Thu Feb 10 15:10:01 PST 2000 Michael Jennings <mej@eterm.org>

	This is the first public availability of the work thus far on Eterm
	0.9.1.  There's quite a bit of new stuff here.

	* Added scrollbar thumb support.

	* Completely redid the terminfo/termcap stuff.  The terminfo file is
	now compiled (by tic) and installed by default (unless you specify
	--without-terminfo).  The config files still say xterm, though,
	because some programs (like SLang and GNU mc) use the silly algorithm
	of "Is $TERM set to xterm?" to detect mouse reporting support in a
	terminal. =P  But if you don't ever use xterm, you can use Eterm's
	termcap and just name it "xterm" instead.  Thanks to Marius Gedminas
	<mgedmin@takas.lt> for his patch that started this whole revamp.

	* Added the kEsetroot script for KDE users from Dax Games
	<dgames@isoc.net>.

	* You can now configure the Home and End emulation via --with-home=
	and --with-end= options to configure.  The --with-terminfo option is
	also new, and --enable-xim is now the default.

	* Added a new image state, disabled, for when Eterm loses focus.  This
	is supported by all widgets (well, all those that could possibly be
	on screen when Eterm lost focus), even the background image.  So you
	could actually have all your images darken on focus out and restore
	to normal on focus in.

	* Widget colors formerly dealt with as colors (menu text color,
	scrollbar color, etc.) are now handled by the imageclasses.  Each
	image state can have a foreground and background color defined.  The
	current exception is the background image; I hope to add that later.
	The foreground is the text color and the background is the object
	color (for solid color mode).  So menu text color is set by the menu
	imageclass.  And again, for unfocused colors, use the disabled state
	of the imageclass.

	* Proportionally-spaced fonts are now handled much better.  They are
	still forced into evenly-spaced columns (it's a terminal for crying
	out loud!) but at least you don't end up with Eterm's wider than your
	screen. :-)

	* Home on refresh is gone, as is home on echo.  It's now much simpler.
	There are two options:  home on output, and home on input, the former
	being a combination of echo and refresh.  Also, keypresses that don't
	necessarily have corresonding output can trigger a home on input,
	like Ctrl-End or whatever...ones that don't have special meaning.
	Credit to Darren Stuart Embry <dse@louisville.edu> for pointing out
	this issue and the one with "m-" in font names.

	* I finally got around to re-merging the new parser stuff from my
	work on the Not Game.  Closed up some old potential behavior quirks
	with theme parsing.

	* Added a new escape sequence to fork-and-exec a program.  Also added
	a scrollback search capability to highlight all occurances of a string
	in your scrollback buffer.  Use the new "Etsearch" utility to access
	it.  "Etsearch string" to search for a string, then "Etsearch" by
	itself to reset the highlighting.

	* And of course, the biggie.  Eterm now supports a completely-
	customizeable buttonbar.  Not a menubar, a buttonbar.  It can have an
	arbitrary number of buttons, and each button can perform an action,
	just like a menuitem.  So a button could bring up a menu (like a
	menubar) or launch a program (like a launchbar) or perform an
	operation (like a toolbar).  Each button can have an icon, text, or
	both.  And you can have buttons left- or right-justified in the
	buttonbar.  You will eventually be able to have an arbitrary number
	of buttonbars, but I'm still working on that.

	As with any change this big, things could very easily be broken.  So
	beware. :-)  I have tested this myself, and everything seems to work,
	but I can't test every possibility.  Let me know if you find anything
	that's broken, and enjoy!


SVN revision: 2048

16 files changed, 786 insertions, 216 deletions

diff --git a/themes/Eterm/menus.cfg b/themes/Eterm/menus.cfg
index 3235f55..c826a14 100644
--- a/themes/Eterm/menus.cfg
+++ b/themes/Eterm/menus.cfg
@@ -39,14 +39,10 @@ begin menu
     action string "\e[?25t"
   end
   begin menuitem
-    text "Home on Echo"
+    text "Home on Output"
     action string "\e[?1010t"
   end
   begin menuitem
-    text "Home on Refresh"
-    action string "\e[?1011t"
-  end
-  begin menuitem
     text "Home on Input"
     action string "\e[?1012t"
   end
@@ -870,6 +866,27 @@ begin menu
   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 string "\e]6;71\a"
+  end
+  begin menuitem
+    text "Exit"
+    action string "\e]6;70\a"
+  end
+end
+
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
@@ -887,6 +904,10 @@ begin menu
   end
   -
   begin menuitem
+    text "New Window..."
+    action string "\e]6;73;Eterm\a"
+  end
+  begin menuitem
     text "Version"
     action string "\e[8n"
   end
diff --git a/themes/Eterm/theme.cfg.in b/themes/Eterm/theme.cfg.in
index 05aa36f..aa35581 100644
--- a/themes/Eterm/theme.cfg.in
+++ b/themes/Eterm/theme.cfg.in
@@ -23,11 +23,6 @@ begin main
     background black
     cursor #ffff00
     cursor_text #880000
-    scrollbar #3f1c00
-    unfocused_scrollbar #777777
-    menu #777777
-    unfocused_menu #777777
-    menu_text black
     pointer white
 
 # video attribute can either be "normal" or "reverse"
@@ -149,27 +144,43 @@ begin main
       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 :scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type anchor
       mode image allow image auto
       state normal
+      color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
+    end image
+    begin image
+      type thumb
+      mode image allow image auto
+      state normal
+      color black #666666
+      file thumb_1.png
+      geom :scale
+      border 3 3 3 3
+      state selected
+      file thumb_2.png
+      geom :scale
+      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 :scale
       border 2 2 2 2
@@ -186,6 +197,7 @@ begin main
       type down_arrow
       mode image allow image auto
       state normal
+      color black #666666
       file button_arrow_down_1.png
       geom :scale
       border 2 2 2 2
@@ -202,18 +214,20 @@ begin main
       type menu
       mode image allow image auto
       state normal
+      color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type submenu
       mode image allow image auto
       state normal
+      color black #999999
       file menu1.png
       geom 100x100+0+0:scale
       border 3 15 3 3
@@ -229,6 +243,36 @@ begin main
       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 100x100+0+0:scale
+      border 2 2 2 2
+      state disabled
+      color white #333333
+      cmod image 0xc0
+      border 2 2 2 2
+    end image
+    begin image
+      type button
+      mode image allow image auto
+      state normal
+      color black #cccccc
+      file bar_horizontal_1.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state selected
+      file bar_horizontal_2.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state clicked
+      file bar_horizontal_3.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+    end image
   end
 
 %include "menus.cfg"
@@ -242,9 +286,27 @@ begin main
     bind ctrl button1 to string "\e]5;\a"
     bind ctrl button2 to string "\e[?30t"
     bind ctrl button3 to menu Eterm
-    bind anymod 0xffbe to menu Eterm
   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 string "\e]6;73;Eterm -e man Eterm\a"
+    rbutton icon exit.png action string "\e]6;70\a"
+  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
@@ -285,13 +347,12 @@ begin main
 # If true, Eterm will start iconified.
     iconic false
 
-# If true, Eterm will jump to the bottom of the window when something is echoed
-# to the terminal, either by program output or user input.
-    home_on_echo 1
+# 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 you refresh the
-# screen (^L).
-    home_on_refresh 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
diff --git a/themes/auto/menus.cfg b/themes/auto/menus.cfg
index 3235f55..d39cabd 100644
--- a/themes/auto/menus.cfg
+++ b/themes/auto/menus.cfg
@@ -39,14 +39,10 @@ begin menu
     action string "\e[?25t"
   end
   begin menuitem
-    text "Home on Echo"
+    text "Home on Output"
     action string "\e[?1010t"
   end
   begin menuitem
-    text "Home on Refresh"
-    action string "\e[?1011t"
-  end
-  begin menuitem
     text "Home on Input"
     action string "\e[?1012t"
   end
diff --git a/themes/auto/theme.cfg.in b/themes/auto/theme.cfg.in
index c453794..bce1260 100644
--- a/themes/auto/theme.cfg.in
+++ b/themes/auto/theme.cfg.in
@@ -23,11 +23,6 @@ begin main
     background black
     cursor #ffff00
     cursor_text #880000
-    scrollbar #3f1c00
-    unfocused_scrollbar #777777
-    menu #777777
-    unfocused_menu #777777
-    menu_text black
     pointer white
 
 # video attribute can either be "normal" or "reverse"
@@ -149,27 +144,43 @@ begin main
       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 :scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type anchor
       mode auto allow image auto
       state normal
+      color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
+    end image
+    begin image
+      type thumb
+      mode auto allow image auto
+      state normal
+      color black #666666
+      file thumb_1.png
+      geom :scale
+      border 3 3 3 3
+      state selected
+      file thumb_2.png
+      geom :scale
+      border 3 3 3 3
     end image
     begin image
       type up_arrow
       mode auto allow image auto
       state normal
+      color black #666666
       file button_arrow_up_1.png
       geom :scale
       border 2 2 2 2
@@ -186,6 +197,7 @@ begin main
       type down_arrow
       mode auto allow image auto
       state normal
+      color black #666666
       file button_arrow_down_1.png
       geom :scale
       border 2 2 2 2
@@ -202,18 +214,20 @@ begin main
       type menu
       mode auto allow image auto
       state normal
+      color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type submenu
       mode auto allow image auto
       state normal
+      color black #999999
       file menu1.png
       geom 100x100+0+0:scale
       border 3 15 3 3
@@ -229,6 +243,36 @@ begin main
       border 3 15 3 3
       padding 3 15 3 3
     end image
+    begin image
+      type button_bar
+      mode auto allow image auto
+      state normal
+      color black #999999
+      file bar_horizontal_1.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state disabled
+      color white #333333
+      cmod image 0xc0
+      border 2 2 2 2
+    end image
+    begin image
+      type button
+      mode auto allow image auto
+      state normal
+      color black #cccccc
+      file bar_horizontal_1.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state selected
+      file bar_horizontal_2.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state clicked
+      file bar_horizontal_3.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+    end image
   end
 
 %include "menus.cfg"
@@ -242,9 +286,27 @@ begin main
     bind ctrl button1 to string "\e]5;\a"
     bind ctrl button2 to string "\e[?30t"
     bind ctrl button3 to menu Eterm
-    bind anymod 0xffbe to menu Eterm
   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 string "\e]6;73;Eterm -e man Eterm\a"
+    rbutton icon exit.png action string "\e]6;70\a"
+  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
@@ -285,13 +347,12 @@ begin main
 # If true, Eterm will start iconified.
     iconic false
 
-# If true, Eterm will jump to the bottom of the window when something is echoed
-# to the terminal, either by program output or user input.
-    home_on_echo 1
+# 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 you refresh the
-# screen (^L).
-    home_on_refresh 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
diff --git a/themes/cEterm/menus.cfg b/themes/cEterm/menus.cfg
index 3235f55..c826a14 100644
--- a/themes/cEterm/menus.cfg
+++ b/themes/cEterm/menus.cfg
@@ -39,14 +39,10 @@ begin menu
     action string "\e[?25t"
   end
   begin menuitem
-    text "Home on Echo"
+    text "Home on Output"
     action string "\e[?1010t"
   end
   begin menuitem
-    text "Home on Refresh"
-    action string "\e[?1011t"
-  end
-  begin menuitem
     text "Home on Input"
     action string "\e[?1012t"
   end
@@ -870,6 +866,27 @@ begin menu
   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 string "\e]6;71\a"
+  end
+  begin menuitem
+    text "Exit"
+    action string "\e]6;70\a"
+  end
+end
+
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
@@ -887,6 +904,10 @@ begin menu
   end
   -
   begin menuitem
+    text "New Window..."
+    action string "\e]6;73;Eterm\a"
+  end
+  begin menuitem
     text "Version"
     action string "\e[8n"
   end
diff --git a/themes/cEterm/theme.cfg.in b/themes/cEterm/theme.cfg.in
index 9fd4bad..321cc22 100644
--- a/themes/cEterm/theme.cfg.in
+++ b/themes/cEterm/theme.cfg.in
@@ -23,11 +23,6 @@ begin main
     background black
     cursor #ffff00
     cursor_text #880000
-    scrollbar #3f1c00
-    unfocused_scrollbar #777777
-    menu #777777
-    unfocused_menu #777777
-    menu_text black
     pointer white
 
 # video attribute can either be "normal" or "reverse"
@@ -148,27 +143,43 @@ begin main
       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 :scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type anchor
       mode image allow image auto
       state normal
+      color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
+    end image
+    begin image
+      type thumb
+      mode image allow image auto
+      state normal
+      color black #666666
+      file thumb_1.png
+      geom :scale
+      border 3 3 3 3
+      state selected
+      file thumb_2.png
+      geom :scale
+      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 :scale
       border 2 2 2 2
@@ -185,6 +196,7 @@ begin main
       type down_arrow
       mode image allow image auto
       state normal
+      color black #666666
       file button_arrow_down_1.png
       geom :scale
       border 2 2 2 2
@@ -201,18 +213,20 @@ begin main
       type menu
       mode image allow image auto
       state normal
+      color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type submenu
       mode image allow image auto
       state normal
+      color black #999999
       file menu1.png
       geom 100x100+0+0:scale
       border 3 15 3 3
@@ -228,6 +242,36 @@ begin main
       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 100x100+0+0:scale
+      border 2 2 2 2
+      state disabled
+      color white #333333
+      cmod image 0xc0
+      border 2 2 2 2
+    end image
+    begin image
+      type button
+      mode image allow image auto
+      state normal
+      color black #cccccc
+      file bar_horizontal_1.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state selected
+      file bar_horizontal_2.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state clicked
+      file bar_horizontal_3.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+    end image
   end
 
 %include "menus.cfg"
@@ -241,9 +285,27 @@ begin main
     bind ctrl button1 to string "\e]5;\a"
     bind ctrl button2 to string "\e[?30t"
     bind ctrl button3 to menu Eterm
-    bind anymod 0xffbe to menu Eterm
   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 string "\e]6;73;Eterm -e man Eterm\a"
+    rbutton icon exit.png action string "\e]6;70\a"
+  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
@@ -279,13 +341,12 @@ begin main
 # If true, Eterm will start iconified.
     iconic false
 
-# If true, Eterm will jump to the bottom of the window when something is echoed
-# to the terminal, either by program output or user input.
-    home_on_echo 1
+# 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 you refresh the
-# screen (^L).
-    home_on_refresh 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
diff --git a/themes/chooser/menus.cfg b/themes/chooser/menus.cfg
index 94b447c..9f332cf 100644
--- a/themes/chooser/menus.cfg
+++ b/themes/chooser/menus.cfg
@@ -35,14 +35,10 @@ begin menu
     action string "\e[?25t"
   end
   begin menuitem
-    text "Home on Echo"
+    text "Home on Output"
     action string "\e[?1010t"
   end
   begin menuitem
-    text "Home on Refresh"
-    action string "\e[?1011t"
-  end
-  begin menuitem
     text "Home on Input"
     action string "\e[?1012t"
   end
@@ -976,25 +972,14 @@ DO_PROTOCOL(rlogin)
 DO_PROTOCOL(telnet)
 DO_PROTOCOL(ftp)
 
-begin menu
-  title Chooser
-  ECHO_ITEM(`New Eterm Window', `Eterm &\r')
-  -
-  SUBMENU_ITEM(`ssh')
-  SUBMENU_ITEM(`rlogin')
-  SUBMENU_ITEM(`telnet')
-  SUBMENU_ITEM(`ftp')
-end
-
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
-  SUBMENU_ITEM(Chooser)
-  -
   SUBMENU_ITEM(Font)
   SUBMENU_ITEM(Background)
   SUBMENU_ITEM(Terminal)
   -
+  STRING_ITEM(`New Eterm Window', `\e]6;73;Eterm\a')
   STRING_ITEM(`Version', `\e[8n')
   STRING_ITEM(`Status', `\e[9n')
   separator
diff --git a/themes/chooser/theme.cfg.in b/themes/chooser/theme.cfg.in
index e9510a9..45ab856 100644
--- a/themes/chooser/theme.cfg.in
+++ b/themes/chooser/theme.cfg.in
@@ -23,11 +23,6 @@ begin main
     background black
     cursor #ffff00
     cursor_text #880000
-    scrollbar #3f1c00
-    unfocused_scrollbar #777777
-    menu #777777
-    unfocused_menu #777777
-    menu_text black
     pointer white
 
 # video attribute can either be "normal" or "reverse"
@@ -149,27 +144,43 @@ begin main
       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 :scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type anchor
       mode image allow image auto
       state normal
+      color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
+    end image
+    begin image
+      type thumb
+      mode image allow image auto
+      state normal
+      color black #666666
+      file thumb_1.png
+      geom :scale
+      border 3 3 3 3
+      state selected
+      file thumb_2.png
+      geom :scale
+      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 :scale
       border 2 2 2 2
@@ -186,6 +197,7 @@ begin main
       type down_arrow
       mode image allow image auto
       state normal
+      color black #666666
       file button_arrow_down_1.png
       geom :scale
       border 2 2 2 2
@@ -202,18 +214,20 @@ begin main
       type menu
       mode image allow image auto
       state normal
+      color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type submenu
       mode image allow image auto
       state normal
+      color black #999999
       file menu1.png
       geom 100x100+0+0:scale
       border 3 15 3 3
@@ -229,6 +243,36 @@ begin main
       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 100x100+0+0:scale
+      border 2 2 2 2
+      state disabled
+      color white #333333
+      cmod image 0xc0
+      border 2 2 2 2
+    end image
+    begin image
+      type button
+      mode image allow image auto
+      state normal
+      color black #cccccc
+      file bar_horizontal_1.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state selected
+      file bar_horizontal_2.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state clicked
+      file bar_horizontal_3.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+    end image
   end
 
 %include "menus.cfg"
@@ -242,9 +286,28 @@ begin main
     bind ctrl button1 to string "\e]5;\a"
     bind ctrl button2 to string "\e[?30t"
     bind ctrl button3 to menu Eterm
-    bind anymod 0xffbe to menu Eterm
   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 ssh action menu ssh
+    button rlogin action menu rlogin
+    button telnet action menu telnet
+    button ftp action menu ftp
+    rbutton icon help.png action string "\e]6;73;Eterm -e man Eterm\a"
+    rbutton icon exit.png action string "\e]6;70\a"
+  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
@@ -280,13 +343,12 @@ begin main
 # If true, Eterm will start iconified.
     iconic false
 
-# If true, Eterm will jump to the bottom of the window when something is echoed
-# to the terminal, either by program output or user input.
-    home_on_echo 1
+# 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 you refresh the
-# screen (^L).
-    home_on_refresh 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
diff --git a/themes/emacs/menus.cfg b/themes/emacs/menus.cfg
index 2d71044..7b09fdd 100644
--- a/themes/emacs/menus.cfg
+++ b/themes/emacs/menus.cfg
@@ -39,14 +39,10 @@ begin menu
     action string "\e[?25t"
   end
   begin menuitem
-    text "Home on Echo"
+    text "Home on Output"
     action string "\e[?1010t"
   end
   begin menuitem
-    text "Home on Refresh"
-    action string "\e[?1011t"
-  end
-  begin menuitem
     text "Home on Input"
     action string "\e[?1012t"
   end
@@ -1109,27 +1105,6 @@ end
 begin menu
   title Eterm
   begin menuitem
-    text "Buffers"
-    action submenu Buffers
-  end
-  begin menuitem
-    text "Files"
-    action submenu Files
-  end
-  begin menuitem
-    text "Edit"
-    action submenu Edit
-  end
-  begin menuitem
-    text "Search"
-    action submenu Search
-  end
-  begin menuitem
-    text "Help"
-    action submenu Help
-  end
-  -
-  begin menuitem
     text "Font"
     action submenu Font
   end
diff --git a/themes/emacs/theme.cfg.in b/themes/emacs/theme.cfg.in
index a2d6407..504a4ae 100644
--- a/themes/emacs/theme.cfg.in
+++ b/themes/emacs/theme.cfg.in
@@ -23,11 +23,6 @@ begin main
     background black
     cursor #ffff00
     cursor_text #880000
-    scrollbar #3f1c00
-    unfocused_scrollbar #777777
-    menu #777777
-    unfocused_menu #777777
-    menu_text black
     pointer white
 
 # video attribute can either be "normal" or "reverse"
@@ -149,27 +144,43 @@ begin main
       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 :scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type anchor
       mode image allow image auto
       state normal
+      color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
+    end image
+    begin image
+      type thumb
+      mode image allow image auto
+      state normal
+      color black #666666
+      file thumb_1.png
+      geom :scale
+      border 3 3 3 3
+      state selected
+      file thumb_2.png
+      geom :scale
+      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 :scale
       border 2 2 2 2
@@ -186,6 +197,7 @@ begin main
       type down_arrow
       mode image allow image auto
       state normal
+      color black #666666
       file button_arrow_down_1.png
       geom :scale
       border 2 2 2 2
@@ -202,18 +214,20 @@ begin main
       type menu
       mode image allow image auto
       state normal
+      color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type submenu
       mode image allow image auto
       state normal
+      color black #999999
       file menu1.png
       geom 100x100+0+0:scale
       border 3 15 3 3
@@ -229,6 +243,36 @@ begin main
       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 100x100+0+0:scale
+      border 2 2 2 2
+      state disabled
+      color white #333333
+      cmod image 0xc0
+      border 2 2 2 2
+    end image
+    begin image
+      type button
+      mode image allow image auto
+      state normal
+      color black #cccccc
+      file bar_horizontal_1.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state selected
+      file bar_horizontal_2.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state clicked
+      file bar_horizontal_3.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+    end image
   end
 
 %include "menus.cfg"
@@ -242,9 +286,29 @@ begin main
     bind ctrl button1 to string "\e]5;\a"
     bind ctrl button2 to string "\e[?30t"
     bind ctrl button3 to menu Eterm
-    bind anymod 0xffbe to menu Eterm
   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 string "\e]6;73;Eterm -e man Eterm\a"
+    rbutton icon exit.png action string "\e]6;70\a"
+  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
@@ -280,13 +344,12 @@ begin main
 # If true, Eterm will start iconified.
     iconic false
 
-# If true, Eterm will jump to the bottom of the window when something is echoed
-# to the terminal, either by program output or user input.
-    home_on_echo 0
+# 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 you refresh the
-# screen (^L).
-    home_on_refresh 0
+# 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
diff --git a/themes/irc/menus.cfg b/themes/irc/menus.cfg
index 3235f55..c826a14 100644
--- a/themes/irc/menus.cfg
+++ b/themes/irc/menus.cfg
@@ -39,14 +39,10 @@ begin menu
     action string "\e[?25t"
   end
   begin menuitem
-    text "Home on Echo"
+    text "Home on Output"
     action string "\e[?1010t"
   end
   begin menuitem
-    text "Home on Refresh"
-    action string "\e[?1011t"
-  end
-  begin menuitem
     text "Home on Input"
     action string "\e[?1012t"
   end
@@ -870,6 +866,27 @@ begin menu
   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 string "\e]6;71\a"
+  end
+  begin menuitem
+    text "Exit"
+    action string "\e]6;70\a"
+  end
+end
+
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
@@ -887,6 +904,10 @@ begin menu
   end
   -
   begin menuitem
+    text "New Window..."
+    action string "\e]6;73;Eterm\a"
+  end
+  begin menuitem
     text "Version"
     action string "\e[8n"
   end
diff --git a/themes/irc/theme.cfg.in b/themes/irc/theme.cfg.in
index a8566d2..1564e3e 100644
--- a/themes/irc/theme.cfg.in
+++ b/themes/irc/theme.cfg.in
@@ -23,11 +23,6 @@ begin main
     background black
     cursor #ffff00
     cursor_text #880000
-    scrollbar #3f1c00
-    unfocused_scrollbar #777777
-    menu #777777
-    unfocused_menu #777777
-    menu_text black
     pointer white
 
 # video attribute can either be "normal" or "reverse"
@@ -84,7 +79,7 @@ begin main
     font default @DEF_FONT_IDX@
     font 0 @FONT0@
     font 1 @FONT1@
-    font 2 @FONT2@
+    font 2 shine
     font 3 @FONT3@
     font 4 @FONT4@
     font 5 8x13
@@ -151,27 +146,43 @@ begin main
       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 :scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type anchor
       mode image allow image auto
       state normal
+      color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
+    end image
+    begin image
+      type thumb
+      mode image allow image auto
+      state normal
+      color black #666666
+      file thumb_1.png
+      geom :scale
+      border 3 3 3 3
+      state selected
+      file thumb_2.png
+      geom :scale
+      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 :scale
       border 2 2 2 2
@@ -188,6 +199,7 @@ begin main
       type down_arrow
       mode image allow image auto
       state normal
+      color black #666666
       file button_arrow_down_1.png
       geom :scale
       border 2 2 2 2
@@ -204,18 +216,20 @@ begin main
       type menu
       mode image allow image auto
       state normal
+      color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type submenu
       mode image allow image auto
       state normal
+      color black #999999
       file menu1.png
       geom 100x100+0+0:scale
       border 3 15 3 3
@@ -231,6 +245,36 @@ begin main
       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 100x100+0+0:scale
+      border 2 2 2 2
+      state disabled
+      color white #333333
+      cmod image 0xc0
+      border 2 2 2 2
+    end image
+    begin image
+      type button
+      mode image allow image auto
+      state normal
+      color black #cccccc
+      file bar_horizontal_1.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state selected
+      file bar_horizontal_2.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state clicked
+      file bar_horizontal_3.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+    end image
   end
 
 %include "menus.cfg"
@@ -244,9 +288,27 @@ begin main
     bind ctrl button1 to string "\e]5;\a"
     bind ctrl button2 to string "\e[?30t"
     bind ctrl button3 to menu Eterm
-    bind anymod 0xffbe to menu Eterm
   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 string "\e]6;73;Eterm -e man Eterm\a"
+    rbutton icon exit.png action string "\e]6;70\a"
+  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
@@ -282,13 +344,12 @@ begin main
 # If true, Eterm will start iconified.
     iconic false
 
-# If true, Eterm will jump to the bottom of the window when something is echoed
-# to the terminal, either by program output or user input.
-    home_on_echo 0
+# 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 you refresh the
-# screen (^L).
-    home_on_refresh 0
+# 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
diff --git a/themes/mutt/menus.cfg b/themes/mutt/menus.cfg
index da62961..c512f3e 100644
--- a/themes/mutt/menus.cfg
+++ b/themes/mutt/menus.cfg
@@ -39,14 +39,10 @@ begin menu
     action string "\e[?25t"
   end
   begin menuitem
-    text "Home on Echo"
+    text "Home on Output"
     action string "\e[?1010t"
   end
   begin menuitem
-    text "Home on Refresh"
-    action string "\e[?1011t"
-  end
-  begin menuitem
     text "Home on Input"
     action string "\e[?1012t"
   end
@@ -1043,15 +1039,6 @@ end
 begin menu
   title Eterm
   begin menuitem
-    text "Messages"
-    action submenu Messages
-  end
-  begin menuitem
-    text "Mailbox"
-    action submenu Mailbox
-  end
-  -
-  begin menuitem
     text "Font"
     action submenu Font
   end
diff --git a/themes/mutt/theme.cfg.in b/themes/mutt/theme.cfg.in
index 16a4210..0865b9c 100644
--- a/themes/mutt/theme.cfg.in
+++ b/themes/mutt/theme.cfg.in
@@ -23,11 +23,6 @@ begin main
     background black
     cursor #ffff00
     cursor_text #880000
-    scrollbar #3f1c00
-    unfocused_scrollbar #777777
-    menu #777777
-    unfocused_menu #777777
-    menu_text black
     pointer white
 
 # video attribute can either be "normal" or "reverse"
@@ -145,21 +140,93 @@ begin main
     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 :scale
+      border 2 2 2 2
+    end image
+    begin image
+      type anchor
+      mode image allow image auto
+      state normal
+      color black #666666
+      file bar_vertical_1.png
+      geom :scale
+      border 2 2 2 2
+      state selected
+      file bar_vertical_2.png
+      geom :scale
+      border 2 2 2 2
+    end image
+    begin image
+      type thumb
+      mode image allow image auto
+      state normal
+      color black #666666
+      file thumb_1.png
+      geom :scale
+      border 3 3 3 3
+      state selected
+      file thumb_2.png
+      geom :scale
+      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 :scale
+      border 2 2 2 2
+      state selected
+      file button_arrow_up_2.png
+      geom :scale
+      border 2 2 2 2
+      state clicked
+      file button_arrow_up_3.png
+      geom :scale
+      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 :scale
+      border 2 2 2 2
+      state selected
+      file button_arrow_down_2.png
+      geom :scale
+      border 2 2 2 2
+      state clicked
+      file button_arrow_down_3.png
+      geom :scale
+      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 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type submenu
       mode image allow image auto
       state normal
+      color black #999999
       file menu1.png
       geom 100x100+0+0:scale
       border 3 15 3 3
@@ -175,6 +242,36 @@ begin main
       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 100x100+0+0:scale
+      border 2 2 2 2
+      state disabled
+      color white #333333
+      cmod image 0xc0
+      border 2 2 2 2
+    end image
+    begin image
+      type button
+      mode image allow image auto
+      state normal
+      color black #cccccc
+      file bar_horizontal_1.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state selected
+      file bar_horizontal_2.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state clicked
+      file bar_horizontal_3.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+    end image
   end
 
 %include "menus.cfg"
@@ -188,9 +285,26 @@ begin main
     bind ctrl button1 to string "\e]5;\a"
     bind ctrl button2 to string "\e[?30t"
     bind ctrl button3 to menu Eterm
-    bind anymod 0xffbe to menu Eterm
   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 string "\e]6;73;Eterm -e man Eterm\a"
+    rbutton icon exit.png action string "\e]6;70\a"
+  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
@@ -226,13 +340,12 @@ begin main
 # If true, Eterm will start iconified.
     iconic false
 
-# If true, Eterm will jump to the bottom of the window when something is echoed
-# to the terminal, either by program output or user input.
-    home_on_echo 1
+# 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 you refresh the
-# screen (^L).
-    home_on_refresh 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
diff --git a/themes/trans/menus.cfg b/themes/trans/menus.cfg
index 3235f55..c826a14 100644
--- a/themes/trans/menus.cfg
+++ b/themes/trans/menus.cfg
@@ -39,14 +39,10 @@ begin menu
     action string "\e[?25t"
   end
   begin menuitem
-    text "Home on Echo"
+    text "Home on Output"
     action string "\e[?1010t"
   end
   begin menuitem
-    text "Home on Refresh"
-    action string "\e[?1011t"
-  end
-  begin menuitem
     text "Home on Input"
     action string "\e[?1012t"
   end
@@ -870,6 +866,27 @@ begin menu
   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 string "\e]6;71\a"
+  end
+  begin menuitem
+    text "Exit"
+    action string "\e]6;70\a"
+  end
+end
+
 # This is the menu that gets called by Ctrl-Button3
 begin menu
   title Eterm
@@ -887,6 +904,10 @@ begin menu
   end
   -
   begin menuitem
+    text "New Window..."
+    action string "\e]6;73;Eterm\a"
+  end
+  begin menuitem
     text "Version"
     action string "\e[8n"
   end
diff --git a/themes/trans/theme.cfg.in b/themes/trans/theme.cfg.in
index 62bc939..21a4597 100644
--- a/themes/trans/theme.cfg.in
+++ b/themes/trans/theme.cfg.in
@@ -23,11 +23,6 @@ begin main
     background black
     cursor #ffff00
     cursor_text #880000
-    scrollbar #3f1c00
-    unfocused_scrollbar #777777
-    menu #777777
-    unfocused_menu #777777
-    menu_text black
     pointer white
 
 # video attribute can either be "normal" or "reverse"
@@ -149,27 +144,43 @@ begin main
       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 :scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type anchor
       mode image allow image auto
       state normal
+      color black #666666
       file bar_vertical_1.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_vertical_2.png
       geom :scale
-      border 3 3 2 2
+      border 2 2 2 2
+    end image
+    begin image
+      type thumb
+      mode image allow image auto
+      state normal
+      color black #666666
+      file thumb_1.png
+      geom :scale
+      border 3 3 3 3
+      state selected
+      file thumb_2.png
+      geom :scale
+      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 :scale
       border 2 2 2 2
@@ -186,6 +197,7 @@ begin main
       type down_arrow
       mode image allow image auto
       state normal
+      color black #666666
       file button_arrow_down_1.png
       geom :scale
       border 2 2 2 2
@@ -202,18 +214,20 @@ begin main
       type menu
       mode image allow image auto
       state normal
+      color black #999999
       file bar_horizontal_1.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
       state selected
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
-      border 3 3 2 2
+      border 2 2 2 2
     end image
     begin image
       type submenu
       mode image allow image auto
       state normal
+      color black #999999
       file menu1.png
       geom 100x100+0+0:scale
       border 3 15 3 3
@@ -229,6 +243,36 @@ begin main
       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 100x100+0+0:scale
+      border 2 2 2 2
+      state disabled
+      color white #333333
+      cmod image 0xc0
+      border 2 2 2 2
+    end image
+    begin image
+      type button
+      mode image allow image auto
+      state normal
+      color black #cccccc
+      file bar_horizontal_1.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state selected
+      file bar_horizontal_2.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+      state clicked
+      file bar_horizontal_3.png
+      geom 100x100+0+0:scale
+      border 2 2 2 2
+    end image
   end
 
 %include "menus.cfg"
@@ -242,9 +286,27 @@ begin main
     bind ctrl button1 to string "\e]5;\a"
     bind ctrl button2 to string "\e[?30t"
     bind ctrl button3 to menu Eterm
-    bind anymod 0xffbe to menu Eterm
   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 string "\e]6;73;Eterm -e man Eterm\a"
+    rbutton icon exit.png action string "\e]6;70\a"
+  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
@@ -280,13 +342,12 @@ begin main
 # If true, Eterm will start iconified.
     iconic false
 
-# If true, Eterm will jump to the bottom of the window when something is echoed
-# to the terminal, either by program output or user input.
-    home_on_echo 1
+# 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 you refresh the
-# screen (^L).
-    home_on_refresh 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