diff --git a/config.def.h b/config.def.h
index 495a4e5..9aa4658 100644
--- a/config.def.h
+++ b/config.def.h
@@ -34,7 +34,7 @@ static char *colors[][3]         = {
 };
 
 /* tagging */
-static const char *tags[] = { "", "", "", "", "", "", "", "", "", "?" };
+static const char *tags[] = { "", "", "", "", "", "", "", "", "", "0", "-", "=" };
 
 static const Rule rules[] = {
 	/* xprop(1):
@@ -65,7 +65,7 @@ static const Rule rules[] = {
 	{ "firefox",			NULL,		NULL,		1 << 8,		0,			-1 },
 	// ----- OTHER -----
 	{ "xwinwrap",			NULL,		NULL,		1 << 9,		0,			-1 },
-	{ NULL,					NULL,		"broken",	1 << 9,		0,			-1 },
+//	{ NULL,					NULL,		"broken",	1 << 9,		0,			-1 },
 };
 
 /* layout(s) */
@@ -149,8 +149,6 @@ static const Key keys[] = {
 	{ SUPERKEY,						XK_period,					focusmon,			{.i = +1 } },
 	{ SUPERKEY|ShiftMask,			XK_comma,					tagmon,				{.i = -1 } },
 	{ SUPERKEY|ShiftMask,			XK_period,					tagmon,				{.i = +1 } },
-	{ SUPERKEY,						XK_minus,					setgaps,			{.i = -1 } },
-	{ SUPERKEY,						XK_equal,					setgaps,			{.i = +1 } },
 	{ SUPERKEY|ShiftMask,			XK_equal,					setgaps,			{.i = 0  } },
 	{ SUPERKEY|ShiftMask,			XK_t,						togglealwaysontop,	{0} },
 	{ SUPERKEY|ShiftMask,			XK_f,						togglefullscr,		{0} },
@@ -165,6 +163,8 @@ static const Key keys[] = {
 	TAGKEYS(						XK_8,											7)
 	TAGKEYS(						XK_9,											8)
 	TAGKEYS(						XK_0,											9)
+	TAGKEYS(						XK_minus,										10)
+	TAGKEYS(						XK_equal,										11)
 	{ SUPERKEY|ShiftMask,			XK_q,						quitprompt,			{0} },
 };
 
diff --git a/config.h b/config.h
index f3d2683..a654d76 100644
--- a/config.h
+++ b/config.h
@@ -34,7 +34,7 @@ static char *colors[][3]         = {
 };
 
 /* tagging */
-static const char *tags[] = { "", "", "", "", "", "", "", "", "", "?" };
+static const char *tags[] = { "", "", "", "", "", "", "", "", "", "?", "-", "=" };
 
 static const Rule rules[] = {
 	/* xprop(1):
@@ -65,7 +65,7 @@ static const Rule rules[] = {
 	{ "firefox",			NULL,		NULL,		1 << 8,		0,			-1 },
 	// ----- OTHER -----
 	{ "xwinwrap",			NULL,		NULL,		1 << 9,		0,			-1 },
-	{ NULL,					NULL,		"broken",	1 << 9,		0,			-1 },
+//	{ NULL,					NULL,		"broken",	1 << 9,		0,			-1 },
 };
 
 /* layout(s) */
@@ -145,14 +145,10 @@ static const Key keys[] = {
 	{ SUPERKEY,						XK_g,						setlayout,			{.v = &layouts[0]} },
 /*	{ SUPERKEY,						XK_space,					setlayout,			{0} }, */
 	{ SUPERKEY|ShiftMask,			XK_space,					togglefloating,		{0} },
-	{ SUPERKEY,						XK_0,						view,				{.ui = ~0 } },
-	{ SUPERKEY|ShiftMask,			XK_0,						tag,				{.ui = ~0 } },
 	{ SUPERKEY,						XK_comma,					focusmon,			{.i = -1 } },
 	{ SUPERKEY,						XK_period,					focusmon,			{.i = +1 } },
 	{ SUPERKEY|ShiftMask,			XK_comma,					tagmon,				{.i = -1 } },
 	{ SUPERKEY|ShiftMask,			XK_period,					tagmon,				{.i = +1 } },
-	{ SUPERKEY,						XK_minus,					setgaps,			{.i = -1 } },
-	{ SUPERKEY,						XK_equal,					setgaps,			{.i = +1 } },
 	{ SUPERKEY|ShiftMask,			XK_equal,					setgaps,			{.i = 0  } },
 	{ SUPERKEY|ShiftMask,			XK_t,						togglealwaysontop,	{0} },
 	{ SUPERKEY|ShiftMask,			XK_f,						togglefullscr,		{0} },
@@ -166,6 +162,9 @@ static const Key keys[] = {
 	TAGKEYS(						XK_7,											6)
 	TAGKEYS(						XK_8,											7)
 	TAGKEYS(						XK_9,											8)
+	TAGKEYS(						XK_0,											9)
+	TAGKEYS(						XK_minus,										10)
+	TAGKEYS(						XK_equal,										11)
 	{ SUPERKEY|ShiftMask,			XK_q,						quitprompt,			{0} },
 };
 
diff --git a/dwm b/dwm
index 9e30820..2dbee3d 100755
Binary files a/dwm and b/dwm differ
diff --git a/dwm.o b/dwm.o
index c43f75e..d973de1 100644
Binary files a/dwm.o and b/dwm.o differ