diff --git a/programs/dwm/config.def.h b/programs/dwm/config.def.h
index fa4eba0f..3aa9fe3e 100644
--- a/programs/dwm/config.def.h
+++ b/programs/dwm/config.def.h
@@ -67,7 +67,7 @@ static const char *mutevol[]    = { "/usr/bin/wpctl",   "set-mute",   "@DEFAULT_
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[]      = { "dmenu_run", "-m", dmenumon, NULL };
-static const char *termcmd[]       = { "tabbed", "-r", "2", "st", "-w", "''", NULL };
+static const char *termcmd[]       = { "tabbed", "-c", "-r", "2", "st", "-w", "''", NULL };
 static const char *slockcmd[]      = { "slock", NULL };
 static const char *screenshotcmd[] = { "scrot", "--select", "--line", "mode=edge", NULL };
 static const char *surfcmd[]       = { "tabbed", "-c", "-r", "2", "surf", "-e", "ID", ".homepage.html" };
diff --git a/programs/dwm/config.h b/programs/dwm/config.h
index fa4eba0f..3aa9fe3e 100644
--- a/programs/dwm/config.h
+++ b/programs/dwm/config.h
@@ -67,7 +67,7 @@ static const char *mutevol[]    = { "/usr/bin/wpctl",   "set-mute",   "@DEFAULT_
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
 static const char *dmenucmd[]      = { "dmenu_run", "-m", dmenumon, NULL };
-static const char *termcmd[]       = { "tabbed", "-r", "2", "st", "-w", "''", NULL };
+static const char *termcmd[]       = { "tabbed", "-c", "-r", "2", "st", "-w", "''", NULL };
 static const char *slockcmd[]      = { "slock", NULL };
 static const char *screenshotcmd[] = { "scrot", "--select", "--line", "mode=edge", NULL };
 static const char *surfcmd[]       = { "tabbed", "-c", "-r", "2", "surf", "-e", "ID", ".homepage.html" };
diff --git a/programs/dwm/dwm b/programs/dwm/dwm
index bb3aa18f..7b5af22e 100755
Binary files a/programs/dwm/dwm and b/programs/dwm/dwm differ
diff --git a/programs/tabbed/config.def.h b/programs/tabbed/config.def.h
index 2c141659..5427c0bf 100644
--- a/programs/tabbed/config.def.h
+++ b/programs/tabbed/config.def.h
@@ -2,12 +2,12 @@
 
 /* appearance */
 static const char font[]        = "JetBrainsMono NF:size=10";
-static const char* normbgcolor  = "#222222";
-static const char* normfgcolor  = "#cccccc";
-static const char* selbgcolor   = "#555555";
-static const char* selfgcolor   = "#ffffff";
-static const char* urgbgcolor   = "#111111";
-static const char* urgfgcolor   = "#cc0000";
+static const char* normbgcolor  = "#32302f";
+static const char* normfgcolor  = "#ebdbb2";
+static const char* selbgcolor   = "#ebdbb2";
+static const char* selfgcolor   = "#282828";
+static const char* urgbgcolor   = "#fb4934";
+static const char* urgfgcolor   = "#282828";
 static const char before[]      = "<";
 static const char after[]       = ">";
 static const char titletrim[]   = "...";
@@ -33,16 +33,16 @@ static Bool npisrelative  = False;
         } \
 }
 
-#define MODKEY ControlMask
+#define MODKEY Mod1Mask
 static const Key keys[] = {
 	/* modifier             key        function     argument */
-	{ MODKEY|ShiftMask,     XK_Return, focusonce,   { 0 } },
-	{ MODKEY|ShiftMask,     XK_Return, spawn,       { 0 } },
+	{ MODKEY,               XK_Return, focusonce,   { 0 } },
+	{ MODKEY,               XK_Return, spawn,       { 0 } },
 
-	{ MODKEY|ShiftMask,     XK_l,      rotate,      { .i = +1 } },
-	{ MODKEY|ShiftMask,     XK_h,      rotate,      { .i = -1 } },
-	{ MODKEY|ShiftMask,     XK_j,      movetab,     { .i = -1 } },
-	{ MODKEY|ShiftMask,     XK_k,      movetab,     { .i = +1 } },
+	{ MODKEY,               XK_l,      rotate,      { .i = +1 } },
+	{ MODKEY,               XK_h,      rotate,      { .i = -1 } },
+	{ MODKEY,               XK_j,      movetab,     { .i = -1 } },
+	{ MODKEY,               XK_k,      movetab,     { .i = +1 } },
 	{ MODKEY,               XK_Tab,    rotate,      { .i = 0 } },
 
 	{ MODKEY,               XK_grave,  spawn,       SETPROP("_TABBED_SELECT_TAB") },
@@ -57,7 +57,7 @@ static const Key keys[] = {
 	{ MODKEY,               XK_9,      move,        { .i = 8 } },
 	{ MODKEY,               XK_0,      move,        { .i = 9 } },
 
-	{ MODKEY,               XK_q,      killclient,  { 0 } },
+	{ MODKEY,               XK_c,      killclient,  { 0 } },
 
 	{ MODKEY,               XK_u,      focusurgent, { 0 } },
 	{ MODKEY|ShiftMask,     XK_u,      toggle,      { .v = (void*) &urgentswitch } },
diff --git a/programs/tabbed/config.h b/programs/tabbed/config.h
index 2c141659..5427c0bf 100644
--- a/programs/tabbed/config.h
+++ b/programs/tabbed/config.h
@@ -2,12 +2,12 @@
 
 /* appearance */
 static const char font[]        = "JetBrainsMono NF:size=10";
-static const char* normbgcolor  = "#222222";
-static const char* normfgcolor  = "#cccccc";
-static const char* selbgcolor   = "#555555";
-static const char* selfgcolor   = "#ffffff";
-static const char* urgbgcolor   = "#111111";
-static const char* urgfgcolor   = "#cc0000";
+static const char* normbgcolor  = "#32302f";
+static const char* normfgcolor  = "#ebdbb2";
+static const char* selbgcolor   = "#ebdbb2";
+static const char* selfgcolor   = "#282828";
+static const char* urgbgcolor   = "#fb4934";
+static const char* urgfgcolor   = "#282828";
 static const char before[]      = "<";
 static const char after[]       = ">";
 static const char titletrim[]   = "...";
@@ -33,16 +33,16 @@ static Bool npisrelative  = False;
         } \
 }
 
-#define MODKEY ControlMask
+#define MODKEY Mod1Mask
 static const Key keys[] = {
 	/* modifier             key        function     argument */
-	{ MODKEY|ShiftMask,     XK_Return, focusonce,   { 0 } },
-	{ MODKEY|ShiftMask,     XK_Return, spawn,       { 0 } },
+	{ MODKEY,               XK_Return, focusonce,   { 0 } },
+	{ MODKEY,               XK_Return, spawn,       { 0 } },
 
-	{ MODKEY|ShiftMask,     XK_l,      rotate,      { .i = +1 } },
-	{ MODKEY|ShiftMask,     XK_h,      rotate,      { .i = -1 } },
-	{ MODKEY|ShiftMask,     XK_j,      movetab,     { .i = -1 } },
-	{ MODKEY|ShiftMask,     XK_k,      movetab,     { .i = +1 } },
+	{ MODKEY,               XK_l,      rotate,      { .i = +1 } },
+	{ MODKEY,               XK_h,      rotate,      { .i = -1 } },
+	{ MODKEY,               XK_j,      movetab,     { .i = -1 } },
+	{ MODKEY,               XK_k,      movetab,     { .i = +1 } },
 	{ MODKEY,               XK_Tab,    rotate,      { .i = 0 } },
 
 	{ MODKEY,               XK_grave,  spawn,       SETPROP("_TABBED_SELECT_TAB") },
@@ -57,7 +57,7 @@ static const Key keys[] = {
 	{ MODKEY,               XK_9,      move,        { .i = 8 } },
 	{ MODKEY,               XK_0,      move,        { .i = 9 } },
 
-	{ MODKEY,               XK_q,      killclient,  { 0 } },
+	{ MODKEY,               XK_c,      killclient,  { 0 } },
 
 	{ MODKEY,               XK_u,      focusurgent, { 0 } },
 	{ MODKEY|ShiftMask,     XK_u,      toggle,      { .v = (void*) &urgentswitch } },
diff --git a/programs/tabbed/tabbed b/programs/tabbed/tabbed
index 267bb9f5..b24c3826 100755
Binary files a/programs/tabbed/tabbed and b/programs/tabbed/tabbed differ