Mon Jun 25 17:41:55 2001 Michael Jennings (mej)

Several changes here, many of which come from the Debian bug list or
from bug reports on IRC.  First off, I believe I've fixed an install
issue with the bg/ directory.  I also put an alternative acsc line in
the terminfo file to see if it fixes anything on Debian.  (RH works
fine.)  I removed the "main" context from all the theme files...which
is something I should've done ages ago, but I forgot.

I made a couple things options which were not previously configurable.
The proportional font thingie which shrank the character cell width is
now the --proportional option.  The automatic window gravity on resize
is now the --resize-gravity option.  Both are boolean, and both are
documented in the man page.

And finally, I added the kill() function to the script language.  At
this point it can only take signals as numbers, but that's good enough
for now.


SVN revision: 4857

8 files changed, 147 insertions, 187 deletions

diff --git a/themes/Eterm/theme.cfg.in b/themes/Eterm/theme.cfg.in
index c241b86..efd0d5a 100644
--- a/themes/Eterm/theme.cfg.in
+++ b/themes/Eterm/theme.cfg.in
@@ -12,11 +12,8 @@
 # directly or indirectly through the use of, or inability to use,
 # this program.  Use at your OWN risk.
 
-# A begin to get things started.
-begin main
-
 # Define the color properties
-  begin color
+begin color
 
 # Foreground, background, cursor, scrollbar, pointer colors
     foreground #aaaaaa
@@ -59,11 +56,11 @@ begin main
 
 # This ends the color section.  Any text after the word "end" is
 # assumed to be a comment and ignored.
-  end color
+end color
 
 # The X11 attributes section.  Should be fairly self-explanatory,
 # but if not, consult the X man page.
-  begin attributes
+begin attributes
 
 # Geometry == widthxheight+x_offset+y_offset, offsets from top left
 #             if +, bottom right if -
@@ -85,22 +82,22 @@ begin main
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
-  end attributes
+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
+begin multichar
     font 0 @MFONT0@
     font 1 @MFONT1@
     font 2 @MFONT2@
     font 3 @MFONT3@
     font 4 @MFONT4@
     encoding @MULTICHAR_ENCODING@
-  end multichar
+end multichar
 
 # Define the imageclasses.
-  begin 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.
@@ -273,7 +270,7 @@ begin main
       geom 100x100+0+0:scale
       border 2 3 2 2
     end image
-  end
+end
 
 %include "menus.cfg"
 
@@ -282,16 +279,16 @@ begin main
 #
 # Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
 #
-  begin actions
+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
+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
+begin button_bar
 
 # Specify a font.  The default buttonbar font is the default terminal
 # font as defined in the attributes section above.
@@ -306,7 +303,7 @@ begin main
     button Terminal action menu Terminal
     rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
     rbutton icon exit.png action script "exit"
-  end button_bar
+end button_bar
 
 # The XIM support options.
 # input_method: set the name of your favorate input method program
@@ -318,7 +315,7 @@ begin main
 
 # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
 # "off", or "false" for FALSE.
-  begin toggles
+begin toggles
 
 # If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
     map_alert on
@@ -369,9 +366,9 @@ begin main
 # memory to spare, it's a good idea.
 #    double_buffer true
 
-  end toggles
+end toggles
 
-  begin keyboard
+begin keyboard
 
 # Use the supplied keysym to reduce/enlarge the font
     smallfont_key LessThan
@@ -383,9 +380,9 @@ begin main
 # Greek keyboard mode.  First the word "greek", then its boolean
 # state, then its mode (either "iso" or "ibm").
 #    greek off iso
-  end keyboard
+end keyboard
 
-  begin misc
+begin misc
 
 # The command to which to pipe print requests (printscreen)
 #    print_pipe "lpr"
@@ -409,6 +406,4 @@ begin main
 # Program to exec (intended for use with themes)
 #    exec foo
 
-  end misc
-
-end main
+end misc
diff --git a/themes/auto/theme.cfg.in b/themes/auto/theme.cfg.in
index 905eb61..b4499bf 100644
--- a/themes/auto/theme.cfg.in
+++ b/themes/auto/theme.cfg.in
@@ -12,11 +12,8 @@
 # directly or indirectly through the use of, or inability to use,
 # this program.  Use at your OWN risk.
 
-# A begin to get things started.
-begin main
-
 # Define the color properties
-  begin color
+begin color
 
 # Foreground, background, cursor, scrollbar, pointer colors
     foreground #aaaaaa
@@ -59,11 +56,11 @@ begin main
 
 # This ends the color section.  Any text after the word "end" is
 # assumed to be a comment and ignored.
-  end color
+end color
 
 # The X11 attributes section.  Should be fairly self-explanatory,
 # but if not, consult the X man page.
-  begin attributes
+begin attributes
 
 # Geometry == widthxheight+x_offset+y_offset, offsets from top left
 #             if +, bottom right if -
@@ -85,22 +82,22 @@ begin main
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
-  end attributes
+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
+begin multichar
     font 0 @MFONT0@
     font 1 @MFONT1@
     font 2 @MFONT2@
     font 3 @MFONT3@
     font 4 @MFONT4@
     encoding @MULTICHAR_ENCODING@
-  end multichar
+end multichar
 
 # Define the imageclasses.
-  begin 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.
@@ -273,7 +270,7 @@ begin main
       geom 100x100+0+0:scale
       border 2 3 2 2
     end image
-  end
+end
 
 %include "menus.cfg"
 
@@ -282,16 +279,16 @@ begin main
 #
 # Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
 #
-  begin actions
+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
+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
+begin button_bar
 
 # Specify a font.  The default buttonbar font is the default terminal
 # font as defined in the attributes section above.
@@ -306,7 +303,7 @@ begin main
     button Terminal action menu Terminal
     rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
     rbutton icon exit.png action script "exit"
-  end button_bar
+end button_bar
 
 # The XIM support options.
 # input_method: set the name of your favorate input method program
@@ -318,7 +315,7 @@ begin main
 
 # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
 # "off", or "false" for FALSE.
-  begin toggles
+begin toggles
 
 # If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
     map_alert on
@@ -364,9 +361,9 @@ begin main
 # If true, Eterm will run with no window borders.
     borderless false
 
-  end toggles
+end toggles
 
-  begin keyboard
+begin keyboard
 
 # Use the supplied keysym to reduce/enlarge the font
     smallfont_key LessThan
@@ -378,9 +375,9 @@ begin main
 # Greek keyboard mode.  First the word "greek", then its boolean
 # state, then its mode (either "iso" or "ibm").
 #    greek off iso
-  end keyboard
+end keyboard
 
-  begin misc
+begin misc
 
 # The command to which to pipe print requests (printscreen)
 #    print_pipe "lpr"
@@ -404,6 +401,4 @@ begin main
 # Program to exec (intended for use with themes)
 #    exec foo
 
-  end misc
-
-end main
+end misc
diff --git a/themes/cEterm/theme.cfg.in b/themes/cEterm/theme.cfg.in
index b6ed289..3bddc38 100644
--- a/themes/cEterm/theme.cfg.in
+++ b/themes/cEterm/theme.cfg.in
@@ -12,11 +12,8 @@
 # directly or indirectly through the use of, or inability to use,
 # this program.  Use at your OWN risk.
 
-# A begin to get things started.
-begin main
-
 # Define the color properties
-  begin color
+begin color
 
 # Foreground, background, cursor, scrollbar, pointer colors
     foreground #aaaaaa
@@ -58,11 +55,11 @@ begin main
 
 # This ends the color section.  Any text after the word "end" is
 # assumed to be a comment and ignored.
-  end color
+end color
 
 # The X11 attributes section.  Should be fairly self-explanatory,
 # but if not, consult the X man page.
-  begin attributes
+begin attributes
 
 # Geometry == widthxheight+x_offset+y_offset, offsets from top left
 #             if +, bottom right if -
@@ -84,22 +81,22 @@ begin main
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
-  end attributes
+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
+begin multichar
     font 0 @MFONT0@
     font 1 @MFONT1@
     font 2 @MFONT2@
     font 3 @MFONT3@
     font 4 @MFONT4@
     encoding @MULTICHAR_ENCODING@
-  end multichar
+end multichar
 
 # Define the imageclasses.
-  begin 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.
@@ -272,7 +269,7 @@ begin main
       geom 100x100+0+0:scale
       border 2 3 2 2
     end image
-  end
+end
 
 %include "menus.cfg"
 
@@ -281,16 +278,16 @@ begin main
 #
 # Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
 #
-  begin actions
+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
+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
+begin button_bar
 
 # Specify a font.  The default buttonbar font is the default terminal
 # font as defined in the attributes section above.
@@ -305,7 +302,7 @@ begin main
     button Terminal action menu Terminal
     rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
     rbutton icon exit.png action script "exit"
-  end button_bar
+end button_bar
 
 # The XIM support options.
 # input_method: set the name of your favorate input method program
@@ -317,7 +314,7 @@ begin main
 
 # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
 # "off", or "false" for FALSE.
-  begin toggles
+begin toggles
 
 # If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
     map_alert on
@@ -358,9 +355,9 @@ begin main
 # If true, Eterm will run with no window borders.
     borderless false
 
-  end toggles
+end toggles
 
-  begin keyboard
+begin keyboard
 
 # Use the supplied keysym to reduce/enlarge the font
     smallfont_key LessThan
@@ -372,9 +369,9 @@ begin main
 # Greek keyboard mode.  First the word "greek", then its boolean
 # state, then its mode (either "iso" or "ibm").
 #    greek off iso
-  end keyboard
+end keyboard
 
-  begin misc
+begin misc
 
 # The command to which to pipe print requests (printscreen)
 #    print_pipe "lpr"
@@ -398,6 +395,4 @@ begin main
 # Program to exec (intended for use with themes)
 #    exec foo
 
-  end misc
-
-end main
+end misc
diff --git a/themes/chooser/theme.cfg.in b/themes/chooser/theme.cfg.in
index 11ed396..c5fa930 100644
--- a/themes/chooser/theme.cfg.in
+++ b/themes/chooser/theme.cfg.in
@@ -12,11 +12,8 @@
 # directly or indirectly through the use of, or inability to use,
 # this program.  Use at your OWN risk.
 
-# A begin to get things started.
-begin main
-
 # Define the color properties
-  begin color
+begin color
 
 # Foreground, background, cursor, scrollbar, pointer colors
     foreground #aaaaaa
@@ -59,11 +56,11 @@ begin main
 
 # This ends the color section.  Any text after the word "end" is
 # assumed to be a comment and ignored.
-  end color
+end color
 
 # The X11 attributes section.  Should be fairly self-explanatory,
 # but if not, consult the X man page.
-  begin attributes
+begin attributes
 
 # Geometry == widthxheight+x_offset+y_offset, offsets from top left
 #             if +, bottom right if -
@@ -85,22 +82,22 @@ begin main
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
-  end attributes
+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
+begin multichar
     font 0 @MFONT0@
     font 1 @MFONT1@
     font 2 @MFONT2@
     font 3 @MFONT3@
     font 4 @MFONT4@
     encoding @MULTICHAR_ENCODING@
-  end multichar
+end multichar
 
 # Define the imageclasses.
-  begin 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.
@@ -273,7 +270,7 @@ begin main
       geom 100x100+0+0:scale
       border 2 3 2 2
     end image
-  end
+end
 
 %include "menus.cfg"
 
@@ -282,16 +279,16 @@ begin main
 #
 # Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
 #
-  begin actions
+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
+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
+begin button_bar
 
 # Specify a font.  The default buttonbar font is the default terminal
 # font as defined in the attributes section above.
@@ -307,7 +304,7 @@ begin main
     button ftp action menu ftp
     rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
     rbutton icon exit.png action script "exit"
-  end button_bar
+end button_bar
 
 # The XIM support options.
 # input_method: set the name of your favorate input method program
@@ -319,7 +316,7 @@ begin main
 
 # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
 # "off", or "false" for FALSE.
-  begin toggles
+begin toggles
 
 # If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
     map_alert on
@@ -360,9 +357,9 @@ begin main
 # If true, Eterm will run with no window borders.
     borderless false
 
-  end toggles
+end toggles
 
-  begin keyboard
+begin keyboard
 
 # Use the supplied keysym to reduce/enlarge the font
     smallfont_key LessThan
@@ -374,9 +371,9 @@ begin main
 # Greek keyboard mode.  First the word "greek", then its boolean
 # state, then its mode (either "iso" or "ibm").
 #    greek off iso
-  end keyboard
+end keyboard
 
-  begin misc
+begin misc
 
 # The command to which to pipe print requests (printscreen)
 #    print_pipe "lpr"
@@ -400,6 +397,4 @@ begin main
 # Program to exec (intended for use with themes)
 #    exec foo
 
-  end misc
-
-end main
+end misc
diff --git a/themes/emacs/theme.cfg.in b/themes/emacs/theme.cfg.in
index 7c3fb74..55599fa 100644
--- a/themes/emacs/theme.cfg.in
+++ b/themes/emacs/theme.cfg.in
@@ -12,11 +12,8 @@
 # directly or indirectly through the use of, or inability to use,
 # this program.  Use at your OWN risk.
 
-# A begin to get things started.
-begin main
-
 # Define the color properties
-  begin color
+begin color
 
 # Foreground, background, cursor, scrollbar, pointer colors
     foreground #aaaaaa
@@ -59,11 +56,11 @@ begin main
 
 # This ends the color section.  Any text after the word "end" is
 # assumed to be a comment and ignored.
-  end color
+end color
 
 # The X11 attributes section.  Should be fairly self-explanatory,
 # but if not, consult the X man page.
-  begin attributes
+begin attributes
 
 # Geometry == widthxheight+x_offset+y_offset, offsets from top left
 #             if +, bottom right if -
@@ -85,22 +82,22 @@ begin main
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
-  end attributes
+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
+begin multichar
     font 0 @MFONT0@
     font 1 @MFONT1@
     font 2 @MFONT2@
     font 3 @MFONT3@
     font 4 @MFONT4@
     encoding @MULTICHAR_ENCODING@
-  end multichar
+end multichar
 
 # Define the imageclasses.
-  begin 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.
@@ -273,7 +270,7 @@ begin main
       geom 100x100+0+0:scale
       border 2 3 2 2
     end image
-  end
+end
 
 %include "menus.cfg"
 
@@ -282,16 +279,16 @@ begin main
 #
 # Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
 #
-  begin actions
+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
+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
+begin button_bar
 
 # Specify a font.  The default buttonbar font is the default terminal
 # font as defined in the attributes section above.
@@ -308,7 +305,7 @@ begin main
     button Help action menu Help
     rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
     rbutton icon exit.png action script "exit"
-  end button_bar
+end button_bar
 
 # The XIM support options.
 # input_method: set the name of your favorate input method program
@@ -320,7 +317,7 @@ begin main
 
 # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
 # "off", or "false" for FALSE.
-  begin toggles
+begin toggles
 
 # If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
     map_alert on
@@ -361,9 +358,9 @@ begin main
 # If true, Eterm will run with no window borders.
     borderless false
 
-  end toggles
+end toggles
 
-  begin keyboard
+begin keyboard
 
 # Use the supplied keysym to reduce/enlarge the font
     smallfont_key LessThan
@@ -375,9 +372,9 @@ begin main
 # Greek keyboard mode.  First the word "greek", then its boolean
 # state, then its mode (either "iso" or "ibm").
 #    greek off iso
-  end keyboard
+end keyboard
 
-  begin misc
+begin misc
 
 # The command to which to pipe print requests (printscreen)
 #    print_pipe "lpr"
@@ -401,6 +398,4 @@ begin main
 # Program to exec (intended for use with themes)
     exec emacs -nw
 
-  end misc
-
-end main
+end misc
diff --git a/themes/irc/theme.cfg.in b/themes/irc/theme.cfg.in
index 473b3cc..3e9e5d0 100644
--- a/themes/irc/theme.cfg.in
+++ b/themes/irc/theme.cfg.in
@@ -12,11 +12,8 @@
 # directly or indirectly through the use of, or inability to use,
 # this program.  Use at your OWN risk.
 
-# A begin to get things started.
-begin main
-
 # Define the color properties
-  begin color
+begin color
 
 # Foreground, background, cursor, scrollbar, pointer colors
     foreground #aaaaaa
@@ -59,11 +56,11 @@ begin main
 
 # This ends the color section.  Any text after the word "end" is
 # assumed to be a comment and ignored.
-  end color
+end color
 
 # The X11 attributes section.  Should be fairly self-explanatory,
 # but if not, consult the X man page.
-  begin attributes
+begin attributes
 
 # Geometry == widthxheight+x_offset+y_offset, offsets from top left
 #             if +, bottom right if -
@@ -87,22 +84,22 @@ begin main
     font 7 10x20
     font 8 12x24
 #    font bold 7x14
-  end attributes
+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
+begin multichar
     font 0 @MFONT0@
     font 1 @MFONT1@
     font 2 @MFONT2@
     font 3 @MFONT3@
     font 4 @MFONT4@
     encoding @MULTICHAR_ENCODING@
-  end multichar
+end multichar
 
 # Define the imageclasses.
-  begin 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.
@@ -275,7 +272,7 @@ begin main
       geom 100x100+0+0:scale
       border 2 3 2 2
     end image
-  end
+end
 
 %include "menus.cfg"
 
@@ -284,16 +281,16 @@ begin main
 #
 # Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
 #
-  begin actions
+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
+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
+begin button_bar
 
 # Specify a font.  The default buttonbar font is the default terminal
 # font as defined in the attributes section above.
@@ -308,7 +305,7 @@ begin main
     button Terminal action menu Terminal
     rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
     rbutton icon exit.png action script "exit"
-  end button_bar
+end button_bar
 
 # The XIM support options.
 # input_method: set the name of your favorate input method program
@@ -320,7 +317,7 @@ begin main
 
 # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
 # "off", or "false" for FALSE.
-  begin toggles
+begin toggles
 
 # If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
     map_alert on
@@ -366,9 +363,9 @@ begin main
 # memory to spare, it's a good idea.
 #    double_buffer true
 
-  end toggles
+end toggles
 
-  begin keyboard
+begin keyboard
 
 # Use the supplied keysym to reduce/enlarge the font
     smallfont_key LessThan
@@ -380,9 +377,9 @@ begin main
 # Greek keyboard mode.  First the word "greek", then its boolean
 # state, then its mode (either "iso" or "ibm").
 #    greek off iso
-  end keyboard
+end keyboard
 
-  begin misc
+begin misc
 
 # The command to which to pipe print requests (printscreen)
 #    print_pipe "lpr"
@@ -406,6 +403,4 @@ begin main
 # Program to exec (intended for use with themes)
     exec irc
 
-  end misc
-
-end main
+end misc
diff --git a/themes/mutt/theme.cfg.in b/themes/mutt/theme.cfg.in
index b016764..e790289 100644
--- a/themes/mutt/theme.cfg.in
+++ b/themes/mutt/theme.cfg.in
@@ -12,11 +12,8 @@
 # directly or indirectly through the use of, or inability to use,
 # this program.  Use at your OWN risk.
 
-# A begin to get things started.
-begin main
-
 # Define the color properties
-  begin color
+begin color
 
 # Foreground, background, cursor, scrollbar, pointer colors
     foreground #aaaaaa
@@ -59,7 +56,7 @@ begin main
 
 # This ends the color section.  Any text after the word "end" is
 # assumed to be a comment and ignored.
-  end color
+end color
 
 # The X11 attributes section.  Should be fairly self-explanatory,
 # but if not, consult the X man page.
@@ -85,7 +82,7 @@ begin main
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
-  end attributes
+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"
@@ -97,7 +94,7 @@ begin main
     font 3 @MFONT3@
     font 4 @MFONT4@
     encoding @MULTICHAR_ENCODING@
-  end multichar
+end multichar
 
 # Define the imageclasses.
   begin imageclasses
@@ -137,7 +134,7 @@ begin main
       border 0 0 0 0
 
 # Th-th-th-th-that's all folks.
-    end image
+  end image
 
     begin image
       type trough
@@ -148,7 +145,7 @@ begin main
 # Here is how you specify the geometry string separately.  See the man page for its syntax.
       geom :scale
       border 2 2 2 3
-    end image
+  end image
     begin image
       type anchor
       mode image allow image auto
@@ -161,7 +158,7 @@ begin main
       file bar_vertical_2.png
       geom :scale
       border 2 2 2 3
-    end image
+  end image
     begin image
       type thumb
       mode image allow image auto
@@ -174,7 +171,7 @@ begin main
       file thumb_2.png
       geom :scale
       border 3 3 3 3
-    end image
+  end image
     begin image
       type up_arrow
       mode image allow image auto
@@ -191,7 +188,7 @@ begin main
       file button_arrow_up_3.png
       geom :scale
       border 2 2 2 2
-    end image
+  end image
     begin image
       type down_arrow
       mode image allow image auto
@@ -208,7 +205,7 @@ begin main
       file button_arrow_down_3.png
       geom :scale
       border 2 2 2 2
-    end image
+  end image
     begin image
       type menu
       mode image allow image auto
@@ -221,7 +218,7 @@ begin main
       file bar_horizontal_2.png
       geom 100x100+0+0:scale
       border 2 3 2 3
-    end image
+  end image
     begin image
       type submenu
       mode image allow image auto
@@ -241,7 +238,7 @@ begin main
       geom 100x100+0+0:scale
       border 3 15 3 3
       padding 3 15 3 3
-    end image
+  end image
     begin image
       type button_bar
       mode image allow image auto
@@ -254,7 +251,7 @@ begin main
       color white #333333
       cmod image 0xc0
       border 2 3 2 2
-    end image
+  end image
     begin image
       type button
       mode image allow image auto
@@ -271,8 +268,8 @@ begin main
       file bar_horizontal_3.png
       geom 100x100+0+0:scale
       border 2 3 2 2
-    end image
-  end
+  end image
+end
 
 %include "menus.cfg"
 
@@ -286,7 +283,7 @@ begin main
     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
+end actions
 
 # This section must also come after the menus if you want any buttons
 # to launch menus.  (If not, it can go anywhere.)
@@ -304,7 +301,7 @@ begin main
     button Mailbox action menu Mailbox
     rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
     rbutton icon exit.png action script "exit"
-  end button_bar
+end button_bar
 
 # The XIM support options.
 # input_method: set the name of your favorate input method program
@@ -312,7 +309,7 @@ begin main
 #  begin xim
 #    input_method Ami
 #    preedit_type OverTheSpot
-#  end xim
+#end xim
 
 # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
 # "off", or "false" for FALSE.
@@ -362,7 +359,7 @@ begin main
 # memory to spare, it's a good idea.
 #    double_buffer true
 
-  end toggles
+end toggles
 
   begin keyboard
 
@@ -376,7 +373,7 @@ begin main
 # Greek keyboard mode.  First the word "greek", then its boolean
 # state, then its mode (either "iso" or "ibm").
 #    greek off iso
-  end keyboard
+end keyboard
 
   begin misc
 
@@ -402,6 +399,4 @@ begin main
 # Program to exec (intended for use with themes)
     exec mutt
 
-  end misc
-
-end main
+end misc
diff --git a/themes/trans/theme.cfg.in b/themes/trans/theme.cfg.in
index e31a1f7..a03da51 100644
--- a/themes/trans/theme.cfg.in
+++ b/themes/trans/theme.cfg.in
@@ -12,11 +12,8 @@
 # directly or indirectly through the use of, or inability to use,
 # this program.  Use at your OWN risk.
 
-# A begin to get things started.
-begin main
-
 # Define the color properties
-  begin color
+begin color
 
 # Foreground, background, cursor, scrollbar, pointer colors
     foreground #aaaaaa
@@ -59,11 +56,11 @@ begin main
 
 # This ends the color section.  Any text after the word "end" is
 # assumed to be a comment and ignored.
-  end color
+end color
 
 # The X11 attributes section.  Should be fairly self-explanatory,
 # but if not, consult the X man page.
-  begin attributes
+begin attributes
 
 # Geometry == widthxheight+x_offset+y_offset, offsets from top left
 #             if +, bottom right if -
@@ -85,22 +82,22 @@ begin main
     font 5 10x20
     font 6 12x24
 #    font bold 7x14
-  end attributes
+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
+begin multichar
     font 0 @MFONT0@
     font 1 @MFONT1@
     font 2 @MFONT2@
     font 3 @MFONT3@
     font 4 @MFONT4@
     encoding @MULTICHAR_ENCODING@
-  end multichar
+end multichar
 
 # Define the imageclasses.
-  begin 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.
@@ -273,7 +270,7 @@ begin main
       geom 100x100+0+0:scale
       border 2 3 2 2
     end image
-  end
+end
 
 %include "menus.cfg"
 
@@ -282,16 +279,16 @@ begin main
 #
 # Syntax:  bind [ { <modifiers> | anymod } ] { <key> | <keysym> | <button> } to { string | echo | menu } <parameter>
 #
-  begin actions
+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
+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
+begin button_bar
 
 # Specify a font.  The default buttonbar font is the default terminal
 # font as defined in the attributes section above.
@@ -306,7 +303,7 @@ begin main
     button Terminal action menu Terminal
     rbutton icon help.png action script "spawn(Eterm -e man Eterm)"
     rbutton icon exit.png action script "exit"
-  end button_bar
+end button_bar
 
 # The XIM support options.
 # input_method: set the name of your favorate input method program
@@ -318,7 +315,7 @@ begin main
 
 # Boolean variables.  The values can be "1", "on", or "true" for TRUE, or "0",
 # "off", or "false" for FALSE.
-  begin toggles
+begin toggles
 
 # If true, Eterm will un-iconify itself when it receives a beep (ASCII 0x07)
     map_alert on
@@ -359,9 +356,9 @@ begin main
 # If true, Eterm will run with no window borders.
     borderless true
 
-  end toggles
+end toggles
 
-  begin keyboard
+begin keyboard
 
 # Use the supplied keysym to reduce/enlarge the font
     smallfont_key LessThan
@@ -373,9 +370,9 @@ begin main
 # Greek keyboard mode.  First the word "greek", then its boolean
 # state, then its mode (either "iso" or "ibm").
 #    greek off iso
-  end keyboard
+end keyboard
 
-  begin misc
+begin misc
 
 # The command to which to pipe print requests (printscreen)
 #    print_pipe "lpr"
@@ -399,6 +396,4 @@ begin main
 # Program to exec (intended for use with themes)
 #    exec foo
 
-  end misc
-
-end main
+end misc