diff --git a/cvs.motd b/cvs.motd
index e4ee510..a7c409e 100644
--- a/cvs.motd
+++ b/cvs.motd
@@ -1,3 +1,3 @@
-Yet another change to the Eterm theme files.  Shading and tinting as
-you remember them no longer exist.  Please update your Eterm theme
-files, or stuff will not work.  See the ChangeLog for details!
+Well, now that we have a new CVS server, I've kinda done a little
+restructuring.  There may still be things that are screwy, so please
+let me know (mej@eterm.org) if you have problems.
diff --git a/src/feature.h b/src/feature.h
new file mode 100644
index 0000000..1107d3b
--- /dev/null
+++ b/src/feature.h
@@ -0,0 +1,394 @@
+/* feature.h -- Eterm feature defines header
+ *           -- 10 Sept 1997, mej
+ *
+ * This file is original work by Michael Jennings <mej@eterm.org> and
+ * Tuomo Venalainen <vendu@cc.hut.fi>.  This file, and any other file
+ * bearing this same message or a similar one, is distributed under
+ * the GNU Public License (GPL) as outlined in the COPYING file.
+ *
+ * Copyright (C) 1997, Michael Jennings and Tuomo Venalainen
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * 
+ * $Id$
+ *
+ */
+
+#ifndef _FEATURE_H_
+# define _FEATURE_H_
+
+# include <stdio.h>
+# include <stdlib.h>
+
+# include "debug.h"
+
+/********************* Miscellaneous OS fixings *********************/
+
+# if defined(hpux) && !defined(_HPUX_SOURCE)
+#  define _HPUX_SOURCE
+# endif
+
+/*
+# if defined(_HPUX_SOURCE) && !defined(SVR4)
+#  define SVR4
+# endif
+ */
+
+# if defined(SVR4) && !defined(__svr4__)
+#  define __svr4__
+# endif
+# if !defined(SVR4) && defined(__svr4__)
+#  define SVR4
+# endif
+
+# if defined(sun) && !defined(__sun__)
+#  define __sun__
+# endif
+# if !defined(sun) && defined(__sun__)
+#  define sun
+# endif
+
+# if defined (sun)
+#  undef HAVE_SYS_IOCTL_H
+# endif
+
+# ifdef _SCO_DS     /* SCO Osr5 */
+#  define ALL_NUMERIC_PTYS    /* Scos pty naming is /dev/[pt]typ0 - /dev/[pt]ty256 */
+# endif 
+
+/********************* Debugging stuff *********************/
+/* As Keith Bunge would say, don't crap with the debugging stuff below
+ * unless you develop this mess. :^)   -- mej
+ */
+
+# ifndef DEBUG
+#   define DEBUG 0
+# endif
+
+/********************* Random development stuff ***************************/
+/* #define PROFILE */
+#ifdef PROFILE
+/* #define PROFILE_SCREEN */
+/* #define PROFILE_X_EVENTS */
+/* #define COUNT_X_EVENTS */
+#endif
+
+#define OPTIMIZE_HACKS
+#define USE_EFFECTS
+
+/********************* Color, screen, and image stuff *********************/
+
+/* Support for background pixmap cycling */
+#define BACKGROUND_CYCLING_SUPPORT
+
+/* The environment variable in which Eterm looks for a search path for
+   config files and pixmaps */
+#define PATH_ENV	"ETERMPATH"
+
+/* Disable simulation of bold font using an "overstrike" technique.  This technique
+ has been known to cause pixel droppings.  See also FORCE_CLEAR_CHARS. */
+/* #define NO_BOLDOVERSTRIKE */
+
+/* Disable the secondary screen ("\E[?47h" / "\E[?47l") */
+/* #define NO_SECONDARY_SCREEN */
+
+/* The number of screenfuls between refreshes. */
+# define REFRESH_PERIOD  5
+
+/* This will force clearing of characters before writing new ones on top of
+ * them. This is experimental - added in order to try and fix pixel dropping
+ * problems some people have had. See also NO_BOLDOVERSTRIKE. */
+# define FORCE_CLEAR_CHARS
+
+/* Rob Nation's graphics escape sequences */
+/* #define RXVT_GRAPHICS */
+
+/* The command through which to pipe print-screen requests */
+#define PRINTPIPE	"lp"
+
+/* If the screen can handle 24-bit graphics, force them */
+/* #define PREFER_24BIT */
+
+/* Offer some support for the Offix DND (Drag 'n' Drop) protocol (untested) */
+/* #define OFFIX_DND */
+
+/* Allows the -w and --border-width options for specifying the width of the
+ * border (in pixels) between the actual X client window and the program-useable
+ * terminal window.                                                 -- mej
+ */
+# define BORDER_WIDTH_OPTION
+
+/********************* Key and key-bindings options *********************/
+
+/* Pick the hotkey for changing the font size */
+# define HOTKEY_CTRL
+/* #define HOTKEY_META */
+
+/* Use Home = "\E[1~" and End = "\E[4~" instead of Home = "\E[7~" and End = "\E[8~" */
+/* #define LINUX_KEYS */
+#ifdef linux
+# define LINUX_KEYS
+#endif
+
+/* Allow the "keysym" attribute in config files for remapping keysyms */
+#define KEYSYM_ATTRIBUTE
+
+/* Allow unshifted Next and Prior keys to scroll, in addition to their shifted
+ * counterparts */
+/* #define UNSHIFTED_SCROLLKEYS */
+
+/********************* Mouse, scrollbar, and menu bar options *********************/
+
+/* Disable sending escape sequences from the scrollbar when mouse reporting
+ * is enabled */
+/* #define NO_SCROLLBAR_REPORT */
+
+/* Set the default number of lines in the scrollback buffer */
+/* #define SAVELINES 256 */
+
+/* Set the default separator characters for double-click word selection */
+#define CUTCHARS "\"&'()*,;<=>?@[\\]^`{|}~ \t"
+
+/* Make it an option */
+#define CUTCHAR_OPTION
+
+/* To activate double-click reporting for button 1 */
+/* #define MOUSE_REPORT_DOUBLECLICK */
+
+/* The delay in milliseconds between multiple clicks */
+/* #define MULTICLICK_TIME 500 */
+
+/* Support for the old xterm-style scrollbar */
+#define XTERM_SCROLLBAR
+
+/* Support for the traditional motif-style scrollbar */
+#define MOTIF_SCROLLBAR
+
+/* Support for a NeXT-style scrollbar */
+#define NEXT_SCROLLBAR
+
+/* Default scrollbar type */
+#define SCROLLBAR_DEFAULT_TYPE SCROLLBAR_MOTIF
+
+/* The default width (in pixels) of the scrollbar. */
+#define SB_WIDTH 10
+
+/* Continuous scrolling by pressing the scrollbar arrow buttons */
+#define SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
+
+/* To allow smooth refresh when the terminal window is fully unobscured. */
+/* #define USE_SMOOTH_REFRESH */
+
+/* Delay periods for continuous scrolling */
+/* #define SCROLLBAR_INITIAL_DELAY 40 */
+/* #define SCROLLBAR_CONTINUOUS_DELAY 2 */
+
+/* An alternative placement of the menubar shadow */
+/* #define MENUBAR_SHADOW_IN */
+
+/* An alternative placement of the menu shadow */
+#define MENU_SHADOW_IN
+
+/* Allow Ctrl+Button1 in a window to raise and steal focus */
+#define CTRL_CLICK_RAISE
+
+/* Allow Ctrl+Button2 in a window to toggle the scrollbar */
+#define CTRL_CLICK_SCROLLBAR
+
+/* Allow Ctrl+Button3 in a window to toggle the menubar */
+#define CTRL_CLICK_MENU
+
+/********************* Multi-lingual support options *********************/
+
+/* Allow option/attribute for Meta to set the 8th bit */
+#define META8_OPTION
+
+/********************* Miscellaneous options *********************/
+
+/* To have $DISPLAY and the "\E[7n" response be IP addresses rather than FQDN's */
+/* #define DISPLAY_IS_IP */
+
+/* To have "\E[7n" reply with the display name.  This is a potential security risk,
+ * so its use is discouraged and unsupported. */
+/* #define ENABLE_DISPLAY_ANSWER */
+
+/* To control what the Eterm detection sequence, ESC-Z, replies with */
+/* #define ESCZ_ANSWER	"\033[?1;2C" */
+
+/* Comment this out to allow printing of the VT100_ANS sequence. See
+ * command.c. I have no idea what this is supposed to do, but disabling
+ * it will prevent your terminal from getting garbage when ^E (ctrl-E)
+ * is printed on it.
+ */
+#define NO_VT100_ANS
+
+/* Checks the current value of the window title and icon name before setting them.
+ Can save unnecessary screen refreshes */
+#define SMART_WINDOW_TITLE 
+
+/* Allow changing of the foreground and background colors with "\E]39;color^G" */
+/* #define XTERM_COLOR_CHANGE */
+
+/* Exports TERM=xterm-color instead of just TERM=xterm */
+/* #define DEFINE_XTERM_COLOR */
+
+/* Disable automatic de-iconify on bell altogether */
+/* #define NO_MAPALERT */
+
+/* Make it an option */
+#define MAPALERT_OPTION
+
+/********************* utmp logging support *********************/
+
+/* Added security for systems with saved uids and gids.  If you don't define
+ * this, and you're not on HP-UX with _HPUX_SOURCE defined, Eterm processes
+ * may seem to be owned by root.  But if you define this and don't have them,
+ * the utmp and tty stuff could break.  Do some testing.  DO NOT get this one
+ * wrong!  */
+#define HAVE_SAVED_UIDS
+
+/* Use getgrnam() to determine the group id of TTY_GRP_NAME, and chgrp tty
+ * device files to that group.  This should be ok on SVR4 and Linux systems
+ * with group "tty" and on BSD systems with group "wheel"
+ */
+#define USE_GETGRNAME
+#define TTY_GRP_NAME "tty"
+
+/********************* Config file parser options *********************/
+
+/* Allow evaluation of expressions like `echo hello` in config files.  The
+ * security-paranoid will not want to define this, but I have replaced the 
+ * OS system() call with a secure one that I have tested and verified, so
+ * child processes run in this way will not run with any privileges, active
+ * or attainable.
+ */
+#define ALLOW_BACKQUOTE_EXEC
+
+/* This causes Eterm to warn you if a config file it's about to parse was
+ * designed for an older version of Eterm. */
+/* #define WARN_OLDER */
+
+/********************* Anti-cl00bie protection (sigh) *********************/
+/* EDITING THIS FILE BELOW THIS LINE IS UNSUPPORTED!  YOU HAVE BEEN WARNED! */
+
+#ifdef MULTI_CHARSET
+# undef GREEK_SUPPORT
+# undef XTERM_FONT_CHANGE
+# undef DEFINE_XTERM_COLOR
+# define KFONT0 "k14"
+# define KFONT1 "jiskan16"
+# define KFONT2 "jiskan18"
+# define KFONT3 "jiskan24"
+# define KFONT4 "jiskan26"
+/* sizes matched to multichar fonts */
+# define FONT0 "fixed"
+# define FONT1 "8x16"
+# define FONT2 "9x18"
+# define FONT3 "12x24"
+# define FONT4 "13x26"
+#else	/* MULTI_CHARSET */
+# define FONT0 "fixed"
+# define FONT1 "6x10"
+# define FONT2 "6x13"
+# define FONT3 "7x14"
+# define FONT4 "8x13"
+#endif	/* MULTI_CHARSET */
+#define FONT0_IDX 2
+
+#ifndef PIXMAP_SUPPORT
+# undef PIXMAP_SCROLLBAR
+# undef PIXMAP_MENUBAR
+# undef BACKING_STORE
+# undef PIXMAP_OFFSET
+# undef IMLIB_TRANS
+# undef BACKGROUND_CYCLING_SUPPORT
+# undef WATCH_PIXMAP_OPTION
+#endif
+
+#ifndef PIXMAP_OFFSET
+# undef WATCH_DESKTOP_OPTION
+#endif
+
+#ifndef TTY_GRP_NAME
+# undef USE_GETGRNAME
+#endif
+
+#ifndef HAVE_MEMMOVE
+inline void *memmove(void *, const void *, size_t);
+#endif
+
+#define APL_NAME	"Eterm"
+
+/* COLORTERM, TERM environment variables */
+#ifdef MULTI_CHARSET
+# define TERMENV	"kterm"
+# define COLORTERMENV	"Kterm"
+#else
+# define TERMENV	"xterm"
+# define COLORTERMENV	"Eterm"
+#endif
+
+#ifdef NO_MOUSE_REPORT
+# ifndef NO_MOUSE_REPORT_SCROLLBAR
+#  define NO_MOUSE_REPORT_SCROLLBAR
+# endif
+#endif
+
+#ifndef DEFAULT_BORDER_WIDTH
+# define DEFAULT_BORDER_WIDTH 5
+#endif
+
+#ifndef SB_WIDTH
+# define SB_WIDTH 10
+#endif
+
+#ifndef MENUBAR_MAX
+# define MENUBAR_MAX 0
+#endif
+
+#ifndef SAVELINES
+# define SAVELINES 256
+#endif
+
+#ifdef NO_SECONDARY_SCREEN
+# define NSCREENS       0
+#else
+# define NSCREENS       1
+#endif
+
+#ifdef USE_SMOOTH_REFRESH
+# define DEFAULT_REFRESH SMOOTH_REFRESH
+#else
+# define DEFAULT_REFRESH FAST_REFRESH
+#endif
+
+#ifndef CUTCHARS
+# define CUTCHARS "\"&'()*,;<=>?@[\\]^`{|}~"
+#endif
+
+#if defined (__sun__) || defined (__svr4__)
+# define NO_DELETE_KEY		/* These systems seem to be anal this way*/
+#endif
+
+#ifndef PATH_ENV
+# define PATH_ENV "ETERMPATH"
+#endif
+
+/* utmp doesn't work on CygWin32 */
+#ifdef __CYGWIN32__
+# undef UTMP_SUPPORT
+#endif
+
+#endif	/* _FEATURE_H_ */