 +	{ MODKEY,                       XK_s,      spawn,          {.v = embedsurfcmd } },
 +	{ MODKEY,                       XK_t,      spawn,          {.v = embedstcmd } },
  	{ MODKEY,                       XK_b,      togglebar,      {0} },
- 	{ MODKEY,                       XK_k,      focusstack,     {.i = +1 } },
- 	{ MODKEY,                       XK_h,      focusstack,     {.i = -1 } },
-@@ -83,11 +96,8 @@ static Key keys[] = {
+-	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+-	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
++	{ MODKEY,                       XK_k,      focusstack,     {.i = +1 } },
++	{ MODKEY,                       XK_h,      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_j,      setmfact,       {.f = -0.03} },
++	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.03} },
  	{ MODKEY,                       XK_Return, zoom,           {0} },
  	{ MODKEY,                       XK_Tab,    view,           {0} },
  	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },

 	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
 	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
 	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },

diff -up dwm-vanilla/config.def.h dwm-main/config.def.h
--- dwm-vanilla/config.def.h	2011-12-19 07:02:46.000000000 -0800
+++ dwm-main/config.def.h	2015-11-01 16:21:14.197763402 -0800
@@ -1,31 +1,51 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const char font[]            = "-*-terminus-medium-r-*-*-16-*-*-*-*-*-*-*";
-static const char normbordercolor[] = "#444444";
-static const char normbgcolor[]     = "#222222";
-static const char normfgcolor[]     = "#bbbbbb";
-static const char selbordercolor[]  = "#005577";
-static const char selbgcolor[]      = "#005577";
-static const char selfgcolor[]      = "#eeeeee";
-static const unsigned int borderpx  = 1;        /* border pixel of windows */
-static const unsigned int snap      = 32;       /* snap pixel */
+static const char font[]            = "Source Code Pro:pixelsize=18:antialias=true";
+static const char normbordercolor[] = "#282828";
+static const char normbgcolor[]     = "#282828";
+static const char normfgcolor[]     = "#EBDBB2";
+static const char selbordercolor[]  = "#B16286";
+static const char selbgcolor[]      = "#B16286";
+static const char selfgcolor[]      = "#EBDBB2";
+static const char occbordercolor[]  = "#504945";
+static const char occbgcolor[]      = "#504945";
+static const char occfgcolor[]      = "#EBDBB2";
+static const char urgbordercolor[]  = "#CC241D";
+static const char urgbgcolor[]      = "#CC241D";
+static const char urgfgcolor[]      = "#EBDBB2";
+static const unsigned int borderpx  = 0;        /* border pixel of windows */
+static const unsigned int snap      = 0;       /* snap pixel */
 static const Bool showbar           = True;     /* False means no bar */
 static const Bool topbar            = True;     /* False means bottom bar */
 
 /* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+static const char *tags[] = { "web", "chat", "term", "music", "code", "steam", "game", "misc" };
 
 static const Rule rules[] = {
-	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",     NULL,       NULL,       0,            True,        -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       False,       -1 },
+	/* class              instance    title                      tags mask     isfloating   monitor */
+	//Browsers
+	{ "chromium-browser", NULL,       NULL,                      1 << 0,       False        -1 },
+	{ "Firefox",          NULL,       NULL,                      1 << 0,       False,       -1 },
+	//Terminals
+	{ "st-256color",      NULL,       "st",                      1 << 2,       False,       -1 },
+	//Terminal Applications
+	{ NULL,               NULL,       "IRC",                     1 << 1,       False,       -1 },
+	{ NULL,               NULL,       "Music",                   1 << 3,       False,       -1 },
+	//Steam
+	{ "Steam",            NULL,       NULL,                      1 << 5,       False,       -1 },
+	//Games
+	{ NULL,               NULL,       "CavesOfQud",              1 << 6,       False,       -1 },
+	{ NULL,               NULL,       "Risk Of Rain",            1 << 6,       False,       -1 },
+	{ NULL,               NULL,       "Planetary Annihilation",  1 << 6,       False,       -1 },
+	//Misc
+	{ "Pavucontrol",      NULL,       NULL,                      1 << 7,       False,       -1 },
 };
 
 /* layout(s) */
-static const float mfact      = 0.55; /* factor of master area size [0.05..0.95] */
+static const float mfact      = 0.60; /* factor of master area size [0.05..0.95] */
 static const int nmaster      = 1;    /* number of clients in master area */
-static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
+static const Bool resizehints = False; /* True means respect size hints in tiled resizals */
 
 static const Layout layouts[] = {
 	/* symbol     arrange function */
@@ -35,10 +55,10 @@ 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} }, \
+	{ MODKEY|ControlMask,           KEY,      view,           {.ui = 1 << TAG} }, \
+	{ MODKEY,                       KEY,      toggleview,     {.ui = 1 << TAG} }, \
 	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
 	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
 
@@ -46,28 +66,38 @@ static const Layout layouts[] = {
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
 
 /* commands */
-static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
-static const char *termcmd[]  = { "uxterm", NULL };
+static const char *dmenucmd[]     = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+static const char *termcmd[]      = { "st", NULL };
+static const char *embedstcmd[]   = { "/home/amelia/.bin/embedst", NULL };
