diff --git a/config.def.h b/config.def.h
index ba9a240..d985467 100644
--- a/config.def.h
+++ b/config.def.h
@@ -28,7 +28,8 @@ static const Rule rules[] = {
 	 */
 	/* class      instance    title       tags mask     isfloating   monitor */
 	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
+	{ "Firefox",  NULL,       NULL,       0,            0,           -1 },
+	{ "KeePass2", NULL,       NULL,       1<<8,         0,           -1 },
 };
 
 /* layout(s) */
@@ -58,20 +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 *volup[]  = { "volcont", "--up", NULL };
+static const char *voldown[]  = { "volcont", "--down", "5", NULL };
+static const char *voltog[]  = { "volcont", "--toggle", "5", NULL };
+static const char *slock[]  = { "slock", NULL };
+static const char *keepass[] = { "mono", "/usr/share/keepass/KeePass.exe", "--auto-type", NULL };
+static const char *pass[] = { "/usr/local/bin/passautotype", "-t", NULL };
 
 static Key keys[] = {
 	/* modifier                     key        function        argument */
-	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+	{ MODKEY,                       XK_r,      spawn,          {.v = dmenucmd } },
+	{ MODKEY,                       XK_Return, spawn,          {.v = termcmd } },
+	{ 0,                            0x1008ff13,spawn,          {.v = volup } },
+	{ 0,                            0x1008ff11,spawn,          {.v = voldown } },
+	{ 0,                            0x1008ff12,spawn,          {.v = voltog } },
+	{ MODKEY,                       XK_l,      spawn,          {.v = slock } },
+	{ MODKEY,                       XK_a,      spawn,          {.v = keepass } },
+	{ MODKEY,                       XK_z,      spawn,          {.v = pass } },
 	{ 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,                       XK_Tab,    focusstack,     {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_Tab,    focusstack,     {.i = -1 } },
+	{ MODKEY|ShiftMask,             XK_Up,     incnmaster,     {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_Down,   incnmaster,     {.i = -1 } },
+	{ MODKEY,                       XK_Up,     setmfact,       {.f = -0.05} },
+	{ MODKEY,                       XK_Down,   setmfact,       {.f = +0.05} },
+	{ MODKEY|ShiftMask,             XK_Return, zoom,           {0} },
+	{ MODKEY,                       XK_j,      view,           {0} },
 	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
 	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
 	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },