--- events.c.orig	2007-06-18 13:29:22.000000000 -0500
+++ events.c	2010-05-11 07:21:29.000000000 -0500
@@ -32,6 +32,24 @@
 		case KEY_NEW:
 			spawn(opt_term);
 			break;
+//	case KEY_NEW_TRANS:
+//		spawn(opt_trans);
+//		break;
+	case KEY_NEW_PIDGIN:
+		spawn(opt_pidgin);
+		break;
+	case KEY_NEW_THUNDERBIRD:
+		spawn(opt_thunderbird);
+		break;
+	case KEY_NEW_EMACS:
+		spawn(opt_emacs);
+		break;
+	case KEY_NEW_FIREFOX:
+		spawn(opt_firefox);
+		break;
+	case KEY_NEW_XLOCK:
+		spawn(opt_xlock);
+		break;
 		case KEY_NEXT:
 			next();
 			if (XGrabKeyboard(dpy, e->root, False, GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess) {
@@ -54,12 +72,18 @@
 			if (current_screen->vdesk > KEY_TO_VDESK(XK_1)) {
 				switch_vdesk(current_screen,
 						current_screen->vdesk - 1);
+		}else{
+			switch_vdesk(current_screen,
+			    current_screen->vdesk + 7);
 			}
 			break;
 		case KEY_NEXTDESK:
 			if (current_screen->vdesk < KEY_TO_VDESK(XK_8)) {
 				switch_vdesk(current_screen,
 						current_screen->vdesk + 1);
+		}else{
+			switch_vdesk(current_screen,
+			    current_screen->vdesk - 7);
 			}
 			break;
 #endif
--- evilwm.h.orig	2007-06-18 13:29:22.000000000 -0500
+++ evilwm.h	2010-05-11 07:22:44.000000000 -0500
@@ -51,6 +51,12 @@
 #else
 #define DEF_TERM        "xterm"
 #endif
+#define DEF_EMACS       "emacs"
+#define DEF_THUNDERBIRD       "thunderbird"
+#define DEF_PIDGIN        "pidgin"
+#define DEF_FIREFOX     "firefox"
+#define DEF_XLOCK       "xlock"
+//#define DEF_TRANS       "transset-df -p"
 
 /* readability stuff */
 
@@ -200,6 +206,11 @@
 extern unsigned int     grabmask2;
 extern unsigned int     altmask;
 extern const char       *opt_term[3];
+extern const char       *opt_emacs[3];
+extern const char       *opt_thunderbird[3];
+extern const char       *opt_pidgin[3];
+extern const char       *opt_firefox[3];
+extern const char       *opt_xlock[3];
 extern int              opt_bw;
 #ifdef SNAP
 extern int              opt_snap;
--- keymap.h.orig	2007-06-18 13:29:22.000000000 -0500
+++ keymap.h	2010-05-11 07:23:38.000000000 -0500
@@ -3,6 +3,12 @@
 
 #define KEY_NEXT	XK_Tab
 #define KEY_NEW		XK_Return
+#define KEY_NEW_EMACS	XK_e
+#define KEY_NEW_THUNDERBIRD	XK_t
+#define KEY_NEW_PIDGIN	XK_p
+#define KEY_NEW_TRANS	XK_c
+#define KEY_NEW_FIREFOX	XK_m
+#define KEY_NEW_XLOCK   XK_Delete
 #define KEY_TOPLEFT	XK_y
 #define KEY_TOPRIGHT	XK_u
 #define KEY_BOTTOMLEFT	XK_b
@@ -24,7 +30,7 @@
 /* Mixtures of Ctrl, Alt an Escape are used for things like VMWare and
  * XFree86/Cygwin, so the KILL key is an option in the Makefile  */
 #ifndef KEY_KILL
-#define KEY_KILL	XK_Escape
+#define KEY_KILL	XK_q
 #endif
 
 #endif
--- main.c.orig	2007-06-18 13:29:22.000000000 -0500
+++ main.c	2010-05-11 07:24:29.000000000 -0500
@@ -51,6 +51,12 @@
 unsigned int grabmask2 = Mod1Mask;
 unsigned int altmask = ShiftMask;
 const char   *opt_term[3] = { DEF_TERM, DEF_TERM, NULL };
+const char   *opt_emacs[3] = { DEF_EMACS, DEF_EMACS, NULL };
+const char   *opt_thunderbird[3] = { DEF_THUNDERBIRD, DEF_THUNDERBIRD, NULL };
+const char   *opt_pidgin[3] = { DEF_PIDGIN, DEF_PIDGIN, NULL };
+//const char   *opt_trans[3] = { DEF_TRANS, DEF_TRANS, NULL };
+const char   *opt_firefox[3] = { DEF_FIREFOX, DEF_FIREFOX, NULL };
+const char   *opt_xlock[3] = { DEF_XLOCK, DEF_XLOCK, NULL };
 int          opt_bw = DEF_BW;
 #ifdef SNAP
 int          opt_snap = 0;
@@ -238,7 +244,7 @@
 	XWindowAttributes winattr;
 
 	dpy = XOpenDisplay(opt_display);
-	if (!dpy) { 
+	if (!dpy) {
 		LOG_ERROR("can't open display %s\n", opt_display);
 		exit(1);
 	}
--- screen.c.orig	2007-06-18 13:29:22.000000000 -0500
+++ screen.c	2010-05-11 07:25:38.000000000 -0500
@@ -375,9 +375,9 @@
 		return;
 	unhide(newc, RAISE);
 	select_client(newc);
-	setmouse(newc->window, 0, 0);
-	setmouse(newc->window, newc->width + newc->border - 1,
-			newc->height + newc->border - 1);
+//	setmouse(newc->window, 0, 0);
+	//setmouse(newc->window, newc->width + newc->border - 1,
+	//	New->height + newc->border - 1);
 	discard_enter_events();
 }
 
@@ -456,7 +456,7 @@
 	KEY_FIX, KEY_PREVDESK, KEY_NEXTDESK,
 	XK_1, XK_2, XK_3, XK_4, XK_5, XK_6, XK_7, XK_8,
 #endif
-	KEY_NEW, KEY_KILL,
+		KEY_NEW_FIREFOX,KEY_NEW_EMACS,KEY_NEW_TRANS,KEY_NEW_XLOCK,KEY_NEW, KEY_KILL,KEY_NEW_THUNDERBIRD, KEY_NEW_PIDGIN,
 	KEY_TOPLEFT, KEY_TOPRIGHT, KEY_BOTTOMLEFT, KEY_BOTTOMRIGHT,
 	KEY_LEFT, KEY_RIGHT, KEY_DOWN, KEY_UP,
 	KEY_LOWER, KEY_ALTLOWER, KEY_INFO, KEY_MAXVERT, KEY_MAX
@@ -480,4 +480,5 @@
 		grab_keysym(s->root, grabmask1 | altmask, alt_keys_to_grab[i]);
 	}
 	grab_keysym(s->root, grabmask2, KEY_NEXT);
+	grab_keysym(s->root, grabmask2, KEY_KILL);
 }