diff --git a/ChangeLog b/ChangeLog
index 1ba41f8..5e0dc74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2372,3 +2372,10 @@ Tue Sep  7 13:15:30 PDT 1999	Michael Jennings <mej@eterm.org>
 	make distcheck works without breaking regular makes now. =P
 	
 -------------------------------------------------------------------------------
+Wed Sep  8 11:11:00 PDT 1999	Michael Jennings <mej@eterm.org>
+
+	Patch from Sung-Hyun Nam <namsh@lgic.co.kr> for the theme files.  Also
+	added a timeout for the backtrace attempt so that it hopefully won't
+	hang around forever when gdb decides to hang.
+	
+-------------------------------------------------------------------------------
diff --git a/src/command.c b/src/command.c
index 0e35e57..2372578 100644
--- a/src/command.c
+++ b/src/command.c
@@ -958,6 +958,21 @@ request_code_to_name(int code)
   return "Unknown";
 }
 
+static void
+hard_exit(void) {
+
+#ifdef HAVE__EXIT
+  _exit(-1);
+#elif defined(SIGKILL)
+  kill(cmd_pid, SIGKILL);
+  raise(SIGKILL);
+#else
+  kill(cmd_pid, 9);
+  raise(9);
+#endif
+
+}
+
 /* Try to get a stack trace when we croak */
 void
 dump_stack_trace(void)
@@ -991,21 +1006,11 @@ dump_stack_trace(void)
   print_error("Your system does not support any of the methods Eterm uses.  Exiting.\n");
   return;
 #endif
+  signal(SIGALRM, (sighandler_t) hard_exit);
+  alarm(10);
   system(cmd);
 }
 
-void
-hard_exit(void) {
-
-  dump_stack_trace();
-#ifdef HAVE__EXIT
-  _exit(-1);
-#else
-  abort();
-#endif
-
-}
-
 /* signal handling, exit handler */
 /*
  * Catch a SIGCHLD signal and exit if the direct child has died
diff --git a/src/term.c b/src/term.c
index 4928c39..be33d81 100644
--- a/src/term.c
+++ b/src/term.c
@@ -149,6 +149,10 @@ lookup_key(XEvent * ev)
   }
 #endif /* USE_XIM */
 
+#ifdef USE_XIM
+  if (valid_keysym) {
+#endif
+
   if (action_dispatch(ev, keysym)) {
     return;
   } 
@@ -160,10 +164,6 @@ lookup_key(XEvent * ev)
     }
   }
 
-#ifdef USE_XIM
-  if (valid_keysym) {
-#endif
-
   if ((Options & Opt_report_as_keysyms) && (keysym >= 0xff00)) {
     len = sprintf(kbuf, "\e[k%X;%X~", (unsigned int) (ev->xkey.state & 0xff), (unsigned int) (keysym & 0xff));
     tt_write(kbuf, len);
diff --git a/themes/Eterm/theme.cfg.in b/themes/Eterm/theme.cfg.in
index 7e074bd..d1ab54d 100644
--- a/themes/Eterm/theme.cfg.in
+++ b/themes/Eterm/theme.cfg.in
@@ -321,6 +321,9 @@ begin main
 # (Default is 5).
     border_width 5
 
+# Defines the number of pixels to add between lines (default is 0).
+#    line_space 2
+
 # Value to use for $TERM
     term_name xterm
 
diff --git a/themes/chooser/theme.cfg.in b/themes/chooser/theme.cfg.in
index 7dbe659..652e35d 100644
--- a/themes/chooser/theme.cfg.in
+++ b/themes/chooser/theme.cfg.in
@@ -321,6 +321,9 @@ begin main
 # (Default is 5).
     border_width 5
 
+# Defines the number of pixels to add between lines (default is 0).
+#    line_space 2
+
 # Value to use for $TERM
     term_name xterm
 
diff --git a/themes/emacs/theme.cfg.in b/themes/emacs/theme.cfg.in
index 36109e1..9f979df 100644
--- a/themes/emacs/theme.cfg.in
+++ b/themes/emacs/theme.cfg.in
@@ -321,6 +321,9 @@ begin main
 # (Default is 5).
     border_width 5
 
+# Defines the number of pixels to add between lines (default is 0).
+#    line_space 2
+
 # Value to use for $TERM
     term_name xterm
 
diff --git a/themes/irc/theme.cfg.in b/themes/irc/theme.cfg.in
index 06f20fc..a742c9a 100644
--- a/themes/irc/theme.cfg.in
+++ b/themes/irc/theme.cfg.in
@@ -321,6 +321,9 @@ begin main
 # (Default is 5).
     border_width 5
 
+# Defines the number of pixels to add between lines (default is 0).
+#    line_space 2
+
 # Value to use for $TERM
     term_name xterm
 
diff --git a/themes/mutt/theme.cfg.in b/themes/mutt/theme.cfg.in
index 23f1189..70afe1b 100644
--- a/themes/mutt/theme.cfg.in
+++ b/themes/mutt/theme.cfg.in
@@ -270,6 +270,9 @@ begin main
 # (Default is 5).
     border_width 0
 
+# Defines the number of pixels to add between lines (default is 0).
+#    line_space 2
+
 # Value to use for $TERM
     term_name xterm
 
diff --git a/themes/tn3270/theme.cfg.in b/themes/tn3270/theme.cfg.in
index 55fe7e8..843396a 100644
--- a/themes/tn3270/theme.cfg.in
+++ b/themes/tn3270/theme.cfg.in
@@ -352,6 +352,9 @@ begin main
 # (Default is 5).
     border_width 5
 
+# Defines the number of pixels to add between lines (default is 0).
+#    line_space 2
+
 # Value to use for $TERM
     term_name xterm
 
diff --git a/themes/trans/theme.cfg.in b/themes/trans/theme.cfg.in
index b52b93e..71e0069 100644
--- a/themes/trans/theme.cfg.in
+++ b/themes/trans/theme.cfg.in
@@ -324,6 +324,9 @@ begin main
 # (Default is 5).
     border_width 5
 
+# Defines the number of pixels to add between lines (default is 0).
+#    line_space 2
+
 # Value to use for $TERM
     term_name xterm