diff --git a/config.def.h b/config.def.h
index a090592..2989750 100644
--- a/config.def.h
+++ b/config.def.h
@@ -142,22 +142,23 @@ static const Key keys[] = {
 	/* Note that Shift changes certain key codes: c -> C, 2 -> at, etc. */
 	/* modifier                  key                function          argument */
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Escape,    quit,             {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_d,         togglefloating,   {0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_f,         togglefullscreen, {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_D,         togglefloating,   {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_F,         togglefullscreen, {0} },
 	{ MODKEY,                    XKB_KEY_h,         focusstack,       {.i = -1} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_h,         zoom,             {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H,         incnmaster,       {.i = -1} },
 	{ MODKEY,                    XKB_KEY_j,         focusstack,       {.i = +1} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_j,         zoom,             {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_J,         incnmaster,       {.i = -1} },
 	{ MODKEY,                    XKB_KEY_k,         focusstack,       {.i = -1} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_k,         zoom,             {0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_K,         incnmaster,       {.i = +1} },
 	{ MODKEY,                    XKB_KEY_l,         focusstack,       {.i = +1} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_L,         incnmaster,       {.i = +1} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_M,         setlayout,        {.v = &layouts[0]} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_o,         setmfact,         {.f = +0.05f} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_O,         setmfact,         {.f = +0.05f} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_Q,         killclient,       {0} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_T,         setlayout,        {.v = &layouts[1]} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_h,         setmfact,         {.f = -0.05f} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_H,         setmfact,         {.f = -0.05f} },
 	{ MODKEY,                    XKB_KEY_0,         view,             {.ui = ~0} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_0,         tag,              {.ui = ~0} },
+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_equal,     tag,              {.ui = ~0} },
 	{ MODKEY,                    XKB_KEY_comma,     focusmon,         {.i = WLR_DIRECTION_LEFT} },
 	{ MODKEY,                    XKB_KEY_period,    focusmon,         {.i = WLR_DIRECTION_RIGHT} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,      tagmon,           {.i = WLR_DIRECTION_LEFT} },
@@ -166,15 +167,25 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_r,          spawn,          {.v = menucmd} },
 	{ MODKEY,                    XKB_KEY_Return,     spawn,          {.v = termcmd} },
 
-	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
-	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                         1),
-	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                 2),
-	TAGKEYS(          XKB_KEY_4, XKB_KEY_dollar,                     3),
-	TAGKEYS(          XKB_KEY_5, XKB_KEY_percent,                    4),
-	TAGKEYS(          XKB_KEY_6, XKB_KEY_asciicircum,                5),
-	TAGKEYS(          XKB_KEY_7, XKB_KEY_ampersand,                  6),
-	TAGKEYS(          XKB_KEY_8, XKB_KEY_asterisk,                   7),
-	TAGKEYS(          XKB_KEY_9, XKB_KEY_parenleft,                  8),
+        TAGKEYS(XKB_KEY_1, XKB_KEY_exclam,      0),
+        TAGKEYS(XKB_KEY_2, XKB_KEY_quotedbl,    1),
+        TAGKEYS(XKB_KEY_3, XKB_KEY_section,     2),
+        TAGKEYS(XKB_KEY_4, XKB_KEY_dollar,      3),
+        TAGKEYS(XKB_KEY_5, XKB_KEY_percent,     4),
+        TAGKEYS(XKB_KEY_6, XKB_KEY_ampersand,   5),
+        TAGKEYS(XKB_KEY_7, XKB_KEY_slash,       6),
+        TAGKEYS(XKB_KEY_8, XKB_KEY_parenleft,   7),
+        TAGKEYS(XKB_KEY_9, XKB_KEY_parenright,  8),
+        // TAGKEYS(XKB_KEY_0, XKB_KEY_equal,       9),
+	// TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
+	// TAGKEYS(          XKB_KEY_2, XKB_KEY_quotedbl,                   1),
+	// TAGKEYS(          XKB_KEY_3, XKB_KEY_paragraph,                  2),
+	// TAGKEYS(          XKB_KEY_4, XKB_KEY_dollar,                     3),
+	// TAGKEYS(          XKB_KEY_5, XKB_KEY_percent,                    4),
+	// TAGKEYS(          XKB_KEY_6, XKB_KEY_ampersand,                  5),
+	// TAGKEYS(          XKB_KEY_7, XKB_KEY_asciicircum,                6),
+	// TAGKEYS(          XKB_KEY_9, XKB_KEY_parenleft,                  7),
+	// TAGKEYS(          XKB_KEY_9, XKB_KEY_parenright,                 8),
 
 	/* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
 	{ WLR_MODIFIER_CTRL|WLR_MODIFIER_ALT,XKB_KEY_Terminate_Server, quit, {0} },