diff --git a/ChangeLog b/ChangeLog
index 089e103..f21f0f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4833,3 +4833,7 @@ used to run on so far.  As a side-effect, the default action is now
 anyways, I might be the only one missing the previous default.  Guess
 I'll change my actionclasses.cfg and hold my peace forever.  : )
 ----------------------------------------------------------------------
+Wed Oct  9 00:05:22 2002                        Michael Jennings (mej)
+
+The beginnings of a dedicated config file section for Escreen stuff.
+----------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index a188850..f66fc8a 100644
--- a/configure.in
+++ b/configure.in
@@ -942,7 +942,7 @@ export BINDIR bindir prefix exec_prefix datadir PACKAGE
 # environment variables, kinda like AC_OUTPUT above.
 changequote(%&, &%)dnl
 %&
-for i in utils/kEsetroot themes/Eterm/theme.cfg themes/auto/theme.cfg themes/chooser/theme.cfg \
+for i in utils/kEsetroot themes/Eterm/theme.cfg themes/auto/theme.cfg themes/Escreen/theme.cfg \
          themes/trans/theme.cfg ; do
   echo creating $i
   $AWK '{if (match($0,/@[A-Za-z0-9_]*@/)) {
diff --git a/src/options.c b/src/options.c
index a303a08..6029877 100644
--- a/src/options.c
+++ b/src/options.c
@@ -76,6 +76,7 @@ static void *parse_menuitem(char *, void *);
 static void *parse_bbar(char *, void *);
 static void *parse_xim(char *, void *);
 static void *parse_multichar(char *, void *);
+static void *parse_escreen(char *, void *);
 
 static char *rs_pipe_name = NULL;
 #ifdef PIXMAP_SUPPORT
@@ -2341,6 +2342,31 @@ parse_multichar(char *buff, void *state)
     buff = NULL;
 }
 
+static void *
+parse_escreen(char *buff, void *state)
+{
+#ifdef ESCREEN
+    if ((*buff == CONF_BEGIN_CHAR) || (*buff == CONF_END_CHAR)) {
+        return NULL;
+    }
+    if (!BEG_STRCASECMP(buff, "url ")) {
+        RESET_AND_ASSIGN(rs_url, get_word(2, buff));
+    } else if (!BEG_STRCASECMP(buff, "firewall ")) {
+        RESET_AND_ASSIGN(rs_hop, get_word(2, buff));
+    } else if (!BEG_STRCASECMP(buff, "delay ")) {
+        rs_delay = strtol(get_pword(2, buff), (char **) NULL, 0);
+    } else {
+        print_error("Parse error in file %s, line %lu:  Attribute \"%s\" is not valid within context escreen\n",
+                    file_peek_path(), file_peek_line(), buff);
+    }
+#else
+    print_warning("Escreen support was not compiled in, ignoring entire context\n");
+    file_poke_skip(1);
+#endif
+    return state;
+    buff = NULL;
+}
+
 char *
 conf_parse_theme(char **theme, char *conf_name, unsigned char fallback)
 {
@@ -2459,6 +2485,7 @@ init_defaults(void)
     conf_register_context("button_bar", parse_bbar);
     conf_register_context("xim", parse_xim);
     conf_register_context("multichar", parse_multichar);
+    conf_register_context("escreen", parse_escreen);
 }
 
 /* Sync up options with our internal data after parsing options and configs */
diff --git a/themes/Escreen/theme.cfg.in b/themes/Escreen/theme.cfg.in
new file mode 100644
index 0000000..481430e
--- /dev/null
+++ b/themes/Escreen/theme.cfg.in
@@ -0,0 +1,62 @@
+<Eterm-0.9.2>
+
+%include "../Eterm/theme.cfg"
+
+begin attributes
+    name %appname() -- Escreen Session
+end attributes
+
+begin actions
+    bind alt Left to script "es_display(prev)"
+    bind alt Right to script "es_display(next)"
+    bind alt Up to script "es_region(prev)"
+    bind alt Down to script "es_region(next)"
+    bind alt Prior to script "es_display(prev)"
+    bind alt Next to script "es_display(next)"
+    bind alt Space to script "es_display(toggle)"
+    bind ctrl Tab to script "es_display(next)"
+
+    # alt-1..alt-0 -> display(0)..display(9)
+    bind alt 0x31 to script "es_display(goto, 0)"
+    bind alt 0x32 to script "es_display(goto, 1)"
+    bind alt 0x33 to script "es_display(goto, 2)"
+    bind alt 0x34 to script "es_display(goto, 3)"
+    bind alt 0x35 to script "es_display(goto, 4)"
+    bind alt 0x36 to script "es_display(goto, 5)"
+    bind alt 0x37 to script "es_display(goto, 6)"
+    bind alt 0x38 to script "es_display(goto, 7)"
+    bind alt 0x39 to script "es_display(goto, 8)"
+    bind alt 0x30 to script "es_display(goto, 9)"
+
+    # F1..F10 -> display(0)..display(9)
+    bind F1 to script "es_display(goto, 0)"
+    bind F2 to script "es_display(goto, 1)"
+    bind F3 to script "es_display(goto, 2)"
+    bind F4 to script "es_display(goto, 3)"
+    bind F5 to script "es_display(goto, 4)"
+    bind F6 to script "es_display(goto, 5)"
+    bind F7 to script "es_display(goto, 6)"
+    bind F8 to script "es_display(goto, 7)"
+    bind F9 to script "es_display(goto, 8)"
+    bind F10 to script "es_display(goto, 9)"
+
+    bind alt n to script "es_display(new)"
+    bind alt r to script "es_display(rename)"
+    bind alt c to script "es_display(kill, ask)"
+    bind alt m to script "es_display(watch)"
+    bind alt b to script "es_display(backlog)"
+
+    bind alt s to script "es_region(new)"
+    bind alt u to script "es_region(full)"
+    bind alt o to script "es_region(next)"
+    bind alt k to script "es_region(kill, ask)"
+
+    bind alt shift S to script "es_statement()"
+    bind alt shift R to script "es_reset()"
+end actions
+
+begin escreen
+    #url screen://localhost/
+    #delay 2
+    #bbar_font "-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1"
+end escreen
diff --git a/themes/Makefile.am b/themes/Makefile.am
index b699475..58e83ea 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -1,9 +1,9 @@
 # $Id$
 
-THEMES = Eterm auto chooser trans
+THEMES = Eterm auto Escreen trans
 
-EXTRA_DIST = Eterm/theme.cfg.in chooser/theme.cfg.in trans/theme.cfg.in auto/theme.cfg.in \
-             Eterm/menus.cfg chooser/menus.cfg trans/menus.cfg auto/menus.cfg
+EXTRA_DIST = Eterm/theme.cfg.in Escreen/theme.cfg.in trans/theme.cfg.in auto/theme.cfg.in \
+             Eterm/menus.cfg Escreen/menus.cfg trans/menus.cfg auto/menus.cfg
 
 install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/themes
diff --git a/themes/chooser/.cvsignore b/themes/chooser/.cvsignore
deleted file mode 100644
index 4674fba..0000000
--- a/themes/chooser/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-theme.cfg
diff --git a/themes/chooser/menus.cfg b/themes/chooser/menus.cfg
deleted file mode 100644
index 3f7a0a3..0000000
--- a/themes/chooser/menus.cfg
+++ /dev/null
@@ -1,996 +0,0 @@
-<Eterm-0.9.1>
-begin menu
-  title Font
-  begin menuitem
-    text "Normal"
-    action string "\e]50;#"
-  end
-  begin menuitem
-    text "Larger"
-    action string "\e]50;#+"
-  end
-  begin menuitem
-    text "Smaller"
-    action string "\e]50;#-"
-  end
-  -
-  begin menuitem
-    text "Font 1"
-    action string "\e]50;#1"
-  end
-  begin menuitem
-    text "Font 2"
-    action string "\e]50;#2"
-  end
-  begin menuitem
-    text "Font 3"
-    action string "\e]50;#3"
-  end
-  begin menuitem
-    text "Font 4"
-    action string "\e]50;#4"
-  end
-end
-begin menu
-  title Toggles
-  begin menuitem
-    text "Cursor Visible"
-    action string "\e[?25t"
-  end
-  begin menuitem
-    text "Home on Output"
-    action string "\e[?1010t"
-  end
-  begin menuitem
-    text "Home on Input"
-    action string "\e[?1012t"
-  end
-  begin menuitem
-    text "Map Alert"
-    action string "\e]6;21\a"
-  end
-  begin menuitem
-    text "Primary/Secondary Screen"
-    action string "\e[?47t"
-  end
-  begin menuitem
-    text "Reverse Video"
-    action string "\e[?5t"
-  end
-  begin menuitem
-    text "Select Trailing Spaces"
-    action string "\e]6;25\a"
-  end
-  begin menuitem
-    text "Select Whole Line on Triple-click"
-    action string "\e]6;23\a"
-  end
-  begin menuitem
-    text "Visual Bell"
-    action string "\e]6;20\a"
-  end
-  begin menuitem
-    text "X11 Mouse Reporting"
-    action string "\e[?1000t"
-  end
-  begin menuitem
-    text "Xterm Selection Behavior"
-    action string "\e]6;22\a"
-  end
-end
-begin menu
-  title Keys
-  begin menuitem
-    text "Application Arrow Keys"
-    action string "\e[?1t"
-  end
-  begin menuitem
-    text "Application Keypad"
-    action string "\e[?66t"
-  end
-  begin menuitem
-    text "Backspace/Delete"
-    action string "\e[?67t"
-  end
-  begin menuitem
-    text "Xterm Shift-Keys"
-    action string "\e[?35t"
-  end
-end
-begin menu
-  title Scrollbar
-  begin menuitem
-    text "Toggle Visibility"
-    rtext "Ctrl-Button2"
-    action string "\e[?30t"
-  end
-  begin menuitem
-    text "Swap Sides"
-    action string "\e]6;11\a"
-  end
-  begin menuitem
-    text "Toggle Floating"
-    action string "\e]6;12\a"
-  end
-  begin menuitem
-    text "Toggle Popup Mode"
-    action string "\e]6;13\a"
-  end
-  -
-  begin menuitem
-    text "Motif (Traditional) Style"
-    action string "\e]6;10;motif;;\a"
-  end
-  begin menuitem
-    text "NeXT Style"
-    action string "\e]6;10;next;;\a"
-  end
-  begin menuitem
-    text "Xterm Style"
-    action string "\e]6;10;xterm;;\a"
-  end
-end
-begin menu
-  title Width
-  begin menuitem
-    text "5"
-    action string "\e]6;10;;5;\a"
-  end
-  begin menuitem
-    text "6"
-    action string "\e]6;10;;6;\a"
-  end
-  begin menuitem
-    text "7"
-    action string "\e]6;10;;7;\a"
-  end
-  begin menuitem
-    text "8"
-    action string "\e]6;10;;8;\a"
-  end
-  begin menuitem
-    text "9"
-    action string "\e]6;10;;9;\a"
-  end
-  begin menuitem
-    text "10"
-    action string "\e]6;10;;10;\a"
-  end
-  begin menuitem
-    text "11"
-    action string "\e]6;10;;11;\a"
-  end
-  begin menuitem
-    text "12"
-    action string "\e]6;10;;12;\a"
-  end
-  begin menuitem
-    text "13"
-    action string "\e]6;10;;13;\a"
-  end
-  begin menuitem
-    text "14"
-    action string "\e]6;10;;14;\a"
-  end
-  begin menuitem
-    text "15"
-    action string "\e]6;10;;15;\a"
-  end
-  begin menuitem
-    text "16"
-    action string "\e]6;10;;16;\a"
-  end
-  begin menuitem
-    text "17"
-    action string "\e]6;10;;17;\a"
-  end
-  begin menuitem
-    text "18"
-    action string "\e]6;10;;18;\a"
-  end
-  begin menuitem
-    text "19"
-    action string "\e]6;10;;19;\a"
-  end
-  begin menuitem
-    text "20"
-    action string "\e]6;10;;20;\a"
-  end
-end
-begin menu
-  title "Move to Desktop"
-  begin menuitem
-    text "0"
-    action string "\e]6;50;0;\a"
-  end
-  begin menuitem
-    text "1"
-    action string "\e]6;50;1;\a"
-  end
-  begin menuitem
-    text "2"
-    action string "\e]6;50;2;\a"
-  end
-  begin menuitem
-    text "3"
-    action string "\e]6;50;3;\a"
-  end
-  begin menuitem
-    text "4"
-    action string "\e]6;50;4;\a"
-  end
-  begin menuitem
-    text "5"
-    action string "\e]6;50;5;\a"
-  end
-  begin menuitem
-    text "6"
-    action string "\e]6;50;6;\a"
-  end
-  begin menuitem
-    text "7"
-    action string "\e]6;50;7;\a"
-  end
-end
-begin menu
-  title Terminal
-  begin menuitem
-    text "Toggles"
-    action submenu "Toggles"
-  end
-  begin menuitem
-    text "Keys"
-    action submenu "Keys"
-  end
-  begin menuitem
-    text "Scrollbar"
-    action submenu "Scrollbar"
-  end
-  begin menuitem
-    text "Move to Desktop"
-    action submenu "Move to Desktop"
-  end
-  -
-  begin menuitem
-    text "Steal Focus"
-    rtext "Ctrl-Button1"
-    action string "\e]5;\a"
-  end
-  begin menuitem
-    text "Full Reset"
-    action string "\ec"
-  end
-end
-begin menu
-  title Tiled
-  begin menuitem
-    text "70s Marble"
-    action string "\e]20;tile/70s_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Atoms"
-    action string "\e]20;tile/atoms.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Black Stone"
-    action string "\e]20;tile/blackstone.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Ether"
-    action string "\e]20;tile/ether_blue.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Blue Marble"
-    action string "\e]20;tile/blue_marble.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Bubbly 1"
-    action string "\e]20;tile/bubbly1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Bubbly 2"
-    action string "\e]20;tile/bubbly2.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Bubbly 3"
-    action string "\e]20;tile/bubbly3.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Bubbly 4"
-    action string "\e]20;tile/bubbly4.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Circuit"
-    action string "\e]20;tile/circuit.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Confusion"
-    action string "\e]20;tile/confusion.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Cyber Playground"
-    action string "\e]20;tile/cyber_bg.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dimples"
-    action string "\e]20;tile/014.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Dirt"
-    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;tile/ether.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger 1"
-    action string "\e]20;tile/giger1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Giger 2"
-    action string "\e]20;tile/giger2.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Gray Matter"
-    action string "\e]20;tile/22.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Gray Waves"
-    action string "\e]20;tile/59.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Green Ether"
-    action string "\e]20;tile/ether_green.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Lava"
-    action string "\e]20;tile/004.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Nebula"
-    action string "\e]20;tile/nebula.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "On Stage"
-    action string "\e]20;tile/lightb1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Purple Stuff"
-    action string "\e]20;tile/purple_stuff.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Red Whisper"
-    action string "\e]20;tile/40.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Shale"
-    action string "\e]20;tile/shale.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Soft Marble"
-    action string "\e]20;tile/soft.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Space"
-    action string "\e]20;tile/space.png;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Starry Night"
-    action string "\e]20;tile/starry.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Steel"
-    action string "\e]20;tile/steel1.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Twisted"
-    action string "\e]20;tile/twisted.jpg;0x0+0+0:tile\a"
-  end
-  begin menuitem
-    text "Whirlpool"
-    action string "\e]20;tile/015.jpg;0x0+0+0:tile\a"
-  end
-end
-begin menu
-  title Scaled
-  begin menuitem
-    text "Day/Night"
-    action string "\e]20;scale/day-night.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Good Morning"
-    action string "\e]20;scale/good-morning.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Neopolis"
-    action string "\e]20;scale/Neopolis-horizon.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Pond"
-    action string "\e]20;scale/pond.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Ripple"
-    action string "\e]20;scale/ripple.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Sunset"
-    action string "\e]20;scale/sunset.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Wasteland"
-    action string "\e]20;scale/wasteland.jpg;100x100+50+50\a"
-  end
-  begin menuitem
-    text "Winter Tree"
-    action string "\e]20;scale/wintertree.jpg;100x100+50+50\a"
-  end
-end
-begin menu
-  title Attrib
-  begin menuitem
-    text "Full Size"
-    action string "\e]20;;100x100"
-  end
-  begin menuitem
-    text "Normal Size"
-    action string "\e]20;;0x0"
-  end
-  -
-  begin menuitem
-    text "Tiled"
-    action string "\e]20;;:tile"
-  end
-  begin menuitem
-    text "Scaled"
-    action string "\e]20;;100x100"
-  end
-  begin menuitem
-    text "Proportional Scale"
-    action string "\e]20;;100x100:propscale"
-  end
-  -
-  begin menuitem
-    text "Center"
-    action string "\e]20;;=+50+50"
-  end
-  begin menuitem
-    text "Top Left Corner"
-    action string "\e]20;;=+0+0"
-  end
-  begin menuitem
-    text "Bottom Right Corner"
-    action string "\e]20;;=+100+100"
-  end
-end
-begin menu
-  title Pixmap
-  begin menuitem
-    text "None"
-    action string "\e[m\e]20;;\a"
-  end
-  begin menuitem
-    text "Toggle Viewport Mode"
-    action string "\e]6;24\a"
-  end
-  begin menuitem
-    text "Tiled"
-    action submenu "Tiled"
-  end
-  begin menuitem
-    text "Scaled"
-    action submenu "Scaled"
-  end
-  -
-  begin menuitem
-    text "Attrib"
-    action submenu "Attrib"
-  end
-end
-begin menu
-  title Brightness
-  begin menuitem
-    text "512 (200%)"
-    action string "\e]6;1;image;brightness;512\a"
-  end
-  begin menuitem
-    text "480 (188%)"
-    action string "\e]6;1;image;brightness;480\a"
-  end
-  begin menuitem
-    text "448 (175%)"
-    action string "\e]6;1;image;brightness;448\a"
-  end
-  begin menuitem
-    text "416 (163%)"
-    action string "\e]6;1;image;brightness;416\a"
-  end
-  begin menuitem
-    text "384 (150%)"
-    action string "\e]6;1;image;brightness;384\a"
-  end
-  begin menuitem
-    text "352 (138%)"
-    action string "\e]6;1;image;brightness;352\a"
-  end
-  begin menuitem
-    text "320 (125%)"
-    action string "\e]6;1;image;brightness;320\a"
-  end
-  begin menuitem
-    text "288 (113%)"
-    action string "\e]6;1;image;brightness;288\a"
-  end
-  begin menuitem
-    text "256 (100%)"
-    action string "\e]6;1;image;brightness;256\a"
-  end
-  begin menuitem
-    text "224 (88%)"
-    action string "\e]6;1;image;brightness;224\a"
-  end
-  begin menuitem
-    text "192 (75%)"
-    action string "\e]6;1;image;brightness;192\a"
-  end
-  begin menuitem
-    text "160 (63%)"
-    action string "\e]6;1;image;brightness;160\a"
-  end
-  begin menuitem
-    text "128 (50%)"
-    action string "\e]6;1;image;brightness;128\a"
-  end
-  begin menuitem
-    text "96 (38%)"
-    action string "\e]6;1;image;brightness;96\a"
-  end
-  begin menuitem
-    text "64 (25%)"
-    action string "\e]6;1;image;brightness;64\a"
-  end
-  begin menuitem
-    text "32 (13%)"
-    action string "\e]6;1;image;brightness;32\a"
-  end
-  begin menuitem
-    text "0 (0%)"
-    action string "\e]6;1;image;brightness;0\a"
-  end
-end
-begin menu
-  title Contrast
-  begin menuitem
-    text "512 (200%)"
-    action string "\e]6;1;image;contrast;512\a"
-  end
-  begin menuitem
-    text "480 (188%)"
-    action string "\e]6;1;image;contrast;480\a"
-  end
-  begin menuitem
-    text "448 (175%)"
-    action string "\e]6;1;image;contrast;448\a"
-  end
-  begin menuitem
-    text "416 (163%)"
-    action string "\e]6;1;image;contrast;416\a"
-  end
-  begin menuitem
-    text "384 (150%)"
-    action string "\e]6;1;image;contrast;384\a"
-  end
-  begin menuitem
-    text "352 (138%)"
-    action string "\e]6;1;image;contrast;352\a"
-  end
-  begin menuitem
-    text "320 (125%)"
-    action string "\e]6;1;image;contrast;320\a"
-  end
-  begin menuitem
-    text "288 (113%)"
-    action string "\e]6;1;image;contrast;288\a"
-  end
-  begin menuitem
-    text "256 (100%)"
-    action string "\e]6;1;image;contrast;256\a"
-  end
-  begin menuitem
-    text "224 (88%)"
-    action string "\e]6;1;image;contrast;224\a"
-  end
-  begin menuitem
-    text "192 (75%)"
-    action string "\e]6;1;image;contrast;192\a"
-  end
-  begin menuitem
-    text "160 (63%)"
-    action string "\e]6;1;image;contrast;160\a"
-  end
-  begin menuitem
-    text "128 (50%)"
-    action string "\e]6;1;image;contrast;128\a"
-  end
-  begin menuitem
-    text "96 (38%)"
-    action string "\e]6;1;image;contrast;96\a"
-  end
-  begin menuitem
-    text "64 (25%)"
-    action string "\e]6;1;image;contrast;64\a"
-  end
-  begin menuitem
-    text "32 (13%)"
-    action string "\e]6;1;image;contrast;32\a"
-  end
-  begin menuitem
-    text "0 (0%)"
-    action string "\e]6;1;image;contrast;0\a"
-  end
-end
-begin menu
-  title Gamma
-  begin menuitem
-    text "512 (200%)"
-    action string "\e]6;1;image;gamma;512\a"
-  end
-  begin menuitem
-    text "480 (188%)"
-    action string "\e]6;1;image;gamma;480\a"
-  end
-  begin menuitem
-    text "448 (175%)"
-    action string "\e]6;1;image;gamma;448\a"
-  end
-  begin menuitem
-    text "416 (163%)"
-    action string "\e]6;1;image;gamma;416\a"
-  end
-  begin menuitem
-    text "384 (150%)"
-    action string "\e]6;1;image;gamma;384\a"
-  end
-  begin menuitem
-    text "352 (138%)"
-    action string "\e]6;1;image;gamma;352\a"
-  end
-  begin menuitem
-    text "320 (125%)"
-    action string "\e]6;1;image;gamma;320\a"
-  end
-  begin menuitem
-    text "288 (113%)"
-    action string "\e]6;1;image;gamma;288\a"
-  end
-  begin menuitem
-    text "256 (100%)"
-    action string "\e]6;1;image;gamma;256\a"
-  end
-  begin menuitem
-    text "224 (88%)"
-    action string "\e]6;1;image;gamma;224\a"
-  end
-  begin menuitem
-    text "192 (75%)"
-    action string "\e]6;1;image;gamma;192\a"
-  end
-  begin menuitem
-    text "160 (63%)"
-    action string "\e]6;1;image;gamma;160\a"
-  end
-  begin menuitem
-    text "128 (50%)"
-    action string "\e]6;1;image;gamma;128\a"
-  end
-  begin menuitem
-    text "96 (38%)"
-    action string "\e]6;1;image;gamma;96\a"
-  end
-  begin menuitem
-    text "64 (25%)"
-    action string "\e]6;1;image;gamma;64\a"
-  end
-  begin menuitem
-    text "32 (13%)"
-    action string "\e]6;1;image;gamma;32\a"
-  end
-  begin menuitem
-    text "0 (0%)"
-    action string "\e]6;1;image;gamma;0\a"
-  end
-end
-begin menu
-  title Background
-  begin menuitem
-    text "Toggle Transparency"
-    action string "\e]6;0\a"
-  end
-  begin menuitem
-    text "Pixmap"
-    action submenu "Pixmap"
-  end
-  begin menuitem
-    text "Brightness"
-    action submenu "Brightness"
-  end
-  begin menuitem
-    text "Contrast"
-    action submenu "Contrast"
-  end
-  begin menuitem
-    text "Gamma"
-    action submenu "Gamma"
-  end
-end
-begin menu
-  title "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
-  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
-  -
-  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
-  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
deleted file mode 100644
index e26913e..0000000
--- a/themes/chooser/theme.cfg.in
+++ /dev/null
@@ -1,195 +0,0 @@
-<Eterm-0.9.1>
-
-begin color
-    foreground #aaaaaa
-    background black
-    cursor #ffff00
-    cursor_text #880000
-    pointer white
-    video normal
-end color
-begin attributes
-    name "%appname() -- Host Chooser"
-end attributes
-begin imageclasses
-    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PKGDATADIR@/pix/"
-    begin image
-      type background
-      state normal
-      file %random(`cat pixmaps.list`)
-      mode image allow image trans viewport auto
-      border 0 0 0 0
-    end image
-    begin image
-      type trough
-      mode image allow image trans viewport auto
-      state normal
-      color black #666666
-      file bar_vertical_3.png
-      geom 100
-      border 2 2 2 3
-    end image
-    begin image
-      type anchor
-      mode image allow image auto
-      state normal
-      color black #666666
-      file bar_vertical_1.png
-      geom 100
-      border 2 2 2 3
-      state selected
-      file bar_vertical_2.png
-      geom 100
-      border 2 2 2 3
-    end image
-    begin image
-      type thumb
-      mode image allow image auto
-      state normal
-      color black #666666
-      file thumb_1.png
-      geom 100
-      border 3 3 3 3
-      state selected
-      file thumb_2.png
-      geom 100
-      border 3 3 3 3
-    end image
-    begin image
-      type up_arrow
-      mode image allow image auto
-      state normal
-      color black #666666
-      file button_arrow_up_1.png
-      geom 100
-      border 2 2 2 2
-      state selected
-      file button_arrow_up_2.png
-      geom 100
-      border 2 2 2 2
-      state clicked
-      file button_arrow_up_3.png
-      geom 100
-      border 2 2 2 2
-    end image
-    begin image
-      type down_arrow
-      mode image allow image auto
-      state normal
-      color black #666666
-      file button_arrow_down_1.png
-      geom 100
-      border 2 2 2 2
-      state selected
-      file button_arrow_down_2.png
-      geom 100
-      border 2 2 2 2
-      state clicked
-      file button_arrow_down_3.png
-      geom 100
-      border 2 2 2 2
-    end image
-    begin image
-      type menu
-      mode image allow image auto
-      state normal
-      color black #999999
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 3
-      state selected
-      file bar_horizontal_2.png
-      geom 100
-      border 2 3 2 3
-    end image
-    begin image
-      type submenu
-      mode image allow image auto
-      state normal
-      color black #999999
-      file menu1.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-      state selected
-      file menu2.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-      state clicked
-      file menu3.png
-      geom 100
-      border 3 15 3 3
-      padding 3 15 3 3
-    end image
-    begin image
-      type button_bar
-      mode image allow image auto
-      state normal
-      color black #999999
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 2
-      state disabled
-      color white #333333
-      cmod image 0xc0
-      border 2 3 2 2
-    end image
-    begin image
-      type button
-      mode image allow image auto
-      state normal
-      color black #cccccc
-      file bar_horizontal_1.png
-      geom 100
-      border 2 3 2 2
-      state selected
-      file bar_horizontal_2.png
-      geom 100
-      border 2 3 2 2
-      state clicked
-      file bar_horizontal_3.png
-      geom 100
-      border 2 3 2 2
-    end image
-end
-%include "menus.cfg"
-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
-begin button_bar
-    font "-adobe-helvetica-medium-r-normal--10-100-75-75-p-56-iso8859-1"
-    button Eterm action menu "Eterm Operations"
-    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 script "spawn(Eterm -e man Eterm)"
-    rbutton icon exit.png action script "exit"
-end button_bar
-begin toggles
-    map_alert on
-    visual_bell off
-    login_shell true
-    scrollbar on
-    utmp_logging on
-    iconic false
-    home_on_output 1
-    home_on_input 1
-    scrollbar_right true
-    scrollbar_floating false
-    borderless false
-end toggles
-begin keyboard
-    smallfont_key LessThan
-    bigfont_key GreaterThan
-end keyboard
-begin misc
-    save_lines 1024
-    cut_chars "\t\\\`\\\"\'&() *,;<=>?@[]{|}"
-    border_width 5
-    term_name Eterm
-end misc