diff --git a/ChangeLog b/ChangeLog
index ad6fdc5..b9a4303 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4345,3 +4345,8 @@ Fri Aug 10 13:55:49 2001                        Michael Jennings (mej)
 
 Minor typo...
 ----------------------------------------------------------------------
+Tue Aug 21 12:51:54 2001                        Michael Jennings (mej)
+
+Updating menus for some themes, and removing some themes that really
+don't demonstrate anything spectacular.  They'll go on the web site.
+----------------------------------------------------------------------
diff --git a/themes/Eterm/menus.cfg b/themes/Eterm/menus.cfg
index 6ef8d1c..7aab154 100644
--- a/themes/Eterm/menus.cfg
+++ b/themes/Eterm/menus.cfg
@@ -263,309 +263,174 @@ begin menu
   end
 end
 
-begin menu
-  title Transparency
-  begin menuitem
-    text "Force Update"
-    action string "\e]6;3\a"
-  end
-  begin menuitem
-    text "Toggle Desktop Watching"
-    action string "\e]6;4\a"
-  end
-  begin menuitem
-    text "Toggle Transparency"
-    action string "\e]6;0\a"
-  end
-end
 begin menu
   title Tiled
   begin menuitem
     text "70's Marble"
-    action string "\e]20;70s_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "7m"
-    action string "\e]20;7m.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Atoms"
-    action string "\e]20;atoms.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Backwave"
-    action string "\e]20;backwave.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/atoms.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Black Stone"
-    action string "\e]20;blackstone.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/blackstone.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Blue Ether"
-    action string "\e]20;ether_blue.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/ether_blue.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Blue Marble"
-    action string "\e]20;blue_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/blue_marble.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Maze"
-    action string "\e]20;blue_maze.jpg;0x0+0+0:tile\a"
+    text "Bubbly 1"
+    action string "\e]20;tile/bubbly1.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Monday"
-    action string "\e]20;021.jpg;0x0+0+0:tile\a"
+    text "Bubbly 2"
+    action string "\e]20;tile/bubbly2.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Puzzle"
-    action string "\e]20;026.png;0x0+0+0:tile\a"
+    text "Bubbly 3"
+    action string "\e]20;tile/bubbly3.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Rock"
-    action string "\e]20;blue_rock.jpg;0x0+0+0:tile\a"
+    text "Bubbly 4"
+    action string "\e]20;tile/bubbly4.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Circuit"
-    action string "\e]20;circuit.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/circuit.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Confusion"
+    action string "\e]20;tile/confusion.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Cyber Playground"
-    action string "\e]20;cyber_bg.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dark Marble"
-    action string "\e]20;dark_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/cyber_bg.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Dimples"
-    action string "\e]20;014.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/014.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Dirt"
-    action string "\e]20;dirt.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/dirt.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Egg"
+    action string "\e]20;tile/egg.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Ether"
-    action string "\e]20;ether.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/ether.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Giger 1"
-    action string "\e]20;giger1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/giger1.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Giger 2"
-    action string "\e]20;giger2.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/giger2.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Gray Matter"
-    action string "\e]20;22.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/22.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Gray Waves"
-    action string "\e]20;59.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/59.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Green Ether"
-    action string "\e]20;ether_green.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/ether_green.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Lava"
-    action string "\e]20;004.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Mudslide"
-    action string "\e]20;35.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/004.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Nebula"
-    action string "\e]20;nebula.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/nebula.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "On Stage"
-    action string "\e]20;lightb1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Clouds"
-    action string "\e]20;7.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Glass"
-    action string "\e]20;purpgls.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Rain"
-    action string "\e]20;024.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/lightb1.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Purple Stuff"
-    action string "\e]20;purple_stuff.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Rainstorm"
-    action string "\e]20;15.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Stucco"
-    action string "\e]20;red_stucco.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/purple_stuff.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Red Whisper"
-    action string "\e]20;40.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/40.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Shale"
-    action string "\e]20;shale.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/shale.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Soft Marble"
-    action string "\e]20;soft.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/soft.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Space"
-    action string "\e]20;space.png;0x0+0+0:tile\a"
+    action string "\e]20;tile/space.png;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Starry Night"
-    action string "\e]20;starry.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/starry.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Steel"
+    action string "\e]20;tile/steel1.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Twisted"
+    action string "\e]20;tile/twisted.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Whirlpool"
-    action string "\e]20;015.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/015.jpg;0x0+0+0:tile\a"
   end
 end
 begin menu
   title Scaled
   begin menuitem
-    text "After the Storm"
-    action string "\e]20;after_the_storm.jpg;100x100+50+50\a"
+    text "Day/Night"
+    action string "\e]20;scale/day-night.jpg;100x100+50+50\a"
   end
   begin menuitem
-    text "Alien Spheres"
-    action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ascension"
-    action string "\e]20;ascension.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Atlantis"
-    action string "\e]20;atlantis.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Bladerunner"
-    action string "\e]20;Bladerunner-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Canyon"
-    action string "\e]20;Canyon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cave Fire"
-    action string "\e]20;Cavefire-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Citidel"
-    action string "\e]20;citidel.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Crater Lake"
-    action string "\e]20;crater_lake.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cronus"
-    action string "\e]20;cronus.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Daughter"
-    action string "\e]20;Daughter.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Dragon"
-    action string "\e]20;Dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "DVXVB"
-    action string "\e]20;dvxvb.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Evocation"
-    action string "\e]20;Evocation.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Fourth Day"
-    action string "\e]20;fourthday.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gaia"
-    action string "\e]20;gaia.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Galleon"
-    action string "\e]20;galleon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gorgon"
-    action string "\e]20;gorgon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ice Moon"
-    action string "\e]20;icemoon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lake of Fire"
-    action string "\e]20;lake_of_fire.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lighthouse"
-    action string "\e]20;lighthouse.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;100x100+50+50\a"
+    text "Good Morning"
+    action string "\e]20;scale/good-morning.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Neopolis"
-    action string "\e]20;Neopolis-horizon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Night of the Dragon"
-    action string "\e]20;night_of_the_dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Planet A"
-    action string "\e]20;planeta.jpg;100x100+50+50\a"
+    action string "\e]20;scale/Neopolis-horizon.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Pond"
-    action string "\e]20;pond.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Poseidon"
-    action string "\e]20;poseidon.jpg;100x100+50+50\a"
+    action string "\e]20;scale/pond.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Ripple"
-    action string "\e]20;ripple.jpg;100x100+50+50\a"
+    action string "\e]20;scale/ripple.jpg;100x100+50+50\a"
   end
   begin menuitem
-    text "Roche Limit"
-    action string "\e]20;roche_limit.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Silence"
-    action string "\e]20;silence.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Taken Field"
-    action string "\e]20;the_taken_field.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Urmane"
-    action string "\e]20;urmane3.jpg;100x100+50+50\a"
+    text "Sunset"
+    action string "\e]20;scale/sunset.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Wasteland"
-    action string "\e]20;wasteland.jpg;100x100+50+50\a"
+    action string "\e]20;scale/wasteland.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Winter Tree"
+    action string "\e]20;scale/wintertree.jpg;100x100+50+50\a"
   end
 end
 begin menu
@@ -585,11 +450,11 @@ begin menu
   end
   begin menuitem
     text "Scaled"
-    action string "\e]20;;:scale"
+    action string "\e]20;;100x100"
   end
   begin menuitem
     text "Proportional Scale"
-    action string "\e]20;;:propscale"
+    action string "\e]20;;100x100:propscale"
   end
   -
   begin menuitem
@@ -845,8 +710,8 @@ end
 begin menu
   title Background
   begin menuitem
-    text "Transparency"
-    action submenu "Transparency"
+    text "Toggle Transparency"
+    action string "\e]6;0\a"
   end
   begin menuitem
     text "Pixmap"
@@ -868,6 +733,10 @@ end
 
 begin menu
   title "Eterm Operations"
+  begin menuitem
+    text "New Window..."
+    action script "spawn(Eterm)"
+  end
   begin menuitem
     text "Version"
     action string "\e[8n"
@@ -878,9 +747,13 @@ begin menu
   end
   separator
   begin menuitem
-    text "Save Settings..."
+    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"
diff --git a/themes/auto/menus.cfg b/themes/auto/menus.cfg
index 6ef8d1c..7aab154 100644
--- a/themes/auto/menus.cfg
+++ b/themes/auto/menus.cfg
@@ -263,309 +263,174 @@ begin menu
   end
 end
 
-begin menu
-  title Transparency
-  begin menuitem
-    text "Force Update"
-    action string "\e]6;3\a"
-  end
-  begin menuitem
-    text "Toggle Desktop Watching"
-    action string "\e]6;4\a"
-  end
-  begin menuitem
-    text "Toggle Transparency"
-    action string "\e]6;0\a"
-  end
-end
 begin menu
   title Tiled
   begin menuitem
     text "70's Marble"
-    action string "\e]20;70s_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "7m"
-    action string "\e]20;7m.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Atoms"
-    action string "\e]20;atoms.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Backwave"
-    action string "\e]20;backwave.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/atoms.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Black Stone"
-    action string "\e]20;blackstone.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/blackstone.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Blue Ether"
-    action string "\e]20;ether_blue.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/ether_blue.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Blue Marble"
-    action string "\e]20;blue_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/blue_marble.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Maze"
-    action string "\e]20;blue_maze.jpg;0x0+0+0:tile\a"
+    text "Bubbly 1"
+    action string "\e]20;tile/bubbly1.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Monday"
-    action string "\e]20;021.jpg;0x0+0+0:tile\a"
+    text "Bubbly 2"
+    action string "\e]20;tile/bubbly2.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Puzzle"
-    action string "\e]20;026.png;0x0+0+0:tile\a"
+    text "Bubbly 3"
+    action string "\e]20;tile/bubbly3.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Rock"
-    action string "\e]20;blue_rock.jpg;0x0+0+0:tile\a"
+    text "Bubbly 4"
+    action string "\e]20;tile/bubbly4.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Circuit"
-    action string "\e]20;circuit.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/circuit.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Confusion"
+    action string "\e]20;tile/confusion.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Cyber Playground"
-    action string "\e]20;cyber_bg.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dark Marble"
-    action string "\e]20;dark_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/cyber_bg.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Dimples"
-    action string "\e]20;014.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/014.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Dirt"
-    action string "\e]20;dirt.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/dirt.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Egg"
+    action string "\e]20;tile/egg.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Ether"
-    action string "\e]20;ether.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/ether.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Giger 1"
-    action string "\e]20;giger1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/giger1.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Giger 2"
-    action string "\e]20;giger2.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/giger2.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Gray Matter"
-    action string "\e]20;22.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/22.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Gray Waves"
-    action string "\e]20;59.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/59.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Green Ether"
-    action string "\e]20;ether_green.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/ether_green.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Lava"
-    action string "\e]20;004.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Mudslide"
-    action string "\e]20;35.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/004.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Nebula"
-    action string "\e]20;nebula.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/nebula.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "On Stage"
-    action string "\e]20;lightb1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Clouds"
-    action string "\e]20;7.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Glass"
-    action string "\e]20;purpgls.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Rain"
-    action string "\e]20;024.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/lightb1.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Purple Stuff"
-    action string "\e]20;purple_stuff.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Rainstorm"
-    action string "\e]20;15.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Stucco"
-    action string "\e]20;red_stucco.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/purple_stuff.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Red Whisper"
-    action string "\e]20;40.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/40.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Shale"
-    action string "\e]20;shale.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/shale.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Soft Marble"
-    action string "\e]20;soft.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/soft.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Space"
-    action string "\e]20;space.png;0x0+0+0:tile\a"
+    action string "\e]20;tile/space.png;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Starry Night"
-    action string "\e]20;starry.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/starry.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Steel"
+    action string "\e]20;tile/steel1.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Twisted"
+    action string "\e]20;tile/twisted.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Whirlpool"
-    action string "\e]20;015.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/015.jpg;0x0+0+0:tile\a"
   end
 end
 begin menu
   title Scaled
   begin menuitem
-    text "After the Storm"
-    action string "\e]20;after_the_storm.jpg;100x100+50+50\a"
+    text "Day/Night"
+    action string "\e]20;scale/day-night.jpg;100x100+50+50\a"
   end
   begin menuitem
-    text "Alien Spheres"
-    action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ascension"
-    action string "\e]20;ascension.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Atlantis"
-    action string "\e]20;atlantis.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Bladerunner"
-    action string "\e]20;Bladerunner-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Canyon"
-    action string "\e]20;Canyon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cave Fire"
-    action string "\e]20;Cavefire-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Citidel"
-    action string "\e]20;citidel.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Crater Lake"
-    action string "\e]20;crater_lake.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cronus"
-    action string "\e]20;cronus.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Daughter"
-    action string "\e]20;Daughter.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Dragon"
-    action string "\e]20;Dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "DVXVB"
-    action string "\e]20;dvxvb.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Evocation"
-    action string "\e]20;Evocation.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Fourth Day"
-    action string "\e]20;fourthday.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gaia"
-    action string "\e]20;gaia.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Galleon"
-    action string "\e]20;galleon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gorgon"
-    action string "\e]20;gorgon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ice Moon"
-    action string "\e]20;icemoon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lake of Fire"
-    action string "\e]20;lake_of_fire.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lighthouse"
-    action string "\e]20;lighthouse.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;100x100+50+50\a"
+    text "Good Morning"
+    action string "\e]20;scale/good-morning.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Neopolis"
-    action string "\e]20;Neopolis-horizon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Night of the Dragon"
-    action string "\e]20;night_of_the_dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Planet A"
-    action string "\e]20;planeta.jpg;100x100+50+50\a"
+    action string "\e]20;scale/Neopolis-horizon.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Pond"
-    action string "\e]20;pond.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Poseidon"
-    action string "\e]20;poseidon.jpg;100x100+50+50\a"
+    action string "\e]20;scale/pond.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Ripple"
-    action string "\e]20;ripple.jpg;100x100+50+50\a"
+    action string "\e]20;scale/ripple.jpg;100x100+50+50\a"
   end
   begin menuitem
-    text "Roche Limit"
-    action string "\e]20;roche_limit.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Silence"
-    action string "\e]20;silence.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Taken Field"
-    action string "\e]20;the_taken_field.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Urmane"
-    action string "\e]20;urmane3.jpg;100x100+50+50\a"
+    text "Sunset"
+    action string "\e]20;scale/sunset.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Wasteland"
-    action string "\e]20;wasteland.jpg;100x100+50+50\a"
+    action string "\e]20;scale/wasteland.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Winter Tree"
+    action string "\e]20;scale/wintertree.jpg;100x100+50+50\a"
   end
 end
 begin menu
@@ -585,11 +450,11 @@ begin menu
   end
   begin menuitem
     text "Scaled"
-    action string "\e]20;;:scale"
+    action string "\e]20;;100x100"
   end
   begin menuitem
     text "Proportional Scale"
-    action string "\e]20;;:propscale"
+    action string "\e]20;;100x100:propscale"
   end
   -
   begin menuitem
@@ -845,8 +710,8 @@ end
 begin menu
   title Background
   begin menuitem
-    text "Transparency"
-    action submenu "Transparency"
+    text "Toggle Transparency"
+    action string "\e]6;0\a"
   end
   begin menuitem
     text "Pixmap"
@@ -868,6 +733,10 @@ end
 
 begin menu
   title "Eterm Operations"
+  begin menuitem
+    text "New Window..."
+    action script "spawn(Eterm)"
+  end
   begin menuitem
     text "Version"
     action string "\e[8n"
@@ -878,9 +747,13 @@ begin menu
   end
   separator
   begin menuitem
-    text "Save Settings..."
+    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"
diff --git a/themes/cEterm/.cvsignore b/themes/cEterm/.cvsignore
deleted file mode 100644
index 4674fba..0000000
--- a/themes/cEterm/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-theme.cfg
diff --git a/themes/cEterm/menus.cfg b/themes/cEterm/menus.cfg
deleted file mode 100644
index 6ef8d1c..0000000
--- a/themes/cEterm/menus.cfg
+++ /dev/null
@@ -1,932 +0,0 @@
-<Eterm-0.9.1>
-begin menu
-  title Font
-  font -*-times-bold-r-normal--14-*-*-*-*-*-iso8859-1
-  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 Transparency
-  begin menuitem
-    text "Force Update"
-    action string "\e]6;3\a"
-  end
-  begin menuitem
-    text "Toggle Desktop Watching"
-    action string "\e]6;4\a"
-  end
-  begin menuitem
-    text "Toggle Transparency"
-    action string "\e]6;0\a"
-  end
-end
-begin menu
-  title Tiled
-  begin menuitem
-    text "70's Marble"
-    action string "\e]20;70s_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "7m"
-    action string "\e]20;7m.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Atoms"
-    action string "\e]20;atoms.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Backwave"
-    action string "\e]20;backwave.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Black Stone"
-    action string "\e]20;blackstone.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Ether"
-    action string "\e]20;ether_blue.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Marble"
-    action string "\e]20;blue_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Maze"
-    action string "\e]20;blue_maze.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Monday"
-    action string "\e]20;021.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Puzzle"
-    action string "\e]20;026.png;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Rock"
-    action string "\e]20;blue_rock.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Circuit"
-    action string "\e]20;circuit.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Cyber Playground"
-    action string "\e]20;cyber_bg.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dark Marble"
-    action string "\e]20;dark_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dimples"
-    action string "\e]20;014.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dirt"
-    action string "\e]20;dirt.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Ether"
-    action string "\e]20;ether.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger 1"
-    action string "\e]20;giger1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger 2"
-    action string "\e]20;giger2.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Gray Matter"
-    action string "\e]20;22.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Gray Waves"
-    action string "\e]20;59.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Green Ether"
-    action string "\e]20;ether_green.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Lava"
-    action string "\e]20;004.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Mudslide"
-    action string "\e]20;35.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "On Stage"
-    action string "\e]20;lightb1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Clouds"
-    action string "\e]20;7.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Glass"
-    action string "\e]20;purpgls.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Rain"
-    action string "\e]20;024.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Stuff"
-    action string "\e]20;purple_stuff.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Rainstorm"
-    action string "\e]20;15.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Stucco"
-    action string "\e]20;red_stucco.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Whisper"
-    action string "\e]20;40.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Shale"
-    action string "\e]20;shale.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Soft Marble"
-    action string "\e]20;soft.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Space"
-    action string "\e]20;space.png;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Starry Night"
-    action string "\e]20;starry.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Whirlpool"
-    action string "\e]20;015.jpg;0x0+0+0:tile\a"
-  end
-end
-begin menu
-  title Scaled
-  begin menuitem
-    text "After the Storm"
-    action string "\e]20;after_the_storm.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Alien Spheres"
-    action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ascension"
-    action string "\e]20;ascension.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Atlantis"
-    action string "\e]20;atlantis.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Bladerunner"
-    action string "\e]20;Bladerunner-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Canyon"
-    action string "\e]20;Canyon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cave Fire"
-    action string "\e]20;Cavefire-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Citidel"
-    action string "\e]20;citidel.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Crater Lake"
-    action string "\e]20;crater_lake.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cronus"
-    action string "\e]20;cronus.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Daughter"
-    action string "\e]20;Daughter.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Dragon"
-    action string "\e]20;Dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "DVXVB"
-    action string "\e]20;dvxvb.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Evocation"
-    action string "\e]20;Evocation.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Fourth Day"
-    action string "\e]20;fourthday.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gaia"
-    action string "\e]20;gaia.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Galleon"
-    action string "\e]20;galleon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gorgon"
-    action string "\e]20;gorgon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ice Moon"
-    action string "\e]20;icemoon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lake of Fire"
-    action string "\e]20;lake_of_fire.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lighthouse"
-    action string "\e]20;lighthouse.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Neopolis"
-    action string "\e]20;Neopolis-horizon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Night of the Dragon"
-    action string "\e]20;night_of_the_dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Planet A"
-    action string "\e]20;planeta.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Pond"
-    action string "\e]20;pond.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Poseidon"
-    action string "\e]20;poseidon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ripple"
-    action string "\e]20;ripple.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Roche Limit"
-    action string "\e]20;roche_limit.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Silence"
-    action string "\e]20;silence.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Taken Field"
-    action string "\e]20;the_taken_field.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Urmane"
-    action string "\e]20;urmane3.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Wasteland"
-    action string "\e]20;wasteland.jpg;100x100+50+50\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;;:scale"
-  end
-  begin menuitem
-    text "Proportional Scale"
-    action string "\e]20;;: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 "Transparency"
-    action submenu "Transparency"
-  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 Operations"
-  begin menuitem
-    text "Version"
-    action string "\e[8n"
-  end
-  begin menuitem
-    text "Status"
-    action string "\e[9n"
-  end
-  separator
-  begin menuitem
-    text "Save Settings..."
-    action script "save()"
-  end
-  begin menuitem
-    text "Exit"
-    action script "exit"
-  end
-end
-
-# This is the menu that gets called by Ctrl-Button3
-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 Window..."
-    action script "spawn(Eterm)"
-  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/cEterm/theme.cfg.in b/themes/cEterm/theme.cfg.in
deleted file mode 100644
index 343ac90..0000000
--- a/themes/cEterm/theme.cfg.in
+++ /dev/null
@@ -1,398 +0,0 @@
-<Eterm-0.9.1>
-# ^- This must be the first line of any Eterm config file!
-# Format is:  <Eterm-VERSION>  where VERSION is replaced by
-#                              the version it was written for,
-#                              minus the "DR-" if any.
-#
-# This is a sample Eterm config file.
-#
-# As always, the authors guarantee absolutely nothing and take
-# no responsibility for anything that might happen to you, your
-# computer, your dog, your sex life, or anyone or anything else
-# directly or indirectly through the use of, or inability to use,
-# this program.  Use at your OWN risk.
-
-# Define the color properties
-begin color
-
-# Foreground, background, cursor, scrollbar, pointer colors
-    foreground #aaaaaa
-    background black
-    cursor #ffff00
-    cursor_text #880000
-    pointer white
-
-# video attribute can either be "normal" or "reverse"
-    video normal
-
-# Redefine the 16 basic colors, if you really feel the need
-# First word is "color", next is the number (0-15, BD, or UL),
-# then the values for red, green, and blue separated by spaces
-# Numbers are base 10 unless preceded by "0x" (base 16) or '0'
-# (base 8).  Alternatively, you can use color names or #xxxxxx
-# format.
-
-# These colors are taken from Alfredo Kojima's cEterm script.  Lots of
-# people seem to like them. :-)
-    color  0 0    0    0
-    color  1 0x9e 0x18 0x28
-    color  2 0x9e 0x18 0x28
-    color  3 #968a38
-    color  4 #414171
-    color  5 #963c59
-    color  6 #418179
-    color  7 gray
-    color  8 gray40
-    color  9 #cf6171
-    color 10 #c5f779
-    color 11 #fff796
-    color 12 #4186be
-    color 13 #cf9ebe
-    color 14 #71bebe
-    color 15 white
-    color bd white
-    color ul white
-
-# This ends the color section.  Any text after the word "end" is
-# assumed to be a comment and ignored.
-end color
-
-# The X11 attributes section.  Should be fairly self-explanatory,
-# but if not, consult the X man page.
-begin attributes
-
-# Geometry == widthxheight+x_offset+y_offset, offsets from top left
-#             if +, bottom right if -
-#    geometry 132x50+100+100
-    title %appname() -- cEterm Theme
-#    name %appname()
-#    iconname Eterm
-
-# Set the fonts.  These must be monospace fonts.  The values shown are
-# the Eterm defaults.  The "bold" font is the font used if color BD has
-# not been set and Eterm cannot map the foreground color to one of the
-# high-intensity colors (8-15).
-    font default @DEF_FONT_IDX@
-    font 0 @FONT0@
-    font 1 @FONT1@
-    font 2 @FONT2@
-    font 3 @FONT3@
-    font 4 @FONT4@
-    font 5 10x20
-    font 6 12x24
-#    font bold 7x14
-end attributes
-
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-begin multichar
-    font 0 @MFONT0@
-    font 1 @MFONT1@
-    font 2 @MFONT2@
-    font 3 @MFONT3@
-    font 4 @MFONT4@
-    encoding @MULTICHAR_ENCODING@
-end multichar
-
-# Define the imageclasses.
-begin imageclasses
-
-# You must define this before setting any images that use it.  This is the $PATH-style variable
-# that determines where Eterm looks for image files.
-    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PKGDATADIR@/pix/"
-
-# If you want a different icon than the standard Eterm one, set this.
-#   icon Eterm.xpm
-
-# This is the background animator.  See the man page for the syntax.
-#   anim 3 foo1 foo2 foo3
-
-# Here we define an image.
-    begin image
-
-# The first thing you set when defining an image MUST be the type.  No type, no dice.  The type
-# should be one of the following:  background, up_arrow, down_arrow, left_arrow, right_arrow,
-#                                  trough, anchor, menu, or submenu
-      type background
-
-# Next you should set the state.  This is either normal, selected, or clicked.
-      state normal
-
-# Here you set the file.  You can also set the geometry string here if you follow the filename with
-# an @ sign.  That way, you can include the geometries in your pixmaps.list file.
-      file %random(`cat pixmaps.list`)
-
-# The mode line.  This defines the startup mode for the image, as well as what modes are allowed.
-# Valid modes are "image" (to display the image file), "trans" (to be transparent), or "viewport"
-# (for viewport mode).  Syntax is "mode <startup_mode> allow <allowed_modes>".
-      mode image allow image trans viewport auto
-
-# Set the image border.  This is a portion of the image which will be kept at its actual size when
-# scaling.  Use this for beveled images (buttons, etc.).
-      border 0 0 0 0
-
-# Th-th-th-th-that's all folks.
-    end image
-
-# The rest of the images.
-    begin image
-      type trough
-      mode image allow image trans viewport auto
-      state normal
-      color black #666666
-      file bar_vertical_3.png
-# Here is how you specify the geometry string separately.  See the man page for its syntax.
-      geom 100
-      border 2 2 2 3
-    end image
-    begin image
-      type anchor
-      mode image allow image auto
-      state normal
-      color black #666666
-      file bar_vertical_1.png
-      geom 100
-      border 2 2 2 3
-      state selected
-      file bar_vertical_2.png
-      geom 100
-      border 2 2 2 3
-    end image
-    begin image
-      type thumb
-      mode image allow image auto
-      state normal
-      color black #666666
-      file thumb_1.png
-      geom 100
-      border 3 3 3 3
-      state selected
-      file thumb_2.png
-      geom 100
-      border 3 3 3 3
-    end image
-    begin image
-      type up_arrow
-      mode image allow image auto
-      state normal
-      color black #666666
-      file button_arrow_up_1.png
-      geom 100
-      border 2 2 2 2
-      state selected
-      file button_arrow_up_2.png
-      geom 100
-      border 2 2 2 2
-      state clicked
-      file button_arrow_up_3.png
-      geom 100
-      border 2 2 2 2
-    end image
-    begin image
-      type down_arrow
-      mode image allow image auto
-      state normal
-      color black #666666
-      file button_arrow_down_1.png
-      geom 100
-      border 2 2 2 2
-      state selected
-      file button_arrow_down_2.png
-      geom 100
-      border 2 2 2 2
-      state clicked
-      file button_arrow_down_3.png
-      geom 100
-      border 2 2 2 2
-    end image
-    begin image
-      type menu
-      mode image allow image auto
-      state normal
-      color black #999999
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 3
-      state selected
-      file bar_horizontal_2.png
-      geom 100
-      border 2 3 2 3
-    end image
-    begin image
-      type submenu
-      mode image allow image auto
-      state normal
-      color black #999999
-      file menu1.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-      state selected
-      file menu2.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-      state clicked
-      file menu3.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-    end image
-    begin image
-      type button_bar
-      mode image allow image auto
-      state normal
-      color black #999999
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 2
-      state disabled
-      color white #333333
-      cmod image 0xc0
-      border 2 3 2 2
-    end image
-    begin image
-      type button
-      mode image allow image auto
-      state normal
-      color black #cccccc
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 2
-      state selected
-      file bar_horizontal_2.png
-      geom 100
-      border 2 3 2 2
-      state clicked
-      file bar_horizontal_3.png
-      geom 100
-      border 2 3 2 2
-    end image
-end
-
-%include "menus.cfg"
-
-# This section *must* come after the menu definitions if you want
-# menu actions to work.  C'est la vie. :-)
-#
-# Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
-#
-begin actions
-    bind ctrl button1 to string "\e]5;\a"
-    bind ctrl button2 to string "\e[?30t"
-    bind ctrl button3 to menu Eterm
-    bind ctrl shift button3 to string "\e]6;14\a"
-end actions
-
-# This section must also come after the menus if you want any buttons
-# to launch menus.  (If not, it can go anywhere.)
-begin button_bar
-
-# Specify a font.  The default buttonbar font is the default terminal
-# font as defined in the attributes section above.
-    font "-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1"
-
-# Add a button.  The syntax is:
-#   button <text> [ icon <filename> ] action { string | echo | menu } <parameter>
-#
-    button Eterm action menu "Eterm Operations"
-    button Font action menu Font
-    button Background action menu Background
-    button Terminal action menu Terminal
-    rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
-    rbutton icon exit.png action script "exit"
-end button_bar
-
-# The XIM support options.
-# input_method: set the name of your favorate input method program
-# preedit_type: OverTheSpot or OffTheSpot or Root
-#  begin xim
-#    input_method Ami
-#    preedit_type OverTheSpot
-#  end xim
-
-# Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
-# "off", or "false" for FALSE.
-begin toggles
-
-# If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
-    map_alert on
-
-# If true, Eterm will flash rather than sending a beep.
-    visual_bell off
-
-# If true, Eterm will prepend '-' to the shell name when calling it.
-    login_shell true
-
-# If true, Eterm will display the scroll bar
-    scrollbar on
-
-# If true, Eterm will attempt to make an entry in the utmp file to record the
-# login information.  Eterm *must* run privileged to do this.
-    utmp_logging on
-
-# If true, Eterm will handle the Meta (Alt) + keypress to set the 8th bit.
-# If false, Eterm will handle the Meta + keypress as an escape prefix. (default)
-#    meta8 false
-
-# If true, Eterm will start iconified.
-    iconic false
-
-# If true, Eterm will jump to the bottom of the window when something is output
-# to the terminal.
-    home_on_output 1
-
-# If true, Eterm will jump to the bottom of the window when a key is pressed.
-    home_on_input 1
-
-# If true, Eterm will put the scrollbar on the right of the window (default is left).
-    scrollbar_right true
-
-# If true, the scrollbar will have no trough.
-    scrollbar_floating false
-
-# If true, Eterm will run with no window borders.
-    borderless false
-
-end toggles
-
-begin keyboard
-
-# Use the supplied keysym to reduce/enlarge the font
-    smallfont_key LessThan
-    bigfont_key GreaterThan
-
-# You can also associate a given keysym (0xff00 - 0xffff) with a string
-#    keysym 0xffff "\r\n\e\007\t"
-
-# Greek keyboard mode.  First the word "greek", then its boolean
-# state, then its mode (either "iso" or "ibm").
-#    greek off iso
-end keyboard
-
-begin misc
-
-# The command to which to pipe print requests (printscreen)
-#    print_pipe "lpr"
-
-# The number of lines in the scrollback buffer.  More lines, more memory needed.
-    save_lines 1024
-
-# The characters to use as word delimiters for double-click selection
-    cut_chars "\t\\\`\\\"\'&() *,;<=>?@[]{|}"
-
-# Defines the width of the border between the terminal window and the client window.
-# (Default is 5).
-    border_width 5
-
-# Defines the number of pixels to add between lines (default is 0).
-#    line_space 2
-
-# Value to use for $TERM
-    term_name Eterm
-
-# Program to exec (intended for use with themes)
-#    exec foo
-
-end misc
diff --git a/themes/emacs/.cvsignore b/themes/emacs/.cvsignore
deleted file mode 100644
index 4674fba..0000000
--- a/themes/emacs/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-theme.cfg
diff --git a/themes/emacs/menus.cfg b/themes/emacs/menus.cfg
deleted file mode 100644
index 6ff1fbf..0000000
--- a/themes/emacs/menus.cfg
+++ /dev/null
@@ -1,1142 +0,0 @@
-<Eterm-0.9.1>
-begin menu
-  title Font
-  font -*-times-bold-r-normal--14-*-*-*-*-*-iso8859-1
-  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 Transparency
-  begin menuitem
-    text "Force Update"
-    action string "\e]6;3\a"
-  end
-  begin menuitem
-    text "Toggle Desktop Watching"
-    action string "\e]6;4\a"
-  end
-  begin menuitem
-    text "Toggle Transparency"
-    action string "\e]6;0\a"
-  end
-end
-begin menu
-  title Tiled
-  begin menuitem
-    text "70's Marble"
-    action string "\e]20;70s_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "7m"
-    action string "\e]20;7m.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Atoms"
-    action string "\e]20;atoms.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Backwave"
-    action string "\e]20;backwave.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Black Stone"
-    action string "\e]20;blackstone.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Ether"
-    action string "\e]20;ether_blue.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Marble"
-    action string "\e]20;blue_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Maze"
-    action string "\e]20;blue_maze.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Monday"
-    action string "\e]20;021.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Puzzle"
-    action string "\e]20;026.png;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Rock"
-    action string "\e]20;blue_rock.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Circuit"
-    action string "\e]20;circuit.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Cyber Playground"
-    action string "\e]20;cyber_bg.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dark Marble"
-    action string "\e]20;dark_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dimples"
-    action string "\e]20;014.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dirt"
-    action string "\e]20;dirt.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Ether"
-    action string "\e]20;ether.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger 1"
-    action string "\e]20;giger1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger 2"
-    action string "\e]20;giger2.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Gray Matter"
-    action string "\e]20;22.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Gray Waves"
-    action string "\e]20;59.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Green Ether"
-    action string "\e]20;ether_green.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Lava"
-    action string "\e]20;004.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Mudslide"
-    action string "\e]20;35.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "On Stage"
-    action string "\e]20;lightb1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Clouds"
-    action string "\e]20;7.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Glass"
-    action string "\e]20;purpgls.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Rain"
-    action string "\e]20;024.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Stuff"
-    action string "\e]20;purple_stuff.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Rainstorm"
-    action string "\e]20;15.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Stucco"
-    action string "\e]20;red_stucco.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Whisper"
-    action string "\e]20;40.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Shale"
-    action string "\e]20;shale.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Soft Marble"
-    action string "\e]20;soft.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Space"
-    action string "\e]20;space.png;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Starry Night"
-    action string "\e]20;starry.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Whirlpool"
-    action string "\e]20;015.jpg;0x0+0+0:tile\a"
-  end
-end
-begin menu
-  title Scaled
-  begin menuitem
-    text "After the Storm"
-    action string "\e]20;after_the_storm.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Alien Spheres"
-    action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ascension"
-    action string "\e]20;ascension.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Atlantis"
-    action string "\e]20;atlantis.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Bladerunner"
-    action string "\e]20;Bladerunner-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Canyon"
-    action string "\e]20;Canyon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cave Fire"
-    action string "\e]20;Cavefire-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Citidel"
-    action string "\e]20;citidel.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Crater Lake"
-    action string "\e]20;crater_lake.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cronus"
-    action string "\e]20;cronus.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Daughter"
-    action string "\e]20;Daughter.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Dragon"
-    action string "\e]20;Dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "DVXVB"
-    action string "\e]20;dvxvb.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Evocation"
-    action string "\e]20;Evocation.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Fourth Day"
-    action string "\e]20;fourthday.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gaia"
-    action string "\e]20;gaia.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Galleon"
-    action string "\e]20;galleon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gorgon"
-    action string "\e]20;gorgon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ice Moon"
-    action string "\e]20;icemoon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lake of Fire"
-    action string "\e]20;lake_of_fire.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lighthouse"
-    action string "\e]20;lighthouse.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Neopolis"
-    action string "\e]20;Neopolis-horizon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Night of the Dragon"
-    action string "\e]20;night_of_the_dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Planet A"
-    action string "\e]20;planeta.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Pond"
-    action string "\e]20;pond.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Poseidon"
-    action string "\e]20;poseidon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ripple"
-    action string "\e]20;ripple.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Roche Limit"
-    action string "\e]20;roche_limit.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Silence"
-    action string "\e]20;silence.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Taken Field"
-    action string "\e]20;the_taken_field.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Urmane"
-    action string "\e]20;urmane3.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Wasteland"
-    action string "\e]20;wasteland.jpg;100x100+50+50\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;;:scale"
-  end
-  begin menuitem
-    text "Proportional Scale"
-    action string "\e]20;;: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 "Transparency"
-    action submenu "Transparency"
-  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 Buffers
-  begin menuitem
-    text "List all"
-    action echo "C-xC-b"
-  end
-  begin menuitem
-    text "Change to other"
-    action echo "C-xo"
-  end
-  begin menuitem
-    text "Change to..."
-    action echo "C-xb"
-  end
-end
-
-begin menu
-  title Files
-  begin menuitem
-    text "Open File..."
-    action echo "C-xC-f"
-  end
-  begin menuitem
-    text "Open Directory..."
-    action echo "C-xd"
-  end
-  begin menuitem
-    text "Save Buffer"
-    action echo "C-xC-s"
-  end
-  begin menuitem
-    text "Save Buffer As..."
-    action echo "C-xC-w"
-  end
-  begin menuitem
-    text "Revert Buffer"
-    action echo "M-xrevert-buffer\r"
-  end
-  begin menuitem
-    text "Insert File..."
-    action echo "C-xi"
-  end
-  begin menuitem
-    text "Kill Current Buffer"
-    action echo "M-xkill-this-buffer\r"
-  end
-  -
-  begin menuitem
-    text "Make New Frame"
-    action echo "C-x52"
-  end
-  begin menuitem
-    text "Open New Display..."
-    action echo "M-xmake-frame-on-display"
-  end
-  begin menuitem
-    text "Delete Frame"
-    action echo "C-x50"
-  end
-  begin menuitem
-    text "Split Window"
-    action echo "C-x2"
-  end
-  begin menuitem
-    text "One Window"
-    action echo "C-x1"
-  end
-  -
-  begin menuitem
-    text "Exit Emacs"
-    action echo "C-xC-c"
-  end
-end
-begin menu
-  title Edit
-  begin menuitem
-    text "Undo"
-    action echo "C-_"
-  end
-  -
-  begin menuitem
-    text "Set Mark"
-    action echo "C-\40"
-  end
-  begin menuitem
-    text "Cut"
-    action echo "C-w"
-  end
-  begin menuitem
-    text "Copy"
-    action echo "M-w"
-  end
-  begin menuitem
-    text "Paste"
-    action echo "C-y"
-  end
-  begin menuitem
-    text "Clear"
-    action echo "M-xdelete-region"
-  end
-  -
-  begin menuitem
-    text "Cut Rectangle"
-    action echo "M-xkill-rectangle"
-  end
-  begin menuitem
-    text "Clear Rectangle"
-    action echo "M-xclear-rectangle"
-  end
-end
-begin menu
-  title Search
-  begin menuitem
-    text "Search..."
-    action echo "C-s"
-  end
-  begin menuitem
-    text "Regexp Search..."
-    action echo "M-xisearch-forward-regexp"
-  end
-  begin menuitem
-    text "Search Backward..."
-    action echo "C-r"
-  end
-  begin menuitem
-    text "Regexp Search Backward..."
-    action echo "M-xisearch-backward-regexp"
-  end
-  -
-  begin menuitem
-    text "Repeat Search"
-    action echo "M-xisearch-repeat-forward"
-  end
-  begin menuitem
-    text "Repeat Regexp Search"
-    action echo "M-xisearch-repeat-forward"
-  end
-  begin menuitem
-    text "Repeat Search Backward"
-    action echo "M-xisearch-repeat-backward"
-  end
-  begin menuitem
-    text "Repeat Regexp Search Backward"
-    action echo "M-xisearch-repeat-backward"
-  end
-  -
-  begin menuitem
-    text "Replace String..."
-    action echo "M-xreplace-string"
-  end
-  begin menuitem
-    text "Replace Regexp..."
-    action echo "M-xreplace-regexp"
-  end
-  begin menuitem
-    text "Query Replace String..."
-    action echo "M-xquery-replace"
-  end
-  begin menuitem
-    text "Query Replace Regexp..."
-    action echo "M-xquery-replace-regexp"
-  end
-  -
-  begin menuitem
-    text "Goto Line..."
-    action echo "M-xgoto-line"
-  end
-end
-begin menu
-  title Help
-  begin menuitem
-    text "Customize"
-    action echo "M-xcustomize"
-  end
-  begin menuitem
-    text "Emacs News"
-    action echo "M-xview-emacs-news"
-  end
-  begin menuitem
-    text "Emacs FAQ"
-    action echo "M-xview-emacs-FAQ"
-  end
-  begin menuitem
-    text "Info Browser"
-    action echo "M-xinfo"
-  end
-  -
-  begin menuitem
-    text "Describe Mode"
-    action echo "M-xdescribe-mode"
-  end
-  begin menuitem
-    text "Command Apropos..."
-    action echo "M-xcommand-apropos"
-  end
-  begin menuitem
-    text "List Keybindings"
-    action echo "M-xdescribe-bindings"
-  end
-  begin menuitem
-    text "Describe Key..."
-    action echo "M-xdescribe-key"
-  end
-  begin menuitem
-    text "Describe Function..."
-    action echo "M-xdescribe-function"
-  end
-  begin menuitem
-    text "Describe Variable..."
-    action echo "M-xdescribe-variable"
-  end
-  -
-  begin menuitem
-    text "Man..."
-    action echo "M-xman"
-  end
-  begin menuitem
-    text "Emacs Tutorial"
-    action echo "M-xhelp-with-tutorial"
-  end
-  begin menuitem
-    text "Find Lisp Packages..."
-    action echo "M-xfinder-by-keyword"
-  end
-  begin menuitem
-    text "Send Bug Report..."
-    action echo "M-xreport-emacs-bug"
-  end
-  -
-  begin menuitem
-    text "Show Version"
-    action echo "M-xversion"
-  end
-end
-
-# This is the menu that gets called by Ctrl-Button3
-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 "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/emacs/theme.cfg.in b/themes/emacs/theme.cfg.in
deleted file mode 100644
index 1dba62e..0000000
--- a/themes/emacs/theme.cfg.in
+++ /dev/null
@@ -1,401 +0,0 @@
-<Eterm-0.9.1>
-# ^- This must be the first line of any Eterm config file!
-# Format is:  <Eterm-VERSION>  where VERSION is replaced by
-#                              the version it was written for,
-#                              minus the "DR-" if any.
-#
-# This is a sample Eterm config file.
-#
-# As always, the authors guarantee absolutely nothing and take
-# no responsibility for anything that might happen to you, your
-# computer, your dog, your sex life, or anyone or anything else
-# directly or indirectly through the use of, or inability to use,
-# this program.  Use at your OWN risk.
-
-# Define the color properties
-begin color
-
-# Foreground, background, cursor, scrollbar, pointer colors
-    foreground #aaaaaa
-    background black
-    cursor #ffff00
-    cursor_text #880000
-    pointer white
-
-# video attribute can either be "normal" or "reverse"
-    video normal
-
-# Redefine the 16 basic colors, if you really feel the need
-# First word is "color", next is the number (0-15, BD, or UL),
-# then the values for red, green, and blue separated by spaces
-# Numbers are base 10 unless preceded by "0x" (base 16) or '0'
-# (base 8).  Alternatively, you can use color names or #xxxxxx
-# format.
-
-# The colors below are taken from Rasterman's .Xdefaults file.  They are intended to
-# display ANSI art properly when combined with a good ANSI-art font (like vga or
-# Rasterman's nexus font).
-    color  0 0    0    0
-    color  1 0xaa 0    0
-    color  2 0    0210 0
-    color  3 0xaa 0x55 0x22
-    color  4 0    0    0xaa
-    color  5 0xaa 0    0xaa
-    color  6 0    0xaa 0xaa
-    color  7 0xaa 0xaa 0xaa
-    color  8 0x44 0x44 0x44
-    color  9 0xff 0x44 0x44
-    color 10 0x44 0xff 0x44
-    color 11 0xff 0xff 0x44
-    color 12 0x44 0x44 0xff
-    color 13 0xff 0x44 0xff
-    color 14 0x44 0xff 0xff
-    color 15 #ffffff
-    color bd #ffffff
-    color ul #ffffff
-
-# This ends the color section.  Any text after the word "end" is
-# assumed to be a comment and ignored.
-end color
-
-# The X11 attributes section.  Should be fairly self-explanatory,
-# but if not, consult the X man page.
-begin attributes
-
-# Geometry == widthxheight+x_offset+y_offset, offsets from top left
-#             if +, bottom right if -
-#    geometry 132x50+100+100
-    title "%appname() -- Emacs Theme"
-    name "GNU Emacs"
-#    iconname Eterm
-
-# Set the fonts.  These must be monospace fonts.  The values shown are
-# the Eterm defaults.  The "bold" font is the font used if color BD has
-# not been set and Eterm cannot map the foreground color to one of the
-# high-intensity colors (8-15).
-    font default @DEF_FONT_IDX@
-    font 0 @FONT0@
-    font 1 @FONT1@
-    font 2 @FONT2@
-    font 3 @FONT3@
-    font 4 @FONT4@
-    font 5 10x20
-    font 6 12x24
-#    font bold 7x14
-end attributes
-
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-begin multichar
-    font 0 @MFONT0@
-    font 1 @MFONT1@
-    font 2 @MFONT2@
-    font 3 @MFONT3@
-    font 4 @MFONT4@
-    encoding @MULTICHAR_ENCODING@
-end multichar
-
-# Define the imageclasses.
-begin imageclasses
-
-# You must define this before setting any images that use it.  This is the $PATH-style variable
-# that determines where Eterm looks for image files.
-    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PKGDATADIR@/pix/"
-
-# If you want a different icon than the standard Eterm one, set this.
-#   icon Eterm.xpm
-
-# This is the background animator.  See the man page for the syntax.
-#   anim 3 foo1 foo2 foo3
-
-# Here we define an image.
-    begin image
-
-# The first thing you set when defining an image MUST be the type.  No type, no dice.  The type
-# should be one of the following:  background, up_arrow, down_arrow, left_arrow, right_arrow,
-#                                  trough, anchor, menu, or submenu
-      type background
-
-# Next you should set the state.  This is either normal, selected, or clicked.
-      state normal
-
-# Here you set the file.  You can also set the geometry string here if you follow the filename with
-# an @ sign.  That way, you can include the geometries in your pixmaps.list file.
-      file %random(`cat pixmaps.list`)
-
-# The mode line.  This defines the startup mode for the image, as well as what modes are allowed.
-# Valid modes are "image" (to display the image file), "trans" (to be transparent), or "viewport"
-# (for viewport mode).  Syntax is "mode <startup_mode> allow <allowed_modes>".
-      mode image allow image trans viewport auto
-
-# Set the image border.  This is a portion of the image which will be kept at its actual size when
-# scaling.  Use this for beveled images (buttons, etc.).
-      border 0 0 0 0
-
-# Th-th-th-th-that's all folks.
-    end image
-
-# The rest of the images.
-    begin image
-      type trough
-      mode image allow image trans viewport auto
-      state normal
-      color black #666666
-      file bar_vertical_3.png
-# Here is how you specify the geometry string separately.  See the man page for its syntax.
-      geom 100
-      border 2 2 2 3
-    end image
-    begin image
-      type anchor
-      mode image allow image auto
-      state normal
-      color black #666666
-      file bar_vertical_1.png
-      geom 100
-      border 2 2 2 3
-      state selected
-      file bar_vertical_2.png
-      geom 100
-      border 2 2 2 3
-    end image
-    begin image
-      type thumb
-      mode image allow image auto
-      state normal
-      color black #666666
-      file thumb_1.png
-      geom 100
-      border 3 3 3 3
-      state selected
-      file thumb_2.png
-      geom 100
-      border 3 3 3 3
-    end image
-    begin image
-      type up_arrow
-      mode image allow image auto
-      state normal
-      color black #666666
-      file button_arrow_up_1.png
-      geom 100
-      border 2 2 2 2
-      state selected
-      file button_arrow_up_2.png
-      geom 100
-      border 2 2 2 2
-      state clicked
-      file button_arrow_up_3.png
-      geom 100
-      border 2 2 2 2
-    end image
-    begin image
-      type down_arrow
-      mode image allow image auto
-      state normal
-      color black #666666
-      file button_arrow_down_1.png
-      geom 100
-      border 2 2 2 2
-      state selected
-      file button_arrow_down_2.png
-      geom 100
-      border 2 2 2 2
-      state clicked
-      file button_arrow_down_3.png
-      geom 100
-      border 2 2 2 2
-    end image
-    begin image
-      type menu
-      mode image allow image auto
-      state normal
-      color black #999999
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 3
-      state selected
-      file bar_horizontal_2.png
-      geom 100
-      border 2 3 2 3
-    end image
-    begin image
-      type submenu
-      mode image allow image auto
-      state normal
-      color black #999999
-      file menu1.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-      state selected
-      file menu2.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-      state clicked
-      file menu3.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-    end image
-    begin image
-      type button_bar
-      mode image allow image auto
-      state normal
-      color black #999999
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 2
-      state disabled
-      color white #333333
-      cmod image 0xc0
-      border 2 3 2 2
-    end image
-    begin image
-      type button
-      mode image allow image auto
-      state normal
-      color black #cccccc
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 2
-      state selected
-      file bar_horizontal_2.png
-      geom 100
-      border 2 3 2 2
-      state clicked
-      file bar_horizontal_3.png
-      geom 100
-      border 2 3 2 2
-    end image
-end
-
-%include "menus.cfg"
-
-# This section *must* come after the menu definitions if you want
-# menu actions to work.  C'est la vie. :-)
-#
-# Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
-#
-begin actions
-    bind ctrl button1 to string "\e]5;\a"
-    bind ctrl button2 to string "\e[?30t"
-    bind ctrl button3 to menu Eterm
-    bind ctrl shift button3 to string "\e]6;14\a"
-end actions
-
-# This section must also come after the menus if you want any buttons
-# to launch menus.  (If not, it can go anywhere.)
-begin button_bar
-
-# Specify a font.  The default buttonbar font is the default terminal
-# font as defined in the attributes section above.
-    font "-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1"
-
-# Add a button.  The syntax is:
-#   button <text> [ icon <filename> ] action { string | echo | menu } <parameter>
-#
-    button Eterm action menu Eterm
-    button Buffers action menu Buffers
-    button Files action menu Files
-    button Edit action menu Edit
-    button Search action menu Search
-    button Help action menu Help
-    rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
-    rbutton icon exit.png action script "exit"
-end button_bar
-
-# The XIM support options.
-# input_method: set the name of your favorate input method program
-# preedit_type: OverTheSpot or OffTheSpot or Root
-#  begin xim
-#    input_method Ami
-#    preedit_type OverTheSpot
-#  end xim
-
-# Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
-# "off", or "false" for FALSE.
-begin toggles
-
-# If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
-    map_alert on
-
-# If true, Eterm will flash rather than sending a beep.
-    visual_bell off
-
-# If true, Eterm will prepend '-' to the shell name when calling it.
-    login_shell true
-
-# If true, Eterm will display the scroll bar
-    scrollbar on
-
-# If true, Eterm will attempt to make an entry in the utmp file to record the
-# login information.  Eterm *must* run privileged to do this.
-    utmp_logging on
-
-# If true, Eterm will handle the Meta (Alt) + keypress to set the 8th bit.
-# If false, Eterm will handle the Meta + keypress as an escape prefix. (default)
-#    meta8 false
-
-# If true, Eterm will start iconified.
-    iconic false
-
-# If true, Eterm will jump to the bottom of the window when something is output
-# to the terminal.
-    home_on_output 1
-
-# If true, Eterm will jump to the bottom of the window when a key is pressed.
-    home_on_input 1
-
-# If true, Eterm will put the scrollbar on the right of the window (default is left).
-    scrollbar_right true
-
-# If true, the scrollbar will have no trough.
-    scrollbar_floating false
-
-# If true, Eterm will run with no window borders.
-    borderless false
-
-end toggles
-
-begin keyboard
-
-# Use the supplied keysym to reduce/enlarge the font
-    smallfont_key LessThan
-    bigfont_key GreaterThan
-
-# You can also associate a given keysym (0xff00 - 0xffff) with a string
-#    keysym 0xffff "\r\n\e\007\t"
-
-# Greek keyboard mode.  First the word "greek", then its boolean
-# state, then its mode (either "iso" or "ibm").
-#    greek off iso
-end keyboard
-
-begin misc
-
-# The command to which to pipe print requests (printscreen)
-#    print_pipe "lpr"
-
-# The number of lines in the scrollback buffer.  More lines, more memory needed.
-    save_lines 1024
-
-# The characters to use as word delimiters for double-click selection
-    cut_chars "\t\\\`\\\"\'&() *,;<=>?@[]{|}"
-
-# Defines the width of the border between the terminal window and the client window.
-# (Default is 5).
-    border_width 5
-
-# Defines the number of pixels to add between lines (default is 0).
-#    line_space 2
-
-# Value to use for $TERM
-    term_name Eterm
-
-# Program to exec (intended for use with themes)
-    exec emacs -nw
-
-end misc
diff --git a/themes/irc/.cvsignore b/themes/irc/.cvsignore
deleted file mode 100644
index 4674fba..0000000
--- a/themes/irc/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-theme.cfg
diff --git a/themes/irc/menus.cfg b/themes/irc/menus.cfg
deleted file mode 100644
index 6ef8d1c..0000000
--- a/themes/irc/menus.cfg
+++ /dev/null
@@ -1,932 +0,0 @@
-<Eterm-0.9.1>
-begin menu
-  title Font
-  font -*-times-bold-r-normal--14-*-*-*-*-*-iso8859-1
-  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 Transparency
-  begin menuitem
-    text "Force Update"
-    action string "\e]6;3\a"
-  end
-  begin menuitem
-    text "Toggle Desktop Watching"
-    action string "\e]6;4\a"
-  end
-  begin menuitem
-    text "Toggle Transparency"
-    action string "\e]6;0\a"
-  end
-end
-begin menu
-  title Tiled
-  begin menuitem
-    text "70's Marble"
-    action string "\e]20;70s_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "7m"
-    action string "\e]20;7m.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Atoms"
-    action string "\e]20;atoms.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Backwave"
-    action string "\e]20;backwave.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Black Stone"
-    action string "\e]20;blackstone.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Ether"
-    action string "\e]20;ether_blue.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Marble"
-    action string "\e]20;blue_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Maze"
-    action string "\e]20;blue_maze.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Monday"
-    action string "\e]20;021.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Puzzle"
-    action string "\e]20;026.png;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Rock"
-    action string "\e]20;blue_rock.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Circuit"
-    action string "\e]20;circuit.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Cyber Playground"
-    action string "\e]20;cyber_bg.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dark Marble"
-    action string "\e]20;dark_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dimples"
-    action string "\e]20;014.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dirt"
-    action string "\e]20;dirt.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Ether"
-    action string "\e]20;ether.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger 1"
-    action string "\e]20;giger1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger 2"
-    action string "\e]20;giger2.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Gray Matter"
-    action string "\e]20;22.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Gray Waves"
-    action string "\e]20;59.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Green Ether"
-    action string "\e]20;ether_green.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Lava"
-    action string "\e]20;004.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Mudslide"
-    action string "\e]20;35.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "On Stage"
-    action string "\e]20;lightb1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Clouds"
-    action string "\e]20;7.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Glass"
-    action string "\e]20;purpgls.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Rain"
-    action string "\e]20;024.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Stuff"
-    action string "\e]20;purple_stuff.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Rainstorm"
-    action string "\e]20;15.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Stucco"
-    action string "\e]20;red_stucco.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Whisper"
-    action string "\e]20;40.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Shale"
-    action string "\e]20;shale.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Soft Marble"
-    action string "\e]20;soft.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Space"
-    action string "\e]20;space.png;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Starry Night"
-    action string "\e]20;starry.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Whirlpool"
-    action string "\e]20;015.jpg;0x0+0+0:tile\a"
-  end
-end
-begin menu
-  title Scaled
-  begin menuitem
-    text "After the Storm"
-    action string "\e]20;after_the_storm.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Alien Spheres"
-    action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ascension"
-    action string "\e]20;ascension.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Atlantis"
-    action string "\e]20;atlantis.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Bladerunner"
-    action string "\e]20;Bladerunner-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Canyon"
-    action string "\e]20;Canyon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cave Fire"
-    action string "\e]20;Cavefire-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Citidel"
-    action string "\e]20;citidel.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Crater Lake"
-    action string "\e]20;crater_lake.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cronus"
-    action string "\e]20;cronus.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Daughter"
-    action string "\e]20;Daughter.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Dragon"
-    action string "\e]20;Dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "DVXVB"
-    action string "\e]20;dvxvb.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Evocation"
-    action string "\e]20;Evocation.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Fourth Day"
-    action string "\e]20;fourthday.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gaia"
-    action string "\e]20;gaia.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Galleon"
-    action string "\e]20;galleon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gorgon"
-    action string "\e]20;gorgon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ice Moon"
-    action string "\e]20;icemoon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lake of Fire"
-    action string "\e]20;lake_of_fire.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lighthouse"
-    action string "\e]20;lighthouse.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Neopolis"
-    action string "\e]20;Neopolis-horizon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Night of the Dragon"
-    action string "\e]20;night_of_the_dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Planet A"
-    action string "\e]20;planeta.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Pond"
-    action string "\e]20;pond.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Poseidon"
-    action string "\e]20;poseidon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ripple"
-    action string "\e]20;ripple.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Roche Limit"
-    action string "\e]20;roche_limit.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Silence"
-    action string "\e]20;silence.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Taken Field"
-    action string "\e]20;the_taken_field.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Urmane"
-    action string "\e]20;urmane3.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Wasteland"
-    action string "\e]20;wasteland.jpg;100x100+50+50\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;;:scale"
-  end
-  begin menuitem
-    text "Proportional Scale"
-    action string "\e]20;;: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 "Transparency"
-    action submenu "Transparency"
-  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 Operations"
-  begin menuitem
-    text "Version"
-    action string "\e[8n"
-  end
-  begin menuitem
-    text "Status"
-    action string "\e[9n"
-  end
-  separator
-  begin menuitem
-    text "Save Settings..."
-    action script "save()"
-  end
-  begin menuitem
-    text "Exit"
-    action script "exit"
-  end
-end
-
-# This is the menu that gets called by Ctrl-Button3
-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 Window..."
-    action script "spawn(Eterm)"
-  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/irc/theme.cfg.in b/themes/irc/theme.cfg.in
deleted file mode 100644
index 3578f38..0000000
--- a/themes/irc/theme.cfg.in
+++ /dev/null
@@ -1,406 +0,0 @@
-<Eterm-0.9.1>
-# ^- This must be the first line of any Eterm config file!
-# Format is:  <Eterm-VERSION>  where VERSION is replaced by
-#                              the version it was written for,
-#                              minus the "DR-" if any.
-#
-# This is a sample Eterm config file.
-#
-# As always, the authors guarantee absolutely nothing and take
-# no responsibility for anything that might happen to you, your
-# computer, your dog, your sex life, or anyone or anything else
-# directly or indirectly through the use of, or inability to use,
-# this program.  Use at your OWN risk.
-
-# Define the color properties
-begin color
-
-# Foreground, background, cursor, scrollbar, pointer colors
-    foreground #aaaaaa
-    background black
-    cursor #ffff00
-    cursor_text #880000
-    pointer white
-
-# video attribute can either be "normal" or "reverse"
-    video normal
-
-# Redefine the 16 basic colors, if you really feel the need
-# First word is "color", next is the number (0-15, BD, or UL),
-# then the values for red, green, and blue separated by spaces
-# Numbers are base 10 unless preceded by "0x" (base 16) or '0'
-# (base 8).  Alternatively, you can use color names or #xxxxxx
-# format.
-
-# The colors below are taken from Rasterman's .Xdefaults file.  They are intended to
-# display ANSI art properly when combined with a good ANSI-art font (like vga or
-# Rasterman's nexus font).
-    color  0 0    0    0
-    color  1 0xaa 0    0
-    color  2 0    0210 0
-    color  3 0xaa 0x55 0x22
-    color  4 0    0    0xaa
-    color  5 0xaa 0    0xaa
-    color  6 0    0xaa 0xaa
-    color  7 0xaa 0xaa 0xaa
-    color  8 0x44 0x44 0x44
-    color  9 0xff 0x44 0x44
-    color 10 0x44 0xff 0x44
-    color 11 0xff 0xff 0x44
-    color 12 0x44 0x44 0xff
-    color 13 0xff 0x44 0xff
-    color 14 0x44 0xff 0xff
-    color 15 #ffffff
-    color bd #ffffff
-    color ul #ffffff
-
-# This ends the color section.  Any text after the word "end" is
-# assumed to be a comment and ignored.
-end color
-
-# The X11 attributes section.  Should be fairly self-explanatory,
-# but if not, consult the X man page.
-begin attributes
-
-# Geometry == widthxheight+x_offset+y_offset, offsets from top left
-#             if +, bottom right if -
-#    geometry 132x50+100+100
-    title "%appname() -- IRC Theme"
-    name IRC
-#    iconname Eterm
-
-# Set the fonts.  These must be monospace fonts.  The values shown are
-# the Eterm defaults.  The "bold" font is the font used if color BD has
-# not been set and Eterm cannot map the foreground color to one of the
-# high-intensity colors (8-15).
-    font default @DEF_FONT_IDX@
-    font 0 @FONT0@
-    font 1 @FONT1@
-    font 2 shine
-    font 3 @FONT3@
-    font 4 @FONT4@
-    font 5 8x13
-    font 6 9x15
-    font 7 10x20
-    font 8 12x24
-#    font bold 7x14
-end attributes
-
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-begin multichar
-    font 0 @MFONT0@
-    font 1 @MFONT1@
-    font 2 @MFONT2@
-    font 3 @MFONT3@
-    font 4 @MFONT4@
-    encoding @MULTICHAR_ENCODING@
-end multichar
-
-# Define the imageclasses.
-begin imageclasses
-
-# You must define this before setting any images that use it.  This is the $PATH-style variable
-# that determines where Eterm looks for image files.
-    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PKGDATADIR@/pix/"
-
-# If you want a different icon than the standard Eterm one, set this.
-#   icon Eterm.xpm
-
-# This is the background animator.  See the man page for the syntax.
-#   anim 3 foo1 foo2 foo3
-
-# Here we define an image.
-    begin image
-
-# The first thing you set when defining an image MUST be the type.  No type, no dice.  The type
-# should be one of the following:  background, up_arrow, down_arrow, left_arrow, right_arrow,
-#                                  trough, anchor, menu, or submenu
-      type background
-
-# The mode line.  This defines the startup mode for the image, as well as what modes are allowed.
-# Valid modes are "image" (to display the image file), "trans" (to be transparent), or "viewport"
-# (for viewport mode).  Syntax is "mode <startup_mode> allow <allowed_modes>".
-      mode image allow image trans viewport auto
-
-# Next you should set the state.  This is either normal, selected, or clicked.
-      state normal
-
-# Here you set the file.  You can also set the geometry string here if you follow the filename with
-# an @ sign.  That way, you can include the geometries in your pixmaps.list file.
-      file %random(`cat pixmaps.list`)
-
-# Set the image border.  This is a portion of the image which will be kept at its actual size when
-# scaling.  Use this for beveled images (buttons, etc.).
-      border 0 0 0 0
-
-# Th-th-th-th-that's all folks.
-    end image
-
-# The rest of the images.
-    begin image
-      type trough
-      mode image allow image trans viewport auto
-      state normal
-      color black #666666
-      file bar_vertical_3.png
-# Here is how you specify the geometry string separately.  See the man page for its syntax.
-      geom 100
-      border 2 2 2 3
-    end image
-    begin image
-      type anchor
-      mode image allow image auto
-      state normal
-      color black #666666
-      file bar_vertical_1.png
-      geom 100
-      border 2 2 2 3
-      state selected
-      file bar_vertical_2.png
-      geom 100
-      border 2 2 2 3
-    end image
-    begin image
-      type thumb
-      mode image allow image auto
-      state normal
-      color black #666666
-      file thumb_1.png
-      geom 100
-      border 3 3 3 3
-      state selected
-      file thumb_2.png
-      geom 100
-      border 3 3 3 3
-    end image
-    begin image
-      type up_arrow
-      mode image allow image auto
-      state normal
-      color black #666666
-      file button_arrow_up_1.png
-      geom 100
-      border 2 2 2 2
-      state selected
-      file button_arrow_up_2.png
-      geom 100
-      border 2 2 2 2
-      state clicked
-      file button_arrow_up_3.png
-      geom 100
-      border 2 2 2 2
-    end image
-    begin image
-      type down_arrow
-      mode image allow image auto
-      state normal
-      color black #666666
-      file button_arrow_down_1.png
-      geom 100
-      border 2 2 2 2
-      state selected
-      file button_arrow_down_2.png
-      geom 100
-      border 2 2 2 2
-      state clicked
-      file button_arrow_down_3.png
-      geom 100
-      border 2 2 2 2
-    end image
-    begin image
-      type menu
-      mode image allow image auto
-      state normal
-      color black #999999
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 3
-      state selected
-      file bar_horizontal_2.png
-      geom 100
-      border 2 3 2 3
-    end image
-    begin image
-      type submenu
-      mode image allow image auto
-      state normal
-      color black #999999
-      file menu1.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-      state selected
-      file menu2.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-      state clicked
-      file menu3.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-    end image
-    begin image
-      type button_bar
-      mode image allow image auto
-      state normal
-      color black #999999
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 2
-      state disabled
-      color white #333333
-      cmod image 0xc0
-      border 2 3 2 2
-    end image
-    begin image
-      type button
-      mode image allow image auto
-      state normal
-      color black #cccccc
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 2
-      state selected
-      file bar_horizontal_2.png
-      geom 100
-      border 2 3 2 2
-      state clicked
-      file bar_horizontal_3.png
-      geom 100
-      border 2 3 2 2
-    end image
-end
-
-%include "menus.cfg"
-
-# This section *must* come after the menu definitions if you want
-# menu actions to work.  C'est la vie. :-)
-#
-# Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
-#
-begin actions
-    bind ctrl button1 to string "\e]5;\a"
-    bind ctrl button2 to string "\e[?30t"
-    bind ctrl button3 to menu Eterm
-    bind ctrl shift button3 to string "\e]6;14\a"
-end actions
-
-# This section must also come after the menus if you want any buttons
-# to launch menus.  (If not, it can go anywhere.)
-begin button_bar
-
-# Specify a font.  The default buttonbar font is the default terminal
-# font as defined in the attributes section above.
-    font "-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1"
-
-# Add a button.  The syntax is:
-#   button <text> [ icon <filename> ] action { string | echo | menu } <parameter>
-#
-    button Eterm action menu "Eterm Operations"
-    button Font action menu Font
-    button Background action menu Background
-    button Terminal action menu Terminal
-    rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
-    rbutton icon exit.png action script "exit"
-end button_bar
-
-# The XIM support options.
-# input_method: set the name of your favorate input method program
-# preedit_type: OverTheSpot or OffTheSpot or Root
-#  begin xim
-#    input_method Ami
-#    preedit_type OverTheSpot
-#  end xim
-
-# Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
-# "off", or "false" for FALSE.
-begin toggles
-
-# If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
-    map_alert on
-
-# If true, Eterm will flash rather than sending a beep.
-    visual_bell off
-
-# If true, Eterm will prepend '-' to the shell name when calling it.
-    login_shell true
-
-# If true, Eterm will display the scroll bar
-    scrollbar on
-
-# If true, Eterm will attempt to make an entry in the utmp file to record the
-# login information.  Eterm *must* run privileged to do this.
-    utmp_logging on
-
-# If true, Eterm will handle the Meta (Alt) + keypress to set the 8th bit.
-# If false, Eterm will handle the Meta + keypress as an escape prefix. (default)
-#    meta8 false
-
-# If true, Eterm will start iconified.
-    iconic false
-
-# If true, Eterm will jump to the bottom of the window when something is output
-# to the terminal.
-    home_on_output 1
-
-# If true, Eterm will jump to the bottom of the window when a key is pressed.
-    home_on_input 1
-
-# If true, Eterm will put the scrollbar on the right of the window (default is left).
-    scrollbar_right true
-
-# If true, the scrollbar will have no trough.
-    scrollbar_floating false
-
-# If true, Eterm will run with no window borders.
-    borderless false
-
-# If true, Eterm will use a double-buffered background pixmap for drawing text.  This
-# makes redraws faster by reducing exposes, but it uses more memory.  If you have the
-# memory to spare, it's a good idea.
-#    double_buffer true
-
-end toggles
-
-begin keyboard
-
-# Use the supplied keysym to reduce/enlarge the font
-    smallfont_key LessThan
-    bigfont_key GreaterThan
-
-# You can also associate a given keysym (0xff00 - 0xffff) with a string
-#    keysym 0xffff "\r\n\e\007\t"
-
-# Greek keyboard mode.  First the word "greek", then its boolean
-# state, then its mode (either "iso" or "ibm").
-#    greek off iso
-end keyboard
-
-begin misc
-
-# The command to which to pipe print requests (printscreen)
-#    print_pipe "lpr"
-
-# The number of lines in the scrollback buffer.  More lines, more memory needed.
-    save_lines 1024
-
-# The characters to use as word delimiters for double-click selection
-    cut_chars "\t\\\`\\\"\'&() *,;<=>?@[]{|}"
-
-# Defines the width of the border between the terminal window and the client window.
-# (Default is 5).
-    border_width 5
-
-# Defines the number of pixels to add between lines (default is 0).
-#    line_space 2
-
-# Value to use for $TERM
-    term_name Eterm
-
-# Program to exec (intended for use with themes)
-    exec irc
-
-end misc
diff --git a/themes/mutt/.cvsignore b/themes/mutt/.cvsignore
deleted file mode 100644
index 4674fba..0000000
--- a/themes/mutt/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-theme.cfg
diff --git a/themes/mutt/menus.cfg b/themes/mutt/menus.cfg
deleted file mode 100644
index a301bbc..0000000
--- a/themes/mutt/menus.cfg
+++ /dev/null
@@ -1,1076 +0,0 @@
-<Eterm-0.9.1>
-begin menu
-  title Font
-  font -*-times-bold-r-normal--14-*-*-*-*-*-iso8859-1
-  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 Transparency
-  begin menuitem
-    text "Force Update"
-    action string "\e]6;3\a"
-  end
-  begin menuitem
-    text "Toggle Desktop Watching"
-    action string "\e]6;4\a"
-  end
-  begin menuitem
-    text "Toggle Transparency"
-    action string "\e]6;0\a"
-  end
-end
-begin menu
-  title Tiled
-  begin menuitem
-    text "70's Marble"
-    action string "\e]20;70s_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "7m"
-    action string "\e]20;7m.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Atoms"
-    action string "\e]20;atoms.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Backwave"
-    action string "\e]20;backwave.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Black Stone"
-    action string "\e]20;blackstone.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Ether"
-    action string "\e]20;ether_blue.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Marble"
-    action string "\e]20;blue_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Maze"
-    action string "\e]20;blue_maze.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Monday"
-    action string "\e]20;021.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Puzzle"
-    action string "\e]20;026.png;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Rock"
-    action string "\e]20;blue_rock.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Circuit"
-    action string "\e]20;circuit.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Cyber Playground"
-    action string "\e]20;cyber_bg.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dark Marble"
-    action string "\e]20;dark_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dimples"
-    action string "\e]20;014.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dirt"
-    action string "\e]20;dirt.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Ether"
-    action string "\e]20;ether.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger 1"
-    action string "\e]20;giger1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger 2"
-    action string "\e]20;giger2.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Gray Matter"
-    action string "\e]20;22.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Gray Waves"
-    action string "\e]20;59.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Green Ether"
-    action string "\e]20;ether_green.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Lava"
-    action string "\e]20;004.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Mudslide"
-    action string "\e]20;35.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "On Stage"
-    action string "\e]20;lightb1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Clouds"
-    action string "\e]20;7.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Glass"
-    action string "\e]20;purpgls.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Rain"
-    action string "\e]20;024.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Stuff"
-    action string "\e]20;purple_stuff.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Rainstorm"
-    action string "\e]20;15.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Stucco"
-    action string "\e]20;red_stucco.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Whisper"
-    action string "\e]20;40.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Shale"
-    action string "\e]20;shale.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Soft Marble"
-    action string "\e]20;soft.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Space"
-    action string "\e]20;space.png;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Starry Night"
-    action string "\e]20;starry.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Whirlpool"
-    action string "\e]20;015.jpg;0x0+0+0:tile\a"
-  end
-end
-begin menu
-  title Scaled
-  begin menuitem
-    text "After the Storm"
-    action string "\e]20;after_the_storm.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Alien Spheres"
-    action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ascension"
-    action string "\e]20;ascension.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Atlantis"
-    action string "\e]20;atlantis.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Bladerunner"
-    action string "\e]20;Bladerunner-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Canyon"
-    action string "\e]20;Canyon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cave Fire"
-    action string "\e]20;Cavefire-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Citidel"
-    action string "\e]20;citidel.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Crater Lake"
-    action string "\e]20;crater_lake.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cronus"
-    action string "\e]20;cronus.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Daughter"
-    action string "\e]20;Daughter.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Dragon"
-    action string "\e]20;Dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "DVXVB"
-    action string "\e]20;dvxvb.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Evocation"
-    action string "\e]20;Evocation.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Fourth Day"
-    action string "\e]20;fourthday.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gaia"
-    action string "\e]20;gaia.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Galleon"
-    action string "\e]20;galleon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gorgon"
-    action string "\e]20;gorgon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ice Moon"
-    action string "\e]20;icemoon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lake of Fire"
-    action string "\e]20;lake_of_fire.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lighthouse"
-    action string "\e]20;lighthouse.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Neopolis"
-    action string "\e]20;Neopolis-horizon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Night of the Dragon"
-    action string "\e]20;night_of_the_dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Planet A"
-    action string "\e]20;planeta.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Pond"
-    action string "\e]20;pond.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Poseidon"
-    action string "\e]20;poseidon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ripple"
-    action string "\e]20;ripple.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Roche Limit"
-    action string "\e]20;roche_limit.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Silence"
-    action string "\e]20;silence.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Taken Field"
-    action string "\e]20;the_taken_field.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Urmane"
-    action string "\e]20;urmane3.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Wasteland"
-    action string "\e]20;wasteland.jpg;100x100+50+50\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;;:scale"
-  end
-  begin menuitem
-    text "Proportional Scale"
-    action string "\e]20;;: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 "Transparency"
-    action submenu "Transparency"
-  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 "Messages"
-  begin menuitem
-    text "New Message"
-    action echo "m"
-  end
-  begin menuitem
-    text "Reply"
-    action echo "r"
-  end
-  begin menuitem
-    text "Group Reply"
-    action echo "g"
-  end
-  begin menuitem
-    text "Forward"
-    action echo "f"
-  end
-  begin menuitem
-    text "Bounce"
-    action echo "b"
-  end
-  -
-  begin menuitem
-    text "Save Message"
-    action echo "s"
-  end
-  begin menuitem
-    text "Copy Message"
-    action echo "C"
-  end
-  begin menuitem
-    text "Delete Message"
-    action echo "d"
-  end
-  -
-  begin menuitem
-    text "Display message"
-    action echo "\r"
-  end
-  begin menuitem
-    text "Display with headers"
-    action echo "h"
-  end
-  begin menuitem
-    text "Show attachments"
-    action echo "v"
-  end
-  -
-  begin menuitem
-    text "Exit mutt"
-    action echo "q"
-  end
-  begin menuitem
-    text "Exit without saving"
-    action echo "x"
-  end
-end
-begin menu
-  title "Change to Folder"
-  begin menuitem
-    text "Inbox"
-    action echo "c!\r"
-  end
-  begin menuitem
-    text "Sent Mail"
-    action echo "c<\r"
-  end
-  begin menuitem
-    text "Received Mail"
-    action echo "c>\r"
-  end
-  begin menuitem
-    text "Other"
-    action echo "c"
-  end
-end
-begin menu
-  title Forward
-  begin menuitem
-    text "Forward by Message Date"
-    action echo "od"
-  end
-  begin menuitem
-    text "Forward by Sender"
-    action echo "of"
-  end
-  begin menuitem
-    text "Forward by Date Received"
-    action echo "or"
-  end
-  begin menuitem
-    text "Forward by Subject"
-    action echo "os"
-  end
-  begin menuitem
-    text "Forward by Thread"
-    action echo "ot"
-  end
-  begin menuitem
-    text "Forward by Size"
-    action echo "oz"
-  end
-  begin menuitem
-    text "Forward Mailbox order"
-    action echo "ou"
-  end
-end
-begin menu
-  title Reverse
-  begin menuitem
-    text "Reverse by Date"
-    action echo "Od"
-  end
-  begin menuitem
-    text "Reverse by Sender"
-    action echo "Of"
-  end
-  begin menuitem
-    text "Reverse by Date Received"
-    action echo "Or"
-  end
-  begin menuitem
-    text "Reverse by Subject"
-    action echo "Os"
-  end
-  begin menuitem
-    text "Reverse by Thread"
-    action echo "Ot"
-  end
-  begin menuitem
-    text "Reverse by Size"
-    action echo "Oz"
-  end
-  begin menuitem
-    text "Reverse Mailbox order"
-    action echo "Ou"
-  end
-end
-
-begin menu
-  title Sort
-  begin menuitem
-    text "Forward"
-    action submenu Forward
-  end
-  begin menuitem
-    text "Reverse"
-    action submenu Reverse
-  end
-end
-
-begin menu
-  title Mailbox
-  begin menuitem
-    text "Change to Folder"
-    action submenu "Change to Folder"
-  end
-  begin menuitem
-    text "Sort"
-    action submenu Sort
-  end
-  -
-  begin menuitem
-    text "Resync"
-    action echo "$"
-  end
-end
-
-# This is the menu that gets called by Ctrl-Button3
-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 "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/mutt/theme.cfg.in b/themes/mutt/theme.cfg.in
deleted file mode 100644
index f997901..0000000
--- a/themes/mutt/theme.cfg.in
+++ /dev/null
@@ -1,402 +0,0 @@
-<Eterm-0.9.1>
-# ^- This must be the first line of any Eterm config file!
-# Format is:  <Eterm-VERSION>  where VERSION is replaced by
-#                              the version it was written for,
-#                              minus the "DR-" if any.
-#
-# This is a sample Eterm config file.
-#
-# As always, the authors guarantee absolutely nothing and take
-# no responsibility for anything that might happen to you, your
-# computer, your dog, your sex life, or anyone or anything else
-# directly or indirectly through the use of, or inability to use,
-# this program.  Use at your OWN risk.
-
-# Define the color properties
-begin color
-
-# Foreground, background, cursor, scrollbar, pointer colors
-    foreground #aaaaaa
-    background black
-    cursor #ffff00
-    cursor_text #880000
-    pointer white
-
-# video attribute can either be "normal" or "reverse"
-    video normal
-
-# Redefine the 16 basic colors, if you really feel the need
-# First word is "color", next is the number (0-15, BD, or UL),
-# then the values for red, green, and blue separated by spaces
-# Numbers are base 10 unless preceded by "0x" (base 16) or '0'
-# (base 8).  Alternatively, you can use color names or #xxxxxx
-# format.
-
-# The colors below are taken from Rasterman's .Xdefaults file.  They are intended to
-# display ANSI art properly when combined with a good ANSI-art font (like vga or
-# Rasterman's nexus font).
-    color  0 0    0    0
-    color  1 0xaa 0    0
-    color  2 0    0210 0
-    color  3 0xaa 0x55 0x22
-    color  4 0    0    0xaa
-    color  5 0xaa 0    0xaa
-    color  6 0    0xaa 0xaa
-    color  7 0xaa 0xaa 0xaa
-    color  8 0x44 0x44 0x44
-    color  9 0xff 0x44 0x44
-    color 10 0x44 0xff 0x44
-    color 11 0xff 0xff 0x44
-    color 12 0x44 0x44 0xff
-    color 13 0xff 0x44 0xff
-    color 14 0x44 0xff 0xff
-    color 15 #ffffff
-    color bd #ffffff
-    color ul #ffffff
-
-# This ends the color section.  Any text after the word "end" is
-# assumed to be a comment and ignored.
-end color
-
-# The X11 attributes section.  Should be fairly self-explanatory,
-# but if not, consult the X man page.
-  begin attributes
-
-# Geometry == widthxheight+x_offset+y_offset, offsets from top left
-#             if +, bottom right if -
-#    geometry 132x50+100+100
-    title "%appname() -- Mutt Theme"
-    name mutt
-#    iconname mutt
-
-# Set the fonts.  These must be monospace fonts.  The values shown are
-# the Eterm defaults.  The "bold" font is the font used if color BD has
-# not been set and Eterm cannot map the foreground color to one of the
-# high-intensity colors (8-15).
-    font default @DEF_FONT_IDX@
-    font 0 @FONT0@
-    font 1 @FONT1@
-    font 2 @FONT2@
-    font 3 @FONT3@
-    font 4 @FONT4@
-    font 5 10x20
-    font 6 12x24
-#    font bold 7x14
-end attributes
-
-# The Multichar support options.  Same goes for these fonts as for the normal
-# ones.  The "encoding" attribute can be either "eucj" or "sjis" or "euckr"
-# or big5 or gb
-  begin multichar
-    font 0 @MFONT0@
-    font 1 @MFONT1@
-    font 2 @MFONT2@
-    font 3 @MFONT3@
-    font 4 @MFONT4@
-    encoding @MULTICHAR_ENCODING@
-end multichar
-
-# Define the imageclasses.
-  begin imageclasses
-
-# You must define this before setting any images that use it.  This is the $PATH-style variable
-# that determines where Eterm looks for image files.
-    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PKGDATADIR@/pix/"
-
-# If you want a different icon than the standard Eterm one, set this.
-#   icon Eterm.xpm
-
-# This is the background animator.  See the man page for the syntax.
-#   anim 3 foo1 foo2 foo3
-
-# Here we define an image.
-    begin image
-
-# The first thing you set when defining an image MUST be the type.  No type, no dice.  The type
-# should be one of the following:  background, up_arrow, down_arrow, left_arrow, right_arrow,
-#                                  trough, anchor, menu, or submenu
-      type background
-
-# The mode line.  This defines the startup mode for the image, as well as what modes are allowed.
-# Valid modes are "image" (to display the image file), "trans" (to be transparent), or "viewport"
-# (for viewport mode).  Syntax is "mode <startup_mode> allow <allowed_modes>".
-      mode image allow image trans viewport auto
-
-# Next you should set the state.  This is either normal, selected, or clicked.
-      state normal
-
-# Here you set the file.  You can also set the geometry string here if you follow the filename with
-# an @ sign.  That way, you can include the geometries in your pixmaps.list file.
-      file %random(`cat pixmaps.list`)
-
-# Set the image border.  This is a portion of the image which will be kept at its actual size when
-# scaling.  Use this for beveled images (buttons, etc.).
-      border 0 0 0 0
-
-# Th-th-th-th-that's all folks.
-  end image
-
-    begin image
-      type trough
-      mode image allow image trans viewport auto
-      state normal
-      color black #666666
-      file bar_vertical_3.png
-# Here is how you specify the geometry string separately.  See the man page for its syntax.
-      geom 100
-      border 2 2 2 3
-  end image
-    begin image
-      type anchor
-      mode image allow image auto
-      state normal
-      color black #666666
-      file bar_vertical_1.png
-      geom 100
-      border 2 2 2 3
-      state selected
-      file bar_vertical_2.png
-      geom 100
-      border 2 2 2 3
-  end image
-    begin image
-      type thumb
-      mode image allow image auto
-      state normal
-      color black #666666
-      file thumb_1.png
-      geom 100
-      border 3 3 3 3
-      state selected
-      file thumb_2.png
-      geom 100
-      border 3 3 3 3
-  end image
-    begin image
-      type up_arrow
-      mode image allow image auto
-      state normal
-      color black #666666
-      file button_arrow_up_1.png
-      geom 100
-      border 2 2 2 2
-      state selected
-      file button_arrow_up_2.png
-      geom 100
-      border 2 2 2 2
-      state clicked
-      file button_arrow_up_3.png
-      geom 100
-      border 2 2 2 2
-  end image
-    begin image
-      type down_arrow
-      mode image allow image auto
-      state normal
-      color black #666666
-      file button_arrow_down_1.png
-      geom 100
-      border 2 2 2 2
-      state selected
-      file button_arrow_down_2.png
-      geom 100
-      border 2 2 2 2
-      state clicked
-      file button_arrow_down_3.png
-      geom 100
-      border 2 2 2 2
-  end image
-    begin image
-      type menu
-      mode image allow image auto
-      state normal
-      color black #999999
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 3
-      state selected
-      file bar_horizontal_2.png
-      geom 100
-      border 2 3 2 3
-  end image
-    begin image
-      type submenu
-      mode image allow image auto
-      state normal
-      color black #999999
-      file menu1.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-      state selected
-      file menu2.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-      state clicked
-      file menu3.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-  end image
-    begin image
-      type button_bar
-      mode image allow image auto
-      state normal
-      color black #999999
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 2
-      state disabled
-      color white #333333
-      cmod image 0xc0
-      border 2 3 2 2
-  end image
-    begin image
-      type button
-      mode image allow image auto
-      state normal
-      color black #cccccc
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 2
-      state selected
-      file bar_horizontal_2.png
-      geom 100
-      border 2 3 2 2
-      state clicked
-      file bar_horizontal_3.png
-      geom 100
-      border 2 3 2 2
-  end image
-end
-
-%include "menus.cfg"
-
-# This section *must* come after the menu definitions if you want
-# menu actions to work.  C'est la vie. :-)
-#
-# Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
-#
-  begin actions
-    bind ctrl button1 to string "\e]5;\a"
-    bind ctrl button2 to string "\e[?30t"
-    bind ctrl button3 to menu Eterm
-    bind ctrl shift button3 to string "\e]6;14\a"
-end actions
-
-# This section must also come after the menus if you want any buttons
-# to launch menus.  (If not, it can go anywhere.)
-  begin button_bar
-
-# Specify a font.  The default buttonbar font is the default terminal
-# font as defined in the attributes section above.
-    font "-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1"
-
-# Add a button.  The syntax is:
-#   button <text> [ icon <filename> ] action { string | echo | menu } <parameter>
-#
-    button Eterm action menu Eterm
-    button Messages action menu Messages
-    button Mailbox action menu Mailbox
-    rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
-    rbutton icon exit.png action script "exit"
-end button_bar
-
-# The XIM support options.
-# input_method: set the name of your favorate input method program
-# preedit_type: OverTheSpot or OffTheSpot or Root
-#  begin xim
-#    input_method Ami
-#    preedit_type OverTheSpot
-#end xim
-
-# Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
-# "off", or "false" for FALSE.
-  begin toggles
-
-# If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
-    map_alert on
-
-# If true, Eterm will flash rather than sending a beep.
-    visual_bell off
-
-# If true, Eterm will prepend '-' to the shell name when calling it.
-    login_shell true
-
-# If true, Eterm will display the scroll bar
-    scrollbar off
-
-# If true, Eterm will attempt to make an entry in the utmp file to record the
-# login information.  Eterm *must* run privileged to do this.
-    utmp_logging on
-
-# If true, Eterm will handle the Meta (Alt) + keypress to set the 8th bit.
-# If false, Eterm will handle the Meta + keypress as an escape prefix. (default)
-    meta8 false
-
-# If true, Eterm will start iconified.
-    iconic false
-
-# If true, Eterm will jump to the bottom of the window when something is output
-# to the terminal.
-    home_on_output 1
-
-# If true, Eterm will jump to the bottom of the window when a key is pressed.
-    home_on_input 1
-
-# If true, Eterm will put the scrollbar on the right of the window (default is left).
-    scrollbar_right true
-
-# If true, the scrollbar will have no trough.
-    scrollbar_floating false
-
-# If true, Eterm will run with no window borders.
-    borderless false
-
-# If true, Eterm will use a double-buffered background pixmap for drawing text.  This
-# makes redraws faster by reducing exposes, but it uses more memory.  If you have the
-# memory to spare, it's a good idea.
-#    double_buffer true
-
-end toggles
-
-  begin keyboard
-
-# Use the supplied keysym to reduce/enlarge the font
-    smallfont_key LessThan
-    bigfont_key GreaterThan
-
-# You can also associate a given keysym (0xff00 - 0xffff) with a string
-#    keysym 0xffff "\r\n\e\007\t"
-
-# Greek keyboard mode.  First the word "greek", then its boolean
-# state, then its mode (either "iso" or "ibm").
-#    greek off iso
-end keyboard
-
-  begin misc
-
-# The command to which to pipe print requests (printscreen)
-    print_pipe "lpr"
-
-# The number of lines in the scrollback buffer.  More lines, more memory needed.
-    save_lines 1024
-
-# The characters to use as word delimiters for double-click selection
-    cut_chars "\t\\\`\\\"\'&() *,;<=>?@[]{|}"
-
-# Defines the width of the border between the terminal window and the client window.
-# (Default is 5).
-    border_width 0
-
-# Defines the number of pixels to add between lines (default is 0).
-#    line_space 2
-
-# Value to use for $TERM
-    term_name Eterm
-
-# Program to exec (intended for use with themes)
-    exec mutt
-
-end misc
diff --git a/themes/trans/menus.cfg b/themes/trans/menus.cfg
index 6ef8d1c..7aab154 100644
--- a/themes/trans/menus.cfg
+++ b/themes/trans/menus.cfg
@@ -263,309 +263,174 @@ begin menu
   end
 end
 
-begin menu
-  title Transparency
-  begin menuitem
-    text "Force Update"
-    action string "\e]6;3\a"
-  end
-  begin menuitem
-    text "Toggle Desktop Watching"
-    action string "\e]6;4\a"
-  end
-  begin menuitem
-    text "Toggle Transparency"
-    action string "\e]6;0\a"
-  end
-end
 begin menu
   title Tiled
   begin menuitem
     text "70's Marble"
-    action string "\e]20;70s_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "7m"
-    action string "\e]20;7m.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Atoms"
-    action string "\e]20;atoms.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Backwave"
-    action string "\e]20;backwave.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/atoms.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Black Stone"
-    action string "\e]20;blackstone.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/blackstone.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Blue Ether"
-    action string "\e]20;ether_blue.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/ether_blue.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Blue Marble"
-    action string "\e]20;blue_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/blue_marble.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Maze"
-    action string "\e]20;blue_maze.jpg;0x0+0+0:tile\a"
+    text "Bubbly 1"
+    action string "\e]20;tile/bubbly1.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Monday"
-    action string "\e]20;021.jpg;0x0+0+0:tile\a"
+    text "Bubbly 2"
+    action string "\e]20;tile/bubbly2.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Puzzle"
-    action string "\e]20;026.png;0x0+0+0:tile\a"
+    text "Bubbly 3"
+    action string "\e]20;tile/bubbly3.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Blue Rock"
-    action string "\e]20;blue_rock.jpg;0x0+0+0:tile\a"
+    text "Bubbly 4"
+    action string "\e]20;tile/bubbly4.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Circuit"
-    action string "\e]20;circuit.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/circuit.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Confusion"
+    action string "\e]20;tile/confusion.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Cyber Playground"
-    action string "\e]20;cyber_bg.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dark Marble"
-    action string "\e]20;dark_marble.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/cyber_bg.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Dimples"
-    action string "\e]20;014.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/014.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Dirt"
-    action string "\e]20;dirt.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/dirt.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Egg"
+    action string "\e]20;tile/egg.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Ether"
-    action string "\e]20;ether.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/ether.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Giger 1"
-    action string "\e]20;giger1.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/giger1.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Giger 2"
-    action string "\e]20;giger2.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/giger2.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Gray Matter"
-    action string "\e]20;22.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/22.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Gray Waves"
-    action string "\e]20;59.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/59.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Green Ether"
-    action string "\e]20;ether_green.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/ether_green.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Lava"
-    action string "\e]20;004.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Mudslide"
-    action string "\e]20;35.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/004.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Nebula"
-    action string "\e]20;nebula.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/nebula.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "On Stage"
-    action string "\e]20;lightb1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Clouds"
-    action string "\e]20;7.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Glass"
-    action string "\e]20;purpgls.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Rain"
-    action string "\e]20;024.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/lightb1.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Purple Stuff"
-    action string "\e]20;purple_stuff.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Rainstorm"
-    action string "\e]20;15.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Stucco"
-    action string "\e]20;red_stucco.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/purple_stuff.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Red Whisper"
-    action string "\e]20;40.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/40.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Shale"
-    action string "\e]20;shale.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/shale.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Soft Marble"
-    action string "\e]20;soft.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/soft.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Space"
-    action string "\e]20;space.png;0x0+0+0:tile\a"
+    action string "\e]20;tile/space.png;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Starry Night"
-    action string "\e]20;starry.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/starry.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Steel"
+    action string "\e]20;tile/steel1.jpg;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Twisted"
+    action string "\e]20;tile/twisted.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
     text "Whirlpool"
-    action string "\e]20;015.jpg;0x0+0+0:tile\a"
+    action string "\e]20;tile/015.jpg;0x0+0+0:tile\a"
   end
 end
 begin menu
   title Scaled
   begin menuitem
-    text "After the Storm"
-    action string "\e]20;after_the_storm.jpg;100x100+50+50\a"
+    text "Day/Night"
+    action string "\e]20;scale/day-night.jpg;100x100+50+50\a"
   end
   begin menuitem
-    text "Alien Spheres"
-    action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ascension"
-    action string "\e]20;ascension.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Atlantis"
-    action string "\e]20;atlantis.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Bladerunner"
-    action string "\e]20;Bladerunner-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Canyon"
-    action string "\e]20;Canyon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cave Fire"
-    action string "\e]20;Cavefire-bg.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Citidel"
-    action string "\e]20;citidel.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Crater Lake"
-    action string "\e]20;crater_lake.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Cronus"
-    action string "\e]20;cronus.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Daughter"
-    action string "\e]20;Daughter.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Dragon"
-    action string "\e]20;Dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "DVXVB"
-    action string "\e]20;dvxvb.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Evocation"
-    action string "\e]20;Evocation.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Fourth Day"
-    action string "\e]20;fourthday.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gaia"
-    action string "\e]20;gaia.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Galleon"
-    action string "\e]20;galleon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Gorgon"
-    action string "\e]20;gorgon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ice Moon"
-    action string "\e]20;icemoon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lake of Fire"
-    action string "\e]20;lake_of_fire.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Lighthouse"
-    action string "\e]20;lighthouse.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;nebula.jpg;100x100+50+50\a"
+    text "Good Morning"
+    action string "\e]20;scale/good-morning.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Neopolis"
-    action string "\e]20;Neopolis-horizon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Night of the Dragon"
-    action string "\e]20;night_of_the_dragon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Planet A"
-    action string "\e]20;planeta.jpg;100x100+50+50\a"
+    action string "\e]20;scale/Neopolis-horizon.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Pond"
-    action string "\e]20;pond.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Poseidon"
-    action string "\e]20;poseidon.jpg;100x100+50+50\a"
+    action string "\e]20;scale/pond.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Ripple"
-    action string "\e]20;ripple.jpg;100x100+50+50\a"
+    action string "\e]20;scale/ripple.jpg;100x100+50+50\a"
   end
   begin menuitem
-    text "Roche Limit"
-    action string "\e]20;roche_limit.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Silence"
-    action string "\e]20;silence.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "The Taken Field"
-    action string "\e]20;the_taken_field.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Urmane"
-    action string "\e]20;urmane3.jpg;100x100+50+50\a"
+    text "Sunset"
+    action string "\e]20;scale/sunset.jpg;100x100+50+50\a"
   end
   begin menuitem
     text "Wasteland"
-    action string "\e]20;wasteland.jpg;100x100+50+50\a"
+    action string "\e]20;scale/wasteland.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Winter Tree"
+    action string "\e]20;scale/wintertree.jpg;100x100+50+50\a"
   end
 end
 begin menu
@@ -585,11 +450,11 @@ begin menu
   end
   begin menuitem
     text "Scaled"
-    action string "\e]20;;:scale"
+    action string "\e]20;;100x100"
   end
   begin menuitem
     text "Proportional Scale"
-    action string "\e]20;;:propscale"
+    action string "\e]20;;100x100:propscale"
   end
   -
   begin menuitem
@@ -845,8 +710,8 @@ end
 begin menu
   title Background
   begin menuitem
-    text "Transparency"
-    action submenu "Transparency"
+    text "Toggle Transparency"
+    action string "\e]6;0\a"
   end
   begin menuitem
     text "Pixmap"
@@ -868,6 +733,10 @@ end
 
 begin menu
   title "Eterm Operations"
+  begin menuitem
+    text "New Window..."
+    action script "spawn(Eterm)"
+  end
   begin menuitem
     text "Version"
     action string "\e[8n"
@@ -878,9 +747,13 @@ begin menu
   end
   separator
   begin menuitem
-    text "Save Settings..."
+    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"