diff --git a/config.h b/config.h
index 959d241..7545dbb 100644
--- a/config.h
+++ b/config.h
@@ -25,7 +25,8 @@ static int hidevacant                    = 1;
 static int monoclenogaps                 = 1;
 
 static const char *const autostart[] = {
-	"/bin/sh", "-c", "$HOME/.config/speedwm/autostart.sh", NULL,
+	"/bin/sh", "-c", "${XDG_CONFIG_HOME:-$HOME/.config}/autostart", NULL,
+	"/bin/sh", "-c", "${XDG_CONFIG_DIRS:-/etc/xdg}/autostart", NULL,
 	NULL /* terminate */
 };
 
@@ -125,17 +126,16 @@ static const Layout layouts[] = {
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
 
 /* commands */
-static const char *spmenucmd[] = { "spmenu_run", "-x", NULL };
 static const char *spmenucmd_d[] = { "spmenu_run", "-d", NULL };
-static const char *termcmd[]  = { "st", NULL };
-static const char *browser[] = { "chromium", NULL };
+static const char *termcmd[]     = { "st", NULL };
+static const char *browser[]     = { "chromium", NULL };
 
 static const Key keys[] = {
 	/* modifier                       key           function        argument */
-	{ MODKEY,                         XK_semicolon, spawn,          {.v = spmenucmd_d } },
-	{ MODKEY|ShiftMask,               XK_semicolon, spawn,          {.v = spmenucmd } },
-	{ MODKEY|ShiftMask,               XK_Return,    spawn,          {.v = termcmd } },
-    { MODKEY|ShiftMask,               XK_w,         spawn,          {.v = browser } },
+	{ MODKEY,                         XK_semicolon, spawn,          SHCMD("spmenu_run -d -a '-p Run'") },
+	{ MODKEY|ShiftMask,               XK_semicolon, spawn,          SHCMD("spmenu_run -x -a '-p Run'") },
+	{ MODKEY|ShiftMask,               XK_Return,    spawn,          SHCMD("st") },
+    { MODKEY|ShiftMask,               XK_w,         spawn,          SHCMD("chromium") },
     { MODKEY|ShiftMask,               XK_o,         spawn,          SHCMD("dfmpeg-spmenu") },
     { MODKEY|ControlMask|ShiftMask,   XK_w,         spawn,          SHCMD("wallpaper-spmenu") },
     { MODKEY|ControlMask|ShiftMask,   XK_b,         spawn,          SHCMD("bluetooth-spmenu") },