--- config.def.h
+++ config.def.h
@@ -46,12 +46,11 @@ static const Layout layouts[] = {
 
 /* key definitions */
 #define MODKEY Mod1Mask
-
-#define TAGKEYS(KEY,TAG)												\
-	{1, {{MODKEY, KEY}},								view,           {.ui = 1 << TAG} },	\
-	{1, {{MODKEY|ControlMask, KEY}},					toggleview,     {.ui = 1 << TAG} }, \
-	{1, {{MODKEY|ShiftMask, KEY}},						tag,            {.ui = 1 << TAG} }, \
-	{1, {{MODKEY|ControlMask|ShiftMask, KEY}},			toggletag,      {.ui = 1 << TAG} },
+#define TAGKEYS(KEY,TAG) \
+	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
+	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
+	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
+	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
 
 /* helper for spawning shell commands in the pre dwm-5.0 fashion */
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
@@ -60,34 +59,32 @@ static const Layout layouts[] = {
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *termcmd[]  = { "st", NULL };
-static const char *emacs[]  = { "emacs", NULL };
 
-static Keychord keychords[] = {
-	/* Keys        function        argument */
-	{1, {{MODKEY, XK_p}},							spawn,          {.v = dmenucmd } },
-	{1, {{MODKEY|ShiftMask, XK_Return}},			spawn,          {.v = termcmd } },
-	{2, {{MODKEY, XK_e}, {MODKEY, XK_e}},			spawn,          {.v = termcmd } },
-	{1, {{MODKEY, XK_b}},							togglebar,      {0} },
-	{1, {{MODKEY, XK_j}},							focusstack,     {.i = +1 } },
-	{1, {{MODKEY, XK_k}},							focusstack,     {.i = -1 } },
-	{1, {{MODKEY, XK_i}},							incnmaster,     {.i = +1 } },
-	{1, {{MODKEY, XK_d}},							incnmaster,     {.i = -1 } },
-	{1, {{MODKEY, XK_h}},							setmfact,       {.f = -0.05} },
-	{1, {{MODKEY, XK_l}},							setmfact,       {.f = +0.05} },
-	{1, {{MODKEY, XK_Return}},						zoom,           {0} },
-	{1, {{MODKEY, XK_Tab}},							view,           {0} },
-	{1, {{MODKEY|ShiftMask, XK_c}},					killclient,     {0} },
-	{1, {{MODKEY, XK_t}},							setlayout,      {.v = &layouts[0]} },
-	{1, {{MODKEY, XK_f}},							setlayout,      {.v = &layouts[1]} },
-	{1, {{MODKEY, XK_m}},							setlayout,      {.v = &layouts[2]} },
-	{1, {{MODKEY, XK_space}},						setlayout,      {0} },
-	{1, {{MODKEY|ShiftMask, XK_space}},				togglefloating, {0} },
-	{1, {{MODKEY, XK_0}},							view,           {.ui = ~0 } },
-	{1, {{MODKEY|ShiftMask, XK_0}},					tag,            {.ui = ~0 } },
-	{1, {{MODKEY, XK_comma}},						focusmon,       {.i = -1 } },
-	{1, {{MODKEY, XK_period}},						focusmon,       {.i = +1 } },
-	{1, {{MODKEY|ShiftMask, XK_comma}},				tagmon,         {.i = -1 } },
-	{1, {{MODKEY|ShiftMask, XK_period}},			tagmon,         {.i = +1 } },
+static Key keys[] = {
+	/* modifier                     key        function        argument */
+	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+	{ MODKEY,                       XK_b,      togglebar,      {0} },
+	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
+	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
+	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
+	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
+	{ MODKEY,                       XK_Return, zoom,           {0} },
+	{ MODKEY,                       XK_Tab,    view,           {0} },
+	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
+	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
+	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
+	{ MODKEY,                       XK_space,  setlayout,      {0} },
+	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
+	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
+	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
+	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
+	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
+	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
 	TAGKEYS(                        XK_1,                      0)
 	TAGKEYS(                        XK_2,                      1)
 	TAGKEYS(                        XK_3,                      2)
@@ -95,9 +92,9 @@ static Key keys[] = {
 	TAGKEYS(                        XK_5,                      4)
 	TAGKEYS(                        XK_6,                      5)
 	TAGKEYS(                        XK_7,                      6)
-	 TAGKEYS(                        XK_8,                      7)
+	TAGKEYS(                        XK_8,                      7)
 	TAGKEYS(                        XK_9,                      8)
-	{1, {{MODKEY|ShiftMask, XK_q}},					quit,           {0} },
+	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 };
 
 /* button definitions */