diff --git a/roles/home-gui/files/icewm/README.menu b/roles/home-gui/files/icewm/README.menu
deleted file mode 100644
index f5d3c0a..0000000
--- a/roles/home-gui/files/icewm/README.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-Use the "wmconfig" program to build the menu as follows:
-
-  wmconfig --output icewm > ~/.icewm/menu
-
-The "wmconfig" program can be found in /usr/ports/x11-wm/wmconfig.
diff --git a/roles/home-gui/files/icewm/keys b/roles/home-gui/files/icewm/keys
index 1d67e3a..328bb7a 100644
--- a/roles/home-gui/files/icewm/keys
+++ b/roles/home-gui/files/icewm/keys
@@ -1,4 +1,2 @@
-key "Ctrl+Alt+L" xscreensaver-command -lock
-key "Ctrl+Alt+M" /bin/sh -c "exec ~/data/code/sh/toggle-trackpad.sh"
+key "Ctrl+Alt+L" xlock -mode blank
 key "Ctrl+Alt+T" urxvt
-key "Ctrl+Alt+V" gvim
diff --git a/roles/home-gui/files/icewm/menu b/roles/home-gui/files/icewm/menu
index 5155654..17a59d6 100644
--- a/roles/home-gui/files/icewm/menu
+++ b/roles/home-gui/files/icewm/menu
@@ -1,9 +1,12 @@
 prog "Terminal" xterm urxvt
 prog "Midnight Commander" file urxvt -geometry 120x40 -e mc
 menu "Terminals" folder {
-    prog "XTerm (80x10)" xterm urxvt -geometry 80x10
-    prog "XTerm (80x24)" xterm urxvt -geometry 80x24
-    prog "XTerm (120x40)" xterm urxvt -geometry 120x40
+    prog "URxvt (80x10)" xterm urxvt -geometry 80x10
+    prog "URxvt (80x24)" xterm urxvt -geometry 80x24
+    prog "URxvt (120x40)" xterm urxvt -geometry 120x40
+    prog "XTerm (80x10)" xterm xterm -geometry 80x10
+    prog "XTerm (80x24)" xterm xterm -geometry 80x24
+    prog "XTerm (120x40)" xterm xterm -geometry 120x40
 }
 separator
 includeprog icewm-menu-fdo --no-sub-cats
diff --git a/roles/home-gui/files/icewm/preferences b/roles/home-gui/files/icewm/preferences
index ba47400..8e3c9ab 100644
--- a/roles/home-gui/files/icewm/preferences
+++ b/roles/home-gui/files/icewm/preferences
@@ -1,7 +1,7 @@
-DateFormat="%F W%V-%u"
+DateFormat="%F%n%A"
 DesktopBackgroundCenter=1
 DesktopBackgroundColor="steelblue"
-LockCommand="xscreensaver-command -lock"
+LockCommand="xlock -mode blank"
 ModSuperIsCtrlAlt=0
 MsgBoxDefaultAction=1
 OpaqueMove=0
diff --git a/roles/home-gui/files/icewm/toolbar b/roles/home-gui/files/icewm/toolbar
index 4b551bf..560d80c 100644
--- a/roles/home-gui/files/icewm/toolbar
+++ b/roles/home-gui/files/icewm/toolbar
@@ -1,4 +1,4 @@
 prog "Terminal" xterm urxvt
-prog "Midnight Commander" file xterm -geometry 120x40 -e mc
-prog "GVIM" vim gvim
+prog "Midnight Commander" file urxvt -geometry 120x40 -e mc
+prog "VIM" vim urxvt -geometry 120x40 -e mc
 prog "Firefox" firefox-esr firefox