Thu Aug 23 14:00:02 2001 Michael Jennings (mej)

I got tired of having to maintain half a gazillion menus.cfg files
considering that the vast majority of them are identical or have
large identical sections.  Thus, I took the m4-based menus.cfg from
the chooser theme and hacked on it a bunch.  I can now regenerate
the menu files for all Eterm themes from a single source file using
the gen-menus script in doc/.

I also removed the comments from the theme.cfg files of all themes
except "Eterm" itself.


SVN revision: 5263

7 files changed, 420 insertions, 952 deletions

diff --git a/themes/Eterm/menus.cfg b/themes/Eterm/menus.cfg
index 7aab154..6145ff7 100644
--- a/themes/Eterm/menus.cfg
+++ b/themes/Eterm/menus.cfg
@@ -1,7 +1,6 @@
 <Eterm-0.9.1>
 begin menu
   title Font
-  font -*-times-bold-r-normal--14-*-*-*-*-*-iso8859-1
   begin menuitem
     text "Normal"
     action string "\e]50;#"
@@ -248,7 +247,7 @@ begin menu
     action submenu "Scrollbar"
   end
   begin menuitem
-    text "Move to Desktop..."
+    text "Move to Desktop"
     action submenu "Move to Desktop"
   end
   -
@@ -262,11 +261,10 @@ begin menu
     action string "\ec"
   end
 end
-
 begin menu
   title Tiled
   begin menuitem
-    text "70's Marble"
+    text "70s Marble"
     action string "\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
@@ -730,11 +728,23 @@ begin menu
     action submenu "Gamma"
   end
 end
-
 begin menu
-  title "Eterm Operations"
+  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..."
+    text "New Eterm Window"
     action script "spawn(Eterm)"
   end
   begin menuitem
@@ -748,7 +758,7 @@ begin menu
   separator
   begin menuitem
     text "Save User Settings..."
-    action script "save()"
+    action script "save"
   end
   begin menuitem
     text "Save Theme Settings..."
@@ -759,25 +769,10 @@ begin menu
     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
-  -
+  title "Eterm Operations"
   begin menuitem
-    text "New Window..."
+    text "New Eterm Window"
     action script "spawn(Eterm)"
   end
   begin menuitem
@@ -791,7 +786,7 @@ begin menu
   separator
   begin menuitem
     text "Save User Settings..."
-    action script "save()"
+    action script "save"
   end
   begin menuitem
     text "Save Theme Settings..."
@@ -802,4 +797,3 @@ begin menu
     action script "exit"
   end
 end
-
diff --git a/themes/auto/menus.cfg b/themes/auto/menus.cfg
index 7aab154..6145ff7 100644
--- a/themes/auto/menus.cfg
+++ b/themes/auto/menus.cfg
@@ -1,7 +1,6 @@
 <Eterm-0.9.1>
 begin menu
   title Font
-  font -*-times-bold-r-normal--14-*-*-*-*-*-iso8859-1
   begin menuitem
     text "Normal"
     action string "\e]50;#"
@@ -248,7 +247,7 @@ begin menu
     action submenu "Scrollbar"
   end
   begin menuitem
-    text "Move to Desktop..."
+    text "Move to Desktop"
     action submenu "Move to Desktop"
   end
   -
@@ -262,11 +261,10 @@ begin menu
     action string "\ec"
   end
 end
-
 begin menu
   title Tiled
   begin menuitem
-    text "70's Marble"
+    text "70s Marble"
     action string "\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
@@ -730,11 +728,23 @@ begin menu
     action submenu "Gamma"
   end
 end
-
 begin menu
-  title "Eterm Operations"
+  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..."
+    text "New Eterm Window"
     action script "spawn(Eterm)"
   end
   begin menuitem
@@ -748,7 +758,7 @@ begin menu
   separator
   begin menuitem
     text "Save User Settings..."
-    action script "save()"
+    action script "save"
   end
   begin menuitem
     text "Save Theme Settings..."
@@ -759,25 +769,10 @@ begin menu
     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
-  -
+  title "Eterm Operations"
   begin menuitem
-    text "New Window..."
+    text "New Eterm Window"
     action script "spawn(Eterm)"
   end
   begin menuitem
@@ -791,7 +786,7 @@ begin menu
   separator
   begin menuitem
     text "Save User Settings..."
-    action script "save()"
+    action script "save"
   end
   begin menuitem
     text "Save Theme Settings..."
@@ -802,4 +797,3 @@ begin menu
     action script "exit"
   end
 end
-
diff --git a/themes/auto/theme.cfg.in b/themes/auto/theme.cfg.in
index 45e9f9f..c0c9836 100644
--- a/themes/auto/theme.cfg.in
+++ b/themes/auto/theme.cfg.in
@@ -1,40 +1,12 @@
 <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
@@ -53,26 +25,8 @@ begin color
     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()
-#    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@
@@ -81,12 +35,7 @@ begin attributes
     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@
@@ -95,55 +44,21 @@ begin multichar
     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 auto 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 auto 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
@@ -271,32 +186,15 @@ begin imageclasses
       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
@@ -304,101 +202,27 @@ begin button_bar
     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 select the whole line when you triple click on the
-# window, instead of from that location/word to the end of the line.
     select_line false
-
-# 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/chooser/menus.cfg b/themes/chooser/menus.cfg
index 6a11a89..3f7a0a3 100644
--- a/themes/chooser/menus.cfg
+++ b/themes/chooser/menus.cfg
@@ -1,36 +1,35 @@
 <Eterm-0.9.1>
-%preproc m4
-define(STRING_ITEM, `begin menuitem
-    text "$1"
-    action string "$2"
-  end')
-define(ECHO_ITEM, `begin menuitem
-    text "$1"
-    action echo "$2"
-  end')
-define(SUBMENU_ITEM, `begin menuitem
-    text "$1"
-    action submenu "$1"
-  end')
-define(SCRIPT_ITEM, `begin menuitem
-    text "$1"
-    action script "$2"
-  end')
-define(FONT_ITEM, `begin menuitem
-    text "$1"
-    action string "\e]50;#$2"
-  end')
 begin menu
   title Font
-  font -*-times-bold-r-normal--14-*-*-*-*-*-iso8859-1
-  STRING_ITEM(`Normal', `\e]50;#')
-  STRING_ITEM(`Larger', `\e]50;#+')
-  STRING_ITEM(`Smaller', `\e]50;#-')
+  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
   -
-  STRING_ITEM(`Font 1', `\e]50;#1')
-  STRING_ITEM(`Font 2', `\e]50;#2')
-  STRING_ITEM(`Font 3', `\e]50;#3')
-  STRING_ITEM(`Font 4', `\e]50;#4')
+  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
@@ -248,7 +247,7 @@ begin menu
     action submenu "Scrollbar"
   end
   begin menuitem
-    text "Move to Desktop..."
+    text "Move to Desktop"
     action submenu "Move to Desktop"
   end
   -
@@ -262,310 +261,174 @@ begin menu
     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"
+    text "70s Marble"
+    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 "Cyber Playground"
-    action string "\e]20;cyber_bg.jpg;0x0+0+0:tile\a"
+    text "Confusion"
+    action string "\e]20;tile/confusion.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Dark Marble"
-    action string "\e]20;dark_marble.jpg;0x0+0+0:tile\a"
+    text "Cyber Playground"
+    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"
-  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"
+    action string "\e]20;tile/starry.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Ascension"
-    action string "\e]20;ascension.jpg;100x100+50+50\a"
+    text "Steel"
+    action string "\e]20;tile/steel1.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
-    text "Atlantis"
-    action string "\e]20;atlantis.jpg;100x100+50+50\a"
+    text "Twisted"
+    action string "\e]20;tile/twisted.jpg;0x0+0+0:tile\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"
+    text "Whirlpool"
+    action string "\e]20;tile/015.jpg;0x0+0+0:tile\a"
   end
+end
+begin menu
+  title Scaled
   begin menuitem
-    text "Lighthouse"
-    action string "\e]20;lighthouse.jpg;100x100+50+50\a"
+    text "Day/Night"
+    action string "\e]20;scale/day-night.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"
-  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"
+    action string "\e]20;scale/ripple.jpg;100x100+50+50\a"
   end
   begin menuitem
-    text "The Taken Field"
-    action string "\e]20;the_taken_field.jpg;100x100+50+50\a"
+    text "Sunset"
+    action string "\e]20;scale/sunset.jpg;100x100+50+50\a"
   end
   begin menuitem
-    text "Urmane"
-    action string "\e]20;urmane3.jpg;100x100+50+50\a"
+    text "Wasteland"
+    action string "\e]20;scale/wasteland.jpg;100x100+50+50\a"
   end
   begin menuitem
-    text "Wasteland"
-    action string "\e]20;wasteland.jpg;100x100+50+50\a"
+    text "Winter Tree"
+    action string "\e]20;scale/wintertree.jpg;100x100+50+50\a"
   end
 end
 begin menu
@@ -585,11 +448,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 +708,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"
@@ -865,129 +728,269 @@ begin menu
     action submenu "Gamma"
   end
 end
-
-# HOST_ITEM(protocol, hostname [, ip])
-define(HOST_ITEM, `begin menuitem
-    text "$2"
-    action string "\e]0;$2 $1\a\e]7;echo:$1 '`ifelse($3, `', `$2', `$3')'`\r\a"
-  end')
-# ALIEN_MENU(protocol)
-define(ALIEN_MENU, `begin menu
-  title "Alien Cluster $1"
-  HOST_ITEM(`$1', `apone')
-  HOST_ITEM(`$1', `ash')
-  HOST_ITEM(`$1', `bishop')
-  HOST_ITEM(`$1', `burke')
-  HOST_ITEM(`$1', `dallas')
-  HOST_ITEM(`$1', `drake')
-  HOST_ITEM(`$1', `ripley')
-  HOST_ITEM(`$1', `view1-mp')
-  HOST_ITEM(`$1', `vob1-mp')
-  HOST_ITEM(`$1', `vob2-mp')
-end')
-define(IT_MENU, `begin menu
-  title "IT Hosts $1"
-  HOST_ITEM(`$1', `allen')
-  HOST_ITEM(`$1', `babylon4')
-  HOST_ITEM(`$1', `icarus')
-  HOST_ITEM(`$1', `orwell')
-  HOST_ITEM(`$1', `phantom')
-  HOST_ITEM(`$1', `starfury')
-  HOST_ITEM(`$1', `viper')
-  HOST_ITEM(`$1', `whitestar')
-end')
-define(COM_MENU, `begin menu
-  title "3Com $1"
-  HOST_ITEM(`$1', `bkup-u2')
-  HOST_ITEM(`$1', `bkup-us')
-  HOST_ITEM(`$1', `corsys1')
-  HOST_ITEM(`$1', `dmc-mp')
-  HOST_ITEM(`$1', `dw-dev')
-  HOST_ITEM(`$1', `dw1-uw')
-  HOST_ITEM(`$1', `dw2-mp')
-  HOST_ITEM(`$1', `firegate')
-  HOST_ITEM(`$1', `hicks')
-  HOST_ITEM(`$1', `hp-carp')
-  HOST_ITEM(`$1', `hp-sales')
-  HOST_ITEM(`$1', `hp9000')
-  HOST_ITEM(`$1', `hprpc1', `149.112.166.42')
-  HOST_ITEM(`$1', `hprpc2', `149.112.166.43')
-  HOST_ITEM(`$1', `intergate')
-  HOST_ITEM(`$1', `lnnsdintra1')
-  HOST_ITEM(`$1', `mailgate')
-  HOST_ITEM(`$1', `mwdev1')
-  HOST_ITEM(`$1', `mwdev2')
-  HOST_ITEM(`$1', `mwdev3')
-  HOST_ITEM(`$1', `mwdocs1')
-  HOST_ITEM(`$1', `mwprod1')
-  HOST_ITEM(`$1', `mwprod2')
-  HOST_ITEM(`$1', `mwprod3')
-  HOST_ITEM(`$1', `netscop')
-  HOST_ITEM(`$1', `notes-mp')
-  HOST_ITEM(`$1', `oraweb1')
-  HOST_ITEM(`$1', `pcdprod')
-  HOST_ITEM(`$1', `prod-mp')
-  HOST_ITEM(`$1', `rdpvcs')
-  HOST_ITEM(`$1', `rdsgi1-mp')
-  HOST_ITEM(`$1', `recov-mp')
-  HOST_ITEM(`$1', `ren')
-  HOST_ITEM(`$1', `scop-us')
-  HOST_ITEM(`$1', `ship-eg')
-  HOST_ITEM(`$1', `ship-mp')
-  HOST_ITEM(`$1', `stimpy')
-  HOST_ITEM(`$1', `test-mp')
-  HOST_ITEM(`$1', `townesquare')
-  HOST_ITEM(`$1', `ussk1rdu1')
-  HOST_ITEM(`$1', `uw-inet')
-  HOST_ITEM(`$1', `webmw')
-end')
-define(EXT_MENU, `begin menu
-  title "External $1"
-  HOST_ITEM(`$1', `foobar.com')
-end')
-
-define(PROTOCOL_MENU, `begin menu
-  title "$1"
-  begin menuitem
-    text "Alien Cluster"
-    action submenu "Alien Cluster $1"
-  end
-  begin menuitem
-    text "IT Hosts"
-    action submenu "IT Hosts $1"
-  end
-  begin menuitem
-    text "3Com"
-    action submenu "3Com $1"
-  end
-  begin menuitem
-    text "External"
-    action submenu "External $1"
-  end
-end')
-define(DO_PROTOCOL, `ALIEN_MENU($1)
-IT_MENU($1)
-COM_MENU($1)
-EXT_MENU($1)
-PROTOCOL_MENU($1)')
-
-DO_PROTOCOL(ssh)
-DO_PROTOCOL(rlogin)
-DO_PROTOCOL(telnet)
-DO_PROTOCOL(ftp)
-
-# This is the menu that gets called by Ctrl-Button3
+begin menu
+  title "Internal Hosts ssh"
+  begin menuitem
+    text "alpha"
+    action script "string(\e]0\\;alpha\\ ssh\a); echo(ssh\\ alpha\r);"
+  end
+  begin menuitem
+    text "beta"
+    action script "string(\e]0\\;beta\\ ssh\a); echo(ssh\\ beta\r);"
+  end
+  begin menuitem
+    text "gamma"
+    action script "string(\e]0\\;gamma\\ ssh\a); echo(ssh\\ 10.1.1.10\r);"
+  end
+  begin menuitem
+    text "delta"
+    action script "string(\e]0\\;delta\\ ssh\a); echo(ssh\\ delta\r);"
+  end
+end
+begin menu
+  title "External Hosts ssh"
+  begin menuitem
+    text "carbon.foo.com"
+    action script "string(\e]0\\;carbon.foo.com\\ ssh\a); echo(ssh\\ carbon.foo.com\r);"
+  end
+  begin menuitem
+    text "i.am.danish.so.eatme.net"
+    action script "string(\e]0\\;i.am.danish.so.eatme.net\\ ssh\a); echo(ssh\\ i.am.danish.so.eatme.net\r);"
+  end
+  begin menuitem
+    text "oxygen.bar.org"
+    action script "string(\e]0\\;oxygen.bar.org\\ ssh\a); echo(ssh\\ oxygen.bar.org\r);"
+  end
+end
+begin menu
+  title "ssh"
+  begin menuitem
+    text "Internal Hosts"
+    action submenu "Internal Hosts ssh"
+  end
+  begin menuitem
+    text "External Hosts"
+    action submenu "External Hosts ssh"
+  end
+end
+begin menu
+  title "Internal Hosts rlogin"
+  begin menuitem
+    text "alpha"
+    action script "string(\e]0\\;alpha\\ rlogin\a); echo(rlogin\\ alpha\r);"
+  end
+  begin menuitem
+    text "beta"
+    action script "string(\e]0\\;beta\\ rlogin\a); echo(rlogin\\ beta\r);"
+  end
+  begin menuitem
+    text "gamma"
+    action script "string(\e]0\\;gamma\\ rlogin\a); echo(rlogin\\ 10.1.1.10\r);"
+  end
+  begin menuitem
+    text "delta"
+    action script "string(\e]0\\;delta\\ rlogin\a); echo(rlogin\\ delta\r);"
+  end
+end
+begin menu
+  title "External Hosts rlogin"
+  begin menuitem
+    text "carbon.foo.com"
+    action script "string(\e]0\\;carbon.foo.com\\ rlogin\a); echo(rlogin\\ carbon.foo.com\r);"
+  end
+  begin menuitem
+    text "i.am.danish.so.eatme.net"
+    action script "string(\e]0\\;i.am.danish.so.eatme.net\\ rlogin\a); echo(rlogin\\ i.am.danish.so.eatme.net\r);"
+  end
+  begin menuitem
+    text "oxygen.bar.org"
+    action script "string(\e]0\\;oxygen.bar.org\\ rlogin\a); echo(rlogin\\ oxygen.bar.org\r);"
+  end
+end
+begin menu
+  title "rlogin"
+  begin menuitem
+    text "Internal Hosts"
+    action submenu "Internal Hosts rlogin"
+  end
+  begin menuitem
+    text "External Hosts"
+    action submenu "External Hosts rlogin"
+  end
+end
+begin menu
+  title "Internal Hosts telnet"
+  begin menuitem
+    text "alpha"
+    action script "string(\e]0\\;alpha\\ telnet\a); echo(telnet\\ alpha\r);"
+  end
+  begin menuitem
+    text "beta"
+    action script "string(\e]0\\;beta\\ telnet\a); echo(telnet\\ beta\r);"
+  end
+  begin menuitem
+    text "gamma"
+    action script "string(\e]0\\;gamma\\ telnet\a); echo(telnet\\ 10.1.1.10\r);"
+  end
+  begin menuitem
+    text "delta"
+    action script "string(\e]0\\;delta\\ telnet\a); echo(telnet\\ delta\r);"
+  end
+end
+begin menu
+  title "External Hosts telnet"
+  begin menuitem
+    text "carbon.foo.com"
+    action script "string(\e]0\\;carbon.foo.com\\ telnet\a); echo(telnet\\ carbon.foo.com\r);"
+  end
+  begin menuitem
+    text "i.am.danish.so.eatme.net"
+    action script "string(\e]0\\;i.am.danish.so.eatme.net\\ telnet\a); echo(telnet\\ i.am.danish.so.eatme.net\r);"
+  end
+  begin menuitem
+    text "oxygen.bar.org"
+    action script "string(\e]0\\;oxygen.bar.org\\ telnet\a); echo(telnet\\ oxygen.bar.org\r);"
+  end
+end
+begin menu
+  title "telnet"
+  begin menuitem
+    text "Internal Hosts"
+    action submenu "Internal Hosts telnet"
+  end
+  begin menuitem
+    text "External Hosts"
+    action submenu "External Hosts telnet"
+  end
+end
+begin menu
+  title "Internal Hosts ftp"
+  begin menuitem
+    text "alpha"
+    action script "string(\e]0\\;alpha\\ ftp\a); echo(ftp\\ alpha\r);"
+  end
+  begin menuitem
+    text "beta"
+    action script "string(\e]0\\;beta\\ ftp\a); echo(ftp\\ beta\r);"
+  end
+  begin menuitem
+    text "gamma"
+    action script "string(\e]0\\;gamma\\ ftp\a); echo(ftp\\ 10.1.1.10\r);"
+  end
+  begin menuitem
+    text "delta"
+    action script "string(\e]0\\;delta\\ ftp\a); echo(ftp\\ delta\r);"
+  end
+end
+begin menu
+  title "External Hosts ftp"
+  begin menuitem
+    text "carbon.foo.com"
+    action script "string(\e]0\\;carbon.foo.com\\ ftp\a); echo(ftp\\ carbon.foo.com\r);"
+  end
+  begin menuitem
+    text "i.am.danish.so.eatme.net"
+    action script "string(\e]0\\;i.am.danish.so.eatme.net\\ ftp\a); echo(ftp\\ i.am.danish.so.eatme.net\r);"
+  end
+  begin menuitem
+    text "oxygen.bar.org"
+    action script "string(\e]0\\;oxygen.bar.org\\ ftp\a); echo(ftp\\ oxygen.bar.org\r);"
+  end
+end
+begin menu
+  title "ftp"
+  begin menuitem
+    text "Internal Hosts"
+    action submenu "Internal Hosts ftp"
+  end
+  begin menuitem
+    text "External Hosts"
+    action submenu "External Hosts ftp"
+  end
+end
 begin menu
   title Eterm
-  SUBMENU_ITEM(Font)
-  SUBMENU_ITEM(Background)
-  SUBMENU_ITEM(Terminal)
+  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 "ssh"
+    action submenu "ssh"
+  end
+  begin menuitem
+    text "rlogin"
+    action submenu "rlogin"
+  end
+  begin menuitem
+    text "telnet"
+    action submenu "telnet"
+  end
+  begin menuitem
+    text "ftp"
+    action submenu "ftp"
+  end
   -
-  SCRIPT_ITEM(`New Eterm Window', `spawn(Eterm)')
-  STRING_ITEM(`Version', `\e[8n')
-  STRING_ITEM(`Status', `\e[9n')
+  begin menuitem
+    text "New Eterm 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
+begin menu
+  title "Eterm Operations"
+  begin menuitem
+    text "New Eterm 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
-  SCRIPT_ITEM(`Save User Settings...', `save')
-  SCRIPT_ITEM(`Save Theme Settings...', `save(theme)')
-  SCRIPT_ITEM(`Exit', `exit')
+  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/chooser/theme.cfg.in b/themes/chooser/theme.cfg.in
index 64203cc..d468bc7 100644
--- a/themes/chooser/theme.cfg.in
+++ b/themes/chooser/theme.cfg.in
@@ -1,40 +1,12 @@
 <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
@@ -53,26 +25,9 @@ begin color
     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() -- Host Chooser"
     name "%appname() -- Host Chooser"
-#    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@
@@ -81,12 +36,7 @@ begin attributes
     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@
@@ -95,55 +45,21 @@ begin multichar
     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
@@ -271,33 +187,16 @@ begin imageclasses
       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 Eterm action menu "Eterm Operations"
     button ssh action menu ssh
     button rlogin action menu rlogin
     button telnet action menu telnet
@@ -305,96 +204,26 @@ begin button_bar
     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/trans/menus.cfg b/themes/trans/menus.cfg
index 7aab154..6145ff7 100644
--- a/themes/trans/menus.cfg
+++ b/themes/trans/menus.cfg
@@ -1,7 +1,6 @@
 <Eterm-0.9.1>
 begin menu
   title Font
-  font -*-times-bold-r-normal--14-*-*-*-*-*-iso8859-1
   begin menuitem
     text "Normal"
     action string "\e]50;#"
@@ -248,7 +247,7 @@ begin menu
     action submenu "Scrollbar"
   end
   begin menuitem
-    text "Move to Desktop..."
+    text "Move to Desktop"
     action submenu "Move to Desktop"
   end
   -
@@ -262,11 +261,10 @@ begin menu
     action string "\ec"
   end
 end
-
 begin menu
   title Tiled
   begin menuitem
-    text "70's Marble"
+    text "70s Marble"
     action string "\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a"
   end
   begin menuitem
@@ -730,11 +728,23 @@ begin menu
     action submenu "Gamma"
   end
 end
-
 begin menu
-  title "Eterm Operations"
+  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..."
+    text "New Eterm Window"
     action script "spawn(Eterm)"
   end
   begin menuitem
@@ -748,7 +758,7 @@ begin menu
   separator
   begin menuitem
     text "Save User Settings..."
-    action script "save()"
+    action script "save"
   end
   begin menuitem
     text "Save Theme Settings..."
@@ -759,25 +769,10 @@ begin menu
     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
-  -
+  title "Eterm Operations"
   begin menuitem
-    text "New Window..."
+    text "New Eterm Window"
     action script "spawn(Eterm)"
   end
   begin menuitem
@@ -791,7 +786,7 @@ begin menu
   separator
   begin menuitem
     text "Save User Settings..."
-    action script "save()"
+    action script "save"
   end
   begin menuitem
     text "Save Theme Settings..."
@@ -802,4 +797,3 @@ begin menu
     action script "exit"
   end
 end
-
diff --git a/themes/trans/theme.cfg.in b/themes/trans/theme.cfg.in
index 7e402a8..11ab2ec 100644
--- a/themes/trans/theme.cfg.in
+++ b/themes/trans/theme.cfg.in
@@ -1,40 +1,12 @@
 <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
@@ -53,26 +25,10 @@ begin color
     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() -- Pseudo-transparency Theme"
     name Eterm-transparent
-#    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@
@@ -81,12 +37,7 @@ begin attributes
     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@
@@ -95,55 +46,21 @@ begin multichar
     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 trans 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 trans 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
@@ -271,32 +188,15 @@ begin imageclasses
       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
@@ -304,96 +204,26 @@ begin button_bar
     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 on
-
-# 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 true
-
-# If true, Eterm will run with no window borders.
     borderless 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 64
-
-# 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