diff --git a/ChangeLog b/ChangeLog
index 5e0dc74..bbcdd38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2379,3 +2379,10 @@ Wed Sep  8 11:11:00 PDT 1999	Michael Jennings <mej@eterm.org>
 	hang around forever when gdb decides to hang.
 	
 -------------------------------------------------------------------------------
+Mon Sep 13 12:23:36 PDT 1999	Michael Jennings <mej@eterm.org>
+
+	Removed the tn3270 theme, which nobody uses, and added the cEterm
+	theme.  You get the same colors as Alfredo's original script, but
+	without all the crap on the command line. :-)
+	
+-------------------------------------------------------------------------------
diff --git a/src/menus.c b/src/menus.c
index 2df2177..7b75aa6 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -511,7 +511,7 @@ find_menu_by_title(menulist_t * list, char *title)
 
   register unsigned char i;
 
-  ASSERT_RVAL(list != NULL, NULL);
+  REQUIRE_RVAL(list != NULL, NULL);
 
   for (i = 0; i < list->nummenus; i++) {
     if (!strcasecmp(list->menus[i]->title, title)) {
@@ -527,7 +527,7 @@ find_menu_by_window(menulist_t * list, Window win)
 
   register unsigned char i;
 
-  ASSERT_RVAL(list != NULL, NULL);
+  REQUIRE_RVAL(list != NULL, NULL);
 
   for (i = 0; i < list->nummenus; i++) {
     if (list->menus[i]->win == win) {
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 0d7b8a5..f152af5 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -1,10 +1,10 @@
 # $Id$
 
-THEMES = Eterm chooser emacs irc mutt tn3270 trans
+THEMES = Eterm cEterm chooser emacs irc mutt tn3270 trans
 
 EXTRA_DIST = Eterm/theme.cfg.in irc/theme.cfg.in chooser/theme.cfg.in emacs/theme.cfg.in mutt/theme.cfg.in tn3270/theme.cfg.in \
              trans/theme.cfg.in Eterm/Eterm-menu.cfg irc/irc-menu.cfg chooser/chooser-menu.cfg emacs/emacs-menu.cfg \
-             mutt/mutt-menu.cfg trans/trans-menu.cfg
+             mutt/mutt-menu.cfg trans/trans-menu.cfg cEterm/cEterm-menu.cfg cEterm/theme.cfg.in
 
 install-data-hook:
 	-@for i in $(THEMES) ; do \
diff --git a/themes/tn3270/.cvsignore b/themes/cEterm/.cvsignore
similarity index 100%
rename from themes/tn3270/.cvsignore
rename to themes/cEterm/.cvsignore
diff --git a/themes/cEterm/cEterm-menu.cfg b/themes/cEterm/cEterm-menu.cfg
new file mode 100644
index 0000000..7fec1e1
--- /dev/null
+++ b/themes/cEterm/cEterm-menu.cfg
@@ -0,0 +1,891 @@
+<Eterm-0.8.10>
+begin menu
+  title Font
+  font -*-times-bold-r-normal--14-*-*-*-*-*-iso8859-1
+  begin menuitem
+    text "Normal"
+    action string "\e]50;#"
+  end
+  begin menuitem
+    text "Larger"
+    action string "\e]50;#+"
+  end
+  begin menuitem
+    text "Smaller"
+    action string "\e]50;#-"
+  end
+  -
+  begin menuitem
+    text "Font 1"
+    action string "\e]50;#1"
+  end
+  begin menuitem
+    text "Font 2"
+    action string "\e]50;#2"
+  end
+  begin menuitem
+    text "Font 3"
+    action string "\e]50;#3"
+  end
+  begin menuitem
+    text "Font 4"
+    action string "\e]50;#4"
+  end
+end
+begin menu
+  title Toggles
+  font fixed
+  begin menuitem
+    text "Cursor Visible"
+    action string "\e[?25t"
+  end
+  begin menuitem
+    text "Home on Echo"
+    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
+  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
+  font fixed
+  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
+  font fixed
+  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
+  font fixed
+  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"
+  font fixed
+  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
+  font fixed
+  begin menuitem
+    text "Toggles"
+    action submenu "Toggles"
+  end
+  begin menuitem
+    text "Keys"
+    action submenu "Keys"
+  end
+  begin menuitem
+    text "Scrollbar"
+    action submenu "Scrollbar"
+  end
+  begin menuitem
+    text "Move to Desktop..."
+    action submenu "Move to Desktop"
+  end
+  -
+  begin menuitem
+    text "Steal Focus"
+    rtext "Ctrl-Button1"
+    action string "\e]5;\a"
+  end
+  begin menuitem
+    text "Full Reset"
+    action string "\ec"
+  end
+end
+
+begin menu
+  title Transparency
+  font fixed
+  begin menuitem
+    text "Force Update"
+    action string "\e]6;3\a"
+  end
+  begin menuitem
+    text "Toggle Desktop Watching"
+    action string "\e]6;4\a"
+  end
+  begin menuitem
+    text "Toggle Transparency"
+    action string "\e]6;0\a"
+  end
+end
+begin menu
+  title Tiled
+  font fixed
+  begin menuitem
+    text "70's Marble"
+    action string "\e]20;70s_marble.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "7m"
+    action string "\e]20;7m.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Alabama Clay"
+    action string "\e]20;dirt.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Anomaly"
+    action string "\e]20;a8.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Black Stone"
+    action string "\e]20;blackstone.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Blue Ether"
+    action string "\e]20;ether_blue.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Blue Marble"
+    action string "\e]20;blue_marble.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Blue Maze"
+    action string "\e]20;blue_maze.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Blue Puzzle"
+    action string "\e]20;026.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Circuit"
+    action string "\e]20;circuit.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Cyber Playground"
+    action string "\e]20;cyber_bg.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Dark Marble"
+    action string "\e]20;dark_marble.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Dimples"
+    action string "\e]20;014.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Ether"
+    action string "\e]20;ether.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Giger 1"
+    action string "\e]20;giger1.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Giger 2"
+    action string "\e]20;giger2.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Gray Matter"
+    action string "\e]20;22.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Gray Waves"
+    action string "\e]20;gray_waves.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Jungle"
+    action string "\e]20;43.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Lava"
+    action string "\e]20;4.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Light B1"
+    action string "\e]20;lightb1.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Maple Leaves"
+    action string "\e]20;maple1.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Marble"
+    action string "\e]20;marbled.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Pebbles"
+    action string "\e]20;pebble1.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Purple Rain"
+    action string "\e]20;024.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Purple Clouds"
+    action string "\e]20;7.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Rainstorm"
+    action string "\e]20;15.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Red Whisper"
+    action string "\e]20;40.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Soft Marble"
+    action string "\e]20;soft.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Space 1"
+    action string "\e]20;space.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Space 2"
+    action string "\e]20;starry.png;0x0+0+0:tile\a"
+  end
+  begin menuitem
+    text "Whirlpool"
+    action string "\e]20;015.png;0x0+0+0:tile\a"
+  end
+end
+begin menu
+  title Scaled
+  font fixed
+  begin menuitem
+    text "Alien Spheres"
+    action string "\e]20;alien_spheres.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Atlantis"
+    action string "\e]20;atlantis.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Before the Storm"
+    action string "\e]20;before_the_storm.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Bladerunner"
+    action string "\e]20;Bladerunner-bg.png;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Canyon"
+    action string "\e]20;Canyon.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "CaveFire"
+    action string "\e]20;Cavefire-bg.png;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Crater Lake"
+    action string "\e]20;crater_lake.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Daughter"
+    action string "\e]20;Daughter.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Dragon"
+    action string "\e]20;Dragon.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "DVXVB"
+    action string "\e]20;dvxvb.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Elysium"
+    action string "\e]20;elysium.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Evocation"
+    action string "\e]20;Evocation.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Hourglass"
+    action string "\e]20;hour.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Ice Moon"
+    action string "\e]20;icemoon.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Iron Temple"
+    action string "\e]20;iron_temple.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Lake of Fire"
+    action string "\e]20;lake_of_fire.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Lighthouse"
+    action string "\e]20;lighthouse.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Monolith"
+    action string "\e]20;monolith.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Nebula"
+    action string "\e]20;nebula.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Neopolis"
+    action string "\e]20;neopolis.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Neopolis Horizon"
+    action string "\e]20;Neopolis-horizon.png;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Planet A"
+    action string "\e]20;planeta.png;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Pond"
+    action string "\e]20;pond.png;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Poseidon"
+    action string "\e]20;poseidon.png;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Return to Giza"
+    action string "\e]20;return_to_giza.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Ripple"
+    action string "\e]20;ripple.png;100x100+50+50\a"
+  end
+  begin menuitem
+    text "River of Lead"
+    action string "\e]20;river_of_lead.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Silence"
+    action string "\e]20;silence.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Sun"
+    action string "\e]20;sun.png;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Tunnel"
+    action string "\e]20;tunnel.jpg;100x100+50+50\a"
+  end
+  begin menuitem
+    text "Wasteland"
+    action string "\e]20;wasteland.jpg;100x100+50+50\a"
+  end
+end
+begin menu
+  title Attrib
+  font fixed
+  begin menuitem
+    text "Full Size"
+    action string "\e]20;;100x100"
+  end
+  begin menuitem
+    text "Normal Size"
+    action string "\e]20;;0x0"
+  end
+  -
+  begin menuitem
+    text "Tiled"
+    action string "\e]20;;:tile"
+  end
+  begin menuitem
+    text "Scaled"
+    action string "\e]20;;:scale"
+  end
+  begin menuitem
+    text "Proportional Scale"
+    action string "\e]20;;:propscale"
+  end
+  -
+  begin menuitem
+    text "Center"
+    action string "\e]20;;=+50+50"
+  end
+  begin menuitem
+    text "Top Left Corner"
+    action string "\e]20;;=+0+0"
+  end
+  begin menuitem
+    text "Bottom Right Corner"
+    action string "\e]20;;=+100+100"
+  end
+end
+begin menu
+  title Pixmap
+  font fixed
+  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
+  font fixed
+  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
+  font fixed
+  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
+  font fixed
+  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
+  font fixed
+  begin menuitem
+    text "Transparency"
+    action submenu "Transparency"
+  end
+  begin menuitem
+    text "Pixmap"
+    action submenu "Pixmap"
+  end
+  begin menuitem
+    text "Brightness"
+    action submenu "Brightness"
+  end
+  begin menuitem
+    text "Contrast"
+    action submenu "Contrast"
+  end
+  begin menuitem
+    text "Gamma"
+    action submenu "Gamma"
+  end
+end
+
+# This is the menu that gets called by Ctrl-Button3
+begin menu
+  title Eterm
+  font fixed
+  begin menuitem
+    text "Font"
+    action submenu Font
+  end
+  begin menuitem
+    text "Background"
+    action submenu Background
+  end
+  begin menuitem
+    text "Terminal"
+    action submenu Terminal
+  end
+  -
+  begin menuitem
+    text "Version"
+    action string "\e[8n"
+  end
+  begin menuitem
+    text "Status"
+    action string "\e[9n"
+  end
+  separator
+  begin menuitem
+    text "Save Settings..."
+    action string "\e]6;71\a"
+  end
+  begin menuitem
+    text "Exit"
+    action string "\e]6;70\a"
+  end
+end
+
diff --git a/themes/tn3270/theme.cfg.in b/themes/cEterm/theme.cfg
similarity index 85%
rename from themes/tn3270/theme.cfg.in
rename to themes/cEterm/theme.cfg
index 843396a..d25da9d 100644
--- a/themes/tn3270/theme.cfg.in
+++ b/themes/cEterm/theme.cfg
@@ -5,7 +5,7 @@
 #                              minus the "DR-" if any.
 #
 # This is a sample Eterm config file.  It should be placed in
-# ~/.Eterm/themes/@THEME@/MAIN and modified to suit your needs
+# ~/.Eterm/themes/cEterm/MAIN and modified to suit your needs
 #
 # As always, the authors guarantee absolutely nothing and take
 # no responsibility for anything that might happen to you, your
@@ -41,27 +41,26 @@ begin main
 # (base 8).  Alternatively, you can use color names or #xxxxxx
 # format.
 
-# The colors below are taken from Rasterman's .Xdefaults file.  They are intended to
-# display ANSI art properly when combined with a good ANSI-art font (like vga or
-# Rasterman's nexus font).
-#   color  0 0    0    0
-#   color  1 0xaa 0    0
-#   color  2 0    0210 0
-#   color  3 0xaa 0x55 0x22
-#   color  4 0    0    0xaa
-#   color  5 0xaa 0    0xaa
-#   color  6 0    0xaa 0xaa
-#   color  7 0xaa 0xaa 0xaa
-#   color  8 0x44 0x44 0x44
-#   color  9 0xff 0x44 0x44
-#   color 10 0x44 0xff 0x44
-#   color 11 0xff 0xff 0x44
-#   color 12 0x44 0x44 0xff
-#   color 13 0xff 0x44 0xff
-#   color 14 0x44 0xff 0xff
-#   color 15 #ffffff
-#   color bd #ffffff
-#   color ul #ffffff
+# These colors are taken from Alfredo Kojima's cEterm script.  Lots of
+# people seem to like them. :-)
+   color  0 0    0    0
+   color  1 0x9e 0x18 0x28
+   color  2 0x9e 0x18 0x28
+   color  3 #968a38
+   color  4 #414171
+   color  5 #963c59
+   color  6 #418179
+   color  7 gray
+   color  8 gray40
+   color  9 #cf6171
+   color 10 #c5f779
+   color 11 #fff796
+   color 12 #4186be
+   color 13 #cf9ebe
+   color 14 #71bebe
+   color 15 white
+   color bd white
+   color ul white
 
 # This ends the color section.  Any text after the word "end" is
 # assumed to be a comment and ignored.
@@ -74,9 +73,9 @@ begin main
 # Geometry == widthxheight+x_offset+y_offset, offsets from top left
 #             if +, bottom right if -
 #    geometry 132x50+100+100
-    title "%appname() -- tn3270 Theme"
-    name tn3270
-#    iconname tn3270
+    title %appname() -- cEterm Theme
+    name %appname()
+#    iconname Eterm
 
 # Set the fonts.  These must be monospace fonts.  The values shown are
 # the Eterm defaults.  The "bold" font is the font used if color BD has
@@ -95,7 +94,7 @@ begin main
 
 # You must define this before setting any images that use it.  This is the $PATH-style variable
 # that determines where Eterm looks for image files.
-    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:@PKGDATADIR@/pix/"
+    path "./pix/:~/.Eterm/:~/.Eterm/themes/Eterm/pix:~/.Eterm/pix/:/usr/local/share/Eterm/pix/"
 
 # If you want a different icon than the standard Eterm one, set this.
 #   icon Eterm.xpm
@@ -212,6 +211,8 @@ begin main
     end image
   end
 
+%include "cEterm-menu.cfg"
+
 # This section *must* come after the menu definitions if you want
 # menu actions to work.  C'est la vie. :-)
 #
@@ -266,7 +267,7 @@ begin main
 
 # If true, Eterm will handle the Meta (Alt) + keypress to set the 8th bit.
 # If false, Eterm will handle the Meta + keypress as an escape prefix. (default)
-    meta8 false
+#    meta8 false
 
 # If true, Eterm will start iconified.
     iconic false
@@ -297,40 +298,7 @@ begin main
     bigfont_key GreaterThan
 
 # You can also associate a given keysym (0xff00 - 0xffff) with a string
-
-# Delete - ^D
-    keysym 0xFFFF "\004"
-
-# Left - ^B
-    keysym 0xFF51 "\002"
-# Right - ^F
-    keysym 0xFF53 "\006"
-# Up - ^P
-    keysym 0xFF52 "\020"
-# Down - ^N
-    keysym 0xFF54 "\016"
-# Home - ^A
-    keysym 0xFF50 "\001"
-# End - ^E
-    keysym 0xFF57 "\005"
-
-# F1 - F12
-    keysym 0xFFBE "\e1"
-    keysym 0xFFBF "\e2"
-    keysym 0xFFC0 "\e3"
-    keysym 0xFFC1 "\e4"
-    keysym 0xFFC2 "\e5"
-    keysym 0xFFC3 "\e6"
-    keysym 0xFFC4 "\e7"
-    keysym 0xFFC5 "\e8"
-    keysym 0xFFC6 "\e9"
-    keysym 0xFFC7 "\e0"
-    keysym 0xFFC8 "\e-"
-    keysym 0xFFC9 "\e="
-
-# map Prior/Next to F7/F8
-    keysym 0xFF55 "\e7"
-    keysym 0xFF56 "\e8"
+#    keysym 0xffff "\r\n\e\007\t"
 
 # Greek keyboard mode.  First the word "greek", then its boolean
 # state, then its mode (either "iso" or "ibm").
@@ -340,7 +308,7 @@ begin main
   begin misc
 
 # The command to which to pipe print requests (printscreen)
-    print_pipe "lpr"
+#    print_pipe "lpr"
 
 # The number of lines in the scrollback buffer.  More lines, more memory needed.
     save_lines 1024
@@ -359,7 +327,7 @@ begin main
     term_name xterm
 
 # Program to exec (intended for use with themes)
-    exec tn3270
+#    exec foo
 
   end misc