diff --git a/config.def.h b/config.def.h
index c38485e..ce2970b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -1,8 +1,8 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const unsigned int borderpx  = 1;        /* border pixel of windows */
-static const unsigned int gappx     = 6;        /* gaps between windows */
+static const unsigned int borderpx  = 2;        /* border pixel of windows */
+static const unsigned int gappx     = 2;        /* gaps between windows */
 static const unsigned int snap      = 32;       /* snap pixel */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
@@ -13,16 +13,18 @@ static const char col_gray2[]       = "#444444";
 static const char col_gray3[]       = "#bbbbbb";
 static const char col_gray4[]       = "#eeeeee";
 static const char col_cyan[]        = "#005577";
+static const char col_border_focus_light[] = "#df8c20"; // hsl(34 75% 50%)
+static const char col_border_focus_dark[]  = "#b25e34"; // hsl(20 55% 45%)
 static const char *colorsdark[][3]      = {
 	/*               fg         bg         border   */
 	[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
-	[SchemeSel]  = { col_gray4, col_cyan,  col_cyan  },
+	[SchemeSel]  = { col_gray4, col_cyan,  col_border_focus_dark },
 	[SchemeHid]  = { col_cyan,  col_gray1, col_cyan  },
 };
 static const char *colorslight[][3]      = {
 	/*               fg         bg         border   */
 	[SchemeNorm] = { col_gray1, col_gray3, col_gray2 },
-	[SchemeSel]  = { col_cyan,  col_gray4, col_cyan  },
+	[SchemeSel]  = { col_cyan,  col_gray4, col_border_focus_light },
 	[SchemeHid]  = { col_cyan,  col_gray1, col_cyan  },
 };
 
@@ -53,7 +55,7 @@ static const Layout layouts[] = {
 };
 
 /* key definitions */
-#define MODKEY Mod1Mask
+#define MODKEY Mod4Mask
 #define TAGKEYS(KEY,TAG) \
 	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
 	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
@@ -68,16 +70,20 @@ static char dmenumon[2] = "0"; /* component of dmenu{dark,light}, manipulated in
 static const char *dmenudark[] =  { "dmenu_run", "-m", dmenumon, "-i", "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *dmenulight[] = { "dmenu_run", "-m", dmenumon, "-i", "-fn", dmenufont, "-nb", col_gray3, "-nf", col_gray1, "-sb", col_cyan, "-sf", col_gray4, NULL };
 static const char *termcmd[]  = { "st", NULL };
-#include "shift-tools.c"
+static const char *lockcmd[]  = { "slock", NULL };
+static const char *suspendcmd[] = { "systemctl", "suspend", NULL };
+static const char *themecmd[]   = { "lupan-set-theme", "toggle", NULL };
 
+#include "shift-tools.c"
 #include "exitdwm.c"
+
 static const Key keys[] = {
 	/* modifier                     key        function        argument */
 	{ MODKEY,                       XK_p,      spawndmenu,     {0} },
-	{ MODKEY,                       XK_o, shiftviewclients,    { .i = +1 } },
-	{ MODKEY|ShiftMask,             XK_o,	shiftview,         { .i = +1 } },
-	{ MODKEY|ShiftMask,             XK_i,	shiftview,         { .i = -1 } },
-	{ MODKEY,	                XK_i, shiftviewclients,    { .i = -1 } },
+	{ MODKEY,                       XK_u,      shiftview,      { .i = +1 } },
+	{ MODKEY|ShiftMask,             XK_u,	   shifttag,       { .i = +1 } },
+	{ MODKEY|ShiftMask,             XK_y,	   shifttag,       { .i = -1 } },
+	{ MODKEY,                       XK_y,      shiftview,      { .i = -1 } },
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
 	{ MODKEY,                       XK_b,      togglebar,      {0} },
 	{ MODKEY,                       XK_j,      focusstackvis,  {.i = +1 } },
@@ -119,17 +125,22 @@ static const Key keys[] = {
 	TAGKEYS(                        XK_7,                      6)
 	TAGKEYS(                        XK_8,                      7)
 	TAGKEYS(                        XK_9,                      8)
-	{ MODKEY|ShiftMask,             XK_j,      focusbynum,     {.i = 0} },
-	{ MODKEY|ShiftMask,             XK_k,      focusbynum,     {.i = 1} },
-	{ MODKEY|ShiftMask,             XK_l,      focusbynum,     {.i = 2} },
-	{ MODKEY|ShiftMask,             XK_colon,  focusbynum,     {.i = 3} },
-	{ MODKEY|ShiftMask,             XK_f,      focusbynum,     {.i = 4} },
-	{ MODKEY|ShiftMask,             XK_d,      focusbynum,     {.i = 5} },
-	{ MODKEY|ShiftMask,             XK_s,      focusbynum,     {.i = 6} },
-	{ MODKEY|ShiftMask,             XK_a,      focusbynum,     {.i = 7} },
+	{ ControlMask,                  XK_1,      focusbynum,     {.i = 0} },
+	{ ControlMask,                  XK_2,      focusbynum,     {.i = 1} },
+	{ ControlMask,                  XK_3,      focusbynum,     {.i = 2} },
+	{ ControlMask,                  XK_4,      focusbynum,     {.i = 3} },
+	{ ControlMask,                  XK_5,      focusbynum,     {.i = 4} },
+	{ ControlMask,                  XK_6,      focusbynum,     {.i = 5} },
+	{ ControlMask,                  XK_7,      focusbynum,     {.i = 6} },
+	{ ControlMask,                  XK_8,      focusbynum,     {.i = 7} },
+	{ ControlMask,                  XK_9,      focusbynum,     {.i = 8} },
 	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 	{ MODKEY|ControlMask|ShiftMask, XK_q,      quit,           {1} }, 
 	{ MODKEY|ShiftMask,             XK_e,      exitdwm,       {0} },
+	{ MODKEY|ControlMask|ShiftMask, XK_s,      spawn,          {.v = suspendcmd } },
+	{ MODKEY|ControlMask|ShiftMask, XK_l,      spawn,          {.v = lockcmd } },
+	{ MODKEY|ControlMask|ShiftMask, XK_t,      spawn,          {.v = themecmd } },
+
 };
 
 /* button definitions */