--- evilwm-1.1.0.orig/keymap.h	2011-07-03 16:14:21.000000000 +0200
+++ evilwm-1.1.0/keymap.h	2011-11-29 19:54:57.437509136 +0100
@@ -2,23 +2,23 @@
 #define _KEYMAP_H
 
 #define KEY_NEXT        XK_Tab
-#define KEY_NEW         XK_Return
-#define KEY_TOPLEFT     XK_y
-#define KEY_TOPRIGHT    XK_u
-#define KEY_BOTTOMLEFT  XK_b
-#define KEY_BOTTOMRIGHT XK_n
+#define KEY_NEW         XK_e
+#define KEY_TOPLEFT     XK_a
+#define KEY_TOPRIGHT    XK_s
+#define KEY_BOTTOMLEFT  XK_y
+#define KEY_BOTTOMRIGHT XK_x
 #define KEY_LEFT        XK_h
 #define KEY_RIGHT       XK_l
 #define KEY_DOWN        XK_j
-#define KEY_UP          XK_k
+#define KEY_UP          XK_g
 #define KEY_LOWER       XK_Insert
 #define KEY_ALTLOWER    XK_KP_Insert
 #define KEY_INFO        XK_i
 #define KEY_MAXVERT     XK_equal
-#define KEY_MAX         XK_x
-#define KEY_DOCK_TOGGLE XK_d
+#define KEY_MAX         XK_m
+#define KEY_DOCK_TOGGLE XK_f
 #ifdef VWM
-# define KEY_FIX        XK_f
+# define KEY_FIX        XK_d
 # define KEY_PREVDESK   XK_Left
 # define KEY_NEXTDESK   XK_Right
 # define KEY_TOGGLEDESK XK_a
@@ -26,7 +26,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_k
 #endif
 
 #endif