diff --git a/config.def.h b/config.def.h
index 735cd3f..7ecfe33 100644
--- a/config.def.h
+++ b/config.def.h
@@ -66,10 +66,13 @@ static const Layout layouts[] = {
 /* commands */
 static const char *runcmd[]         = { "dmenu_run", NULL };
 static const char *termcmd[]        = { "kitty", "-1", NULL };
+static const char *emacscmd[]       = { "emacsclient", "-nc", NULL };
+static const char *diredcmd[]       = { "emacsclient", "-nc", "--eval", "(dired \"~\")", NULL };
+static const char *mailcmd[]        = { "emacsclient", "-nc", "--eval", "(mu4e)", NULL };
+static const char *khalcmd[]        = { "kitty", "-1", "ikhal", NULL };
 static const char *browsercmd[]     = { "mullvad-browser", NULL };
 static const char *lockcmd[]        = { "loginctl", "lock-session", NULL };
 static const char *passwdcmd[]      = { "keepassxc", NULL };
-static const char *mailcmd[]        = { "thunderbird", NULL };
 static const char *volupcmd[]       = { "pamixer", "-i", "1", NULL };
 static const char *bigvolupcmd[]    = { "pamixer", "-i", "5", NULL };
 static const char *voldowncmd[]     = { "pamixer", "-d", "1", NULL };
@@ -85,11 +88,14 @@ static Key keys[] = {
 	/* modifier                     key        function           argument */
 	{ MODKEY,                       XK_p,      spawn,             {.v = runcmd } },
 	{ MODKEY|ShiftMask,             XK_Return, spawn,             {.v = termcmd } },
+	{ MODKEY|ShiftMask,             XK_e,      spawn,             {.v = emacscmd } },
+	{ MODKEY|ShiftMask,             XK_d,      spawn,             {.v = diredcmd } },
+	{ MODKEY|ShiftMask,             XK_m,      spawn,             {.v = mailcmd } },
+	{ MODKEY|ShiftMask,             XK_k,      spawn,             {.v = khalcmd } },
 	{ MODKEY|ShiftMask,             XK_b,      spawn,             {.v = browsercmd } },
 	{ MODKEY|ShiftMask,             XK_o,      spawn,             {.v = lockcmd } },
 	{ MODKEY|ShiftMask,             XK_p,      spawn,             {.v = passwdcmd } },
 	{ MODKEY|ShiftMask,             XK_n,      spawn,             {.v = selectsoundcmd } },
-	{ MODKEY|ShiftMask,             XK_m,      spawn,             {.v = mailcmd } },
 	{ MODKEY|ShiftMask,             XK_s,      spawn,             {.v = screenshotcmd } },
 	{ MODKEY,						XK_u,      spawn,			  {.v = closenotifycmd } },
 	{ MODKEY|ShiftMask,				XK_u,      spawn,			  {.v = lastnotifycmd } },