diff --git a/desktop b/desktop
index d9c7b4d..fb4d624 100644
--- a/desktop
+++ b/desktop
@@ -59,3 +59,4 @@ wmmixer
 unclutter
 xdialog
 smbfs
+xeji
diff --git a/internal/rootfs/etc/skel/.fluxbox/keys b/internal/rootfs/etc/skel/.fluxbox/keys
new file mode 100644
index 0000000..c207d73
--- /dev/null
+++ b/internal/rootfs/etc/skel/.fluxbox/keys
@@ -0,0 +1,22 @@
+OnDesktop Mouse1 :HideMenus
+OnDesktop Mouse2 :WorkspaceMenu
+OnDesktop Mouse3 :RootMenu
+OnDesktop Mouse4 :NextWorkspace
+OnDesktop Mouse5 :PrevWorkspace
+
+Mod1 Tab :NextWindow
+Mod1 Shift Tab :PrevWindow
+Mod1 F1 :Workspace 1
+Mod1 F2 :Workspace 2
+Mod1 F3 :Workspace 3
+Mod1 F4 :Workspace 4
+Mod1 F5 :Workspace 5
+Mod1 F6 :Workspace 6
+Mod1 F7 :Workspace 7
+Mod1 F8 :Workspace 8
+Mod1 F9 :Workspace 9
+Mod1 F10 :Workspace 10
+Mod1 F11 :Workspace 11
+Mod1 F12 :Workspace 12
+
+Control Mod1 Delete :ExecCommand urxvt -e htop
\ No newline at end of file
diff --git a/internal/rootfs/etc/skel/.idesktop/Files.lnk b/internal/rootfs/etc/skel/.idesktop/Files.lnk
new file mode 100644
index 0000000..6c9d3f0
--- /dev/null
+++ b/internal/rootfs/etc/skel/.idesktop/Files.lnk
@@ -0,0 +1,6 @@
+table Icon
+  Caption: Files
+  CaptionTip: Open files browser (pcmanfm)
+  Command: pcmanfm
+  Icon: /usr/share/icons/gnome/48x48/drawer.png
+end
\ No newline at end of file
diff --git a/internal/rootfs/etc/skel/.idesktop/TaskManager.lnl b/internal/rootfs/etc/skel/.idesktop/TaskManager.lnl
new file mode 100644
index 0000000..922d825
--- /dev/null
+++ b/internal/rootfs/etc/skel/.idesktop/TaskManager.lnl
@@ -0,0 +1,6 @@
+table Icon
+  Caption: Task Manager
+  CaptionTip: Open htop
+  Command: urxvt -e htop
+  Icon: /usr/share/icons/gnome/48x48/gnome-monitor.png
+end
\ No newline at end of file
diff --git a/internal/rootfs/etc/skel/.idesktop/Terminal.lnk b/internal/rootfs/etc/skel/.idesktop/Terminal.lnk
new file mode 100644
index 0000000..b52f33f
--- /dev/null
+++ b/internal/rootfs/etc/skel/.idesktop/Terminal.lnk
@@ -0,0 +1,6 @@
+table Icon
+  Caption: Terminal
+  CaptionTip: Open a new terminal
+  Command: rxvt
+  Icon: /usr/share/icons/gnome/48x48/gnome-terminal.png
+end
\ No newline at end of file
diff --git a/internal/rootfs/etc/skel/.idesktop/TextEdit.lnl b/internal/rootfs/etc/skel/.idesktop/TextEdit.lnl
new file mode 100644
index 0000000..f6f81cd
--- /dev/null
+++ b/internal/rootfs/etc/skel/.idesktop/TextEdit.lnl
@@ -0,0 +1,6 @@
+table Icon
+  Caption: Text Edit
+  CaptionTip: Open leafpad
+  Command: leafpad
+  Icon: /usr/share/icons/gnome/48x48/text-editor.png
+end
\ No newline at end of file
diff --git a/internal/rootfs/opt/retrodebian/fluxbox/set-resolution.sh b/internal/rootfs/opt/retrodebian/bin/set-resolution
similarity index 100%
rename from internal/rootfs/opt/retrodebian/fluxbox/set-resolution.sh
rename to internal/rootfs/opt/retrodebian/bin/set-resolution
diff --git a/internal/rootfs/opt/retrodebian/fluxbox/retrodebian-menu.section b/internal/rootfs/opt/retrodebian/fluxbox/retrodebian-menu.section
index 6c07433..5b08ef9 100644
--- a/internal/rootfs/opt/retrodebian/fluxbox/retrodebian-menu.section
+++ b/internal/rootfs/opt/retrodebian/fluxbox/retrodebian-menu.section
@@ -1,8 +1,21 @@
-[submenu] (RetroDebian)
-  [submenu] (Resolution)
-    [exec] (640x480) {/opt/retrodebian/bin/set-resolution 640x480}
-    [exec] (800x600) {/opt/retrodebian/bin/set-resolution 800x600}
-    [exec] (1024x768) {/opt/retrodebian/bin/set-resolution 1024x768}
-  [end]
+[submenu] (RetroDebian) </usr/share/icons/gnome/24x24/gnome-favorites.png>
+    [exec] (Terminal) {rxvt} </usr/share/icons/gnome/24x24/gnome-terminal.png>
+    [exec] (Files) {pcmanfm} </usr/share/icons/gnome/24x24/drawer.png>
+    [exec] (Text Editor) {urxvt -e htop} </usr/share/icons/gnome/24x24/text-editor.png>
+    [exec] (Task Manager) {leafpad} </usr/share/icons/gnome/24x24/gnome-monitor.png>
+    [separator]
+    [exec] (xeji) {xeji} </usr/share/icons/gnome/24x24/eyes.png>
+    [separator]
+    [submenu] (Resolution) </usr/share/icons/gnome/24x24/gnome-monitor.png>
+        [exec] (640x480) {/opt/retrodebian/bin/set-resolution 640x480} 
+        [exec] (800x600) {/opt/retrodebian/bin/set-resolution 800x600}
+        [exec] (1024x768) {/opt/retrodebian/bin/set-resolution 1024x768}
+    [end]
+    [submenu] (Games) </usr/share/icons/gnome/24x24/gnome-joystick.png>
+    [end]
+    [submenu] (Tools) </usr/share/icons/gnome/24x24/gnome-control-center.png>
+    [end]
+    [submenu] (Diags) </usr/share/icons/gnome/24x24/gnome-cpu.png>
+    [end]
 [end]
 [separator]
diff --git a/internal/rootfs/opt/retrodebian/fluxbox/update-menu.sh b/internal/rootfs/opt/retrodebian/fluxbox/update-menu.sh
index 09363d3..055da96 100644
--- a/internal/rootfs/opt/retrodebian/fluxbox/update-menu.sh
+++ b/internal/rootfs/opt/retrodebian/fluxbox/update-menu.sh
@@ -11,9 +11,9 @@ mkdir -p "$DST_DIR"
 TMP="$DST.tmp"
 
 sed \
-  -e '/(Eterm)/d' \
-  -e '/(Rxvt-Unicode (Black))/d' \
-  -e '/(XTerm)/d' \
+  -e '/(Eterm/d' \
+  -e '/(Rxvt-Unicode (Black/d' \
+  -e '/(XTerm/d' \
   "$SRC" > "$TMP.base"
 
 if [ -f "$TEMPLATE" ]; then
diff --git a/zzz-config-live.sh b/zzz-config-live.sh
index 60efc07..deafc15 100644
--- a/zzz-config-live.sh
+++ b/zzz-config-live.sh
@@ -34,7 +34,7 @@ find /etc/skel \( \
 
 
 # todo: automatic
-chmod +xr,ug+xrw,o-w /opt/retrodebian/fluxbox/set-resolution.sh
+chmod +xr,ug+xrw,o-w /opt/retrodebian/bin/set-resolution
 chmod +r,ug+xw,o-w /opt/retrodebian/fluxbox/watch-menu.sh
 chmod +r,ug+xw,o-w /opt/retrodebian/fluxbox/update-menu.sh
 chmod +r,ug+xw,o-w /etc/init.d/retrodebian-fluxbox-watch-menu