update theme + menus + dockapps

5 files changed, 234 insertions, 179 deletions

diff --git a/wmaker/GNUstep/Defaults/WMRootMenu b/wmaker/GNUstep/Defaults/WMRootMenu
index a4f2e96..a4a3e9a 100644
--- a/wmaker/GNUstep/Defaults/WMRootMenu
+++ b/wmaker/GNUstep/Defaults/WMRootMenu
@@ -6,6 +6,7 @@
     (PCManFM, EXEC, pcmanfm),
     (Urxvt, SHORTCUT, "Mod4+Return", EXEC, urxvt),
     (Emacsclient, SHORTCUT, "Mod4+n", EXEC, "emacsclient -c -n"),
+    ("Emacs Launcher", SHORTCUT, "Shift+Mod4+n", EXEC, "emacs-launcher"),
     (EMMS, SHORTCUT, "Mod4+m", EXEC, "emacs-launcher \"music\""),
     (Terminals, (st, EXEC, st)),
     (Graphics, (GIMP, EXEC, gimp), ("ImageMagick Display", EXEC, display)),
@@ -154,6 +155,12 @@
       "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name,Name to save icon set as)\""
     )
   ),
+  (
+    Wallpaper,
+    ("Choose wallpaper", EXEC, wallpaper.sh),
+    ("Load themed wallpaper", EXEC, "load-theme-wallpaper"),
+    ("Annotate wallpaper", EXEC, "wallpaper-annotate.sh")
+  ),
   (Workspaces, WORKSPACE_MENU),
   (
     Workspace,
@@ -166,6 +173,7 @@
   ),
   ("Configure Window Maker", EXEC, WPrefs),
   ("Info Panel", INFO_PANEL),
+  (Lock, EXEC, sysact),
   ("Restart Window Maker", RESTART),
   ("Other Window Managers", ("Start Motif Window Manager", RESTART, mwm)),
   ("Exit Window Maker", EXIT)
diff --git a/wmaker/GNUstep/Defaults/WMState b/wmaker/GNUstep/Defaults/WMState
index e0227dc..30f36cd 100644
--- a/wmaker/GNUstep/Defaults/WMState
+++ b/wmaker/GNUstep/Defaults/WMState
@@ -13,25 +13,23 @@
       },
       {
         Forced = No;
-        Name = emacs.Emacs;
-        DropCommand = "emacsclient -c -a 'emacs' %d";
+        Name = wmclock.WMClock;
         BuggyApplication = No;
         AutoLaunch = Yes;
-        Position = "0,7";
+        Position = "0,4";
         Lock = Yes;
-        PasteCommand = "emacsclient -c -a 'emacs' %s";
-        Command = "emacsclient -c -a 'emacs'";
+        Command = "wmclock -24 -exe \"emacs-launcher 'agenda'\"";
       },
       {
         Forced = No;
-        Name = urxvt.URxvt;
-        DropCommand = "urxvt -cd /home/bard %d";
+        Name = emacs.Emacs;
+        DropCommand = "emacsclient -c %d";
         BuggyApplication = No;
         AutoLaunch = No;
-        Position = "0,6";
+        Position = "0,8";
         Lock = Yes;
-        PasteCommand = "urxvt -cd /home/bard %s";
-        Command = "urxvt -cd /home/bard";
+        PasteCommand = emacs;
+        Command = "emacsclient -c -a 'emacs'";
       },
       {
         Forced = No;
@@ -46,25 +44,14 @@
       },
       {
         Forced = No;
-        Name = wmacpi.DockApp;
-        DropCommand = "wmacpi %d";
-        BuggyApplication = No;
-        AutoLaunch = Yes;
-        Position = "0,2";
-        Lock = Yes;
-        PasteCommand = "wmacpi %s";
-        Command = wmacpi;
-      },
-      {
-        Forced = No;
         Name = wmamixer.Wmamixer;
-        DropCommand = "wmamixer -w %d";
+        DropCommand = "wmamixer -w -l #cc8c3c -b #181818 %d";
         BuggyApplication = No;
         AutoLaunch = Yes;
-        Position = "0,3";
+        Position = "0,2";
         Lock = Yes;
-        PasteCommand = "wmamixer -w %s";
-        Command = "wmamixer -w";
+        PasteCommand = "wmamixer -w -l #cc8c3c -b #181818 %s";
+        Command = "wmamixer -w -l #cc8c3c -b #181818";
       },
       {
         Forced = No;
@@ -72,21 +59,21 @@
         DropCommand = "wmusic %d";
         BuggyApplication = No;
         AutoLaunch = Yes;
-        Position = "0,4";
+        Position = "0,3";
         Lock = Yes;
         PasteCommand = "wmusic %s";
         Command = wmusic;
       },
       {
         Forced = No;
-        Name = wmclock.WMClock;
-        DropCommand = "wmclock -24 -exe \"emacs-launcher \"calendar\"\" %d";
+        Name = urxvt.URxvt;
+        DropCommand = "urxvtc %d";
         BuggyApplication = No;
-        AutoLaunch = Yes;
-        Position = "0,5";
+        AutoLaunch = No;
+        Position = "0,7";
         Lock = Yes;
-        PasteCommand = "wmclock -24 -exe \"emacs-launcher \"calendar\"\" %s";
-        Command = "wmclock -24 -exe \"emacs-launcher \"calendar\"\"";
+        PasteCommand = "urxvtc %s";
+        Command = urxvtc;
       },
       {
         Forced = No;
@@ -94,21 +81,32 @@
         DropCommand = "pcmanfm %d";
         BuggyApplication = No;
         AutoLaunch = No;
-        Position = "0,8";
+        Position = "0,10";
         Lock = Yes;
         PasteCommand = "pcmanfm %s";
         Command = pcmanfm;
       },
       {
         Forced = No;
-        Name = firefox.Firefox;
-        DropCommand = "firefox %d";
+        Name = wmomikuzi.DockApp;
+        DropCommand = "wmomikuzi %d";
         BuggyApplication = No;
-        AutoLaunch = No;
-        Position = "0,9";
-        Lock = No;
-        PasteCommand = "firefox %s";
-        Command = firefox;
+        AutoLaunch = Yes;
+        Position = "0,6";
+        Lock = Yes;
+        PasteCommand = "wmomikuzi %s";
+        Command = wmomikuzi;
+      },
+      {
+        Forced = No;
+        Name = wmmoonclock.wmmoonclock;
+        DropCommand = "wmmoonclock %d";
+        BuggyApplication = No;
+        AutoLaunch = Yes;
+        Position = "0,5";
+        Lock = Yes;
+        PasteCommand = "wmmoonclock %s";
+        Command = wmmoonclock;
       }
     );
     Applications1080 = (
@@ -123,25 +121,23 @@
       },
       {
         Forced = No;
-        Name = emacs.Emacs;
-        DropCommand = "emacsclient -c -a 'emacs' %d";
+        Name = wmclock.WMClock;
         BuggyApplication = No;
         AutoLaunch = Yes;
-        Position = "0,7";
+        Position = "0,4";
         Lock = Yes;
-        PasteCommand = "emacsclient -c -a 'emacs' %s";
-        Command = "emacsclient -c -a 'emacs'";
+        Command = "wmclock -24 -exe \"emacs-launcher 'agenda'\"";
       },
       {
         Forced = No;
-        Name = urxvt.URxvt;
-        DropCommand = "urxvt -cd /home/bard %d";
+        Name = emacs.Emacs;
+        DropCommand = "emacsclient -c %d";
         BuggyApplication = No;
         AutoLaunch = No;
-        Position = "0,6";
+        Position = "0,8";
         Lock = Yes;
-        PasteCommand = "urxvt -cd /home/bard %s";
-        Command = "urxvt -cd /home/bard";
+        PasteCommand = emacs;
+        Command = "emacsclient -c -a 'emacs'";
       },
       {
         Forced = No;
@@ -156,25 +152,14 @@
       },
       {
         Forced = No;
-        Name = wmacpi.DockApp;
-        DropCommand = "wmacpi %d";
-        BuggyApplication = No;
-        AutoLaunch = Yes;
-        Position = "0,2";
-        Lock = Yes;
-        PasteCommand = "wmacpi %s";
-        Command = wmacpi;
-      },
-      {
-        Forced = No;
         Name = wmamixer.Wmamixer;
-        DropCommand = "wmamixer -w %d";
+        DropCommand = "wmamixer -w -l #cc8c3c -b #181818 %d";
         BuggyApplication = No;
         AutoLaunch = Yes;
-        Position = "0,3";
+        Position = "0,2";
         Lock = Yes;
-        PasteCommand = "wmamixer -w %s";
-        Command = "wmamixer -w";
+        PasteCommand = "wmamixer -w -l #cc8c3c -b #181818 %s";
+        Command = "wmamixer -w -l #cc8c3c -b #181818";
       },
       {
         Forced = No;
@@ -182,21 +167,21 @@
         DropCommand = "wmusic %d";
         BuggyApplication = No;
         AutoLaunch = Yes;
-        Position = "0,4";
+        Position = "0,3";
         Lock = Yes;
         PasteCommand = "wmusic %s";
         Command = wmusic;
       },
       {
         Forced = No;
-        Name = wmclock.WMClock;
-        DropCommand = "wmclock -24 -exe \"emacs-launcher \"calendar\"\" %d";
+        Name = urxvt.URxvt;
+        DropCommand = "urxvtc %d";
         BuggyApplication = No;
-        AutoLaunch = Yes;
-        Position = "0,5";
+        AutoLaunch = No;
+        Position = "0,7";
         Lock = Yes;
-        PasteCommand = "wmclock -24 -exe \"emacs-launcher \"calendar\"\" %s";
-        Command = "wmclock -24 -exe \"emacs-launcher \"calendar\"\"";
+        PasteCommand = "urxvtc %s";
+        Command = urxvtc;
       },
       {
         Forced = No;
@@ -204,45 +189,92 @@
         DropCommand = "pcmanfm %d";
         BuggyApplication = No;
         AutoLaunch = No;
-        Position = "0,8";
+        Position = "0,10";
         Lock = Yes;
         PasteCommand = "pcmanfm %s";
         Command = pcmanfm;
       },
       {
         Forced = No;
-        Name = firefox.Firefox;
-        DropCommand = "firefox %d";
+        Name = wmomikuzi.DockApp;
+        DropCommand = "wmomikuzi %d";
         BuggyApplication = No;
-        AutoLaunch = No;
-        Position = "0,9";
-        Lock = No;
-        PasteCommand = "firefox %s";
-        Command = firefox;
+        AutoLaunch = Yes;
+        Position = "0,6";
+        Lock = Yes;
+        PasteCommand = "wmomikuzi %s";
+        Command = wmomikuzi;
+      },
+      {
+        Forced = No;
+        Name = wmmoonclock.wmmoonclock;
+        DropCommand = "wmmoonclock %d";
+        BuggyApplication = No;
+        AutoLaunch = Yes;
+        Position = "0,5";
+        Lock = Yes;
+        PasteCommand = "wmmoonclock %s";
+        Command = wmmoonclock;
       }
     );
     Lowered = Yes;
-    Position = "1856,0";
+    Position = "0,0";
   };
   Clip = {
     Forced = No;
     Name = Logo.WMClip;
     BuggyApplication = No;
     AutoLaunch = No;
-    Position = "1856,1016";
+    Position = "0,1016";
     Lock = No;
     Command = "-";
   };
   Applications = ();
-  Drawers = ();
+  Drawers = (
+    {
+      Dock = {
+        AutoCollapse = Yes;
+        Applications = (
+          {
+            Forced = No;
+            Name = Navigator.firefox;
+            DropCommand = "/opt/firefox/firefox-bin %d";
+            BuggyApplication = No;
+            AutoLaunch = No;
+            Position = "1,0";
+            Lock = Yes;
+            PasteCommand = "/opt/firefox/firefox-bin %s";
+            Command = "/opt/firefox/firefox-bin";
+            Omnipresent = No;
+          },
+          {
+            Forced = No;
+            Name = Navigator.LibreWolf;
+            DropCommand = "/opt/librewolf/librewolf-bin %d";
+            BuggyApplication = No;
+            AutoLaunch = No;
+            Position = "2,0";
+            Lock = Yes;
+            PasteCommand = "/opt/librewolf/librewolf-bin %s";
+            Command = "/opt/librewolf/librewolf-bin";
+            Omnipresent = No;
+          }
+        );
+        Collapsed = Yes;
+        AutoAttractIcons = No;
+      };
+      Name = Drawer0;
+      Position = "0,576";
+    }
+  );
   Workspaces = (
     {
       Clip = {
         AutoRaiseLower = No;
         AutoCollapse = No;
         Applications = ();
-        Collapsed = Yes;
-        AutoAttractIcons = No;
+        Collapsed = No;
+        AutoAttractIcons = Yes;
         Lowered = Yes;
       };
       Name = "Workspace 1";
@@ -257,6 +289,17 @@
         Lowered = Yes;
       };
       Name = "Workspace 2";
+    },
+    {
+      Clip = {
+        AutoRaiseLower = No;
+        AutoCollapse = No;
+        Applications = ();
+        Collapsed = No;
+        AutoAttractIcons = No;
+        Lowered = Yes;
+      };
+      Name = "Workspace 3";
     }
   );
   Workspace = "Workspace 1";
diff --git a/wmaker/GNUstep/Defaults/WMWindowAttributes b/wmaker/GNUstep/Defaults/WMWindowAttributes
index 699e95f..623712d 100644
--- a/wmaker/GNUstep/Defaults/WMWindowAttributes
+++ b/wmaker/GNUstep/Defaults/WMWindowAttributes
@@ -13,8 +13,11 @@
   };
   Navigator.LibreWolf = {
     AlwaysUserIcon = Yes;
-    Icon = Mozilla.png;
     EmulateAppIcon = Yes;
+    Icon = Mozilla.png;
+  };
+  Drawer0.WMDrawer = {
+    Icon = Drawer.tiff;
   };
   st.St = {
     AlwaysUserIcon = No;
@@ -28,10 +31,14 @@
     AlwaysUserIcon = No;
     Icon = "logan-terminal.xpm";
   };
+  mpvk.mpv = {
+    AlwaysUserIcon = Yes;
+    Icon = Speaker.png;
+  };
   Navigator.firefox = {
     AlwaysUserIcon = Yes;
-    Icon = Mozilla_Firefox_3.5_logo.png;
     EmulateAppIcon = Yes;
+    Icon = Mozilla_Firefox_3.5_logo.png;
   };
   urxvt.URxvt = {
     Icon = TerminalLinux.xpm;
diff --git a/wmaker/GNUstep/Defaults/WPrefs b/wmaker/GNUstep/Defaults/WPrefs
index 6d078a5..660b955 100644
--- a/wmaker/GNUstep/Defaults/WPrefs
+++ b/wmaker/GNUstep/Defaults/WPrefs
@@ -6,26 +6,26 @@
     "#292929",
     "#525252",
     "#808080",
-    "#a7a7a7",
-    "#d0d0d0",
-    "#fafafa",
-    "#d0d086",
-    "#d09f7b",
-    "#86d086",
-    "#86d0c8",
-    "#d08686",
-    "#8696d0",
-    "#b780d0",
-    "#d086b7",
-    "#d04a4a",
-    "#4a5ad0",
-    "#4ad0c8",
-    "#4ad05a",
-    "#c8d04a",
-    "#d0804a",
-    "#84d031",
-    "#c829c0",
-    "#c82973"
+    "#a4a4a4",
+    "#cdcdcd",
+    "#f7f7f7",
+    "#cdcd83",
+    "#cd9d7b",
+    "#83cd83",
+    "#83cdc5",
+    "#cd8383",
+    "#8395cd",
+    "#b480cd",
+    "#cd83b4",
+    "#cd4a4a",
+    "#4a5acd",
+    "#4acdc5",
+    "#4acd5a",
+    "#c5cd4a",
+    "#cd804a",
+    "#81cd31",
+    "#c529bd",
+    "#c52973"
   );
   BalloonHelp = YES;
 }
diff --git a/wmaker/GNUstep/Defaults/WindowMaker b/wmaker/GNUstep/Defaults/WindowMaker
index caffa18..e1fa3fe 100644
--- a/wmaker/GNUstep/Defaults/WindowMaker
+++ b/wmaker/GNUstep/Defaults/WindowMaker
@@ -1,11 +1,12 @@
 {
-  FTitleColor = "#d7d7d7";
+  FTitleColor = "#dbdbdb";
   FrameBorderColor = "#000000";
   ScreenCaptureKey = None;
-  MiniaturizeKey = "Shift+Mod4+F";
-  MenuDisabledColor = "#959595";
-  Superfluous = NO;
+  MenuDisabledColor = "#969696";
+  CycleIgnoreMinimized = YES;
   LastWorkspaceKey = "Mod4+Tab";
+  IconTitleBack = "#575757";
+  HotCornerEdge = 2;
   PixmapPath = (
     "/home/bard/GNUstep/Library/WindowMaker/Pixmaps",
     "/home/bard/GNUstep/Library/WindowMaker/Backgrounds",
@@ -15,94 +16,96 @@
     "/usr/share/WindowMaker/Backgrounds",
     "/usr/share/pixmaps"
   );
-  IconTitleBack = "#575757";
-  HotCornerEdge = 2;
   FTitleBack = (
     spixmap,
-    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/focused.png",
+    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/gruber.themed/focused.png",
     "#3d4254"
   );
-  ToggleKbdModeKey = None;
-  WindowMenuKey = "Shift+Mod4+space";
+  ClipTitleFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=12";
   MiniwindowPreviewBalloons = YES;
-  ClipTitleFont = "Iosevka Comfy Wide Duo:slant=0:weight=80:width=125:pixelsize=10";
   MaximizeKey = "Mod4+F";
-  DoNotMakeAppIconsBounce = YES;
-  MaximusKey = "Mod4+T";
   IconTitleFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=12";
-  MenuTextBack = (
-    spixmap,
-    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/unfocused.png",
-    "#41454d"
-  );
-  LargeDisplayFont = "Iosevka Comfy Wide Duo-24:slant=0:weight=200:width=125:pixelsize=24";
+  LargeDisplayFont = "Trebuchet MS,sans serif:pixelsize=24";
   KeepDockOnPrimaryHead = YES;
-  CycleWorkspaces = YES;
-  HotCornerDelay = 250;
   ResizeCursor = (
     bitmap,
-    "/usr/share/WindowMaker/Themes/Motion.themed/dot_resize.xbm",
-    "/usr/share/WindowMaker/Themes/Motion.themed/dot_resize_mask.xbm"
+    "/usr/share/WindowMaker/Themes/Grass After the Rain.themed/dot_resize.xbm",
+    "/usr/share/WindowMaker/Themes/Grass After the Rain.themed/dot_resize_mask.xbm"
   );
   CenterKey = "Mod4+C";
+  IconTitleColor = "#c1c1c1";
+  MenuTitleColor = "#d6d6d6";
+  HotCorners = NO;
+  MenuTitleFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=14";
+  MoveTo6to12Head = None;
+  DbClickFullScreen = NO;
+  NoWindowOverDock = YES;
+  OmnipresentKey = "Shift+Mod4+S";
+  WorkspaceBack = (mvgradient, "rgb:50/50/75", "#6a6f9e", "#4b4f70", "#28293c");
+  HighlightTextColor = "#d6d6d6";
+  EnforceIconMargin = NO;
+  AutoArrangeIcons = YES;
+  ClipTitleColor = "#cccccc";
+  MoveTo12to6Head = None;
+  HotCornerActions = (None, None, None, None);
+  WaitCursor = (
+    bitmap,
+    "/usr/share/WindowMaker/Themes/Grass After the Rain.themed/dot_wait.xbm",
+    "/usr/share/WindowMaker/Themes/Grass After the Rain.themed/dot_wait_mask.xbm"
+  );
+  FrameFocusedBorderColor = "#000000";
+  WindowTitleFont = "Iosevka Comfy:slant=0:weight=50:width=100:pixelsize=16";
+  RootMenuKey = "Mod4+space";
+  ResizebarBack = (
+    spixmap,
+    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/gruber.themed/focused.png",
+    "#424242"
+  );
+  MiniPreviewSize = 248;
+  DisplayFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=20";
+  KbdModeLock = NO;
+  CloseRootMenuByLeftOrRightMouseClick = YES;
+  MenuTitleExtendSpace = "-1";
+  FrameSelectedBorderColor = "#f9f9f9";
+  MiniaturizeKey = "Shift+Mod4+F";
+  Superfluous = NO;
+  ToggleKbdModeKey = None;
+  WindowMenuKey = "Shift+Mod4+space";
+  MaximusKey = "Mod4+T";
+  MenuTextBack = (
+    spixmap,
+    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/gruber.themed/unfocused.png",
+    "#41454d"
+  );
+  WindowPlacement = smart;
+  HotCornerDelay = 250;
+  CycleWorkspaces = YES;
   MoveToLastWorkspaceKey = "Shift+Mod4+Tab";
-  TitleJustify = left;
-  IconTitleColor = "#bdbdbd";
-  MenuTextColor = "#d2d2d2";
+  MenuTextColor = "#d6d6d6";
   IconBack = (
     spixmap,
-    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/tile.png",
+    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/gruber.themed/tile.png",
     "#424242"
   );
   AntialiasedText = YES;
-  MenuTitleColor = "#d2d2d2";
   LowerKey = "Mod4+S";
-  MenuTitleFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=16";
-  HotCorners = NO;
   WindowTitleExtendSpace = "-1";
-  MoveTo6to12Head = None;
-  DbClickFullScreen = NO;
-  MenuTextFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=16";
-  NoWindowOverDock = YES;
+  MenuTextFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=14";
   NoWindowOverIcons = YES;
-  OmnipresentKey = "Shift+Mod4+S";
-  WorkspaceBack = (
-    spixmap,
-    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/scylla.tif",
-    "#545454"
-  );
-  HighlightTextColor = "#d2d2d2";
   MenuTitleBack = (
     spixmap,
-    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/focused.png",
+    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/gruber.themed/focused.png",
     "#424242"
   );
-  EnforceIconMargin = NO;
-  AutoArrangeIcons = YES;
-  ClipTitleColor = "#c8c8c8";
-  MoveTo12to6Head = None;
-  HotCornerActions = (None, None, None, None);
-  WaitCursor = (
-    bitmap,
-    "/usr/share/WindowMaker/Themes/Motion.themed/dot_wait.xbm",
-    "/usr/share/WindowMaker/Themes/Motion.themed/dot_wait_mask.xbm"
-  );
+  SnapCornerDetect = 50;
   CloseKey = "Mod4+Q";
-  FrameFocusedBorderColor = "#000000";
   HighlightColor = "#4a4d49";
-  WindowTitleFont = "Iosevka Comfy:slant=0:weight=80:width=100:pixelsize=16";
   WrapMenus = YES;
-  CClipTitleColor = "#e1e1e1";
+  CClipTitleColor = gray90;
   MoveCursor = (
     bitmap,
-    "/usr/share/WindowMaker/Themes/Motion.themed/dot_move.xbm",
-    "/usr/share/WindowMaker/Themes/Motion.themed/dot_move_mask.xbm"
-  );
-  RootMenuKey = "Mod4+space";
-  ResizebarBack = (
-    spixmap,
-    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/focused.png",
-    "#424242"
+    "/usr/share/WindowMaker/Themes/Grass After the Rain.themed/dot_move.xbm",
+    "/usr/share/WindowMaker/Themes/Grass After the Rain.themed/dot_move_mask.xbm"
   );
   IconPath = (
     "/home/bard/GNUstep/Library/Icons",
@@ -113,26 +116,20 @@
     "/usr/share/WindowMaker/Pixmaps",
     "/usr/share/pixmaps"
   );
-  MiniPreviewSize = 248;
   RaiseKey = "Mod4+A";
-  DisplayFont = "-*-helvetica-bold-r-normal-*-12-*-*-*-*-*-*-*";
-  KbdModeLock = NO;
   ModifierKey = Mod4;
   PTitleBack = (
     spixmap,
-    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/unfocused.png",
+    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/gruber.themed/unfocused.png",
     "#3d4554"
   );
   MenuTextExtendSpace = "-1";
   ViKeyMenus = YES;
-  UTitleColor = "#959595";
+  UTitleColor = "#989898";
   UTitleBack = (
     spixmap,
-    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/scylla.themed/unfocused.png",
+    "~/dotfiles-stow/wmaker/GNUstep/Library/WindowMaker/Themes/gruber.themed/unfocused.png",
     "#3d4554"
   );
-  CloseRootMenuByLeftOrRightMouseClick = YES;
-  PTitleColor = "#959595";
-  MenuTitleExtendSpace = "-1";
-  FrameSelectedBorderColor = "#fafafa";
+  PTitleColor = "#999999";
 }