diff --git a/src/keyevents.c b/src/keyevents.c
index 2f9b1d6..7791261 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -29,6 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "filelist.h"
 #include "winwidget.h"
 #include "options.h"
+#include <X11/X.h>
 #include <termios.h>
 
 struct __fehkey keys[EVENT_LIST_END];
@@ -140,21 +141,21 @@ void init_keyevents(void) {
 	 */
 
 	feh_set_kb("menu_close" , 0, XK_Escape    , 0, 0            , 0, 0);
-	feh_set_kb("menu_parent", 0, XK_Left      , 0, 0            , 0, 0);
-	feh_set_kb("menu_down", 0, XK_Down      , 0, 0            , 0, 0);
-	feh_set_kb("menu_up", 0, XK_Up        , 0, 0            , 0, 0);
-	feh_set_kb("menu_child", 0, XK_Right     , 0, 0            , 0, 0);
+	feh_set_kb("menu_parent", 0, XK_h      , 0, 0            , 0, 0);
+	feh_set_kb("menu_down", 0, XK_j      , 0, 0            , 0, 0);
+	feh_set_kb("menu_up", 0, XK_k        , 0, 0            , 0, 0);
+	feh_set_kb("menu_child", 0, XK_l     , 0, 0            , 0, 0);
 	feh_set_kb("menu_select", 0, XK_Return    , 0, XK_space     , 0, 0);
-	feh_set_kb("scroll_left",0, XK_KP_Left   , 4, XK_Left      , 0, 0);
-	feh_set_kb("scroll_right", 0,XK_KP_Right  , 4, XK_Right     , 0, 0);
-	feh_set_kb("scroll_down",0, XK_KP_Down   , 4, XK_Down      , 0, 0);
-	feh_set_kb("scroll_up",  0, XK_KP_Up     , 4, XK_Up        , 0, 0);
+	feh_set_kb("scroll_left", 0, XK_H   , 4, XK_Left      , 0, 0);
+	feh_set_kb("scroll_right", 0, XK_L  , 4, XK_Right     , 0, 0);
+	feh_set_kb("scroll_down", 0, XK_J   , 4, XK_Down      , 0, 0);
+	feh_set_kb("scroll_up", 0, XK_K     , 4, XK_Up        , 0, 0);
 	feh_set_kb("scroll_left_page" , 8, XK_Left , 0, 0          , 0, 0);
 	feh_set_kb("scroll_right_page", 8, XK_Right, 0, 0          , 0, 0);
 	feh_set_kb("scroll_down_page" , 8, XK_Down , 0, 0          , 0, 0);
 	feh_set_kb("scroll_up_page" , 8, XK_Up   , 0, 0          , 0, 0);
-	feh_set_kb("prev_img"  , 0, XK_Left      , 0, XK_p         , 0, XK_BackSpace);
-	feh_set_kb("next_img"  , 0, XK_Right     , 0, XK_n         , 0, XK_space);
+	feh_set_kb("prev_img"  , 0, XK_h      , 0, XK_p         , 0, XK_BackSpace);
+	feh_set_kb("next_img"  , 0, XK_l     , 0, XK_n         , 0, XK_space);
 	feh_set_kb("jump_back" , 0, XK_Page_Up   , 0, XK_KP_Page_Up, 0, 0);
 	feh_set_kb("jump_fwd"  , 0, XK_Page_Down , 0, XK_KP_Page_Down,0,0);
 	feh_set_kb("prev_dir"  , 0, XK_bracketleft, 0, 0           , 0, 0);
@@ -162,10 +163,10 @@ void init_keyevents(void) {
 	feh_set_kb("jump_random" ,0, XK_z         , 0, 0            , 0, 0);
 	feh_set_kb("quit"      , 0, XK_Escape    , 0, XK_q         , 0, 0);
 	feh_set_kb("close"     , 0, XK_x         , 0, 0            , 0, 0);
-	feh_set_kb("remove"    , 0, XK_Delete    , 0, 0            , 0, 0);
-	feh_set_kb("delete"    , 4, XK_Delete    , 0, 0            , 0, 0);
-	feh_set_kb("jump_first" , 0, XK_Home      , 0, XK_KP_Home   , 0, 0);
-	feh_set_kb("jump_last" , 0, XK_End       , 0, XK_KP_End    , 0, 0);
+	feh_set_kb("remove"    , 0, XK_d    , 0, 0            , 0, 0);
+	feh_set_kb("delete"    , 0, XK_D    , 0, 0            , 0, 0);
+	feh_set_kb("jump_first" , 0, XK_I      , 0, XK_Home   , 0, 0);
+	feh_set_kb("jump_last" , 0, XK_A       , 0, XK_End    , 0, 0);
 	feh_set_kb("action_0"  , 0, XK_Return    , 0, XK_0         , 0, XK_KP_0);
 	feh_set_kb("action_1"  , 0, XK_1         , 0, XK_KP_1      , 0, 0);
 	feh_set_kb("action_2"  , 0, XK_2         , 0, XK_KP_2      , 0, 0);
@@ -176,9 +177,9 @@ void init_keyevents(void) {
 	feh_set_kb("action_7"  , 0, XK_7         , 0, XK_KP_7      , 0, 0);
 	feh_set_kb("action_8"  , 0, XK_8         , 0, XK_KP_8      , 0, 0);
 	feh_set_kb("action_9"  , 0, XK_9         , 0, XK_KP_9      , 0, 0);
-	feh_set_kb("zoom_in"   , 0, XK_Up        , 0, XK_KP_Add    , 0, 0);
-	feh_set_kb("zoom_out"  , 0, XK_Down      , 0, XK_KP_Subtract,0, 0);
-	feh_set_kb("zoom_default" , 0, XK_KP_Multiply, 0, XK_asterisk,0, 0);
+	feh_set_kb("zoom_in"   , 0, XK_plus        , 0, XK_KP_Add    , 0, 0);
+	feh_set_kb("zoom_out"  , 0, XK_minus      , 0, XK_KP_Subtract,0, 0);
+	feh_set_kb("zoom_default" , 0, XK_equal, 0, XK_asterisk,0, 0);
 	feh_set_kb("zoom_fit"  , 0, XK_KP_Divide , 0, XK_slash     , 0, 0);
 	feh_set_kb("zoom_fill" , 0, XK_exclam    , 0, 0            , 0, 0);
 	feh_set_kb("size_to_image" , 0, XK_w      , 0, 0            , 0, 0);
@@ -189,11 +190,11 @@ void init_keyevents(void) {
 #ifdef HAVE_LIBEXIF
 	feh_set_kb("toggle_exif" , 0, XK_e, 0, 0, 0, 0);
 #endif
-	feh_set_kb("toggle_filenames" , 0, XK_d, 0, 0, 0, 0);
+	feh_set_kb("toggle_filenames" , 0, XK_p, 0, 0, 0, 0);
 	feh_set_kb("toggle_info" , 0, XK_i, 0, 0, 0, 0);
 	feh_set_kb("toggle_pointer" , 0, XK_o, 0, 0, 0, 0);
 	feh_set_kb("toggle_caption" , 0, XK_c, 0, 0, 0, 0);
-	feh_set_kb("toggle_pause" , 0, XK_h, 0, 0, 0, 0);
+	feh_set_kb("toggle_pause" , 0, XK_p, 0, 0, 0, 0);
 	feh_set_kb("toggle_menu" , 0, XK_m, 0, 0, 0, 0);
 	feh_set_kb("toggle_fullscreen" , 0, XK_f, 0, 0, 0, 0);
 	feh_set_kb("reload_image" , 0, XK_r, 0, 0, 0, 0);
@@ -203,9 +204,9 @@ void init_keyevents(void) {
 	feh_set_kb("orient_3" , 0, XK_less, 0, 0, 0, 0);
 	feh_set_kb("flip" , 0, XK_underscore, 0, 0, 0, 0);
 	feh_set_kb("mirror" , 0, XK_bar, 0, 0, 0, 0);
-	feh_set_kb("reload_minus" , 0, XK_minus, 0, 0, 0, 0);
-	feh_set_kb("reload_plus" , 0, XK_plus, 0, 0, 0, 0);
-	feh_set_kb("toggle_keep_vp" , 0, XK_k, 0, 0, 0, 0);
+	feh_set_kb("reload_minus" , 0, XK_KP_Add, 0, 0, 0, 0);
+	feh_set_kb("reload_plus" , 0, XK_KP_Subtract, 0, 0, 0, 0);
+	feh_set_kb("toggle_keep_vp" , 0, XK_v, 0, 0, 0, 0);
 	feh_set_kb("toggle_fixed_geometry" , 0, XK_g, 0, 0, 0, 0);
 	feh_set_kb("pan" , 0, 0, 0, 0, 0, 0);
 	feh_set_kb("zoom" , 0, 0, 0, 0, 0, 0);