From 159f33d376a9f689deb022ea4dcf382c4bb1ce05 Mon Sep 17 00:00:00 2001
From: Michael Jennings <mej@kainx.org>
Date: Mon, 22 Dec 2003 20:57:12 +0000
Subject: [PATCH] Mon Dec 22 15:56:51 2003                        Michael
 Jennings (mej)

Backported changes to menu generation.


SVN revision: 8181
---
 ChangeLog                |   4 +
 doc/menu-master-file.m4  |  90 +++--
 themes/Escreen/menus.cfg | 819 ++++++++++++++++++++++++++++++++++++++-
 themes/Eterm/menus.cfg   |  82 ++--
 themes/auto/menus.cfg    |  82 ++--
 themes/trans/menus.cfg   |  82 ++--
 6 files changed, 993 insertions(+), 166 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3cece7c..1be23a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5152,3 +5152,7 @@ Mon Dec 22 15:50:35 2003                        Michael Jennings (mej)
 
 Minor tweaks to utils/Etbg_update_list.
 ----------------------------------------------------------------------
+Mon Dec 22 15:56:51 2003                        Michael Jennings (mej)
+
+Backported changes to menu generation.
+----------------------------------------------------------------------
diff --git a/doc/menu-master-file.m4 b/doc/menu-master-file.m4
index 5934a7e..7358248 100644
--- a/doc/menu-master-file.m4
+++ b/doc/menu-master-file.m4
@@ -24,6 +24,14 @@ define(FONT_ITEM, `begin menuitem
     text "$1"
     action string "\e]50;#$2"
   end')
+define(TILE_IMAGE_ITEM, `begin menuitem
+    text "$1"
+    action string "\e]20;tile/$2;0+0:tile\a"
+  end')
+define(SCALE_IMAGE_ITEM, `begin menuitem
+    text "$1"
+    action string "\e]20;scale/$2;100\a"
+  end')
 
 dnl#
 dnl# Define these only for the chooser theme
@@ -154,50 +162,50 @@ end
 
 begin menu
   title Tiled
-  STRING_ITEM(`70s Marble', `\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Atoms', `\e]20;tile/atoms.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Black Stone', `\e]20;tile/blackstone.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Blue Ether', `\e]20;tile/ether_blue.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Blue Marble', `\e]20;tile/blue_marble.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Bubbly 1', `\e]20;tile/bubbly1.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Bubbly 2', `\e]20;tile/bubbly2.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Bubbly 3', `\e]20;tile/bubbly3.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Bubbly 4', `\e]20;tile/bubbly4.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Circuit', `\e]20;tile/circuit.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Confusion', `\e]20;tile/confusion.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Cyber Playground', `\e]20;tile/cyber_bg.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Dimples', `\e]20;tile/014.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Dirt', `\e]20;tile/dirt.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Egg', `\e]20;tile/egg.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Ether', `\e]20;tile/ether.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Giger 1', `\e]20;tile/giger1.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Giger 2', `\e]20;tile/giger2.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Gray Matter', `\e]20;tile/22.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Gray Waves', `\e]20;tile/59.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Green Ether', `\e]20;tile/ether_green.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Lava', `\e]20;tile/004.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Nebula', `\e]20;tile/nebula.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`On Stage', `\e]20;tile/lightb1.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Purple Stuff', `\e]20;tile/purple_stuff.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Red Whisper', `\e]20;tile/40.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Shale', `\e]20;tile/shale.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Soft Marble', `\e]20;tile/soft.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Space', `\e]20;tile/space.png;0x0+0+0:tile\a')
-  STRING_ITEM(`Starry Night', `\e]20;tile/starry.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Steel', `\e]20;tile/steel1.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Twisted', `\e]20;tile/twisted.jpg;0x0+0+0:tile\a')
-  STRING_ITEM(`Whirlpool', `\e]20;tile/015.jpg;0x0+0+0:tile\a')
+  TILE_IMAGE_ITEM(`70s Marble', `tile/70s_marble.jpg')
+  TILE_IMAGE_ITEM(`Atoms', `tile/atoms.jpg')
+  TILE_IMAGE_ITEM(`Black Stone', `tile/blackstone.jpg')
+  TILE_IMAGE_ITEM(`Blue Ether', `tile/ether_blue.jpg')
+  TILE_IMAGE_ITEM(`Blue Marble', `tile/blue_marble.jpg')
+  TILE_IMAGE_ITEM(`Bubbly 1', `tile/bubbly1.jpg')
+  TILE_IMAGE_ITEM(`Bubbly 2', `tile/bubbly2.jpg')
+  TILE_IMAGE_ITEM(`Bubbly 3', `tile/bubbly3.jpg')
+  TILE_IMAGE_ITEM(`Bubbly 4', `tile/bubbly4.jpg')
+  TILE_IMAGE_ITEM(`Circuit', `tile/circuit.jpg')
+  TILE_IMAGE_ITEM(`Confusion', `tile/confusion.jpg')
+  TILE_IMAGE_ITEM(`Cyber Playground', `tile/cyber_bg.jpg')
+  TILE_IMAGE_ITEM(`Dimples', `tile/014.jpg')
+  TILE_IMAGE_ITEM(`Dirt', `tile/dirt.jpg')
+  TILE_IMAGE_ITEM(`Egg', `tile/egg.jpg')
+  TILE_IMAGE_ITEM(`Ether', `tile/ether.jpg')
+  TILE_IMAGE_ITEM(`Giger 1', `tile/giger1.jpg')
+  TILE_IMAGE_ITEM(`Giger 2', `tile/giger2.jpg')
+  TILE_IMAGE_ITEM(`Gray Matter', `tile/22.jpg')
+  TILE_IMAGE_ITEM(`Gray Waves', `tile/59.jpg')
+  TILE_IMAGE_ITEM(`Green Ether', `tile/ether_green.jpg')
+  TILE_IMAGE_ITEM(`Lava', `tile/004.jpg')
+  TILE_IMAGE_ITEM(`Nebula', `tile/nebula.jpg')
+  TILE_IMAGE_ITEM(`On Stage', `tile/lightb1.jpg')
+  TILE_IMAGE_ITEM(`Purple Stuff', `tile/purple_stuff.jpg')
+  TILE_IMAGE_ITEM(`Red Whisper', `tile/40.jpg')
+  TILE_IMAGE_ITEM(`Shale', `tile/shale.jpg')
+  TILE_IMAGE_ITEM(`Soft Marble', `tile/soft.jpg')
+  TILE_IMAGE_ITEM(`Space', `tile/space.png')
+  TILE_IMAGE_ITEM(`Starry Night', `tile/starry.jpg')
+  TILE_IMAGE_ITEM(`Steel', `tile/steel1.jpg')
+  TILE_IMAGE_ITEM(`Twisted', `tile/twisted.jpg')
+  TILE_IMAGE_ITEM(`Whirlpool', `tile/015.jpg')
 end
 begin menu
   title Scaled
-  STRING_ITEM(`Day/Night', `\e]20;scale/day-night.jpg;100x100+50+50\a')
-  STRING_ITEM(`Good Morning', `\e]20;scale/good-morning.jpg;100x100+50+50\a')
-  STRING_ITEM(`Neopolis', `\e]20;scale/Neopolis-horizon.jpg;100x100+50+50\a')
-  STRING_ITEM(`Pond', `\e]20;scale/pond.jpg;100x100+50+50\a')
-  STRING_ITEM(`Ripple', `\e]20;scale/ripple.jpg;100x100+50+50\a')
-  STRING_ITEM(`Sunset', `\e]20;scale/sunset.jpg;100x100+50+50\a')
-  STRING_ITEM(`Wasteland', `\e]20;scale/wasteland.jpg;100x100+50+50\a')
-  STRING_ITEM(`Winter Tree', `\e]20;scale/wintertree.jpg;100x100+50+50\a')
+  SCALE_IMAGE_ITEM(`Day/Night', `scale/day-night.jpg')
+  SCALE_IMAGE_ITEM(`Good Morning', `scale/good-morning.jpg')
+  SCALE_IMAGE_ITEM(`Neopolis', `scale/Neopolis-horizon.jpg')
+  SCALE_IMAGE_ITEM(`Pond', `scale/pond.jpg')
+  SCALE_IMAGE_ITEM(`Ripple', `scale/ripple.jpg')
+  SCALE_IMAGE_ITEM(`Sunset', `scale/sunset.jpg')
+  SCALE_IMAGE_ITEM(`Wasteland', `scale/wasteland.jpg')
+  SCALE_IMAGE_ITEM(`Winter Tree', `scale/wintertree.jpg')
 end
 begin menu
   title Attrib
diff --git a/themes/Escreen/menus.cfg b/themes/Escreen/menus.cfg
index 45e8661..6b4a375 100644
--- a/themes/Escreen/menus.cfg
+++ b/themes/Escreen/menus.cfg
@@ -1,2 +1,817 @@
-<Eterm-0.9.2>
-# This file is intentionally blank. :-)
+<Eterm-0.9.1>
+begin menu
+  title Font
+  begin menuitem
+    text "Normal"
+    action string "\e]50;#"
+  end
+  begin menuitem
+    text "Larger"
+    action string "\e]50;#+"
+  end
+  begin menuitem
+    text "Smaller"
+    action string "\e]50;#-"
+  end
+  -
+  begin menuitem
+    text "Font 1"
+    action string "\e]50;#1"
+  end
+  begin menuitem
+    text "Font 2"
+    action string "\e]50;#2"
+  end
+  begin menuitem
+    text "Font 3"
+    action string "\e]50;#3"
+  end
+  begin menuitem
+    text "Font 4"
+    action string "\e]50;#4"
+  end
+end
+begin menu
+  title Toggles
+  begin menuitem
+    text "Cursor Visible"
+    action string "\e[?25t"
+  end
+  begin menuitem
+    text "Home on Output"
+    action string "\e[?1010t"
+  end
+  begin menuitem
+    text "Home on Input"
+    action string "\e[?1012t"
+  end
+  begin menuitem
+    text "Map Alert"
+    action string "\e]6;21\a"
+  end
+  begin menuitem
+    text "Primary/Secondary Screen"
+    action string "\e[?47t"
+  end
+  begin menuitem
+    text "Reverse Video"
+    action string "\e[?5t"
+  end
+  begin menuitem
+    text "Select Trailing Spaces"
+    action string "\e]6;25\a"
+  end
+  begin menuitem
+    text "Select Whole Line on Triple-click"
+    action string "\e]6;23\a"
+  end
+  begin menuitem
+    text "Visual Bell"
+    action string "\e]6;20\a"
+  end
+  begin menuitem
+    text "X11 Mouse Reporting"
+    action string "\e[?1000t"
+  end
+  begin menuitem
+    text "Xterm Selection Behavior"
+    action string "\e]6;22\a"
+  end
+end
+begin menu
+  title Keys
+  begin menuitem
+    text "Application Arrow Keys"
+    action string "\e[?1t"
+  end
+  begin menuitem
+    text "Application Keypad"
+    action string "\e[?66t"
+  end
+  begin menuitem
+    text "Backspace/Delete"
+    action string "\e[?67t"
+  end
+  begin menuitem
+    text "Xterm Shift-Keys"
+    action string "\e[?35t"
+  end
+end
+begin menu
+  title Scrollbar
+  begin menuitem
+    text "Toggle Visibility"
+    rtext "Ctrl-Button2"
+    action string "\e[?30t"
+  end
+  begin menuitem
+    text "Swap Sides"
+    action string "\e]6;11\a"
+  end
+  begin menuitem
+    text "Toggle Floating"
+    action string "\e]6;12\a"
+  end
+  begin menuitem
+    text "Toggle Popup Mode"
+    action string "\e]6;13\a"
+  end
+  -
+  begin menuitem
+    text "Motif (Traditional) Style"
+    action string "\e]6;10;motif;;\a"
+  end
+  begin menuitem
+    text "NeXT Style"
+    action string "\e]6;10;next;;\a"
+  end
+  begin menuitem
+    text "Xterm Style"
+    action string "\e]6;10;xterm;;\a"
+  end
+end
+begin menu
+  title Width
+  begin menuitem
+    text "5"
+    action string "\e]6;10;;5;\a"
+  end
+  begin menuitem
+    text "6"
+    action string "\e]6;10;;6;\a"
+  end
+  begin menuitem
+    text "7"
+    action string "\e]6;10;;7;\a"
+  end
+  begin menuitem
+    text "8"
+    action string "\e]6;10;;8;\a"
+  end
+  begin menuitem
+    text "9"
+    action string "\e]6;10;;9;\a"
+  end
+  begin menuitem
+    text "10"
+    action string "\e]6;10;;10;\a"
+  end
+  begin menuitem
+    text "11"
+    action string "\e]6;10;;11;\a"
+  end
+  begin menuitem
+    text "12"
+    action string "\e]6;10;;12;\a"
+  end
+  begin menuitem
+    text "13"
+    action string "\e]6;10;;13;\a"
+  end
+  begin menuitem
+    text "14"
+    action string "\e]6;10;;14;\a"
+  end
+  begin menuitem
+    text "15"
+    action string "\e]6;10;;15;\a"
+  end
+  begin menuitem
+    text "16"
+    action string "\e]6;10;;16;\a"
+  end
+  begin menuitem
+    text "17"
+    action string "\e]6;10;;17;\a"
+  end
+  begin menuitem
+    text "18"
+    action string "\e]6;10;;18;\a"
+  end
+  begin menuitem
+    text "19"
+    action string "\e]6;10;;19;\a"
+  end
+  begin menuitem
+    text "20"
+    action string "\e]6;10;;20;\a"
+  end
+end
+begin menu
+  title "Move to Desktop"
+  begin menuitem
+    text "0"
+    action string "\e]6;50;0;\a"
+  end
+  begin menuitem
+    text "1"
+    action string "\e]6;50;1;\a"
+  end
+  begin menuitem
+    text "2"
+    action string "\e]6;50;2;\a"
+  end
+  begin menuitem
+    text "3"
+    action string "\e]6;50;3;\a"
+  end
+  begin menuitem
+    text "4"
+    action string "\e]6;50;4;\a"
+  end
+  begin menuitem
+    text "5"
+    action string "\e]6;50;5;\a"
+  end
+  begin menuitem
+    text "6"
+    action string "\e]6;50;6;\a"
+  end
+  begin menuitem
+    text "7"
+    action string "\e]6;50;7;\a"
+  end
+end
+begin menu
+  title Terminal
+  begin menuitem
+    text "Toggles"
+    action submenu "Toggles"
+  end
+  begin menuitem
+    text "Keys"
+    action submenu "Keys"
+  end
+  begin menuitem
+    text "Scrollbar"
+    action submenu "Scrollbar"
+  end
+  begin menuitem
+    text "Move to Desktop"
+    action submenu "Move to Desktop"
+  end
+  -
+  begin menuitem
+    text "Steal Focus"
+    rtext "Ctrl-Button1"
+    action string "\e]5;\a"
+  end
+  begin menuitem
+    text "Full Reset"
+    action string "\ec"
+  end
+end
+begin menu
+  title Tiled
+  begin menuitem
+    text "70s Marble"
+    action string "\e]20;tile/tile/70s_marble.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Atoms"
+    action string "\e]20;tile/tile/atoms.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Black Stone"
+    action string "\e]20;tile/tile/blackstone.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Blue Ether"
+    action string "\e]20;tile/tile/ether_blue.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Blue Marble"
+    action string "\e]20;tile/tile/blue_marble.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Bubbly 1"
+    action string "\e]20;tile/tile/bubbly1.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Bubbly 2"
+    action string "\e]20;tile/tile/bubbly2.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Bubbly 3"
+    action string "\e]20;tile/tile/bubbly3.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Bubbly 4"
+    action string "\e]20;tile/tile/bubbly4.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Circuit"
+    action string "\e]20;tile/tile/circuit.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Confusion"
+    action string "\e]20;tile/tile/confusion.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Cyber Playground"
+    action string "\e]20;tile/tile/cyber_bg.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Dimples"
+    action string "\e]20;tile/tile/014.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Dirt"
+    action string "\e]20;tile/tile/dirt.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Egg"
+    action string "\e]20;tile/tile/egg.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Ether"
+    action string "\e]20;tile/tile/ether.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Giger 1"
+    action string "\e]20;tile/tile/giger1.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Giger 2"
+    action string "\e]20;tile/tile/giger2.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Gray Matter"
+    action string "\e]20;tile/tile/22.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Gray Waves"
+    action string "\e]20;tile/tile/59.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Green Ether"
+    action string "\e]20;tile/tile/ether_green.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Lava"
+    action string "\e]20;tile/tile/004.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Nebula"
+    action string "\e]20;tile/tile/nebula.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "On Stage"
+    action string "\e]20;tile/tile/lightb1.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Purple Stuff"
+    action string "\e]20;tile/tile/purple_stuff.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Red Whisper"
+    action string "\e]20;tile/tile/40.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Shale"
+    action string "\e]20;tile/tile/shale.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Soft Marble"
+    action string "\e]20;tile/tile/soft.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Space"
+    action string "\e]20;tile/tile/space.png;0+0:tile\a"
+  end
+  begin menuitem
+    text "Starry Night"
+    action string "\e]20;tile/tile/starry.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Steel"
+    action string "\e]20;tile/tile/steel1.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Twisted"
+    action string "\e]20;tile/tile/twisted.jpg;0+0:tile\a"
+  end
+  begin menuitem
+    text "Whirlpool"
+    action string "\e]20;tile/tile/015.jpg;0+0:tile\a"
+  end
+end
+begin menu
+  title Scaled
+  begin menuitem
+    text "Day/Night"
+    action string "\e]20;scale/scale/day-night.jpg;100\a"
+  end
+  begin menuitem
+    text "Good Morning"
+    action string "\e]20;scale/scale/good-morning.jpg;100\a"
+  end
+  begin menuitem
+    text "Neopolis"
+    action string "\e]20;scale/scale/Neopolis-horizon.jpg;100\a"
+  end
+  begin menuitem
+    text "Pond"
+    action string "\e]20;scale/scale/pond.jpg;100\a"
+  end
+  begin menuitem
+    text "Ripple"
+    action string "\e]20;scale/scale/ripple.jpg;100\a"
+  end
+  begin menuitem
+    text "Sunset"
+    action string "\e]20;scale/scale/sunset.jpg;100\a"
+  end
+  begin menuitem
+    text "Wasteland"
+    action string "\e]20;scale/scale/wasteland.jpg;100\a"
+  end
+  begin menuitem
+    text "Winter Tree"
+    action string "\e]20;scale/scale/wintertree.jpg;100\a"
+  end
+end
+begin menu
+  title Attrib
+  begin menuitem
+    text "Full Size"
+    action string "\e]20;;100x100"
+  end
+  begin menuitem
+    text "Normal Size"
+    action string "\e]20;;0x0"
+  end
+  -
+  begin menuitem
+    text "Tiled"
+    action string "\e]20;;:tile"
+  end
+  begin menuitem
+    text "Scaled"
+    action string "\e]20;;100x100"
+  end
+  begin menuitem
+    text "Proportional Scale"
+    action string "\e]20;;100x100:propscale"
+  end
+  -
+  begin menuitem
+    text "Center"
+    action string "\e]20;;=+50+50"
+  end
+  begin menuitem
+    text "Top Left Corner"
+    action string "\e]20;;=+0+0"
+  end
+  begin menuitem
+    text "Bottom Right Corner"
+    action string "\e]20;;=+100+100"
+  end
+end
+begin menu
+  title Pixmap
+  begin menuitem
+    text "None"
+    action string "\e[m\e]20;;\a"
+  end
+  begin menuitem
+    text "Toggle Viewport Mode"
+    action string "\e]6;24\a"
+  end
+  begin menuitem
+    text "Tiled"
+    action submenu "Tiled"
+  end
+  begin menuitem
+    text "Scaled"
+    action submenu "Scaled"
+  end
+  -
+  begin menuitem
+    text "Attrib"
+    action submenu "Attrib"
+  end
+end
+begin menu
+  title Brightness
+  begin menuitem
+    text "512 (200%)"
+    action string "\e]6;1;image;brightness;512\a"
+  end
+  begin menuitem
+    text "480 (188%)"
+    action string "\e]6;1;image;brightness;480\a"
+  end
+  begin menuitem
+    text "448 (175%)"
+    action string "\e]6;1;image;brightness;448\a"
+  end
+  begin menuitem
+    text "416 (163%)"
+    action string "\e]6;1;image;brightness;416\a"
+  end
+  begin menuitem
+    text "384 (150%)"
+    action string "\e]6;1;image;brightness;384\a"
+  end
+  begin menuitem
+    text "352 (138%)"
+    action string "\e]6;1;image;brightness;352\a"
+  end
+  begin menuitem
+    text "320 (125%)"
+    action string "\e]6;1;image;brightness;320\a"
+  end
+  begin menuitem
+    text "288 (113%)"
+    action string "\e]6;1;image;brightness;288\a"
+  end
+  begin menuitem
+    text "256 (100%)"
+    action string "\e]6;1;image;brightness;256\a"
+  end
+  begin menuitem
+    text "224 (88%)"
+    action string "\e]6;1;image;brightness;224\a"
+  end
+  begin menuitem
+    text "192 (75%)"
+    action string "\e]6;1;image;brightness;192\a"
+  end
+  begin menuitem
+    text "160 (63%)"
+    action string "\e]6;1;image;brightness;160\a"
+  end
+  begin menuitem
+    text "128 (50%)"
+    action string "\e]6;1;image;brightness;128\a"
+  end
+  begin menuitem
+    text "96 (38%)"
+    action string "\e]6;1;image;brightness;96\a"
+  end
+  begin menuitem
+    text "64 (25%)"
+    action string "\e]6;1;image;brightness;64\a"
+  end
+  begin menuitem
+    text "32 (13%)"
+    action string "\e]6;1;image;brightness;32\a"
+  end
+  begin menuitem
+    text "0 (0%)"
+    action string "\e]6;1;image;brightness;0\a"
+  end
+end
+begin menu
+  title Contrast
+  begin menuitem
+    text "512 (200%)"
+    action string "\e]6;1;image;contrast;512\a"
+  end
+  begin menuitem
+    text "480 (188%)"
+    action string "\e]6;1;image;contrast;480\a"
+  end
+  begin menuitem
+    text "448 (175%)"
+    action string "\e]6;1;image;contrast;448\a"
+  end
+  begin menuitem
+    text "416 (163%)"
+    action string "\e]6;1;image;contrast;416\a"
+  end
+  begin menuitem
+    text "384 (150%)"
+    action string "\e]6;1;image;contrast;384\a"
+  end
+  begin menuitem
+    text "352 (138%)"
+    action string "\e]6;1;image;contrast;352\a"
+  end
+  begin menuitem
+    text "320 (125%)"
+    action string "\e]6;1;image;contrast;320\a"
+  end
+  begin menuitem
+    text "288 (113%)"
+    action string "\e]6;1;image;contrast;288\a"
+  end
+  begin menuitem
+    text "256 (100%)"
+    action string "\e]6;1;image;contrast;256\a"
+  end
+  begin menuitem
+    text "224 (88%)"
+    action string "\e]6;1;image;contrast;224\a"
+  end
+  begin menuitem
+    text "192 (75%)"
+    action string "\e]6;1;image;contrast;192\a"
+  end
+  begin menuitem
+    text "160 (63%)"
+    action string "\e]6;1;image;contrast;160\a"
+  end
+  begin menuitem
+    text "128 (50%)"
+    action string "\e]6;1;image;contrast;128\a"
+  end
+  begin menuitem
+    text "96 (38%)"
+    action string "\e]6;1;image;contrast;96\a"
+  end
+  begin menuitem
+    text "64 (25%)"
+    action string "\e]6;1;image;contrast;64\a"
+  end
+  begin menuitem
+    text "32 (13%)"
+    action string "\e]6;1;image;contrast;32\a"
+  end
+  begin menuitem
+    text "0 (0%)"
+    action string "\e]6;1;image;contrast;0\a"
+  end
+end
+begin menu
+  title Gamma
+  begin menuitem
+    text "512 (200%)"
+    action string "\e]6;1;image;gamma;512\a"
+  end
+  begin menuitem
+    text "480 (188%)"
+    action string "\e]6;1;image;gamma;480\a"
+  end
+  begin menuitem
+    text "448 (175%)"
+    action string "\e]6;1;image;gamma;448\a"
+  end
+  begin menuitem
+    text "416 (163%)"
+    action string "\e]6;1;image;gamma;416\a"
+  end
+  begin menuitem
+    text "384 (150%)"
+    action string "\e]6;1;image;gamma;384\a"
+  end
+  begin menuitem
+    text "352 (138%)"
+    action string "\e]6;1;image;gamma;352\a"
+  end
+  begin menuitem
+    text "320 (125%)"
+    action string "\e]6;1;image;gamma;320\a"
+  end
+  begin menuitem
+    text "288 (113%)"
+    action string "\e]6;1;image;gamma;288\a"
+  end
+  begin menuitem
+    text "256 (100%)"
+    action string "\e]6;1;image;gamma;256\a"
+  end
+  begin menuitem
+    text "224 (88%)"
+    action string "\e]6;1;image;gamma;224\a"
+  end
+  begin menuitem
+    text "192 (75%)"
+    action string "\e]6;1;image;gamma;192\a"
+  end
+  begin menuitem
+    text "160 (63%)"
+    action string "\e]6;1;image;gamma;160\a"
+  end
+  begin menuitem
+    text "128 (50%)"
+    action string "\e]6;1;image;gamma;128\a"
+  end
+  begin menuitem
+    text "96 (38%)"
+    action string "\e]6;1;image;gamma;96\a"
+  end
+  begin menuitem
+    text "64 (25%)"
+    action string "\e]6;1;image;gamma;64\a"
+  end
+  begin menuitem
+    text "32 (13%)"
+    action string "\e]6;1;image;gamma;32\a"
+  end
+  begin menuitem
+    text "0 (0%)"
+    action string "\e]6;1;image;gamma;0\a"
+  end
+end
+begin menu
+  title Background
+  begin menuitem
+    text "Toggle Transparency"
+    action string "\e]6;0\a"
+  end
+  begin menuitem
+    text "Pixmap"
+    action submenu "Pixmap"
+  end
+  begin menuitem
+    text "Brightness"
+    action submenu "Brightness"
+  end
+  begin menuitem
+    text "Contrast"
+    action submenu "Contrast"
+  end
+  begin menuitem
+    text "Gamma"
+    action submenu "Gamma"
+  end
+end
+begin menu
+  title Eterm
+  begin menuitem
+    text "Font"
+    action submenu "Font"
+  end
+  begin menuitem
+    text "Background"
+    action submenu "Background"
+  end
+  begin menuitem
+    text "Terminal"
+    action submenu "Terminal"
+  end
+  -
+  begin menuitem
+    text "New Eterm Window"
+    action script "spawn(Eterm)"
+  end
+  begin menuitem
+    text "Search..."
+    action script "search()"
+  end
+  begin menuitem
+    text "Run..."
+    action script "exec_dialog(Eterm -e )"
+  end
+  -
+  begin menuitem
+    text "Version"
+    action string "\e[8n"
+  end
+  begin menuitem
+    text "Status"
+    action string "\e[9n"
+  end
+  separator
+  begin menuitem
+    text "Save User Settings..."
+    action script "save"
+  end
+  begin menuitem
+    text "Save Theme Settings..."
+    action script "save(theme)"
+  end
+  begin menuitem
+    text "Exit"
+    action script "exit"
+  end
+end
+begin menu
+  title "Eterm Operations"
+  begin menuitem
+    text "New Eterm Window"
+    action script "spawn(Eterm)"
+  end
+  begin menuitem
+    text "Search..."
+    action script "search()"
+  end
+  begin menuitem
+    text "Run..."
+    action script "exec_dialog(Eterm -e )"
+  end
+  -
+  begin menuitem
+    text "Version"
+    action string "\e[8n"
+  end
+  begin menuitem
+    text "Status"
+    action string "\e[9n"
+  end
+  separator
+  begin menuitem
+    text "Save User Settings..."
+    action script "save"
+  end
+  begin menuitem
+    text "Save Theme Settings..."
+    action script "save(theme)"
+  end
+  begin menuitem
+    text "Exit"
+    action script "exit"
+  end
+end
diff --git a/themes/Eterm/menus.cfg b/themes/Eterm/menus.cfg
index 45a31fe..6b4a375 100644
--- a/themes/Eterm/menus.cfg
+++ b/themes/Eterm/menus.cfg
@@ -265,170 +265,170 @@ begin menu
   title Tiled
   begin menuitem
     text "70s Marble"
-    action string "\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/70s_marble.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Atoms"
-    action string "\e]20;tile/atoms.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/atoms.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Black Stone"
-    action string "\e]20;tile/blackstone.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/blackstone.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Blue Ether"
-    action string "\e]20;tile/ether_blue.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/ether_blue.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Blue Marble"
-    action string "\e]20;tile/blue_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/blue_marble.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 1"
-    action string "\e]20;tile/bubbly1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 2"
-    action string "\e]20;tile/bubbly2.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly2.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 3"
-    action string "\e]20;tile/bubbly3.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly3.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 4"
-    action string "\e]20;tile/bubbly4.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly4.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Circuit"
-    action string "\e]20;tile/circuit.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/circuit.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Confusion"
-    action string "\e]20;tile/confusion.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/confusion.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Cyber Playground"
-    action string "\e]20;tile/cyber_bg.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/cyber_bg.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Dimples"
-    action string "\e]20;tile/014.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/014.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Dirt"
-    action string "\e]20;tile/dirt.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/dirt.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Egg"
-    action string "\e]20;tile/egg.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/egg.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Ether"
-    action string "\e]20;tile/ether.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/ether.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Giger 1"
-    action string "\e]20;tile/giger1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/giger1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Giger 2"
-    action string "\e]20;tile/giger2.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/giger2.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Gray Matter"
-    action string "\e]20;tile/22.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/22.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Gray Waves"
-    action string "\e]20;tile/59.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/59.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Green Ether"
-    action string "\e]20;tile/ether_green.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/ether_green.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Lava"
-    action string "\e]20;tile/004.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/004.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Nebula"
-    action string "\e]20;tile/nebula.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/nebula.jpg;0+0:tile\a"
   end
   begin menuitem
     text "On Stage"
-    action string "\e]20;tile/lightb1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/lightb1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Purple Stuff"
-    action string "\e]20;tile/purple_stuff.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/purple_stuff.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Red Whisper"
-    action string "\e]20;tile/40.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/40.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Shale"
-    action string "\e]20;tile/shale.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/shale.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Soft Marble"
-    action string "\e]20;tile/soft.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/soft.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Space"
-    action string "\e]20;tile/space.png;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/space.png;0+0:tile\a"
   end
   begin menuitem
     text "Starry Night"
-    action string "\e]20;tile/starry.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/starry.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Steel"
-    action string "\e]20;tile/steel1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/steel1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Twisted"
-    action string "\e]20;tile/twisted.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/twisted.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Whirlpool"
-    action string "\e]20;tile/015.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/015.jpg;0+0:tile\a"
   end
 end
 begin menu
   title Scaled
   begin menuitem
     text "Day/Night"
-    action string "\e]20;scale/day-night.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/day-night.jpg;100\a"
   end
   begin menuitem
     text "Good Morning"
-    action string "\e]20;scale/good-morning.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/good-morning.jpg;100\a"
   end
   begin menuitem
     text "Neopolis"
-    action string "\e]20;scale/Neopolis-horizon.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/Neopolis-horizon.jpg;100\a"
   end
   begin menuitem
     text "Pond"
-    action string "\e]20;scale/pond.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/pond.jpg;100\a"
   end
   begin menuitem
     text "Ripple"
-    action string "\e]20;scale/ripple.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/ripple.jpg;100\a"
   end
   begin menuitem
     text "Sunset"
-    action string "\e]20;scale/sunset.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/sunset.jpg;100\a"
   end
   begin menuitem
     text "Wasteland"
-    action string "\e]20;scale/wasteland.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/wasteland.jpg;100\a"
   end
   begin menuitem
     text "Winter Tree"
-    action string "\e]20;scale/wintertree.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/wintertree.jpg;100\a"
   end
 end
 begin menu
diff --git a/themes/auto/menus.cfg b/themes/auto/menus.cfg
index 45a31fe..6b4a375 100644
--- a/themes/auto/menus.cfg
+++ b/themes/auto/menus.cfg
@@ -265,170 +265,170 @@ begin menu
   title Tiled
   begin menuitem
     text "70s Marble"
-    action string "\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/70s_marble.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Atoms"
-    action string "\e]20;tile/atoms.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/atoms.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Black Stone"
-    action string "\e]20;tile/blackstone.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/blackstone.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Blue Ether"
-    action string "\e]20;tile/ether_blue.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/ether_blue.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Blue Marble"
-    action string "\e]20;tile/blue_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/blue_marble.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 1"
-    action string "\e]20;tile/bubbly1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 2"
-    action string "\e]20;tile/bubbly2.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly2.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 3"
-    action string "\e]20;tile/bubbly3.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly3.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 4"
-    action string "\e]20;tile/bubbly4.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly4.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Circuit"
-    action string "\e]20;tile/circuit.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/circuit.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Confusion"
-    action string "\e]20;tile/confusion.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/confusion.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Cyber Playground"
-    action string "\e]20;tile/cyber_bg.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/cyber_bg.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Dimples"
-    action string "\e]20;tile/014.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/014.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Dirt"
-    action string "\e]20;tile/dirt.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/dirt.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Egg"
-    action string "\e]20;tile/egg.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/egg.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Ether"
-    action string "\e]20;tile/ether.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/ether.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Giger 1"
-    action string "\e]20;tile/giger1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/giger1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Giger 2"
-    action string "\e]20;tile/giger2.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/giger2.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Gray Matter"
-    action string "\e]20;tile/22.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/22.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Gray Waves"
-    action string "\e]20;tile/59.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/59.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Green Ether"
-    action string "\e]20;tile/ether_green.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/ether_green.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Lava"
-    action string "\e]20;tile/004.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/004.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Nebula"
-    action string "\e]20;tile/nebula.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/nebula.jpg;0+0:tile\a"
   end
   begin menuitem
     text "On Stage"
-    action string "\e]20;tile/lightb1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/lightb1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Purple Stuff"
-    action string "\e]20;tile/purple_stuff.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/purple_stuff.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Red Whisper"
-    action string "\e]20;tile/40.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/40.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Shale"
-    action string "\e]20;tile/shale.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/shale.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Soft Marble"
-    action string "\e]20;tile/soft.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/soft.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Space"
-    action string "\e]20;tile/space.png;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/space.png;0+0:tile\a"
   end
   begin menuitem
     text "Starry Night"
-    action string "\e]20;tile/starry.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/starry.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Steel"
-    action string "\e]20;tile/steel1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/steel1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Twisted"
-    action string "\e]20;tile/twisted.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/twisted.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Whirlpool"
-    action string "\e]20;tile/015.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/015.jpg;0+0:tile\a"
   end
 end
 begin menu
   title Scaled
   begin menuitem
     text "Day/Night"
-    action string "\e]20;scale/day-night.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/day-night.jpg;100\a"
   end
   begin menuitem
     text "Good Morning"
-    action string "\e]20;scale/good-morning.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/good-morning.jpg;100\a"
   end
   begin menuitem
     text "Neopolis"
-    action string "\e]20;scale/Neopolis-horizon.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/Neopolis-horizon.jpg;100\a"
   end
   begin menuitem
     text "Pond"
-    action string "\e]20;scale/pond.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/pond.jpg;100\a"
   end
   begin menuitem
     text "Ripple"
-    action string "\e]20;scale/ripple.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/ripple.jpg;100\a"
   end
   begin menuitem
     text "Sunset"
-    action string "\e]20;scale/sunset.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/sunset.jpg;100\a"
   end
   begin menuitem
     text "Wasteland"
-    action string "\e]20;scale/wasteland.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/wasteland.jpg;100\a"
   end
   begin menuitem
     text "Winter Tree"
-    action string "\e]20;scale/wintertree.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/wintertree.jpg;100\a"
   end
 end
 begin menu
diff --git a/themes/trans/menus.cfg b/themes/trans/menus.cfg
index 45a31fe..6b4a375 100644
--- a/themes/trans/menus.cfg
+++ b/themes/trans/menus.cfg
@@ -265,170 +265,170 @@ begin menu
   title Tiled
   begin menuitem
     text "70s Marble"
-    action string "\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/70s_marble.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Atoms"
-    action string "\e]20;tile/atoms.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/atoms.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Black Stone"
-    action string "\e]20;tile/blackstone.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/blackstone.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Blue Ether"
-    action string "\e]20;tile/ether_blue.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/ether_blue.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Blue Marble"
-    action string "\e]20;tile/blue_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/blue_marble.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 1"
-    action string "\e]20;tile/bubbly1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 2"
-    action string "\e]20;tile/bubbly2.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly2.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 3"
-    action string "\e]20;tile/bubbly3.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly3.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Bubbly 4"
-    action string "\e]20;tile/bubbly4.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/bubbly4.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Circuit"
-    action string "\e]20;tile/circuit.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/circuit.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Confusion"
-    action string "\e]20;tile/confusion.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/confusion.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Cyber Playground"
-    action string "\e]20;tile/cyber_bg.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/cyber_bg.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Dimples"
-    action string "\e]20;tile/014.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/014.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Dirt"
-    action string "\e]20;tile/dirt.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/dirt.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Egg"
-    action string "\e]20;tile/egg.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/egg.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Ether"
-    action string "\e]20;tile/ether.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/ether.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Giger 1"
-    action string "\e]20;tile/giger1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/giger1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Giger 2"
-    action string "\e]20;tile/giger2.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/giger2.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Gray Matter"
-    action string "\e]20;tile/22.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/22.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Gray Waves"
-    action string "\e]20;tile/59.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/59.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Green Ether"
-    action string "\e]20;tile/ether_green.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/ether_green.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Lava"
-    action string "\e]20;tile/004.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/004.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Nebula"
-    action string "\e]20;tile/nebula.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/nebula.jpg;0+0:tile\a"
   end
   begin menuitem
     text "On Stage"
-    action string "\e]20;tile/lightb1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/lightb1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Purple Stuff"
-    action string "\e]20;tile/purple_stuff.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/purple_stuff.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Red Whisper"
-    action string "\e]20;tile/40.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/40.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Shale"
-    action string "\e]20;tile/shale.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/shale.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Soft Marble"
-    action string "\e]20;tile/soft.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/soft.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Space"
-    action string "\e]20;tile/space.png;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/space.png;0+0:tile\a"
   end
   begin menuitem
     text "Starry Night"
-    action string "\e]20;tile/starry.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/starry.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Steel"
-    action string "\e]20;tile/steel1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/steel1.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Twisted"
-    action string "\e]20;tile/twisted.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/twisted.jpg;0+0:tile\a"
   end
   begin menuitem
     text "Whirlpool"
-    action string "\e]20;tile/015.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/tile/015.jpg;0+0:tile\a"
   end
 end
 begin menu
   title Scaled
   begin menuitem
     text "Day/Night"
-    action string "\e]20;scale/day-night.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/day-night.jpg;100\a"
   end
   begin menuitem
     text "Good Morning"
-    action string "\e]20;scale/good-morning.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/good-morning.jpg;100\a"
   end
   begin menuitem
     text "Neopolis"
-    action string "\e]20;scale/Neopolis-horizon.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/Neopolis-horizon.jpg;100\a"
   end
   begin menuitem
     text "Pond"
-    action string "\e]20;scale/pond.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/pond.jpg;100\a"
   end
   begin menuitem
     text "Ripple"
-    action string "\e]20;scale/ripple.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/ripple.jpg;100\a"
   end
   begin menuitem
     text "Sunset"
-    action string "\e]20;scale/sunset.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/sunset.jpg;100\a"
   end
   begin menuitem
     text "Wasteland"
-    action string "\e]20;scale/wasteland.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/wasteland.jpg;100\a"
   end
   begin menuitem
     text "Winter Tree"
-    action string "\e]20;scale/wintertree.jpg;100x100+50+50\a"
+    action string "\e]20;scale/scale/wintertree.jpg;100\a"
   end
 end
 begin menu