Updates dwm, st, dmenu, slock, and dwmblocks

49 files changed, 9580 insertions, 5209 deletions

diff --git a/dmenu/config.h b/dmenu/config.h
index acc8457..1ac8c72 100644
--- a/dmenu/config.h
+++ b/dmenu/config.h
@@ -1,30 +1,32 @@
 /* See LICENSE file for copyright and license details. */
 /* Default settings; can be overriden by command line. */
 
-static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom     */
+static int topbar = 1; /* -b  option; if 0, dmenu appears at bottom     */
+static int fuzzy = 1;  /* -F  option; if 0, dmenu doesn't use fuzzy matching  */
 /* -fn option overrides fonts[0]; default X11 font or font set */
 static const char *fonts[] = {
-	"monospace:size=10",
-	"NotoColorEmoji:pixelsize=8:antialias=true:autohint=true"
-};
+    "monospace:size=10",
+    "NotoColorEmoji:pixelsize=8:antialias=true:autohint=true"};
 static const unsigned int bgalpha = 0xe0;
 static const unsigned int fgalpha = OPAQUE;
-static const char *prompt      = NULL;      /* -p  option; prompt to the left of input field */
+static const char *prompt =
+    NULL; /* -p  option; prompt to the left of input field */
 static const char *colors[SchemeLast][2] = {
-	/*     fg         bg       */
-	[SchemeNorm] = { "#bbbbbb", "#222222" },
-	[SchemeSel] = { "#eeeeee", "#005577" },
-	[SchemeOut] = { "#000000", "#00ffff" },
+    /*     fg         bg       */
+    [SchemeNorm] = {"#bbbbbb", "#222222"},
+    [SchemeSel] = {"#eeeeee", "#005577"},
+    [SchemeOut] = {"#000000", "#00ffff"},
+    [SchemeCursor] = {"#222222", "#bbbbbb"},
 };
 static const unsigned int alphas[SchemeLast][2] = {
-	/*		fgalpha		bgalphga	*/
-	[SchemeNorm] = { fgalpha, bgalpha },
-	[SchemeSel] = { fgalpha, bgalpha },
-	[SchemeOut] = { fgalpha, bgalpha },
+    /*		fgalpha		bgalphga	*/
+    [SchemeNorm] = {fgalpha, bgalpha},
+    [SchemeSel] = {fgalpha, bgalpha},
+    [SchemeOut] = {fgalpha, bgalpha},
 };
 
 /* -l option; if nonzero, dmenu uses vertical list with given number of lines */
-static unsigned int lines      = 0;
+static unsigned int lines = 0;
 
 /*
  * Characters not considered part of a word while deleting words
@@ -32,3 +34,13 @@ static unsigned int lines      = 0;
  */
 static const char worddelimiters[] = " ";
 
+/*
+ * -vi option; if nonzero, vi mode is always enabled and can be
+ * accessed with the global_esc keysym + mod mask
+ */
+static unsigned int vi_mode = 1;
+static unsigned int start_mode = 0; /* mode to use when -vi is passed. 0 = insert mode, 1 = normal mode */
+static Key global_esc = {XK_c, ControlMask}; /* escape key when vi mode is not enabled explicitly */
+static Key quit_keys[] = {
+    /* keysym	modifier */
+    {XK_q, 0}};
diff --git a/dmenu/config.h.bak b/dmenu/config.h.bak
new file mode 100644
index 0000000..10c2024
--- /dev/null
+++ b/dmenu/config.h.bak
@@ -0,0 +1,48 @@
+/* See LICENSE file for copyright and license details. */
+/* Default settings; can be overriden by command line. */
+
+static int topbar = 1; /* -b  option; if 0, dmenu appears at bottom     */
+static int fuzzy = 1;  /* -F  option; if 0, dmenu doesn't use fuzzy matching  */
+/* -fn option overrides fonts[0]; default X11 font or font set */
+static const char *fonts[] = {
+    "monospace:size=10",
+    "NotoColorEmoji:pixelsize=8:antialias=true:autohint=true"};
+static const unsigned int bgalpha = 0xe0;
+static const unsigned int fgalpha = OPAQUE;
+static const char *prompt =
+    NULL; /* -p  option; prompt to the left of input field */
+static const char *colors[SchemeLast][2] = {
+    /*     fg         bg       */
+    [SchemeNorm] = {"#bbbbbb", "#222222"},
+    [SchemeSel] = {"#eeeeee", "#005577"},
+    [SchemeOut] = {"#000000", "#00ffff"},
+    [SchemeCursor] = {"#222222", "#bbbbbb"},
+};
+static const unsigned int alphas[SchemeLast][2] = {
+    /*		fgalpha		bgalphga	*/
+    [SchemeNorm] = {fgalpha, bgalpha},
+    [SchemeSel] = {fgalpha, bgalpha},
+    [SchemeOut] = {fgalpha, bgalpha},
+};
+
+/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
+static unsigned int lines = 0;
+
+/*
+ * Characters not considered part of a word while deleting words
+ * for example: " /?\"&[]"
+ */
+static const char worddelimiters[] = " ";
+
+/*
+ * -vi option; if nonzero, vi mode is always enabled and can be
+ * accessed with the global_esc keysym + mod mask
+ */
+static unsigned int vi_mode = 1;
+static unsigned int start_mode =
+    0; /* mode to use when -vi is passed. 0 = insert mode, 1 = normal mode */
+static Key global_esc = {
+    XK_c, ControlMask}; /* escape key when vi mode is not enabled explicitly */
+static Key quit_keys[] = {
+    /* keysym	modifier */
+    {XK_q, 0}};
diff --git a/dmenu/config.mk b/dmenu/config.mk
index 8531fb9..1641c06 100644
--- a/dmenu/config.mk
+++ b/dmenu/config.mk
@@ -20,7 +20,7 @@ FREETYPEINC = /usr/include/freetype2
 
 # includes and libs
 INCS = -I$(X11INC) -I$(FREETYPEINC)
-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lXrender
+LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lXrender -lm
 
 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS)
diff --git a/dmenu/dmenu.1 b/dmenu/dmenu.1
index 4c87074..fc1eb5e 100644
--- a/dmenu/dmenu.1
+++ b/dmenu/dmenu.1
@@ -8,6 +8,12 @@ dmenu \- dynamic menu
 .IR lines ]
 .RB [ \-m
 .IR monitor ]
+.RB [ \-x
+.IR xoffset ]
+.RB [ \-y
+.IR yoffset ]
+.RB [ \-z
+.IR width ]
 .RB [ \-p
 .IR prompt ]
 .RB [ \-fn
@@ -60,6 +66,24 @@ dmenu lists items vertically, with the given number of lines.
 dmenu is displayed on the monitor number supplied. Monitor numbers are starting
 from 0.
 .TP
+.BI \-x " xoffset"
+dmenu is placed at this offset measured from the left side of the monitor.
+Can be negative.
+If option
+.B \-m
+is present, the measurement will use the given monitor.
+.TP
+.BI \-y " yoffset"
+dmenu is placed at this offset measured from the top of the monitor.  If the
+.B \-b
+option is used, the offset is measured from the bottom.  Can be negative.
+If option
+.B \-m
+is present, the measurement will use the given monitor.
+.TP
+.BI \-z " width"
+sets the width of the dmenu window.
+.TP
 .BI \-p " prompt"
 defines the prompt to be displayed to the left of the input field.
 .TP
diff --git a/dmenu/dmenu.c b/dmenu/dmenu.c
index 34d0943..9c67296 100644
--- a/dmenu/dmenu.c
+++ b/dmenu/dmenu.c
@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <locale.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -8,8 +9,8 @@
 #include <time.h>
 #include <unistd.h>
 
-#include <X11/Xlib.h>
 #include <X11/Xatom.h>
+#include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
@@ -21,26 +22,43 @@
 #include "util.h"
 
 /* macros */
-#define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
-                             && MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
-#define LENGTH(X)             (sizeof X / sizeof X[0])
-#define TEXTW(X)              (drw_fontset_getwidth(drw, (X)) + lrpad)
+#define INTERSECT(x, y, w, h, r)                                               \
+  (MAX(0, MIN((x) + (w), (r).x_org + (r).width) - MAX((x), (r).x_org)) &&      \
+   MAX(0, MIN((y) + (h), (r).y_org + (r).height) - MAX((y), (r).y_org)))
+#define LENGTH(X) (sizeof X / sizeof X[0])
+#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
 
 /* define opaqueness */
 #define OPAQUE 0xFFU
 
 /* enums */
-enum { SchemeNorm, SchemeSel, SchemeOut, SchemeLast }; /* color schemes */
+enum {
+  SchemeNorm,
+  SchemeSel,
+  SchemeOut,
+  SchemeCursor,
+  SchemeLast
+}; /* color schemes */
 
 struct item {
-	char *text;
-	struct item *left, *right;
-	int out;
+  char *text;
+  struct item *left, *right;
+  int out;
+  double distance;
 };
 
+typedef struct {
+  KeySym ksym;
+  unsigned int state;
+} Key;
+
 static char text[BUFSIZ] = "";
 static char *embed;
 static int bh, mw, mh;
+static int dmx = 6; /* put dmenu at this x offset */
+static int dmy = 6; /* put dmenu at this y offset (measured from the bottom if
+                       topbar is 0) */
+static unsigned int dmw = 0; /* make dmenu this wide */
 static int inputw = 0, promptw, passwd = 0;
 static int lrpad; /* sum of left and right padding */
 static int reject_no_match = 0;
@@ -49,6 +67,7 @@ static struct item *items = NULL;
 static struct item *matches, *matchend;
 static struct item *prev, *curr, *next, *sel;
 static int mon = -1, screen;
+static unsigned int using_vi_mode = 0;
 
 static Atom clip, utf8;
 static Display *dpy;
@@ -64,934 +83,1234 @@ static Clr *scheme[SchemeLast];
 
 #include "config.h"
 
-static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
-static char *(*fstrstr)(const char *, const char *) = strstr;
-
-
-static void
-xinitvisual()
-{
-	XVisualInfo *infos;
-	XRenderPictFormat *fmt;
-	int nitems;
-	int i;
-
-	XVisualInfo tpl = {
-		.screen = screen,
-		.depth = 32,
-		.class = TrueColor
-	};
-
-	long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
-
-	infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
-	visual = NULL;
-
-	for (i = 0; i < nitems; i++){
-		fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
-		if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
-			visual = infos[i].visual;
-			depth = infos[i].depth;
-			cmap = XCreateColormap(dpy, root, visual, AllocNone);
-			usergb = 1;
-			break;
-		}
-	}
-
-	XFree(infos);
-
-	if (! visual) {
-		visual = DefaultVisual(dpy, screen);
-		depth = DefaultDepth(dpy, screen);
-		cmap = DefaultColormap(dpy, screen);
-	}
+static char *cistrstr(const char *s, const char *sub);
+static int (*fstrncmp)(const char *, const char *, size_t) = strncasecmp;
+static char *(*fstrstr)(const char *, const char *) = cistrstr;
+
+static void xinitvisual() {
+  XVisualInfo *infos;
+  XRenderPictFormat *fmt;
+  int nitems;
+  int i;
+
+  XVisualInfo tpl = {.screen = screen, .depth = 32, .class = TrueColor};
+
+  long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
+
+  infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
+  visual = NULL;
+
+  for (i = 0; i < nitems; i++) {
+    fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
+    if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
+      visual = infos[i].visual;
+      depth = infos[i].depth;
+      cmap = XCreateColormap(dpy, root, visual, AllocNone);
+      usergb = 1;
+      break;
+    }
+  }
+
+  XFree(infos);
+
+  if (!visual) {
+    visual = DefaultVisual(dpy, screen);
+    depth = DefaultDepth(dpy, screen);
+    cmap = DefaultColormap(dpy, screen);
+  }
+}
+
+static void appenditem(struct item *item, struct item **list,
+                       struct item **last) {
+  if (*last)
+    (*last)->right = item;
+  else
+    *list = item;
+
+  item->left = *last;
+  item->right = NULL;
+  *last = item;
 }
 
-static void
-appenditem(struct item *item, struct item **list, struct item **last)
-{
-	if (*last)
-		(*last)->right = item;
-	else
-		*list = item;
-
-	item->left = *last;
-	item->right = NULL;
-	*last = item;
+static void calcoffsets(void) {
+  int i, n;
+
+  if (lines > 0)
+    n = lines * bh;
+  else
+    n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
+  /* calculate which items will begin the next page and previous page */
+  for (i = 0, next = curr; next; next = next->right)
+    if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
+      break;
+  for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
+    if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
+      break;
 }
 
-static void
-calcoffsets(void)
-{
-	int i, n;
-
-	if (lines > 0)
-		n = lines * bh;
-	else
-		n = mw - (promptw + inputw + TEXTW("<") + TEXTW(">"));
-	/* calculate which items will begin the next page and previous page */
-	for (i = 0, next = curr; next; next = next->right)
-		if ((i += (lines > 0) ? bh : MIN(TEXTW(next->text), n)) > n)
-			break;
-	for (i = 0, prev = curr; prev && prev->left; prev = prev->left)
-		if ((i += (lines > 0) ? bh : MIN(TEXTW(prev->left->text), n)) > n)
-			break;
+static void cleanup(void) {
+  size_t i;
+
+  XUngrabKey(dpy, AnyKey, AnyModifier, root);
+  for (i = 0; i < SchemeLast; i++)
+    free(scheme[i]);
+  drw_free(drw);
+  XSync(dpy, False);
+  XCloseDisplay(dpy);
 }
 
-static void
-cleanup(void)
-{
-	size_t i;
-
-	XUngrabKey(dpy, AnyKey, AnyModifier, root);
-	for (i = 0; i < SchemeLast; i++)
-		free(scheme[i]);
-	drw_free(drw);
-	XSync(dpy, False);
-	XCloseDisplay(dpy);
+static char *cistrstr(const char *s, const char *sub) {
+  size_t len;
+
+  for (len = strlen(sub); *s; s++)
+    if (!strncasecmp(s, sub, len))
+      return (char *)s;
+  return NULL;
 }
 
-static char *
-cistrstr(const char *s, const char *sub)
-{
-	size_t len;
+static int drawitem(struct item *item, int x, int y, int w) {
+  if (item == sel)
+    drw_setscheme(drw, scheme[SchemeSel]);
+  else if (item->out)
+    drw_setscheme(drw, scheme[SchemeOut]);
+  else
+    drw_setscheme(drw, scheme[SchemeNorm]);
 
-	for (len = strlen(sub); *s; s++)
-		if (!strncasecmp(s, sub, len))
-			return (char *)s;
-	return NULL;
+  return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
 }
 
-static int
-drawitem(struct item *item, int x, int y, int w)
-{
-	if (item == sel)
-		drw_setscheme(drw, scheme[SchemeSel]);
-	else if (item->out)
-		drw_setscheme(drw, scheme[SchemeOut]);
-	else
-		drw_setscheme(drw, scheme[SchemeNorm]);
-
-	return drw_text(drw, x, y, w, bh, lrpad / 2, item->text, 0);
+static void drawmenu(void) {
+  unsigned int curpos;
+  struct item *item;
+  int x = 0, y = 0, w;
+  char *censort;
+
+  drw_setscheme(drw, scheme[SchemeNorm]);
+  drw_rect(drw, 0, 0, mw, mh, 1, 1);
+
+  if (prompt && *prompt) {
+    drw_setscheme(drw, scheme[SchemeSel]);
+    x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
+  }
+  /* draw input field */
+  w = (lines > 0 || !matches) ? mw - x : inputw;
+  drw_setscheme(drw, scheme[SchemeNorm]);
+  if (passwd) {
+    censort = ecalloc(1, sizeof(text));
+    memset(censort, '.', strlen(text));
+    drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0);
+    free(censort);
+  } else
+    drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
+
+  curpos = TEXTW(text) - TEXTW(&text[cursor]);
+  curpos += lrpad / 2 - 1;
+  if (using_vi_mode && text[0] != '\0') {
+    drw_setscheme(drw, scheme[SchemeCursor]);
+    char vi_char[] = {text[cursor], '\0'};
+    drw_text(drw, x + curpos, 0, TEXTW(vi_char) - lrpad, bh, 0, vi_char, 0);
+  } else if (using_vi_mode) {
+    drw_setscheme(drw, scheme[SchemeNorm]);
+    drw_rect(drw, x + curpos, 2, lrpad / 2, bh - 4, 1, 0);
+  } else if (curpos < w) {
+    drw_setscheme(drw, scheme[SchemeNorm]);
+    drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
+  }
+
+  if (lines > 0) {
+    /* draw vertical list */
+    for (item = curr; item != next; item = item->right)
+      drawitem(item, x, y += bh, mw - x);
+  } else if (matches) {
+    /* draw horizontal list */
+    x += inputw;
+    w = TEXTW("<");
+    if (curr->left) {
+      drw_setscheme(drw, scheme[SchemeNorm]);
+      drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);
+    }
+    x += w;
+    for (item = curr; item != next; item = item->right)
+      x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
+    if (next) {
+      w = TEXTW(">");
+      drw_setscheme(drw, scheme[SchemeNorm]);
+      drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
+    }
+  }
+  drw_map(drw, win, 0, 0, mw, mh);
 }
 
-static void
-drawmenu(void)
-{
-	unsigned int curpos;
-	struct item *item;
-	int x = 0, y = 0, w;
- char *censort;
-
-	drw_setscheme(drw, scheme[SchemeNorm]);
-	drw_rect(drw, 0, 0, mw, mh, 1, 1);
-
-	if (prompt && *prompt) {
-		drw_setscheme(drw, scheme[SchemeSel]);
-		x = drw_text(drw, x, 0, promptw, bh, lrpad / 2, prompt, 0);
-	}
-	/* draw input field */
-	w = (lines > 0 || !matches) ? mw - x : inputw;
-	drw_setscheme(drw, scheme[SchemeNorm]);
-	if (passwd) {
-	        censort = ecalloc(1, sizeof(text));
-		memset(censort, '.', strlen(text));
-		drw_text(drw, x, 0, w, bh, lrpad / 2, censort, 0);
-		free(censort);
-	} else drw_text(drw, x, 0, w, bh, lrpad / 2, text, 0);
-
-	curpos = TEXTW(text) - TEXTW(&text[cursor]);
-	if ((curpos += lrpad / 2 - 1) < w) {
-		drw_setscheme(drw, scheme[SchemeNorm]);
-		drw_rect(drw, x + curpos, 2, 2, bh - 4, 1, 0);
-	}
-
-	if (lines > 0) {
-		/* draw vertical list */
-		for (item = curr; item != next; item = item->right)
-			drawitem(item, x, y += bh, mw - x);
-	} else if (matches) {
-		/* draw horizontal list */
-		x += inputw;
-		w = TEXTW("<");
-		if (curr->left) {
-			drw_setscheme(drw, scheme[SchemeNorm]);
-			drw_text(drw, x, 0, w, bh, lrpad / 2, "<", 0);
-		}
-		x += w;
-		for (item = curr; item != next; item = item->right)
-			x = drawitem(item, x, 0, MIN(TEXTW(item->text), mw - x - TEXTW(">")));
-		if (next) {
-			w = TEXTW(">");
-			drw_setscheme(drw, scheme[SchemeNorm]);
-			drw_text(drw, mw - w, 0, w, bh, lrpad / 2, ">", 0);
-		}
-	}
-	drw_map(drw, win, 0, 0, mw, mh);
+static void grabfocus(void) {
+  struct timespec ts = {.tv_sec = 0, .tv_nsec = 10000000};
+  Window focuswin;
+  int i, revertwin;
+
+  for (i = 0; i < 100; ++i) {
+    XGetInputFocus(dpy, &focuswin, &revertwin);
+    if (focuswin == win)
+      return;
+    XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
+    nanosleep(&ts, NULL);
+  }
+  die("cannot grab focus");
 }
 
-static void
-grabfocus(void)
-{
-	struct timespec ts = { .tv_sec = 0, .tv_nsec = 10000000  };
-	Window focuswin;
-	int i, revertwin;
-
-	for (i = 0; i < 100; ++i) {
-		XGetInputFocus(dpy, &focuswin, &revertwin);
-		if (focuswin == win)
-			return;
-		XSetInputFocus(dpy, win, RevertToParent, CurrentTime);
-		nanosleep(&ts, NULL);
-	}
-	die("cannot grab focus");
+static void grabkeyboard(void) {
+  struct timespec ts = {.tv_sec = 0, .tv_nsec = 1000000};
+  int i;
+
+  if (embed)
+    return;
+  /* try to grab keyboard, we may have to wait for another process to ungrab */
+  for (i = 0; i < 1000; i++) {
+    if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
+                      GrabModeAsync, CurrentTime) == GrabSuccess)
+      return;
+    nanosleep(&ts, NULL);
+  }
+  die("cannot grab keyboard");
 }
 
-static void
-grabkeyboard(void)
-{
-	struct timespec ts = { .tv_sec = 0, .tv_nsec = 1000000  };
-	int i;
-
-	if (embed)
-		return;
-	/* try to grab keyboard, we may have to wait for another process to ungrab */
-	for (i = 0; i < 1000; i++) {
-		if (XGrabKeyboard(dpy, DefaultRootWindow(dpy), True, GrabModeAsync,
-		                  GrabModeAsync, CurrentTime) == GrabSuccess)
-			return;
-		nanosleep(&ts, NULL);
-	}
-	die("cannot grab keyboard");
+int compare_distance(const void *a, const void *b) {
+  struct item *da = *(struct item **)a;
+  struct item *db = *(struct item **)b;
+
+  if (!db)
+    return 1;
+  if (!da)
+    return -1;
+
+  return da->distance == db->distance  ? 0
+         : da->distance < db->distance ? -1
+                                       : 1;
 }
 
-static void
-match(void)
-{
-	static char **tokv = NULL;
-	static int tokn = 0;
-
-	char buf[sizeof text], *s;
-	int i, tokc = 0;
-	size_t len, textsize;
-	struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
-
-	strcpy(buf, text);
-	/* separate input text into tokens to be matched individually */
-	for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
-		if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
-			die("cannot realloc %u bytes:", tokn * sizeof *tokv);
-	len = tokc ? strlen(tokv[0]) : 0;
-
-	matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
-	textsize = strlen(text) + 1;
-	for (item = items; item && item->text; item++) {
-		for (i = 0; i < tokc; i++)
-			if (!fstrstr(item->text, tokv[i]))
-				break;
-		if (i != tokc) /* not all tokens match */
-			continue;
-		/* exact matches go first, then prefixes, then substrings */
-		if (!tokc || !fstrncmp(text, item->text, textsize))
-			appenditem(item, &matches, &matchend);
-		else if (!fstrncmp(tokv[0], item->text, len))
-			appenditem(item, &lprefix, &prefixend);
-		else
-			appenditem(item, &lsubstr, &substrend);
-	}
-	if (lprefix) {
-		if (matches) {
-			matchend->right = lprefix;
-			lprefix->left = matchend;
-		} else
-			matches = lprefix;
-		matchend = prefixend;
-	}
-	if (lsubstr) {
-		if (matches) {
-			matchend->right = lsubstr;
-			lsubstr->left = matchend;
-		} else
-			matches = lsubstr;
-		matchend = substrend;
-	}
-	curr = sel = matches;
-	calcoffsets();
+void fuzzymatch(void) {
+  /* bang - we have so much memory */
+  struct item *it;
+  struct item **fuzzymatches = NULL;
+  char c;
+  int number_of_matches = 0, i, pidx, sidx, eidx;
+  int text_len = strlen(text), itext_len;
+
+  matches = matchend = NULL;
+
+  /* walk through all items */
+  for (it = items; it && it->text; it++) {
+    if (text_len) {
+      itext_len = strlen(it->text);
+      pidx = 0;         /* pointer */
+      sidx = eidx = -1; /* start of match, end of match */
+      /* walk through item text */
+      for (i = 0; i < itext_len && (c = it->text[i]); i++) {
+        /* fuzzy match pattern */
+        if (!fstrncmp(&text[pidx], &c, 1)) {
+          if (sidx == -1)
+            sidx = i;
+          pidx++;
+          if (pidx == text_len) {
+            eidx = i;
+            break;
+          }
+        }
+      }
+      /* build list of matches */
+      if (eidx != -1) {
+        /* compute distance */
+        /* add penalty if match starts late (log(sidx+2))
+         * add penalty for long a match without many matching characters */
+        it->distance = log(sidx + 2) + (double)(eidx - sidx - text_len);
+        /* fprintf(stderr, "distance %s %f\n", it->text, it->distance); */
+        appenditem(it, &matches, &matchend);
+        number_of_matches++;
+      }
+    } else {
+      appenditem(it, &matches, &matchend);
+    }
+  }
+
+  if (number_of_matches) {
+    /* initialize array with matches */
+    if (!(fuzzymatches =
+              realloc(fuzzymatches, number_of_matches * sizeof(struct item *))))
+      die("cannot realloc %u bytes:",
+          number_of_matches * sizeof(struct item *));
+    for (i = 0, it = matches; it && i < number_of_matches;
+         i++, it = it->right) {
+      fuzzymatches[i] = it;
+    }
+    /* sort matches according to distance */
+    qsort(fuzzymatches, number_of_matches, sizeof(struct item *),
+          compare_distance);
+    /* rebuild list of matches */
+    matches = matchend = NULL;
+    for (i = 0, it = fuzzymatches[i]; i < number_of_matches && it && it->text;
+         i++, it = fuzzymatches[i]) {
+      appenditem(it, &matches, &matchend);
+    }
+    free(fuzzymatches);
+  }
+  curr = sel = matches;
+  calcoffsets();
 }
 
-static void
-insert(const char *str, ssize_t n)
-{
-	if (strlen(text) + n > sizeof text - 1)
-		return;
-
-	static char last[BUFSIZ] = "";
-	if(reject_no_match) {
-		/* store last text value in case we need to revert it */
-		memcpy(last, text, BUFSIZ);
-	}
-
-	/* move existing text out of the way, insert new text, and update cursor */
-	memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
-	if (n > 0)
-		memcpy(&text[cursor], str, n);
-	cursor += n;
-	match();
-
-	if(!matches && reject_no_match) {
-		/* revert to last text value if theres no match */
-		memcpy(text, last, BUFSIZ);
-		cursor -= n;
-		match();
-	}
+static void match(void) {
+  if (fuzzy) {
+    fuzzymatch();
+    return;
+  }
+  static char **tokv = NULL;
+  static int tokn = 0;
+
+  char buf[sizeof text], *s;
+  int i, tokc = 0;
+  size_t len, textsize;
+  struct item *item, *lprefix, *lsubstr, *prefixend, *substrend;
+
+  strcpy(buf, text);
+  /* separate input text into tokens to be matched individually */
+  for (s = strtok(buf, " "); s; tokv[tokc - 1] = s, s = strtok(NULL, " "))
+    if (++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
+      die("cannot realloc %u bytes:", tokn * sizeof *tokv);
+  len = tokc ? strlen(tokv[0]) : 0;
+
+  matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
+  textsize = strlen(text) + 1;
+  for (item = items; item && item->text; item++) {
+    for (i = 0; i < tokc; i++)
+      if (!fstrstr(item->text, tokv[i]))
+        break;
+    if (i != tokc) /* not all tokens match */
+      continue;
+    /* exact matches go first, then prefixes, then substrings */
+    if (!tokc || !fstrncmp(text, item->text, textsize))
+      appenditem(item, &matches, &matchend);
+    else if (!fstrncmp(tokv[0], item->text, len))
+      appenditem(item, &lprefix, &prefixend);
+    else
+      appenditem(item, &lsubstr, &substrend);
+  }
+  if (lprefix) {
+    if (matches) {
+      matchend->right = lprefix;
+      lprefix->left = matchend;
+    } else
+      matches = lprefix;
+    matchend = prefixend;
+  }
+  if (lsubstr) {
+    if (matches) {
+      matchend->right = lsubstr;
+      lsubstr->left = matchend;
+    } else
+      matches = lsubstr;
+    matchend = substrend;
+  }
+  curr = sel = matches;
+  calcoffsets();
 }
 
-static size_t
-nextrune(int inc)
-{
-	ssize_t n;
+static void insert(const char *str, ssize_t n) {
+  if (strlen(text) + n > sizeof text - 1)
+    return;
 
-	/* return location of next utf8 rune in the given direction (+1 or -1) */
-	for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
-		;
-	return n;
+  static char last[BUFSIZ] = "";
+  if (reject_no_match) {
+    /* store last text value in case we need to revert it */
+    memcpy(last, text, BUFSIZ);
+  }
+
+  /* move existing text out of the way, insert new text, and update cursor */
+  memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
+  if (n > 0)
+    memcpy(&text[cursor], str, n);
+  cursor += n;
+  match();
+
+  if (!matches && reject_no_match) {
+    /* revert to last text value if theres no match */
+    memcpy(text, last, BUFSIZ);
+    cursor -= n;
+    match();
+  }
 }
 
-static void
-movewordedge(int dir)
-{
-	if (dir < 0) { /* move cursor to the start of the word*/
-		while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
-			cursor = nextrune(-1);
-		while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
-			cursor = nextrune(-1);
-	} else { /* move cursor to the end of the word */
-		while (text[cursor] && strchr(worddelimiters, text[cursor]))
-			cursor = nextrune(+1);
-		while (text[cursor] && !strchr(worddelimiters, text[cursor]))
-			cursor = nextrune(+1);
-	}
+static size_t nextrune(int inc) {
+  ssize_t n;
+
+  /* return location of next utf8 rune in the given direction (+1 or -1) */
+  for (n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc)
+    ;
+  return n;
 }
 
-static void
-keypress(XKeyEvent *ev)
-{
-	char buf[32];
-	int len;
-	KeySym ksym;
-	Status status;
-
-	len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
-	switch (status) {
-	default: /* XLookupNone, XBufferOverflow */
-		return;
-	case XLookupChars:
-		goto insert;
-	case XLookupKeySym:
-	case XLookupBoth:
-		break;
-	}
-
-	if (ev->state & ControlMask) {
-		switch(ksym) {
-		case XK_a: ksym = XK_Home;      break;
-		case XK_b: ksym = XK_Left;      break;
-		case XK_c: ksym = XK_Escape;    break;
-		case XK_d: ksym = XK_Delete;    break;
-		case XK_e: ksym = XK_End;       break;
-		case XK_f: ksym = XK_Right;     break;
-		case XK_g: ksym = XK_Escape;    break;
-		case XK_h: ksym = XK_BackSpace; break;
-		case XK_i: ksym = XK_Tab;       break;
-		case XK_j: /* fallthrough */
-		case XK_J: /* fallthrough */
-		case XK_m: /* fallthrough */
-		case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break;
-		case XK_n: ksym = XK_Down;      break;
-		case XK_p: ksym = XK_Up;        break;
-
-		case XK_k: /* delete right */
-			text[cursor] = '\0';
-			match();
-			break;
-		case XK_u: /* delete left */
-			insert(NULL, 0 - cursor);
-			break;
-		case XK_w: /* delete word */
-			while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
-				insert(NULL, nextrune(-1) - cursor);
-			while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
-				insert(NULL, nextrune(-1) - cursor);
-			break;
-		case XK_y: /* paste selection */
-		case XK_Y:
-			XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
-			                  utf8, utf8, win, CurrentTime);
-			return;
-		case XK_Left:
-			movewordedge(-1);
-			goto draw;
-		case XK_Right:
-			movewordedge(+1);
-			goto draw;
-		case XK_Return:
-		case XK_KP_Enter:
-			break;
-		case XK_bracketleft:
-			cleanup();
-			exit(1);
-		default:
-			return;
-		}
-	} else if (ev->state & Mod1Mask) {
-		switch(ksym) {
-		case XK_b:
-			movewordedge(-1);
-			goto draw;
-		case XK_f:
-			movewordedge(+1);
-			goto draw;
-		case XK_g: ksym = XK_Home;  break;
-		case XK_G: ksym = XK_End;   break;
-		case XK_h: ksym = XK_Up;    break;
-		case XK_j: ksym = XK_Next;  break;
-		case XK_k: ksym = XK_Prior; break;
-		case XK_l: ksym = XK_Down;  break;
-		default:
-			return;
-		}
-	}
-
-	switch(ksym) {
-	default:
-insert:
-		if (!iscntrl(*buf))
-			insert(buf, len);
-		break;
-	case XK_Delete:
-		if (text[cursor] == '\0')
-			return;
-		cursor = nextrune(+1);
-		/* fallthrough */
-	case XK_BackSpace:
-		if (cursor == 0)
-			return;
-		insert(NULL, nextrune(-1) - cursor);
-		break;
-	case XK_End:
-		if (text[cursor] != '\0') {
-			cursor = strlen(text);
-			break;
-		}
-		if (next) {
-			/* jump to end of list and position items in reverse */
-			curr = matchend;
-			calcoffsets();
-			curr = prev;
-			calcoffsets();
-			while (next && (curr = curr->right))
-				calcoffsets();
-		}
-		sel = matchend;
-		break;
-	case XK_Escape:
-		cleanup();
-		exit(1);
-	case XK_Home:
-		if (sel == matches) {
-			cursor = 0;
-			break;
-		}
-		sel = curr = matches;
-		calcoffsets();
-		break;
-	case XK_Left:
-		if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
-			cursor = nextrune(-1);
-			break;
-		}
-		if (lines > 0)
-			return;
-		/* fallthrough */
-	case XK_Up:
-		if (sel && sel->left && (sel = sel->left)->right == curr) {
-			curr = prev;
-			calcoffsets();
-		}
-		break;
-	case XK_Next:
-		if (!next)
-			return;
-		sel = curr = next;
-		calcoffsets();
-		break;
-	case XK_Prior:
-		if (!prev)
-			return;
-		sel = curr = prev;
-		calcoffsets();
-		break;
-	case XK_Return:
-	case XK_KP_Enter:
-		puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
-		if (!(ev->state & ControlMask)) {
-			cleanup();
-			exit(0);
-		}
-		if (sel)
-			sel->out = 1;
-		break;
-	case XK_Right:
-		if (text[cursor] != '\0') {
-			cursor = nextrune(+1);
-			break;
-		}
-		if (lines > 0)
-			return;
-		/* fallthrough */
-	case XK_Down:
-		if (sel && sel->right && (sel = sel->right) == next) {
-			curr = next;
-			calcoffsets();
-		}
-		break;
-	case XK_Tab:
-		if (!sel)
-			return;
-		strncpy(text, sel->text, sizeof text - 1);
-		text[sizeof text - 1] = '\0';
-		cursor = strlen(text);
-		match();
-		break;
-	}
+static void movewordedge(int dir) {
+  if (dir < 0) { /* move cursor to the start of the word*/
+    while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
+      cursor = nextrune(-1);
+    while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
+      cursor = nextrune(-1);
+  } else { /* move cursor to the end of the word */
+    while (text[cursor] && strchr(worddelimiters, text[cursor]))
+      cursor = nextrune(+1);
+    while (text[cursor] && !strchr(worddelimiters, text[cursor]))
+      cursor = nextrune(+1);
+  }
+}
+
+static void vi_keypress(KeySym ksym, const XKeyEvent *ev) {
+  static const size_t quit_len = LENGTH(quit_keys);
+  if (ev->state & ControlMask) {
+    switch (ksym) {
+    /* movement */
+    case XK_d: /* fallthrough */
+      if (next) {
+        sel = curr = next;
+        calcoffsets();
+        goto draw;
+      } else
+        ksym = XK_G;
+      break;
+    case XK_u:
+      if (prev) {
+        sel = curr = prev;
+        calcoffsets();
+        goto draw;
+      } else
+        ksym = XK_g;
+      break;
+    case XK_p: /* fallthrough */
+    case XK_P:
+      break;
+    case XK_c:
+      cleanup();
+      exit(1);
+    case XK_Return: /* fallthrough */
+    case XK_KP_Enter:
+      break;
+    default:
+      return;
+    }
+  }
+
+  switch (ksym) {
+  /* movement */
+  case XK_0:
+    cursor = 0;
+    break;
+  case XK_dollar:
+    if (text[cursor + 1] != '\0') {
+      cursor = strlen(text) - 1;
+      break;
+    }
+    break;
+  case XK_b:
+    movewordedge(-1);
+    break;
+  case XK_e:
+    cursor = nextrune(+1);
+    movewordedge(+1);
+    if (text[cursor] == '\0')
+      --cursor;
+    else
+      cursor = nextrune(-1);
+    break;
+  case XK_g:
+    if (sel == matches) {
+      break;
+    }
+    sel = curr = matches;
+    calcoffsets();
+    break;
+  case XK_G:
+    if (next) {
+      /* jump to end of list and position items in reverse */
+      curr = matchend;
+      calcoffsets();
+      curr = prev;
+      calcoffsets();
+      while (next && (curr = curr->right))
+        calcoffsets();
+    }
+    sel = matchend;
+    break;
+  case XK_h:
+    if (cursor)
+      cursor = nextrune(-1);
+    break;
+  case XK_j:
+    if (sel && sel->right && (sel = sel->right) == next) {
+      curr = next;
+      calcoffsets();
+    }
+    break;
+  case XK_k:
+    if (sel && sel->left && (sel = sel->left)->right == curr) {
+      curr = prev;
+      calcoffsets();
+    }
+    break;
+  case XK_l:
+    if (text[cursor] != '\0' && text[cursor + 1] != '\0')
+      cursor = nextrune(+1);
+    else if (text[cursor] == '\0' && cursor)
+      --cursor;
+    break;
+  case XK_w:
+    movewordedge(+1);
+    if (text[cursor] != '\0' && text[cursor + 1] != '\0')
+      cursor = nextrune(+1);
+    else if (cursor)
+      --cursor;
+    break;
+  /* insertion */
+  case XK_a:
+    cursor = nextrune(+1);
+    /* fallthrough */
+  case XK_i:
+    using_vi_mode = 0;
+    break;
+  case XK_A:
+    if (text[cursor] != '\0')
+      cursor = strlen(text);
+    using_vi_mode = 0;
+    break;
+  case XK_I:
+    cursor = using_vi_mode = 0;
+    break;
+  case XK_p:
+    if (text[cursor] != '\0')
+      cursor = nextrune(+1);
+    XConvertSelection(dpy, (ev->state & ControlMask) ? clip : XA_PRIMARY, utf8,
+                      utf8, win, CurrentTime);
+    return;
+  case XK_P:
+    XConvertSelection(dpy, (ev->state & ControlMask) ? clip : XA_PRIMARY, utf8,
+                      utf8, win, CurrentTime);
+    return;
+  /* deletion */
+  case XK_D:
+    text[cursor] = '\0';
+    if (cursor)
+      cursor = nextrune(-1);
+    match();
+    break;
+  case XK_x:
+    cursor = nextrune(+1);
+    insert(NULL, nextrune(-1) - cursor);
+    if (text[cursor] == '\0' && text[0] != '\0')
+      --cursor;
+    match();
+    break;
+  /* misc. */
+  case XK_Return:
+  case XK_KP_Enter:
+    puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+    if (!(ev->state & ControlMask)) {
+      cleanup();
+      exit(0);
+    }
+    if (sel)
+      sel->out = 1;
+    break;
+  case XK_Tab:
+    if (!sel)
+      return;
+    strncpy(text, sel->text, sizeof text - 1);
+    text[sizeof text - 1] = '\0';
+    cursor = strlen(text) - 1;
+    match();
+    break;
+  default:
+    for (size_t i = 0; i < quit_len; ++i)
+      if (quit_keys[i].ksym == ksym &&
+          (quit_keys[i].state & ev->state) == quit_keys[i].state) {
+        cleanup();
+        exit(1);
+      }
+  }
 
 draw:
-	drawmenu();
+  drawmenu();
 }
 
-static void
-buttonpress(XEvent *e)
-{
-	struct item *item;
-	XButtonPressedEvent *ev = &e->xbutton;
-	int x = 0, y = 0, h = bh, w;
-
-	if (ev->window != win)
-		return;
-
-	/* right-click: exit */
-	if (ev->button == Button3)
-		exit(1);
-
-	if (prompt && *prompt)
-		x += promptw;
-
-	/* input field */
-	w = (lines > 0 || !matches) ? mw - x : inputw;
-
-	/* left-click on input: clear input,
-	 * NOTE: if there is no left-arrow the space for < is reserved so
-	 *       add that to the input width */
-	if (ev->button == Button1 &&
-	   ((lines <= 0 && ev->x >= 0 && ev->x <= x + w +
-	   ((!prev || !curr->left) ? TEXTW("<") : 0)) ||
-	   (lines > 0 && ev->y >= y && ev->y <= y + h))) {
-		insert(NULL, -cursor);
-		drawmenu();
-		return;
-	}
-	/* middle-mouse click: paste selection */
-	if (ev->button == Button2) {
-		XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
-		                  utf8, utf8, win, CurrentTime);
-		drawmenu();
-		return;
-	}
-	/* scroll up */
-	if (ev->button == Button4 && prev) {
-		sel = curr = prev;
-		calcoffsets();
-		drawmenu();
-		return;
-	}
-	/* scroll down */
-	if (ev->button == Button5 && next) {
-		sel = curr = next;
-		calcoffsets();
-		drawmenu();
-		return;
-	}
-	if (ev->button != Button1)
-		return;
-	if (ev->state & ~ControlMask)
-		return;
-	if (lines > 0) {
-		/* vertical list: (ctrl)left-click on item */
-		w = mw - x;
-		for (item = curr; item != next; item = item->right) {
-			y += h;
-			if (ev->y >= y && ev->y <= (y + h)) {
-				puts(item->text);
-				if (!(ev->state & ControlMask))
-					exit(0);
-				sel = item;
-				if (sel) {
-					sel->out = 1;
-					drawmenu();
-				}
-				return;
-			}
-		}
-	} else if (matches) {
-		/* left-click on left arrow */
-		x += inputw;
-		w = TEXTW("<");
-		if (prev && curr->left) {
-			if (ev->x >= x && ev->x <= x + w) {
-				sel = curr = prev;
-				calcoffsets();
-				drawmenu();
-				return;
-			}
-		}
-		/* horizontal list: (ctrl)left-click on item */
-		for (item = curr; item != next; item = item->right) {
-			x += w;
-			w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
-			if (ev->x >= x && ev->x <= x + w) {
-				puts(item->text);
-				if (!(ev->state & ControlMask))
-					exit(0);
-				sel = item;
-				if (sel) {
-					sel->out = 1;
-					drawmenu();
-				}
-				return;
-			}
-		}
-		/* left-click on right arrow */
-		w = TEXTW(">");
-		x = mw - w;
-		if (next && ev->x >= x && ev->x <= x + w) {
-			sel = curr = next;
-			calcoffsets();
-			drawmenu();
-			return;
-		}
-	}
+static void keypress(XKeyEvent *ev) {
+  char buf[32];
+  int len;
+  KeySym ksym;
+  Status status;
+
+  len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
+  switch (status) {
+  default: /* XLookupNone, XBufferOverflow */
+    return;
+  case XLookupChars:
+    goto insert;
+  case XLookupKeySym:
+  case XLookupBoth:
+    break;
+  }
+
+  if (using_vi_mode) {
+    vi_keypress(ksym, ev);
+    return;
+  } else if (vi_mode && (ksym == global_esc.ksym &&
+                         (ev->state & global_esc.state) == global_esc.state)) {
+    using_vi_mode = 1;
+    if (cursor)
+      cursor = nextrune(-1);
+    goto draw;
+  }
+
+  if (ev->state & ControlMask) {
+    switch (ksym) {
+    case XK_a:
+      ksym = XK_Home;
+    case XK_b:
+      break;
+      ksym = XK_Left;
+      break;
+    case XK_c:
+      ksym = XK_Escape;
+      break;
+    case XK_d:
+      ksym = XK_Delete;
+      break;
+    case XK_e:
+      ksym = XK_End;
+      break;
+    case XK_f:
+      ksym = XK_Right;
+      break;
+    case XK_g:
+      ksym = XK_Escape;
+      break;
+    case XK_h:
+      ksym = XK_BackSpace;
+      break;
+    case XK_i:
+      ksym = XK_Tab;
+      break;
+    case XK_j: /* fallthrough */
+    case XK_J: /* fallthrough */
+    case XK_m: /* fallthrough */
+    case XK_M:
+      ksym = XK_Return;
+      ev->state &= ~ControlMask;
+      break;
+    case XK_n:
+      ksym = XK_Down;
+      break;
+    case XK_p:
+      ksym = XK_Up;
+      break;
+
+    case XK_k: /* delete right */
+      text[cursor] = '\0';
+      match();
+      break;
+    case XK_u: /* delete left */
+      insert(NULL, 0 - cursor);
+      break;
+    case XK_w: /* delete word */
+      while (cursor > 0 && strchr(worddelimiters, text[nextrune(-1)]))
+        insert(NULL, nextrune(-1) - cursor);
+      while (cursor > 0 && !strchr(worddelimiters, text[nextrune(-1)]))
+        insert(NULL, nextrune(-1) - cursor);
+      break;
+    case XK_y: /* paste selection */
+    case XK_Y:
+      XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, utf8,
+                        utf8, win, CurrentTime);
+      return;
+    case XK_Left:
+      movewordedge(-1);
+      goto draw;
+    case XK_Right:
+      movewordedge(+1);
+      goto draw;
+    case XK_Return:
+    case XK_KP_Enter:
+      break;
+    case XK_bracketleft:
+      cleanup();
+      exit(1);
+    default:
+      return;
+    }
+  } else if (ev->state & Mod1Mask) {
+    switch (ksym) {
+    case XK_b:
+      movewordedge(-1);
+      goto draw;
+    case XK_f:
+      movewordedge(+1);
+      goto draw;
+    case XK_g:
+      ksym = XK_Home;
+      break;
+    case XK_G:
+      ksym = XK_End;
+      break;
+    case XK_h:
+      ksym = XK_Up;
+      break;
+    case XK_j:
+      ksym = XK_Next;
+      break;
+    case XK_k:
+      ksym = XK_Prior;
+      break;
+    case XK_l:
+      ksym = XK_Down;
+      break;
+    default:
+      return;
+    }
+  }
+
+  switch (ksym) {
+  default:
+  insert:
+    if (!iscntrl(*buf))
+      insert(buf, len);
+    break;
+  case XK_Delete:
+    if (text[cursor] == '\0')
+      return;
+    cursor = nextrune(+1);
+    /* fallthrough */
+  case XK_BackSpace:
+    if (cursor == 0)
+      return;
+    insert(NULL, nextrune(-1) - cursor);
+    break;
+  case XK_End:
+    if (text[cursor] != '\0') {
+      cursor = strlen(text);
+      break;
+    }
+    if (next) {
+      /* jump to end of list and position items in reverse */
+      curr = matchend;
+      calcoffsets();
+      curr = prev;
+      calcoffsets();
+      while (next && (curr = curr->right))
+        calcoffsets();
+    }
+    sel = matchend;
+    break;
+  case XK_Escape:
+    cleanup();
+    exit(1);
+  case XK_Home:
+    if (sel == matches) {
+      cursor = 0;
+      break;
+    }
+    sel = curr = matches;
+    calcoffsets();
+    break;
+  case XK_Left:
+    if (cursor > 0 && (!sel || !sel->left || lines > 0)) {
+      cursor = nextrune(-1);
+      break;
+    }
+    if (lines > 0)
+      return;
+    /* fallthrough */
+  case XK_Up:
+    if (sel && sel->left && (sel = sel->left)->right == curr) {
+      curr = prev;
+      calcoffsets();
+    }
+    break;
+  case XK_Next:
+    if (!next)
+      return;
+    sel = curr = next;
+    calcoffsets();
+    break;
+  case XK_Prior:
+    if (!prev)
+      return;
+    sel = curr = prev;
+    calcoffsets();
+    break;
+  case XK_Return:
+  case XK_KP_Enter:
+    puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+    if (!(ev->state & ControlMask)) {
+      cleanup();
+      exit(0);
+    }
+    if (sel)
+      sel->out = 1;
+    break;
+  case XK_Right:
+    if (text[cursor] != '\0') {
+      cursor = nextrune(+1);
+      break;
+    }
+    if (lines > 0)
+      return;
+    /* fallthrough */
+  case XK_Down:
+    if (sel && sel->right && (sel = sel->right) == next) {
+      curr = next;
+      calcoffsets();
+    }
+    break;
+  case XK_Tab:
+    if (!sel)
+      return;
+    strncpy(text, sel->text, sizeof text - 1);
+    text[sizeof text - 1] = '\0';
+    cursor = strlen(text);
+    match();
+    break;
+  }
+
+draw:
+  drawmenu();
 }
 
-static void
-paste(void)
-{
-	char *p, *q;
-	int di;
-	unsigned long dl;
-	Atom da;
-
-	/* we have been given the current selection, now insert it into input */
-	if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
-	                   utf8, &da, &di, &dl, &dl, (unsigned char **)&p)
-	    == Success && p) {
-		insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
-		XFree(p);
-	}
-	drawmenu();
+static void buttonpress(XEvent *e) {
+  struct item *item;
+  XButtonPressedEvent *ev = &e->xbutton;
+  int x = 0, y = 0, h = bh, w;
+
+  if (ev->window != win)
+    return;
+
+  /* right-click: exit */
+  if (ev->button == Button3)
+    exit(1);
+
+  if (prompt && *prompt)
+    x += promptw;
+
+  /* input field */
+  w = (lines > 0 || !matches) ? mw - x : inputw;
+
+  /* left-click on input: clear input,
+   * NOTE: if there is no left-arrow the space for < is reserved so
+   *       add that to the input width */
+  if (ev->button == Button1 &&
+      ((lines <= 0 && ev->x >= 0 &&
+        ev->x <= x + w + ((!prev || !curr->left) ? TEXTW("<") : 0)) ||
+       (lines > 0 && ev->y >= y && ev->y <= y + h))) {
+    insert(NULL, -cursor);
+    drawmenu();
+    return;
+  }
+  /* middle-mouse click: paste selection */
+  if (ev->button == Button2) {
+    XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY, utf8,
+                      utf8, win, CurrentTime);
+    drawmenu();
+    return;
+  }
+  /* scroll up */
+  if (ev->button == Button4 && prev) {
+    sel = curr = prev;
+    calcoffsets();
+    drawmenu();
+    return;
+  }
+  /* scroll down */
+  if (ev->button == Button5 && next) {
+    sel = curr = next;
+    calcoffsets();
+    drawmenu();
+    return;
+  }
+  if (ev->button != Button1)
+    return;
+  if (ev->state & ~ControlMask)
+    return;
+  if (lines > 0) {
+    /* vertical list: (ctrl)left-click on item */
+    w = mw - x;
+    for (item = curr; item != next; item = item->right) {
+      y += h;
+      if (ev->y >= y && ev->y <= (y + h)) {
+        puts(item->text);
+        if (!(ev->state & ControlMask))
+          exit(0);
+        sel = item;
+        if (sel) {
+          sel->out = 1;
+          drawmenu();
+        }
+        return;
+      }
+    }
+  } else if (matches) {
+    /* left-click on left arrow */
+    x += inputw;
+    w = TEXTW("<");
+    if (prev && curr->left) {
+      if (ev->x >= x && ev->x <= x + w) {
+        sel = curr = prev;
+        calcoffsets();
+        drawmenu();
+        return;
+      }
+    }
+    /* horizontal list: (ctrl)left-click on item */
+    for (item = curr; item != next; item = item->right) {
+      x += w;
+      w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
+      if (ev->x >= x && ev->x <= x + w) {
+        puts(item->text);
+        if (!(ev->state & ControlMask))
+          exit(0);
+        sel = item;
+        if (sel) {
+          sel->out = 1;
+          drawmenu();
+        }
+        return;
+      }
+    }
+    /* left-click on right arrow */
+    w = TEXTW(">");
+    x = mw - w;
+    if (next && ev->x >= x && ev->x <= x + w) {
+      sel = curr = next;
+      calcoffsets();
+      drawmenu();
+      return;
+    }
+  }
 }
 
-static void
-readstdin(void)
-{
-	char buf[sizeof text], *p;
-	size_t i, imax = 0, size = 0;
-	unsigned int tmpmax = 0;
+static void paste(void) {
+  char *p, *q;
+  int di;
+  unsigned long dl;
+  Atom da;
+
+  /* we have been given the current selection, now insert it into input */
+  if (XGetWindowProperty(dpy, win, utf8, 0, (sizeof text / 4) + 1, False, utf8,
+                         &da, &di, &dl, &dl, (unsigned char **)&p) == Success &&
+      p) {
+    insert(p, (q = strchr(p, '\n')) ? q - p : (ssize_t)strlen(p));
+    XFree(p);
+  }
+  if (using_vi_mode && text[cursor] == '\0')
+    --cursor;
+  drawmenu();
+}
+
+static void readstdin(void) {
+  char buf[sizeof text], *p;
+  size_t i, imax = 0, size = 0;
+  unsigned int tmpmax = 0;
 
-  if(passwd){
+  if (passwd) {
     inputw = lines = 0;
     return;
   }
 
-	/* read each line from stdin and add it to the item list */
-	for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
-		if (i + 1 >= size / sizeof *items)
-			if (!(items = realloc(items, (size += BUFSIZ))))
-				die("cannot realloc %u bytes:", size);
-		if ((p = strchr(buf, '\n')))
-			*p = '\0';
-		if (!(items[i].text = strdup(buf)))
-			die("cannot strdup %u bytes:", strlen(buf) + 1);
-		items[i].out = 0;
-		drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
-		if (tmpmax > inputw) {
-			inputw = tmpmax;
-			imax = i;
-		}
-	}
-	if (items)
-		items[i].text = NULL;
-	inputw = items ? TEXTW(items[imax].text) : 0;
-	lines = MIN(lines, i);
+  /* read each line from stdin and add it to the item list */
+  for (i = 0; fgets(buf, sizeof buf, stdin); i++) {
+    if (i + 1 >= size / sizeof *items)
+      if (!(items = realloc(items, (size += BUFSIZ))))
+        die("cannot realloc %u bytes:", size);
+    if ((p = strchr(buf, '\n')))
+      *p = '\0';
+    if (!(items[i].text = strdup(buf)))
+      die("cannot strdup %u bytes:", strlen(buf) + 1);
+    items[i].out = 0;
+    drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
+    if (tmpmax > inputw) {
+      inputw = tmpmax;
+      imax = i;
+    }
+  }
+  if (items)
+    items[i].text = NULL;
+  inputw = items ? TEXTW(items[imax].text) : 0;
+  lines = MIN(lines, i);
 }
 
-static void
-run(void)
-{
-	XEvent ev;
-
-	while (!XNextEvent(dpy, &ev)) {
-		if (XFilterEvent(&ev, win))
-			continue;
-		switch(ev.type) {
-		case ButtonPress:
-			buttonpress(&ev);
-			break;
-		case DestroyNotify:
-			if (ev.xdestroywindow.window != win)
-				break;
-			cleanup();
-			exit(1);
-		case Expose:
-			if (ev.xexpose.count == 0)
-				drw_map(drw, win, 0, 0, mw, mh);
-			break;
-		case FocusIn:
-			/* regrab focus from parent window */
-			if (ev.xfocus.window != win)
-				grabfocus();
-			break;
-		case KeyPress:
-			keypress(&ev.xkey);
-			break;
-		case SelectionNotify:
-			if (ev.xselection.property == utf8)
-				paste();
-			break;
-		case VisibilityNotify:
-			if (ev.xvisibility.state != VisibilityUnobscured)
-				XRaiseWindow(dpy, win);
-			break;
-		}
-	}
+static void run(void) {
+  XEvent ev;
+
+  while (!XNextEvent(dpy, &ev)) {
+    if (XFilterEvent(&ev, win))
+      continue;
+    switch (ev.type) {
+    case ButtonPress:
+      buttonpress(&ev);
+      break;
+    case DestroyNotify:
+      if (ev.xdestroywindow.window != win)
+        break;
+      cleanup();
+      exit(1);
+    case Expose:
+      if (ev.xexpose.count == 0)
+        drw_map(drw, win, 0, 0, mw, mh);
+      break;
+    case FocusIn:
+      /* regrab focus from parent window */
+      if (ev.xfocus.window != win)
+        grabfocus();
+      break;
+    case KeyPress:
+      keypress(&ev.xkey);
+      break;
+    case SelectionNotify:
+      if (ev.xselection.property == utf8)
+        paste();
+      break;
+    case VisibilityNotify:
+      if (ev.xvisibility.state != VisibilityUnobscured)
+        XRaiseWindow(dpy, win);
+      break;
+    }
+  }
 }
 
-static void
-setup(void)
-{
-	int x, y, i, j;
-	unsigned int du;
-	XSetWindowAttributes swa;
-	XIM xim;
-	Window w, dw, *dws;
-	XWindowAttributes wa;
-	XClassHint ch = {"dmenu", "dmenu"};
+static void setup(void) {
+  int x, y, i, j;
+  unsigned int du;
+  XSetWindowAttributes swa;
+  XIM xim;
+  Window w, dw, *dws;
+  XWindowAttributes wa;
+  XClassHint ch = {"dmenu", "dmenu"};
 #ifdef XINERAMA
-	XineramaScreenInfo *info;
-	Window pw;
-	int a, di, n, area = 0;
+  XineramaScreenInfo *info;
+  Window pw;
+  int a, di, n, area = 0;
 #endif
-	/* init appearance */
-	for (j = 0; j < SchemeLast; j++)
-		scheme[j] = drw_scm_create(drw, colors[j], alphas[j], 2);
+  /* init appearance */
+  for (j = 0; j < SchemeLast; j++)
+    scheme[j] = drw_scm_create(drw, colors[j], alphas[j], 2);
 
-	clip = XInternAtom(dpy, "CLIPBOARD",   False);
-	utf8 = XInternAtom(dpy, "UTF8_STRING", False);
+  clip = XInternAtom(dpy, "CLIPBOARD", False);
+  utf8 = XInternAtom(dpy, "UTF8_STRING", False);
 
-	/* calculate menu geometry */
-	bh = drw->fonts->h + 2;
-	lines = MAX(lines, 0);
-	mh = (lines + 1) * bh;
+  /* calculate menu geometry */
+  bh = drw->fonts->h + 2;
+  lines = MAX(lines, 0);
+  mh = (lines + 1) * bh;
 #ifdef XINERAMA
-	i = 0;
-	if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
-		XGetInputFocus(dpy, &w, &di);
-		if (mon >= 0 && mon < n)
-			i = mon;
-		else if (w != root && w != PointerRoot && w != None) {
-			/* find top-level window containing current input focus */
-			do {
-				if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
-					XFree(dws);
-			} while (w != root && w != pw);
-			/* find xinerama screen with which the window intersects most */
-			if (XGetWindowAttributes(dpy, pw, &wa))
-				for (j = 0; j < n; j++)
-					if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
-						area = a;
-						i = j;
-					}
-		}
-		/* no focused window is on screen, so use pointer location instead */
-		if (mon < 0 && !area && XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
-			for (i = 0; i < n; i++)
-				if (INTERSECT(x, y, 1, 1, info[i]))
-					break;
-
-		x = info[i].x_org;
-		y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
-		mw = info[i].width;
-		XFree(info);
-	} else
+  i = 0;
+  if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
+    XGetInputFocus(dpy, &w, &di);
+    if (mon >= 0 && mon < n)
+      i = mon;
+    else if (w != root && w != PointerRoot && w != None) {
+      /* find top-level window containing current input focus */
+      do {
+        if (XQueryTree(dpy, (pw = w), &dw, &w, &dws, &du) && dws)
+          XFree(dws);
+      } while (w != root && w != pw);
+      /* find xinerama screen with which the window intersects most */
+      if (XGetWindowAttributes(dpy, pw, &wa))
+        for (j = 0; j < n; j++)
+          if ((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) >
+              area) {
+            area = a;
+            i = j;
+          }
+    }
+    /* no focused window is on screen, so use pointer location instead */
+    if (mon < 0 && !area &&
+        XQueryPointer(dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
+      for (i = 0; i < n; i++)
+        if (INTERSECT(x, y, 1, 1, info[i]))
+          break;
+
+    x = info[i].x_org + dmx;
+    y = info[i].y_org + (topbar ? dmy : info[i].height - mh - dmy);
+    mw = (dmw > 0 ? dmw : info[i].width);
+    XFree(info);
+  } else
 #endif
-	{
-		if (!XGetWindowAttributes(dpy, parentwin, &wa))
-			die("could not get embedding window attributes: 0x%lx",
-			    parentwin);
-		x = 0;
-		y = topbar ? 0 : wa.height - mh;
-		mw = wa.width;
-	}
-	promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
-	inputw = MIN(inputw, mw/3);
-	match();
-
-	/* create menu window */
-	swa.override_redirect = True;
-	swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
-	swa.border_pixel = 0;
-	swa.colormap = cmap;
-	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask |
-		ButtonPressMask;
-	win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
-	                    depth, InputOutput, visual,
-	                    CWOverrideRedirect | CWBackPixel | CWColormap |  CWEventMask | CWBorderPixel, &swa);
-	XSetClassHint(dpy, win, &ch);
-
-
-	/* input methods */
-	if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
-		die("XOpenIM failed: could not open input device");
-
-	xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
-	                XNClientWindow, win, XNFocusWindow, win, NULL);
-
-	XMapRaised(dpy, win);
-	if (embed) {
-		XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);
-		if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
-			for (i = 0; i < du && dws[i] != win; ++i)
-				XSelectInput(dpy, dws[i], FocusChangeMask);
-			XFree(dws);
-		}
-		grabfocus();
-	}
-	drw_resize(drw, mw, mh);
-	drawmenu();
+  {
+    if (!XGetWindowAttributes(dpy, parentwin, &wa))
+      die("could not get embedding window attributes: 0x%lx", parentwin);
+    x = dmx;
+    y = topbar ? dmy : wa.height - mh - dmy;
+    mw = (dmw > 0 ? dmw : wa.width);
+  }
+  promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
+  inputw = MIN(inputw, mw / 3);
+  match();
+
+  /* create menu window */
+  swa.override_redirect = True;
+  swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
+  swa.border_pixel = 0;
+  swa.colormap = cmap;
+  swa.event_mask =
+      ExposureMask | KeyPressMask | VisibilityChangeMask | ButtonPressMask;
+  win =
+      XCreateWindow(dpy, parentwin, x, y, mw, mh, 0, depth, InputOutput, visual,
+                    CWOverrideRedirect | CWBackPixel | CWColormap |
+                        CWEventMask | CWBorderPixel,
+                    &swa);
+  XSetClassHint(dpy, win, &ch);
+
+  /* input methods */
+  if ((xim = XOpenIM(dpy, NULL, NULL, NULL)) == NULL)
+    die("XOpenIM failed: could not open input device");
+
+  xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
+                  XNClientWindow, win, XNFocusWindow, win, NULL);
+
+  XMapRaised(dpy, win);
+  if (embed) {
+    XSelectInput(dpy, parentwin, FocusChangeMask | SubstructureNotifyMask);
+    if (XQueryTree(dpy, parentwin, &dw, &w, &dws, &du) && dws) {
+      for (i = 0; i < du && dws[i] != win; ++i)
+        XSelectInput(dpy, dws[i], FocusChangeMask);
+      XFree(dws);
+    }
+    grabfocus();
+  }
+  drw_resize(drw, mw, mh);
+  drawmenu();
 }
 
-static void
-usage(void)
-{
-	fputs("usage: dmenu [-bfiPrv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
-	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w windowid]\n", stderr);
-	exit(1);
+static void usage(void) {
+  fputs(
+      "usage: dmenu [-bfiPrv] [-l lines] [-p prompt] [-fn font] [-m monitor]\n"
+      "             [-x xoffset] [-y yoffset] [-z width]\n"
+      "             [-nb color] [-nf color] [-sb color] [-sf color] [-w "
+      "windowid]\n",
+      stderr);
+  exit(1);
 }
 
-void
-read_Xresources(void) {
-	XrmInitialize();
-
-	char* xrm;
-	if ((xrm = XResourceManagerString(drw->dpy))) {
-		char *type;
-		XrmDatabase xdb = XrmGetStringDatabase(xrm);
-		XrmValue xval;
-
-		if (XrmGetResource(xdb, "dmenu.font", "*", &type, &xval) == True) /* font or font set */
-			fonts[0] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.color0", "*", &type, &xval) == True)  /* normal background color */
-			colors[SchemeNorm][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.color4", "*", &type, &xval) == True)  /* normal foreground color */
-			colors[SchemeNorm][ColFg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.color4", "*", &type, &xval) == True)  /* selected background color */
-			colors[SchemeSel][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.color0", "*", &type, &xval) == True)  /* selected foreground color */
-			colors[SchemeSel][ColFg] = strdup(xval.addr);
-
-		XrmDestroyDatabase(xdb);
-	}
+void read_Xresources(void) {
+  XrmInitialize();
+
+  char *xrm;
+  if ((xrm = XResourceManagerString(drw->dpy))) {
+    char *type;
+    XrmDatabase xdb = XrmGetStringDatabase(xrm);
+    XrmValue xval;
+
+    if (XrmGetResource(xdb, "dmenu.font", "*", &type, &xval) ==
+        True) /* font or font set */
+      fonts[0] = strdup(xval.addr);
+    if (XrmGetResource(xdb, "dmenu.color0", "*", &type, &xval) ==
+        True) /* normal background color */
+      colors[SchemeNorm][ColBg] = strdup(xval.addr);
+    if (XrmGetResource(xdb, "dmenu.color4", "*", &type, &xval) ==
+        True) /* normal foreground color */
+      colors[SchemeNorm][ColFg] = strdup(xval.addr);
+    if (XrmGetResource(xdb, "dmenu.color4", "*", &type, &xval) ==
+        True) /* selected background color */
+      colors[SchemeSel][ColBg] = strdup(xval.addr);
+    if (XrmGetResource(xdb, "dmenu.color0", "*", &type, &xval) ==
+        True) /* selected foreground color */
+      colors[SchemeSel][ColFg] = strdup(xval.addr);
+
+    XrmDestroyDatabase(xdb);
+  }
 }
 
-int
-main(int argc, char *argv[])
-{
-	XWindowAttributes wa;
-	int i, fast = 0;
-
-	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-		fputs("warning: no locale support\n", stderr);
-	if (!(dpy = XOpenDisplay(NULL)))
-		die("cannot open display");
-	screen = DefaultScreen(dpy);
-	root = RootWindow(dpy, screen);
-	if (!embed || !(parentwin = strtol(embed, NULL, 0)))
-		parentwin = root;
-	if (!XGetWindowAttributes(dpy, parentwin, &wa))
-		die("could not get embedding window attributes: 0x%lx",
-		    parentwin);
-	xinitvisual();
-	drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap);
-	read_Xresources();
-
-	for (i = 1; i < argc; i++)
-		/* these options take no arguments */
-		if (!strcmp(argv[i], "-v")) {      /* prints version information */
-			puts("dmenu-"VERSION);
-			exit(0);
-		} else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
-			topbar = 0;
-		else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
-			fast = 1;
-		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
-			fstrncmp = strncasecmp;
-			fstrstr = cistrstr;
-		} else if (!strcmp(argv[i], "-P"))   /* is the input a password */
-		        passwd = 1;
-		else if (!strcmp(argv[i], "-r")) /* reject input which results in no match */
-			reject_no_match = 1;
-		else if (i + 1 == argc)
-			usage();
-		/* these options take one argument */
-		else if (!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
-			lines = atoi(argv[++i]);
-		else if (!strcmp(argv[i], "-m"))
-			mon = atoi(argv[++i]);
-		else if (!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
-			prompt = argv[++i];
-		else if (!strcmp(argv[i], "-fn"))  /* font or font set */
-			fonts[0] = argv[++i];
-		else if (!strcmp(argv[i], "-nb"))  /* normal background color */
-			colors[SchemeNorm][ColBg] = argv[++i];
-		else if (!strcmp(argv[i], "-nf"))  /* normal foreground color */
-			colors[SchemeNorm][ColFg] = argv[++i];
-		else if (!strcmp(argv[i], "-sb"))  /* selected background color */
-			colors[SchemeSel][ColBg] = argv[++i];
-		else if (!strcmp(argv[i], "-sf"))  /* selected foreground color */
-			colors[SchemeSel][ColFg] = argv[++i];
-		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
-			embed = argv[++i];
-		else
-			usage();
-
-	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
-		die("no fonts could be loaded.");
-	lrpad = drw->fonts->h;
+int main(int argc, char *argv[]) {
+  XWindowAttributes wa;
+  int i, fast = 0;
+
+  if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+    fputs("warning: no locale support\n", stderr);
+  if (!(dpy = XOpenDisplay(NULL)))
+    die("cannot open display");
+  screen = DefaultScreen(dpy);
+  root = RootWindow(dpy, screen);
+  if (!embed || !(parentwin = strtol(embed, NULL, 0)))
+    parentwin = root;
+  if (!XGetWindowAttributes(dpy, parentwin, &wa))
+    die("could not get embedding window attributes: 0x%lx", parentwin);
+  xinitvisual();
+  drw = drw_create(dpy, screen, root, wa.width, wa.height, visual, depth, cmap);
+  read_Xresources();
+
+  for (i = 1; i < argc; i++)
+    /* these options take no arguments */
+    if (!strcmp(argv[i], "-v")) { /* prints version information */
+      puts("dmenu-" VERSION);
+      exit(0);
+    } else if (!strcmp(argv[i], "-b")) /* appears at the bottom of the screen */
+      topbar = 0;
+    else if (!strcmp(argv[i], "-f")) /* grabs keyboard before reading stdin */
+      fast = 1;
+    else if (!strcmp(argv[i], "-F")) /* grabs keyboard before reading stdin */
+      fuzzy = 0;
+    else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
+      fstrncmp = strncasecmp;
+      fstrstr = cistrstr;
+    } else if (!strcmp(argv[i], "-vi")) {
+      vi_mode = 1;
+      using_vi_mode = start_mode;
+      global_esc.ksym = XK_Escape;
+      global_esc.state = 0;
+    } else if (!strcmp(argv[i], "-P")) /* is the input a password */
+      passwd = 1;
+    else if (!strcmp(argv[i],
+                     "-r")) /* reject input which results in no match */
+      reject_no_match = 1;
+    else if (i + 1 == argc)
+      usage();
+    /* these options take one argument */
+    else if (!strcmp(argv[i], "-l")) /* number of lines in vertical list */
+      lines = atoi(argv[++i]);
+    else if (!strcmp(argv[i], "-x")) /* window x offset */
+      dmx = atoi(argv[++i]);
+    else if (!strcmp(argv[i],
+                     "-y")) /* window y offset (from bottom up if -b) */
+      dmy = atoi(argv[++i]);
+    else if (!strcmp(argv[i], "-z")) /* make dmenu this wide */
+      dmw = atoi(argv[++i]);
+    else if (!strcmp(argv[i], "-m"))
+      mon = atoi(argv[++i]);
+    else if (!strcmp(argv[i], "-p")) /* adds prompt to left of input field */
+      prompt = argv[++i];
+    else if (!strcmp(argv[i], "-fn")) /* font or font set */
+      fonts[0] = argv[++i];
+    else if (!strcmp(argv[i], "-nb")) /* normal background color */
+      colors[SchemeNorm][ColBg] = argv[++i];
+    else if (!strcmp(argv[i], "-nf")) /* normal foreground color */
+      colors[SchemeNorm][ColFg] = argv[++i];
+    else if (!strcmp(argv[i], "-sb")) /* selected background color */
+      colors[SchemeSel][ColBg] = argv[++i];
+    else if (!strcmp(argv[i], "-sf")) /* selected foreground color */
+      colors[SchemeSel][ColFg] = argv[++i];
+    else if (!strcmp(argv[i], "-w")) /* embedding window id */
+      embed = argv[++i];
+    else
+      usage();
+
+  if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+    die("no fonts could be loaded.");
+  lrpad = drw->fonts->h;
 
 #ifdef __OpenBSD__
-	if (pledge("stdio rpath", NULL) == -1)
-		die("pledge");
+  if (pledge("stdio rpath", NULL) == -1)
+    die("pledge");
 #endif
 
-	if (fast && !isatty(0)) {
-		grabkeyboard();
-		readstdin();
-	} else {
-		readstdin();
-		grabkeyboard();
-	}
-	setup();
-	run();
-
-	return 1; /* unreachable */
-}
+  if (fast && !isatty(0)) {
+    grabkeyboard();
+    readstdin();
+  } else {
+    readstdin();
+    grabkeyboard();
+  }
+  setup();
+  run();
 
+  return 1; /* unreachable */
+}
diff --git a/dmenu/stest b/dmenu/stest
index 455fd83..02ccef7 100755
--- a/dmenu/stest
+++ b/dmenu/stest
diff --git a/dwm/Makefile b/dwm/Makefile
index 11a49c4..7e4b1f5 100644
--- a/dwm/Makefile
+++ b/dwm/Makefile
@@ -40,11 +40,11 @@ install: all
 	sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
 	chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
 	mkdir -p ${DESTDIR}${PREFIX}/share/dwm
-	install -Dm644 ./larbs.mom ${DESTDIR}${PREFIX}/share/dwm
+	install -Dm644 ./thesiah.mom ${DESTDIR}${PREFIX}/share/man/thesiah
 
 uninstall:
 	rm -f ${DESTDIR}${PREFIX}/bin/dwm\
-		${DESTDIR}${PREFIX}/share/dwm/larbs.mom\
+		${DESTDIR}${PREFIX}/share/man/thesiah/thesiah.mom\
 		${DESTDIR}${MANPREFIX}/man1/dwm.1
 
 .PHONY: all options clean dist install uninstall
diff --git a/dwm/PKGBUILD b/dwm/PKGBUILD
index 1903c72..5f448e3 100644
--- a/dwm/PKGBUILD
+++ b/dwm/PKGBUILD
@@ -1,9 +1,9 @@
 _pkgname=dwm
-pkgname=$_pkgname-larbs-git
+pkgname=$_pkgname-thesiah-git
 pkgver=6.2.r1888.0ac09e0
 pkgrel=1
-pkgdesc="Luke's build of dwm"
-url=https://github.com/LukeSmithxyz/dwm
+pkgdesc="Soomin's build of dwm"
+url=https://github.com/SoominImxyz/dwm
 arch=(i686 x86_64)
 license=(MIT)
 makedepends=(git)
@@ -13,7 +13,7 @@ optdepends=(
 	'st: terminal emulator')
 provides=($_pkgname)
 conflicts=($_pkgname)
-source=(git+https://github.com/LukeSmithxyz/dwm)
+source=(git+https://github.com/SoominImxyz/dwm)
 sha256sums=('SKIP')
 
 pkgver() {
@@ -23,9 +23,9 @@ pkgver() {
 
 prepare() {
 	cd "$_pkgname"
-	echo "CPPFLAGS+=${CPPFLAGS}" >> config.mk
-	echo "CFLAGS+=${CFLAGS}" >> config.mk
-	echo "LDFLAGS+=${LDFLAGS}" >> config.mk
+	echo "CPPFLAGS+=${CPPFLAGS}" >>config.mk
+	echo "CFLAGS+=${CFLAGS}" >>config.mk
+	echo "LDFLAGS+=${LDFLAGS}" >>config.mk
 	# to use a custom config.h, place it in the package directory
 	if [[ -f ${SRCDEST}/config.h ]]; then
 		cp "${SRCDEST}/config.h" .
diff --git a/dwm/config.def.h b/dwm/config.def.h
new file mode 100644
index 0000000..dec3915
--- /dev/null
+++ b/dwm/config.def.h
@@ -0,0 +1,495 @@
+/* See LICENSE file for copyright and license details. */
+
+/* constants */
+#define TERMINAL "st"
+#define TERMCLASS "St"
+#define BROWSER "firefox"
+#define BROWSERCLASS "Firefox"
+#define GAP 6
+
+/* appearance */
+static unsigned int borderpx = 3;               /* border pixel of windows */
+static unsigned int snap = 32;                  /* snap pixel */
+static unsigned int gappih = GAP;               /* horiz inner gap between windows */
+static unsigned int gappiv = GAP;               /* vert inner gap between windows */
+static unsigned int gappoh = GAP;               /* horiz outer gap between windows and screen edge */
+static unsigned int gappov = GAP;               /* vert outer gap between windows and screen edge */
+static int swallowfloating = 0;                 /* 1 means swallow floating windows by default */
+static int smartgaps = 0;                       /* 1 means no outer gap when there is only one window */
+static int showbar = 1;                         /* 0 means no bar */
+static int topbar = 1;                          /* 0 means bottom bar */
+static const int vertpad = GAP;                 /* vertical padding of bar */
+static const int sidepad = GAP;                 /* horizontal padding of bar */
+static char *fonts[] = {
+    "monospace:size=10",
+    "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" };
+static char normbgcolor[] = "#222222";
+static char normbordercolor[] = "#555555";
+static char normfgcolor[] = "#bbbbbb";
+static char selfgcolor[] = "#eeeeee";
+static char selbordercolor[] = "#4CBB17";
+static char selbgcolor[] = "#005577";
+static const unsigned int baralpha = 0xd0;
+static const unsigned int borderalpha = OPAQUE;
+static char *colors[][3] = {
+    /*                      fg              bg              border  */
+    [SchemeNorm]    = { normfgcolor,     normbgcolor,    normbordercolor },
+    [SchemeSel]     = { selfgcolor,      selbgcolor,     selbordercolor },
+};
+static const unsigned int alphas[][3] = {
+    /*                  fg              bg              border  */
+    [SchemeNorm]    = { OPAQUE,      baralpha,       borderalpha },
+    [SchemeSel]     = { OPAQUE,      baralpha,       borderalpha },
+};
+
+typedef struct {
+  const char *name;
+  const void *cmd;
+} Sp;
+
+/* scratchpads */
+const char *spcmd1[] = { TERMINAL, "-n", "spterm", "-g", "120x34", NULL };
+const char *spcmd2[] = { TERMINAL, "-n",    "spcalc", "-f", "monospace:size=16",
+                        "-g",     "50x20", "-e",     "bc", "-lq", NULL };
+static Sp scratchpads[] = {
+    /* name         cmd */
+    { "spterm",     spcmd1 },
+    { "spcalc",     spcmd2 },
+};
+
+/* tagging */
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+static const Rule rules[] = {
+    /* xprop(1):
+     *	WM_CLASS(STRING) = instance, class
+     *	WM_NAME(STRING) = title
+     */
+    /* class        instance        title           tags mask       isfloating isterminal  noswallow  monitor */
+    { "Gimp",       NULL,           NULL,           1 << 8,         0,  0,  0, -1 },
+    { "kakaotalk",  NULL,           NULL,           1 << 8,         0,  0, -1, -1 },
+    { TERMCLASS,    NULL,           NULL,           0,              0,  1,  0, -1 },
+    { BROWSERCLASS, NULL,           NULL,           0,              0,  0, -1, -1 },
+    { TERMCLASS,    "floatterm",    NULL,           0,              1,  1,  0, -1 },
+    { TERMCLASS,    "bg",           NULL,           1 << 7,         0,  1,  0, -1 },
+    { TERMCLASS,    "spterm",       NULL,           SPTAG(0),       1,  1,  0, -1 },
+    { TERMCLASS,    "spcalc",       NULL,           SPTAG(1),       1,  1,  0, -1 },
+    { NULL,         NULL,           "Event Tester", 0,              0,  0,  1, -1 },
+};
+
+/* layout(s) */
+static float mfact = 0.55;              /* factor of master area size [0.05..0.95] */
+static int nmaster = 1;                 /* number of clients in master area */
+static int resizehints = 0;             /* 1 means respect size hints in tiled resizals */
+static const int lockfullscreen = 1;    /* 1 will force focus on the fullscreen window */
+
+#define FORCE_VSPLIT 1                  /* nrowgrid layout: force two clients to always split vertically */
+#include "vanitygaps.c"
+
+static const Layout layouts[] = {
+    /* symbol   arrange function */
+    { "[]=",    tile },                     /* 0: Default: Master on left, slaves on right */
+    { "[M]",    monocle },                  /* 1: All windows on top of eachother */
+	{ "|||",    col },                      /* 2: Column */
+    { "[@]",    spiral },                   /* 3: Fibonacci spiral */
+    { "[\\]",    dwindle },                 /* 4: Decreasing in size right and leftward */
+    { "H[]",    deck },                     /* 5: Master on left, slaves in monocle-like mode on right */
+    { "TTT",    bstack },                   /* 6: Master on top, slaves on bottom horizontally */
+    { "===",    bstackhoriz },              /* 7: Master on top, slaves on bottom vertically */
+    { "HHH",    grid },                     /* 8: Equal grid */
+    { "###",    nrowgrid },                 /* 9: Number of row grid */
+    { "---",    horizgrid },                /* 10: Horizontal grid */
+    { ":::",    gaplessgrid },              /* 11: Gapless grid */
+    { "|M|",    centeredmaster },           /* 12: Master in middle, slaves on sides */
+    { ">M>",    centeredfloatingmaster },   /* 13: Same but master floats */
+    { "><>",    NULL },                     /* 14: no layout function means floating behavior */
+    { NULL,     NULL },
+};
+
+/* imports */
+#include <X11/XF86keysym.h>
+#include "shift-tools-scratchpads.c"
+#include "tagandview.c"
+#include "exresize.c"
+
+/* key definitions */
+#define MODKEY Mod4Mask
+#define MODKEY2 Mod1Mask
+
+#define TAGKEYS(KEY, TAG)                                                               \
+    { MODKEY,                               KEY, view,           { .ui = 1 << TAG } },  \
+    { MODKEY | ControlMask,                 KEY, toggleview,     { .ui = 1 << TAG } },  \
+    { MODKEY | ShiftMask,                   KEY, tag,            { .ui = 1 << TAG } },  \
+    { MODKEY | ControlMask | ShiftMask,     KEY, toggletag,      { .ui = 1 << TAG } },  \
+    { MODKEY2 | ShiftMask,                  KEY, tagandview,     { .ui = 1 << TAG } },
+
+#define CTAGKEYS(KEY, TAG)                                                                      \
+	{ {0,0,0,0},                            {KEY,0,0,0}, view,          { .ui = 1 << TAG} },    \
+	{ {ControlMask,0,0,0},                  {KEY,0,0,0}, toggleview,    { .ui = 1 << TAG} },    \
+	{ {ShiftMask,0,0,0},                    {KEY,0,0,0}, tag,           { .ui = 1 << TAG} },    \
+	{ {ControlMask|ShiftMask,0,0,0},        {KEY,0,0,0}, toggletag,     { .ui = 1 << TAG} },
+
+#define STACKKEYS(MOD, ACTION)                              \
+    { MOD,  XK_j,   ACTION##stack,  { .i = INC(+1) } },     \
+    { MOD,  XK_k,   ACTION##stack,  { .i = INC(-1) } },     \
+    { MOD,  XK_Tab, ACTION##stack,  { .i = PREVSEL } },     \
+    { MOD,  XK_x,   ACTION##stack,  { .i = 0 } },           \
+    { MOD,  XK_a,   ACTION##stack,  { .i = 1 } },           \
+    { MOD,  XK_s,   ACTION##stack,  { .i = 2 } },           \
+    { MOD,  XK_z,   ACTION##stack,  { .i = -1 } },
+
+#define CSTACKKEYS(MOD, ACTION)                                             \
+    { {MOD,0,0,0},  {XK_j, 0,0,0},  ACTION##stack,  { .i = INC(+1) } },     \
+    { {MOD,0,0,0},  {XK_k, 0,0,0},  ACTION##stack,  { .i = INC(-1) } },     \
+    { {MOD,0,0,0},  {XK_Tab,0,0,0}, ACTION##stack,  { .i = PREVSEL } },     \
+    { {MOD,0,0,0},  {XK_x, 0,0,0},  ACTION##stack,  { .i = 0 } },           \
+    { {MOD,0,0,0},  {XK_a, 0,0,0},  ACTION##stack,  { .i = 1 } },           \
+    { {MOD,0,0,0},  {XK_s, 0,0,0},  ACTION##stack,  { .i = 2 } },           \
+    { {MOD,0,0,0},  {XK_z, 0,0,0},  ACTION##stack,  { .i = -1 } },
+
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
+#define SHCMD(cmd) { .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } }
+
+/* commands */
+// static const char *dmenucmd[] = { "dmenu_run",    "-fn", dmenufont,   "-nb",
+//                                  normbgcolor,    "-nf", normfgcolor, "-sb",
+//                                  selbordercolor, "-sf", selfgcolor,  NULL };
+static const char *termcmd[] = { TERMINAL, NULL };
+
+/* Xresources preferences to load at startup */
+ResourcePref resources[] = {
+    { "color0", STRING, &normbordercolor },
+    { "color8", STRING, &selbordercolor },
+    { "color0", STRING, &normbgcolor },
+    { "color4", STRING, &normfgcolor },
+    { "color0", STRING, &selfgcolor },
+    { "color4", STRING, &selbgcolor },
+    { "borderpx", INTEGER, &borderpx },
+    { "snap", INTEGER, &snap },
+    { "showbar", INTEGER, &showbar },
+    { "topbar", INTEGER, &topbar },
+    { "nmaster", INTEGER, &nmaster },
+    { "resizehints", INTEGER, &resizehints },
+    { "mfact", FLOAT, &mfact },
+    { "gappih", INTEGER, &gappih },
+    { "gappiv", INTEGER, &gappiv },
+    { "gappoh", INTEGER, &gappoh },
+    { "gappov", INTEGER, &gappov },
+    { "swallowfloating", INTEGER, &swallowfloating },
+    { "smartgaps", INTEGER, &smartgaps },
+};
+
+static const Key keys[] = {
+    /* STACKKEYS */
+    STACKKEYS(MODKEY,               focus)
+    STACKKEYS(MODKEY | ShiftMask,   push)
+
+    /* TAGKEYS */
+    TAGKEYS(XK_1, 0)
+    TAGKEYS(XK_2, 1)
+    TAGKEYS(XK_3, 2)
+    TAGKEYS(XK_4, 3)
+    TAGKEYS(XK_5, 4)
+    TAGKEYS(XK_6, 5)
+    TAGKEYS(XK_7, 6)
+    TAGKEYS(XK_8, 7)
+    TAGKEYS(XK_9, 8)
+
+    /* modifier                             key                 function            argument */
+    /* AUDIO CONTROL */
+    { MODKEY,                               XK_m,               spawn,              SHCMD("mpc random on; mpc load entire; mpc play; pkill -RTMIN+11 dwmblocks") },
+    { MODKEY | ShiftMask,                   XK_m,               spawn,              { .v = (const char *[]){ "playlists", NULL } } },
+    { MODKEY | ControlMask,                 XK_m,               spawn,              { .v = (const char *[]){ "mpdmenu", NULL } } },
+    { MODKEY,                               XK_p,               spawn,              { .v = (const char *[]){ "mpc", "toggle", NULL } } },
+    { MODKEY | ShiftMask,                   XK_p,               spawn,              SHCMD("mpc pause; pauseallmpv") },
+    { MODKEY | ControlMask,                 XK_p,               spawn,              SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask,                 XK_s,               spawn,              SHCMD("mpc stop; pkill -RTMIN+11 dwmblocks") },
+    { MODKEY,                               XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "prev", NULL } } },
+    { MODKEY,                               XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "next", NULL } } },
+    { MODKEY | ShiftMask,                   XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "-10", NULL } } },
+    { MODKEY | ShiftMask,                   XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
+    { MODKEY | ControlMask,                 XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "-60", NULL } } },
+    { MODKEY | ControlMask,                 XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "seek", "+60", NULL } } },
+    { MODKEY | ShiftMask | ControlMask,     XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "0%", NULL } } },
+    { MODKEY | ShiftMask | ControlMask,     XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "repeat", NULL } } },
+    { MODKEY ,                              XK_backslash,       spawn,              { .v = (const char *[]){ "mpc", "single", NULL } } },
+    { MODKEY | ShiftMask,                   XK_backslash,       spawn,              { .v = (const char *[]){ "mpc", "random", NULL } } },
+    { MODKEY | ControlMask,                 XK_backslash,       spawn,              SHCMD("mpc repeat off; mpc random off; mpc single off; pkill -RTMIN+11 dwmblocks") },
+
+    /* LAYOUT SIZE */
+    { MODKEY | ShiftMask,                   XK_n,               incnmaster,         { .i = -1 } },
+    { MODKEY | ControlMask,                 XK_n,               incnmaster,         { .i = +1 } },
+    { MODKEY,                               XK_f,               togglefullscr,      {0} },
+    { MODKEY,                               XK_h,               setmfact,           { .f = -0.05 } },
+    { MODKEY,                               XK_l,               setmfact,           { .f = +0.05 } },
+    { MODKEY,                               XK_s,               togglesticky,       {0} },
+    { MODKEY,                               XK_space,           zoom,               {0} },
+    { MODKEY | ControlMask,                 XK_j,               setcfact,           { .f = -0.25 } },
+    { MODKEY | ControlMask,                 XK_k,               setcfact,           { .f = +0.25 } },
+    { MODKEY | ControlMask,                 XK_y,               setcfact,           { .f = 0.00 } },
+    { MODKEY | ShiftMask,                   XK_c,               incrgaps,           { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_c,               incrgaps,           { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_i,               incrigaps,          { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_i,               incrigaps,          { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_o,               incrogaps,          { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_o,               incrogaps,          { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_h,               incrihgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_h,               incrihgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_g,               incrivgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_g,               incrivgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_b,               incrohgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_b,               incrohgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_v,               incrovgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_v,               incrovgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_t,               togglegaps,         {0} },
+    { MODKEY | ControlMask,                 XK_t,               defaultgaps,        {0} },
+ 
+    /* FLOATING SIZE */
+	{ MODKEY2 | ControlMask,                XK_h,               exresize,           { .v = (int []){ -25,   0 } } },
+	{ MODKEY2 | ControlMask,                XK_l,               exresize,           { .v = (int []){  25,   0 } } },
+	{ MODKEY2 | ControlMask,                XK_j,               exresize,           { .v = (int []){   0,  25 } } },
+	{ MODKEY2 | ControlMask,                XK_k,               exresize,           { .v = (int []){   0, -25 } } },
+	{ MODKEY2 | ControlMask,                XK_comma,           exresize,           { .v = (int []){ -25, -25 } } },
+	{ MODKEY2 | ControlMask,                XK_period,          exresize,           { .v = (int []){  25,  25 } } },
+
+    /* MEDIA CONTROL */
+    { 0, XF86XK_Battery,                    spawn, SHCMD("pkill -RTMIN+3 dwmblocks") },
+    { 0, XF86XK_WWW,                        spawn, { .v = (const char *[]){ BROWSER, NULL } } },
+    { 0, XF86XK_DOS,                        spawn, { .v = termcmd } },
+    { 0, XF86XK_AudioMute,                  spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioRaiseVolume,           spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%- && wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%+; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioLowerVolume,           spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%+ && wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%-; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioPrev,                  spawn, { .v = (const char *[]){ "mpc", "prev", NULL } } },
+    { 0, XF86XK_AudioNext,                  spawn, { .v = (const char *[]){ "mpc", "next", NULL } } },
+    { 0, XF86XK_AudioPause,                 spawn, { .v = (const char *[]){ "mpc", "pause", NULL } } },
+    { 0, XF86XK_AudioPlay,                  spawn, { .v = (const char *[]){ "mpc", "play", NULL } } },
+    { 0, XF86XK_AudioStop,                  spawn, { .v = (const char *[]){ "mpc", "stop", NULL } } },
+    { 0, XF86XK_AudioRewind,                spawn, { .v = (const char *[]){ "mpc", "seek", "-10", NULL } } },
+    { 0, XF86XK_AudioForward,               spawn, { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
+    { 0, XF86XK_AudioMedia,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
+    { 0, XF86XK_AudioMicMute,               spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") },
+    { 0, XF86XK_PowerOff,                   spawn, { .v = (const char*[]){ "sysact", NULL } } },
+    { 0, XF86XK_Calculator,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "bc", "-l", NULL } } },
+    { 0, XF86XK_Sleep,                      spawn, { .v = (const char *[]){ "sudo", "-A", "zzz", NULL } } },
+    { 0, XF86XK_ScreenSaver,                spawn, SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },
+    { 0, XF86XK_TaskPane,                   spawn, { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { 0, XF86XK_Mail,                       spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks") },
+    { 0, XF86XK_MyComputer,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "lfub", "/", NULL } } },
+    { 0, XF86XK_Launch1,                    spawn, { .v = (const char *[]){ "xset", "dpms", "force", "off", NULL } } },
+    { 0, XF86XK_TouchpadToggle,             spawn, SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") },
+    { 0, XF86XK_TouchpadOff,                spawn, { .v = (const char *[]){ "synclient", "TouchpadOff=1", NULL } } },
+    { 0, XF86XK_TouchpadOn,                 spawn, { .v = (const char *[]){ "synclient", "TouchpadOff=0", NULL } } },
+    { 0, XF86XK_MonBrightnessUp,            spawn, { .v = (const char *[]){ "brillo", "-U", "5", "-q", NULL } } },
+    { 0, XF86XK_MonBrightnessDown,          spawn, { .v = (const char *[]){ "brillo", "-A", "5", "-q", NULL } } },
+
+    /* MODE */
+	{ MODKEY,                               XK_Escape,          setkeymode,         { .ui = ModeCommand } },
+
+    /* PROGRAM */
+    { MODKEY,                               XK_d,               spawn,              { .v = (const char *[]){ "dmenu_run", NULL } } },
+    { MODKEY,                               XK_e,               spawn,              SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { MODKEY,                               XK_n,               spawn,              SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+    { MODKEY,                               XK_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
+    { MODKEY | ShiftMask,                   XK_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { MODKEY,                               XK_w,               spawn,              { .v = (const char *[]){ BROWSER, NULL } } },
+    { MODKEY,                               XK_c,               togglescratch,      { .ui = 1 } }, /* calculator */
+    { MODKEY,                               XK_u,               spawn,              { .v = (const char *[]){ "dmenuunicode", NULL } } },
+    { MODKEY,                               XK_Return,          spawn,              { .v = termcmd } },
+    { MODKEY | ShiftMask,                   XK_Return,          spawn,              { .v = (const char *[]){ "sd", NULL } } },
+    { MODKEY | ControlMask,                 XK_Return,          togglescratch,      { .ui = 0 } }, /* terminal */
+
+    /* SCRIPT */
+    { MODKEY | ShiftMask,                   XK_d,               spawn,              { .v = (const char *[]){ "passmenu", NULL } } },
+    { MODKEY | ControlMask,                 XK_d,               spawn,              { .v = (const char *[]){ "passmenu2", NULL } } },
+    { MODKEY | ShiftMask,                   XK_f,               spawn,              { .v = (const char *[]){ "fecrypt", NULL } } },
+    { MODKEY,                               XK_v,               spawn,              { .v = (const char *[]){ "mpvplay", NULL } } },
+    { MODKEY,                               XK_Insert,          spawn,              SHCMD("xdotool type $(grep -v '^#' ~/.local/share/thesiah/snippets | dmenu -i -l 50 | cut -d' ' -f1)") },
+    { 0,                                    XK_Print,           spawn,              SHCMD("maim | tee ~/Pictures/screenshot-$(date '+%y%m%d-%H%M-%S').png | xclip -selection clipboard") },
+    { ShiftMask,                            XK_Print,           spawn,              { .v = (const char *[]){ "maimpick", NULL } } },
+    { MODKEY,                               XK_Print,           spawn,              { .v = (const char *[]){ "dmenurecord", NULL } } },
+    { MODKEY,                               XK_Delete,          spawn,              { .v = (const char *[]){ "dmenurecord", "kill", NULL } } },
+    { MODKEY,                               XK_Scroll_Lock,     spawn,              SHCMD("killall screenkey || screenkey -t 3 -p fixed -s small -g 20%x5%+40%-5% --key-mode keysyms --bak-mode normal --mods-mode normal -f ttf-font-awesome --opacity 0.5 &") },
+    { MODKEY,                               XK_F1,              spawn,              SHCMD("groff -mom /home/si/.local/share/man/thesiah/thesiah.mom -Tpdf | zathura -") },
+    { MODKEY | ShiftMask,                   XK_F1,              spawn,              SHCMD("nsxiv ~/Pictures/resources") },
+    { MODKEY | ControlMask,                 XK_F1,              spawn,              { .v = (const char *[]){ TERMINAL, "-e", "dman", NULL } } },
+    { MODKEY,                               XK_F2,              spawn,              { .v = (const char *[]){ "tutorialvids", NULL } } },
+    { MODKEY,                               XK_F3,              spawn,              { .v = (const char *[]){ "displayselect", NULL } } },
+    { MODKEY,                               XK_F4,              spawn,              SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") },
+    { MODKEY,                               XK_F5,              xrdb,               { .v = NULL } },
+    { MODKEY | ShiftMask,                   XK_F5,              spawn,              SHCMD("stw ~/.dotfiles/arch -d") },
+    { MODKEY | ControlMask,                 XK_F5,              spawn,              { .v = (const char *[]){ "pacupgrade", NULL } } },
+    { MODKEY,                               XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-v", NULL } } },
+    { MODKEY | ShiftMask,                   XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-m", NULL } } },
+    { MODKEY,                               XK_F7,              spawn,              { .v = (const char *[]){ "td-toggle", NULL } } },
+    { MODKEY | ShiftMask,                   XK_F7,              spawn,              { .v = (const char *[]){ "transadd", NULL } } },
+    { MODKEY,                               XK_F8,              spawn,              { .v = (const char *[]){ "mailsync", NULL } } },
+    { MODKEY,                               XK_F9,              spawn,              { .v = (const char *[]){ "mounter", NULL } } },
+    { MODKEY,                               XK_F10,             spawn,              { .v = (const char *[]){ "unmounter", NULL } } },
+    { MODKEY,                               XK_F11,             spawn,              SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls " "/dev/video[0,2,4,6,8] | tail -n 1)") },
+    { MODKEY,                               XK_F12,             spawn,              SHCMD("remaps") },
+    { MODKEY | ShiftMask,                   XK_F12,             spawn,              { .v = (const char *[]){ "fcitx5-configtool", NULL } } },
+
+    /* SYSTEM */
+    { MODKEY | ControlMask,                 XK_f,               spawn,              SHCMD("pkill -f firefox") },
+    { MODKEY | ControlMask,                 XK_k,               spawn,              SHCMD("pkill -f kakaotalk") },
+    { MODKEY,                               XK_q,               killclient,         {0} },
+    { MODKEY | ShiftMask,                   XK_q,               killclient,         { .ui = 1 } },
+    { MODKEY | ControlMask,                 XK_q,               killclient,         { .ui = 2 } },
+    { MODKEY,                               XK_BackSpace,       spawn,              { .v = (const char *[]){ "slock", NULL } } },
+    { MODKEY | ShiftMask,                   XK_BackSpace,       spawn,              { .v = (const char *[]){ "sysact", NULL } } },
+    { MODKEY,                               XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -44 $(pidof dwmblocks)") },
+    { MODKEY,                               XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ShiftMask,                   XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ShiftMask,                   XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask,                 XK_minus,           spawn,              { .v = (const char *[]){ "brillo", "-U", "5", "-q", NULL } } },
+    { MODKEY | ControlMask,                 XK_equal,           spawn,              { .v = (const char *[]){ "brillo", "-A", "5", "-q", NULL } } },
+    { 0,                                    XK_Alt_R,           spawn,              SHCMD("fcitx5-remote -t; pkill -RTMIN+29 dwmblocks") },
+	{ ControlMask,                          XK_F5,              quit,               {1} },
+    { ShiftMask | ControlMask,              XK_F5,              spawn,              SHCMD("killall -q dwmblocks; setsid -f dwmblocks") },
+
+    /* TRAVERSAL */
+    { MODKEY | ShiftMask,                   XK_0,               tag,                { .ui = ~0 } },
+	{ MODKEY2,                              XK_comma,           shiftview,          { .i = -1 } },
+	{ MODKEY2,                              XK_period,          shiftview,          { .i = 1 } },
+    { MODKEY2 | ShiftMask,                  XK_comma,           shifttag,           { .i = -1 } },
+    { MODKEY2 | ShiftMask,                  XK_period,          shifttag,           { .i = 1 } },
+	{ MODKEY,                               XK_comma,           shiftviewclients,   { .i = -1 } },
+	{ MODKEY,                               XK_period,          shiftviewclients,   { .i = +1 } },
+	{ MODKEY | ShiftMask,                   XK_comma,           shifttagclients,    { .i = -1 } },
+	{ MODKEY | ShiftMask,                   XK_period,          shifttagclients,    { .i = +1 } },
+	{ MODKEY | ControlMask,                 XK_comma,           shiftboth,          { .i = -1 } },
+	{ MODKEY | ControlMask,                 XK_period,          shiftboth,          { .i = +1 } },
+	{ MODKEY | ShiftMask | ControlMask,     XK_comma,           shiftswaptags,      { .i = -1 }	},
+	{ MODKEY | ShiftMask | ControlMask,     XK_period,          shiftswaptags,      { .i = +1 }	},
+    { MODKEY,                               XK_Left,            focusmon,           { .i = -1 } },
+    { MODKEY,                               XK_Right,           focusmon,           { .i = +1 } },
+    { MODKEY | ShiftMask,                   XK_Left,            tagmon,             { .i = -1 } },
+    { MODKEY | ShiftMask,                   XK_Right,           tagmon,             { .i = +1 } },
+    { MODKEY | ShiftMask,                   XK_Tab,             view,               {0} },
+
+    /* { MODKEY | ShiftMask,                   XK_apostrophe,      togglesmartgaps,    {0} }, */
+  
+};
+
+static Key cmdkeys[] = {
+	/* modifier                         keys                function        argument */
+	{ 0,                                XK_Escape,          clearcmd,       {0} },
+	{ ControlMask,                      XK_c,               clearcmd,       {0} },
+	{ ControlMask,                      XK_x,               setkeymode,     { .ui = ModeInsert } },
+};
+
+static Command commands[] = {
+    /* STACKKEYS */
+    CSTACKKEYS(MODKEY,               focus)
+    CSTACKKEYS(MODKEY | ShiftMask,   push)
+
+    /* TAGKEYS */
+	CTAGKEYS(XK_1, 0)
+	CTAGKEYS(XK_2, 1)
+	CTAGKEYS(XK_3, 2)
+	CTAGKEYS(XK_4, 3)
+	CTAGKEYS(XK_5, 4)
+	CTAGKEYS(XK_6, 5)
+	CTAGKEYS(XK_7, 6)
+	CTAGKEYS(XK_8, 7)
+	CTAGKEYS(XK_9, 8)
+
+    /* Modifier (4 keys)                keysyms (4 keys)            function                argument */
+    /* APPEARANCE */
+    { { ShiftMask, 0, 0, 0 },           { XK_b, 0, 0, 0 },          togglebar,              {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_b, 0, 0, 0 },          togglebar,              { .i = 1 } },
+    { { ShiftMask, 0, 0, 0 },           { XK_o, 0, 0, 0 },          toggleborder,           {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_f, 0, 0, 0 },          togglefloating,         {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_g, 0, 0, 0 },          togglegaps,             {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_g, 0, 0, 0 },          defaultgaps,            {0} },
+
+    /* LAYOUT */
+    { { 0, 0, 0, 0 },                   { XK_l, XK_t, 0, 0 },       setlayout,              { .v = &layouts[0] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_m, 0, 0 },       setlayout,              { .v = &layouts[1] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_l, 0 },    setlayout,              { .v = &layouts[2] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_s, 0, 0 },       setlayout,              { .v = &layouts[3] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_w, 0, 0 },       setlayout,              { .v = &layouts[4] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_d, 0, 0 },       setlayout,              { .v = &layouts[5] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_b, XK_e, 0 },    setlayout,              { .v = &layouts[6] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_b, XK_h, 0 },    setlayout,              { .v = &layouts[7] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_e, 0 },    setlayout,              { .v = &layouts[8] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_r, 0 },    setlayout,              { .v = &layouts[9] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_h, 0 },    setlayout,              { .v = &layouts[10] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_g, 0 },    setlayout,              { .v = &layouts[11] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_m, 0 },    setlayout,              { .v = &layouts[12] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_f, 0 },    setlayout,              { .v = &layouts[13] } },
+
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_u, 0, 0 },       explace,                { .ui = EX_NW } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_i, 0, 0 },       explace,                { .ui = EX_N } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_o, 0, 0 },       explace,                { .ui = EX_NE } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_h, 0, 0 },       explace,                { .ui = EX_W } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_k, 0, 0 },       explace,                { .ui = EX_C } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_l, 0, 0 },       explace,                { .ui = EX_E } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_m, 0, 0 },       explace,                { .ui = EX_SW } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_comma, 0, 0 },   explace,                { .ui = EX_S } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_period, 0, 0 },  explace,                { .ui = EX_SE } },
+
+    /* FLOATING SIZE */
+	{ { ControlMask, 0, 0, 0 },         { XK_j, 0, 0, 0 },          exresize,               { .v = (int []){   0,  25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_k, 0, 0, 0 },          exresize,               { .v = (int []){   0, -25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_l, 0, 0, 0 },          exresize,               { .v = (int []){  25,   0 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_h, 0, 0, 0 },          exresize,               { .v = (int []){ -25,   0 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_comma, 0, 0, 0 },      exresize,               { .v = (int []){ -25, -25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_period, 0, 0, 0 },     exresize,               { .v = (int []){  25,  25 } } },
+
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_h, 0 },    togglehorizontalexpand, { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_h, 0 },    togglehorizontalexpand, { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_h, 0 },    togglehorizontalexpand, { .i = -1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_v, 0 },    toggleverticalexpand,   { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_v, 0 },    toggleverticalexpand,   { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_v, 0 },    toggleverticalexpand,   { .i = -1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_m, 0 },    togglemaximize,         { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_m, 0 },    togglemaximize,         { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_m, 0 },    togglemaximize,         { .i = -1 } },
+
+    /* PROGRAM */
+    { { 0, 0, 0, 0 },                   { XK_a, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e abook -C ~/.abook/abookrc --datafile ~/.abook/addressbook") },
+    { { 0, 0, 0, 0 },                   { XK_e, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { { 0, 0, 0, 0 },                   { XK_g, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "gimp", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_h, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_k, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "kakaotalk", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_m, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_n, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+    { { 0, 0, 0, 0 },                   { XK_p, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "profanity", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_r, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_s, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e sc-im /home/si/.dotfiles/THESIAH/progs.csv") },
+    { { 0, 0, 0, 0 },                   { XK_t, XK_h, 0, 0 },       spawn,                  { .v = (const char *[]){ "thunderbird", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_t, XK_w, 0, 0 },       spawn,                  { .v = (const char *[]){ "torwrap", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_v, 0,    0, 0 },       spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "nvim", "-c", "VimwikiIndex", "1", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_w, XK_e, 0, 0 },       spawn,                  SHCMD(TERMINAL " -e less -Sf ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport") },
+    { { 0, 0, 0, 0 },                   { XK_w, XK_f, 0, 0 },       spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "sudo", "nmtui", NULL } } },
+};
+
+/* button definitions */
+/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+ * ClkClientWin, or ClkRootWin */
+static const Button buttons[] = {
+/*      click           event mask      button      function        argument */
+#ifndef __OpenBSD__
+    { ClkWinTitle,      0,              Button2,    zoom, {0} },
+    { ClkStatusText,    0,              Button1,    sigdwmblocks,   { .i = 1 } },
+    { ClkStatusText,    0,              Button2,    sigdwmblocks,   { .i = 2 } },
+    { ClkStatusText,    0,              Button3,    sigdwmblocks,   { .i = 3 } },
+    { ClkStatusText,    0,              Button4,    sigdwmblocks,   { .i = 4 } },
+    { ClkStatusText,    0,              Button5,    sigdwmblocks,   { .i = 5 } },
+    { ClkStatusText,    ShiftMask,      Button1,    sigdwmblocks,   { .i = 6 } },
+#endif
+    { ClkStatusText,    ShiftMask,      Button3,    spawn,          SHCMD(TERMINAL " -e nvim ~/.local/src/suckless/dwmblocks/config.h") },
+    { ClkClientWin,     MODKEY,         Button1,    movemouse,      {0} },
+    { ClkClientWin,     MODKEY,         Button2,    defaultgaps,    {0} },
+    { ClkClientWin,     MODKEY,         Button3,    resizemouse,    {0} },
+    { ClkClientWin,     MODKEY,         Button4,    incrgaps,       { .i = +1 } },
+    { ClkClientWin,     MODKEY,         Button5,    incrgaps,       { .i = -1 } },
+    { ClkTagBar,        0,              Button1,    view,           {0} },
+    { ClkTagBar,        0,              Button3,    toggleview,     {0} },
+    { ClkTagBar,        MODKEY,         Button1,    tag,            {0} },
+    { ClkTagBar,        MODKEY,         Button3,    toggletag,      {0} },
+    { ClkTagBar,        0,              Button4,    shiftview,      { .i = -1 } },
+    { ClkTagBar,        0,              Button5,    shiftview,      { .i = 1 } },
+    { ClkRootWin,       0,              Button2,    togglebar,      {0} },
+};
diff --git a/dwm/config.def.h.bak b/dwm/config.def.h.bak
new file mode 100644
index 0000000..e4ac330
--- /dev/null
+++ b/dwm/config.def.h.bak
@@ -0,0 +1,487 @@
+/* See LICENSE file for copyright and license details. */
+
+/* constants */
+#define TERMINAL "st"
+#define TERMCLASS "St"
+#define BROWSER "firefox"
+#define BROWSERCLASS "Firefox"
+#define GAP 6
+
+/* appearance */
+static unsigned int borderpx = 3;               /* border pixel of windows */
+static unsigned int snap = 32;                  /* snap pixel */
+static unsigned int gappih = GAP;               /* horiz inner gap between windows */
+static unsigned int gappiv = GAP;               /* vert inner gap between windows */
+static unsigned int gappoh = GAP;               /* horiz outer gap between windows and screen edge */
+static unsigned int gappov = GAP;               /* vert outer gap between windows and screen edge */
+static int swallowfloating = 0;                 /* 1 means swallow floating windows by default */
+static int smartgaps = 0;                       /* 1 means no outer gap when there is only one window */
+static int showbar = 1;                         /* 0 means no bar */
+static int topbar = 1;                          /* 0 means bottom bar */
+static const int vertpad = GAP;                 /* vertical padding of bar */
+static const int sidepad = GAP;                 /* horizontal padding of bar */
+static char *fonts[] = {
+    "monospace:size=10",
+    "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" };
+static char normbgcolor[] = "#222222";
+static char normbordercolor[] = "#555555";
+static char normfgcolor[] = "#bbbbbb";
+static char selfgcolor[] = "#eeeeee";
+static char selbordercolor[] = "#4CBB17";
+static char selbgcolor[] = "#005577";
+static const unsigned int baralpha = 0xd0;
+static const unsigned int borderalpha = OPAQUE;
+static char *colors[][3] = {
+    /*                      fg              bg              border  */
+    [SchemeNorm]    = { normfgcolor,     normbgcolor,    normbordercolor },
+    [SchemeSel]     = { selfgcolor,      selbgcolor,     selbordercolor },
+};
+static const unsigned int alphas[][3] = {
+    /*                  fg              bg              border  */
+    [SchemeNorm]    = { OPAQUE,      baralpha,       borderalpha },
+    [SchemeSel]     = { OPAQUE,      baralpha,       borderalpha },
+};
+
+typedef struct {
+  const char *name;
+  const void *cmd;
+} Sp;
+
+/* scratchpads */
+const char *spcmd1[] = { TERMINAL, "-n", "spterm", "-g", "120x34", NULL };
+const char *spcmd2[] = { TERMINAL, "-n",    "spcalc", "-f", "monospace:size=16",
+                        "-g",     "50x20", "-e",     "bc", "-lq", NULL };
+static Sp scratchpads[] = {
+    /* name         cmd */
+    { "spterm",     spcmd1 },
+    { "spcalc",     spcmd2 },
+};
+
+/* tagging */
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+static const Rule rules[] = {
+    /* xprop(1):
+     *	WM_CLASS(STRING) = instance, class
+     *	WM_NAME(STRING) = title
+     */
+    /* class        instance        title           tags mask       isfloating isterminal  noswallow  monitor */
+    { "Gimp",       NULL,           NULL,           1 << 8,         0,  0,  0, -1 },
+    { "kakaotalk",  NULL,           NULL,           1 << 8,         0,  0, -1, -1 },
+    { TERMCLASS,    NULL,           NULL,           0,              0,  1,  0, -1 },
+    { BROWSERCLASS, NULL,           NULL,           0,              0,  0, -1, -1 },
+    { TERMCLASS,    "floatterm",    NULL,           0,              1,  1,  0, -1 },
+    { TERMCLASS,    "bg",           NULL,           1 << 7,         0,  1,  0, -1 },
+    { TERMCLASS,    "spterm",       NULL,           SPTAG(0),       1,  1,  0, -1 },
+    { TERMCLASS,    "spcalc",       NULL,           SPTAG(1),       1,  1,  0, -1 },
+    { NULL,         NULL,           "Event Tester", 0,              0,  0,  1, -1 },
+};
+
+/* layout(s) */
+static float mfact = 0.55;              /* factor of master area size [0.05..0.95] */
+static int nmaster = 1;                 /* number of clients in master area */
+static int resizehints = 0;             /* 1 means respect size hints in tiled resizals */
+static const int lockfullscreen = 1;    /* 1 will force focus on the fullscreen window */
+
+#define FORCE_VSPLIT 1                  /* nrowgrid layout: force two clients to always split vertically */
+#include "vanitygaps.c"
+
+static const Layout layouts[] = {
+    /* symbol   arrange function */
+    { "[]=",    tile },                     /* 0: Default: Master on left, slaves on right */
+    { "[M]",    monocle },                  /* 1: All windows on top of eachother */
+	{ "|||",    col },                      /* 2: Column */
+    { "[@]",    spiral },                   /* 3: Fibonacci spiral */
+    { "[\\]",    dwindle },                 /* 4: Decreasing in size right and leftward */
+    { "H[]",    deck },                     /* 5: Master on left, slaves in monocle-like mode on right */
+    { "TTT",    bstack },                   /* 6: Master on top, slaves on bottom horizontally */
+    { "===",    bstackhoriz },              /* 7: Master on top, slaves on bottom vertically */
+    { "HHH",    grid },                     /* 8: Equal grid */
+    { "###",    nrowgrid },                 /* 9: Number of row grid */
+    { "---",    horizgrid },                /* 10: Horizontal grid */
+    { ":::",    gaplessgrid },              /* 11: Gapless grid */
+    { "|M|",    centeredmaster },           /* 12: Master in middle, slaves on sides */
+    { ">M>",    centeredfloatingmaster },   /* 13: Same but master floats */
+    { "><>",    NULL },                     /* 14: no layout function means floating behavior */
+    { NULL,     NULL },
+};
+
+/* imports */
+#include <X11/XF86keysym.h>
+#include "shift-tools-scratchpads.c"
+#include "tagandview.c"
+#include "exresize.c"
+
+/* key definitions */
+#define MODKEY Mod4Mask
+#define MODKEY2 Mod1Mask
+
+#define TAGKEYS(KEY, TAG)                                                               \
+    { MODKEY,                               KEY, view,           { .ui = 1 << TAG } },  \
+    { MODKEY | ControlMask,                 KEY, toggleview,     { .ui = 1 << TAG } },  \
+    { MODKEY | ShiftMask,                   KEY, tag,            { .ui = 1 << TAG } },  \
+    { MODKEY | ControlMask | ShiftMask,     KEY, toggletag,      { .ui = 1 << TAG } },  \
+    { MODKEY2 | ShiftMask,                  KEY, tagandview,     { .ui = 1 << TAG } },
+
+#define CTAGKEYS(KEY, TAG)                                                                      \
+	{ {0,0,0,0},                            {KEY,0,0,0}, view,          { .ui = 1 << TAG} },    \
+	{ {ControlMask,0,0,0},                  {KEY,0,0,0}, toggleview,    { .ui = 1 << TAG} },    \
+	{ {ShiftMask,0,0,0},                    {KEY,0,0,0}, tag,           { .ui = 1 << TAG} },    \
+	{ {ControlMask|ShiftMask,0,0,0},        {KEY,0,0,0}, toggletag,     { .ui = 1 << TAG} },
+
+#define STACKKEYS(MOD, ACTION)                              \
+    { MOD,  XK_j,   ACTION##stack,  { .i = INC(+1) } },     \
+    { MOD,  XK_k,   ACTION##stack,  { .i = INC(-1) } },     \
+    { MOD,  XK_Tab, ACTION##stack,  { .i = PREVSEL } },     \
+    { MOD,  XK_x,   ACTION##stack,  { .i = 0 } },           \
+    { MOD,  XK_a,   ACTION##stack,  { .i = 1 } },           \
+    { MOD,  XK_s,   ACTION##stack,  { .i = 2 } },           \
+    { MOD,  XK_z,   ACTION##stack,  { .i = -1 } },
+
+#define CSTACKKEYS(MOD, ACTION)                                             \
+    { {MOD,0,0,0},  {XK_j, 0,0,0},  ACTION##stack,  { .i = INC(+1) } },     \
+    { {MOD,0,0,0},  {XK_k, 0,0,0},  ACTION##stack,  { .i = INC(-1) } },     \
+    { {MOD,0,0,0},  {XK_Tab,0,0,0}, ACTION##stack,  { .i = PREVSEL } },     \
+    { {MOD,0,0,0},  {XK_x, 0,0,0},  ACTION##stack,  { .i = 0 } },           \
+    { {MOD,0,0,0},  {XK_a, 0,0,0},  ACTION##stack,  { .i = 1 } },           \
+    { {MOD,0,0,0},  {XK_s, 0,0,0},  ACTION##stack,  { .i = 2 } },           \
+    { {MOD,0,0,0},  {XK_z, 0,0,0},  ACTION##stack,  { .i = -1 } },
+
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
+#define SHCMD(cmd) { .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } }
+
+/* commands */
+// static const char *dmenucmd[] = { "dmenu_run",    "-fn", dmenufont,   "-nb",
+//                                  normbgcolor,    "-nf", normfgcolor, "-sb",
+//                                  selbordercolor, "-sf", selfgcolor,  NULL };
+static const char *termcmd[] = { TERMINAL, NULL };
+
+/* Xresources preferences to load at startup */
+ResourcePref resources[] = {
+    { "color0", STRING, &normbordercolor },
+    { "color8", STRING, &selbordercolor },
+    { "color0", STRING, &normbgcolor },
+    { "color4", STRING, &normfgcolor },
+    { "color0", STRING, &selfgcolor },
+    { "color4", STRING, &selbgcolor },
+    { "borderpx", INTEGER, &borderpx },
+    { "snap", INTEGER, &snap },
+    { "showbar", INTEGER, &showbar },
+    { "topbar", INTEGER, &topbar },
+    { "nmaster", INTEGER, &nmaster },
+    { "resizehints", INTEGER, &resizehints },
+    { "mfact", FLOAT, &mfact },
+    { "gappih", INTEGER, &gappih },
+    { "gappiv", INTEGER, &gappiv },
+    { "gappoh", INTEGER, &gappoh },
+    { "gappov", INTEGER, &gappov },
+    { "swallowfloating", INTEGER, &swallowfloating },
+    { "smartgaps", INTEGER, &smartgaps },
+};
+
+static const Key keys[] = {
+    /* STACKKEYS */
+    STACKKEYS(MODKEY,               focus)
+    STACKKEYS(MODKEY | ShiftMask,   push)
+
+    /* TAGKEYS */
+    TAGKEYS(XK_1, 0)
+    TAGKEYS(XK_2, 1)
+    TAGKEYS(XK_3, 2)
+    TAGKEYS(XK_4, 3)
+    TAGKEYS(XK_5, 4)
+    TAGKEYS(XK_6, 5)
+    TAGKEYS(XK_7, 6)
+    TAGKEYS(XK_8, 7)
+    TAGKEYS(XK_9, 8)
+
+    /* modifier                             key                 function            argument */
+    /* AUDIO CONTROL */
+    { MODKEY,                               XK_m,               spawn,              SHCMD("mpc random on; mpc load entire; mpc play; pkill -RTMIN+11 dwmblocks") },
+    { MODKEY | ShiftMask,                   XK_m,               spawn,              { .v = (const char *[]){ "playlists", NULL } } },
+    { MODKEY | ControlMask,                 XK_m,               spawn,              { .v = (const char *[]){ "mpdmenu", NULL } } },
+    { MODKEY,                               XK_p,               spawn,              { .v = (const char *[]){ "mpc", "toggle", NULL } } },
+    { MODKEY | ShiftMask,                   XK_p,               spawn,              SHCMD("mpc pause; pauseallmpv") },
+    { MODKEY | ControlMask,                 XK_p,               spawn,              SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask,                 XK_s,               spawn,              SHCMD("mpc stop; pkill -RTMIN+11 dwmblocks") },
+    { MODKEY,                               XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "prev", NULL } } },
+    { MODKEY,                               XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "next", NULL } } },
+    { MODKEY | ShiftMask,                   XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "-10", NULL } } },
+    { MODKEY | ShiftMask,                   XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
+    { MODKEY | ControlMask,                 XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "-60", NULL } } },
+    { MODKEY | ControlMask,                 XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "seek", "+60", NULL } } },
+    { MODKEY | ShiftMask | ControlMask,     XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "0%", NULL } } },
+    { MODKEY | ShiftMask | ControlMask,     XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "repeat", NULL } } },
+    { MODKEY ,                              XK_backslash,       spawn,              { .v = (const char *[]){ "mpc", "single", NULL } } },
+    { MODKEY | ShiftMask,                   XK_backslash,       spawn,              { .v = (const char *[]){ "mpc", "random", NULL } } },
+    { MODKEY | ControlMask,                 XK_backslash,       spawn,              SHCMD("mpc repeat off; mpc random off; mpc single off; pkill -RTMIN+11 dwmblocks") },
+
+    /* LAYOUT SIZE */
+    { MODKEY | ShiftMask,                   XK_n,               incnmaster,         { .i = -1 } },
+    { MODKEY | ControlMask,                 XK_n,               incnmaster,         { .i = +1 } },
+    { MODKEY,                               XK_f,               togglefullscr,      {0} },
+    { MODKEY,                               XK_h,               setmfact,           { .f = -0.05 } },
+    { MODKEY,                               XK_l,               setmfact,           { .f = +0.05 } },
+    { MODKEY,                               XK_s,               togglesticky,       {0} },
+    { MODKEY,                               XK_space,           zoom,               {0} },
+    { MODKEY | ControlMask,                 XK_j,               setcfact,           { .f = -0.25 } },
+    { MODKEY | ControlMask,                 XK_k,               setcfact,           { .f = +0.25 } },
+    { MODKEY | ControlMask,                 XK_y,               setcfact,           { .f = 0.00 } },
+    { MODKEY | ShiftMask,                   XK_c,               incrgaps,           { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_c,               incrgaps,           { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_i,               incrigaps,          { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_i,               incrigaps,          { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_o,               incrogaps,          { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_o,               incrogaps,          { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_h,               incrihgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_h,               incrihgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_g,               incrivgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_g,               incrivgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_b,               incrohgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_b,               incrohgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_v,               incrovgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_v,               incrovgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_t,               togglegaps,         {0} },
+    { MODKEY | ControlMask,                 XK_t,               defaultgaps,        {0} },
+ 
+    /* FLOATING SIZE */
+	{ MODKEY2 | ControlMask,                XK_h,               exresize,           { .v = (int []){ -25,   0 } } },
+	{ MODKEY2 | ControlMask,                XK_l,               exresize,           { .v = (int []){  25,   0 } } },
+	{ MODKEY2 | ControlMask,                XK_j,               exresize,           { .v = (int []){   0,  25 } } },
+	{ MODKEY2 | ControlMask,                XK_k,               exresize,           { .v = (int []){   0, -25 } } },
+	{ MODKEY2 | ControlMask,                XK_comma,           exresize,           { .v = (int []){ -25, -25 } } },
+	{ MODKEY2 | ControlMask,                XK_period,          exresize,           { .v = (int []){  25,  25 } } },
+
+    /* MEDIA CONTROL */
+    { 0, XF86XK_Battery,                    spawn, SHCMD("pkill -RTMIN+3 dwmblocks") },
+    { 0, XF86XK_WWW,                        spawn, { .v = (const char *[]){ BROWSER, NULL } } },
+    { 0, XF86XK_DOS,                        spawn, { .v = termcmd } },
+    { 0, XF86XK_AudioMute,                  spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioRaiseVolume,           spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%- && wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%+; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioLowerVolume,           spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%+ && wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%-; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioPrev,                  spawn, { .v = (const char *[]){ "mpc", "prev", NULL } } },
+    { 0, XF86XK_AudioNext,                  spawn, { .v = (const char *[]){ "mpc", "next", NULL } } },
+    { 0, XF86XK_AudioPause,                 spawn, { .v = (const char *[]){ "mpc", "pause", NULL } } },
+    { 0, XF86XK_AudioPlay,                  spawn, { .v = (const char *[]){ "mpc", "play", NULL } } },
+    { 0, XF86XK_AudioStop,                  spawn, { .v = (const char *[]){ "mpc", "stop", NULL } } },
+    { 0, XF86XK_AudioRewind,                spawn, { .v = (const char *[]){ "mpc", "seek", "-10", NULL } } },
+    { 0, XF86XK_AudioForward,               spawn, { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
+    { 0, XF86XK_AudioMedia,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
+    { 0, XF86XK_AudioMicMute,               spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") },
+    { 0, XF86XK_PowerOff,                   spawn, { .v = (const char*[]){ "sysact", NULL } } },
+    { 0, XF86XK_Calculator,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "bc", "-l", NULL } } },
+    { 0, XF86XK_Sleep,                      spawn, { .v = (const char *[]){ "sudo", "-A", "zzz", NULL } } },
+    { 0, XF86XK_ScreenSaver,                spawn, SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },
+    { 0, XF86XK_TaskPane,                   spawn, { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { 0, XF86XK_Mail,                       spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks") },
+    { 0, XF86XK_MyComputer,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "lfub", "/", NULL } } },
+    { 0, XF86XK_Launch1,                    spawn, { .v = (const char *[]){ "xset", "dpms", "force", "off", NULL } } },
+    { 0, XF86XK_TouchpadToggle,             spawn, SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") },
+    { 0, XF86XK_TouchpadOff,                spawn, { .v = (const char *[]){ "synclient", "TouchpadOff=1", NULL } } },
+    { 0, XF86XK_TouchpadOn,                 spawn, { .v = (const char *[]){ "synclient", "TouchpadOff=0", NULL } } },
+    { 0, XF86XK_MonBrightnessUp,            spawn, { .v = (const char *[]){ "brillo", "-U", "5", "-q", NULL } } },
+    { 0, XF86XK_MonBrightnessDown,          spawn, { .v = (const char *[]){ "brillo", "-A", "5", "-q", NULL } } },
+
+    /* MODE */
+	{ MODKEY,                               XK_Escape,          setkeymode,         { .ui = ModeCommand } },
+
+    /* PROGRAM */
+    { MODKEY,                               XK_d,               spawn,              { .v = (const char *[]){ "dmenu_run", NULL } } },
+    { MODKEY,                               XK_e,               spawn,              SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { MODKEY,                               XK_n,               spawn,              SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+    { MODKEY,                               XK_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
+    { MODKEY | ShiftMask,                   XK_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { MODKEY,                               XK_w,               spawn,              { .v = (const char *[]){ BROWSER, NULL } } },
+    { MODKEY,                               XK_c,               togglescratch,      { .ui = 1 } }, /* calculator */
+    { MODKEY,                               XK_u,               spawn,              { .v = (const char *[]){ "dmenuunicode", NULL } } },
+    { MODKEY,                               XK_Return,          spawn,              { .v = termcmd } },
+    { MODKEY | ShiftMask,                   XK_Return,          spawn,              { .v = (const char *[]){ "sd", NULL } } },
+    { MODKEY | ControlMask,                 XK_Return,          togglescratch,      { .ui = 0 } }, /* terminal */
+
+    /* SCRIPT */
+    { MODKEY | ShiftMask,                   XK_d,               spawn,              { .v = (const char *[]){ "passmenu", NULL } } },
+    { MODKEY | ControlMask,                 XK_d,               spawn,              { .v = (const char *[]){ "passmenu2", NULL } } },
+    { MODKEY | ShiftMask,                   XK_f,               spawn,              { .v = (const char *[]){ "fecrypt", NULL } } },
+    { MODKEY,                               XK_v,               spawn,              { .v = (const char *[]){ "mpvplay", NULL } } },
+    { MODKEY,                               XK_Insert,          spawn,              SHCMD("xdotool type $(grep -v '^#' ~/.local/share/thesiah/snippets | dmenu -i -l 50 | cut -d' ' -f1)") },
+    { 0,                                    XK_Print,           spawn,              SHCMD("maim | tee ~/Pictures/screenshot-$(date '+%y%m%d-%H%M-%S').png | xclip -selection clipboard") },
+    { ShiftMask,                            XK_Print,           spawn,              { .v = (const char *[]){ "maimpick", NULL } } },
+    { MODKEY,                               XK_Print,           spawn,              { .v = (const char *[]){ "dmenurecord", NULL } } },
+    { MODKEY,                               XK_Delete,          spawn,              { .v = (const char *[]){ "dmenurecord", "kill", NULL } } },
+    { MODKEY,                               XK_Scroll_Lock,     spawn,              SHCMD("killall screenkey || screenkey -t 3 -p fixed -s small -g 20%x5%+40%-5% --key-mode keysyms --bak-mode normal --mods-mode normal -f ttf-font-awesome --opacity 0.5 &") },
+    { MODKEY,                               XK_F1,              spawn,              SHCMD("groff -mom /home/si/.local/share/man/thesiah/thesiah.mom -Tpdf | zathura -") },
+    { MODKEY | ShiftMask,                   XK_F1,              spawn,              SHCMD("nsxiv ~/Pictures/resources") },
+    { MODKEY | ControlMask,                 XK_F1,              spawn,              { .v = (const char *[]){ TERMINAL, "-e", "dman", NULL } } },
+    { MODKEY,                               XK_F2,              spawn,              { .v = (const char *[]){ "tutorialvids", NULL } } },
+    { MODKEY,                               XK_F3,              spawn,              { .v = (const char *[]){ "displayselect", NULL } } },
+    { MODKEY,                               XK_F4,              spawn,              SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") },
+    { MODKEY,                               XK_F5,              xrdb,               { .v = NULL } },
+    { MODKEY | ShiftMask,                   XK_F5,              spawn,              SHCMD("stw ~/.dotfiles/arch -d") },
+    { MODKEY | ControlMask,                 XK_F5,              spawn,              { .v = (const char *[]){ "pacupgrade", NULL } } },
+    { MODKEY,                               XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-v", NULL } } },
+    { MODKEY | ShiftMask,                   XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-m", NULL } } },
+    { MODKEY,                               XK_F7,              spawn,              { .v = (const char *[]){ "td-toggle", NULL } } },
+    { MODKEY | ShiftMask,                   XK_F7,              spawn,              { .v = (const char *[]){ "transadd", NULL } } },
+    { MODKEY,                               XK_F8,              spawn,              { .v = (const char *[]){ "mailsync", NULL } } },
+    { MODKEY,                               XK_F9,              spawn,              { .v = (const char *[]){ "mounter", NULL } } },
+    { MODKEY,                               XK_F10,             spawn,              { .v = (const char *[]){ "unmounter", NULL } } },
+    { MODKEY,                               XK_F11,             spawn,              SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls " "/dev/video[0,2,4,6,8] | tail -n 1)") },
+    { MODKEY,                               XK_F12,             spawn,              SHCMD("remaps") },
+    { MODKEY | ShiftMask,                   XK_F12,             spawn,              { .v = (const char *[]){ "fcitx5-configtool", NULL } } },
+
+    /* SYSTEM */
+    { MODKEY | ControlMask,                 XK_f,               spawn,              SHCMD("pkill -f firefox") },
+    { MODKEY | ControlMask,                 XK_k,               spawn,              SHCMD("pkill -f kakaotalk") },
+    { MODKEY,                               XK_q,               killclient,         {0} },
+    { MODKEY | ShiftMask,                   XK_q,               killclient,         { .ui = 1 } },
+    { MODKEY | ControlMask,                 XK_q,               killclient,         { .ui = 2 } },
+    { MODKEY,                               XK_BackSpace,       spawn,              { .v = (const char *[]){ "slock", NULL } } },
+    { MODKEY | ShiftMask,                   XK_BackSpace,       spawn,              { .v = (const char *[]){ "sysact", NULL } } },
+    { MODKEY,                               XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -44 $(pidof dwmblocks)") },
+    { MODKEY,                               XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ShiftMask,                   XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ShiftMask,                   XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask,                 XK_minus,           spawn,              { .v = (const char *[]){ "brillo", "-U", "5", "-q", NULL } } },
+    { MODKEY | ControlMask,                 XK_equal,           spawn,              { .v = (const char *[]){ "brillo", "-A", "5", "-q", NULL } } },
+    { 0,                                    XK_Alt_R,           spawn,              SHCMD("fcitx5-remote -t; pkill -RTMIN+29 dwmblocks") },
+	{ ControlMask,                          XK_F5,              quit,               {1} },
+    { ShiftMask | ControlMask,              XK_F5,              spawn,              SHCMD("killall -q dwmblocks; setsid -f dwmblocks") },
+
+    /* TRAVERSAL */
+    { MODKEY | ShiftMask,                   XK_0,               tag,                { .ui = ~0 } },
+	{ MODKEY2,                              XK_comma,           shiftview,          { .i = -1 } },
+	{ MODKEY2,                              XK_period,          shiftview,          { .i = 1 } },
+    { MODKEY2 | ShiftMask,                  XK_comma,           shifttag,           { .i = -1 } },
+    { MODKEY2 | ShiftMask,                  XK_period,          shifttag,           { .i = 1 } },
+	{ MODKEY,                               XK_comma,           shiftviewclients,   { .i = -1 } },
+	{ MODKEY,                               XK_period,          shiftviewclients,   { .i = +1 } },
+	{ MODKEY | ShiftMask,                   XK_comma,           shifttagclients,    { .i = -1 } },
+	{ MODKEY | ShiftMask,                   XK_period,          shifttagclients,    { .i = +1 } },
+	{ MODKEY | ControlMask,                 XK_comma,           shiftboth,          { .i = -1 } },
+	{ MODKEY | ControlMask,                 XK_period,          shiftboth,          { .i = +1 } },
+	{ MODKEY | ShiftMask | ControlMask,     XK_comma,           shiftswaptags,      { .i = -1 }	},
+	{ MODKEY | ShiftMask | ControlMask,     XK_period,          shiftswaptags,      { .i = +1 }	},
+    { MODKEY,                               XK_Left,            focusmon,           { .i = -1 } },
+    { MODKEY,                               XK_Right,           focusmon,           { .i = +1 } },
+    { MODKEY | ShiftMask,                   XK_Left,            tagmon,             { .i = -1 } },
+    { MODKEY | ShiftMask,                   XK_Right,           tagmon,             { .i = +1 } },
+    { MODKEY | ShiftMask,                   XK_Tab,             view,               {0} },
+
+    /* { MODKEY | ShiftMask,                   XK_apostrophe,      togglesmartgaps,    {0} }, */
+  
+};
+
+static Key cmdkeys[] = {
+	/* modifier                         keys                function        argument */
+	{ 0,                                XK_Escape,          clearcmd,       {0} },
+	{ ControlMask,                      XK_c,               clearcmd,       {0} },
+	{ ControlMask,                      XK_x,               setkeymode,     { .ui = ModeInsert } },
+};
+
+static Command commands[] = {
+    /* STACKKEYS */
+    CSTACKKEYS(MODKEY,               focus)
+    CSTACKKEYS(MODKEY | ShiftMask,   push)
+
+    /* TAGKEYS */
+	CTAGKEYS(XK_1, 0)
+	CTAGKEYS(XK_2, 1)
+	CTAGKEYS(XK_3, 2)
+	CTAGKEYS(XK_4, 3)
+	CTAGKEYS(XK_5, 4)
+	CTAGKEYS(XK_6, 5)
+	CTAGKEYS(XK_7, 6)
+	CTAGKEYS(XK_8, 7)
+	CTAGKEYS(XK_9, 8)
+
+    /* Modifier (4 keys)                keysyms (4 keys)            function                argument */
+    /* APPEARANCE */
+    { { ShiftMask, 0, 0, 0 },           { XK_b, 0, 0, 0 },          togglebar,              {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_b, 0, 0, 0 },          togglebar,              { .i = 1 } },
+    { { ShiftMask, 0, 0, 0 },           { XK_o, 0, 0, 0 },          toggleborder,           {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_f, 0, 0, 0 },          togglefloating,         {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_g, 0, 0, 0 },          togglegaps,             {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_g, 0, 0, 0 },          defaultgaps,            {0} },
+
+    /* LAYOUT */
+    { { 0, 0, 0, 0 },                   { XK_l, XK_t, 0, 0 },       setlayout,              { .v = &layouts[0] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_m, 0, 0 },       setlayout,              { .v = &layouts[1] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_l, 0 },    setlayout,              { .v = &layouts[2] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_s, 0, 0 },       setlayout,              { .v = &layouts[3] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_w, 0, 0 },       setlayout,              { .v = &layouts[4] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_d, 0, 0 },       setlayout,              { .v = &layouts[5] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_b, XK_e, 0 },    setlayout,              { .v = &layouts[6] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_b, XK_h, 0 },    setlayout,              { .v = &layouts[7] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_e, 0 },    setlayout,              { .v = &layouts[8] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_r, 0 },    setlayout,              { .v = &layouts[9] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_h, 0 },    setlayout,              { .v = &layouts[10] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_g, 0 },    setlayout,              { .v = &layouts[11] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_m, 0 },    setlayout,              { .v = &layouts[12] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_f, 0 },    setlayout,              { .v = &layouts[13] } },
+
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_u, 0, 0 },       explace,                { .ui = EX_NW } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_i, 0, 0 },       explace,                { .ui = EX_N } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_o, 0, 0 },       explace,                { .ui = EX_NE } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_h, 0, 0 },       explace,                { .ui = EX_W } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_k, 0, 0 },       explace,                { .ui = EX_C } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_l, 0, 0 },       explace,                { .ui = EX_E } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_m, 0, 0 },       explace,                { .ui = EX_SW } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_comma, 0, 0 },   explace,                { .ui = EX_S } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_period, 0, 0 },  explace,                { .ui = EX_SE } },
+
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_h, 0 },    togglehorizontalexpand, { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_h, 0 },    togglehorizontalexpand, { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_h, 0 },    togglehorizontalexpand, { .i = -1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_v, 0 },    toggleverticalexpand,   { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_v, 0 },    toggleverticalexpand,   { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_v, 0 },    toggleverticalexpand,   { .i = -1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_m, 0 },    togglemaximize,         { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_m, 0 },    togglemaximize,         { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_m, 0 },    togglemaximize,         { .i = -1 } },
+
+    /* PROGRAM */
+    { { 0, 0, 0, 0 },                   { XK_a, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e abook -C ~/.abook/abookrc --datafile ~/.abook/addressbook") },
+    { { 0, 0, 0, 0 },                   { XK_e, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { { 0, 0, 0, 0 },                   { XK_g, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "gimp", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_h, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_k, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "kakaotalk", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_m, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_n, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+    { { 0, 0, 0, 0 },                   { XK_p, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "profanity", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_r, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_s, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e sc-im /home/si/.dotfiles/THESIAH/progs.csv") },
+    { { 0, 0, 0, 0 },                   { XK_t, XK_h, 0, 0 },       spawn,                  { .v = (const char *[]){ "thunderbird", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_t, XK_w, 0, 0 },       spawn,                  { .v = (const char *[]){ "torwrap", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_v, 0,    0, 0 },       spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "nvim", "-c", "VimwikiIndex", "1", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_w, XK_e, 0, 0 },       spawn,                  SHCMD(TERMINAL " -e less -Sf ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport") },
+    { { 0, 0, 0, 0 },                   { XK_w, XK_f, 0, 0 },       spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "sudo", "nmtui", NULL } } },
+};
+
+/* button definitions */
+/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+ * ClkClientWin, or ClkRootWin */
+static const Button buttons[] = {
+/*      click           event mask      button      function        argument */
+#ifndef __OpenBSD__
+    { ClkWinTitle,      0,              Button2,    zoom, {0} },
+    { ClkStatusText,    0,              Button1,    sigdwmblocks,   { .i = 1 } },
+    { ClkStatusText,    0,              Button2,    sigdwmblocks,   { .i = 2 } },
+    { ClkStatusText,    0,              Button3,    sigdwmblocks,   { .i = 3 } },
+    { ClkStatusText,    0,              Button4,    sigdwmblocks,   { .i = 4 } },
+    { ClkStatusText,    0,              Button5,    sigdwmblocks,   { .i = 5 } },
+    { ClkStatusText,    ShiftMask,      Button1,    sigdwmblocks,   { .i = 6 } },
+#endif
+    { ClkStatusText,    ShiftMask,      Button3,    spawn,          SHCMD(TERMINAL " -e nvim ~/.local/src/suckless/dwmblocks/config.h") },
+    { ClkClientWin,     MODKEY,         Button1,    movemouse,      {0} },
+    { ClkClientWin,     MODKEY,         Button2,    defaultgaps,    {0} },
+    { ClkClientWin,     MODKEY,         Button3,    resizemouse,    {0} },
+    { ClkClientWin,     MODKEY,         Button4,    incrgaps,       { .i = +1 } },
+    { ClkClientWin,     MODKEY,         Button5,    incrgaps,       { .i = -1 } },
+    { ClkTagBar,        0,              Button1,    view,           {0} },
+    { ClkTagBar,        0,              Button3,    toggleview,     {0} },
+    { ClkTagBar,        MODKEY,         Button1,    tag,            {0} },
+    { ClkTagBar,        MODKEY,         Button3,    toggletag,      {0} },
+    { ClkTagBar,        0,              Button4,    shiftview,      { .i = -1 } },
+    { ClkTagBar,        0,              Button5,    shiftview,      { .i = 1 } },
+    { ClkRootWin,       0,              Button2,    togglebar,      {0} },
+};
diff --git a/dwm/config.h b/dwm/config.h
index 9bc71a8..dec3915 100755..100644
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -1,545 +1,495 @@
 /* See LICENSE file for copyright and license details. */
 
-/* Constants */
+/* constants */
 #define TERMINAL "st"
 #define TERMCLASS "St"
 #define BROWSER "firefox"
+#define BROWSERCLASS "Firefox"
+#define GAP 6
 
 /* appearance */
-static unsigned int borderpx = 3; /* border pixel of windows */
-static unsigned int snap = 32;    /* snap pixel */
-static unsigned int gappih = 8;   /* horiz inner gap between windows */
-static unsigned int gappiv = 8;   /* vert inner gap between windows */
-static unsigned int gappoh =
-    8; /* horiz outer gap between windows and screen edge */
-static unsigned int gappov =
-    8; /* vert outer gap between windows and screen edge */
-static int swallowfloating =
-    0; /* 1 means swallow floating windows by default */
-static int smartgaps =
-    0;                  /* 1 means no outer gap when there is only one window */
-static int showbar = 1; /* 0 means no bar */
-static int topbar = 1;  /* 0 means bottom bar */
+static unsigned int borderpx = 3;               /* border pixel of windows */
+static unsigned int snap = 32;                  /* snap pixel */
+static unsigned int gappih = GAP;               /* horiz inner gap between windows */
+static unsigned int gappiv = GAP;               /* vert inner gap between windows */
+static unsigned int gappoh = GAP;               /* horiz outer gap between windows and screen edge */
+static unsigned int gappov = GAP;               /* vert outer gap between windows and screen edge */
+static int swallowfloating = 0;                 /* 1 means swallow floating windows by default */
+static int smartgaps = 0;                       /* 1 means no outer gap when there is only one window */
+static int showbar = 1;                         /* 0 means no bar */
+static int topbar = 1;                          /* 0 means bottom bar */
+static const int vertpad = GAP;                 /* vertical padding of bar */
+static const int sidepad = GAP;                 /* horizontal padding of bar */
 static char *fonts[] = {
     "monospace:size=10",
-    "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true"};
+    "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" };
 static char normbgcolor[] = "#222222";
-static char normbordercolor[] = "#444444";
+static char normbordercolor[] = "#555555";
 static char normfgcolor[] = "#bbbbbb";
 static char selfgcolor[] = "#eeeeee";
 static char selbordercolor[] = "#4CBB17";
-// static char selbordercolor[] = "#770000";
 static char selbgcolor[] = "#005577";
+static const unsigned int baralpha = 0xd0;
+static const unsigned int borderalpha = OPAQUE;
 static char *colors[][3] = {
-    /*               fg           bg           border   */
-    [SchemeNorm] = {normfgcolor, normbgcolor, normbordercolor},
-    [SchemeSel] = {selfgcolor, selbgcolor, selbordercolor},
+    /*                      fg              bg              border  */
+    [SchemeNorm]    = { normfgcolor,     normbgcolor,    normbordercolor },
+    [SchemeSel]     = { selfgcolor,      selbgcolor,     selbordercolor },
+};
+static const unsigned int alphas[][3] = {
+    /*                  fg              bg              border  */
+    [SchemeNorm]    = { OPAQUE,      baralpha,       borderalpha },
+    [SchemeSel]     = { OPAQUE,      baralpha,       borderalpha },
 };
 
 typedef struct {
   const char *name;
   const void *cmd;
 } Sp;
-const char *spcmd1[] = {TERMINAL, "-n", "spterm", "-g", "120x34", NULL};
-const char *spcmd2[] = {TERMINAL, "-n",    "spcalc", "-f", "monospace:size=16",
-                        "-g",     "50x20", "-e",     "bc", "-lq",
-                        NULL};
+
+/* scratchpads */
+const char *spcmd1[] = { TERMINAL, "-n", "spterm", "-g", "120x34", NULL };
+const char *spcmd2[] = { TERMINAL, "-n",    "spcalc", "-f", "monospace:size=16",
+                        "-g",     "50x20", "-e",     "bc", "-lq", NULL };
 static Sp scratchpads[] = {
-    /* name          cmd  */
-    {"spterm", spcmd1},
-    {"spcalc", spcmd2},
+    /* name         cmd */
+    { "spterm",     spcmd1 },
+    { "spcalc",     spcmd2 },
 };
 
 /* tagging */
-static const char *tags[] = {"1", "2", "3", "4", "5", "6", "7", "8", "9"};
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 static const Rule rules[] = {
     /* xprop(1):
      *	WM_CLASS(STRING) = instance, class
      *	WM_NAME(STRING) = title
      */
-    /* class    instance      title       	 tags mask    isfloating
-       isterminal  noswallow  monitor */
-    {"Gimp", NULL, NULL, 1 << 8, 0, 0, 0, -1},
-    {TERMCLASS, NULL, NULL, 0, 0, 1, 0, -1},
-    {NULL, NULL, "Event Tester", 0, 0, 0, 1, -1},
-    {TERMCLASS, "floatterm", NULL, 0, 1, 1, 0, -1},
-    {TERMCLASS, "bg", NULL, 1 << 7, 0, 1, 0, -1},
-    {TERMCLASS, "spterm", NULL, SPTAG(0), 1, 1, 0, -1},
-    {TERMCLASS, "spcalc", NULL, SPTAG(1), 1, 1, 0, -1},
+    /* class        instance        title           tags mask       isfloating isterminal  noswallow  monitor */
+    { "Gimp",       NULL,           NULL,           1 << 8,         0,  0,  0, -1 },
+    { "kakaotalk",  NULL,           NULL,           1 << 8,         0,  0, -1, -1 },
+    { TERMCLASS,    NULL,           NULL,           0,              0,  1,  0, -1 },
+    { BROWSERCLASS, NULL,           NULL,           0,              0,  0, -1, -1 },
+    { TERMCLASS,    "floatterm",    NULL,           0,              1,  1,  0, -1 },
+    { TERMCLASS,    "bg",           NULL,           1 << 7,         0,  1,  0, -1 },
+    { TERMCLASS,    "spterm",       NULL,           SPTAG(0),       1,  1,  0, -1 },
+    { TERMCLASS,    "spcalc",       NULL,           SPTAG(1),       1,  1,  0, -1 },
+    { NULL,         NULL,           "Event Tester", 0,              0,  0,  1, -1 },
 };
 
 /* layout(s) */
-static float mfact = 0.55;  /* factor of master area size [0.05..0.95] */
-static int nmaster = 1;     /* number of clients in master area */
-static int resizehints = 0; /* 1 means respect size hints in tiled resizals */
-static const int lockfullscreen =
-    1; /* 1 will force focus on the fullscreen window */
-#define FORCE_VSPLIT                                                           \
-  1 /* nrowgrid layout: force two clients to always split vertically */
+static float mfact = 0.55;              /* factor of master area size [0.05..0.95] */
+static int nmaster = 1;                 /* number of clients in master area */
+static int resizehints = 0;             /* 1 means respect size hints in tiled resizals */
+static const int lockfullscreen = 1;    /* 1 will force focus on the fullscreen window */
+
+#define FORCE_VSPLIT 1                  /* nrowgrid layout: force two clients to always split vertically */
 #include "vanitygaps.c"
+
 static const Layout layouts[] = {
-    /* symbol     arrange function */
-    {"[]=", tile},   /* Default: Master on left, slaves on right */
-    {"TTT", bstack}, /* Master on top, slaves on bottom */
+    /* symbol   arrange function */
+    { "[]=",    tile },                     /* 0: Default: Master on left, slaves on right */
+    { "[M]",    monocle },                  /* 1: All windows on top of eachother */
+	{ "|||",    col },                      /* 2: Column */
+    { "[@]",    spiral },                   /* 3: Fibonacci spiral */
+    { "[\\]",    dwindle },                 /* 4: Decreasing in size right and leftward */
+    { "H[]",    deck },                     /* 5: Master on left, slaves in monocle-like mode on right */
+    { "TTT",    bstack },                   /* 6: Master on top, slaves on bottom horizontally */
+    { "===",    bstackhoriz },              /* 7: Master on top, slaves on bottom vertically */
+    { "HHH",    grid },                     /* 8: Equal grid */
+    { "###",    nrowgrid },                 /* 9: Number of row grid */
+    { "---",    horizgrid },                /* 10: Horizontal grid */
+    { ":::",    gaplessgrid },              /* 11: Gapless grid */
+    { "|M|",    centeredmaster },           /* 12: Master in middle, slaves on sides */
+    { ">M>",    centeredfloatingmaster },   /* 13: Same but master floats */
+    { "><>",    NULL },                     /* 14: no layout function means floating behavior */
+    { NULL,     NULL },
+};
 
-    {"[@]", spiral},   /* Fibonacci spiral */
-    {"[\\]", dwindle}, /* Decreasing in size right and leftward */
+/* imports */
+#include <X11/XF86keysym.h>
+#include "shift-tools-scratchpads.c"
+#include "tagandview.c"
+#include "exresize.c"
 
-    {"[D]", deck},    /* Master on left, slaves in monocle-like mode on right */
-    {"[M]", monocle}, /* All windows on top of eachother */
+/* key definitions */
+#define MODKEY Mod4Mask
+#define MODKEY2 Mod1Mask
 
-    {"|M|", centeredmaster},         /* Master in middle, slaves on sides */
-    {">M>", centeredfloatingmaster}, /* Same but master floats */
+#define TAGKEYS(KEY, TAG)                                                               \
+    { MODKEY,                               KEY, view,           { .ui = 1 << TAG } },  \
+    { MODKEY | ControlMask,                 KEY, toggleview,     { .ui = 1 << TAG } },  \
+    { MODKEY | ShiftMask,                   KEY, tag,            { .ui = 1 << TAG } },  \
+    { MODKEY | ControlMask | ShiftMask,     KEY, toggletag,      { .ui = 1 << TAG } },  \
+    { MODKEY2 | ShiftMask,                  KEY, tagandview,     { .ui = 1 << TAG } },
 
-    {"><>", NULL}, /* no layout function means floating behavior */
-    {NULL, NULL},
-};
+#define CTAGKEYS(KEY, TAG)                                                                      \
+	{ {0,0,0,0},                            {KEY,0,0,0}, view,          { .ui = 1 << TAG} },    \
+	{ {ControlMask,0,0,0},                  {KEY,0,0,0}, toggleview,    { .ui = 1 << TAG} },    \
+	{ {ShiftMask,0,0,0},                    {KEY,0,0,0}, tag,           { .ui = 1 << TAG} },    \
+	{ {ControlMask|ShiftMask,0,0,0},        {KEY,0,0,0}, toggletag,     { .ui = 1 << TAG} },
 
-static void tagandview(const Arg *arg);
+#define STACKKEYS(MOD, ACTION)                              \
+    { MOD,  XK_j,   ACTION##stack,  { .i = INC(+1) } },     \
+    { MOD,  XK_k,   ACTION##stack,  { .i = INC(-1) } },     \
+    { MOD,  XK_Tab, ACTION##stack,  { .i = PREVSEL } },     \
+    { MOD,  XK_x,   ACTION##stack,  { .i = 0 } },           \
+    { MOD,  XK_a,   ACTION##stack,  { .i = 1 } },           \
+    { MOD,  XK_s,   ACTION##stack,  { .i = 2 } },           \
+    { MOD,  XK_z,   ACTION##stack,  { .i = -1 } },
 
-/* key definitions */
-#define MODKEY Mod4Mask
-#define TAGKEYS(KEY, TAG)                                                      \
-  {MODKEY, KEY, view, {.ui = 1 << TAG}},                                       \
-      {MODKEY | ControlMask, KEY, toggleview, {.ui = 1 << TAG}},               \
-      {MODKEY | ShiftMask, KEY, tag, {.ui = 1 << TAG}},                        \
-      {MODKEY | Mod1Mask, KEY, tagandview, {.ui = 1 << TAG}},                  \
-      {MODKEY | ControlMask | ShiftMask, KEY, toggletag, {.ui = 1 << TAG}},
-#define STACKKEYS(MOD, ACTION)                                                 \
-  {MOD, XK_j, ACTION##stack, {.i = INC(+1)}},                                  \
-      {MOD, XK_k, ACTION##stack, {.i = INC(-1)}},                              \
-      {MOD,                                                                    \
-       XK_v,                                                                   \
-       ACTION##stack,                                                          \
-       {.i = 0}}, /* { MOD, XK_grave, ACTION##stack, {.i = PREVSEL } }, \ */
-                  /* { MOD, XK_a,     ACTION##stack, {.i = 1 } }, \ */
-                  /* { MOD, XK_z,     ACTION##stack, {.i = 2 } }, \ */
-                  /* { MOD, XK_x,     ACTION##stack, {.i = -1 } }, */
+#define CSTACKKEYS(MOD, ACTION)                                             \
+    { {MOD,0,0,0},  {XK_j, 0,0,0},  ACTION##stack,  { .i = INC(+1) } },     \
+    { {MOD,0,0,0},  {XK_k, 0,0,0},  ACTION##stack,  { .i = INC(-1) } },     \
+    { {MOD,0,0,0},  {XK_Tab,0,0,0}, ACTION##stack,  { .i = PREVSEL } },     \
+    { {MOD,0,0,0},  {XK_x, 0,0,0},  ACTION##stack,  { .i = 0 } },           \
+    { {MOD,0,0,0},  {XK_a, 0,0,0},  ACTION##stack,  { .i = 1 } },           \
+    { {MOD,0,0,0},  {XK_s, 0,0,0},  ACTION##stack,  { .i = 2 } },           \
+    { {MOD,0,0,0},  {XK_z, 0,0,0},  ACTION##stack,  { .i = -1 } },
 
 /* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd)                                                             \
-  {                                                                            \
-    .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL }                       \
-  }
+#define SHCMD(cmd) { .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } }
 
 /* commands */
-static const char *termcmd[] = {TERMINAL, NULL};
+// static const char *dmenucmd[] = { "dmenu_run",    "-fn", dmenufont,   "-nb",
+//                                  normbgcolor,    "-nf", normfgcolor, "-sb",
+//                                  selbordercolor, "-sf", selfgcolor,  NULL };
+static const char *termcmd[] = { TERMINAL, NULL };
 
-/*
- * Xresources preferences to load at startup
- */
+/* Xresources preferences to load at startup */
 ResourcePref resources[] = {
-    {"color0", STRING, &normbordercolor},
-    {"color8", STRING, &selbordercolor},
-    {"color0", STRING, &normbgcolor},
-    {"color4", STRING, &normfgcolor},
-    {"color0", STRING, &selfgcolor},
-    {"color4", STRING, &selbgcolor},
-    {"borderpx", INTEGER, &borderpx},
-    {"snap", INTEGER, &snap},
-    {"showbar", INTEGER, &showbar},
-    {"topbar", INTEGER, &topbar},
-    {"nmaster", INTEGER, &nmaster},
-    {"resizehints", INTEGER, &resizehints},
-    {"mfact", FLOAT, &mfact},
-    {"gappih", INTEGER, &gappih},
-    {"gappiv", INTEGER, &gappiv},
-    {"gappoh", INTEGER, &gappoh},
-    {"gappov", INTEGER, &gappov},
-    {"swallowfloating", INTEGER, &swallowfloating},
-    {"smartgaps", INTEGER, &smartgaps},
+    { "color0", STRING, &normbordercolor },
+    { "color8", STRING, &selbordercolor },
+    { "color0", STRING, &normbgcolor },
+    { "color4", STRING, &normfgcolor },
+    { "color0", STRING, &selfgcolor },
+    { "color4", STRING, &selbgcolor },
+    { "borderpx", INTEGER, &borderpx },
+    { "snap", INTEGER, &snap },
+    { "showbar", INTEGER, &showbar },
+    { "topbar", INTEGER, &topbar },
+    { "nmaster", INTEGER, &nmaster },
+    { "resizehints", INTEGER, &resizehints },
+    { "mfact", FLOAT, &mfact },
+    { "gappih", INTEGER, &gappih },
+    { "gappiv", INTEGER, &gappiv },
+    { "gappoh", INTEGER, &gappoh },
+    { "gappov", INTEGER, &gappov },
+    { "swallowfloating", INTEGER, &swallowfloating },
+    { "smartgaps", INTEGER, &smartgaps },
 };
 
-#include "shiftview.c"
-#include <X11/XF86keysym.h>
-
 static const Key keys[] = {
-    /* modifier                     key        function        argument */
-    STACKKEYS(MODKEY, focus) STACKKEYS(MODKEY | ShiftMask, push)
-    /* { MODKEY|ShiftMask,		XK_Escape,	spawn,	SHCMD("") }, */
-    {MODKEY, XK_grave, spawn, {.v = (const char *[]){"dmenuunicode", NULL}}},
-    /* { MODKEY|ShiftMask,		XK_grave,	togglescratch,
-       SHCMD("") }, */
-    TAGKEYS(XK_1, 0) TAGKEYS(XK_2, 1) TAGKEYS(XK_3, 2) TAGKEYS(XK_4, 3)
-        TAGKEYS(XK_5, 4) TAGKEYS(XK_6, 5) TAGKEYS(XK_7, 6) TAGKEYS(XK_8, 7)
-            TAGKEYS(XK_9, 8){MODKEY, XK_0, view, {.ui = ~0}},
-    {MODKEY | ShiftMask, XK_0, tag, {.ui = ~0}},
-    {MODKEY, XK_minus, spawn,
-     SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -44 $(pidof "
-           "dwmblocks)")},
-    {MODKEY | ShiftMask, XK_minus, spawn,
-     SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-; kill -44 $(pidof "
-           "dwmblocks)")},
-    {MODKEY, XK_equal, spawn,
-     SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -44 $(pidof "
-           "dwmblocks)")},
-    {MODKEY | ShiftMask, XK_equal, spawn,
-     SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+; kill -44 $(pidof "
-           "dwmblocks)")},
-    {MODKEY, XK_BackSpace, spawn, {.v = (const char *[]){"sysact", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_BackSpace,
-     spawn,
-     {.v = (const char *[]){"sysact", NULL}}},
-
-    {MODKEY, XK_Tab, view, {0}},
-    /* { MODKEY|ShiftMask,		XK_Tab,		spawn,
-       SHCMD("") }, */
-    {MODKEY, XK_q, killclient, {0}},
-    {MODKEY | ShiftMask, XK_q, spawn, {.v = (const char *[]){"sysact", NULL}}},
-    {MODKEY, XK_w, spawn, {.v = (const char *[]){BROWSER, NULL}}},
-    {MODKEY | ShiftMask,
-     XK_w,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "sudo", "nmtui", NULL}}},
-    {MODKEY | ControlMask, XK_w, spawn,
-     SHCMD(TERMINAL
-           " -e less -Sf ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport")},
-    {MODKEY, XK_e, spawn,
-     SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook "
-                    "2>/dev/null")},
-    // {MODKEY | ShiftMask, XK_e, spawn,
-    //  SHCMD(TERMINAL " -e abook -C ~/.config/abook/abookrc --datafile "
-    //                 "~/.config/abook/addressbook")},
-    {MODKEY | ShiftMask, XK_e, spawn,
-     SHCMD(TERMINAL " -e abook -C ~/.abook/abookrc --datafile "
-                    "~/.abook/addressbook")},
-    {MODKEY,
-     XK_r,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "lfub", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_r,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "htop", NULL}}},
-    {MODKEY, XK_t, setlayout, {.v = &layouts[0]}},             /* tile */
-    {MODKEY | ShiftMask, XK_t, setlayout, {.v = &layouts[1]}}, /* bstack */
-    {MODKEY, XK_y, setlayout, {.v = &layouts[2]}},             /* spiral */
-    {MODKEY | ShiftMask, XK_y, setlayout, {.v = &layouts[3]}}, /* dwindle */
-    {MODKEY, XK_u, setlayout, {.v = &layouts[4]}},             /* deck */
-    {MODKEY | ShiftMask, XK_u, setlayout, {.v = &layouts[5]}}, /* monocle */
-    {MODKEY, XK_i, setlayout, {.v = &layouts[6]}}, /* centeredmaster */
-    {MODKEY | ShiftMask,
-     XK_i,
-     setlayout,
-     {.v = &layouts[7]}}, /* centeredfloatingmaster */
-    {MODKEY, XK_o, incnmaster, {.i = +1}},
-    {MODKEY | ShiftMask, XK_o, incnmaster, {.i = -1}},
-    {MODKEY, XK_p, spawn, {.v = (const char *[]){"mpc", "toggle", NULL}}},
-    {MODKEY | ShiftMask, XK_p, spawn, SHCMD("mpc pause; pauseallmpv")},
-    {MODKEY,
-     XK_bracketleft,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "-10", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_bracketleft,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "-60", NULL}}},
-    {MODKEY,
-     XK_bracketright,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "+10", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_bracketright,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "+60", NULL}}},
-    {MODKEY, XK_backslash, view, {0}},
-    /* { MODKEY|ShiftMask,		XK_backslash,		spawn,
-       SHCMD("") }, */
-
-    {MODKEY, XK_a, togglegaps, {0}},
-    {MODKEY | ShiftMask, XK_a, defaultgaps, {0}},
-    {MODKEY, XK_s, togglesticky, {0}},
-    /* { MODKEY|ShiftMask,		XK_s,		spawn,
-       SHCMD("") }, */
-    {MODKEY | ShiftMask, XK_s, spawn,
-     SHCMD("mpc load Entire; mpc random; mpc play; pkill -RTMIN+11 dwmblocks")},
-    {MODKEY | ControlMask, XK_s, spawn,
-     SHCMD("mpc stop; pkill -RTMIN+11 dwmblocks")},
-    {MODKEY, XK_d, spawn, {.v = (const char *[]){"dmenu_run", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_d,
-     spawn,
-     {.v = (const char *[]){"passmenu", NULL}}},
-    {MODKEY, XK_f, togglefullscr, {0}},
-    {MODKEY | ShiftMask, XK_f, setlayout, {.v = &layouts[8]}},
-    {MODKEY, XK_g, shiftview, {.i = -1}},
-    {MODKEY | ShiftMask, XK_g, shifttag, {.i = -1}},
-    {MODKEY, XK_h, setmfact, {.f = -0.05}},
-    /* J and K are automatically bound above in STACKEYS */
-    {MODKEY, XK_l, setmfact, {.f = +0.05}},
-    {MODKEY, XK_semicolon, shiftview, {.i = 1}},
-    {MODKEY | ShiftMask, XK_semicolon, shifttag, {.i = 1}},
-    {MODKEY, XK_apostrophe, togglescratch, {.ui = 1}},
-    /* { MODKEY|ShiftMask,		XK_apostrophe,	spawn,
-       SHCMD("") }, */
-    {MODKEY | ShiftMask, XK_apostrophe, togglesmartgaps, {0}},
-    {MODKEY, XK_Return, spawn, {.v = termcmd}},
-    {MODKEY | ShiftMask, XK_Return, togglescratch, {.ui = 0}},
-
-    {MODKEY, XK_z, incrgaps, {.i = +3}},
-    /* { MODKEY|ShiftMask,		XK_z,		spawn,
-       SHCMD("") }, */
-    {MODKEY, XK_x, incrgaps, {.i = -3}},
-    /* { MODKEY|ShiftMask,		XK_x,		spawn,
-       SHCMD("") }, */
-    {MODKEY,
-     XK_c,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "profanity", NULL}}},
-    /* { MODKEY|ShiftMask,		XK_c,		spawn,
-       SHCMD("") }, */
-    /* V is automatically bound above in STACKKEYS */
-    {MODKEY, XK_b, togglebar, {0}},
-    /* { MODKEY|ShiftMask,		XK_b,		spawn,
-       SHCMD("") }, */
-    {MODKEY,
-     XK_n,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "nvim", "-c", "VimwikiIndex",
-                            NULL}}},
-    {MODKEY | ShiftMask, XK_n, spawn,
-     SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks")},
-    {MODKEY,
-     XK_m,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}}},
-    {MODKEY | ShiftMask, XK_m, spawn,
-     SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof "
-           "dwmblocks)")},
-    {MODKEY, XK_comma, spawn, {.v = (const char *[]){"mpc", "prev", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_comma,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "0%", NULL}}},
-    {MODKEY, XK_period, spawn, {.v = (const char *[]){"mpc", "next", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_period,
-     spawn,
-     {.v = (const char *[]){"mpc", "repeat", NULL}}},
-
-    {MODKEY, XK_Left, focusmon, {.i = -1}},
-    {MODKEY | ShiftMask, XK_Left, tagmon, {.i = -1}},
-    {MODKEY, XK_Right, focusmon, {.i = +1}},
-    {MODKEY | ShiftMask, XK_Right, tagmon, {.i = +1}},
-
-    {MODKEY, XK_Page_Up, shiftview, {.i = -1}},
-    {MODKEY | ShiftMask, XK_Page_Up, shifttag, {.i = -1}},
-    {MODKEY, XK_Page_Down, shiftview, {.i = +1}},
-    {MODKEY | ShiftMask, XK_Page_Down, shifttag, {.i = +1}},
-    {MODKEY, XK_Insert, spawn,
-     SHCMD("xdotool type $(grep -v '^#' ~/.local/share/larbs/snippets | dmenu "
-           "-i -l 50 | cut -d' ' -f1)")},
-
-    {MODKEY, XK_F1, spawn,
-     SHCMD("groff -mom ~/.local/share/dwm/larbs.mom -Tpdf | zathura -")},
-    {MODKEY | ShiftMask, XK_F1, spawn, SHCMD("nsxiv ~/Pictures/resources")},
-    {MODKEY, XK_F2, spawn, {.v = (const char *[]){"tutorialvids", NULL}}},
-    {MODKEY, XK_F3, spawn, {.v = (const char *[]){"displayselect", NULL}}},
-    {MODKEY, XK_F4, spawn,
-     SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)")},
-    {MODKEY, XK_F5, xrdb, {.v = NULL}},
-    {MODKEY, XK_F6, spawn, {.v = (const char *[]){"torwrap", NULL}}},
-    {MODKEY | ControlMask,
-     XK_F6,
-     spawn,
-     {.v = (const char *[]){"td-remove", NULL}}},
-    {MODKEY, XK_F7, spawn, {.v = (const char *[]){"td-toggle", NULL}}},
-    {MODKEY, XK_F8, spawn, {.v = (const char *[]){"mailsync", NULL}}},
-    {MODKEY, XK_F9, spawn, {.v = (const char *[]){"mounter", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_F9,
-     spawn,
-     {.v = (const char *[]){"mpvplay", NULL}}},
-    {MODKEY, XK_F10, spawn, {.v = (const char *[]){"unmounter", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_F10,
-     spawn,
-     {.v = (const char *[]){"qndl", "-v", NULL}}},
-    {MODKEY | ControlMask,
-     XK_F10,
-     spawn,
-     {.v = (const char *[]){"qndl", "-m", NULL}}},
-    {MODKEY, XK_F11, spawn,
-     SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings "
-           "--profile=low-latency --input-conf=/dev/null --title=webcam $(ls "
-           "/dev/video[0,2,4,6,8] | tail -n 1)")},
-    {MODKEY | ShiftMask,
-     XK_F11,
-     spawn,
-     {.v = (const char *[]){"kakaotalk", NULL}}},
-    {MODKEY, XK_F12, spawn, SHCMD("remaps")},
-    {MODKEY | ShiftMask,
-     XK_F12,
-     spawn,
-     {.v = (const char *[]){"fcitx5-configtool", NULL}}},
-    {MODKEY, XK_space, zoom, {0}},
-    {MODKEY | ShiftMask, XK_space, togglefloating, {0}},
-
-    {0, XK_Print, spawn,
-     SHCMD("maim | tee ~/Pictures/screenshot-$(date '+%y%m%d-%H%M-%S').png | "
-           "xclip -selection clipboard")},
-    {ShiftMask, XK_Print, spawn, {.v = (const char *[]){"maimpick", NULL}}},
-    {MODKEY, XK_Print, spawn, {.v = (const char *[]){"dmenurecord", NULL}}},
-    {MODKEY | ShiftMask,
-     XK_Print,
-     spawn,
-     {.v = (const char *[]){"dmenurecord", "kill", NULL}}},
-    {MODKEY,
-     XK_Delete,
-     spawn,
-     {.v = (const char *[]){"dmenurecord", "kill", NULL}}},
-    {MODKEY, XK_Scroll_Lock, spawn, SHCMD("killall screenkey || screenkey &")},
-    {MODKEY | ControlMask,
-     XK_minus,
-     spawn,
-     {.v = (const char *[]){"brillo", "-U", "5", "-q", NULL}}},
-    {MODKEY | ControlMask,
-     XK_equal,
-     spawn,
-     {.v = (const char *[]){"brillo", "-A", "5", "-q", NULL}}},
-
-    {0, XF86XK_AudioMute, spawn,
-     SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof "
-           "dwmblocks)")},
-    {0, XF86XK_AudioRaiseVolume, spawn,
-     SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%- && wpctl set-volume "
-           "@DEFAULT_AUDIO_SINK@ 3%+; kill -44 $(pidof dwmblocks)")},
-    {0, XF86XK_AudioLowerVolume, spawn,
-     SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%+ && wpctl set-volume "
-           "@DEFAULT_AUDIO_SINK@ 3%-; kill -44 $(pidof dwmblocks)")},
-    {0, XF86XK_AudioPrev, spawn, {.v = (const char *[]){"mpc", "prev", NULL}}},
-    {0, XF86XK_AudioNext, spawn, {.v = (const char *[]){"mpc", "next", NULL}}},
-    {0,
-     XF86XK_AudioPause,
-     spawn,
-     {.v = (const char *[]){"mpc", "pause", NULL}}},
-    {0, XF86XK_AudioPlay, spawn, {.v = (const char *[]){"mpc", "play", NULL}}},
-    {0, XF86XK_AudioStop, spawn, {.v = (const char *[]){"mpc", "stop", NULL}}},
-    {0,
-     XF86XK_AudioRewind,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "-10", NULL}}},
-    {0,
-     XF86XK_AudioForward,
-     spawn,
-     {.v = (const char *[]){"mpc", "seek", "+10", NULL}}},
-    {0,
-     XF86XK_AudioMedia,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "ncmpcpp", NULL}}},
-    {0, XF86XK_AudioMicMute, spawn,
-     SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle")},
-    /* { 0, XF86XK_PowerOff,		spawn,		{.v = (const char*[]){
-       "sysact", NULL } } }, */
-    {0,
-     XF86XK_Calculator,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "bc", "-l", NULL}}},
-    {0,
-     XF86XK_Sleep,
-     spawn,
-     {.v = (const char *[]){"sudo", "-A", "zzz", NULL}}},
-    {0, XF86XK_WWW, spawn, {.v = (const char *[]){BROWSER, NULL}}},
-    {0, XF86XK_DOS, spawn, {.v = termcmd}},
-    {0, XF86XK_ScreenSaver, spawn,
-     SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv")},
-    {0,
-     XF86XK_TaskPane,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "htop", NULL}}},
-    {0, XF86XK_Mail, spawn,
-     SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks")},
-    {0,
-     XF86XK_MyComputer,
-     spawn,
-     {.v = (const char *[]){TERMINAL, "-e", "lfub", "/", NULL}}},
-    /* { 0, XF86XK_Battery,		spawn,		SHCMD("") }, */
-    {0,
-     XF86XK_Launch1,
-     spawn,
-     {.v = (const char *[]){"xset", "dpms", "force", "off", NULL}}},
-    {0, XF86XK_TouchpadToggle, spawn,
-     SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || "
-           "synclient TouchpadOff=1")},
-    {0,
-     XF86XK_TouchpadOff,
-     spawn,
-     {.v = (const char *[]){"synclient", "TouchpadOff=1", NULL}}},
-    {0,
-     XF86XK_TouchpadOn,
-     spawn,
-     {.v = (const char *[]){"synclient", "TouchpadOff=0", NULL}}},
-    {0,
-     XF86XK_MonBrightnessUp,
-     spawn,
-     {.v = (const char *[]){"xbacklight", "-inc", "15", NULL}}},
-    {0,
-     XF86XK_MonBrightnessDown,
-     spawn,
-     {.v = (const char *[]){"xbacklight", "-dec", "15", NULL}}},
-
-    /* ===================================================================\= */
-    /* { MODKEY|Mod4Mask,              XK_h,      incrgaps,       {.i = +1 } },
-     */
-    /* { MODKEY|Mod4Mask,              XK_l,      incrgaps,       {.i = -1 } },
-     */
-    /* { MODKEY|Mod4Mask|ShiftMask,    XK_h,      incrogaps,      {.i = +1 } },
-     */
-    /* { MODKEY|Mod4Mask|ShiftMask,    XK_l,      incrogaps,      {.i = -1 } },
-     */
-    /* { MODKEY|Mod4Mask|ControlMask,  XK_h,      incrigaps,      {.i = +1 } },
-     */
-    /* { MODKEY|Mod4Mask|ControlMask,  XK_l,      incrigaps,      {.i = -1 } },
-     */
-    /* { MODKEY|Mod4Mask|ShiftMask,    XK_0,      defaultgaps,    {0} }, */
-    /* { MODKEY,                       XK_y,      incrihgaps,     {.i = +1 } },
-     */
-    /* { MODKEY,                       XK_o,      incrihgaps,     {.i = -1 } },
-     */
-    /* { MODKEY|ControlMask,           XK_y,      incrivgaps,     {.i = +1 } },
-     */
-    /* { MODKEY|ControlMask,           XK_o,      incrivgaps,     {.i = -1 } },
-     */
-    /* { MODKEY|Mod4Mask,              XK_y,      incrohgaps,     {.i = +1 } },
-     */
-    /* { MODKEY|Mod4Mask,              XK_o,      incrohgaps,     {.i = -1 } },
-     */
-    /* { MODKEY|ShiftMask,             XK_y,      incrovgaps,     {.i = +1 } },
-     */
-    /* { MODKEY|ShiftMask,             XK_o,      incrovgaps,     {.i = -1 } },
-     */
+    /* STACKKEYS */
+    STACKKEYS(MODKEY,               focus)
+    STACKKEYS(MODKEY | ShiftMask,   push)
+
+    /* TAGKEYS */
+    TAGKEYS(XK_1, 0)
+    TAGKEYS(XK_2, 1)
+    TAGKEYS(XK_3, 2)
+    TAGKEYS(XK_4, 3)
+    TAGKEYS(XK_5, 4)
+    TAGKEYS(XK_6, 5)
+    TAGKEYS(XK_7, 6)
+    TAGKEYS(XK_8, 7)
+    TAGKEYS(XK_9, 8)
+
+    /* modifier                             key                 function            argument */
+    /* AUDIO CONTROL */
+    { MODKEY,                               XK_m,               spawn,              SHCMD("mpc random on; mpc load entire; mpc play; pkill -RTMIN+11 dwmblocks") },
+    { MODKEY | ShiftMask,                   XK_m,               spawn,              { .v = (const char *[]){ "playlists", NULL } } },
+    { MODKEY | ControlMask,                 XK_m,               spawn,              { .v = (const char *[]){ "mpdmenu", NULL } } },
+    { MODKEY,                               XK_p,               spawn,              { .v = (const char *[]){ "mpc", "toggle", NULL } } },
+    { MODKEY | ShiftMask,                   XK_p,               spawn,              SHCMD("mpc pause; pauseallmpv") },
+    { MODKEY | ControlMask,                 XK_p,               spawn,              SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask,                 XK_s,               spawn,              SHCMD("mpc stop; pkill -RTMIN+11 dwmblocks") },
+    { MODKEY,                               XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "prev", NULL } } },
+    { MODKEY,                               XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "next", NULL } } },
+    { MODKEY | ShiftMask,                   XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "-10", NULL } } },
+    { MODKEY | ShiftMask,                   XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
+    { MODKEY | ControlMask,                 XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "-60", NULL } } },
+    { MODKEY | ControlMask,                 XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "seek", "+60", NULL } } },
+    { MODKEY | ShiftMask | ControlMask,     XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "0%", NULL } } },
+    { MODKEY | ShiftMask | ControlMask,     XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "repeat", NULL } } },
+    { MODKEY ,                              XK_backslash,       spawn,              { .v = (const char *[]){ "mpc", "single", NULL } } },
+    { MODKEY | ShiftMask,                   XK_backslash,       spawn,              { .v = (const char *[]){ "mpc", "random", NULL } } },
+    { MODKEY | ControlMask,                 XK_backslash,       spawn,              SHCMD("mpc repeat off; mpc random off; mpc single off; pkill -RTMIN+11 dwmblocks") },
+
+    /* LAYOUT SIZE */
+    { MODKEY | ShiftMask,                   XK_n,               incnmaster,         { .i = -1 } },
+    { MODKEY | ControlMask,                 XK_n,               incnmaster,         { .i = +1 } },
+    { MODKEY,                               XK_f,               togglefullscr,      {0} },
+    { MODKEY,                               XK_h,               setmfact,           { .f = -0.05 } },
+    { MODKEY,                               XK_l,               setmfact,           { .f = +0.05 } },
+    { MODKEY,                               XK_s,               togglesticky,       {0} },
+    { MODKEY,                               XK_space,           zoom,               {0} },
+    { MODKEY | ControlMask,                 XK_j,               setcfact,           { .f = -0.25 } },
+    { MODKEY | ControlMask,                 XK_k,               setcfact,           { .f = +0.25 } },
+    { MODKEY | ControlMask,                 XK_y,               setcfact,           { .f = 0.00 } },
+    { MODKEY | ShiftMask,                   XK_c,               incrgaps,           { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_c,               incrgaps,           { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_i,               incrigaps,          { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_i,               incrigaps,          { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_o,               incrogaps,          { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_o,               incrogaps,          { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_h,               incrihgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_h,               incrihgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_g,               incrivgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_g,               incrivgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_b,               incrohgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_b,               incrohgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_v,               incrovgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_v,               incrovgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_t,               togglegaps,         {0} },
+    { MODKEY | ControlMask,                 XK_t,               defaultgaps,        {0} },
+ 
+    /* FLOATING SIZE */
+	{ MODKEY2 | ControlMask,                XK_h,               exresize,           { .v = (int []){ -25,   0 } } },
+	{ MODKEY2 | ControlMask,                XK_l,               exresize,           { .v = (int []){  25,   0 } } },
+	{ MODKEY2 | ControlMask,                XK_j,               exresize,           { .v = (int []){   0,  25 } } },
+	{ MODKEY2 | ControlMask,                XK_k,               exresize,           { .v = (int []){   0, -25 } } },
+	{ MODKEY2 | ControlMask,                XK_comma,           exresize,           { .v = (int []){ -25, -25 } } },
+	{ MODKEY2 | ControlMask,                XK_period,          exresize,           { .v = (int []){  25,  25 } } },
+
+    /* MEDIA CONTROL */
+    { 0, XF86XK_Battery,                    spawn, SHCMD("pkill -RTMIN+3 dwmblocks") },
+    { 0, XF86XK_WWW,                        spawn, { .v = (const char *[]){ BROWSER, NULL } } },
+    { 0, XF86XK_DOS,                        spawn, { .v = termcmd } },
+    { 0, XF86XK_AudioMute,                  spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioRaiseVolume,           spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%- && wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%+; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioLowerVolume,           spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%+ && wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%-; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioPrev,                  spawn, { .v = (const char *[]){ "mpc", "prev", NULL } } },
+    { 0, XF86XK_AudioNext,                  spawn, { .v = (const char *[]){ "mpc", "next", NULL } } },
+    { 0, XF86XK_AudioPause,                 spawn, { .v = (const char *[]){ "mpc", "pause", NULL } } },
+    { 0, XF86XK_AudioPlay,                  spawn, { .v = (const char *[]){ "mpc", "play", NULL } } },
+    { 0, XF86XK_AudioStop,                  spawn, { .v = (const char *[]){ "mpc", "stop", NULL } } },
+    { 0, XF86XK_AudioRewind,                spawn, { .v = (const char *[]){ "mpc", "seek", "-10", NULL } } },
+    { 0, XF86XK_AudioForward,               spawn, { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
+    { 0, XF86XK_AudioMedia,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
+    { 0, XF86XK_AudioMicMute,               spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") },
+    { 0, XF86XK_PowerOff,                   spawn, { .v = (const char*[]){ "sysact", NULL } } },
+    { 0, XF86XK_Calculator,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "bc", "-l", NULL } } },
+    { 0, XF86XK_Sleep,                      spawn, { .v = (const char *[]){ "sudo", "-A", "zzz", NULL } } },
+    { 0, XF86XK_ScreenSaver,                spawn, SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },
+    { 0, XF86XK_TaskPane,                   spawn, { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { 0, XF86XK_Mail,                       spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks") },
+    { 0, XF86XK_MyComputer,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "lfub", "/", NULL } } },
+    { 0, XF86XK_Launch1,                    spawn, { .v = (const char *[]){ "xset", "dpms", "force", "off", NULL } } },
+    { 0, XF86XK_TouchpadToggle,             spawn, SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") },
+    { 0, XF86XK_TouchpadOff,                spawn, { .v = (const char *[]){ "synclient", "TouchpadOff=1", NULL } } },
+    { 0, XF86XK_TouchpadOn,                 spawn, { .v = (const char *[]){ "synclient", "TouchpadOff=0", NULL } } },
+    { 0, XF86XK_MonBrightnessUp,            spawn, { .v = (const char *[]){ "brillo", "-U", "5", "-q", NULL } } },
+    { 0, XF86XK_MonBrightnessDown,          spawn, { .v = (const char *[]){ "brillo", "-A", "5", "-q", NULL } } },
+
+    /* MODE */
+	{ MODKEY,                               XK_Escape,          setkeymode,         { .ui = ModeCommand } },
+
+    /* PROGRAM */
+    { MODKEY,                               XK_d,               spawn,              { .v = (const char *[]){ "dmenu_run", NULL } } },
+    { MODKEY,                               XK_e,               spawn,              SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { MODKEY,                               XK_n,               spawn,              SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+    { MODKEY,                               XK_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
+    { MODKEY | ShiftMask,                   XK_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { MODKEY,                               XK_w,               spawn,              { .v = (const char *[]){ BROWSER, NULL } } },
+    { MODKEY,                               XK_c,               togglescratch,      { .ui = 1 } }, /* calculator */
+    { MODKEY,                               XK_u,               spawn,              { .v = (const char *[]){ "dmenuunicode", NULL } } },
+    { MODKEY,                               XK_Return,          spawn,              { .v = termcmd } },
+    { MODKEY | ShiftMask,                   XK_Return,          spawn,              { .v = (const char *[]){ "sd", NULL } } },
+    { MODKEY | ControlMask,                 XK_Return,          togglescratch,      { .ui = 0 } }, /* terminal */
+
+    /* SCRIPT */
+    { MODKEY | ShiftMask,                   XK_d,               spawn,              { .v = (const char *[]){ "passmenu", NULL } } },
+    { MODKEY | ControlMask,                 XK_d,               spawn,              { .v = (const char *[]){ "passmenu2", NULL } } },
+    { MODKEY | ShiftMask,                   XK_f,               spawn,              { .v = (const char *[]){ "fecrypt", NULL } } },
+    { MODKEY,                               XK_v,               spawn,              { .v = (const char *[]){ "mpvplay", NULL } } },
+    { MODKEY,                               XK_Insert,          spawn,              SHCMD("xdotool type $(grep -v '^#' ~/.local/share/thesiah/snippets | dmenu -i -l 50 | cut -d' ' -f1)") },
+    { 0,                                    XK_Print,           spawn,              SHCMD("maim | tee ~/Pictures/screenshot-$(date '+%y%m%d-%H%M-%S').png | xclip -selection clipboard") },
+    { ShiftMask,                            XK_Print,           spawn,              { .v = (const char *[]){ "maimpick", NULL } } },
+    { MODKEY,                               XK_Print,           spawn,              { .v = (const char *[]){ "dmenurecord", NULL } } },
+    { MODKEY,                               XK_Delete,          spawn,              { .v = (const char *[]){ "dmenurecord", "kill", NULL } } },
+    { MODKEY,                               XK_Scroll_Lock,     spawn,              SHCMD("killall screenkey || screenkey -t 3 -p fixed -s small -g 20%x5%+40%-5% --key-mode keysyms --bak-mode normal --mods-mode normal -f ttf-font-awesome --opacity 0.5 &") },
+    { MODKEY,                               XK_F1,              spawn,              SHCMD("groff -mom /home/si/.local/share/man/thesiah/thesiah.mom -Tpdf | zathura -") },
+    { MODKEY | ShiftMask,                   XK_F1,              spawn,              SHCMD("nsxiv ~/Pictures/resources") },
+    { MODKEY | ControlMask,                 XK_F1,              spawn,              { .v = (const char *[]){ TERMINAL, "-e", "dman", NULL } } },
+    { MODKEY,                               XK_F2,              spawn,              { .v = (const char *[]){ "tutorialvids", NULL } } },
+    { MODKEY,                               XK_F3,              spawn,              { .v = (const char *[]){ "displayselect", NULL } } },
+    { MODKEY,                               XK_F4,              spawn,              SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") },
+    { MODKEY,                               XK_F5,              xrdb,               { .v = NULL } },
+    { MODKEY | ShiftMask,                   XK_F5,              spawn,              SHCMD("stw ~/.dotfiles/arch -d") },
+    { MODKEY | ControlMask,                 XK_F5,              spawn,              { .v = (const char *[]){ "pacupgrade", NULL } } },
+    { MODKEY,                               XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-v", NULL } } },
+    { MODKEY | ShiftMask,                   XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-m", NULL } } },
+    { MODKEY,                               XK_F7,              spawn,              { .v = (const char *[]){ "td-toggle", NULL } } },
+    { MODKEY | ShiftMask,                   XK_F7,              spawn,              { .v = (const char *[]){ "transadd", NULL } } },
+    { MODKEY,                               XK_F8,              spawn,              { .v = (const char *[]){ "mailsync", NULL } } },
+    { MODKEY,                               XK_F9,              spawn,              { .v = (const char *[]){ "mounter", NULL } } },
+    { MODKEY,                               XK_F10,             spawn,              { .v = (const char *[]){ "unmounter", NULL } } },
+    { MODKEY,                               XK_F11,             spawn,              SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls " "/dev/video[0,2,4,6,8] | tail -n 1)") },
+    { MODKEY,                               XK_F12,             spawn,              SHCMD("remaps") },
+    { MODKEY | ShiftMask,                   XK_F12,             spawn,              { .v = (const char *[]){ "fcitx5-configtool", NULL } } },
+
+    /* SYSTEM */
+    { MODKEY | ControlMask,                 XK_f,               spawn,              SHCMD("pkill -f firefox") },
+    { MODKEY | ControlMask,                 XK_k,               spawn,              SHCMD("pkill -f kakaotalk") },
+    { MODKEY,                               XK_q,               killclient,         {0} },
+    { MODKEY | ShiftMask,                   XK_q,               killclient,         { .ui = 1 } },
+    { MODKEY | ControlMask,                 XK_q,               killclient,         { .ui = 2 } },
+    { MODKEY,                               XK_BackSpace,       spawn,              { .v = (const char *[]){ "slock", NULL } } },
+    { MODKEY | ShiftMask,                   XK_BackSpace,       spawn,              { .v = (const char *[]){ "sysact", NULL } } },
+    { MODKEY,                               XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -44 $(pidof dwmblocks)") },
+    { MODKEY,                               XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ShiftMask,                   XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ShiftMask,                   XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask,                 XK_minus,           spawn,              { .v = (const char *[]){ "brillo", "-U", "5", "-q", NULL } } },
+    { MODKEY | ControlMask,                 XK_equal,           spawn,              { .v = (const char *[]){ "brillo", "-A", "5", "-q", NULL } } },
+    { 0,                                    XK_Alt_R,           spawn,              SHCMD("fcitx5-remote -t; pkill -RTMIN+29 dwmblocks") },
+	{ ControlMask,                          XK_F5,              quit,               {1} },
+    { ShiftMask | ControlMask,              XK_F5,              spawn,              SHCMD("killall -q dwmblocks; setsid -f dwmblocks") },
+
+    /* TRAVERSAL */
+    { MODKEY | ShiftMask,                   XK_0,               tag,                { .ui = ~0 } },
+	{ MODKEY2,                              XK_comma,           shiftview,          { .i = -1 } },
+	{ MODKEY2,                              XK_period,          shiftview,          { .i = 1 } },
+    { MODKEY2 | ShiftMask,                  XK_comma,           shifttag,           { .i = -1 } },
+    { MODKEY2 | ShiftMask,                  XK_period,          shifttag,           { .i = 1 } },
+	{ MODKEY,                               XK_comma,           shiftviewclients,   { .i = -1 } },
+	{ MODKEY,                               XK_period,          shiftviewclients,   { .i = +1 } },
+	{ MODKEY | ShiftMask,                   XK_comma,           shifttagclients,    { .i = -1 } },
+	{ MODKEY | ShiftMask,                   XK_period,          shifttagclients,    { .i = +1 } },
+	{ MODKEY | ControlMask,                 XK_comma,           shiftboth,          { .i = -1 } },
+	{ MODKEY | ControlMask,                 XK_period,          shiftboth,          { .i = +1 } },
+	{ MODKEY | ShiftMask | ControlMask,     XK_comma,           shiftswaptags,      { .i = -1 }	},
+	{ MODKEY | ShiftMask | ControlMask,     XK_period,          shiftswaptags,      { .i = +1 }	},
+    { MODKEY,                               XK_Left,            focusmon,           { .i = -1 } },
+    { MODKEY,                               XK_Right,           focusmon,           { .i = +1 } },
+    { MODKEY | ShiftMask,                   XK_Left,            tagmon,             { .i = -1 } },
+    { MODKEY | ShiftMask,                   XK_Right,           tagmon,             { .i = +1 } },
+    { MODKEY | ShiftMask,                   XK_Tab,             view,               {0} },
+
+    /* { MODKEY | ShiftMask,                   XK_apostrophe,      togglesmartgaps,    {0} }, */
+  
+};
+
+static Key cmdkeys[] = {
+	/* modifier                         keys                function        argument */
+	{ 0,                                XK_Escape,          clearcmd,       {0} },
+	{ ControlMask,                      XK_c,               clearcmd,       {0} },
+	{ ControlMask,                      XK_x,               setkeymode,     { .ui = ModeInsert } },
+};
+
+static Command commands[] = {
+    /* STACKKEYS */
+    CSTACKKEYS(MODKEY,               focus)
+    CSTACKKEYS(MODKEY | ShiftMask,   push)
+
+    /* TAGKEYS */
+	CTAGKEYS(XK_1, 0)
+	CTAGKEYS(XK_2, 1)
+	CTAGKEYS(XK_3, 2)
+	CTAGKEYS(XK_4, 3)
+	CTAGKEYS(XK_5, 4)
+	CTAGKEYS(XK_6, 5)
+	CTAGKEYS(XK_7, 6)
+	CTAGKEYS(XK_8, 7)
+	CTAGKEYS(XK_9, 8)
+
+    /* Modifier (4 keys)                keysyms (4 keys)            function                argument */
+    /* APPEARANCE */
+    { { ShiftMask, 0, 0, 0 },           { XK_b, 0, 0, 0 },          togglebar,              {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_b, 0, 0, 0 },          togglebar,              { .i = 1 } },
+    { { ShiftMask, 0, 0, 0 },           { XK_o, 0, 0, 0 },          toggleborder,           {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_f, 0, 0, 0 },          togglefloating,         {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_g, 0, 0, 0 },          togglegaps,             {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_g, 0, 0, 0 },          defaultgaps,            {0} },
+
+    /* LAYOUT */
+    { { 0, 0, 0, 0 },                   { XK_l, XK_t, 0, 0 },       setlayout,              { .v = &layouts[0] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_m, 0, 0 },       setlayout,              { .v = &layouts[1] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_l, 0 },    setlayout,              { .v = &layouts[2] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_s, 0, 0 },       setlayout,              { .v = &layouts[3] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_w, 0, 0 },       setlayout,              { .v = &layouts[4] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_d, 0, 0 },       setlayout,              { .v = &layouts[5] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_b, XK_e, 0 },    setlayout,              { .v = &layouts[6] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_b, XK_h, 0 },    setlayout,              { .v = &layouts[7] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_e, 0 },    setlayout,              { .v = &layouts[8] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_r, 0 },    setlayout,              { .v = &layouts[9] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_h, 0 },    setlayout,              { .v = &layouts[10] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_g, 0 },    setlayout,              { .v = &layouts[11] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_m, 0 },    setlayout,              { .v = &layouts[12] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_f, 0 },    setlayout,              { .v = &layouts[13] } },
+
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_u, 0, 0 },       explace,                { .ui = EX_NW } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_i, 0, 0 },       explace,                { .ui = EX_N } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_o, 0, 0 },       explace,                { .ui = EX_NE } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_h, 0, 0 },       explace,                { .ui = EX_W } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_k, 0, 0 },       explace,                { .ui = EX_C } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_l, 0, 0 },       explace,                { .ui = EX_E } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_m, 0, 0 },       explace,                { .ui = EX_SW } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_comma, 0, 0 },   explace,                { .ui = EX_S } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_period, 0, 0 },  explace,                { .ui = EX_SE } },
+
+    /* FLOATING SIZE */
+	{ { ControlMask, 0, 0, 0 },         { XK_j, 0, 0, 0 },          exresize,               { .v = (int []){   0,  25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_k, 0, 0, 0 },          exresize,               { .v = (int []){   0, -25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_l, 0, 0, 0 },          exresize,               { .v = (int []){  25,   0 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_h, 0, 0, 0 },          exresize,               { .v = (int []){ -25,   0 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_comma, 0, 0, 0 },      exresize,               { .v = (int []){ -25, -25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_period, 0, 0, 0 },     exresize,               { .v = (int []){  25,  25 } } },
+
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_h, 0 },    togglehorizontalexpand, { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_h, 0 },    togglehorizontalexpand, { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_h, 0 },    togglehorizontalexpand, { .i = -1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_v, 0 },    toggleverticalexpand,   { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_v, 0 },    toggleverticalexpand,   { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_v, 0 },    toggleverticalexpand,   { .i = -1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_m, 0 },    togglemaximize,         { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_m, 0 },    togglemaximize,         { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_m, 0 },    togglemaximize,         { .i = -1 } },
 
+    /* PROGRAM */
+    { { 0, 0, 0, 0 },                   { XK_a, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e abook -C ~/.abook/abookrc --datafile ~/.abook/addressbook") },
+    { { 0, 0, 0, 0 },                   { XK_e, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { { 0, 0, 0, 0 },                   { XK_g, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "gimp", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_h, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_k, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "kakaotalk", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_m, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_n, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+    { { 0, 0, 0, 0 },                   { XK_p, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "profanity", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_r, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_s, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e sc-im /home/si/.dotfiles/THESIAH/progs.csv") },
+    { { 0, 0, 0, 0 },                   { XK_t, XK_h, 0, 0 },       spawn,                  { .v = (const char *[]){ "thunderbird", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_t, XK_w, 0, 0 },       spawn,                  { .v = (const char *[]){ "torwrap", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_v, 0,    0, 0 },       spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "nvim", "-c", "VimwikiIndex", "1", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_w, XK_e, 0, 0 },       spawn,                  SHCMD(TERMINAL " -e less -Sf ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport") },
+    { { 0, 0, 0, 0 },                   { XK_w, XK_f, 0, 0 },       spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "sudo", "nmtui", NULL } } },
 };
 
 /* button definitions */
 /* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
  * ClkClientWin, or ClkRootWin */
 static const Button buttons[] = {
-/* click                event mask      button          function        argument
- */
+/*      click           event mask      button      function        argument */
 #ifndef __OpenBSD__
-    {ClkWinTitle, 0, Button2, zoom, {0}},
-    {ClkStatusText, 0, Button1, sigdwmblocks, {.i = 1}},
-    {ClkStatusText, 0, Button2, sigdwmblocks, {.i = 2}},
-    {ClkStatusText, 0, Button3, sigdwmblocks, {.i = 3}},
-    {ClkStatusText, 0, Button4, sigdwmblocks, {.i = 4}},
-    {ClkStatusText, 0, Button5, sigdwmblocks, {.i = 5}},
-    {ClkStatusText, ShiftMask, Button1, sigdwmblocks, {.i = 6}},
+    { ClkWinTitle,      0,              Button2,    zoom, {0} },
+    { ClkStatusText,    0,              Button1,    sigdwmblocks,   { .i = 1 } },
+    { ClkStatusText,    0,              Button2,    sigdwmblocks,   { .i = 2 } },
+    { ClkStatusText,    0,              Button3,    sigdwmblocks,   { .i = 3 } },
+    { ClkStatusText,    0,              Button4,    sigdwmblocks,   { .i = 4 } },
+    { ClkStatusText,    0,              Button5,    sigdwmblocks,   { .i = 5 } },
+    { ClkStatusText,    ShiftMask,      Button1,    sigdwmblocks,   { .i = 6 } },
 #endif
-    {ClkStatusText, ShiftMask, Button3, spawn,
-     SHCMD(TERMINAL " -e nvim ~/.local/src/suckless/dwmblocks/config.h")},
-    {ClkClientWin, MODKEY, Button1, movemouse, {0}},
-    {ClkClientWin, MODKEY, Button2, defaultgaps, {0}},
-    {ClkClientWin, MODKEY, Button3, resizemouse, {0}},
-    {ClkClientWin, MODKEY, Button4, incrgaps, {.i = +1}},
-    {ClkClientWin, MODKEY, Button5, incrgaps, {.i = -1}},
-    {ClkTagBar, 0, Button1, view, {0}},
-    {ClkTagBar, 0, Button3, toggleview, {0}},
-    {ClkTagBar, MODKEY, Button1, tag, {0}},
-    {ClkTagBar, MODKEY, Button3, toggletag, {0}},
-    {ClkTagBar, 0, Button4, shiftview, {.i = -1}},
-    {ClkTagBar, 0, Button5, shiftview, {.i = 1}},
-    {ClkRootWin, 0, Button2, togglebar, {0}},
+    { ClkStatusText,    ShiftMask,      Button3,    spawn,          SHCMD(TERMINAL " -e nvim ~/.local/src/suckless/dwmblocks/config.h") },
+    { ClkClientWin,     MODKEY,         Button1,    movemouse,      {0} },
+    { ClkClientWin,     MODKEY,         Button2,    defaultgaps,    {0} },
+    { ClkClientWin,     MODKEY,         Button3,    resizemouse,    {0} },
+    { ClkClientWin,     MODKEY,         Button4,    incrgaps,       { .i = +1 } },
+    { ClkClientWin,     MODKEY,         Button5,    incrgaps,       { .i = -1 } },
+    { ClkTagBar,        0,              Button1,    view,           {0} },
+    { ClkTagBar,        0,              Button3,    toggleview,     {0} },
+    { ClkTagBar,        MODKEY,         Button1,    tag,            {0} },
+    { ClkTagBar,        MODKEY,         Button3,    toggletag,      {0} },
+    { ClkTagBar,        0,              Button4,    shiftview,      { .i = -1 } },
+    { ClkTagBar,        0,              Button5,    shiftview,      { .i = 1 } },
+    { ClkRootWin,       0,              Button2,    togglebar,      {0} },
 };
diff --git a/dwm/config.h.bak b/dwm/config.h.bak
new file mode 100644
index 0000000..dec3915
--- /dev/null
+++ b/dwm/config.h.bak
@@ -0,0 +1,495 @@
+/* See LICENSE file for copyright and license details. */
+
+/* constants */
+#define TERMINAL "st"
+#define TERMCLASS "St"
+#define BROWSER "firefox"
+#define BROWSERCLASS "Firefox"
+#define GAP 6
+
+/* appearance */
+static unsigned int borderpx = 3;               /* border pixel of windows */
+static unsigned int snap = 32;                  /* snap pixel */
+static unsigned int gappih = GAP;               /* horiz inner gap between windows */
+static unsigned int gappiv = GAP;               /* vert inner gap between windows */
+static unsigned int gappoh = GAP;               /* horiz outer gap between windows and screen edge */
+static unsigned int gappov = GAP;               /* vert outer gap between windows and screen edge */
+static int swallowfloating = 0;                 /* 1 means swallow floating windows by default */
+static int smartgaps = 0;                       /* 1 means no outer gap when there is only one window */
+static int showbar = 1;                         /* 0 means no bar */
+static int topbar = 1;                          /* 0 means bottom bar */
+static const int vertpad = GAP;                 /* vertical padding of bar */
+static const int sidepad = GAP;                 /* horizontal padding of bar */
+static char *fonts[] = {
+    "monospace:size=10",
+    "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" };
+static char normbgcolor[] = "#222222";
+static char normbordercolor[] = "#555555";
+static char normfgcolor[] = "#bbbbbb";
+static char selfgcolor[] = "#eeeeee";
+static char selbordercolor[] = "#4CBB17";
+static char selbgcolor[] = "#005577";
+static const unsigned int baralpha = 0xd0;
+static const unsigned int borderalpha = OPAQUE;
+static char *colors[][3] = {
+    /*                      fg              bg              border  */
+    [SchemeNorm]    = { normfgcolor,     normbgcolor,    normbordercolor },
+    [SchemeSel]     = { selfgcolor,      selbgcolor,     selbordercolor },
+};
+static const unsigned int alphas[][3] = {
+    /*                  fg              bg              border  */
+    [SchemeNorm]    = { OPAQUE,      baralpha,       borderalpha },
+    [SchemeSel]     = { OPAQUE,      baralpha,       borderalpha },
+};
+
+typedef struct {
+  const char *name;
+  const void *cmd;
+} Sp;
+
+/* scratchpads */
+const char *spcmd1[] = { TERMINAL, "-n", "spterm", "-g", "120x34", NULL };
+const char *spcmd2[] = { TERMINAL, "-n",    "spcalc", "-f", "monospace:size=16",
+                        "-g",     "50x20", "-e",     "bc", "-lq", NULL };
+static Sp scratchpads[] = {
+    /* name         cmd */
+    { "spterm",     spcmd1 },
+    { "spcalc",     spcmd2 },
+};
+
+/* tagging */
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
+static const Rule rules[] = {
+    /* xprop(1):
+     *	WM_CLASS(STRING) = instance, class
+     *	WM_NAME(STRING) = title
+     */
+    /* class        instance        title           tags mask       isfloating isterminal  noswallow  monitor */
+    { "Gimp",       NULL,           NULL,           1 << 8,         0,  0,  0, -1 },
+    { "kakaotalk",  NULL,           NULL,           1 << 8,         0,  0, -1, -1 },
+    { TERMCLASS,    NULL,           NULL,           0,              0,  1,  0, -1 },
+    { BROWSERCLASS, NULL,           NULL,           0,              0,  0, -1, -1 },
+    { TERMCLASS,    "floatterm",    NULL,           0,              1,  1,  0, -1 },
+    { TERMCLASS,    "bg",           NULL,           1 << 7,         0,  1,  0, -1 },
+    { TERMCLASS,    "spterm",       NULL,           SPTAG(0),       1,  1,  0, -1 },
+    { TERMCLASS,    "spcalc",       NULL,           SPTAG(1),       1,  1,  0, -1 },
+    { NULL,         NULL,           "Event Tester", 0,              0,  0,  1, -1 },
+};
+
+/* layout(s) */
+static float mfact = 0.55;              /* factor of master area size [0.05..0.95] */
+static int nmaster = 1;                 /* number of clients in master area */
+static int resizehints = 0;             /* 1 means respect size hints in tiled resizals */
+static const int lockfullscreen = 1;    /* 1 will force focus on the fullscreen window */
+
+#define FORCE_VSPLIT 1                  /* nrowgrid layout: force two clients to always split vertically */
+#include "vanitygaps.c"
+
+static const Layout layouts[] = {
+    /* symbol   arrange function */
+    { "[]=",    tile },                     /* 0: Default: Master on left, slaves on right */
+    { "[M]",    monocle },                  /* 1: All windows on top of eachother */
+	{ "|||",    col },                      /* 2: Column */
+    { "[@]",    spiral },                   /* 3: Fibonacci spiral */
+    { "[\\]",    dwindle },                 /* 4: Decreasing in size right and leftward */
+    { "H[]",    deck },                     /* 5: Master on left, slaves in monocle-like mode on right */
+    { "TTT",    bstack },                   /* 6: Master on top, slaves on bottom horizontally */
+    { "===",    bstackhoriz },              /* 7: Master on top, slaves on bottom vertically */
+    { "HHH",    grid },                     /* 8: Equal grid */
+    { "###",    nrowgrid },                 /* 9: Number of row grid */
+    { "---",    horizgrid },                /* 10: Horizontal grid */
+    { ":::",    gaplessgrid },              /* 11: Gapless grid */
+    { "|M|",    centeredmaster },           /* 12: Master in middle, slaves on sides */
+    { ">M>",    centeredfloatingmaster },   /* 13: Same but master floats */
+    { "><>",    NULL },                     /* 14: no layout function means floating behavior */
+    { NULL,     NULL },
+};
+
+/* imports */
+#include <X11/XF86keysym.h>
+#include "shift-tools-scratchpads.c"
+#include "tagandview.c"
+#include "exresize.c"
+
+/* key definitions */
+#define MODKEY Mod4Mask
+#define MODKEY2 Mod1Mask
+
+#define TAGKEYS(KEY, TAG)                                                               \
+    { MODKEY,                               KEY, view,           { .ui = 1 << TAG } },  \
+    { MODKEY | ControlMask,                 KEY, toggleview,     { .ui = 1 << TAG } },  \
+    { MODKEY | ShiftMask,                   KEY, tag,            { .ui = 1 << TAG } },  \
+    { MODKEY | ControlMask | ShiftMask,     KEY, toggletag,      { .ui = 1 << TAG } },  \
+    { MODKEY2 | ShiftMask,                  KEY, tagandview,     { .ui = 1 << TAG } },
+
+#define CTAGKEYS(KEY, TAG)                                                                      \
+	{ {0,0,0,0},                            {KEY,0,0,0}, view,          { .ui = 1 << TAG} },    \
+	{ {ControlMask,0,0,0},                  {KEY,0,0,0}, toggleview,    { .ui = 1 << TAG} },    \
+	{ {ShiftMask,0,0,0},                    {KEY,0,0,0}, tag,           { .ui = 1 << TAG} },    \
+	{ {ControlMask|ShiftMask,0,0,0},        {KEY,0,0,0}, toggletag,     { .ui = 1 << TAG} },
+
+#define STACKKEYS(MOD, ACTION)                              \
+    { MOD,  XK_j,   ACTION##stack,  { .i = INC(+1) } },     \
+    { MOD,  XK_k,   ACTION##stack,  { .i = INC(-1) } },     \
+    { MOD,  XK_Tab, ACTION##stack,  { .i = PREVSEL } },     \
+    { MOD,  XK_x,   ACTION##stack,  { .i = 0 } },           \
+    { MOD,  XK_a,   ACTION##stack,  { .i = 1 } },           \
+    { MOD,  XK_s,   ACTION##stack,  { .i = 2 } },           \
+    { MOD,  XK_z,   ACTION##stack,  { .i = -1 } },
+
+#define CSTACKKEYS(MOD, ACTION)                                             \
+    { {MOD,0,0,0},  {XK_j, 0,0,0},  ACTION##stack,  { .i = INC(+1) } },     \
+    { {MOD,0,0,0},  {XK_k, 0,0,0},  ACTION##stack,  { .i = INC(-1) } },     \
+    { {MOD,0,0,0},  {XK_Tab,0,0,0}, ACTION##stack,  { .i = PREVSEL } },     \
+    { {MOD,0,0,0},  {XK_x, 0,0,0},  ACTION##stack,  { .i = 0 } },           \
+    { {MOD,0,0,0},  {XK_a, 0,0,0},  ACTION##stack,  { .i = 1 } },           \
+    { {MOD,0,0,0},  {XK_s, 0,0,0},  ACTION##stack,  { .i = 2 } },           \
+    { {MOD,0,0,0},  {XK_z, 0,0,0},  ACTION##stack,  { .i = -1 } },
+
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
+#define SHCMD(cmd) { .v = (const char *[]) { "/bin/sh", "-c", cmd, NULL } }
+
+/* commands */
+// static const char *dmenucmd[] = { "dmenu_run",    "-fn", dmenufont,   "-nb",
+//                                  normbgcolor,    "-nf", normfgcolor, "-sb",
+//                                  selbordercolor, "-sf", selfgcolor,  NULL };
+static const char *termcmd[] = { TERMINAL, NULL };
+
+/* Xresources preferences to load at startup */
+ResourcePref resources[] = {
+    { "color0", STRING, &normbordercolor },
+    { "color8", STRING, &selbordercolor },
+    { "color0", STRING, &normbgcolor },
+    { "color4", STRING, &normfgcolor },
+    { "color0", STRING, &selfgcolor },
+    { "color4", STRING, &selbgcolor },
+    { "borderpx", INTEGER, &borderpx },
+    { "snap", INTEGER, &snap },
+    { "showbar", INTEGER, &showbar },
+    { "topbar", INTEGER, &topbar },
+    { "nmaster", INTEGER, &nmaster },
+    { "resizehints", INTEGER, &resizehints },
+    { "mfact", FLOAT, &mfact },
+    { "gappih", INTEGER, &gappih },
+    { "gappiv", INTEGER, &gappiv },
+    { "gappoh", INTEGER, &gappoh },
+    { "gappov", INTEGER, &gappov },
+    { "swallowfloating", INTEGER, &swallowfloating },
+    { "smartgaps", INTEGER, &smartgaps },
+};
+
+static const Key keys[] = {
+    /* STACKKEYS */
+    STACKKEYS(MODKEY,               focus)
+    STACKKEYS(MODKEY | ShiftMask,   push)
+
+    /* TAGKEYS */
+    TAGKEYS(XK_1, 0)
+    TAGKEYS(XK_2, 1)
+    TAGKEYS(XK_3, 2)
+    TAGKEYS(XK_4, 3)
+    TAGKEYS(XK_5, 4)
+    TAGKEYS(XK_6, 5)
+    TAGKEYS(XK_7, 6)
+    TAGKEYS(XK_8, 7)
+    TAGKEYS(XK_9, 8)
+
+    /* modifier                             key                 function            argument */
+    /* AUDIO CONTROL */
+    { MODKEY,                               XK_m,               spawn,              SHCMD("mpc random on; mpc load entire; mpc play; pkill -RTMIN+11 dwmblocks") },
+    { MODKEY | ShiftMask,                   XK_m,               spawn,              { .v = (const char *[]){ "playlists", NULL } } },
+    { MODKEY | ControlMask,                 XK_m,               spawn,              { .v = (const char *[]){ "mpdmenu", NULL } } },
+    { MODKEY,                               XK_p,               spawn,              { .v = (const char *[]){ "mpc", "toggle", NULL } } },
+    { MODKEY | ShiftMask,                   XK_p,               spawn,              SHCMD("mpc pause; pauseallmpv") },
+    { MODKEY | ControlMask,                 XK_p,               spawn,              SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask,                 XK_s,               spawn,              SHCMD("mpc stop; pkill -RTMIN+11 dwmblocks") },
+    { MODKEY,                               XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "prev", NULL } } },
+    { MODKEY,                               XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "next", NULL } } },
+    { MODKEY | ShiftMask,                   XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "-10", NULL } } },
+    { MODKEY | ShiftMask,                   XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
+    { MODKEY | ControlMask,                 XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "-60", NULL } } },
+    { MODKEY | ControlMask,                 XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "seek", "+60", NULL } } },
+    { MODKEY | ShiftMask | ControlMask,     XK_bracketleft,     spawn,              { .v = (const char *[]){ "mpc", "seek", "0%", NULL } } },
+    { MODKEY | ShiftMask | ControlMask,     XK_bracketright,    spawn,              { .v = (const char *[]){ "mpc", "repeat", NULL } } },
+    { MODKEY ,                              XK_backslash,       spawn,              { .v = (const char *[]){ "mpc", "single", NULL } } },
+    { MODKEY | ShiftMask,                   XK_backslash,       spawn,              { .v = (const char *[]){ "mpc", "random", NULL } } },
+    { MODKEY | ControlMask,                 XK_backslash,       spawn,              SHCMD("mpc repeat off; mpc random off; mpc single off; pkill -RTMIN+11 dwmblocks") },
+
+    /* LAYOUT SIZE */
+    { MODKEY | ShiftMask,                   XK_n,               incnmaster,         { .i = -1 } },
+    { MODKEY | ControlMask,                 XK_n,               incnmaster,         { .i = +1 } },
+    { MODKEY,                               XK_f,               togglefullscr,      {0} },
+    { MODKEY,                               XK_h,               setmfact,           { .f = -0.05 } },
+    { MODKEY,                               XK_l,               setmfact,           { .f = +0.05 } },
+    { MODKEY,                               XK_s,               togglesticky,       {0} },
+    { MODKEY,                               XK_space,           zoom,               {0} },
+    { MODKEY | ControlMask,                 XK_j,               setcfact,           { .f = -0.25 } },
+    { MODKEY | ControlMask,                 XK_k,               setcfact,           { .f = +0.25 } },
+    { MODKEY | ControlMask,                 XK_y,               setcfact,           { .f = 0.00 } },
+    { MODKEY | ShiftMask,                   XK_c,               incrgaps,           { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_c,               incrgaps,           { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_i,               incrigaps,          { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_i,               incrigaps,          { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_o,               incrogaps,          { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_o,               incrogaps,          { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_h,               incrihgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_h,               incrihgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_g,               incrivgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_g,               incrivgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_b,               incrohgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_b,               incrohgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_v,               incrovgaps,         { .i = -5 } },
+    { MODKEY | ControlMask,                 XK_v,               incrovgaps,         { .i = +5 } },
+    { MODKEY | ShiftMask,                   XK_t,               togglegaps,         {0} },
+    { MODKEY | ControlMask,                 XK_t,               defaultgaps,        {0} },
+ 
+    /* FLOATING SIZE */
+	{ MODKEY2 | ControlMask,                XK_h,               exresize,           { .v = (int []){ -25,   0 } } },
+	{ MODKEY2 | ControlMask,                XK_l,               exresize,           { .v = (int []){  25,   0 } } },
+	{ MODKEY2 | ControlMask,                XK_j,               exresize,           { .v = (int []){   0,  25 } } },
+	{ MODKEY2 | ControlMask,                XK_k,               exresize,           { .v = (int []){   0, -25 } } },
+	{ MODKEY2 | ControlMask,                XK_comma,           exresize,           { .v = (int []){ -25, -25 } } },
+	{ MODKEY2 | ControlMask,                XK_period,          exresize,           { .v = (int []){  25,  25 } } },
+
+    /* MEDIA CONTROL */
+    { 0, XF86XK_Battery,                    spawn, SHCMD("pkill -RTMIN+3 dwmblocks") },
+    { 0, XF86XK_WWW,                        spawn, { .v = (const char *[]){ BROWSER, NULL } } },
+    { 0, XF86XK_DOS,                        spawn, { .v = termcmd } },
+    { 0, XF86XK_AudioMute,                  spawn, SHCMD("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioRaiseVolume,           spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%- && wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%+; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioLowerVolume,           spawn, SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0%+ && wpctl set-volume @DEFAULT_AUDIO_SINK@ 3%-; kill -44 $(pidof dwmblocks)") },
+    { 0, XF86XK_AudioPrev,                  spawn, { .v = (const char *[]){ "mpc", "prev", NULL } } },
+    { 0, XF86XK_AudioNext,                  spawn, { .v = (const char *[]){ "mpc", "next", NULL } } },
+    { 0, XF86XK_AudioPause,                 spawn, { .v = (const char *[]){ "mpc", "pause", NULL } } },
+    { 0, XF86XK_AudioPlay,                  spawn, { .v = (const char *[]){ "mpc", "play", NULL } } },
+    { 0, XF86XK_AudioStop,                  spawn, { .v = (const char *[]){ "mpc", "stop", NULL } } },
+    { 0, XF86XK_AudioRewind,                spawn, { .v = (const char *[]){ "mpc", "seek", "-10", NULL } } },
+    { 0, XF86XK_AudioForward,               spawn, { .v = (const char *[]){ "mpc", "seek", "+10", NULL } } },
+    { 0, XF86XK_AudioMedia,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
+    { 0, XF86XK_AudioMicMute,               spawn, SHCMD("pactl set-source-mute @DEFAULT_SOURCE@ toggle") },
+    { 0, XF86XK_PowerOff,                   spawn, { .v = (const char*[]){ "sysact", NULL } } },
+    { 0, XF86XK_Calculator,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "bc", "-l", NULL } } },
+    { 0, XF86XK_Sleep,                      spawn, { .v = (const char *[]){ "sudo", "-A", "zzz", NULL } } },
+    { 0, XF86XK_ScreenSaver,                spawn, SHCMD("slock & xset dpms force off; mpc pause; pauseallmpv") },
+    { 0, XF86XK_TaskPane,                   spawn, { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { 0, XF86XK_Mail,                       spawn, SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks") },
+    { 0, XF86XK_MyComputer,                 spawn, { .v = (const char *[]){ TERMINAL, "-e", "lfub", "/", NULL } } },
+    { 0, XF86XK_Launch1,                    spawn, { .v = (const char *[]){ "xset", "dpms", "force", "off", NULL } } },
+    { 0, XF86XK_TouchpadToggle,             spawn, SHCMD("(synclient | grep 'TouchpadOff.*1' && synclient TouchpadOff=0) || synclient TouchpadOff=1") },
+    { 0, XF86XK_TouchpadOff,                spawn, { .v = (const char *[]){ "synclient", "TouchpadOff=1", NULL } } },
+    { 0, XF86XK_TouchpadOn,                 spawn, { .v = (const char *[]){ "synclient", "TouchpadOff=0", NULL } } },
+    { 0, XF86XK_MonBrightnessUp,            spawn, { .v = (const char *[]){ "brillo", "-U", "5", "-q", NULL } } },
+    { 0, XF86XK_MonBrightnessDown,          spawn, { .v = (const char *[]){ "brillo", "-A", "5", "-q", NULL } } },
+
+    /* MODE */
+	{ MODKEY,                               XK_Escape,          setkeymode,         { .ui = ModeCommand } },
+
+    /* PROGRAM */
+    { MODKEY,                               XK_d,               spawn,              { .v = (const char *[]){ "dmenu_run", NULL } } },
+    { MODKEY,                               XK_e,               spawn,              SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { MODKEY,                               XK_n,               spawn,              SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+    { MODKEY,                               XK_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
+    { MODKEY | ShiftMask,                   XK_r,               spawn,              { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { MODKEY,                               XK_w,               spawn,              { .v = (const char *[]){ BROWSER, NULL } } },
+    { MODKEY,                               XK_c,               togglescratch,      { .ui = 1 } }, /* calculator */
+    { MODKEY,                               XK_u,               spawn,              { .v = (const char *[]){ "dmenuunicode", NULL } } },
+    { MODKEY,                               XK_Return,          spawn,              { .v = termcmd } },
+    { MODKEY | ShiftMask,                   XK_Return,          spawn,              { .v = (const char *[]){ "sd", NULL } } },
+    { MODKEY | ControlMask,                 XK_Return,          togglescratch,      { .ui = 0 } }, /* terminal */
+
+    /* SCRIPT */
+    { MODKEY | ShiftMask,                   XK_d,               spawn,              { .v = (const char *[]){ "passmenu", NULL } } },
+    { MODKEY | ControlMask,                 XK_d,               spawn,              { .v = (const char *[]){ "passmenu2", NULL } } },
+    { MODKEY | ShiftMask,                   XK_f,               spawn,              { .v = (const char *[]){ "fecrypt", NULL } } },
+    { MODKEY,                               XK_v,               spawn,              { .v = (const char *[]){ "mpvplay", NULL } } },
+    { MODKEY,                               XK_Insert,          spawn,              SHCMD("xdotool type $(grep -v '^#' ~/.local/share/thesiah/snippets | dmenu -i -l 50 | cut -d' ' -f1)") },
+    { 0,                                    XK_Print,           spawn,              SHCMD("maim | tee ~/Pictures/screenshot-$(date '+%y%m%d-%H%M-%S').png | xclip -selection clipboard") },
+    { ShiftMask,                            XK_Print,           spawn,              { .v = (const char *[]){ "maimpick", NULL } } },
+    { MODKEY,                               XK_Print,           spawn,              { .v = (const char *[]){ "dmenurecord", NULL } } },
+    { MODKEY,                               XK_Delete,          spawn,              { .v = (const char *[]){ "dmenurecord", "kill", NULL } } },
+    { MODKEY,                               XK_Scroll_Lock,     spawn,              SHCMD("killall screenkey || screenkey -t 3 -p fixed -s small -g 20%x5%+40%-5% --key-mode keysyms --bak-mode normal --mods-mode normal -f ttf-font-awesome --opacity 0.5 &") },
+    { MODKEY,                               XK_F1,              spawn,              SHCMD("groff -mom /home/si/.local/share/man/thesiah/thesiah.mom -Tpdf | zathura -") },
+    { MODKEY | ShiftMask,                   XK_F1,              spawn,              SHCMD("nsxiv ~/Pictures/resources") },
+    { MODKEY | ControlMask,                 XK_F1,              spawn,              { .v = (const char *[]){ TERMINAL, "-e", "dman", NULL } } },
+    { MODKEY,                               XK_F2,              spawn,              { .v = (const char *[]){ "tutorialvids", NULL } } },
+    { MODKEY,                               XK_F3,              spawn,              { .v = (const char *[]){ "displayselect", NULL } } },
+    { MODKEY,                               XK_F4,              spawn,              SHCMD(TERMINAL " -e pulsemixer; kill -44 $(pidof dwmblocks)") },
+    { MODKEY,                               XK_F5,              xrdb,               { .v = NULL } },
+    { MODKEY | ShiftMask,                   XK_F5,              spawn,              SHCMD("stw ~/.dotfiles/arch -d") },
+    { MODKEY | ControlMask,                 XK_F5,              spawn,              { .v = (const char *[]){ "pacupgrade", NULL } } },
+    { MODKEY,                               XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-v", NULL } } },
+    { MODKEY | ShiftMask,                   XK_F6,              spawn,              { .v = (const char *[]){ "qndl", "-m", NULL } } },
+    { MODKEY,                               XK_F7,              spawn,              { .v = (const char *[]){ "td-toggle", NULL } } },
+    { MODKEY | ShiftMask,                   XK_F7,              spawn,              { .v = (const char *[]){ "transadd", NULL } } },
+    { MODKEY,                               XK_F8,              spawn,              { .v = (const char *[]){ "mailsync", NULL } } },
+    { MODKEY,                               XK_F9,              spawn,              { .v = (const char *[]){ "mounter", NULL } } },
+    { MODKEY,                               XK_F10,             spawn,              { .v = (const char *[]){ "unmounter", NULL } } },
+    { MODKEY,                               XK_F11,             spawn,              SHCMD("mpv --untimed --no-cache --no-osc --no-input-default-bindings --profile=low-latency --input-conf=/dev/null --title=webcam $(ls " "/dev/video[0,2,4,6,8] | tail -n 1)") },
+    { MODKEY,                               XK_F12,             spawn,              SHCMD("remaps") },
+    { MODKEY | ShiftMask,                   XK_F12,             spawn,              { .v = (const char *[]){ "fcitx5-configtool", NULL } } },
+
+    /* SYSTEM */
+    { MODKEY | ControlMask,                 XK_f,               spawn,              SHCMD("pkill -f firefox") },
+    { MODKEY | ControlMask,                 XK_k,               spawn,              SHCMD("pkill -f kakaotalk") },
+    { MODKEY,                               XK_q,               killclient,         {0} },
+    { MODKEY | ShiftMask,                   XK_q,               killclient,         { .ui = 1 } },
+    { MODKEY | ControlMask,                 XK_q,               killclient,         { .ui = 2 } },
+    { MODKEY,                               XK_BackSpace,       spawn,              { .v = (const char *[]){ "slock", NULL } } },
+    { MODKEY | ShiftMask,                   XK_BackSpace,       spawn,              { .v = (const char *[]){ "sysact", NULL } } },
+    { MODKEY,                               XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-; kill -44 $(pidof dwmblocks)") },
+    { MODKEY,                               XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ShiftMask,                   XK_minus,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%-; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ShiftMask,                   XK_equal,           spawn,              SHCMD("wpctl set-volume @DEFAULT_AUDIO_SINK@ 15%+; kill -44 $(pidof dwmblocks)") },
+    { MODKEY | ControlMask,                 XK_minus,           spawn,              { .v = (const char *[]){ "brillo", "-U", "5", "-q", NULL } } },
+    { MODKEY | ControlMask,                 XK_equal,           spawn,              { .v = (const char *[]){ "brillo", "-A", "5", "-q", NULL } } },
+    { 0,                                    XK_Alt_R,           spawn,              SHCMD("fcitx5-remote -t; pkill -RTMIN+29 dwmblocks") },
+	{ ControlMask,                          XK_F5,              quit,               {1} },
+    { ShiftMask | ControlMask,              XK_F5,              spawn,              SHCMD("killall -q dwmblocks; setsid -f dwmblocks") },
+
+    /* TRAVERSAL */
+    { MODKEY | ShiftMask,                   XK_0,               tag,                { .ui = ~0 } },
+	{ MODKEY2,                              XK_comma,           shiftview,          { .i = -1 } },
+	{ MODKEY2,                              XK_period,          shiftview,          { .i = 1 } },
+    { MODKEY2 | ShiftMask,                  XK_comma,           shifttag,           { .i = -1 } },
+    { MODKEY2 | ShiftMask,                  XK_period,          shifttag,           { .i = 1 } },
+	{ MODKEY,                               XK_comma,           shiftviewclients,   { .i = -1 } },
+	{ MODKEY,                               XK_period,          shiftviewclients,   { .i = +1 } },
+	{ MODKEY | ShiftMask,                   XK_comma,           shifttagclients,    { .i = -1 } },
+	{ MODKEY | ShiftMask,                   XK_period,          shifttagclients,    { .i = +1 } },
+	{ MODKEY | ControlMask,                 XK_comma,           shiftboth,          { .i = -1 } },
+	{ MODKEY | ControlMask,                 XK_period,          shiftboth,          { .i = +1 } },
+	{ MODKEY | ShiftMask | ControlMask,     XK_comma,           shiftswaptags,      { .i = -1 }	},
+	{ MODKEY | ShiftMask | ControlMask,     XK_period,          shiftswaptags,      { .i = +1 }	},
+    { MODKEY,                               XK_Left,            focusmon,           { .i = -1 } },
+    { MODKEY,                               XK_Right,           focusmon,           { .i = +1 } },
+    { MODKEY | ShiftMask,                   XK_Left,            tagmon,             { .i = -1 } },
+    { MODKEY | ShiftMask,                   XK_Right,           tagmon,             { .i = +1 } },
+    { MODKEY | ShiftMask,                   XK_Tab,             view,               {0} },
+
+    /* { MODKEY | ShiftMask,                   XK_apostrophe,      togglesmartgaps,    {0} }, */
+  
+};
+
+static Key cmdkeys[] = {
+	/* modifier                         keys                function        argument */
+	{ 0,                                XK_Escape,          clearcmd,       {0} },
+	{ ControlMask,                      XK_c,               clearcmd,       {0} },
+	{ ControlMask,                      XK_x,               setkeymode,     { .ui = ModeInsert } },
+};
+
+static Command commands[] = {
+    /* STACKKEYS */
+    CSTACKKEYS(MODKEY,               focus)
+    CSTACKKEYS(MODKEY | ShiftMask,   push)
+
+    /* TAGKEYS */
+	CTAGKEYS(XK_1, 0)
+	CTAGKEYS(XK_2, 1)
+	CTAGKEYS(XK_3, 2)
+	CTAGKEYS(XK_4, 3)
+	CTAGKEYS(XK_5, 4)
+	CTAGKEYS(XK_6, 5)
+	CTAGKEYS(XK_7, 6)
+	CTAGKEYS(XK_8, 7)
+	CTAGKEYS(XK_9, 8)
+
+    /* Modifier (4 keys)                keysyms (4 keys)            function                argument */
+    /* APPEARANCE */
+    { { ShiftMask, 0, 0, 0 },           { XK_b, 0, 0, 0 },          togglebar,              {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_b, 0, 0, 0 },          togglebar,              { .i = 1 } },
+    { { ShiftMask, 0, 0, 0 },           { XK_o, 0, 0, 0 },          toggleborder,           {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_f, 0, 0, 0 },          togglefloating,         {0} },
+    { { ShiftMask, 0, 0, 0 },           { XK_g, 0, 0, 0 },          togglegaps,             {0} },
+    { { ControlMask, 0, 0, 0 },         { XK_g, 0, 0, 0 },          defaultgaps,            {0} },
+
+    /* LAYOUT */
+    { { 0, 0, 0, 0 },                   { XK_l, XK_t, 0, 0 },       setlayout,              { .v = &layouts[0] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_m, 0, 0 },       setlayout,              { .v = &layouts[1] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_l, 0 },    setlayout,              { .v = &layouts[2] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_s, 0, 0 },       setlayout,              { .v = &layouts[3] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_w, 0, 0 },       setlayout,              { .v = &layouts[4] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_d, 0, 0 },       setlayout,              { .v = &layouts[5] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_b, XK_e, 0 },    setlayout,              { .v = &layouts[6] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_b, XK_h, 0 },    setlayout,              { .v = &layouts[7] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_e, 0 },    setlayout,              { .v = &layouts[8] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_r, 0 },    setlayout,              { .v = &layouts[9] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_h, 0 },    setlayout,              { .v = &layouts[10] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_g, XK_g, 0 },    setlayout,              { .v = &layouts[11] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_m, 0 },    setlayout,              { .v = &layouts[12] } },
+    { { 0, 0, 0, 0 },                   { XK_l, XK_c, XK_f, 0 },    setlayout,              { .v = &layouts[13] } },
+
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_u, 0, 0 },       explace,                { .ui = EX_NW } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_i, 0, 0 },       explace,                { .ui = EX_N } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_o, 0, 0 },       explace,                { .ui = EX_NE } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_h, 0, 0 },       explace,                { .ui = EX_W } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_k, 0, 0 },       explace,                { .ui = EX_C } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_l, 0, 0 },       explace,                { .ui = EX_E } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_m, 0, 0 },       explace,                { .ui = EX_SW } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_comma, 0, 0 },   explace,                { .ui = EX_S } },
+	{ { 0, 0, 0, 0 },                   { XK_f, XK_period, 0, 0 },  explace,                { .ui = EX_SE } },
+
+    /* FLOATING SIZE */
+	{ { ControlMask, 0, 0, 0 },         { XK_j, 0, 0, 0 },          exresize,               { .v = (int []){   0,  25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_k, 0, 0, 0 },          exresize,               { .v = (int []){   0, -25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_l, 0, 0, 0 },          exresize,               { .v = (int []){  25,   0 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_h, 0, 0, 0 },          exresize,               { .v = (int []){ -25,   0 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_comma, 0, 0, 0 },      exresize,               { .v = (int []){ -25, -25 } } },
+	{ { ControlMask, 0, 0, 0 },         { XK_period, 0, 0, 0 },     exresize,               { .v = (int []){  25,  25 } } },
+
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_h, 0 },    togglehorizontalexpand, { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_h, 0 },    togglehorizontalexpand, { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_h, 0 },    togglehorizontalexpand, { .i = -1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_v, 0 },    toggleverticalexpand,   { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_v, 0 },    toggleverticalexpand,   { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_v, 0 },    toggleverticalexpand,   { .i = -1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_i, XK_m, 0 },    togglemaximize,         { .i = +1 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_r, XK_m, 0 },    togglemaximize,         { .i =  0 } },
+	{ { ControlMask, 0, 0, 0 },         { XK_f, XK_d, XK_m, 0 },    togglemaximize,         { .i = -1 } },
+
+    /* PROGRAM */
+    { { 0, 0, 0, 0 },                   { XK_a, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e abook -C ~/.abook/abookrc --datafile ~/.abook/addressbook") },
+    { { 0, 0, 0, 0 },                   { XK_e, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e neomutt ; pkill -RTMIN+12 dwmblocks; rmdir ~/.abook 2>/dev/null") },
+    { { 0, 0, 0, 0 },                   { XK_g, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "gimp", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_h, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "htop", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_k, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ "kakaotalk", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_m, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "ncmpcpp", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_n, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e newsboat ; pkill -RTMIN+6 dwmblocks") },
+    { { 0, 0, 0, 0 },                   { XK_p, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "profanity", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_r, 0, 0, 0 },          spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "lfub", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_s, 0, 0, 0 },          spawn,                  SHCMD(TERMINAL " -e sc-im /home/si/.dotfiles/THESIAH/progs.csv") },
+    { { 0, 0, 0, 0 },                   { XK_t, XK_h, 0, 0 },       spawn,                  { .v = (const char *[]){ "thunderbird", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_t, XK_w, 0, 0 },       spawn,                  { .v = (const char *[]){ "torwrap", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_v, 0,    0, 0 },       spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "nvim", "-c", "VimwikiIndex", "1", NULL } } },
+    { { 0, 0, 0, 0 },                   { XK_w, XK_e, 0, 0 },       spawn,                  SHCMD(TERMINAL " -e less -Sf ${XDG_CACHE_HOME:-$HOME/.cache}/weatherreport") },
+    { { 0, 0, 0, 0 },                   { XK_w, XK_f, 0, 0 },       spawn,                  { .v = (const char *[]){ TERMINAL, "-e", "sudo", "nmtui", NULL } } },
+};
+
+/* button definitions */
+/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
+ * ClkClientWin, or ClkRootWin */
+static const Button buttons[] = {
+/*      click           event mask      button      function        argument */
+#ifndef __OpenBSD__
+    { ClkWinTitle,      0,              Button2,    zoom, {0} },
+    { ClkStatusText,    0,              Button1,    sigdwmblocks,   { .i = 1 } },
+    { ClkStatusText,    0,              Button2,    sigdwmblocks,   { .i = 2 } },
+    { ClkStatusText,    0,              Button3,    sigdwmblocks,   { .i = 3 } },
+    { ClkStatusText,    0,              Button4,    sigdwmblocks,   { .i = 4 } },
+    { ClkStatusText,    0,              Button5,    sigdwmblocks,   { .i = 5 } },
+    { ClkStatusText,    ShiftMask,      Button1,    sigdwmblocks,   { .i = 6 } },
+#endif
+    { ClkStatusText,    ShiftMask,      Button3,    spawn,          SHCMD(TERMINAL " -e nvim ~/.local/src/suckless/dwmblocks/config.h") },
+    { ClkClientWin,     MODKEY,         Button1,    movemouse,      {0} },
+    { ClkClientWin,     MODKEY,         Button2,    defaultgaps,    {0} },
+    { ClkClientWin,     MODKEY,         Button3,    resizemouse,    {0} },
+    { ClkClientWin,     MODKEY,         Button4,    incrgaps,       { .i = +1 } },
+    { ClkClientWin,     MODKEY,         Button5,    incrgaps,       { .i = -1 } },
+    { ClkTagBar,        0,              Button1,    view,           {0} },
+    { ClkTagBar,        0,              Button3,    toggleview,     {0} },
+    { ClkTagBar,        MODKEY,         Button1,    tag,            {0} },
+    { ClkTagBar,        MODKEY,         Button3,    toggletag,      {0} },
+    { ClkTagBar,        0,              Button4,    shiftview,      { .i = -1 } },
+    { ClkTagBar,        0,              Button5,    shiftview,      { .i = 1 } },
+    { ClkRootWin,       0,              Button2,    togglebar,      {0} },
+};
diff --git a/dwm/config.mk b/dwm/config.mk
index 0d70060..13ed3dc 100644
--- a/dwm/config.mk
+++ b/dwm/config.mk
@@ -23,7 +23,7 @@ FREETYPEINC = /usr/include/freetype2
 
 # includes and libs
 INCS = -I${X11INC} -I${FREETYPEINC}
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res
+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lX11-xcb -lxcb -lxcb-res -lXrender
 
 # flags
 CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
diff --git a/dwm/drw.c b/dwm/drw.c
index 975ca63..2d1c6ec 100644
--- a/dwm/drw.c
+++ b/dwm/drw.c
@@ -1,453 +1,430 @@
 /* See LICENSE file for copyright and license details. */
+#include <X11/Xft/Xft.h>
+#include <X11/Xlib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
 
 #include "drw.h"
 #include "util.h"
 
 #define UTF_INVALID 0xFFFD
-#define UTF_SIZ     4
-
-static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
-static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static const long utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
-static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
-
-static long
-utf8decodebyte(const char c, size_t *i)
-{
-	for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
-		if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
-			return (unsigned char)c & ~utfmask[*i];
-	return 0;
+#define UTF_SIZ 4
+
+static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80, 0, 0xC0, 0xE0, 0xF0};
+static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0,
+                                                   0xF8};
+static const long utfmin[UTF_SIZ + 1] = {0, 0, 0x80, 0x800, 0x10000};
+static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF,
+                                         0x10FFFF};
+
+static long utf8decodebyte(const char c, size_t *i) {
+  for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
+    if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
+      return (unsigned char)c & ~utfmask[*i];
+  return 0;
 }
 
-static size_t
-utf8validate(long *u, size_t i)
-{
-	if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
-		*u = UTF_INVALID;
-	for (i = 1; *u > utfmax[i]; ++i)
-		;
-	return i;
+static size_t utf8validate(long *u, size_t i) {
+  if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
+    *u = UTF_INVALID;
+  for (i = 1; *u > utfmax[i]; ++i)
+    ;
+  return i;
 }
 
-static size_t
-utf8decode(const char *c, long *u, size_t clen)
-{
-	size_t i, j, len, type;
-	long udecoded;
-
-	*u = UTF_INVALID;
-	if (!clen)
-		return 0;
-	udecoded = utf8decodebyte(c[0], &len);
-	if (!BETWEEN(len, 1, UTF_SIZ))
-		return 1;
-	for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
-		udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
-		if (type)
-			return j;
-	}
-	if (j < len)
-		return 0;
-	*u = udecoded;
-	utf8validate(u, len);
-
-	return len;
+static size_t utf8decode(const char *c, long *u, size_t clen) {
+  size_t i, j, len, type;
+  long udecoded;
+
+  *u = UTF_INVALID;
+  if (!clen)
+    return 0;
+  udecoded = utf8decodebyte(c[0], &len);
+  if (!BETWEEN(len, 1, UTF_SIZ))
+    return 1;
+  for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
+    udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
+    if (type)
+      return j;
+  }
+  if (j < len)
+    return 0;
+  *u = udecoded;
+  utf8validate(u, len);
+
+  return len;
 }
 
-Drw *
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
-{
-	Drw *drw = ecalloc(1, sizeof(Drw));
-
-	drw->dpy = dpy;
-	drw->screen = screen;
-	drw->root = root;
-	drw->w = w;
-	drw->h = h;
-	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
-	drw->gc = XCreateGC(dpy, root, 0, NULL);
-	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
-
-	return drw;
+Drw *drw_create(Display *dpy, int screen, Window root, unsigned int w,
+                unsigned int h, Visual *visual, unsigned int depth,
+                Colormap cmap) {
+  Drw *drw = ecalloc(1, sizeof(Drw));
+
+  drw->dpy = dpy;
+  drw->screen = screen;
+  drw->root = root;
+  drw->w = w;
+  drw->h = h;
+  drw->visual = visual;
+  drw->depth = depth;
+  drw->cmap = cmap;
+  drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
+  drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
+  XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
+
+  return drw;
 }
 
-void
-drw_resize(Drw *drw, unsigned int w, unsigned int h)
-{
-	if (!drw)
-		return;
-
-	drw->w = w;
-	drw->h = h;
-	if (drw->drawable)
-		XFreePixmap(drw->dpy, drw->drawable);
-	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
+void drw_resize(Drw *drw, unsigned int w, unsigned int h) {
+  if (!drw)
+    return;
+
+  drw->w = w;
+  drw->h = h;
+  if (drw->drawable)
+    XFreePixmap(drw->dpy, drw->drawable);
+  drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
 }
 
-void
-drw_free(Drw *drw)
-{
-	XFreePixmap(drw->dpy, drw->drawable);
-	XFreeGC(drw->dpy, drw->gc);
-	drw_fontset_free(drw->fonts);
-	free(drw);
+void drw_free(Drw *drw) {
+  XFreePixmap(drw->dpy, drw->drawable);
+  XFreeGC(drw->dpy, drw->gc);
+  drw_fontset_free(drw->fonts);
+  free(drw);
 }
 
 /* This function is an implementation detail. Library users should use
  * drw_fontset_create instead.
  */
-static Fnt *
-xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
-{
-	Fnt *font;
-	XftFont *xfont = NULL;
-	FcPattern *pattern = NULL;
-
-	if (fontname) {
-		/* Using the pattern found at font->xfont->pattern does not yield the
-		 * same substitution results as using the pattern returned by
-		 * FcNameParse; using the latter results in the desired fallback
-		 * behaviour whereas the former just results in missing-character
-		 * rectangles being drawn, at least with some fonts. */
-		if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
-			fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
-			return NULL;
-		}
-		if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
-			fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
-			XftFontClose(drw->dpy, xfont);
-			return NULL;
-		}
-	} else if (fontpattern) {
-		if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
-			fprintf(stderr, "error, cannot load font from pattern.\n");
-			return NULL;
-		}
-	} else {
-		die("no font specified.");
-	}
-
-	font = ecalloc(1, sizeof(Fnt));
-	font->xfont = xfont;
-	font->pattern = pattern;
-	font->h = xfont->ascent + xfont->descent;
-	font->dpy = drw->dpy;
-
-	return font;
+static Fnt *xfont_create(Drw *drw, const char *fontname,
+                         FcPattern *fontpattern) {
+  Fnt *font;
+  XftFont *xfont = NULL;
+  FcPattern *pattern = NULL;
+
+  if (fontname) {
+    /* Using the pattern found at font->xfont->pattern does not yield the
+     * same substitution results as using the pattern returned by
+     * FcNameParse; using the latter results in the desired fallback
+     * behaviour whereas the former just results in missing-character
+     * rectangles being drawn, at least with some fonts. */
+    if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
+      fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
+      return NULL;
+    }
+    if (!(pattern = FcNameParse((FcChar8 *)fontname))) {
+      fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n",
+              fontname);
+      XftFontClose(drw->dpy, xfont);
+      return NULL;
+    }
+  } else if (fontpattern) {
+    if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
+      fprintf(stderr, "error, cannot load font from pattern.\n");
+      return NULL;
+    }
+  } else {
+    die("no font specified.");
+  }
+
+  font = ecalloc(1, sizeof(Fnt));
+  font->xfont = xfont;
+  font->pattern = pattern;
+  font->h = xfont->ascent + xfont->descent;
+  font->dpy = drw->dpy;
+
+  return font;
 }
 
-static void
-xfont_free(Fnt *font)
-{
-	if (!font)
-		return;
-	if (font->pattern)
-		FcPatternDestroy(font->pattern);
-	XftFontClose(font->dpy, font->xfont);
-	free(font);
+static void xfont_free(Fnt *font) {
+  if (!font)
+    return;
+  if (font->pattern)
+    FcPatternDestroy(font->pattern);
+  XftFontClose(font->dpy, font->xfont);
+  free(font);
 }
 
-Fnt*
-drw_fontset_create(Drw* drw, char *fonts[], size_t fontcount)
-{
-	Fnt *cur, *ret = NULL;
-	size_t i;
-
-	if (!drw || !fonts)
-		return NULL;
-
-	for (i = 1; i <= fontcount; i++) {
-		if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
-			cur->next = ret;
-			ret = cur;
-		}
-	}
-	return (drw->fonts = ret);
+Fnt *drw_fontset_create(Drw *drw, char *fonts[], size_t fontcount) {
+  Fnt *cur, *ret = NULL;
+  size_t i;
+
+  if (!drw || !fonts)
+    return NULL;
+
+  for (i = 1; i <= fontcount; i++) {
+    if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
+      cur->next = ret;
+      ret = cur;
+    }
+  }
+  return (drw->fonts = ret);
 }
 
-void
-drw_fontset_free(Fnt *font)
-{
-	if (font) {
-		drw_fontset_free(font->next);
-		xfont_free(font);
-	}
+void drw_fontset_free(Fnt *font) {
+  if (font) {
+    drw_fontset_free(font->next);
+    xfont_free(font);
+  }
 }
 
-void
-drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
-{
-	if (!drw || !dest || !clrname)
-		return;
+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname,
+                    unsigned int alpha) {
+  if (!drw || !dest || !clrname)
+    return;
 
-	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
-	                       DefaultColormap(drw->dpy, drw->screen),
-	                       clrname, dest))
-		die("error, cannot allocate color '%s'", clrname);
+  if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap, clrname, dest))
+    die("error, cannot allocate color '%s'", clrname);
 
-	dest->pixel |= 0xff << 24;
+  dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24);
 }
 
 /* Wrapper to create color schemes. The caller has to call free(3) on the
  * returned color scheme when done using it. */
-Clr *
-drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount)
-{
-	size_t i;
-	Clr *ret;
-
-	/* need at least two colors for a scheme */
-	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
-		return NULL;
-
-	for (i = 0; i < clrcount; i++)
-		drw_clr_create(drw, &ret[i], clrnames[i]);
-	return ret;
+Clr *drw_scm_create(Drw *drw, char *clrnames[], const unsigned int alphas[],
+                    size_t clrcount) {
+  size_t i;
+  Clr *ret;
+
+  /* need at least two colors for a scheme */
+  if (!drw || !clrnames || clrcount < 2 ||
+      !(ret = ecalloc(clrcount, sizeof(XftColor))))
+    return NULL;
+
+  for (i = 0; i < clrcount; i++)
+    drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]);
+  return ret;
 }
 
-void
-drw_setfontset(Drw *drw, Fnt *set)
-{
-	if (drw)
-		drw->fonts = set;
+void drw_setfontset(Drw *drw, Fnt *set) {
+  if (drw)
+    drw->fonts = set;
 }
 
-void
-drw_setscheme(Drw *drw, Clr *scm)
-{
-	if (drw)
-		drw->scheme = scm;
+void drw_setscheme(Drw *drw, Clr *scm) {
+  if (drw)
+    drw->scheme = scm;
 }
 
-void
-drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
-{
-	if (!drw || !drw->scheme)
-		return;
-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
-	if (filled)
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-	else
-		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
+void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h,
+              int filled, int invert) {
+  if (!drw || !drw->scheme)
+    return;
+  XSetForeground(drw->dpy, drw->gc,
+                 invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
+  if (filled)
+    XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
+  else
+    XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
 }
 
-int
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
-{
-	int i, ty, ellipsis_x = 0;
-	unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
-	XftDraw *d = NULL;
-	Fnt *usedfont, *curfont, *nextfont;
-	int utf8strlen, utf8charlen, render = x || y || w || h;
-	long utf8codepoint = 0;
-	const char *utf8str;
-	FcCharSet *fccharset;
-	FcPattern *fcpattern;
-	FcPattern *match;
-	XftResult result;
-	int charexists = 0, overflow = 0;
-	/* keep track of a couple codepoints for which we have no match. */
-	enum { nomatches_len = 64 };
-	static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches;
-	static unsigned int ellipsis_width = 0;
-
-	if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
-		return 0;
-
-	if (!render) {
-		w = invert ? invert : ~invert;
-	} else {
-		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-		d = XftDrawCreate(drw->dpy, drw->drawable,
-		                  DefaultVisual(drw->dpy, drw->screen),
-		                  DefaultColormap(drw->dpy, drw->screen));
-		x += lpad;
-		w -= lpad;
-	}
-
-	usedfont = drw->fonts;
-	if (!ellipsis_width && render)
-		ellipsis_width = drw_fontset_getwidth(drw, "...");
-	while (1) {
-		ew = ellipsis_len = utf8strlen = 0;
-		utf8str = text;
-		nextfont = NULL;
-		while (*text) {
-			utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
-			for (curfont = drw->fonts; curfont; curfont = curfont->next) {
-				charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
-				if (charexists) {
-					drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
-					if (ew + ellipsis_width <= w) {
-						/* keep track where the ellipsis still fits */
-						ellipsis_x = x + ew;
-						ellipsis_w = w - ew;
-						ellipsis_len = utf8strlen;
-					}
-
-					if (ew + tmpw > w) {
-						overflow = 1;
-						/* called from drw_fontset_getwidth_clamp():
-						 * it wants the width AFTER the overflow
-						 */
-						if (!render)
-							x += tmpw;
-						else
-							utf8strlen = ellipsis_len;
-					} else if (curfont == usedfont) {
-						utf8strlen += utf8charlen;
-						text += utf8charlen;
-						ew += tmpw;
-					} else {
-						nextfont = curfont;
-					}
-					break;
-				}
-			}
-
-			if (overflow || !charexists || nextfont)
-				break;
-			else
-				charexists = 0;
-		}
-
-		if (utf8strlen) {
-			if (render) {
-				ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
-				XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
-				                  usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen);
-			}
-			x += ew;
-			w -= ew;
-		}
-		if (render && overflow)
-			drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert);
-
-		if (!*text || overflow) {
-			break;
-		} else if (nextfont) {
-			charexists = 0;
-			usedfont = nextfont;
-		} else {
-			/* Regardless of whether or not a fallback font is found, the
-			 * character must be drawn. */
-			charexists = 1;
-
-			for (i = 0; i < nomatches_len; ++i) {
-				/* avoid calling XftFontMatch if we know we won't find a match */
-				if (utf8codepoint == nomatches.codepoint[i])
-					goto no_match;
-			}
-
-			fccharset = FcCharSetCreate();
-			FcCharSetAddChar(fccharset, utf8codepoint);
-
-			if (!drw->fonts->pattern) {
-				/* Refer to the comment in xfont_create for more information. */
-				die("the first font in the cache must be loaded from a font string.");
-			}
-
-			fcpattern = FcPatternDuplicate(drw->fonts->pattern);
-			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
-			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-			FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
-
-			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
-			FcDefaultSubstitute(fcpattern);
-			match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
-
-			FcCharSetDestroy(fccharset);
-			FcPatternDestroy(fcpattern);
-
-			if (match) {
-				usedfont = xfont_create(drw, NULL, match);
-				if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
-					for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
-						; /* NOP */
-					curfont->next = usedfont;
-				} else {
-					xfont_free(usedfont);
-					nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint;
-no_match:
-					usedfont = drw->fonts;
-				}
-			}
-		}
-	}
-	if (d)
-		XftDrawDestroy(d);
-
-	return x + (render ? w : 0);
+int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h,
+             unsigned int lpad, const char *text, int invert) {
+  int i, ty, ellipsis_x = 0;
+  unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
+  XftDraw *d = NULL;
+  Fnt *usedfont, *curfont, *nextfont;
+  int utf8strlen, utf8charlen, render = x || y || w || h;
+  long utf8codepoint = 0;
+  const char *utf8str;
+  FcCharSet *fccharset;
+  FcPattern *fcpattern;
+  FcPattern *match;
+  XftResult result;
+  int charexists = 0, overflow = 0;
+  /* keep track of a couple codepoints for which we have no match. */
+  enum { nomatches_len = 64 };
+  static struct {
+    long codepoint[nomatches_len];
+    unsigned int idx;
+  } nomatches;
+  static unsigned int ellipsis_width = 0;
+
+  if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
+    return 0;
+
+  if (!render) {
+    w = invert ? invert : ~invert;
+  } else {
+    XSetForeground(drw->dpy, drw->gc,
+                   drw->scheme[invert ? ColFg : ColBg].pixel);
+    XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
+    d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
+    x += lpad;
+    w -= lpad;
+  }
+
+  usedfont = drw->fonts;
+  if (!ellipsis_width && render)
+    ellipsis_width = drw_fontset_getwidth(drw, "...");
+  while (1) {
+    ew = ellipsis_len = utf8strlen = 0;
+    utf8str = text;
+    nextfont = NULL;
+    while (*text) {
+      utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
+      for (curfont = drw->fonts; curfont; curfont = curfont->next) {
+        charexists = charexists ||
+                     XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
+        if (charexists) {
+          drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
+          if (ew + ellipsis_width <= w) {
+            /* keep track where the ellipsis still fits */
+            ellipsis_x = x + ew;
+            ellipsis_w = w - ew;
+            ellipsis_len = utf8strlen;
+          }
+
+          if (ew + tmpw > w) {
+            overflow = 1;
+            /* called from drw_fontset_getwidth_clamp():
+             * it wants the width AFTER the overflow
+             */
+            if (!render)
+              x += tmpw;
+            else
+              utf8strlen = ellipsis_len;
+          } else if (curfont == usedfont) {
+            utf8strlen += utf8charlen;
+            text += utf8charlen;
+            ew += tmpw;
+          } else {
+            nextfont = curfont;
+          }
+          break;
+        }
+      }
+
+      if (overflow || !charexists || nextfont)
+        break;
+      else
+        charexists = 0;
+    }
+
+    if (utf8strlen) {
+      if (render) {
+        ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
+        XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
+                          usedfont->xfont, x, ty, (XftChar8 *)utf8str,
+                          utf8strlen);
+      }
+      x += ew;
+      w -= ew;
+    }
+    if (render && overflow)
+      drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, "...", invert);
+
+    if (!*text || overflow) {
+      break;
+    } else if (nextfont) {
+      charexists = 0;
+      usedfont = nextfont;
+    } else {
+      /* Regardless of whether or not a fallback font is found, the
+       * character must be drawn. */
+      charexists = 1;
+
+      for (i = 0; i < nomatches_len; ++i) {
+        /* avoid calling XftFontMatch if we know we won't find a match */
+        if (utf8codepoint == nomatches.codepoint[i])
+          goto no_match;
+      }
+
+      fccharset = FcCharSetCreate();
+      FcCharSetAddChar(fccharset, utf8codepoint);
+
+      if (!drw->fonts->pattern) {
+        /* Refer to the comment in xfont_create for more information. */
+        die("the first font in the cache must be loaded from a font string.");
+      }
+
+      fcpattern = FcPatternDuplicate(drw->fonts->pattern);
+      FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
+      FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
+      FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
+
+      FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
+      FcDefaultSubstitute(fcpattern);
+      match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
+
+      FcCharSetDestroy(fccharset);
+      FcPatternDestroy(fcpattern);
+
+      if (match) {
+        usedfont = xfont_create(drw, NULL, match);
+        if (usedfont &&
+            XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
+          for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
+            ; /* NOP */
+          curfont->next = usedfont;
+        } else {
+          xfont_free(usedfont);
+          nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint;
+        no_match:
+          usedfont = drw->fonts;
+        }
+      }
+    }
+  }
+  if (d)
+    XftDrawDestroy(d);
+
+  return x + (render ? w : 0);
 }
 
-void
-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
-{
-	if (!drw)
-		return;
+void drw_map(Drw *drw, Window win, int x, int y, unsigned int w,
+             unsigned int h) {
+  if (!drw)
+    return;
 
-	XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
-	XSync(drw->dpy, False);
+  XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
+  XSync(drw->dpy, False);
 }
 
-unsigned int
-drw_fontset_getwidth(Drw *drw, const char *text)
-{
-	if (!drw || !drw->fonts || !text)
-		return 0;
-	return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
+unsigned int drw_fontset_getwidth(Drw *drw, const char *text) {
+  if (!drw || !drw->fonts || !text)
+    return 0;
+  return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
 }
 
-unsigned int
-drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
-{
-	unsigned int tmp = 0;
-	if (drw && drw->fonts && text && n)
-		tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
-	return MIN(n, tmp);
+unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text,
+                                        unsigned int n) {
+  unsigned int tmp = 0;
+  if (drw && drw->fonts && text && n)
+    tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
+  return MIN(n, tmp);
 }
 
-void
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
-{
-	XGlyphInfo ext;
+void drw_font_getexts(Fnt *font, const char *text, unsigned int len,
+                      unsigned int *w, unsigned int *h) {
+  XGlyphInfo ext;
 
-	if (!font || !text)
-		return;
+  if (!font || !text)
+    return;
 
-	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
-	if (w)
-		*w = ext.xOff;
-	if (h)
-		*h = font->h;
+  XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
+  if (w)
+    *w = ext.xOff;
+  if (h)
+    *h = font->h;
 }
 
-Cur *
-drw_cur_create(Drw *drw, int shape)
-{
-	Cur *cur;
+Cur *drw_cur_create(Drw *drw, int shape) {
+  Cur *cur;
 
-	if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
-		return NULL;
+  if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
+    return NULL;
 
-	cur->cursor = XCreateFontCursor(drw->dpy, shape);
+  cur->cursor = XCreateFontCursor(drw->dpy, shape);
 
-	return cur;
+  return cur;
 }
 
-void
-drw_cur_free(Drw *drw, Cur *cursor)
-{
-	if (!cursor)
-		return;
+void drw_cur_free(Drw *drw, Cur *cursor) {
+  if (!cursor)
+    return;
 
-	XFreeCursor(drw->dpy, cursor->cursor);
-	free(cursor);
+  XFreeCursor(drw->dpy, cursor->cursor);
+  free(cursor);
 }
diff --git a/dwm/drw.h b/dwm/drw.h
index bfc027d..af763f9 100644
--- a/dwm/drw.h
+++ b/dwm/drw.h
@@ -20,6 +20,9 @@ typedef struct {
   Display *dpy;
   int screen;
   Window root;
+  Visual *visual;
+  unsigned int depth;
+  Colormap cmap;
   Drawable drawable;
   GC gc;
   Clr *scheme;
@@ -28,7 +31,8 @@ typedef struct {
 
 /* Drawable abstraction */
 Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w,
-                unsigned int h);
+                unsigned int h, Visual *visual, unsigned int depth,
+                Colormap cmap);
 void drw_resize(Drw *drw, unsigned int w, unsigned int h);
 void drw_free(Drw *drw);
 
@@ -42,8 +46,10 @@ void drw_font_getexts(Fnt *font, const char *text, unsigned int len,
                       unsigned int *w, unsigned int *h);
 
 /* Colorscheme abstraction */
-void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
-Clr *drw_scm_create(Drw *drw, char *clrnames[], size_t clrcount);
+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname,
+                    unsigned int alpha);
+Clr *drw_scm_create(Drw *drw, char *clrnames[], const unsigned int alphas[],
+                    size_t clrcount);
 
 /* Cursor abstraction */
 Cur *drw_cur_create(Drw *drw, int shape);
diff --git a/dwm/dwm.1 b/dwm/dwm.1
index 62fff83..b13fd9e 100644
--- a/dwm/dwm.1
+++ b/dwm/dwm.1
@@ -170,6 +170,9 @@ Add/remove all windows with nth tag to/from the view.
 .B Super\-Shift\-q
 Quit dwm.
 .TP
+.B Super\-Shift\-r
+Restart dwm.
+.TP
 .B Mod1\-Control\-Shift\-q
 Menu to refresh/quit/reboot/shutdown.
 .SS Mouse commands
diff --git a/dwm/dwm.c b/dwm/dwm.c
index d58bacd..f265f18 100644
--- a/dwm/dwm.c
+++ b/dwm/dwm.c
@@ -47,20 +47,24 @@
 #include "drw.h"
 #include "util.h"
 
+#include <assert.h>
+#include <libgen.h>
+#include <sys/stat.h>
+
 /* macros */
 #define BUTTONMASK (ButtonPressMask | ButtonReleaseMask)
-#define CLEANMASK(mask)                                                        \
-  (mask & ~(numlockmask | LockMask) &                                          \
-   (ShiftMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask |      \
-    Mod5Mask))
+#define CLEANMASK(mask)                                                     \
+    (mask & ~(numlockmask | LockMask) &                                     \
+     (ShiftMask | ControlMask | Mod1Mask | Mod2Mask | Mod3Mask | Mod4Mask | \
+      Mod5Mask))
 #define GETINC(X) ((X)-2000)
 #define INC(X) ((X) + 2000)
-#define INTERSECT(x, y, w, h, m)                                               \
-  (MAX(0, MIN((x) + (w), (m)->wx + (m)->ww) - MAX((x), (m)->wx)) *             \
-   MAX(0, MIN((y) + (h), (m)->wy + (m)->wh) - MAX((y), (m)->wy)))
+#define INTERSECT(x, y, w, h, m)                                     \
+    (MAX(0, MIN((x) + (w), (m)->wx + (m)->ww) - MAX((x), (m)->wx)) * \
+     MAX(0, MIN((y) + (h), (m)->wy + (m)->wh) - MAX((y), (m)->wy)))
 #define ISINC(X) ((X) > 1000 && (X) < 3000)
-#define ISVISIBLE(C)                                                           \
-  ((C->tags & C->mon->tagset[C->mon->seltags]) || C->issticky)
+#define ISVISIBLE(C) \
+    ((C->tags & C->mon->tagset[C->mon->seltags]) || C->issticky)
 #define PREVSEL 3000
 #define LENGTH(X) (sizeof X / sizeof X[0])
 #define MOUSEMASK (BUTTONMASK | PointerMotionMask)
@@ -73,130 +77,178 @@
 #define SPTAGMASK (((1 << LENGTH(scratchpads)) - 1) << LENGTH(tags))
 #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
 #define TRUNC(X, A, B) (MAX((A), MIN((X), (B))))
+#define ColFloat 3
+#define OPAQUE 0xffU
 
 /* enums */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { SchemeNorm, SchemeSel };                  /* color schemes */
-enum {
-  NetSupported,
-  NetWMName,
-  NetWMState,
-  NetWMCheck,
-  NetWMFullscreen,
-  NetActiveWindow,
-  NetWMWindowType,
-  NetWMWindowTypeDialog,
-  NetClientList,
-  NetClientInfo,
-  NetLast
+enum
+{
+    CurNormal,
+    CurResize,
+    CurMove,
+    CurLast
+}; /* cursor */
+enum
+{
+    SchemeNorm,
+    SchemeSel
+}; /* color schemes */
+enum
+{
+    ModeCommand,
+    ModeInsert
+};
+enum
+{
+    NetSupported,
+    NetWMName,
+    NetWMState,
+    NetWMCheck,
+    NetWMFullscreen,
+    NetActiveWindow,
+    NetWMWindowType,
+    NetWMWindowTypeDialog,
+    NetClientList,
+    NetClientInfo,
+    NetLast
 }; /* EWMH atoms */
-enum {
-  WMProtocols,
-  WMDelete,
-  WMState,
-  WMTakeFocus,
-  WMLast
+enum
+{
+    WMProtocols,
+    WMDelete,
+    WMState,
+    WMTakeFocus,
+    WMLast
 }; /* default atoms */
-enum {
-  ClkTagBar,
-  ClkLtSymbol,
-  ClkStatusText,
-  ClkWinTitle,
-  ClkClientWin,
-  ClkRootWin,
-  ClkLast
+enum
+{
+    ClkTagBar,
+    ClkLtSymbol,
+    ClkStatusText,
+    ClkWinTitle,
+    ClkClientWin,
+    ClkRootWin,
+    ClkLast
 }; /* clicks */
 
-typedef union {
-  int i;
-  unsigned int ui;
-  float f;
-  const void *v;
+typedef union
+{
+    int i;
+    unsigned int ui;
+    float f;
+    const void *v;
 } Arg;
 
-typedef struct {
-  unsigned int click;
-  unsigned int mask;
-  unsigned int button;
-  void (*func)(const Arg *arg);
-  const Arg arg;
+typedef struct
+{
+    unsigned int click;
+    unsigned int mask;
+    unsigned int button;
+    void (*func)(const Arg *arg);
+    const Arg arg;
 } Button;
 
+typedef struct
+{
+    unsigned int mod[4];
+    KeySym keysym[4];
+    void (*func)(const Arg *);
+    const Arg arg;
+} Command;
+
 typedef struct Monitor Monitor;
 typedef struct Client Client;
-struct Client {
-  char name[256];
-  float mina, maxa;
-  int x, y, w, h;
-  int oldx, oldy, oldw, oldh;
-  int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
-  int bw, oldbw;
-  unsigned int tags;
-  int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen,
-      isterminal, noswallow, issticky;
-  pid_t pid;
-  Client *next;
-  Client *snext;
-  Client *swallowing;
-  Monitor *mon;
-  Window win;
+struct Client
+{
+    char name[256];
+    float mina, maxa;
+    float cfact;
+    int x, y, w, h;
+    int sfx, sfy, sfw, sfh; /* stored float geometry, used on mode revert */
+    int oldx, oldy, oldw, oldh;
+    int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid;
+    int bw, oldbw;
+    unsigned int tags;
+    int wasfloating, isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow, issticky;
+    unsigned char expandmask;
+    int expandx1, expandy1, expandx2, expandy2;
+    pid_t pid;
+    Client *next;
+    Client *snext;
+    Client *swallowing;
+    Monitor *mon;
+    Window win;
 };
 
-typedef struct {
-  unsigned int mod;
-  KeySym keysym;
-  void (*func)(const Arg *);
-  const Arg arg;
+typedef struct
+{
+    unsigned int mod;
+    KeySym keysym;
+    void (*func)(const Arg *);
+    const Arg arg;
 } Key;
 
-typedef struct {
-  const char *symbol;
-  void (*arrange)(Monitor *);
+typedef struct
+{
+    const char *symbol;
+    void (*arrange)(Monitor *);
 } Layout;
 
-struct Monitor {
-  char ltsymbol[16];
-  float mfact;
-  int nmaster;
-  int num;
-  int by;             /* bar geometry */
-  int mx, my, mw, mh; /* screen size */
-  int wx, wy, ww, wh; /* window area  */
-  int gappih;         /* horizontal gap between windows */
-  int gappiv;         /* vertical gap between windows */
-  int gappoh;         /* horizontal outer gaps */
-  int gappov;         /* vertical outer gaps */
-  unsigned int seltags;
-  unsigned int sellt;
-  unsigned int tagset[2];
-  int showbar;
-  int topbar;
-  Client *clients;
-  Client *sel;
-  Client *stack;
-  Monitor *next;
-  Window barwin;
-  const Layout *lt[2];
+typedef struct Pertag Pertag;
+
+struct Monitor
+{
+    char ltsymbol[16];
+    float mfact;
+    int nmaster;
+    int num;
+    int by;             /* bar geometry */
+    int mx, my, mw, mh; /* screen size */
+    int wx, wy, ww, wh; /* window area  */
+    int gappih;         /* horizontal gap between windows */
+    int gappiv;         /* vertical gap between windows */
+    int gappoh;         /* horizontal outer gaps */
+    int gappov;         /* vertical outer gaps */
+    unsigned int seltags;
+    unsigned int sellt;
+    unsigned int tagset[2];
+    int showbar;
+    unsigned int barmask;
+    int topbar;
+    Client *clients;
+    Client *sel;
+    Client *stack;
+    Monitor *next;
+    Window barwin;
+    const Layout *lt[2];
+    Pertag *pertag;
 };
 
-typedef struct {
-  const char *class;
-  const char *instance;
-  const char *title;
-  unsigned int tags;
-  int isfloating;
-  int isterminal;
-  int noswallow;
-  int monitor;
+typedef struct
+{
+    const char *class;
+    const char *instance;
+    const char *title;
+    unsigned int tags;
+    int isfloating;
+    int isterminal;
+    int noswallow;
+    int monitor;
 } Rule;
 
 /* Xresources preferences */
-enum resource_type { STRING = 0, INTEGER = 1, FLOAT = 2 };
+enum resource_type
+{
+    STRING = 0,
+    INTEGER = 1,
+    FLOAT = 2
+};
 
-typedef struct {
-  char *name;
-  enum resource_type type;
-  void *dst;
+typedef struct
+{
+    char *name;
+    enum resource_type type;
+    void *dst;
 } ResourcePref;
 
 /* function declarations */
@@ -211,6 +263,7 @@ static void buttonpress(XEvent *e);
 static void checkotherwm(void);
 static void cleanup(void);
 static void cleanupmon(Monitor *mon);
+static void clearcmd(const Arg *arg);
 static void clientmessage(XEvent *e);
 static void configure(Client *c);
 static void configurenotify(XEvent *e);
@@ -237,7 +290,9 @@ static void grabbuttons(Client *c, int focused);
 static void grabkeys(void);
 static void incnmaster(const Arg *arg);
 static void keypress(XEvent *e);
+static void keypresscmd(XEvent *e);
 static void killclient(const Arg *arg);
+static void killthis(Client *c);
 static void manage(Window w, XWindowAttributes *wa);
 static void mappingnotify(XEvent *e);
 static void maprequest(XEvent *e);
@@ -263,7 +318,10 @@ static void setclientstate(Client *c, long state);
 static void setclienttagprop(Client *c);
 static void setfocus(Client *c);
 static void setfullscreen(Client *c, int fullscreen);
+static void setinsertmode(void);
+static void setkeymode(const Arg *arg);
 static void setlayout(const Arg *arg);
+static void setcfact(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void seturgent(Client *c, int urg);
@@ -280,6 +338,7 @@ static int stackpos(const Arg *arg);
 static void tag(const Arg *arg);
 static void tagmon(const Arg *arg);
 static void togglebar(const Arg *arg);
+static void toggleborder(const Arg *arg);
 static void togglefloating(const Arg *arg);
 static void togglescratch(const Arg *arg);
 static void togglesticky(const Arg *arg);
@@ -305,11 +364,11 @@ static Monitor *wintomon(Window w);
 static int xerror(Display *dpy, XErrorEvent *ee);
 static int xerrordummy(Display *dpy, XErrorEvent *ee);
 static int xerrorstart(Display *dpy, XErrorEvent *ee);
+static void xinitvisual();
 static void zoom(const Arg *arg);
 static void xrdb(const Arg *arg);
 static void load_xresources(void);
-static void resource_load(XrmDatabase db, char *name, enum resource_type rtype,
-                          void *dst);
+static void resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst);
 
 static pid_t getparentprocess(pid_t p);
 static int isdescprocess(pid_t p, pid_t c);
@@ -327,7 +386,11 @@ static int screen;
 static int sw, sh; /* X display screen geometry width, height */
 static int bh;     /* bar height */
 static int lrpad;  /* sum of left and right padding for text */
+static int vp;     /* vertical padding for bar */
+static int sp;     /* side padding for bar */
 static int (*xerrorxlib)(Display *, XErrorEvent *);
+static unsigned int cmdmod[4];
+static unsigned int keymode = ModeCommand;
 static unsigned int numlockmask = 0;
 static void (*handler[LASTEvent])(XEvent *) = {
     [ButtonPress] = buttonpress,
@@ -351,2195 +414,2880 @@ static Cur *cursor[CurLast];
 static Clr **scheme;
 static Display *dpy;
 static Drw *drw;
+static KeySym cmdkeysym[4];
 static Monitor *mons, *selmon;
 static Window root, wmcheckwin;
 
+static int useargb = 0;
+static Visual *visual;
+static int depth;
+static Colormap cmap;
+
 static xcb_connection_t *xcon;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
+struct Pertag
+{
+    unsigned int curtag, prevtag;              /* current and previous tag */
+    int nmasters[LENGTH(tags) + 1];            /* number of windows in master area */
+    float mfacts[LENGTH(tags) + 1];            /* mfacts per tag */
+    unsigned int sellts[LENGTH(tags) + 1];     /* selected layouts */
+    const Layout *ltidxs[LENGTH(tags) + 1][2]; /* matrix of tags and layouts indexes  */
+};
+
 /* compile-time check if all tags fit into an unsigned int bit array. */
-struct NumTags {
-  char limitexceeded[LENGTH(tags) > 31 ? -1 : 1];
+struct NumTags
+{
+    char limitexceeded[LENGTH(tags) > 31 ? -1 : 1];
 };
 
 /* function implementations */
-void applyrules(Client *c) {
-  const char *class, *instance;
-  unsigned int i;
-  const Rule *r;
-  Monitor *m;
-  XClassHint ch = {NULL, NULL};
-
-  /* rule matching */
-  c->isfloating = 0;
-  c->tags = 0;
-  XGetClassHint(dpy, c->win, &ch);
-  class = ch.res_class ? ch.res_class : broken;
-  instance = ch.res_name ? ch.res_name : broken;
-
-  for (i = 0; i < LENGTH(rules); i++) {
-    r = &rules[i];
-    if ((!r->title || strstr(c->name, r->title)) &&
-        (!r->class || strstr(class, r->class)) &&
-        (!r->instance || strstr(instance, r->instance))) {
-      c->isterminal = r->isterminal;
-      c->isfloating = r->isfloating;
-      c->noswallow = r->noswallow;
-      c->tags |= r->tags;
-      if ((r->tags & SPTAGMASK) && r->isfloating) {
-        c->x = c->mon->wx + (c->mon->ww / 2 - WIDTH(c) / 2);
-        c->y = c->mon->wy + (c->mon->wh / 2 - HEIGHT(c) / 2);
-      }
-
-      for (m = mons; m && m->num != r->monitor; m = m->next)
-        ;
-      if (m)
-        c->mon = m;
-    }
-  }
-  if (ch.res_class)
-    XFree(ch.res_class);
-  if (ch.res_name)
-    XFree(ch.res_name);
-  c->tags = c->tags & TAGMASK ? c->tags & TAGMASK
-                              : (c->mon->tagset[c->mon->seltags] & ~SPTAGMASK);
-}
-
-int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact) {
-  int baseismin;
-  Monitor *m = c->mon;
-
-  /* set minimum possible */
-  *w = MAX(1, *w);
-  *h = MAX(1, *h);
-  if (interact) {
-    if (*x > sw)
-      *x = sw - WIDTH(c);
-    if (*y > sh)
-      *y = sh - HEIGHT(c);
-    if (*x + *w + 2 * c->bw < 0)
-      *x = 0;
-    if (*y + *h + 2 * c->bw < 0)
-      *y = 0;
-  } else {
-    if (*x >= m->wx + m->ww)
-      *x = m->wx + m->ww - WIDTH(c);
-    if (*y >= m->wy + m->wh)
-      *y = m->wy + m->wh - HEIGHT(c);
-    if (*x + *w + 2 * c->bw <= m->wx)
-      *x = m->wx;
-    if (*y + *h + 2 * c->bw <= m->wy)
-      *y = m->wy;
-  }
-  if (*h < bh)
-    *h = bh;
-  if (*w < bh)
-    *w = bh;
-  if (resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) {
-    if (!c->hintsvalid)
-      updatesizehints(c);
-    /* see last two sentences in ICCCM 4.1.2.3 */
-    baseismin = c->basew == c->minw && c->baseh == c->minh;
-    if (!baseismin) { /* temporarily remove base dimensions */
-      *w -= c->basew;
-      *h -= c->baseh;
-    }
-    /* adjust for aspect limits */
-    if (c->mina > 0 && c->maxa > 0) {
-      if (c->maxa < (float)*w / *h)
-        *w = *h * c->maxa + 0.5;
-      else if (c->mina < (float)*h / *w)
-        *h = *w * c->mina + 0.5;
-    }
-    if (baseismin) { /* increment calculation requires this */
-      *w -= c->basew;
-      *h -= c->baseh;
-    }
-    /* adjust for increment value */
-    if (c->incw)
-      *w -= *w % c->incw;
-    if (c->inch)
-      *h -= *h % c->inch;
-    /* restore base dimensions */
-    *w = MAX(*w + c->basew, c->minw);
-    *h = MAX(*h + c->baseh, c->minh);
-    if (c->maxw)
-      *w = MIN(*w, c->maxw);
-    if (c->maxh)
-      *h = MIN(*h, c->maxh);
-  }
-  return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
-}
-
-void arrange(Monitor *m) {
-  if (m)
-    showhide(m->stack);
-  else
-    for (m = mons; m; m = m->next)
-      showhide(m->stack);
-  if (m) {
-    arrangemon(m);
-    restack(m);
-  } else
-    for (m = mons; m; m = m->next)
-      arrangemon(m);
+void
+applyrules(Client *c)
+{
+    const char *class, *instance;
+    unsigned int i;
+    const Rule *r;
+    Monitor *m;
+    XClassHint ch = {NULL, NULL};
+
+    /* rule matching */
+    c->isfloating = 0;
+    c->tags = 0;
+    XGetClassHint(dpy, c->win, &ch);
+    class = ch.res_class ? ch.res_class : broken;
+    instance = ch.res_name ? ch.res_name : broken;
+
+    for (i = 0; i < LENGTH(rules); i++)
+    {
+        r = &rules[i];
+        if ((!r->title || strstr(c->name, r->title)) &&
+            (!r->class || strstr(class, r->class)) &&
+            (!r->instance || strstr(instance, r->instance)))
+        {
+            c->isterminal = r->isterminal;
+            c->isfloating = r->isfloating;
+            c->noswallow = r->noswallow;
+            c->tags |= r->tags;
+            if ((r->tags & SPTAGMASK) && r->isfloating)
+            {
+                c->x = c->mon->wx + (c->mon->ww / 2 - WIDTH(c) / 2);
+                c->y = c->mon->wy + (c->mon->wh / 2 - HEIGHT(c) / 2);
+            }
+
+            for (m = mons; m && m->num != r->monitor; m = m->next)
+                ;
+            if (m)
+                c->mon = m;
+        }
+    }
+    if (ch.res_class)
+        XFree(ch.res_class);
+    if (ch.res_name)
+        XFree(ch.res_name);
+    c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : (c->mon->tagset[c->mon->seltags] & ~SPTAGMASK);
+}
+
+int
+applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact)
+{
+    int baseismin;
+    Monitor *m = c->mon;
+
+    /* set minimum possible */
+    *w = MAX(1, *w);
+    *h = MAX(1, *h);
+    if (interact)
+    {
+        if (*x > sw)
+            *x = sw - WIDTH(c);
+        if (*y > sh)
+            *y = sh - HEIGHT(c);
+        if (*x + *w + 2 * c->bw < 0)
+            *x = 0;
+        if (*y + *h + 2 * c->bw < 0)
+            *y = 0;
+    }
+    else
+    {
+        if (*x >= m->wx + m->ww)
+            *x = m->wx + m->ww - WIDTH(c);
+        if (*y >= m->wy + m->wh)
+            *y = m->wy + m->wh - HEIGHT(c);
+        if (*x + *w + 2 * c->bw <= m->wx)
+            *x = m->wx;
+        if (*y + *h + 2 * c->bw <= m->wy)
+            *y = m->wy;
+    }
+    if (*h < bh)
+        *h = bh;
+    if (*w < bh)
+        *w = bh;
+    if (resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange)
+    {
+        if (!c->hintsvalid)
+            updatesizehints(c);
+        /* see last two sentences in ICCCM 4.1.2.3 */
+        baseismin = c->basew == c->minw && c->baseh == c->minh;
+        if (!baseismin)
+        { /* temporarily remove base dimensions */
+            *w -= c->basew;
+            *h -= c->baseh;
+        }
+        /* adjust for aspect limits */
+        if (c->mina > 0 && c->maxa > 0)
+        {
+            if (c->maxa < (float)*w / *h)
+                *w = *h * c->maxa + 0.5;
+            else if (c->mina < (float)*h / *w)
+                *h = *w * c->mina + 0.5;
+        }
+        if (baseismin)
+        { /* increment calculation requires this */
+            *w -= c->basew;
+            *h -= c->baseh;
+        }
+        /* adjust for increment value */
+        if (c->incw)
+            *w -= *w % c->incw;
+        if (c->inch)
+            *h -= *h % c->inch;
+        /* restore base dimensions */
+        *w = MAX(*w + c->basew, c->minw);
+        *h = MAX(*h + c->baseh, c->minh);
+        if (c->maxw)
+            *w = MIN(*w, c->maxw);
+        if (c->maxh)
+            *h = MIN(*h, c->maxh);
+    }
+    return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
+}
+
+void
+arrange(Monitor *m)
+{
+    if (m)
+        showhide(m->stack);
+    else
+        for (m = mons; m; m = m->next)
+            showhide(m->stack);
+    if (m)
+    {
+        arrangemon(m);
+        restack(m);
+    }
+    else
+        for (m = mons; m; m = m->next)
+            arrangemon(m);
 }
 
-void arrangemon(Monitor *m) {
-  strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
-  if (m->lt[m->sellt]->arrange)
-    m->lt[m->sellt]->arrange(m);
+void
+arrangemon(Monitor *m)
+{
+    strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
+    if (m->lt[m->sellt]->arrange)
+        m->lt[m->sellt]->arrange(m);
 }
 
-void attach(Client *c) {
-  c->next = c->mon->clients;
-  c->mon->clients = c;
+void
+attach(Client *c)
+{
+    c->next = c->mon->clients;
+    c->mon->clients = c;
 }
 
-void attachstack(Client *c) {
-  c->snext = c->mon->stack;
-  c->mon->stack = c;
+void
+attachstack(Client *c)
+{
+    c->snext = c->mon->stack;
+    c->mon->stack = c;
 }
 
-void swallow(Client *p, Client *c) {
-  if (c->noswallow || c->isterminal)
-    return;
-  if (!swallowfloating && c->isfloating)
-    return;
+void
+swallow(Client *p, Client *c)
+{
+    if (c->noswallow || c->isterminal)
+        return;
+    if (!swallowfloating && c->isfloating)
+        return;
 
-  detach(c);
-  detachstack(c);
+    detach(c);
+    detachstack(c);
 
-  setclientstate(c, WithdrawnState);
-  XUnmapWindow(dpy, p->win);
+    setclientstate(c, WithdrawnState);
+    XUnmapWindow(dpy, p->win);
 
-  p->swallowing = c;
-  c->mon = p->mon;
+    p->swallowing = c;
+    c->mon = p->mon;
 
-  Window w = p->win;
-  p->win = c->win;
-  c->win = w;
-  updatetitle(p);
+    Window w = p->win;
+    p->win = c->win;
+    c->win = w;
+    updatetitle(p);
 
-  XWindowChanges wc;
-  wc.border_width = p->bw;
-  XConfigureWindow(dpy, p->win, CWBorderWidth, &wc);
-  XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
-  XSetWindowBorder(dpy, p->win, scheme[SchemeNorm][ColBorder].pixel);
+    XWindowChanges wc;
+    wc.border_width = p->bw;
+    XConfigureWindow(dpy, p->win, CWBorderWidth, &wc);
+    XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h);
+    XSetWindowBorder(dpy, p->win, scheme[SchemeNorm][ColBorder].pixel);
 
-  arrange(p->mon);
-  configure(p);
-  updateclientlist();
+    arrange(p->mon);
+    configure(p);
+    updateclientlist();
 }
 
-void unswallow(Client *c) {
-  c->win = c->swallowing->win;
+void
+unswallow(Client *c)
+{
+    c->win = c->swallowing->win;
 
-  free(c->swallowing);
-  c->swallowing = NULL;
+    free(c->swallowing);
+    c->swallowing = NULL;
 
-  /* unfullscreen the client */
-  setfullscreen(c, 0);
-  updatetitle(c);
-  arrange(c->mon);
-  XMapWindow(dpy, c->win);
+    /* unfullscreen the client */
+    setfullscreen(c, 0);
+    updatetitle(c);
+    arrange(c->mon);
+    XMapWindow(dpy, c->win);
 
-  XWindowChanges wc;
-  wc.border_width = c->bw;
-  XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
-  XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-  XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
+    XWindowChanges wc;
+    wc.border_width = c->bw;
+    XConfigureWindow(dpy, c->win, CWBorderWidth, &wc);
+    XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+    XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
 
-  setclientstate(c, NormalState);
-  focus(NULL);
-  arrange(c->mon);
+    setclientstate(c, NormalState);
+    focus(NULL);
+    arrange(c->mon);
 }
 
-void buttonpress(XEvent *e) {
-  unsigned int i, x, click, occ = 0;
-  Arg arg = {0};
-  Client *c;
-  Monitor *m;
-  XButtonPressedEvent *ev = &e->xbutton;
+void
+buttonpress(XEvent *e)
+{
+    unsigned int i, x, click, occ = 0;
+    Arg arg = {0};
+    Client *c;
+    Monitor *m;
+    XButtonPressedEvent *ev = &e->xbutton;
+
+    click = ClkRootWin;
+    /* focus monitor if necessary */
+    if ((m = wintomon(ev->window)) && m != selmon)
+    {
+        unfocus(selmon->sel, 1);
+        selmon = m;
+        focus(NULL);
+    }
+    if (ev->window == selmon->barwin)
+    {
+        i = x = 0;
+        for (c = m->clients; c; c = c->next)
+            occ |= c->tags == 255 ? 0 : c->tags;
+        do
+        {
+            /* do not reserve space for vacant tags */
+            if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
+                continue;
+            x += TEXTW(tags[i]);
+        } while (ev->x >= x && ++i < LENGTH(tags));
+        if (i < LENGTH(tags))
+        {
+            click = ClkTagBar;
+            arg.ui = 1 << i;
+        }
+        else if (ev->x < x + TEXTW(selmon->ltsymbol))
+            click = ClkLtSymbol;
+        else if (ev->x > (x = selmon->ww - (int)TEXTW(stext) + lrpad))
+        {
+            click = ClkStatusText;
+
+            char *text = rawstext;
+            int i = -1;
+            char ch;
+            dwmblockssig = 0;
+            while (text[++i])
+            {
+                if ((unsigned char)text[i] < ' ')
+                {
+                    ch = text[i];
+                    text[i] = '\0';
+                    x += TEXTW(text) - lrpad;
+                    text[i] = ch;
+                    text += i + 1;
+                    i = -1;
+                    if (x >= ev->x)
+                        break;
+                    dwmblockssig = ch;
+                }
+            }
+        }
+        else
+            click = ClkWinTitle;
+    }
+    else if ((c = wintoclient(ev->window)))
+    {
+        focus(c);
+        restack(selmon);
+        XAllowEvents(dpy, ReplayPointer, CurrentTime);
+        click = ClkClientWin;
+    }
+    for (i = 0; i < LENGTH(buttons); i++)
+        if (click == buttons[i].click && buttons[i].func &&
+            buttons[i].button == ev->button &&
+            CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+            buttons[i].func(
+                click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
+}
+
+void
+checkotherwm(void)
+{
+    xerrorxlib = XSetErrorHandler(xerrorstart);
+    /* this causes an error if some other window manager is running */
+    XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
+    XSync(dpy, False);
+    XSetErrorHandler(xerror);
+    XSync(dpy, False);
+}
 
-  click = ClkRootWin;
-  /* focus monitor if necessary */
-  if ((m = wintomon(ev->window)) && m != selmon) {
-    unfocus(selmon->sel, 1);
-    selmon = m;
-    focus(NULL);
-  }
-  if (ev->window == selmon->barwin) {
-    i = x = 0;
-    for (c = m->clients; c; c = c->next)
-      occ |= c->tags == 255 ? 0 : c->tags;
-    do {
-      /* do not reserve space for vacant tags */
-      if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-        continue;
-      x += TEXTW(tags[i]);
-    } while (ev->x >= x && ++i < LENGTH(tags));
-    if (i < LENGTH(tags)) {
-      click = ClkTagBar;
-      arg.ui = 1 << i;
-    } else if (ev->x < x + TEXTW(selmon->ltsymbol))
-      click = ClkLtSymbol;
-    else if (ev->x > (x = selmon->ww - (int)TEXTW(stext) + lrpad)) {
-      click = ClkStatusText;
-
-      char *text = rawstext;
-      int i = -1;
-      char ch;
-      dwmblockssig = 0;
-      while (text[++i]) {
-        if ((unsigned char)text[i] < ' ') {
-          ch = text[i];
-          text[i] = '\0';
-          x += TEXTW(text) - lrpad;
-          text[i] = ch;
-          text += i + 1;
-          i = -1;
-          if (x >= ev->x)
-            break;
-          dwmblockssig = ch;
+void
+cleanup(void)
+{
+    Arg a = {.ui = ~0};
+    Layout foo = {"", NULL};
+    Monitor *m;
+    size_t i;
+
+    view(&a);
+    selmon->lt[selmon->sellt] = &foo;
+    for (m = mons; m; m = m->next)
+        while (m->stack)
+            unmanage(m->stack, 0);
+    XUngrabKey(dpy, AnyKey, AnyModifier, root);
+    while (mons)
+        cleanupmon(mons);
+    for (i = 0; i < CurLast; i++)
+        drw_cur_free(drw, cursor[i]);
+    for (i = 0; i < LENGTH(colors); i++)
+        free(scheme[i]);
+    free(scheme);
+    XDestroyWindow(dpy, wmcheckwin);
+    drw_free(drw);
+    XSync(dpy, False);
+    XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
+    XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+}
+
+void
+cleanupmon(Monitor *mon)
+{
+    Monitor *m;
+
+    if (mon == mons)
+        mons = mons->next;
+    else
+    {
+        for (m = mons; m && m->next != mon; m = m->next)
+            ;
+        m->next = mon->next;
+    }
+    XUnmapWindow(dpy, mon->barwin);
+    XDestroyWindow(dpy, mon->barwin);
+    free(mon);
+}
+
+void
+clearcmd(const Arg *arg)
+{
+    unsigned int i;
+
+    for (i = 0; i < LENGTH(cmdkeysym); i++)
+    {
+        cmdkeysym[i] = 0;
+        cmdmod[i] = 0;
+    }
+}
+
+void
+clientmessage(XEvent *e)
+{
+    XClientMessageEvent *cme = &e->xclient;
+    Client *c = wintoclient(cme->window);
+
+    if (!c)
+        return;
+    if (cme->message_type == netatom[NetWMState])
+    {
+        if (cme->data.l[1] == netatom[NetWMFullscreen] ||
+            cme->data.l[2] == netatom[NetWMFullscreen])
+            setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
+                              || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ &&
+                                  !c->isfullscreen)));
+    }
+    else if (cme->message_type == netatom[NetActiveWindow])
+    {
+        if (c != selmon->sel && !c->isurgent)
+            seturgent(c, 1);
+    }
+}
+
+void
+configure(Client *c)
+{
+    XConfigureEvent ce;
+
+    ce.type = ConfigureNotify;
+    ce.display = dpy;
+    ce.event = c->win;
+    ce.window = c->win;
+    ce.x = c->x;
+    ce.y = c->y;
+    ce.width = c->w;
+    ce.height = c->h;
+    ce.border_width = c->bw;
+    ce.above = None;
+    ce.override_redirect = False;
+    XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
+}
+
+void
+configurenotify(XEvent *e)
+{
+    Monitor *m;
+    Client *c;
+    XConfigureEvent *ev = &e->xconfigure;
+    int dirty;
+
+    /* TODO: updategeom handling sucks, needs to be simplified */
+    if (ev->window == root)
+    {
+        dirty = (sw != ev->width || sh != ev->height);
+        sw = ev->width;
+        sh = ev->height;
+        if (updategeom() || dirty)
+        {
+            drw_resize(drw, sw, bh);
+            updatebars();
+            for (m = mons; m; m = m->next)
+            {
+                for (c = m->clients; c; c = c->next)
+                    if (c->isfullscreen)
+                        resizeclient(c, m->mx, m->my, m->mw, m->mh);
+                XMoveResizeWindow(dpy, m->barwin, m->wx + sp, m->by + vp, m->ww - 2 * sp, bh);
+            }
+            focus(NULL);
+            arrange(NULL);
         }
-      }
-    } else
-      click = ClkWinTitle;
-  } else if ((c = wintoclient(ev->window))) {
-    focus(c);
-    restack(selmon);
-    XAllowEvents(dpy, ReplayPointer, CurrentTime);
-    click = ClkClientWin;
-  }
-  for (i = 0; i < LENGTH(buttons); i++)
-    if (click == buttons[i].click && buttons[i].func &&
-        buttons[i].button == ev->button &&
-        CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-      buttons[i].func(
-          click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
-}
-
-void checkotherwm(void) {
-  xerrorxlib = XSetErrorHandler(xerrorstart);
-  /* this causes an error if some other window manager is running */
-  XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
-  XSync(dpy, False);
-  XSetErrorHandler(xerror);
-  XSync(dpy, False);
-}
-
-void cleanup(void) {
-  Arg a = {.ui = ~0};
-  Layout foo = {"", NULL};
-  Monitor *m;
-  size_t i;
-
-  view(&a);
-  selmon->lt[selmon->sellt] = &foo;
-  for (m = mons; m; m = m->next)
-    while (m->stack)
-      unmanage(m->stack, 0);
-  XUngrabKey(dpy, AnyKey, AnyModifier, root);
-  while (mons)
-    cleanupmon(mons);
-  for (i = 0; i < CurLast; i++)
-    drw_cur_free(drw, cursor[i]);
-  for (i = 0; i < LENGTH(colors); i++)
-    free(scheme[i]);
-  free(scheme);
-  XDestroyWindow(dpy, wmcheckwin);
-  drw_free(drw);
-  XSync(dpy, False);
-  XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-  XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-}
-
-void cleanupmon(Monitor *mon) {
-  Monitor *m;
-
-  if (mon == mons)
-    mons = mons->next;
-  else {
-    for (m = mons; m && m->next != mon; m = m->next)
-      ;
-    m->next = mon->next;
-  }
-  XUnmapWindow(dpy, mon->barwin);
-  XDestroyWindow(dpy, mon->barwin);
-  free(mon);
-}
-
-void clientmessage(XEvent *e) {
-  XClientMessageEvent *cme = &e->xclient;
-  Client *c = wintoclient(cme->window);
-
-  if (!c)
-    return;
-  if (cme->message_type == netatom[NetWMState]) {
-    if (cme->data.l[1] == netatom[NetWMFullscreen] ||
-        cme->data.l[2] == netatom[NetWMFullscreen])
-      setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
-                        || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ &&
-                            !c->isfullscreen)));
-  } else if (cme->message_type == netatom[NetActiveWindow]) {
-    if (c != selmon->sel && !c->isurgent)
-      seturgent(c, 1);
-  }
-}
-
-void configure(Client *c) {
-  XConfigureEvent ce;
-
-  ce.type = ConfigureNotify;
-  ce.display = dpy;
-  ce.event = c->win;
-  ce.window = c->win;
-  ce.x = c->x;
-  ce.y = c->y;
-  ce.width = c->w;
-  ce.height = c->h;
-  ce.border_width = c->bw;
-  ce.above = None;
-  ce.override_redirect = False;
-  XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
-}
-
-void configurenotify(XEvent *e) {
-  Monitor *m;
-  Client *c;
-  XConfigureEvent *ev = &e->xconfigure;
-  int dirty;
-
-  /* TODO: updategeom handling sucks, needs to be simplified */
-  if (ev->window == root) {
-    dirty = (sw != ev->width || sh != ev->height);
-    sw = ev->width;
-    sh = ev->height;
-    if (updategeom() || dirty) {
-      drw_resize(drw, sw, bh);
-      updatebars();
-      for (m = mons; m; m = m->next) {
-        for (c = m->clients; c; c = c->next)
-          if (c->isfullscreen)
-            resizeclient(c, m->mx, m->my, m->mw, m->mh);
-        XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
-      }
-      focus(NULL);
-      arrange(NULL);
-    }
-  }
-}
-
-void configurerequest(XEvent *e) {
-  Client *c;
-  Monitor *m;
-  XConfigureRequestEvent *ev = &e->xconfigurerequest;
-  XWindowChanges wc;
-
-  if ((c = wintoclient(ev->window))) {
-    if (ev->value_mask & CWBorderWidth)
-      c->bw = ev->border_width;
-    else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
-      m = c->mon;
-      if (ev->value_mask & CWX) {
-        c->oldx = c->x;
-        c->x = m->mx + ev->x;
-      }
-      if (ev->value_mask & CWY) {
-        c->oldy = c->y;
-        c->y = m->my + ev->y;
-      }
-      if (ev->value_mask & CWWidth) {
-        c->oldw = c->w;
-        c->w = ev->width;
-      }
-      if (ev->value_mask & CWHeight) {
-        c->oldh = c->h;
-        c->h = ev->height;
-      }
-      if ((c->x + c->w) > m->mx + m->mw && c->isfloating)
-        c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
-      if ((c->y + c->h) > m->my + m->mh && c->isfloating)
-        c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */
-      if ((ev->value_mask & (CWX | CWY)) &&
-          !(ev->value_mask & (CWWidth | CWHeight)))
-        configure(c);
-      if (ISVISIBLE(c))
-        XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-    } else
-      configure(c);
-  } else {
-    wc.x = ev->x;
-    wc.y = ev->y;
-    wc.width = ev->width;
-    wc.height = ev->height;
-    wc.border_width = ev->border_width;
-    wc.sibling = ev->above;
-    wc.stack_mode = ev->detail;
-    XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-  }
-  XSync(dpy, False);
-}
-
-void copyvalidchars(char *text, char *rawtext) {
-  int i = -1, j = 0;
-
-  while (rawtext[++i]) {
-    if ((unsigned char)rawtext[i] >= ' ') {
-      text[j++] = rawtext[i];
-    }
-  }
-  text[j] = '\0';
-}
-
-Monitor *createmon(void) {
-  Monitor *m;
-
-  m = ecalloc(1, sizeof(Monitor));
-  m->tagset[0] = m->tagset[1] = 1;
-  m->mfact = mfact;
-  m->nmaster = nmaster;
-  m->showbar = showbar;
-  m->topbar = topbar;
-  m->gappih = gappih;
-  m->gappiv = gappiv;
-  m->gappoh = gappoh;
-  m->gappov = gappov;
-  m->lt[0] = &layouts[0];
-  m->lt[1] = &layouts[1 % LENGTH(layouts)];
-  strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
-  return m;
-}
-
-void destroynotify(XEvent *e) {
-  Client *c;
-  XDestroyWindowEvent *ev = &e->xdestroywindow;
-
-  if ((c = wintoclient(ev->window)))
-    unmanage(c, 1);
-
-  else if ((c = swallowingclient(ev->window)))
-    unmanage(c->swallowing, 1);
-}
-
-void detach(Client *c) {
-  Client **tc;
-
-  for (tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next)
-    ;
-  *tc = c->next;
-}
-
-void detachstack(Client *c) {
-  Client **tc, *t;
-
-  for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext)
-    ;
-  *tc = c->snext;
-
-  if (c == c->mon->sel) {
-    for (t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext)
-      ;
-    c->mon->sel = t;
-  }
-}
-
-Monitor *dirtomon(int dir) {
-  Monitor *m = NULL;
-
-  if (dir > 0) {
-    if (!(m = selmon->next))
-      m = mons;
-  } else if (selmon == mons)
-    for (m = mons; m->next; m = m->next)
-      ;
-  else
-    for (m = mons; m->next != selmon; m = m->next)
-      ;
-  return m;
-}
-
-void drawbar(Monitor *m) {
-  int x, w, tw = 0;
-  int boxs = drw->fonts->h / 9;
-  int boxw = drw->fonts->h / 6 + 2;
-  unsigned int i, occ = 0, urg = 0;
-  Client *c;
-
-  if (!m->showbar)
-    return;
+    }
+}
 
-  /* draw status first so it can be overdrawn by tags later */
-  if (m == selmon) { /* status is only drawn on selected monitor */
-    drw_setscheme(drw, scheme[SchemeNorm]);
-    tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
-    drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
-  }
-
-  for (c = m->clients; c; c = c->next) {
-    occ |= c->tags == 255 ? 0 : c->tags;
-    if (c->isurgent)
-      urg |= c->tags;
-  }
-  x = 0;
-  for (i = 0; i < LENGTH(tags); i++) {
-    /* do not draw vacant tags */
-    if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-      continue;
-
-    w = TEXTW(tags[i]);
-    drw_setscheme(
-        drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
-    drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
-    x += w;
-  }
-  w = TEXTW(m->ltsymbol);
-  drw_setscheme(drw, scheme[SchemeNorm]);
-  x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
-
-  if ((w = m->ww - tw - x) > bh) {
-    if (m->sel) {
-      drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
-      drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
-      if (m->sel->isfloating)
-        drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
-    } else {
-      drw_setscheme(drw, scheme[SchemeNorm]);
-      drw_rect(drw, x, 0, w, bh, 1, 1);
-    }
-  }
-  drw_map(drw, m->barwin, 0, 0, m->ww, bh);
-}
-
-void drawbars(void) {
-  Monitor *m;
-
-  for (m = mons; m; m = m->next)
-    drawbar(m);
+void
+configurerequest(XEvent *e)
+{
+    Client *c;
+    Monitor *m;
+    XConfigureRequestEvent *ev = &e->xconfigurerequest;
+    XWindowChanges wc;
+
+    if ((c = wintoclient(ev->window)))
+    {
+        if (ev->value_mask & CWBorderWidth)
+            c->bw = ev->border_width;
+        else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange)
+        {
+            m = c->mon;
+            if (ev->value_mask & CWX)
+            {
+                c->oldx = c->x;
+                c->x = m->mx + ev->x;
+            }
+            if (ev->value_mask & CWY)
+            {
+                c->oldy = c->y;
+                c->y = m->my + ev->y;
+            }
+            if (ev->value_mask & CWWidth)
+            {
+                c->oldw = c->w;
+                c->w = ev->width;
+            }
+            if (ev->value_mask & CWHeight)
+            {
+                c->oldh = c->h;
+                c->h = ev->height;
+            }
+            if ((c->x + c->w) > m->mx + m->mw && c->isfloating)
+                c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
+            if ((c->y + c->h) > m->my + m->mh && c->isfloating)
+                c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */
+            if ((ev->value_mask & (CWX | CWY)) &&
+                !(ev->value_mask & (CWWidth | CWHeight)))
+                configure(c);
+            if (ISVISIBLE(c))
+                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+        }
+        else
+            configure(c);
+    }
+    else
+    {
+        wc.x = ev->x;
+        wc.y = ev->y;
+        wc.width = ev->width;
+        wc.height = ev->height;
+        wc.border_width = ev->border_width;
+        wc.sibling = ev->above;
+        wc.stack_mode = ev->detail;
+        XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
+    }
+    XSync(dpy, False);
 }
 
-void enternotify(XEvent *e) {
-  Client *c;
-  Monitor *m;
-  XCrossingEvent *ev = &e->xcrossing;
+void
+copyvalidchars(char *text, char *rawtext)
+{
+    int i = -1, j = 0;
 
-  if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) &&
-      ev->window != root)
-    return;
-  c = wintoclient(ev->window);
-  m = c ? c->mon : wintomon(ev->window);
-  if (m != selmon) {
-    unfocus(selmon->sel, 1);
-    selmon = m;
-  } else if (!c || c == selmon->sel)
-    return;
-  focus(c);
+    while (rawtext[++i])
+    {
+        if ((unsigned char)rawtext[i] >= ' ')
+        {
+            text[j++] = rawtext[i];
+        }
+    }
+    text[j] = '\0';
 }
 
-void expose(XEvent *e) {
-  Monitor *m;
-  XExposeEvent *ev = &e->xexpose;
+Monitor *createmon(void)
+{
+    Monitor *m;
+    int i;
+
+    m = ecalloc(1, sizeof(Monitor));
+    m->tagset[0] = m->tagset[1] = 1;
+    m->mfact = mfact;
+    m->nmaster = nmaster;
+    m->showbar = showbar;
+    m->barmask = showbar * TAGMASK;
+    m->topbar = topbar;
+    m->gappih = gappih;
+    m->gappiv = gappiv;
+    m->gappoh = gappoh;
+    m->gappov = gappov;
+    m->lt[0] = &layouts[0];
+    m->lt[1] = &layouts[1 % LENGTH(layouts)];
+    strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
+	if (!(m->pertag = (Pertag *)calloc(1, sizeof(Pertag))))
+		die("fatal: could not malloc() %u bytes\n", sizeof(Pertag));
+	m->pertag->curtag = m->pertag->prevtag = 1;
+	for (i=0; i <= LENGTH(tags); i++) {
+		/* init nmaster */
+		m->pertag->nmasters[i] = m->nmaster;
+
+		/* init mfacts */
+		m->pertag->mfacts[i] = m->mfact;
+
+		/* init layouts */
+		m->pertag->ltidxs[i][0] = m->lt[0];
+		m->pertag->ltidxs[i][1] = m->lt[1];
+		m->pertag->sellts[i] = m->sellt;
+	}
+    return m;
+}
+
+void
+destroynotify(XEvent *e)
+{
+    Client *c;
+    XDestroyWindowEvent *ev = &e->xdestroywindow;
 
-  if (ev->count == 0 && (m = wintomon(ev->window)))
-    drawbar(m);
+    if ((c = wintoclient(ev->window)))
+        unmanage(c, 1);
+
+    else if ((c = swallowingclient(ev->window)))
+        unmanage(c->swallowing, 1);
 }
 
-void focus(Client *c) {
-  if (!c || !ISVISIBLE(c)) {
-    for (c = selmon->stack;
-         c && (!ISVISIBLE(c) || (c->issticky && !selmon->sel->issticky));
-         c = c->snext)
-      ;
+void
+detach(Client *c)
+{
+    Client **tc;
 
-    if (!c) /* No windows found; check for available stickies */
-      for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext)
+    for (tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next)
         ;
-  }
+    *tc = c->next;
+}
 
-  if (selmon->sel && selmon->sel != c)
-    unfocus(selmon->sel, 0);
-  if (c) {
-    if (c->mon != selmon)
-      selmon = c->mon;
-    if (c->isurgent)
-      seturgent(c, 0);
-    detachstack(c);
-    attachstack(c);
-    grabbuttons(c, 1);
-    XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
-    setfocus(c);
-  } else {
-    XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-    XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-  }
-  selmon->sel = c;
-  drawbars();
+void
+detachstack(Client *c)
+{
+    Client **tc, *t;
+
+    for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext)
+        ;
+    *tc = c->snext;
+
+    if (c == c->mon->sel)
+    {
+        for (t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext)
+            ;
+        c->mon->sel = t;
+    }
+}
+
+Monitor *dirtomon(int dir)
+{
+    Monitor *m = NULL;
+
+    if (dir > 0)
+    {
+        if (!(m = selmon->next))
+            m = mons;
+    }
+    else if (selmon == mons)
+        for (m = mons; m->next; m = m->next)
+            ;
+    else
+        for (m = mons; m->next != selmon; m = m->next)
+            ;
+    return m;
+}
+
+void
+drawbar(Monitor *m)
+{
+    int x, w, tw = 0;
+    int boxs = drw->fonts->h / 9;
+    int boxw = drw->fonts->h / 6 + 2;
+    unsigned int i, occ = 0, urg = 0;
+    Client *c;
+
+    if (!(m->tagset[m->seltags] & m->barmask))
+        return;
+
+    /* draw status first so it can be overdrawn by tags later */
+    if (m == selmon)
+    { /* status is only drawn on selected monitor */
+        drw_setscheme(drw, scheme[SchemeNorm]);
+        tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
+        drw_text(drw, m->ww - tw - 2 * sp, 0, tw, bh, 0, stext, 0);
+    }
+
+    for (c = m->clients; c; c = c->next)
+    {
+        occ |= c->tags == 255 ? 0 : c->tags;
+        if (c->isurgent)
+            urg |= c->tags;
+    }
+    x = 0;
+    for (i = 0; i < LENGTH(tags); i++)
+    {
+        /* do not draw vacant tags */
+        if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
+            continue;
+
+        w = TEXTW(tags[i]);
+        drw_setscheme(
+            drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
+        drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
+        x += w;
+    }
+    w = TEXTW(m->ltsymbol);
+    drw_setscheme(drw, scheme[SchemeNorm]);
+    x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
+
+    if ((w = m->ww - tw - x) > bh)
+    {
+        drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
+        if (m->sel)
+        {
+            drw_text(drw, x, 0, w - 2 * sp, bh, lrpad / 2, m->sel->name, 0);
+            if (m->sel->isfloating)
+                drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
+        }
+        else
+        {
+            drw_rect(drw, x, 0, w - 2 * sp, bh, 1, 1);
+        }
+    }
+    drw_map(drw, m->barwin, 0, 0, m->ww, bh);
+}
+
+void
+drawbars(void)
+{
+    Monitor *m;
+
+    for (m = mons; m; m = m->next)
+        drawbar(m);
+}
+
+void
+enternotify(XEvent *e)
+{
+    Client *c;
+    Monitor *m;
+    XCrossingEvent *ev = &e->xcrossing;
+
+    if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) &&
+        ev->window != root)
+        return;
+    c = wintoclient(ev->window);
+    m = c ? c->mon : wintomon(ev->window);
+    if (m != selmon)
+    {
+        unfocus(selmon->sel, 1);
+        selmon = m;
+    }
+    else if (!c || c == selmon->sel)
+        return;
+    focus(c);
+}
+
+void
+expose(XEvent *e)
+{
+    Monitor *m;
+    XExposeEvent *ev = &e->xexpose;
+
+    if (ev->count == 0 && (m = wintomon(ev->window)))
+        drawbar(m);
+}
+
+void
+focus(Client *c)
+{
+    if (!c || !ISVISIBLE(c))
+    {
+        for (c = selmon->stack;
+             c && (!ISVISIBLE(c) || (c->issticky && !selmon->sel->issticky));
+             c = c->snext)
+            ;
+
+        if (!c) /* No windows found; check for available stickies */
+            for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext)
+                ;
+    }
+
+    if (selmon->sel && selmon->sel != c)
+        unfocus(selmon->sel, 0);
+    if (c)
+    {
+        if (c->mon != selmon)
+            selmon = c->mon;
+        if (c->isurgent)
+            seturgent(c, 0);
+        detachstack(c);
+        attachstack(c);
+        grabbuttons(c, 1);
+        XSetWindowBorder(dpy, c->win, scheme[SchemeSel][ColBorder].pixel);
+        setfocus(c);
+    }
+    else
+    {
+        XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+        XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+    }
+    selmon->sel = c;
+    drawbars();
 }
 
 /* there are some broken focus acquiring clients needing extra handling */
-void focusin(XEvent *e) {
-  XFocusChangeEvent *ev = &e->xfocus;
+void
+focusin(XEvent *e)
+{
+    XFocusChangeEvent *ev = &e->xfocus;
 
-  if (selmon->sel && ev->window != selmon->sel->win)
-    setfocus(selmon->sel);
+    if (selmon->sel && ev->window != selmon->sel->win)
+        setfocus(selmon->sel);
 }
 
-void focusmon(const Arg *arg) {
-  Monitor *m;
+void
+focusmon(const Arg *arg)
+{
+    Monitor *m;
 
-  if (!mons->next)
-    return;
-  if ((m = dirtomon(arg->i)) == selmon)
-    return;
-  unfocus(selmon->sel, 0);
-  selmon = m;
-  focus(NULL);
+    if (!mons->next)
+        return;
+    if ((m = dirtomon(arg->i)) == selmon)
+        return;
+    unfocus(selmon->sel, 0);
+    selmon = m;
+    focus(NULL);
 }
 
-void focusstack(const Arg *arg) {
-  int i = stackpos(arg);
-  Client *c, *p;
+void
+focusstack(const Arg *arg)
+{
+    int i = stackpos(arg);
+    Client *c, *p;
 
-  if (i < 0 || !selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
-    return;
+    if (i < 0 || !selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
+        return;
 
-  for (p = NULL, c = selmon->clients; c && (i || !ISVISIBLE(c));
-       i -= ISVISIBLE(c) ? 1 : 0, p = c, c = c->next)
-    ;
-  focus(c ? c : p);
-  restack(selmon);
+    for (p = NULL, c = selmon->clients; c && (i || !ISVISIBLE(c));
+         i -= ISVISIBLE(c) ? 1 : 0, p = c, c = c->next)
+        ;
+    focus(c ? c : p);
+    restack(selmon);
 }
 
-Atom getatomprop(Client *c, Atom prop) {
-  int di;
-  unsigned long dl;
-  unsigned char *p = NULL;
-  Atom da, atom = None;
+Atom getatomprop(Client *c, Atom prop)
+{
+    int di;
+    unsigned long dl;
+    unsigned char *p = NULL;
+    Atom da, atom = None;
 
-  if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
-                         &da, &di, &dl, &dl, &p) == Success &&
-      p) {
-    atom = *(Atom *)p;
-    XFree(p);
-  }
-  return atom;
+    if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
+                           &da, &di, &dl, &dl, &p) == Success &&
+        p)
+    {
+        atom = *(Atom *)p;
+        XFree(p);
+    }
+    return atom;
 }
 
 #ifndef __OpenBSD__
-int getdwmblockspid() {
-  char buf[16];
-  FILE *fp = popen("pidof -s dwmblocks", "r");
-  fgets(buf, sizeof(buf), fp);
-  pid_t pid = strtoul(buf, NULL, 10);
-  pclose(fp);
-  dwmblockspid = pid;
-  return pid != 0 ? 0 : -1;
+int
+getdwmblockspid()
+{
+    char buf[16];
+    FILE *fp = popen("pidof -s dwmblocks", "r");
+    fgets(buf, sizeof(buf), fp);
+    pid_t pid = strtoul(buf, NULL, 10);
+    pclose(fp);
+    dwmblockspid = pid;
+    return pid != 0 ? 0 : -1;
 }
 #endif
 
-int getrootptr(int *x, int *y) {
-  int di;
-  unsigned int dui;
-  Window dummy;
+int
+getrootptr(int *x, int *y)
+{
+    int di;
+    unsigned int dui;
+    Window dummy;
 
-  return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
+    return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
 }
 
-long getstate(Window w) {
-  int format;
-  long result = -1;
-  unsigned char *p = NULL;
-  unsigned long n, extra;
-  Atom real;
+long getstate(Window w)
+{
+    int format;
+    long result = -1;
+    unsigned char *p = NULL;
+    unsigned long n, extra;
+    Atom real;
+
+    if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False,
+                           wmatom[WMState], &real, &format, &n, &extra,
+                           (unsigned char **)&p) != Success)
+        return -1;
+    if (n != 0)
+        result = *p;
+    XFree(p);
+    return result;
+}
+
+int
+gettextprop(Window w, Atom atom, char *text, unsigned int size)
+{
+    char **list = NULL;
+    int n;
+    XTextProperty name;
+
+    if (!text || size == 0)
+        return 0;
+    text[0] = '\0';
+    if (!XGetTextProperty(dpy, w, &name, atom) || !name.nitems)
+        return 0;
+    if (name.encoding == XA_STRING)
+    {
+        strncpy(text, (char *)name.value, size - 1);
+    }
+    else if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success &&
+             n > 0 && *list)
+    {
+        strncpy(text, *list, size - 1);
+        XFreeStringList(list);
+    }
+    text[size - 1] = '\0';
+    XFree(name.value);
+    return 1;
+}
+
+void
+grabbuttons(Client *c, int focused)
+{
+    updatenumlockmask();
+    {
+        unsigned int i, j;
+        unsigned int modifiers[] = {0, LockMask, numlockmask,
+                                    numlockmask | LockMask};
+        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+        if (!focused)
+            XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
+                        GrabModeSync, GrabModeSync, None, None);
+        for (i = 0; i < LENGTH(buttons); i++)
+            if (buttons[i].click == ClkClientWin)
+                for (j = 0; j < LENGTH(modifiers); j++)
+                    XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j],
+                                c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync,
+                                None, None);
+    }
+}
 
-  if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False,
-                         wmatom[WMState], &real, &format, &n, &extra,
-                         (unsigned char **)&p) != Success)
-    return -1;
-  if (n != 0)
-    result = *p;
-  XFree(p);
-  return result;
-}
-
-int gettextprop(Window w, Atom atom, char *text, unsigned int size) {
-  char **list = NULL;
-  int n;
-  XTextProperty name;
-
-  if (!text || size == 0)
-    return 0;
-  text[0] = '\0';
-  if (!XGetTextProperty(dpy, w, &name, atom) || !name.nitems)
-    return 0;
-  if (name.encoding == XA_STRING) {
-    strncpy(text, (char *)name.value, size - 1);
-  } else if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success &&
-             n > 0 && *list) {
-    strncpy(text, *list, size - 1);
-    XFreeStringList(list);
-  }
-  text[size - 1] = '\0';
-  XFree(name.value);
-  return 1;
-}
-
-void grabbuttons(Client *c, int focused) {
-  updatenumlockmask();
-  {
-    unsigned int i, j;
-    unsigned int modifiers[] = {0, LockMask, numlockmask,
-                                numlockmask | LockMask};
-    XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-    if (!focused)
-      XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
-                  GrabModeSync, GrabModeSync, None, None);
-    for (i = 0; i < LENGTH(buttons); i++)
-      if (buttons[i].click == ClkClientWin)
-        for (j = 0; j < LENGTH(modifiers); j++)
-          XGrabButton(dpy, buttons[i].button, buttons[i].mask | modifiers[j],
-                      c->win, False, BUTTONMASK, GrabModeAsync, GrabModeSync,
-                      None, None);
-  }
-}
-
-void grabkeys(void) {
-  updatenumlockmask();
-  {
-    unsigned int i, j, k;
-    unsigned int modifiers[] = {0, LockMask, numlockmask,
-                                numlockmask | LockMask};
-    int start, end, skip;
-    KeySym *syms;
+void
+grabkeys(void)
+{
+    if (keymode == ModeCommand)
+    {
+        XUngrabKey(dpy, AnyKey, AnyModifier, root);
+        XGrabKeyboard(dpy, root, True, GrabModeAsync, GrabModeAsync, CurrentTime);
+        return;
+    }
 
-    XUngrabKey(dpy, AnyKey, AnyModifier, root);
-    XDisplayKeycodes(dpy, &start, &end);
-    syms = XGetKeyboardMapping(dpy, start, end - start + 1, &skip);
-    if (!syms)
-      return;
-    for (k = start; k <= end; k++)
-      for (i = 0; i < LENGTH(keys); i++)
-        /* skip modifier codes, we do that ourselves */
-        if (keys[i].keysym == syms[(k - start) * skip])
-          for (j = 0; j < LENGTH(modifiers); j++)
-            XGrabKey(dpy, k, keys[i].mod | modifiers[j], root, True,
-                     GrabModeAsync, GrabModeAsync);
-    XFree(syms);
-  }
+    XUngrabKeyboard(dpy, CurrentTime);
+    updatenumlockmask();
+    {
+        unsigned int i, j, k;
+        unsigned int modifiers[] = {0, LockMask, numlockmask,
+                                    numlockmask | LockMask};
+        int start, end, skip;
+        KeySym *syms;
+
+        XUngrabKey(dpy, AnyKey, AnyModifier, root);
+        XDisplayKeycodes(dpy, &start, &end);
+        syms = XGetKeyboardMapping(dpy, start, end - start + 1, &skip);
+        if (!syms)
+            return;
+        for (k = start; k <= end; k++)
+            for (i = 0; i < LENGTH(keys); i++)
+                /* skip modifier codes, we do that ourselves */
+                if (keys[i].keysym == syms[(k - start) * skip])
+                    for (j = 0; j < LENGTH(modifiers); j++)
+                        XGrabKey(dpy, k, keys[i].mod | modifiers[j], root, True,
+                                 GrabModeAsync, GrabModeAsync);
+        XFree(syms);
+    }
 }
-
-void incnmaster(const Arg *arg) {
-  selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
-  arrange(selmon);
+void
+incnmaster(const Arg *arg)
+{
+    selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag] = MAX(selmon->nmaster + arg->i, 0);
+    arrange(selmon);
 }
 
 #ifdef XINERAMA
 static int isuniquegeom(XineramaScreenInfo *unique, size_t n,
-                        XineramaScreenInfo *info) {
-  while (n--)
-    if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org &&
-        unique[n].width == info->width && unique[n].height == info->height)
-      return 0;
-  return 1;
+                        XineramaScreenInfo *info)
+{
+    while (n--)
+        if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org &&
+            unique[n].width == info->width && unique[n].height == info->height)
+            return 0;
+    return 1;
 }
 #endif /* XINERAMA */
 
-void keypress(XEvent *e) {
-  unsigned int i;
-  KeySym keysym;
-  XKeyEvent *ev;
-
-  ev = &e->xkey;
-  keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-  for (i = 0; i < LENGTH(keys); i++)
-    if (keysym == keys[i].keysym &&
-        CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) && keys[i].func)
-      keys[i].func(&(keys[i].arg));
-}
-
-void killclient(const Arg *arg) {
-  if (!selmon->sel)
-    return;
-  if (!sendevent(selmon->sel, wmatom[WMDelete])) {
-    XGrabServer(dpy);
-    XSetErrorHandler(xerrordummy);
-    XSetCloseDownMode(dpy, DestroyAll);
-    XKillClient(dpy, selmon->sel->win);
-    XSync(dpy, False);
-    XSetErrorHandler(xerror);
-    XUngrabServer(dpy);
-  }
-}
-
-void manage(Window w, XWindowAttributes *wa) {
-  Client *c, *t = NULL, *term = NULL;
-  Window trans = None;
-  XWindowChanges wc;
-
-  c = ecalloc(1, sizeof(Client));
-  c->win = w;
-  c->pid = winpid(w);
-  /* geometry */
-  c->x = c->oldx = wa->x;
-  c->y = c->oldy = wa->y;
-  c->w = c->oldw = wa->width;
-  c->h = c->oldh = wa->height;
-  c->oldbw = wa->border_width;
-
-  updatetitle(c);
-  if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
-    c->mon = t->mon;
-    c->tags = t->tags;
-  } else {
-    c->mon = selmon;
-    applyrules(c);
-    term = termforwin(c);
-  }
-
-  if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
-    c->x = c->mon->wx + c->mon->ww - WIDTH(c);
-  if (c->y + HEIGHT(c) > c->mon->wy + c->mon->wh)
-    c->y = c->mon->wy + c->mon->wh - HEIGHT(c);
-  c->x = MAX(c->x, c->mon->wx);
-  c->y = MAX(c->y, c->mon->wy);
-  c->bw = borderpx;
-
-  wc.border_width = c->bw;
-  XConfigureWindow(dpy, w, CWBorderWidth, &wc);
-  XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
-  configure(c); /* propagates border_width, if size doesn't change */
-  updatewindowtype(c);
-  updatesizehints(c);
-  updatewmhints(c);
-  {
-    int format;
-    unsigned long *data, n, extra;
+void
+keypress(XEvent *e)
+{
+    unsigned int i;
+    KeySym keysym;
+    XKeyEvent *ev;
+
+    if (keymode == ModeCommand)
+    {
+        keypresscmd(e);
+        return;
+    }
+
+    ev = &e->xkey;
+    keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
+    for (i = 0; i < LENGTH(keys); i++)
+        if (keysym == keys[i].keysym &&
+            CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) && keys[i].func)
+            keys[i].func(&(keys[i].arg));
+}
+
+void
+keypresscmd(XEvent *e)
+{
+    unsigned int i, j;
+    int matches = 0;
+    KeySym keysym;
+    XKeyEvent *ev;
+
+    ev = &e->xkey;
+    keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
+    if (XK_Shift_L <= keysym && keysym <= XK_Hyper_R)
+    {
+        return;
+    }
+
+    for (i = 0; i < LENGTH(cmdkeys); i++)
+    {
+        if (keysym == cmdkeys[i].keysym && CLEANMASK(cmdkeys[i].mod) == CLEANMASK(ev->state) && cmdkeys[i].func)
+        {
+            cmdkeys[i].func(&(cmdkeys[i].arg));
+            return;
+        }
+    }
+
+    for (j = 0; j < LENGTH(cmdkeysym); j++)
+    {
+        if (cmdkeysym[j] == 0)
+        {
+            cmdkeysym[j] = keysym;
+            cmdmod[j] = ev->state;
+            break;
+        }
+    }
+
+    for (i = 0; i < LENGTH(commands); i++)
+    {
+        matches = 0;
+        for (j = 0; j < LENGTH(cmdkeysym); j++)
+        {
+            if (cmdkeysym[j] == commands[i].keysym[j] && CLEANMASK(cmdmod[j]) == CLEANMASK(commands[i].mod[j]))
+                matches++;
+        }
+        if (matches == LENGTH(cmdkeysym))
+        {
+            if (commands[i].func)
+                commands[i].func(&(commands[i].arg));
+            clearcmd(NULL);
+            return;
+        }
+    }
+}
+
+void
+killclient(const Arg *arg)
+{
+    Client *c;
+
+    if (!selmon->sel)
+        return;
+
+    if (!arg->ui || arg->ui == 0)
+    {
+        killthis(selmon->sel);
+        return;
+    }
+
+    for (c = selmon->clients; c; c = c->next)
+    {
+        if (!ISVISIBLE(c) || (arg->ui == 1 && c == selmon->sel))
+            continue;
+        killthis(c);
+    }
+}
+
+void
+killthis(Client *c)
+{
+    if (!sendevent(c, wmatom[WMDelete]))
+    {
+        XGrabServer(dpy);
+        XSetErrorHandler(xerrordummy);
+        XSetCloseDownMode(dpy, DestroyAll);
+        XKillClient(dpy, c->win);
+        XSync(dpy, False);
+        XSetErrorHandler(xerror);
+        XUngrabServer(dpy);
+    }
+}
+
+void
+manage(Window w, XWindowAttributes *wa)
+{
+    Client *c, *t = NULL, *term = NULL;
+    Window trans = None;
+    XWindowChanges wc;
+
+    c = ecalloc(1, sizeof(Client));
+    c->win = w;
+    c->pid = winpid(w);
+    /* geometry */
+    c->x = c->oldx = wa->x;
+    c->y = c->oldy = wa->y;
+    c->w = c->oldw = wa->width;
+    c->h = c->oldh = wa->height;
+    c->oldbw = wa->border_width;
+    c->cfact = 1.0;
+
+    updatetitle(c);
+    if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans)))
+    {
+        c->mon = t->mon;
+        c->tags = t->tags;
+    }
+    else
+    {
+        c->mon = selmon;
+        applyrules(c);
+        term = termforwin(c);
+    }
+
+    if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww)
+        c->x = c->mon->wx + c->mon->ww - WIDTH(c);
+    if (c->y + HEIGHT(c) > c->mon->wy + c->mon->wh)
+        c->y = c->mon->wy + c->mon->wh - HEIGHT(c);
+    c->x = MAX(c->x, c->mon->wx);
+    c->y = MAX(c->y, c->mon->wy);
+    c->bw = borderpx;
+
+    wc.border_width = c->bw;
+    XConfigureWindow(dpy, w, CWBorderWidth, &wc);
+    XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
+    configure(c); /* propagates border_width, if size doesn't change */
+    updatewindowtype(c);
+    updatesizehints(c);
+    updatewmhints(c);
+    {
+        int format;
+        unsigned long *data, n, extra;
+        Monitor *m;
+        Atom atom;
+        if (XGetWindowProperty(dpy, c->win, netatom[NetClientInfo], 0L, 2L, False,
+                               XA_CARDINAL, &atom, &format, &n, &extra,
+                               (unsigned char **)&data) == Success &&
+            n == 2)
+        {
+            c->tags = *data;
+            for (m = mons; m; m = m->next)
+            {
+                if (m->num == *(data + 1))
+                {
+                    c->mon = m;
+                    break;
+                }
+            }
+        }
+        if (n > 0)
+            XFree(data);
+    }
+    c->sfx = c->x;
+    c->sfy = c->y;
+    c->sfw = c->w;
+    c->sfh = c->h;
+    setclienttagprop(c);
+
+    c->x = c->mon->mx + (c->mon->mw - WIDTH(c)) / 2;
+    c->y = c->mon->my + (c->mon->mh - HEIGHT(c)) / 2;
+    XSelectInput(dpy, w,
+                 EnterWindowMask | FocusChangeMask | PropertyChangeMask |
+                     StructureNotifyMask);
+    grabbuttons(c, 0);
+    c->wasfloating = 0;
+    c->expandmask = 0;
+    if (!c->isfloating)
+        c->isfloating = c->oldstate = trans != None || c->isfixed;
+    if (c->isfloating)
+        XRaiseWindow(dpy, c->win);
+    attach(c);
+    attachstack(c);
+    XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32,
+                    PropModeAppend, (unsigned char *)&(c->win), 1);
+    XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w,
+                      c->h); /* some windows require this */
+    setclientstate(c, NormalState);
+    if (selmon->sel && selmon->sel->isfullscreen && !c->isfloating)
+        setfullscreen(selmon->sel, 0);
+    if (c->mon == selmon)
+        unfocus(selmon->sel, 0);
+    c->mon->sel = c;
+    XMapWindow(dpy, c->win);
+    if (term)
+        swallow(term, c);
+    arrange(c->mon);
+    focus(NULL);
+}
+
+void
+mappingnotify(XEvent *e)
+{
+    XMappingEvent *ev = &e->xmapping;
+
+    XRefreshKeyboardMapping(ev);
+    if (ev->request == MappingKeyboard)
+        grabkeys();
+}
+
+void
+maprequest(XEvent *e)
+{
+    static XWindowAttributes wa;
+    XMapRequestEvent *ev = &e->xmaprequest;
+
+    if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
+        return;
+    if (!wintoclient(ev->window))
+        manage(ev->window, &wa);
+}
+
+void
+monocle(Monitor *m)
+{
+    unsigned int n;
+    int oh, ov, ih, iv;
+    Client *c;
+
+    getgaps(m, &oh, &ov, &ih, &iv, &n);
+
+    if (n > 0) /* override layout symbol */
+        snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
+    for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
+        resize(c, m->wx + ov, m->wy + oh, m->ww - 2 * c->bw - 2 * ov,
+               m->wh - 2 * c->bw - 2 * oh, 0);
+}
+
+void
+motionnotify(XEvent *e)
+{
+    static Monitor *mon = NULL;
+    Monitor *m;
+    XMotionEvent *ev = &e->xmotion;
+
+    if (ev->window != root)
+        return;
+    if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon)
+    {
+        unfocus(selmon->sel, 1);
+        selmon = m;
+        focus(NULL);
+    }
+    mon = m;
+}
+
+void
+movemouse(const Arg *arg)
+{
+    int x, y, ocx, ocy, nx, ny;
+    Client *c;
     Monitor *m;
-    Atom atom;
-    if (XGetWindowProperty(dpy, c->win, netatom[NetClientInfo], 0L, 2L, False,
-                           XA_CARDINAL, &atom, &format, &n, &extra,
-                           (unsigned char **)&data) == Success &&
-        n == 2) {
-      c->tags = *data;
-      for (m = mons; m; m = m->next) {
-        if (m->num == *(data + 1)) {
-          c->mon = m;
-          break;
+    XEvent ev;
+
+    if (!(c = selmon->sel))
+        return;
+    if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
+        return;
+    restack(selmon);
+    ocx = c->x;
+    ocy = c->y;
+    if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+                     None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
+        return;
+    if (!getrootptr(&x, &y))
+        return;
+    do
+    {
+        XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
+        switch (ev.type)
+        {
+        case ConfigureRequest:
+        case Expose:
+        case MapRequest:
+            handler[ev.type](&ev);
+            break;
+        case MotionNotify:
+            nx = ocx + (ev.xmotion.x - x);
+            ny = ocy + (ev.xmotion.y - y);
+            if ((m = recttomon(nx, ny, c->w, c->h)))
+            {
+                if (m != selmon)
+                    sendmon(c, m);
+                if (abs(selmon->wx - nx) < snap)
+                    nx = selmon->wx;
+                else if (abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
+                    nx = selmon->wx + selmon->ww - WIDTH(c);
+                if (abs(selmon->wy - ny) < snap)
+                    ny = selmon->wy;
+                else if (abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
+                    ny = selmon->wy + selmon->wh - HEIGHT(c);
+                if (!c->isfloating && selmon->lt[selmon->sellt]->arrange &&
+                    (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
+                    togglefloating(NULL);
+                if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                    resize(c, nx, ny, c->w, c->h, 1);
+            }
+            break;
         }
-      }
-    }
-    if (n > 0)
-      XFree(data);
-  }
-  setclienttagprop(c);
-
-  c->x = c->mon->mx + (c->mon->mw - WIDTH(c)) / 2;
-  c->y = c->mon->my + (c->mon->mh - HEIGHT(c)) / 2;
-  XSelectInput(dpy, w,
-               EnterWindowMask | FocusChangeMask | PropertyChangeMask |
-                   StructureNotifyMask);
-  grabbuttons(c, 0);
-  if (!c->isfloating)
-    c->isfloating = c->oldstate = trans != None || c->isfixed;
-  if (c->isfloating)
-    XRaiseWindow(dpy, c->win);
-  attach(c);
-  attachstack(c);
-  XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32,
-                  PropModeAppend, (unsigned char *)&(c->win), 1);
-  XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w,
-                    c->h); /* some windows require this */
-  setclientstate(c, NormalState);
-  if (selmon->sel && selmon->sel->isfullscreen && !c->isfloating)
-    setfullscreen(selmon->sel, 0);
-  if (c->mon == selmon)
-    unfocus(selmon->sel, 0);
-  c->mon->sel = c;
-  XMapWindow(dpy, c->win);
-  if (term)
-    swallow(term, c);
-  arrange(c->mon);
-  focus(NULL);
+    } while (ev.type != ButtonRelease);
+    XUngrabPointer(dpy, CurrentTime);
+    if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon)
+    {
+        sendmon(c, m);
+        selmon = m;
+        focus(NULL);
+    }
 }
 
-void mappingnotify(XEvent *e) {
-  XMappingEvent *ev = &e->xmapping;
+Client *
+nexttiled(Client *c)
+{
+    for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next)
+        ;
+    return c;
+}
 
-  XRefreshKeyboardMapping(ev);
-  if (ev->request == MappingKeyboard)
-    grabkeys();
+void
+pop(Client *c)
+{
+    detach(c);
+    attach(c);
+    focus(c);
+    arrange(c->mon);
+}
+
+void
+pushstack(const Arg *arg)
+{
+    int i = stackpos(arg);
+    Client *sel = selmon->sel, *c, *p;
+
+    if (i < 0 || !sel)
+        return;
+    else if (i == 0)
+    {
+        detach(sel);
+        attach(sel);
+    }
+    else
+    {
+        for (p = NULL, c = selmon->clients; c; p = c, c = c->next)
+            if (!(i -= (ISVISIBLE(c) && c != sel)))
+                break;
+        c = c ? c : p;
+        detach(sel);
+        sel->next = c->next;
+        c->next = sel;
+    }
+    arrange(selmon);
 }
 
-void maprequest(XEvent *e) {
-  static XWindowAttributes wa;
-  XMapRequestEvent *ev = &e->xmaprequest;
+void
+propertynotify(XEvent *e)
+{
+    Client *c;
+    Window trans;
+    XPropertyEvent *ev = &e->xproperty;
+
+    if ((ev->window == root) && (ev->atom == XA_WM_NAME))
+    {
+        updatestatus();
+    }
+    else if (ev->state == PropertyDelete)
+    {
+        return; /* ignore */
+    }
+    else if ((c = wintoclient(ev->window)))
+    {
+        switch (ev->atom)
+        {
+        default:
+            break;
+        case XA_WM_TRANSIENT_FOR:
+            if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
+                (c->isfloating = (wintoclient(trans)) != NULL))
+                arrange(c->mon);
+            break;
+        case XA_WM_NORMAL_HINTS:
+            updatesizehints(c);
+            break;
+        case XA_WM_HINTS:
+            updatewmhints(c);
+            drawbars();
+            break;
+        }
+        if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName])
+        {
+            updatetitle(c);
+            if (c == c->mon->sel)
+                drawbar(c->mon);
+        }
+        if (ev->atom == netatom[NetWMWindowType])
+            updatewindowtype(c);
+    }
+}
 
-  if (!XGetWindowAttributes(dpy, ev->window, &wa) || wa.override_redirect)
-    return;
-  if (!wintoclient(ev->window))
-    manage(ev->window, &wa);
+void
+quit(const Arg *arg)
+{
+    if (arg->i)
+        restart = 1;
+    running = 0;
 }
 
-void monocle(Monitor *m) {
-  unsigned int n;
-  int oh, ov, ih, iv;
-  Client *c;
+Monitor *recttomon(int x, int y, int w, int h)
+{
+    Monitor *m, *r = selmon;
+    int a, area = 0;
 
-  getgaps(m, &oh, &ov, &ih, &iv, &n);
+    for (m = mons; m; m = m->next)
+        if ((a = INTERSECT(x, y, w, h, m)) > area)
+        {
+            area = a;
+            r = m;
+        }
+    return r;
+}
+
+void
+resize(Client *c, int x, int y, int w, int h, int interact)
+{
+    if (applysizehints(c, &x, &y, &w, &h, interact))
+        resizeclient(c, x, y, w, h);
+}
+
+void
+resizeclient(Client *c, int x, int y, int w, int h)
+{
+    XWindowChanges wc;
+
+    c->oldx = c->x;
+    c->x = wc.x = x;
+    c->oldy = c->y;
+    c->y = wc.y = y;
+    c->oldw = c->w;
+    c->w = wc.width = w;
+    c->oldh = c->h;
+    c->h = wc.height = h;
+    c->expandmask = 0;
+    wc.border_width = c->bw;
+    XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth,
+                     &wc);
+    configure(c);
+    XSync(dpy, False);
+}
 
-  if (n > 0) /* override layout symbol */
-    snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
-  for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
-    resize(c, m->wx + ov, m->wy + oh, m->ww - 2 * c->bw - 2 * ov,
-           m->wh - 2 * c->bw - 2 * oh, 0);
+void
+resizemouse(const Arg *arg)
+{
+    int ocx, ocy, nw, nh;
+    Client *c;
+    Monitor *m;
+    XEvent ev;
+
+    if (!(c = selmon->sel))
+        return;
+    if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
+        return;
+    restack(selmon);
+    ocx = c->x;
+    ocy = c->y;
+    if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+                     None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
+        return;
+    XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1,
+                 c->h + c->bw - 1);
+    do
+    {
+        XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
+        switch (ev.type)
+        {
+        case ConfigureRequest:
+        case Expose:
+        case MapRequest:
+            handler[ev.type](&ev);
+            break;
+        case MotionNotify:
+            nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
+            nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
+            if ((m = recttomon(c->x, c->y, nw, nh)))
+            {
+                if (m != selmon)
+                    sendmon(c, m);
+                if (!c->isfloating && selmon->lt[selmon->sellt]->arrange && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
+                    togglefloating(NULL);
+            }
+            if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
+                resize(c, c->x, c->y, nw, nh, 1);
+            break;
+        }
+    } while (ev.type != ButtonRelease);
+    XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1,
+                 c->h + c->bw - 1);
+    XUngrabPointer(dpy, CurrentTime);
+    while (XCheckMaskEvent(dpy, EnterWindowMask, &ev))
+        ;
+    if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon)
+    {
+        sendmon(c, m);
+        selmon = m;
+        focus(NULL);
+    }
 }
 
-void motionnotify(XEvent *e) {
-  static Monitor *mon = NULL;
-  Monitor *m;
-  XMotionEvent *ev = &e->xmotion;
+void
+restack(Monitor *m)
+{
+    Client *c;
+    XEvent ev;
+    XWindowChanges wc;
 
-  if (ev->window != root)
-    return;
-  if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
-    unfocus(selmon->sel, 1);
-    selmon = m;
-    focus(NULL);
-  }
-  mon = m;
-}
-
-void movemouse(const Arg *arg) {
-  int x, y, ocx, ocy, nx, ny;
-  Client *c;
-  Monitor *m;
-  XEvent ev;
-  Time lasttime = 0;
-
-  if (!(c = selmon->sel))
-    return;
-  if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
-    return;
-  restack(selmon);
-  ocx = c->x;
-  ocy = c->y;
-  if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                   None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
-    return;
-  if (!getrootptr(&x, &y))
-    return;
-  do {
-    XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
-    switch (ev.type) {
-    case ConfigureRequest:
-    case Expose:
-    case MapRequest:
-      handler[ev.type](&ev);
-      break;
-    case MotionNotify:
-      if ((ev.xmotion.time - lasttime) <= (1000 / 60))
-        continue;
-      lasttime = ev.xmotion.time;
-
-      nx = ocx + (ev.xmotion.x - x);
-      ny = ocy + (ev.xmotion.y - y);
-      if (abs(selmon->wx - nx) < snap)
-        nx = selmon->wx;
-      else if (abs((selmon->wx + selmon->ww) - (nx + WIDTH(c))) < snap)
-        nx = selmon->wx + selmon->ww - WIDTH(c);
-      if (abs(selmon->wy - ny) < snap)
-        ny = selmon->wy;
-      else if (abs((selmon->wy + selmon->wh) - (ny + HEIGHT(c))) < snap)
-        ny = selmon->wy + selmon->wh - HEIGHT(c);
-      if (!c->isfloating && selmon->lt[selmon->sellt]->arrange &&
-          (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
-        togglefloating(NULL);
-      if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-        resize(c, nx, ny, c->w, c->h, 1);
-      break;
-    }
-  } while (ev.type != ButtonRelease);
-  XUngrabPointer(dpy, CurrentTime);
-  if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
-    sendmon(c, m);
-    selmon = m;
-    focus(NULL);
-  }
+    drawbar(m);
+    if (!m->sel)
+        return;
+    if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
+        XRaiseWindow(dpy, m->sel->win);
+    if (m->lt[m->sellt]->arrange)
+    {
+        wc.stack_mode = Below;
+        wc.sibling = m->barwin;
+        for (c = m->stack; c; c = c->snext)
+            if (!c->isfloating && ISVISIBLE(c))
+            {
+                XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+                wc.sibling = c->win;
+            }
+    }
+    XSync(dpy, False);
+    while (XCheckMaskEvent(dpy, EnterWindowMask, &ev))
+        ;
 }
 
-Client *nexttiled(Client *c) {
-  for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next)
-    ;
-  return c;
+void
+run(void)
+{
+    XEvent ev;
+    /* main event loop */
+    XSync(dpy, False);
+    while (running && !XNextEvent(dpy, &ev))
+        if (handler[ev.type])
+            handler[ev.type](&ev); /* call handler */
+}
+
+void
+runAutostart(void)
+{ 
+  system("killall -q dwmblocks; dwmblocks &"); 
+}
+
+void
+scan(void)
+{
+    unsigned int i, num;
+    Window d1, d2, *wins = NULL;
+    XWindowAttributes wa;
+
+    if (XQueryTree(dpy, root, &d1, &d2, &wins, &num))
+    {
+        for (i = 0; i < num; i++)
+        {
+            if (!XGetWindowAttributes(dpy, wins[i], &wa) || wa.override_redirect ||
+                XGetTransientForHint(dpy, wins[i], &d1))
+                continue;
+            if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
+                manage(wins[i], &wa);
+        }
+        for (i = 0; i < num; i++)
+        { /* now the transients */
+            if (!XGetWindowAttributes(dpy, wins[i], &wa))
+                continue;
+            if (XGetTransientForHint(dpy, wins[i], &d1) &&
+                (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
+                manage(wins[i], &wa);
+        }
+        if (wins)
+            XFree(wins);
+    }
 }
 
-void pop(Client *c) {
-  detach(c);
-  attach(c);
-  focus(c);
-  arrange(c->mon);
+void
+sendmon(Client *c, Monitor *m)
+{
+    Monitor *oldm = selmon;
+    if (c->mon == m)
+        return;
+    unfocus(c, 1);
+    detach(c);
+    detachstack(c);
+    c->mon = m;
+    c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
+    attach(c);
+    attachstack(c);
+    setclienttagprop(c);
+    if (oldm != m)
+        arrange(oldm);
+    arrange(m);
+    focus(c);
+    restack(m);
 }
 
-void pushstack(const Arg *arg) {
-  int i = stackpos(arg);
-  Client *sel = selmon->sel, *c, *p;
+void
+setclientstate(Client *c, long state)
+{
+    long data[] = {state, None};
 
-  if (i < 0 || !sel)
-    return;
-  else if (i == 0) {
-    detach(sel);
-    attach(sel);
-  } else {
-    for (p = NULL, c = selmon->clients; c; p = c, c = c->next)
-      if (!(i -= (ISVISIBLE(c) && c != sel)))
-        break;
-    c = c ? c : p;
-    detach(sel);
-    sel->next = c->next;
-    c->next = sel;
-  }
-  arrange(selmon);
+    XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
+                    PropModeReplace, (unsigned char *)data, 2);
 }
 
-void propertynotify(XEvent *e) {
-  Client *c;
-  Window trans;
-  XPropertyEvent *ev = &e->xproperty;
+void
+setinsertmode()
+{
+    keymode = ModeInsert;
+    clearcmd(NULL);
+    grabkeys();
+}
 
-  if ((ev->window == root) && (ev->atom == XA_WM_NAME)) {
-    updatestatus();
-  } else if (ev->state == PropertyDelete) {
-    return; /* ignore */
-  } else if ((c = wintoclient(ev->window))) {
-    switch (ev->atom) {
-    default:
-      break;
-    case XA_WM_TRANSIENT_FOR:
-      if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
-          (c->isfloating = (wintoclient(trans)) != NULL))
+void
+setkeymode(const Arg *arg)
+{
+    if (!arg)
+        return;
+    keymode = arg->ui;
+    clearcmd(NULL);
+    grabkeys();
+}
+
+int
+sendevent(Client *c, Atom proto)
+{
+    int n;
+    Atom *protocols;
+    int exists = 0;
+    XEvent ev;
+
+    if (XGetWMProtocols(dpy, c->win, &protocols, &n))
+    {
+        while (!exists && n--)
+            exists = protocols[n] == proto;
+        XFree(protocols);
+    }
+    if (exists)
+    {
+        ev.type = ClientMessage;
+        ev.xclient.window = c->win;
+        ev.xclient.message_type = wmatom[WMProtocols];
+        ev.xclient.format = 32;
+        ev.xclient.data.l[0] = proto;
+        ev.xclient.data.l[1] = CurrentTime;
+        XSendEvent(dpy, c->win, False, NoEventMask, &ev);
+    }
+    return exists;
+}
+
+void
+setfocus(Client *c)
+{
+    if (!c->neverfocus)
+    {
+        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
+        XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32,
+                        PropModeReplace, (unsigned char *)&(c->win), 1);
+    }
+    sendevent(c, wmatom[WMTakeFocus]);
+}
+
+void
+setfullscreen(Client *c, int fullscreen)
+{
+    if (fullscreen && !c->isfullscreen)
+    {
+        XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+                        PropModeReplace, (unsigned char *)&netatom[NetWMFullscreen],
+                        1);
+        c->isfullscreen = 1;
+        c->oldstate = c->isfloating;
+        c->oldbw = c->bw;
+        c->bw = 0;
+        c->isfloating = 1;
+        resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
+        XRaiseWindow(dpy, c->win);
+    }
+    else if (!fullscreen && c->isfullscreen)
+    {
+        XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
+                        PropModeReplace, (unsigned char *)0, 0);
+        c->isfullscreen = 0;
+        c->isfloating = c->oldstate;
+        c->bw = c->oldbw;
+        c->x = c->oldx;
+        c->y = c->oldy;
+        c->w = c->oldw;
+        c->h = c->oldh;
+        resizeclient(c, c->x, c->y, c->w, c->h);
         arrange(c->mon);
-      break;
-    case XA_WM_NORMAL_HINTS:
-      updatesizehints(c);
-      break;
-    case XA_WM_HINTS:
-      updatewmhints(c);
-      drawbars();
-      break;
-    }
-    if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-      updatetitle(c);
-      if (c == c->mon->sel)
-        drawbar(c->mon);
-    }
-    if (ev->atom == netatom[NetWMWindowType])
-      updatewindowtype(c);
-  }
-}
-
-void quit(const Arg *arg) {
-  if (arg->i)
-    restart = 1;
-  running = 0;
-}
-
-Monitor *recttomon(int x, int y, int w, int h) {
-  Monitor *m, *r = selmon;
-  int a, area = 0;
-
-  for (m = mons; m; m = m->next)
-    if ((a = INTERSECT(x, y, w, h, m)) > area) {
-      area = a;
-      r = m;
-    }
-  return r;
-}
-
-void resize(Client *c, int x, int y, int w, int h, int interact) {
-  if (applysizehints(c, &x, &y, &w, &h, interact))
-    resizeclient(c, x, y, w, h);
-}
-
-void resizeclient(Client *c, int x, int y, int w, int h) {
-  XWindowChanges wc;
-
-  c->oldx = c->x;
-  c->x = wc.x = x;
-  c->oldy = c->y;
-  c->y = wc.y = y;
-  c->oldw = c->w;
-  c->w = wc.width = w;
-  c->oldh = c->h;
-  c->h = wc.height = h;
-  wc.border_width = c->bw;
-  XConfigureWindow(dpy, c->win, CWX | CWY | CWWidth | CWHeight | CWBorderWidth,
-                   &wc);
-  configure(c);
-  XSync(dpy, False);
-}
-
-void resizemouse(const Arg *arg) {
-  int ocx, ocy, nw, nh;
-  Client *c;
-  Monitor *m;
-  XEvent ev;
-  Time lasttime = 0;
-
-  if (!(c = selmon->sel))
-    return;
-  if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
-    return;
-  restack(selmon);
-  ocx = c->x;
-  ocy = c->y;
-  if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                   None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
-    return;
-  XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1,
-               c->h + c->bw - 1);
-  do {
-    XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
-    switch (ev.type) {
-    case ConfigureRequest:
-    case Expose:
-    case MapRequest:
-      handler[ev.type](&ev);
-      break;
-    case MotionNotify:
-      if ((ev.xmotion.time - lasttime) <= (1000 / 60))
-        continue;
-      lasttime = ev.xmotion.time;
-
-      nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
-      nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
-      if (c->mon->wx + nw >= selmon->wx &&
-          c->mon->wx + nw <= selmon->wx + selmon->ww &&
-          c->mon->wy + nh >= selmon->wy &&
-          c->mon->wy + nh <= selmon->wy + selmon->wh) {
-        if (!c->isfloating && selmon->lt[selmon->sellt]->arrange &&
-            (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
-          togglefloating(NULL);
-      }
-      if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-        resize(c, c->x, c->y, nw, nh, 1);
-      break;
-    }
-  } while (ev.type != ButtonRelease);
-  XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1,
-               c->h + c->bw - 1);
-  XUngrabPointer(dpy, CurrentTime);
-  while (XCheckMaskEvent(dpy, EnterWindowMask, &ev))
-    ;
-  if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
-    sendmon(c, m);
-    selmon = m;
-    focus(NULL);
-  }
-}
-
-void restack(Monitor *m) {
-  Client *c;
-  XEvent ev;
-  XWindowChanges wc;
-
-  drawbar(m);
-  if (!m->sel)
-    return;
-  if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
-    XRaiseWindow(dpy, m->sel->win);
-  if (m->lt[m->sellt]->arrange) {
-    wc.stack_mode = Below;
-    wc.sibling = m->barwin;
-    for (c = m->stack; c; c = c->snext)
-      if (!c->isfloating && ISVISIBLE(c)) {
-        XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
-        wc.sibling = c->win;
-      }
-  }
-  XSync(dpy, False);
-  while (XCheckMaskEvent(dpy, EnterWindowMask, &ev))
-    ;
-}
-
-void run(void) {
-  XEvent ev;
-  /* main event loop */
-  XSync(dpy, False);
-  while (running && !XNextEvent(dpy, &ev))
-    if (handler[ev.type])
-      handler[ev.type](&ev); /* call handler */
-}
-
-void runAutostart(void) { system("killall -q dwmblocks; dwmblocks &"); }
-
-void scan(void) {
-  unsigned int i, num;
-  Window d1, d2, *wins = NULL;
-  XWindowAttributes wa;
-
-  if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
-    for (i = 0; i < num; i++) {
-      if (!XGetWindowAttributes(dpy, wins[i], &wa) || wa.override_redirect ||
-          XGetTransientForHint(dpy, wins[i], &d1))
-        continue;
-      if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
-        manage(wins[i], &wa);
-    }
-    for (i = 0; i < num; i++) { /* now the transients */
-      if (!XGetWindowAttributes(dpy, wins[i], &wa))
-        continue;
-      if (XGetTransientForHint(dpy, wins[i], &d1) &&
-          (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
-        manage(wins[i], &wa);
-    }
-    if (wins)
-      XFree(wins);
-  }
-}
-
-void sendmon(Client *c, Monitor *m) {
-  if (c->mon == m)
-    return;
-  unfocus(c, 1);
-  detach(c);
-  detachstack(c);
-  c->mon = m;
-  c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
-  attach(c);
-  attachstack(c);
-  setclienttagprop(c);
-  focus(NULL);
-  arrange(NULL);
-}
-
-void setclientstate(Client *c, long state) {
-  long data[] = {state, None};
-
-  XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
-                  PropModeReplace, (unsigned char *)data, 2);
-}
-
-int sendevent(Client *c, Atom proto) {
-  int n;
-  Atom *protocols;
-  int exists = 0;
-  XEvent ev;
-
-  if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-    while (!exists && n--)
-      exists = protocols[n] == proto;
-    XFree(protocols);
-  }
-  if (exists) {
-    ev.type = ClientMessage;
-    ev.xclient.window = c->win;
-    ev.xclient.message_type = wmatom[WMProtocols];
-    ev.xclient.format = 32;
-    ev.xclient.data.l[0] = proto;
-    ev.xclient.data.l[1] = CurrentTime;
-    XSendEvent(dpy, c->win, False, NoEventMask, &ev);
-  }
-  return exists;
-}
-
-void setfocus(Client *c) {
-  if (!c->neverfocus) {
-    XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-    XChangeProperty(dpy, root, netatom[NetActiveWindow], XA_WINDOW, 32,
-                    PropModeReplace, (unsigned char *)&(c->win), 1);
-  }
-  sendevent(c, wmatom[WMTakeFocus]);
-}
-
-void setfullscreen(Client *c, int fullscreen) {
-  if (fullscreen && !c->isfullscreen) {
-    XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
-                    PropModeReplace, (unsigned char *)&netatom[NetWMFullscreen],
-                    1);
-    c->isfullscreen = 1;
-    c->oldstate = c->isfloating;
-    c->oldbw = c->bw;
-    c->bw = 0;
-    c->isfloating = 1;
-    resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
-    XRaiseWindow(dpy, c->win);
-  } else if (!fullscreen && c->isfullscreen) {
-    XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
-                    PropModeReplace, (unsigned char *)0, 0);
-    c->isfullscreen = 0;
-    c->isfloating = c->oldstate;
-    c->bw = c->oldbw;
-    c->x = c->oldx;
-    c->y = c->oldy;
-    c->w = c->oldw;
-    c->h = c->oldh;
-    resizeclient(c, c->x, c->y, c->w, c->h);
-    arrange(c->mon);
-  }
+    }
 }
 
-int stackpos(const Arg *arg) {
-  int n, i;
-  Client *c, *l;
+int
+stackpos(const Arg *arg)
+{
+    int n, i;
+    Client *c, *l;
+
+    if (!selmon->clients)
+        return -1;
+
+    if (arg->i == PREVSEL)
+    {
+        for (l = selmon->stack; l && (!ISVISIBLE(l) || l == selmon->sel);
+             l = l->snext)
+            ;
+        if (!l)
+            return -1;
+        for (i = 0, c = selmon->clients; c != l;
+             i += ISVISIBLE(c) ? 1 : 0, c = c->next)
+            ;
+        return i;
+    }
+    else if (ISINC(arg->i))
+    {
+        if (!selmon->sel)
+            return -1;
+        for (i = 0, c = selmon->clients; c != selmon->sel;
+             i += ISVISIBLE(c) ? 1 : 0, c = c->next)
+            ;
+        for (n = i; c; n += ISVISIBLE(c) ? 1 : 0, c = c->next)
+            ;
+        return MOD(i + GETINC(arg->i), n);
+    }
+    else if (arg->i < 0)
+    {
+        for (i = 0, c = selmon->clients; c; i += ISVISIBLE(c) ? 1 : 0, c = c->next)
+            ;
+        return MAX(i + arg->i, 0);
+    }
+    else
+        return arg->i;
+}
+
+void
+setlayout(const Arg *arg)
+{
+    if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
+    {
+        selmon->pertag->sellts[selmon->pertag->curtag] ^= 1;
+        selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
+        if (!selmon->lt[selmon->sellt]->arrange)
+        {
+            for (Client *c = selmon->clients; c; c = c->next)
+            {
+                if (!c->isfloating)
+                {
+                    /*restore last known float dimensions*/
+                    resize(c, selmon->mx + c->sfx, selmon->my + c->sfy,
+                           c->sfw, c->sfh, 0);
+                }
+            }
+        }
+    }
+    if (arg && arg->v)
+        selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt] = (Layout *)arg->v;
+    selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
+    strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
+    if (selmon->sel)
+        arrange(selmon);
+    else
+        drawbar(selmon);
+}
 
-  if (!selmon->clients)
-    return -1;
+void
+setcfact(const Arg *arg)
+{
+    float f;
+    Client *c;
 
-  if (arg->i == PREVSEL) {
-    for (l = selmon->stack; l && (!ISVISIBLE(l) || l == selmon->sel);
-         l = l->snext)
-      ;
-    if (!l)
-      return -1;
-    for (i = 0, c = selmon->clients; c != l;
-         i += ISVISIBLE(c) ? 1 : 0, c = c->next)
-      ;
-    return i;
-  } else if (ISINC(arg->i)) {
-    if (!selmon->sel)
-      return -1;
-    for (i = 0, c = selmon->clients; c != selmon->sel;
-         i += ISVISIBLE(c) ? 1 : 0, c = c->next)
-      ;
-    for (n = i; c; n += ISVISIBLE(c) ? 1 : 0, c = c->next)
-      ;
-    return MOD(i + GETINC(arg->i), n);
-  } else if (arg->i < 0) {
-    for (i = 0, c = selmon->clients; c; i += ISVISIBLE(c) ? 1 : 0, c = c->next)
-      ;
-    return MAX(i + arg->i, 0);
-  } else
-    return arg->i;
-}
-
-void setlayout(const Arg *arg) {
-  if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
-    selmon->sellt ^= 1;
-  if (arg && arg->v)
-    selmon->lt[selmon->sellt] = (Layout *)arg->v;
-  strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol,
-          sizeof selmon->ltsymbol);
-  if (selmon->sel)
+    c = selmon->sel;
+
+    if (!arg || !c || !selmon->lt[selmon->sellt]->arrange)
+        return;
+    f = arg->f + c->cfact;
+    if (arg->f == 0.0)
+        f = 1.0;
+    else if (f < 0.25 || f > 4.0)
+        return;
+    c->cfact = f;
     arrange(selmon);
-  else
-    drawbar(selmon);
 }
 
 /* arg > 1.0 will set mfact absolutely */
-void setmfact(const Arg *arg) {
-  float f;
-
-  if (!arg || !selmon->lt[selmon->sellt]->arrange)
-    return;
-  f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
-  if (f < 0.05 || f > 0.95)
-    return;
-  selmon->mfact = f;
-  arrange(selmon);
-}
-
-void setup(void) {
-  int i;
-  XSetWindowAttributes wa;
-  Atom utf8string;
-
-  /* clean up any zombies immediately */
-  sigchld(0);
-
-  signal(SIGHUP, sighup);
-  signal(SIGTERM, sigterm);
-
-  /* init screen */
-  screen = DefaultScreen(dpy);
-  sw = DisplayWidth(dpy, screen);
-  sh = DisplayHeight(dpy, screen);
-  root = RootWindow(dpy, screen);
-  drw = drw_create(dpy, screen, root, sw, sh);
-  if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
-    die("no fonts could be loaded.");
-  lrpad = drw->fonts->h;
-  bh = drw->fonts->h + 2;
-  updategeom();
-  /* init atoms */
-  utf8string = XInternAtom(dpy, "UTF8_STRING", False);
-  wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
-  wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-  wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
-  wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
-  netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
-  netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
-  netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-  netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
-  netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
-  netatom[NetWMFullscreen] =
-      XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
-  netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
-  netatom[NetWMWindowTypeDialog] =
-      XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
-  netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
-  netatom[NetClientInfo] = XInternAtom(dpy, "_NET_CLIENT_INFO", False);
-  /* init cursors */
-  cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
-  cursor[CurResize] = drw_cur_create(drw, XC_sizing);
-  cursor[CurMove] = drw_cur_create(drw, XC_fleur);
-  /* init appearance */
-  scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
-  for (i = 0; i < LENGTH(colors); i++)
-    scheme[i] = drw_scm_create(drw, colors[i], 3);
-  /* init bars */
-  updatebars();
-  updatestatus();
-  /* supporting window for NetWMCheck */
-  wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0);
-  XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
-                  PropModeReplace, (unsigned char *)&wmcheckwin, 1);
-  XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8,
-                  PropModeReplace, (unsigned char *)"dwm", 3);
-  XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
-                  PropModeReplace, (unsigned char *)&wmcheckwin, 1);
-  /* EWMH support per view */
-  XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-                  PropModeReplace, (unsigned char *)netatom, NetLast);
-  XDeleteProperty(dpy, root, netatom[NetClientList]);
-  XDeleteProperty(dpy, root, netatom[NetClientInfo]);
-  /* select events */
-  wa.cursor = cursor[CurNormal]->cursor;
-  wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask |
-                  ButtonPressMask | PointerMotionMask | EnterWindowMask |
-                  LeaveWindowMask | StructureNotifyMask | PropertyChangeMask;
-  XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
-  XSelectInput(dpy, root, wa.event_mask);
-  grabkeys();
-  focus(NULL);
-}
-
-void seturgent(Client *c, int urg) {
-  XWMHints *wmh;
-
-  c->isurgent = urg;
-  if (!(wmh = XGetWMHints(dpy, c->win)))
-    return;
-  wmh->flags = urg ? (wmh->flags | XUrgencyHint) : (wmh->flags & ~XUrgencyHint);
-  XSetWMHints(dpy, c->win, wmh);
-  XFree(wmh);
-}
-
-void showhide(Client *c) {
-  if (!c)
-    return;
-  if (ISVISIBLE(c)) {
-    if ((c->tags & SPTAGMASK) && c->isfloating) {
-      c->x = c->mon->wx + (c->mon->ww / 2 - WIDTH(c) / 2);
-      c->y = c->mon->wy + (c->mon->wh / 2 - HEIGHT(c) / 2);
-    }
-    /* show clients top down */
-    XMoveWindow(dpy, c->win, c->x, c->y);
-    if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) &&
-        !c->isfullscreen)
-      resize(c, c->x, c->y, c->w, c->h, 0);
-    showhide(c->snext);
-  } else {
-    /* hide clients bottom up */
-    showhide(c->snext);
-    XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
-  }
-}
-
-void sighup(int unused) {
-  Arg a = {.i = 1};
-  quit(&a);
-}
-
-void sigterm(int unused) {
-  Arg a = {.i = 0};
-  quit(&a);
-}
+void
+setmfact(const Arg *arg)
+{
+    float f;
 
-#ifndef __OpenBSD__
-void sigdwmblocks(const Arg *arg) {
-  union sigval sv;
-  sv.sival_int = 0 | (dwmblockssig << 8) | arg->i;
-  if (!dwmblockspid)
-    if (getdwmblockspid() == -1)
+    if (!arg || !selmon->lt[selmon->sellt]->arrange)
       return;
+    f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
+    if (f < 0.05 || f > 0.95)
+      return;
+	selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag] = f;
+    arrange(selmon);
+}
 
-  if (sigqueue(dwmblockspid, SIGUSR1, sv) == -1) {
-    if (errno == ESRCH) {
-      if (!getdwmblockspid())
-        sigqueue(dwmblockspid, SIGUSR1, sv);
-    }
-  }
+void
+setup(void)
+{
+    int i;
+    XSetWindowAttributes wa;
+    Atom utf8string;
+
+    /* clean up any zombies immediately */
+    sigchld(0);
+
+    signal(SIGHUP, sighup);
+    signal(SIGTERM, sigterm);
+
+    /* init screen */
+    screen = DefaultScreen(dpy);
+    sw = DisplayWidth(dpy, screen);
+    sh = DisplayHeight(dpy, screen);
+    root = RootWindow(dpy, screen);
+    xinitvisual();
+    drw = drw_create(dpy, screen, root, sw, sh, visual, depth, cmap);
+    if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+        die("no fonts could be loaded.");
+    lrpad = drw->fonts->h;
+    bh = drw->fonts->h + 2;
+    sp = sidepad;
+    vp = (topbar == 1) ? vertpad : -vertpad;
+    updategeom();
+    /* init atoms */
+    utf8string = XInternAtom(dpy, "UTF8_STRING", False);
+    wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
+    wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
+    wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
+    wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
+    netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
+    netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
+    netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
+    netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
+    netatom[NetWMCheck] = XInternAtom(dpy, "_NET_SUPPORTING_WM_CHECK", False);
+    netatom[NetWMFullscreen] =
+        XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
+    netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
+    netatom[NetWMWindowTypeDialog] =
+        XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
+    netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
+    netatom[NetClientInfo] = XInternAtom(dpy, "_NET_CLIENT_INFO", False);
+    /* init cursors */
+    cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
+    cursor[CurResize] = drw_cur_create(drw, XC_sizing);
+    cursor[CurMove] = drw_cur_create(drw, XC_fleur);
+    /* init appearance */
+    scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
+    for (i = 0; i < LENGTH(colors); i++)
+        scheme[i] = drw_scm_create(drw, colors[i], alphas[i], 3);
+    /* init bars */
+    updatebars();
+    updatestatus();
+    /* supporting window for NetWMCheck */
+    wmcheckwin = XCreateSimpleWindow(dpy, root, 0, 0, 1, 1, 0, 0, 0);
+    XChangeProperty(dpy, wmcheckwin, netatom[NetWMCheck], XA_WINDOW, 32,
+                    PropModeReplace, (unsigned char *)&wmcheckwin, 1);
+    XChangeProperty(dpy, wmcheckwin, netatom[NetWMName], utf8string, 8,
+                    PropModeReplace, (unsigned char *)"dwm", 3);
+    XChangeProperty(dpy, root, netatom[NetWMCheck], XA_WINDOW, 32,
+                    PropModeReplace, (unsigned char *)&wmcheckwin, 1);
+    /* EWMH support per view */
+    XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
+                    PropModeReplace, (unsigned char *)netatom, NetLast);
+    XDeleteProperty(dpy, root, netatom[NetClientList]);
+    XDeleteProperty(dpy, root, netatom[NetClientInfo]);
+    /* select events */
+    wa.cursor = cursor[CurNormal]->cursor;
+    wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask |
+                    ButtonPressMask | PointerMotionMask | EnterWindowMask |
+                    LeaveWindowMask | StructureNotifyMask | PropertyChangeMask;
+    XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
+    XSelectInput(dpy, root, wa.event_mask);
+    grabkeys();
+    focus(NULL);
+}
+
+void
+seturgent(Client *c, int urg)
+{
+    XWMHints *wmh;
+
+    c->isurgent = urg;
+    if (!(wmh = XGetWMHints(dpy, c->win)))
+        return;
+    wmh->flags = urg ? (wmh->flags | XUrgencyHint) : (wmh->flags & ~XUrgencyHint);
+    XSetWMHints(dpy, c->win, wmh);
+    XFree(wmh);
 }
-#endif
 
-void sigchld(int unused) {
-  if (signal(SIGCHLD, sigchld) == SIG_ERR)
-    die("can't install SIGCHLD handler:");
-  while (0 < waitpid(-1, NULL, WNOHANG))
-    ;
+void
+showhide(Client *c)
+{
+    if (!c)
+        return;
+    if (ISVISIBLE(c))
+    {
+        if ((c->tags & SPTAGMASK) && c->isfloating)
+        {
+            c->x = c->mon->wx + (c->mon->ww / 2 - WIDTH(c) / 2);
+            c->y = c->mon->wy + (c->mon->wh / 2 - HEIGHT(c) / 2);
+        }
+        /* show clients top down */
+        XMoveWindow(dpy, c->win, c->x, c->y);
+        if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) &&
+            !c->isfullscreen)
+            resize(c, c->x, c->y, c->w, c->h, 0);
+        showhide(c->snext);
+    }
+    else
+    {
+        /* hide clients bottom up */
+        showhide(c->snext);
+        XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
+    }
 }
 
-void spawn(const Arg *arg) {
-  if (fork() == 0) {
-    if (dpy)
-      close(ConnectionNumber(dpy));
-    setsid();
-    execvp(((char **)arg->v)[0], (char **)arg->v);
-    die("dwm: execvp '%s' failed:", ((char **)arg->v)[0]);
-  }
+void
+sighup(int unused)
+{
+    Arg a = {.i = 1};
+    quit(&a);
 }
 
-void setclienttagprop(Client *c) {
-  long data[] = {(long)c->tags, (long)c->mon->num};
-  XChangeProperty(dpy, c->win, netatom[NetClientInfo], XA_CARDINAL, 32,
-                  PropModeReplace, (unsigned char *)data, 2);
+void
+sigterm(int unused)
+{
+    Arg a = {.i = 0};
+    quit(&a);
 }
 
-void tag(const Arg *arg) {
-  Client *c;
-  if (selmon->sel && arg->ui & TAGMASK) {
-    c = selmon->sel;
-    selmon->sel->tags = arg->ui & TAGMASK;
-    setclienttagprop(c);
-    focus(NULL);
-    arrange(selmon);
-  }
+#ifndef __OpenBSD__
+void
+sigdwmblocks(const Arg *arg)
+{
+    union sigval sv;
+    sv.sival_int = 0 | (dwmblockssig << 8) | arg->i;
+    if (!dwmblockspid)
+        if (getdwmblockspid() == -1)
+            return;
+
+    if (sigqueue(dwmblockspid, SIGUSR1, sv) == -1)
+    {
+        if (errno == ESRCH)
+        {
+            if (!getdwmblockspid())
+                sigqueue(dwmblockspid, SIGUSR1, sv);
+        }
+    }
 }
+#endif
 
-void tagmon(const Arg *arg) {
-  if (!selmon->sel || !mons->next)
-    return;
-  sendmon(selmon->sel, dirtomon(arg->i));
+void
+sigchld(int unused)
+{
+    if (signal(SIGCHLD, sigchld) == SIG_ERR)
+        die("can't install SIGCHLD handler:");
+    while (0 < waitpid(-1, NULL, WNOHANG))
+        ;
 }
 
-void togglebar(const Arg *arg) {
-  selmon->showbar = !selmon->showbar;
-  updatebarpos(selmon);
-  XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww,
-                    bh);
-  arrange(selmon);
+#define SPAWN_CWD_DELIM " []{}()<>\"':"
+
+void
+spawn(const Arg *arg)
+{
+    setinsertmode();
+    if (fork() == 0)
+    {
+        if (dpy)
+            close(ConnectionNumber(dpy));
+        setsid();
+        execvp(((char **)arg->v)[0], (char **)arg->v);
+        die("dwm: execvp '%s' failed:", ((char **)arg->v)[0]);
+    }
 }
 
-void togglefloating(const Arg *arg) {
-  if (!selmon->sel)
-    return;
-  if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
-    return;
-  selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
-  if (selmon->sel->isfloating)
-    resize(selmon->sel, selmon->sel->x, selmon->sel->y, selmon->sel->w,
-           selmon->sel->h, 0);
-  arrange(selmon);
+void
+setclienttagprop(Client *c)
+{
+    long data[] = {(long)c->tags, (long)c->mon->num};
+    XChangeProperty(dpy, c->win, netatom[NetClientInfo], XA_CARDINAL, 32,
+                    PropModeReplace, (unsigned char *)data, 2);
 }
 
-void togglefullscr(const Arg *arg) {
-  if (selmon->sel)
-    setfullscreen(selmon->sel, !selmon->sel->isfullscreen);
+void
+tag(const Arg *arg)
+{
+    Client *c;
+    if (selmon->sel && arg->ui & TAGMASK)
+    {
+        c = selmon->sel;
+        selmon->sel->tags = arg->ui & TAGMASK;
+        setclienttagprop(c);
+        focus(NULL);
+        arrange(selmon);
+    }
 }
 
-void togglesticky(const Arg *arg) {
-  if (!selmon->sel)
-    return;
-  selmon->sel->issticky = !selmon->sel->issticky;
-  arrange(selmon);
+void
+tagmon(const Arg *arg)
+{
+    if (!selmon->sel || !mons->next)
+        return;
+    sendmon(selmon->sel, dirtomon(arg->i));
 }
 
-void togglescratch(const Arg *arg) {
-  Client *c;
-  unsigned int found = 0;
-  unsigned int scratchtag = SPTAG(arg->ui);
-  Arg sparg = {.v = scratchpads[arg->ui].cmd};
+void
+togglebar(const Arg *arg)
+{
+    unsigned int ctag = selmon->tagset[selmon->seltags];
 
-  for (c = selmon->clients; c && !(found = c->tags & scratchtag); c = c->next)
-    ;
-  if (found) {
-    unsigned int newtagset = selmon->tagset[selmon->seltags] ^ scratchtag;
-    if (newtagset) {
-      selmon->tagset[selmon->seltags] = newtagset;
-      focus(NULL);
-      arrange(selmon);
+    if (arg->i == 1 || ctag == TAGMASK)
+    {
+        selmon->showbar = !selmon->showbar;
+        selmon->barmask = selmon->showbar * TAGMASK;
     }
-    if (ISVISIBLE(c)) {
-      focus(c);
-      restack(selmon);
+    else
+    {
+        selmon->barmask ^= ctag;
     }
-  } else {
-    selmon->tagset[selmon->seltags] |= scratchtag;
-    spawn(&sparg);
-  }
+    updatebarpos(selmon);
+    XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + sp, selmon->by + vp,
+                      selmon->ww - 2 * sp, bh);
+    arrange(selmon);
 }
 
-void toggletag(const Arg *arg) {
-  unsigned int newtags;
+void
+toggleborder(const Arg *arg)
+{
+    selmon->sel->bw = (selmon->sel->bw == borderpx ? 0 : borderpx);
+    arrange(selmon);
+}
 
-  if (!selmon->sel)
-    return;
-  newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
-  if (newtags) {
-    selmon->sel->tags = newtags;
-    setclienttagprop(selmon->sel);
-    focus(NULL);
+void
+togglefloating(const Arg *arg)
+{
+    if (!selmon->sel)
+        return;
+    if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
+        return;
+    selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
+    if (selmon->sel->isfloating)
+    {
+        /*restore last known float dimensions*/
+        resize(selmon->sel, selmon->mx + selmon->sel->sfx, selmon->my + selmon->sel->sfy,
+               selmon->sel->sfw, selmon->sel->sfh, 0);
+    }
+    else
+    {
+        if (selmon->sel->isfullscreen)
+            setfullscreen(selmon->sel, 0);
+        /*save last known float dimensions*/
+        selmon->sel->sfx = selmon->sel->x - selmon->mx;
+        selmon->sel->sfy = selmon->sel->y - selmon->my;
+        selmon->sel->sfw = selmon->sel->w;
+        selmon->sel->sfh = selmon->sel->h;
+    }
     arrange(selmon);
-  }
 }
 
-void toggleview(const Arg *arg) {
-  unsigned int newtagset =
-      selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
+void
+togglefullscr(const Arg *arg)
+{
+    if (selmon->sel)
+        setfullscreen(selmon->sel, !selmon->sel->isfullscreen);
+}
 
-  if (newtagset) {
-    selmon->tagset[selmon->seltags] = newtagset;
-    focus(NULL);
+void
+togglesticky(const Arg *arg)
+{
+    if (!selmon->sel)
+        return;
+    selmon->sel->issticky = !selmon->sel->issticky;
     arrange(selmon);
-  }
 }
 
-void unfocus(Client *c, int setfocus) {
-  if (!c)
-    return;
-  grabbuttons(c, 0);
-  XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
-  if (setfocus) {
-    XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-    XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-  }
+void
+togglescratch(const Arg *arg)
+{
+    Client *c;
+    unsigned int found = 0;
+    unsigned int scratchtag = SPTAG(arg->ui);
+    Arg sparg = {.v = scratchpads[arg->ui].cmd};
+
+    for (c = selmon->clients; c && !(found = c->tags & scratchtag); c = c->next)
+        ;
+    if (found)
+    {
+        unsigned int newtagset = selmon->tagset[selmon->seltags] ^ scratchtag;
+        if (newtagset)
+        {
+            selmon->tagset[selmon->seltags] = newtagset;
+            focus(NULL);
+            arrange(selmon);
+        }
+        if (ISVISIBLE(c))
+        {
+            focus(c);
+            restack(selmon);
+        }
+    }
+    else
+    {
+        selmon->tagset[selmon->seltags] |= scratchtag;
+        spawn(&sparg);
+    }
 }
 
-void unmanage(Client *c, int destroyed) {
-  Monitor *m = c->mon;
-  XWindowChanges wc;
+void
+toggletag(const Arg *arg)
+{
+    unsigned int newtags;
 
-  if (c->swallowing) {
-    unswallow(c);
-    return;
-  }
+    if (!selmon->sel)
+        return;
+    newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
+    if (newtags)
+    {
+        selmon->sel->tags = newtags;
+        setclienttagprop(selmon->sel);
+        focus(NULL);
+        arrange(selmon);
+    }
+}
 
-  Client *s = swallowingclient(c->win);
-  if (s) {
-    free(s->swallowing);
-    s->swallowing = NULL;
-    arrange(m);
-    focus(NULL);
-    return;
-  }
-
-  detach(c);
-  detachstack(c);
-  if (!destroyed) {
-    wc.border_width = c->oldbw;
-    XGrabServer(dpy); /* avoid race conditions */
-    XSetErrorHandler(xerrordummy);
-    XSelectInput(dpy, c->win, NoEventMask);
-    XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
-    XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-    setclientstate(c, WithdrawnState);
-    XSync(dpy, False);
-    XSetErrorHandler(xerror);
-    XUngrabServer(dpy);
-  }
-  free(c);
+void
+toggleview(const Arg *arg)
+{
+    unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
+    int i;
 
-  if (!s) {
-    arrange(m);
-    focus(NULL);
-    updateclientlist();
-  }
+    if (newtagset)
+    {
+        if (newtagset == ~0)
+        {
+            selmon->pertag->prevtag = selmon->pertag->curtag;
+            selmon->pertag->curtag = 0;
+        }
+        /* test if the user did not select the same tag */
+        if (!(newtagset & 1 << (selmon->pertag->curtag - 1)))
+        {
+            selmon->pertag->prevtag = selmon->pertag->curtag;
+            for (i = 0; !(newtagset & 1 << i); i++)
+                ;
+            selmon->pertag->curtag = i + 1;
+        }
+        selmon->tagset[selmon->seltags] = newtagset;
+
+        /* apply settings for this view */
+        selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
+        selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
+        selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
+        selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
+        selmon->lt[selmon->sellt ^ 1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt ^ 1];
+        focus(NULL);
+        arrange(selmon);
+    }
 }
 
-void unmapnotify(XEvent *e) {
-  Client *c;
-  XUnmapEvent *ev = &e->xunmap;
+void
+unfocus(Client *c, int setfocus)
+{
+    if (!c)
+        return;
+    grabbuttons(c, 0);
+    XSetWindowBorder(dpy, c->win, scheme[SchemeNorm][ColBorder].pixel);
+    if (setfocus)
+    {
+        XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+        XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
+    }
+}
 
-  if ((c = wintoclient(ev->window))) {
-    if (ev->send_event)
-      setclientstate(c, WithdrawnState);
-    else
-      unmanage(c, 0);
-  }
-}
-
-void updatebars(void) {
-  Monitor *m;
-  XSetWindowAttributes wa = {.override_redirect = True,
-                             .background_pixmap = ParentRelative,
-                             .event_mask = ButtonPressMask | ExposureMask};
-  XClassHint ch = {"dwm", "dwm"};
-  for (m = mons; m; m = m->next) {
-    if (m->barwin)
-      continue;
-    m->barwin = XCreateWindow(
-        dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
-        CopyFromParent, DefaultVisual(dpy, screen),
-        CWOverrideRedirect | CWBackPixmap | CWEventMask, &wa);
-    XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
-    XMapRaised(dpy, m->barwin);
-    XSetClassHint(dpy, m->barwin, &ch);
-  }
-}
-
-void updatebarpos(Monitor *m) {
-  m->wy = m->my;
-  m->wh = m->mh;
-  if (m->showbar) {
-    m->wh -= bh;
-    m->by = m->topbar ? m->wy : m->wy + m->wh;
-    m->wy = m->topbar ? m->wy + bh : m->wy;
-  } else
-    m->by = -bh;
-}
-
-void updateclientlist() {
-  Client *c;
-  Monitor *m;
-
-  XDeleteProperty(dpy, root, netatom[NetClientList]);
-  for (m = mons; m; m = m->next)
-    for (c = m->clients; c; c = c->next)
-      XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32,
-                      PropModeAppend, (unsigned char *)&(c->win), 1);
+void
+unmanage(Client *c, int destroyed)
+{
+    Monitor *m = c->mon;
+    XWindowChanges wc;
+
+    if (c->swallowing)
+    {
+        unswallow(c);
+        return;
+    }
+
+    Client *s = swallowingclient(c->win);
+    if (s)
+    {
+        free(s->swallowing);
+        s->swallowing = NULL;
+        arrange(m);
+        focus(NULL);
+        return;
+    }
+
+    detach(c);
+    detachstack(c);
+    if (!destroyed)
+    {
+        wc.border_width = c->oldbw;
+        XGrabServer(dpy); /* avoid race conditions */
+        XSetErrorHandler(xerrordummy);
+        XSelectInput(dpy, c->win, NoEventMask);
+        XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
+        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+        setclientstate(c, WithdrawnState);
+        XSync(dpy, False);
+        XSetErrorHandler(xerror);
+        XUngrabServer(dpy);
+    }
+    free(c);
+
+    if (!s)
+    {
+        arrange(m);
+        focus(NULL);
+        updateclientlist();
+    }
 }
 
-int updategeom(void) {
-  int dirty = 0;
+void
+unmapnotify(XEvent *e)
+{
+    Client *c;
+    XUnmapEvent *ev = &e->xunmap;
+
+    if ((c = wintoclient(ev->window)))
+    {
+        if (ev->send_event)
+            setclientstate(c, WithdrawnState);
+        else
+            unmanage(c, 0);
+    }
+}
 
-#ifdef XINERAMA
-  if (XineramaIsActive(dpy)) {
-    int i, j, n, nn;
+void
+updatebars(void)
+{
+    Monitor *m;
+    XSetWindowAttributes wa = {.override_redirect = True,
+                               .background_pixel = 0,
+                               .border_pixel = 0,
+                               .colormap = cmap,
+                               .event_mask = ButtonPressMask | ExposureMask};
+    XClassHint ch = {"dwm", "dwm"};
+    for (m = mons; m; m = m->next)
+    {
+        if (m->barwin)
+            continue;
+        m->barwin = XCreateWindow(dpy, root, m->wx + sp, m->by + vp, m->ww - 2 * sp,
+                                  bh, 0, depth, InputOutput, visual,
+                                  CWOverrideRedirect | CWBackPixel | CWBorderPixel |
+                                      CWColormap | CWEventMask,
+                                  &wa);
+        XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
+        XMapRaised(dpy, m->barwin);
+        XSetClassHint(dpy, m->barwin, &ch);
+    }
+}
+
+void
+updatebarpos(Monitor *m)
+{
+    m->wy = m->my;
+    m->wh = m->mh;
+    if ((m->tagset[m->seltags] & m->barmask))
+    {
+        m->wh = m->wh - vertpad - bh;
+        m->by = m->topbar ? m->wy : m->wy + m->wh + vertpad;
+        m->wy = m->topbar ? m->wy + bh + vp : m->wy;
+    }
+    else
+        m->by = -bh - vp;
+}
+
+void
+updateclientlist()
+{
     Client *c;
     Monitor *m;
-    XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
-    XineramaScreenInfo *unique = NULL;
-
-    for (n = 0, m = mons; m; m = m->next, n++)
-      ;
-    /* only consider unique geometries as separate screens */
-    unique = ecalloc(nn, sizeof(XineramaScreenInfo));
-    for (i = 0, j = 0; i < nn; i++)
-      if (isuniquegeom(unique, j, &info[i]))
-        memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
-    XFree(info);
-    nn = j;
-
-    /* new monitors if nn > n */
-    for (i = n; i < nn; i++) {
-      for (m = mons; m && m->next; m = m->next)
-        ;
-      if (m)
-        m->next = createmon();
-      else
-        mons = createmon();
-    }
-    for (i = 0, m = mons; i < nn && m; m = m->next, i++)
-      if (i >= n || unique[i].x_org != m->mx || unique[i].y_org != m->my ||
-          unique[i].width != m->mw || unique[i].height != m->mh) {
-        dirty = 1;
-        m->num = i;
-        m->mx = m->wx = unique[i].x_org;
-        m->my = m->wy = unique[i].y_org;
-        m->mw = m->ww = unique[i].width;
-        m->mh = m->wh = unique[i].height;
-        updatebarpos(m);
-      }
-    /* removed monitors if n > nn */
-    for (i = nn; i < n; i++) {
-      for (m = mons; m && m->next; m = m->next)
-        ;
-      while ((c = m->clients)) {
-        dirty = 1;
-        m->clients = c->next;
-        detachstack(c);
-        c->mon = mons;
-        attach(c);
-        attachstack(c);
-      }
-      if (m == selmon)
-        selmon = mons;
-      cleanupmon(m);
+
+    XDeleteProperty(dpy, root, netatom[NetClientList]);
+    for (m = mons; m; m = m->next)
+        for (c = m->clients; c; c = c->next)
+            XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32,
+                            PropModeAppend, (unsigned char *)&(c->win), 1);
+}
+
+int
+updategeom(void)
+{
+    int dirty = 0;
+
+#ifdef XINERAMA
+    if (XineramaIsActive(dpy))
+    {
+        int i, j, n, nn;
+        Client *c;
+        Monitor *m;
+        XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
+        XineramaScreenInfo *unique = NULL;
+
+        for (n = 0, m = mons; m; m = m->next, n++)
+            ;
+        /* only consider unique geometries as separate screens */
+        unique = ecalloc(nn, sizeof(XineramaScreenInfo));
+        for (i = 0, j = 0; i < nn; i++)
+            if (isuniquegeom(unique, j, &info[i]))
+                memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
+        XFree(info);
+        nn = j;
+
+        /* new monitors if nn > n */
+        for (i = n; i < nn; i++)
+        {
+            for (m = mons; m && m->next; m = m->next)
+                ;
+            if (m)
+                m->next = createmon();
+            else
+                mons = createmon();
+        }
+        for (i = 0, m = mons; i < nn && m; m = m->next, i++)
+            if (i >= n || unique[i].x_org != m->mx || unique[i].y_org != m->my ||
+                unique[i].width != m->mw || unique[i].height != m->mh)
+            {
+                dirty = 1;
+                m->num = i;
+                m->mx = m->wx = unique[i].x_org;
+                m->my = m->wy = unique[i].y_org;
+                m->mw = m->ww = unique[i].width;
+                m->mh = m->wh = unique[i].height;
+                updatebarpos(m);
+            }
+        /* removed monitors if n > nn */
+        for (i = nn; i < n; i++)
+        {
+            for (m = mons; m && m->next; m = m->next)
+                ;
+            while ((c = m->clients))
+            {
+                dirty = 1;
+                m->clients = c->next;
+                detachstack(c);
+                c->mon = mons;
+                attach(c);
+                attachstack(c);
+            }
+            if (m == selmon)
+                selmon = mons;
+            cleanupmon(m);
+        }
+        free(unique);
     }
-    free(unique);
-  } else
+    else
 #endif /* XINERAMA */
-  {    /* default monitor setup */
-    if (!mons)
-      mons = createmon();
-    if (mons->mw != sw || mons->mh != sh) {
-      dirty = 1;
-      mons->mw = mons->ww = sw;
-      mons->mh = mons->wh = sh;
-      updatebarpos(mons);
-    }
-  }
-  if (dirty) {
-    selmon = mons;
-    selmon = wintomon(root);
-  }
-  return dirty;
-}
-
-void updatenumlockmask(void) {
-  unsigned int i, j;
-  XModifierKeymap *modmap;
-
-  numlockmask = 0;
-  modmap = XGetModifierMapping(dpy);
-  for (i = 0; i < 8; i++)
-    for (j = 0; j < modmap->max_keypermod; j++)
-      if (modmap->modifiermap[i * modmap->max_keypermod + j] ==
-          XKeysymToKeycode(dpy, XK_Num_Lock))
-        numlockmask = (1 << i);
-  XFreeModifiermap(modmap);
-}
-
-void updatesizehints(Client *c) {
-  long msize;
-  XSizeHints size;
-
-  if (!XGetWMNormalHints(dpy, c->win, &size, &msize))
-    /* size is uninitialized, ensure that size.flags aren't used */
-    size.flags = PSize;
-  if (size.flags & PBaseSize) {
-    c->basew = size.base_width;
-    c->baseh = size.base_height;
-  } else if (size.flags & PMinSize) {
-    c->basew = size.min_width;
-    c->baseh = size.min_height;
-  } else
-    c->basew = c->baseh = 0;
-  if (size.flags & PResizeInc) {
-    c->incw = size.width_inc;
-    c->inch = size.height_inc;
-  } else
-    c->incw = c->inch = 0;
-  if (size.flags & PMaxSize) {
-    c->maxw = size.max_width;
-    c->maxh = size.max_height;
-  } else
-    c->maxw = c->maxh = 0;
-  if (size.flags & PMinSize) {
-    c->minw = size.min_width;
-    c->minh = size.min_height;
-  } else if (size.flags & PBaseSize) {
-    c->minw = size.base_width;
-    c->minh = size.base_height;
-  } else
-    c->minw = c->minh = 0;
-  if (size.flags & PAspect) {
-    c->mina = (float)size.min_aspect.y / size.min_aspect.x;
-    c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
-  } else
-    c->maxa = c->mina = 0.0;
-  c->isfixed = (c->maxw && c->maxh && c->maxw == c->minw && c->maxh == c->minh);
-}
-
-void updatestatus(void) {
-  if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)))
-    strcpy(stext, "dwm-" VERSION);
-  else
-    copyvalidchars(stext, rawstext);
-  drawbar(selmon);
-}
-
-void updatetitle(Client *c) {
-  if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
-    gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
-  if (c->name[0] == '\0') /* hack to mark broken clients */
-    strcpy(c->name, broken);
-}
-
-void updatewindowtype(Client *c) {
-  Atom state = getatomprop(c, netatom[NetWMState]);
-  Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
-
-  if (state == netatom[NetWMFullscreen])
-    setfullscreen(c, 1);
-  if (wtype == netatom[NetWMWindowTypeDialog])
-    c->isfloating = 1;
-}
-
-void updatewmhints(Client *c) {
-  XWMHints *wmh;
-
-  if ((wmh = XGetWMHints(dpy, c->win))) {
-    if (c == selmon->sel && wmh->flags & XUrgencyHint) {
-      wmh->flags &= ~XUrgencyHint;
-      XSetWMHints(dpy, c->win, wmh);
-    } else
-      c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0;
-    if (wmh->flags & InputHint)
-      c->neverfocus = !wmh->input;
+    {  /* default monitor setup */
+        if (!mons)
+            mons = createmon();
+        if (mons->mw != sw || mons->mh != sh)
+        {
+            dirty = 1;
+            mons->mw = mons->ww = sw;
+            mons->mh = mons->wh = sh;
+            updatebarpos(mons);
+        }
+    }
+    if (dirty)
+    {
+        selmon = mons;
+        selmon = wintomon(root);
+    }
+    return dirty;
+}
+
+void
+updatenumlockmask(void)
+{
+    unsigned int i, j;
+    XModifierKeymap *modmap;
+
+    numlockmask = 0;
+    modmap = XGetModifierMapping(dpy);
+    for (i = 0; i < 8; i++)
+        for (j = 0; j < modmap->max_keypermod; j++)
+            if (modmap->modifiermap[i * modmap->max_keypermod + j] ==
+                XKeysymToKeycode(dpy, XK_Num_Lock))
+                numlockmask = (1 << i);
+    XFreeModifiermap(modmap);
+}
+
+void
+updatesizehints(Client *c)
+{
+    long msize;
+    XSizeHints size;
+
+    if (!XGetWMNormalHints(dpy, c->win, &size, &msize))
+        /* size is uninitialized, ensure that size.flags aren't used */
+        size.flags = PSize;
+    if (size.flags & PBaseSize)
+    {
+        c->basew = size.base_width;
+        c->baseh = size.base_height;
+    }
+    else if (size.flags & PMinSize)
+    {
+        c->basew = size.min_width;
+        c->baseh = size.min_height;
+    }
     else
-      c->neverfocus = 0;
-    XFree(wmh);
-  }
+        c->basew = c->baseh = 0;
+    if (size.flags & PResizeInc)
+    {
+        c->incw = size.width_inc;
+        c->inch = size.height_inc;
+    }
+    else
+        c->incw = c->inch = 0;
+    if (size.flags & PMaxSize)
+    {
+        c->maxw = size.max_width;
+        c->maxh = size.max_height;
+    }
+    else
+        c->maxw = c->maxh = 0;
+    if (size.flags & PMinSize)
+    {
+        c->minw = size.min_width;
+        c->minh = size.min_height;
+    }
+    else if (size.flags & PBaseSize)
+    {
+        c->minw = size.base_width;
+        c->minh = size.base_height;
+    }
+    else
+        c->minw = c->minh = 0;
+    if (size.flags & PAspect)
+    {
+        c->mina = (float)size.min_aspect.y / size.min_aspect.x;
+        c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
+    }
+    else
+        c->maxa = c->mina = 0.0;
+    c->isfixed = (c->maxw && c->maxh && c->maxw == c->minw && c->maxh == c->minh);
 }
 
-void view(const Arg *arg) {
-  if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
-    return;
-  selmon->seltags ^= 1; /* toggle sel tagset */
-  if (arg->ui & TAGMASK)
-    selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-  focus(NULL);
-  arrange(selmon);
+void
+updatestatus(void)
+{
+    if (!gettextprop(root, XA_WM_NAME, rawstext, sizeof(rawstext)))
+        strcpy(stext, "dwm-" VERSION);
+    else
+        copyvalidchars(stext, rawstext);
+    drawbar(selmon);
+}
+
+void
+updatetitle(Client *c)
+{
+    if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
+        gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
+    if (c->name[0] == '\0') /* hack to mark broken clients */
+        strcpy(c->name, broken);
 }
 
-pid_t winpid(Window w) {
-  pid_t result = 0;
+void
+updatewindowtype(Client *c)
+{
+    Atom state = getatomprop(c, netatom[NetWMState]);
+    Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
 
-  xcb_res_client_id_spec_t spec = {0};
-  spec.client = w;
-  spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
+    if (state == netatom[NetWMFullscreen])
+        setfullscreen(c, 1);
+    if (wtype == netatom[NetWMWindowTypeDialog])
+        c->isfloating = 1;
+}
+
+void
+updatewmhints(Client *c)
+{
+    XWMHints *wmh;
 
-  xcb_generic_error_t *e = NULL;
-  xcb_res_query_client_ids_cookie_t c =
-      xcb_res_query_client_ids(xcon, 1, &spec);
-  xcb_res_query_client_ids_reply_t *r =
-      xcb_res_query_client_ids_reply(xcon, c, &e);
+    if ((wmh = XGetWMHints(dpy, c->win)))
+    {
+        if (c == selmon->sel && wmh->flags & XUrgencyHint)
+        {
+            wmh->flags &= ~XUrgencyHint;
+            XSetWMHints(dpy, c->win, wmh);
+        }
+        else
+            c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0;
+        if (wmh->flags & InputHint)
+            c->neverfocus = !wmh->input;
+        else
+            c->neverfocus = 0;
+        XFree(wmh);
+    }
+}
 
-  if (!r)
-    return (pid_t)0;
+void
+view(const Arg *arg)
+{
+    int i;
+    unsigned int tmptag;
+
+    if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
+        return;
+    selmon->seltags ^= 1; /* toggle sel tagset */
+    if (arg->ui & TAGMASK)
+    {
+        selmon->pertag->prevtag = selmon->pertag->curtag;
+        selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
+        if (arg->ui == ~0)
+            selmon->pertag->curtag = 0;
+        else
+        {
+            for (i = 0; !(arg->ui & 1 << i); i++)
+                ;
+            selmon->pertag->curtag = i + 1;
+        }
+    }
+    else
+    {
+        tmptag = selmon->pertag->prevtag;
+        selmon->pertag->prevtag = selmon->pertag->curtag;
+        selmon->pertag->curtag = tmptag;
+    }
+    selmon->nmaster = selmon->pertag->nmasters[selmon->pertag->curtag];
+    selmon->mfact = selmon->pertag->mfacts[selmon->pertag->curtag];
+    selmon->sellt = selmon->pertag->sellts[selmon->pertag->curtag];
+    selmon->lt[selmon->sellt] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt];
+    selmon->lt[selmon->sellt ^ 1] = selmon->pertag->ltidxs[selmon->pertag->curtag][selmon->sellt ^ 1];
+    updatebarpos(selmon);
+    XMoveResizeWindow(dpy, selmon->barwin, selmon->wx + sp, selmon->by + vp,
+                      selmon->ww - 2 * sp, bh);
+    focus(NULL);
+    arrange(selmon);
+}
 
-  xcb_res_client_id_value_iterator_t i =
-      xcb_res_query_client_ids_ids_iterator(r);
-  for (; i.rem; xcb_res_client_id_value_next(&i)) {
-    spec = i.data->spec;
-    if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) {
-      uint32_t *t = xcb_res_client_id_value_value(i.data);
-      result = *t;
-      break;
+pid_t
+winpid(Window w)
+{
+    pid_t result = 0;
+
+    xcb_res_client_id_spec_t spec = {0};
+    spec.client = w;
+    spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID;
+
+    xcb_generic_error_t *e = NULL;
+    xcb_res_query_client_ids_cookie_t c =
+        xcb_res_query_client_ids(xcon, 1, &spec);
+    xcb_res_query_client_ids_reply_t *r =
+        xcb_res_query_client_ids_reply(xcon, c, &e);
+
+    if (!r)
+        return (pid_t)0;
+
+    xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r);
+    for (; i.rem; xcb_res_client_id_value_next(&i))
+    {
+        spec = i.data->spec;
+        if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID)
+        {
+            uint32_t *t = xcb_res_client_id_value_value(i.data);
+            result = *t;
+            break;
+        }
     }
-  }
 
-  free(r);
+    free(r);
 
-  if (result == (pid_t)-1)
-    result = 0;
-  return result;
+    if (result == (pid_t)-1)
+        result = 0;
+    return result;
 }
 
-pid_t getparentprocess(pid_t p) {
-  unsigned int v = 0;
+pid_t
+getparentprocess(pid_t p)
+{
+    unsigned int v = 0;
 
 #if defined(__linux__)
-  FILE *f;
-  char buf[256];
-  snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p);
+    FILE *f;
+    char buf[256];
+    snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p);
 
-  if (!(f = fopen(buf, "r")))
-    return (pid_t)0;
+    if (!(f = fopen(buf, "r")))
+        return (pid_t)0;
 
-  if (fscanf(f, "%*u %*s %*c %u", (unsigned *)&v) != 1)
-    v = (pid_t)0;
-  fclose(f);
+    if (fscanf(f, "%*u %*s %*c %u", (unsigned *)&v) != 1)
+        v = (pid_t)0;
+    fclose(f);
 #elif defined(__FreeBSD__)
-  struct kinfo_proc *proc = kinfo_getproc(p);
-  if (!proc)
-    return (pid_t)0;
+    struct kinfo_proc *proc = kinfo_getproc(p);
+    if (!proc)
+        return (pid_t)0;
 
-  v = proc->ki_ppid;
-  free(proc);
+    v = proc->ki_ppid;
+    free(proc);
 #endif
-  return (pid_t)v;
+    return (pid_t)v;
 }
 
-int isdescprocess(pid_t p, pid_t c) {
-  while (p != c && c != 0)
-    c = getparentprocess(c);
+int
+isdescprocess(pid_t p, pid_t c)
+{
+    while (p != c && c != 0)
+        c = getparentprocess(c);
 
-  return (int)c;
+    return (int)c;
 }
 
-Client *termforwin(const Client *w) {
-  Client *c;
-  Monitor *m;
+Client *
+termforwin(const Client *w)
+{
+    Client *c;
+    Monitor *m;
 
-  if (!w->pid || w->isterminal)
-    return NULL;
+    if (!w->pid || w->isterminal)
+        return NULL;
 
-  for (m = mons; m; m = m->next) {
-    for (c = m->clients; c; c = c->next) {
-      if (c->isterminal && !c->swallowing && c->pid &&
-          isdescprocess(c->pid, w->pid))
-        return c;
+    for (m = mons; m; m = m->next)
+    {
+        for (c = m->clients; c; c = c->next)
+        {
+            if (c->isterminal && !c->swallowing && c->pid &&
+                isdescprocess(c->pid, w->pid))
+                return c;
+        }
     }
-  }
 
-  return NULL;
+    return NULL;
 }
 
-Client *swallowingclient(Window w) {
-  Client *c;
-  Monitor *m;
+Client *
+swallowingclient(Window w)
+{
+    Client *c;
+    Monitor *m;
 
-  for (m = mons; m; m = m->next) {
-    for (c = m->clients; c; c = c->next) {
-      if (c->swallowing && c->swallowing->win == w)
-        return c;
+    for (m = mons; m; m = m->next)
+    {
+        for (c = m->clients; c; c = c->next)
+        {
+            if (c->swallowing && c->swallowing->win == w)
+                return c;
+        }
     }
-  }
 
-  return NULL;
+    return NULL;
 }
 
-Client *wintoclient(Window w) {
-  Client *c;
-  Monitor *m;
+Client *
+wintoclient(Window w)
+{
+    Client *c;
+    Monitor *m;
 
-  for (m = mons; m; m = m->next)
-    for (c = m->clients; c; c = c->next)
-      if (c->win == w)
-        return c;
-  return NULL;
+    for (m = mons; m; m = m->next)
+        for (c = m->clients; c; c = c->next)
+            if (c->win == w)
+                return c;
+    return NULL;
 }
 
-Monitor *wintomon(Window w) {
-  int x, y;
-  Client *c;
-  Monitor *m;
+Monitor *wintomon(Window w)
+{
+    int x, y;
+    Client *c;
+    Monitor *m;
 
-  if (w == root && getrootptr(&x, &y))
-    return recttomon(x, y, 1, 1);
-  for (m = mons; m; m = m->next)
-    if (w == m->barwin)
-      return m;
-  if ((c = wintoclient(w)))
-    return c->mon;
-  return selmon;
+    if (w == root && getrootptr(&x, &y))
+        return recttomon(x, y, 1, 1);
+    for (m = mons; m; m = m->next)
+        if (w == m->barwin)
+            return m;
+    if ((c = wintoclient(w)))
+        return c->mon;
+    return selmon;
 }
 
 /* There's no way to check accesses to destroyed windows, thus those cases are
  * ignored (especially on UnmapNotify's). Other types of errors call Xlibs
  * default error handler, which may call exit. */
-int xerror(Display *dpy, XErrorEvent *ee) {
-  if (ee->error_code == BadWindow ||
-      (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch) ||
-      (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable) ||
-      (ee->request_code == X_PolyFillRectangle &&
-       ee->error_code == BadDrawable) ||
-      (ee->request_code == X_PolySegment && ee->error_code == BadDrawable) ||
-      (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch) ||
-      (ee->request_code == X_GrabButton && ee->error_code == BadAccess) ||
-      (ee->request_code == X_GrabKey && ee->error_code == BadAccess) ||
-      (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
-    return 0;
-  fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-          ee->request_code, ee->error_code);
-  return xerrorxlib(dpy, ee); /* may call exit */
-}
-
-int xerrordummy(Display *dpy, XErrorEvent *ee) { return 0; }
+int
+xerror(Display *dpy, XErrorEvent *ee)
+{
+    if (ee->error_code == BadWindow ||
+        (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch) ||
+        (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable) ||
+        (ee->request_code == X_PolyFillRectangle &&
+         ee->error_code == BadDrawable) ||
+        (ee->request_code == X_PolySegment && ee->error_code == BadDrawable) ||
+        (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch) ||
+        (ee->request_code == X_GrabButton && ee->error_code == BadAccess) ||
+        (ee->request_code == X_GrabKey && ee->error_code == BadAccess) ||
+        (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
+        return 0;
+    fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
+            ee->request_code, ee->error_code);
+    return xerrorxlib(dpy, ee); /* may call exit */
+}
+
+int
+xerrordummy(Display *dpy, XErrorEvent *ee) { return 0; }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
-int xerrorstart(Display *dpy, XErrorEvent *ee) {
-  die("dwm: another window manager is already running");
-  return -1;
-}
-
-void zoom(const Arg *arg) {
-  Client *c = selmon->sel;
-
-  if (!selmon->lt[selmon->sellt]->arrange || !c || c->isfloating)
-    return;
-  if (c == nexttiled(selmon->clients) && !(c = nexttiled(c->next)))
-    return;
-  pop(c);
-}
-
-void xrdb(const Arg *arg) {
-  load_xresources();
-
-  for (int i = 0; i < LENGTH(colors); i++)
-    scheme[i] = drw_scm_create(drw, colors[i], 3);
-
-  focus(NULL);
-  arrange(NULL);
-}
-
-void resource_load(XrmDatabase db, char *name, enum resource_type rtype,
-                   void *dst) {
-  char *sdst = NULL;
-  int *idst = NULL;
-  float *fdst = NULL;
-
-  sdst = dst;
-  idst = dst;
-  fdst = dst;
-
-  char fullname[256];
-  char *type;
-  XrmValue ret;
-
-  snprintf(fullname, sizeof(fullname), "%s.%s", "dwm", name);
-  fullname[sizeof(fullname) - 1] = '\0';
-
-  XrmGetResource(db, fullname, "*", &type, &ret);
-  if (!(ret.addr == NULL || strncmp("String", type, 64))) {
-    switch (rtype) {
-    case STRING:
-      strcpy(sdst, ret.addr);
-      break;
-    case INTEGER:
-      *idst = strtoul(ret.addr, NULL, 10);
-      break;
-    case FLOAT:
-      *fdst = strtof(ret.addr, NULL);
-      break;
-    }
-  }
-}
-
-void load_xresources(void) {
-  Display *display;
-  char *resm;
-  XrmDatabase db;
-  ResourcePref *p;
-
-  display = XOpenDisplay(NULL);
-  resm = XResourceManagerString(display);
-  if (!resm)
-    return;
-
-  db = XrmGetStringDatabase(resm);
-  for (p = resources; p < resources + LENGTH(resources); p++)
-    resource_load(db, p->name, p->type, p->dst);
-  XCloseDisplay(display);
-}
-
-int main(int argc, char *argv[]) {
-  if (argc == 2 && !strcmp("-v", argv[1]))
-    die("dwm-" VERSION);
-  else if (argc != 1)
-    die("usage: dwm [-v]");
-  if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-    fputs("warning: no locale support\n", stderr);
-  if (!(dpy = XOpenDisplay(NULL)))
-    die("dwm: cannot open display");
-  if (!(xcon = XGetXCBConnection(dpy)))
-    die("dwm: cannot get xcb connection\n");
-  checkotherwm();
-  XrmInitialize();
-  load_xresources();
-  setup();
+int
+xerrorstart(Display *dpy, XErrorEvent *ee)
+{
+    die("dwm: another window manager is already running");
+    return -1;
+}
+
+void
+xinitvisual()
+{
+    XVisualInfo *infos;
+    XRenderPictFormat *fmt;
+    int nitems;
+    int i;
+
+    XVisualInfo tpl = {.screen = screen, .depth = 32, .class = TrueColor};
+    long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
+
+    infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
+    visual = NULL;
+    for (i = 0; i < nitems; i++)
+    {
+        fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
+        if (fmt->type == PictTypeDirect && fmt->direct.alphaMask)
+        {
+            visual = infos[i].visual;
+            depth = infos[i].depth;
+            cmap = XCreateColormap(dpy, root, visual, AllocNone);
+            useargb = 1;
+            break;
+        }
+    }
+
+    XFree(infos);
+
+    if (!visual)
+    {
+        visual = DefaultVisual(dpy, screen);
+        depth = DefaultDepth(dpy, screen);
+        cmap = DefaultColormap(dpy, screen);
+    }
+}
+
+void
+zoom(const Arg *arg)
+{
+    Client *c = selmon->sel;
+
+    if (!selmon->lt[selmon->sellt]->arrange || !c || c->isfloating)
+        return;
+    if (c == nexttiled(selmon->clients) && !(c = nexttiled(c->next)))
+        return;
+    pop(c);
+}
+
+void
+xrdb(const Arg *arg)
+{
+    load_xresources();
+
+    for (int i = 0; i < LENGTH(colors); i++)
+        scheme[i] = drw_scm_create(drw, colors[i], alphas[i], 3);
+
+    focus(NULL);
+    arrange(NULL);
+}
+
+void
+resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
+{
+    char *sdst = NULL;
+    int *idst = NULL;
+    float *fdst = NULL;
+
+    sdst = dst;
+    idst = dst;
+    fdst = dst;
+
+    char fullname[256];
+    char *type;
+    XrmValue ret;
+
+    snprintf(fullname, sizeof(fullname), "%s.%s", "dwm", name);
+    fullname[sizeof(fullname) - 1] = '\0';
+
+    XrmGetResource(db, fullname, "*", &type, &ret);
+    if (!(ret.addr == NULL || strncmp("String", type, 64)))
+    {
+        switch (rtype)
+        {
+        case STRING:
+            strcpy(sdst, ret.addr);
+            break;
+        case INTEGER:
+            *idst = strtoul(ret.addr, NULL, 10);
+            break;
+        case FLOAT:
+            *fdst = strtof(ret.addr, NULL);
+            break;
+        }
+    }
+}
+
+void
+load_xresources(void)
+{
+    Display *display;
+    char *resm;
+    XrmDatabase db;
+    ResourcePref *p;
+
+    display = XOpenDisplay(NULL);
+    resm = XResourceManagerString(display);
+    if (!resm)
+        return;
+
+    db = XrmGetStringDatabase(resm);
+    for (p = resources; p < resources + LENGTH(resources); p++)
+        resource_load(db, p->name, p->type, p->dst);
+    XCloseDisplay(display);
+}
+
+int
+main(int argc, char *argv[])
+{
+    if (argc == 2 && !strcmp("-v", argv[1]))
+        die("dwm-" VERSION);
+    else if (argc != 1)
+        die("usage: dwm [-v]");
+    if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
+        fputs("warning: no locale support\n", stderr);
+    if (!(dpy = XOpenDisplay(NULL)))
+        die("dwm: cannot open display");
+    if (!(xcon = XGetXCBConnection(dpy)))
+        die("dwm: cannot get xcb connection\n");
+    checkotherwm();
+    XrmInitialize();
+    load_xresources();
+    setup();
 #ifdef __OpenBSD__
-  if (pledge("stdio rpath proc exec", NULL) == -1)
-    die("pledge");
+    if (pledge("stdio rpath proc exec", NULL) == -1)
+        die("pledge");
 #endif /* __OpenBSD__ */
-  scan();
-  runAutostart();
-  run();
-  if (restart)
-    execvp(argv[0], argv);
-  cleanup();
-  XCloseDisplay(dpy);
-  return EXIT_SUCCESS;
-}
-
-/* tag and view */
-void tagandview(const Arg *arg) {
-  tag(arg);
-  view(arg);
+    scan();
+    runAutostart();
+    run();
+    if (restart)
+        execvp(argv[0], argv);
+    cleanup();
+    XCloseDisplay(dpy);
+    return EXIT_SUCCESS;
 }
diff --git a/dwm/exresize.c b/dwm/exresize.c
new file mode 100644
index 0000000..e3f0424
--- /dev/null
+++ b/dwm/exresize.c
@@ -0,0 +1,195 @@
+#define EXPAND_LEFT  (1 << 0)
+#define EXPAND_RIGHT (1 << 2)
+#define EXPAND_UP    (1 << 4)
+#define EXPAND_DOWN  (1 << 6)
+
+#define IS_SET(q, w) ((q & w) != 0)
+#define IS_FORCED(q, w) IS_SET((q << 1), w)
+
+#define EXPANDALL       (EXPAND_LEFT | EXPAND_RIGHT | EXPAND_UP | EXPAND_DOWN)
+#define UNEXPAND       (EXPANDALL << 1) // Force all directions to 0
+#define FORCE_EXPANDALL ~0 // Force expand in all directions
+
+enum { EX_NW, EX_N, EX_NE, EX_W, EX_C, EX_E, EX_SW, EX_S, EX_SE };
+
+void expand(unsigned char mask);
+
+void togglemaximize(const Arg *arg);
+void toggleverticalexpand(const Arg *arg);
+void togglehorizontalexpand(const Arg *arg);
+void exresize(const Arg *arg);
+void explace(const Arg *arg);
+
+void
+exresize(const Arg *arg) {
+	Client *c;
+	int x, y, nx, ny, nw, nh;
+	c = selmon->sel;
+
+	if (!c || !arg) return;
+	if (selmon->lt[selmon->sellt]->arrange && !c->isfloating)
+		togglefloating(NULL);
+	if (c->expandmask != 0)
+		expand(UNEXPAND);
+
+	x = ((int *)arg->v)[0];
+	y = ((int *)arg->v)[1];
+
+	nw = MIN(selmon->ww - c->bw*2, c->w + x);
+	nh = MIN(selmon->wh - c->bw*2, c->h + y);
+	nx = c->x - x/2;
+	ny = c->y - y/2;
+
+	if (!((abs(c->x + c->w/2 - (selmon->wx + selmon->ww/2)) < snap))) {
+		if ((nw == selmon->ww) || 
+				(nx < selmon->wx) ||
+				(abs(selmon->wx - c->x) < snap))
+			nx = selmon->wx;
+		else if ((nx+nw > (selmon->wx + selmon->ww)) || 
+				(abs((selmon->wx + selmon->ww) - (c->x + c->w)) < snap))
+			nx = (selmon->wx + selmon->ww) - nw - c->bw*2;
+    } else 
+		nx = selmon->wx + selmon->ww/2 - nw/2;
+
+    if (!((abs(c->y + c->h/2 - (selmon->wy + selmon->wh/2)) < snap))) {
+
+		if ((nh == selmon->wh) || 
+				(ny < selmon->wy) ||
+				(abs(selmon->wy - c->y) < snap))
+			ny = selmon->wy;
+		else if ((ny+nh > (selmon->wy + selmon->wh)) ||
+				(abs((selmon->wy + selmon->wh) - (c->y + c->h)) < snap))
+			ny = (selmon->wy + selmon->wh) - nh - c->bw*2;
+	} else 
+        ny = selmon->wy + selmon->wh/2 - nh/2;
+
+
+	resizeclient(c, nx, ny, MAX(nw, 32), MAX(nh, 32));
+	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2);
+}
+
+void
+explace(const Arg *arg) {
+	Client *c;
+	int nx, ny;
+
+	c = selmon->sel;
+	if (!c || (arg->ui >= 9)) return;
+	if (selmon->lt[selmon->sellt]->arrange && !c->isfloating)
+		togglefloating(NULL);
+
+	nx = (arg->ui % 3) - 1;
+	ny = (arg->ui / 3) - 1;
+
+	if (nx < 0) nx = selmon->wx;
+	else if (nx > 0) nx = selmon->wx + selmon->ww - c->w - c->bw*2;
+	else nx = selmon->wx + selmon->ww/2 - c->w/2;
+
+	if (ny < 0) ny = selmon->wy;
+	else if (ny > 0) ny = selmon->wy + selmon->wh - c->h - c->bw*2;
+	else ny = selmon->wy + selmon->wh/2 - c->h/2;
+
+	resize(c, nx, ny, c->w, c->h, 0);
+	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w/2, c->h/2);
+}
+
+int
+calculate_expand(unsigned char mask, unsigned char curmask,
+		unsigned char *newmask, unsigned char key,
+		int *reset_value, int new_reset_value,
+		int max_value, int old_value) {
+	if (IS_SET(key, mask) ||
+			(IS_SET(key, curmask) && (!IS_SET(key, mask) && IS_FORCED(key, mask))) ||
+			(!IS_SET(key, curmask) && (IS_SET(key, mask) && IS_FORCED(key, mask)))) {
+
+		if (IS_SET(key, mask) && (!IS_SET(key,curmask) || IS_FORCED(key,mask)))
+		{
+			if (!IS_SET(key, curmask))
+				*reset_value = new_reset_value;
+			*newmask |= key;
+			return max_value;
+		} else if ((IS_SET(key,curmask) && IS_SET(key, mask)) ||
+				(!IS_SET(key, mask) && IS_FORCED(key, mask))) {
+			*newmask &= ~key;
+			return *reset_value;
+		} else {
+			*newmask &= ~key;
+			return old_value;
+		}
+	} else
+		return new_reset_value;
+}
+
+void
+expand(unsigned char mask) {
+	XEvent ev;
+	int nx1, ny1, nx2, ny2;
+	unsigned char curmask;
+	unsigned char newmask;
+
+	if(!selmon->sel || selmon->sel->isfixed)
+		return;
+	XRaiseWindow(dpy, selmon->sel->win);
+	newmask = curmask = selmon->sel->expandmask;
+
+	if (curmask == 0) {
+		if(!selmon->lt[selmon->sellt]->arrange || selmon->sel->isfloating)
+			selmon->sel->wasfloating = 0;
+		else {
+			togglefloating(NULL);
+			selmon->sel->wasfloating = 0;
+		}
+	}
+
+	nx1 = calculate_expand(mask, curmask, &newmask,
+			EXPAND_LEFT, &selmon->sel->expandx1,
+			selmon->sel->x,
+			selmon->wx,
+			selmon->sel->oldx);
+	nx2 = calculate_expand(mask, curmask, &newmask,
+			EXPAND_RIGHT, &selmon->sel->expandx2,
+			selmon->sel->x + selmon->sel->w,
+			selmon->wx + selmon->ww - 2*borderpx,
+			selmon->sel->oldw + selmon->sel->x);
+	ny1 = calculate_expand(mask, curmask, &newmask,
+			EXPAND_UP, &selmon->sel->expandy1,
+			selmon->sel->y,
+			selmon->wy,
+			selmon->sel->oldy);
+	ny2 = calculate_expand(mask, curmask, &newmask,
+			EXPAND_DOWN, &selmon->sel->expandy2,
+			selmon->sel->y + selmon->sel->h,
+			selmon->wy + selmon->wh - 2*borderpx,
+			selmon->sel->oldh + selmon->sel->y);
+
+
+	resizeclient(selmon->sel, nx1, ny1, MAX(nx2-nx1, 32), MAX(ny2-ny1, 32));
+
+	if ((newmask == 0) && (!selmon->sel->wasfloating))
+		togglefloating(NULL);
+	selmon->sel->expandmask = newmask;
+	drawbar(selmon);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+void
+togglemaximize(const Arg *arg) {
+	if (arg->i > 0) expand(FORCE_EXPANDALL);
+	else if (arg->i < 0) expand(UNEXPAND);
+	else expand(EXPANDALL);
+}
+
+void
+toggleverticalexpand(const Arg *arg) {
+	if (arg->i < 0) expand(EXPAND_DOWN);
+	else if (arg->i > 0) expand(EXPAND_UP);
+	else expand(EXPAND_DOWN | EXPAND_UP);
+}
+
+void
+togglehorizontalexpand(const Arg *arg) {
+	if (arg->i < 0) expand(EXPAND_LEFT);
+	else if (arg->i > 0) expand(EXPAND_RIGHT);
+	else expand(EXPAND_LEFT | EXPAND_RIGHT);
+}
+
diff --git a/dwm/shift-tools-scratchpads.c b/dwm/shift-tools-scratchpads.c
new file mode 100644
index 0000000..1e399a8
--- /dev/null
+++ b/dwm/shift-tools-scratchpads.c
@@ -0,0 +1,143 @@
+/* Sends a window to the next/prev tag */
+void
+shifttag(const Arg *arg)
+{
+	Arg shifted;
+	shifted.ui = selmon->tagset[selmon->seltags] & ~SPTAGMASK;
+
+
+	if (arg->i > 0)	/* left circular shift */
+		shifted.ui = ((shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i))) & ~SPTAGMASK;
+	else		/* right circular shift */
+		shifted.ui = (shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i)) & ~SPTAGMASK;
+	tag(&shifted);
+}
+/* Sends a window to the next/prev tag that has a client, else it moves it to the next/prev one. */
+void
+shifttagclients(const Arg *arg)
+{
+
+	Arg shifted;
+	Client *c;
+	unsigned int tagmask = 0;
+	shifted.ui = selmon->tagset[selmon->seltags] & ~SPTAGMASK;
+
+	for (c = selmon->clients; c; c = c->next)
+		if (!(c->tags & SPTAGMASK))
+			tagmask = tagmask | c->tags;
+
+
+	if (arg->i > 0)	/* left circular shift */
+		do {
+			shifted.ui = (shifted.ui << arg->i)
+			   | (shifted.ui >> (LENGTH(tags) - arg->i));
+			shifted.ui &= ~SPTAGMASK;
+		} while (tagmask && !(shifted.ui & tagmask));
+	else		/* right circular shift */
+		do {
+			shifted.ui = (shifted.ui >> (- arg->i)
+			   | shifted.ui << (LENGTH(tags) + arg->i));
+			shifted.ui &= ~SPTAGMASK;
+		} while (tagmask && !(shifted.ui & tagmask));
+	tag(&shifted);
+}
+/* Navigate to the next/prev tag */
+void
+shiftview(const Arg *arg)
+{
+	Arg shifted;
+	shifted.ui = selmon->tagset[selmon->seltags] & ~SPTAGMASK;
+
+	if (arg->i > 0) {/* left circular shift */
+		shifted.ui = (shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i));
+		shifted.ui &= ~SPTAGMASK;
+	} else {	/* right circular shift */
+		shifted.ui = (shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i));
+		shifted.ui &= ~SPTAGMASK;
+	}
+	view(&shifted);
+}
+/* Navigate to the next/prev tag that has a client, else moves it to the next/prev tag */
+void
+shiftviewclients(const Arg *arg)
+{
+	Arg shifted;
+	Client *c;
+	unsigned int tagmask = 0;
+	shifted.ui = selmon->tagset[selmon->seltags] & ~SPTAGMASK;
+
+	for (c = selmon->clients; c; c = c->next)
+		if (!(c->tags & SPTAGMASK))
+			tagmask = tagmask | c->tags;
+
+
+	if (arg->i > 0)	/* left circular shift */
+		do {
+			shifted.ui = (shifted.ui << arg->i)
+			   | (shifted.ui >> (LENGTH(tags) - arg->i));
+			shifted.ui &= ~SPTAGMASK;
+		} while (tagmask && !(shifted.ui & tagmask));
+	else		/* right circular shift */
+		do {
+			shifted.ui = (shifted.ui >> (- arg->i)
+			   | shifted.ui << (LENGTH(tags) + arg->i));
+			shifted.ui &= ~SPTAGMASK;
+		} while (tagmask && !(shifted.ui & tagmask));
+	view(&shifted);
+}
+/* move the current active window to the next/prev tag and view it. More like following the window */
+void
+shiftboth(const Arg *arg)
+{
+	Arg shifted;
+	shifted.ui = selmon->tagset[selmon->seltags] & ~SPTAGMASK;
+
+	if (arg->i > 0)	/* left circular shift */
+		shifted.ui = ((shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i))) & ~SPTAGMASK;
+	else		/* right circular shift */
+		shifted.ui = ((shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i))) & ~SPTAGMASK;
+	tag(&shifted);
+	view(&shifted);
+}
+//helper function for shiftswaptags found on:
+//https://github.com/moizifty/DWM-Build/blob/65379c62640788881486401a0d8c79333751b02f/config.h#L48
+// modified to work with scratchpad
+void
+swaptags(const Arg *arg)
+{
+	Client *c;
+	unsigned int newtag = arg->ui & TAGMASK;
+	unsigned int curtag = selmon->tagset[selmon->seltags] & ~SPTAGMASK;
+
+	if (newtag == curtag || !curtag || (curtag & (curtag-1)))
+		return;
+
+	for (c = selmon->clients; c != NULL; c = c->next) {
+		if ((c->tags & newtag) || (c->tags & curtag))
+			c->tags ^= curtag ^ newtag;
+
+		if (!c->tags)
+			c->tags = newtag;
+	}
+
+	//move to the swaped tag
+	//selmon->tagset[selmon->seltags] = newtag;
+
+	focus(NULL);
+	arrange(selmon);
+}
+/* swaps "tags" (all the clients) with the next/prev tag. */
+void
+shiftswaptags(const Arg *arg)
+{
+	Arg shifted;
+	shifted.ui = selmon->tagset[selmon->seltags] & ~SPTAGMASK;
+
+	if (arg->i > 0)	/* left circular shift */
+		shifted.ui = ((shifted.ui << arg->i) | (shifted.ui >> (LENGTH(tags) - arg->i))) & ~SPTAGMASK;
+	else		/* right circular shift */
+		shifted.ui = ((shifted.ui >> (- arg->i) | shifted.ui << (LENGTH(tags) + arg->i))) & ~SPTAGMASK;
+	swaptags(&shifted);
+	// uncomment if you also want to "go" (view) the tag where the the clients are going
+	//view(&shifted);
+}
diff --git a/dwm/shiftview.c b/dwm/shiftview.c
deleted file mode 100644
index bb43969..0000000
--- a/dwm/shiftview.c
+++ /dev/null
@@ -1,65 +0,0 @@
-/** Function to shift the current view to the left/right
- *
- * @param: "arg->i" stores the number of tags to shift right (positive value)
- *          or left (negative value)
- */
-void
-shiftview(const Arg *arg)
-{
-	Arg shifted;
-	Client *c;
-	unsigned int tagmask = 0;
-
-	for (c = selmon->clients; c; c = c->next)
-		if (!(c->tags & SPTAGMASK))
-			tagmask = tagmask | c->tags;
-
-	shifted.ui = selmon->tagset[selmon->seltags] & ~SPTAGMASK;
-	if (arg->i > 0) /* left circular shift */
-		do {
-			shifted.ui = (shifted.ui << arg->i)
-			   | (shifted.ui >> (LENGTH(tags) - arg->i));
-			shifted.ui &= ~SPTAGMASK;
-		} while (tagmask && !(shifted.ui & tagmask));
-	else /* right circular shift */
-		do {
-			shifted.ui = (shifted.ui >> (- arg->i)
-			   | shifted.ui << (LENGTH(tags) + arg->i));
-			shifted.ui &= ~SPTAGMASK;
-		} while (tagmask && !(shifted.ui & tagmask));
-
-	view(&shifted);
-}
-
-void
-shifttag(const Arg *arg)
-{
-	Arg a;
-	Client *c;
-	unsigned visible = 0;
-	int i = arg->i;
-	int count = 0;
-	int nextseltags, curseltags = selmon->tagset[selmon->seltags];
-
-	do {
-		if(i > 0) // left circular shift
-			nextseltags = (curseltags << i) | (curseltags >> (LENGTH(tags) - i));
-
-		else // right circular shift
-			nextseltags = (curseltags >> - i) | (curseltags << (LENGTH(tags) + i));
-
-                // Check if tag is visible
-		for (c = selmon->clients; c && !visible; c = c->next)
-			if (nextseltags & c->tags) {
-				visible = 1;
-				break;
-			}
-		i += arg->i;
-	} while (!visible && ++count < 10);
-
-	if (count < 10) {
-		a.i = nextseltags;
-		tag(&a);
-	}
-}
-
diff --git a/dwm/tagandview.c b/dwm/tagandview.c
new file mode 100644
index 0000000..0f98214
--- /dev/null
+++ b/dwm/tagandview.c
@@ -0,0 +1,4 @@
+void tagandview(const Arg *arg) {
+  tag(arg);
+  view(arg);
+}
diff --git a/dwm/vanitygaps.c b/dwm/vanitygaps.c
index 4c98e69..aebbb99 100644
--- a/dwm/vanitygaps.c
+++ b/dwm/vanitygaps.c
@@ -1,185 +1,149 @@
 /* Key binding functions */
 static void defaultgaps(const Arg *arg);
 static void incrgaps(const Arg *arg);
-/* static void incrigaps(const Arg *arg); */
-/* static void incrogaps(const Arg *arg); */
-/* static void incrohgaps(const Arg *arg); */
-/* static void incrovgaps(const Arg *arg); */
-/* static void incrihgaps(const Arg *arg); */
-/* static void incrivgaps(const Arg *arg); */
+static void incrigaps(const Arg *arg);
+static void incrogaps(const Arg *arg);
+static void incrohgaps(const Arg *arg);
+static void incrovgaps(const Arg *arg);
+static void incrihgaps(const Arg *arg);
+static void incrivgaps(const Arg *arg);
 static void togglegaps(const Arg *arg);
-static void togglesmartgaps(const Arg *arg);
-
-/* Layouts */
+/* Layouts (delete the ones you do not need) */
 static void bstack(Monitor *m);
+static void bstackhoriz(Monitor *m);
 static void centeredmaster(Monitor *m);
 static void centeredfloatingmaster(Monitor *m);
+static void col(Monitor *);
 static void deck(Monitor *m);
 static void dwindle(Monitor *m);
 static void fibonacci(Monitor *m, int s);
+static void grid(Monitor *m);
+static void nrowgrid(Monitor *m);
 static void spiral(Monitor *m);
-static void tile(Monitor *);
-
+static void tile(Monitor *m);
 /* Internals */
-static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc);
+static void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv,
+                    unsigned int *nc);
+static void getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf,
+                     int *mr, int *sr);
 static void setgaps(int oh, int ov, int ih, int iv);
 
 /* Settings */
+#if !PERTAG_PATCH
 static int enablegaps = 1;
+#endif // PERTAG_PATCH
+
+void setgaps(int oh, int ov, int ih, int iv) {
+  if (oh < 0)
+    oh = 0;
+  if (ov < 0)
+    ov = 0;
+  if (ih < 0)
+    ih = 0;
+  if (iv < 0)
+    iv = 0;
+
+  selmon->gappoh = oh;
+  selmon->gappov = ov;
+  selmon->gappih = ih;
+  selmon->gappiv = iv;
+  arrange(selmon);
+}
+
+void togglegaps(const Arg *arg) {
+#if PERTAG_PATCH
+  selmon->pertag->enablegaps[selmon->pertag->curtag] =
+      !selmon->pertag->enablegaps[selmon->pertag->curtag];
+#else
+  enablegaps = !enablegaps;
+#endif // PERTAG_PATCH
+  arrange(NULL);
+}
+
+void defaultgaps(const Arg *arg) { setgaps(gappoh, gappov, gappih, gappiv); }
+
+void incrgaps(const Arg *arg) {
+  setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i,
+          selmon->gappih + arg->i, selmon->gappiv + arg->i);
+}
 
-static void
-setgaps(int oh, int ov, int ih, int iv)
-{
-	if (oh < 0) oh = 0;
-	if (ov < 0) ov = 0;
-	if (ih < 0) ih = 0;
-	if (iv < 0) iv = 0;
-
-	selmon->gappoh = oh;
-	selmon->gappov = ov;
-	selmon->gappih = ih;
-	selmon->gappiv = iv;
-	arrange(selmon);
+void incrigaps(const Arg *arg) {
+  setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
+          selmon->gappiv + arg->i);
 }
 
-static void
-togglegaps(const Arg *arg)
-{
-	enablegaps = !enablegaps;
-	arrange(NULL);
+void incrogaps(const Arg *arg) {
+  setgaps(selmon->gappoh + arg->i, selmon->gappov + arg->i, selmon->gappih,
+          selmon->gappiv);
 }
 
-static void
-togglesmartgaps(const Arg *arg)
-{
-	smartgaps = !smartgaps;
-	arrange(NULL);
+void incrohgaps(const Arg *arg) {
+  setgaps(selmon->gappoh + arg->i, selmon->gappov, selmon->gappih,
+          selmon->gappiv);
 }
 
-static void
-defaultgaps(const Arg *arg)
-{
-	setgaps(gappoh, gappov, gappih, gappiv);
+void incrovgaps(const Arg *arg) {
+  setgaps(selmon->gappoh, selmon->gappov + arg->i, selmon->gappih,
+          selmon->gappiv);
 }
 
-static void
-incrgaps(const Arg *arg)
-{
-	setgaps(
-		selmon->gappoh + arg->i,
-		selmon->gappov + arg->i,
-		selmon->gappih + arg->i,
-		selmon->gappiv + arg->i
-	);
+void incrihgaps(const Arg *arg) {
+  setgaps(selmon->gappoh, selmon->gappov, selmon->gappih + arg->i,
+          selmon->gappiv);
 }
 
-/* static void */
-/* incrigaps(const Arg *arg) */
-/* { */
-/* 	setgaps( */
-/* 		selmon->gappoh, */
-/* 		selmon->gappov, */
-/* 		selmon->gappih + arg->i, */
-/* 		selmon->gappiv + arg->i */
-/* 	); */
-/* } */
-
-/* static void */
-/* incrogaps(const Arg *arg) */
-/* { */
-/* 	setgaps( */
-/* 		selmon->gappoh + arg->i, */
-/* 		selmon->gappov + arg->i, */
-/* 		selmon->gappih, */
-/* 		selmon->gappiv */
-/* 	); */
-/* } */
-
-/* static void */
-/* incrohgaps(const Arg *arg) */
-/* { */
-/* 	setgaps( */
-/* 		selmon->gappoh + arg->i, */
-/* 		selmon->gappov, */
-/* 		selmon->gappih, */
-/* 		selmon->gappiv */
-/* 	); */
-/* } */
-
-/* static void */
-/* incrovgaps(const Arg *arg) */
-/* { */
-/* 	setgaps( */
-/* 		selmon->gappoh, */
-/* 		selmon->gappov + arg->i, */
-/* 		selmon->gappih, */
-/* 		selmon->gappiv */
-/* 	); */
-/* } */
-
-/* static void */
-/* incrihgaps(const Arg *arg) */
-/* { */
-/* 	setgaps( */
-/* 		selmon->gappoh, */
-/* 		selmon->gappov, */
-/* 		selmon->gappih + arg->i, */
-/* 		selmon->gappiv */
-/* 	); */
-/* } */
-
-/* static void */
-/* incrivgaps(const Arg *arg) */
-/* { */
-/* 	setgaps( */
-/* 		selmon->gappoh, */
-/* 		selmon->gappov, */
-/* 		selmon->gappih, */
-/* 		selmon->gappiv + arg->i */
-/* 	); */
-/* } */
-
-static void
-getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc)
-{
-	unsigned int n, oe, ie;
-	oe = ie = enablegaps;
-	Client *c;
-
-	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-	if (smartgaps && n == 1) {
-		oe = 0; // outer gaps disabled when only one client
-	}
-
-	*oh = m->gappoh*oe; // outer horizontal gap
-	*ov = m->gappov*oe; // outer vertical gap
-	*ih = m->gappih*ie; // inner horizontal gap
-	*iv = m->gappiv*ie; // inner vertical gap
-	*nc = n;            // number of clients
+void incrivgaps(const Arg *arg) {
+  setgaps(selmon->gappoh, selmon->gappov, selmon->gappih,
+          selmon->gappiv + arg->i);
 }
 
-void
-getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *sr)
-{
-	unsigned int n;
-	float mfacts, sfacts;
-	int mtotal = 0, stotal = 0;
-	Client *c;
-
-	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-	mfacts = MIN(n, m->nmaster);
-	sfacts = n - m->nmaster;
-
-	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
-		if (n < m->nmaster)
-			mtotal += msize / mfacts;
-		else
-			stotal += ssize / sfacts;
-
-	*mf = mfacts; // total factor of master area
-	*sf = sfacts; // total factor of stack area
-	*mr = msize - mtotal; // the remainder (rest) of pixels after an even master split
-	*sr = ssize - stotal; // the remainder (rest) of pixels after an even stack split
+void getgaps(Monitor *m, int *oh, int *ov, int *ih, int *iv, unsigned int *nc) {
+  unsigned int n, oe, ie;
+#if PERTAG_PATCH
+  oe = ie = selmon->pertag->enablegaps[selmon->pertag->curtag];
+#else
+  oe = ie = enablegaps;
+#endif // PERTAG_PATCH
+  Client *c;
+
+  for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
+    ;
+  if (smartgaps && n == 1) {
+    oe = 0; // outer gaps disabled when only one client
+  }
+
+  *oh = m->gappoh * oe; // outer horizontal gap
+  *ov = m->gappov * oe; // outer vertical gap
+  *ih = m->gappih * ie; // inner horizontal gap
+  *iv = m->gappiv * ie; // inner vertical gap
+  *nc = n;              // number of clients
+}
+
+void getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr,
+              int *sr) {
+  unsigned int n;
+  float mfacts = 0, sfacts = 0;
+  int mtotal = 0, stotal = 0;
+  Client *c;
+
+  for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
+    if (n < m->nmaster)
+      mfacts += c->cfact;
+    else
+      sfacts += c->cfact;
+
+  for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
+    if (n < m->nmaster)
+      mtotal += msize * (c->cfact / mfacts);
+    else
+      stotal += ssize * (c->cfact / sfacts);
+
+  *mf = mfacts; // total factor of master area
+  *sf = sfacts; // total factor of stack area
+  *mr = msize -
+        mtotal; // the remainder (rest) of pixels after a cfacts master split
+  *sr = ssize -
+        stotal; // the remainder (rest) of pixels after a cfacts stack split
 }
 
 /***
@@ -190,361 +154,646 @@ getfacts(Monitor *m, int msize, int ssize, float *mf, float *sf, int *mr, int *s
  * Bottomstack layout + gaps
  * https://dwm.suckless.org/patches/bottomstack/
  */
+static void bstack(Monitor *m) {
+  unsigned int i, n;
+  int oh, ov, ih, iv;
+  int mx = 0, my = 0, mh = 0, mw = 0;
+  int sx = 0, sy = 0, sh = 0, sw = 0;
+  float mfacts, sfacts;
+  int mrest, srest;
+  Client *c;
+
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+  if (n == 0)
+    return;
+
+  sx = mx = m->wx + ov;
+  sy = my = m->wy + oh;
+  sh = mh = m->wh - 2 * oh;
+  mw = m->ww - 2 * ov - iv * (MIN(n, m->nmaster) - 1);
+  sw = m->ww - 2 * ov - iv * (n - m->nmaster - 1);
+
+  if (m->nmaster && n > m->nmaster) {
+    sh = (mh - ih) * (1 - m->mfact);
+    mh = mh - ih - sh;
+    sx = mx;
+    sy = my + mh + ih;
+  }
+
+  getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest);
+
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
+    if (i < m->nmaster) {
+      resize(c, mx, my,
+             mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw),
+             mh - (2 * c->bw), 0);
+      mx += WIDTH(c) + iv;
+    } else {
+      resize(c, sx, sy,
+             sw * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) -
+                 (2 * c->bw),
+             sh - (2 * c->bw), 0);
+      sx += WIDTH(c) + iv;
+    }
+  }
+}
 
-static void
-bstack(Monitor *m)
-{
-	unsigned int i, n;
-	int mx = 0, my = 0, mh = 0, mw = 0;
-	int sx = 0, sy = 0, sh = 0, sw = 0;
-	float mfacts, sfacts;
-	int mrest, srest;
-	Client *c;
-
-	int oh, ov, ih, iv;
-	getgaps(m, &oh, &ov, &ih, &iv, &n);
-
-	if (n == 0)
-		return;
-
-	sx = mx = m->wx + ov;
-	sy = my = m->wy + oh;
-	sh = mh = m->wh - 2*oh;
-	mw = m->ww - 2*ov - iv * (MIN(n, m->nmaster) - 1);
-	sw = m->ww - 2*ov - iv * (n - m->nmaster - 1);
-
-	if (m->nmaster && n > m->nmaster) {
-		sh = (mh - ih) * (1 - m->mfact);
-		mh = (mh - ih) * m->mfact;
-		sx = mx;
-		sy = my + mh + ih;
-	}
-
-	getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest);
-
-	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
-		if (i < m->nmaster) {
-			resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0);
-			mx += WIDTH(c) + iv;
-		} else {
-			resize(c, sx, sy, (sw / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0);
-			sx += WIDTH(c) + iv;
-		}
-	}
+static void bstackhoriz(Monitor *m) {
+  unsigned int i, n;
+  int oh, ov, ih, iv;
+  int mx = 0, my = 0, mh = 0, mw = 0;
+  int sx = 0, sy = 0, sh = 0, sw = 0;
+  float mfacts, sfacts;
+  int mrest, srest;
+  Client *c;
+
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+  if (n == 0)
+    return;
+
+  sx = mx = m->wx + ov;
+  sy = my = m->wy + oh;
+  mh = m->wh - 2 * oh;
+  sh = m->wh - 2 * oh - ih * (n - m->nmaster - 1);
+  mw = m->ww - 2 * ov - iv * (MIN(n, m->nmaster) - 1);
+  sw = m->ww - 2 * ov;
+
+  if (m->nmaster && n > m->nmaster) {
+    sh = (mh - ih) * (1 - m->mfact);
+    mh = mh - ih - sh;
+    sy = my + mh + ih;
+    sh = m->wh - mh - 2 * oh - ih * (n - m->nmaster);
+  }
+
+  getfacts(m, mw, sh, &mfacts, &sfacts, &mrest, &srest);
+
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
+    if (i < m->nmaster) {
+      resize(c, mx, my,
+             mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw),
+             mh - (2 * c->bw), 0);
+      mx += WIDTH(c) + iv;
+    } else {
+      resize(c, sx, sy, sw - (2 * c->bw),
+             sh * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) -
+                 (2 * c->bw),
+             0);
+      sy += HEIGHT(c) + ih;
+    }
+  }
 }
 
 /*
  * Centred master layout + gaps
  * https://dwm.suckless.org/patches/centeredmaster/
  */
+void centeredmaster(Monitor *m) {
+  unsigned int i, n;
+  int oh, ov, ih, iv;
+  int mx = 0, my = 0, mh = 0, mw = 0;
+  int lx = 0, ly = 0, lw = 0, lh = 0;
+  int rx = 0, ry = 0, rw = 0, rh = 0;
+  float mfacts = 0, lfacts = 0, rfacts = 0;
+  int mtotal = 0, ltotal = 0, rtotal = 0;
+  int mrest = 0, lrest = 0, rrest = 0;
+  Client *c;
+
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+  if (n == 0)
+    return;
+
+  /* initialize areas */
+  mx = m->wx + ov;
+  my = m->wy + oh;
+  mh = m->wh - 2 * oh - ih * ((!m->nmaster ? n : MIN(n, m->nmaster)) - 1);
+  mw = m->ww - 2 * ov;
+  lh = m->wh - 2 * oh - ih * (((n - m->nmaster) / 2) - 1);
+  rh = m->wh - 2 * oh -
+       ih * (((n - m->nmaster) / 2) - ((n - m->nmaster) % 2 ? 0 : 1));
+
+  if (m->nmaster && n > m->nmaster) {
+    /* go mfact box in the center if more than nmaster clients */
+    if (n - m->nmaster > 1) {
+      /* ||<-S->|<---M--->|<-S->|| */
+      mw = (m->ww - 2 * ov - 2 * iv) * m->mfact;
+      lw = (m->ww - mw - 2 * ov - 2 * iv) / 2;
+      rw = (m->ww - mw - 2 * ov - 2 * iv) - lw;
+      mx += lw + iv;
+    } else {
+      /* ||<---M--->|<-S->|| */
+      mw = (mw - iv) * m->mfact;
+      lw = 0;
+      rw = m->ww - mw - iv - 2 * ov;
+    }
+    lx = m->wx + ov;
+    ly = m->wy + oh;
+    rx = mx + mw + iv;
+    ry = m->wy + oh;
+  }
+
+  /* calculate facts */
+  for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) {
+    if (!m->nmaster || n < m->nmaster)
+      mfacts += c->cfact;
+    else if ((n - m->nmaster) % 2)
+      lfacts += c->cfact; // total factor of left hand stack area
+    else
+      rfacts += c->cfact; // total factor of right hand stack area
+  }
+
+  for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
+    if (!m->nmaster || n < m->nmaster)
+      mtotal += mh * (c->cfact / mfacts);
+    else if ((n - m->nmaster) % 2)
+      ltotal += lh * (c->cfact / lfacts);
+    else
+      rtotal += rh * (c->cfact / rfacts);
+
+  mrest = mh - mtotal;
+  lrest = lh - ltotal;
+  rrest = rh - rtotal;
+
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
+    if (!m->nmaster || i < m->nmaster) {
+      /* nmaster clients are stacked vertically, in the center of the screen */
+      resize(c, mx, my, mw - (2 * c->bw),
+             mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw), 0);
+      my += HEIGHT(c) + ih;
+    } else {
+      /* stack clients are stacked vertically */
+      if ((i - m->nmaster) % 2) {
+        resize(c, lx, ly, lw - (2 * c->bw),
+               lh * (c->cfact / lfacts) +
+                   ((i - 2 * m->nmaster) < 2 * lrest ? 1 : 0) - (2 * c->bw),
+               0);
+        ly += HEIGHT(c) + ih;
+      } else {
+        resize(c, rx, ry, rw - (2 * c->bw),
+               rh * (c->cfact / rfacts) +
+                   ((i - 2 * m->nmaster) < 2 * rrest ? 1 : 0) - (2 * c->bw),
+               0);
+        ry += HEIGHT(c) + ih;
+      }
+    }
+  }
+}
 
-void
-centeredmaster(Monitor *m)
-{
-	unsigned int i, n;
-	int mx = 0, my = 0, mh = 0, mw = 0;
-	int lx = 0, ly = 0, lw = 0, lh = 0;
-	int rx = 0, ry = 0, rw = 0, rh = 0;
-	float mfacts = 0, lfacts = 0, rfacts = 0;
-	int mtotal = 0, ltotal = 0, rtotal = 0;
-	int mrest = 0, lrest = 0, rrest = 0;
-	Client *c;
-
-	int oh, ov, ih, iv;
-	getgaps(m, &oh, &ov, &ih, &iv, &n);
-
-	if (n == 0)
-		return;
-
-	/* initialize areas */
-	mx = m->wx + ov;
-	my = m->wy + oh;
-	mh = m->wh - 2*oh - ih * ((!m->nmaster ? n : MIN(n, m->nmaster)) - 1);
-	mw = m->ww - 2*ov;
-	lh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - 1);
-	rh = m->wh - 2*oh - ih * (((n - m->nmaster) / 2) - ((n - m->nmaster) % 2 ? 0 : 1));
-
-	if (m->nmaster && n > m->nmaster) {
-		/* go mfact box in the center if more than nmaster clients */
-		if (n - m->nmaster > 1) {
-			/* ||<-S->|<---M--->|<-S->|| */
-			mw = (m->ww - 2*ov - 2*iv) * m->mfact;
-			lw = (m->ww - mw - 2*ov - 2*iv) / 2;
-			mx += lw + iv;
-		} else {
-			/* ||<---M--->|<-S->|| */
-			mw = (mw - iv) * m->mfact;
-			lw = m->ww - mw - iv - 2*ov;
-		}
-		rw = lw;
-		lx = m->wx + ov;
-		ly = m->wy + oh;
-		rx = mx + mw + iv;
-		ry = m->wy + oh;
-	}
-
-	/* calculate facts */
-	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++) {
-		if (!m->nmaster || n < m->nmaster)
-			mfacts += 1;
-		else if ((n - m->nmaster) % 2)
-			lfacts += 1; // total factor of left hand stack area
-		else
-			rfacts += 1; // total factor of right hand stack area
-	}
-
-	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++)
-		if (!m->nmaster || n < m->nmaster)
-			mtotal += mh / mfacts;
-		else if ((n - m->nmaster) % 2)
-			ltotal += lh / lfacts;
-		else
-			rtotal += rh / rfacts;
-
-	mrest = mh - mtotal;
-	lrest = lh - ltotal;
-	rrest = rh - rtotal;
-
-	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
-		if (!m->nmaster || i < m->nmaster) {
-			/* nmaster clients are stacked vertically, in the center of the screen */
-			resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0);
-			my += HEIGHT(c) + ih;
-		} else {
-			/* stack clients are stacked vertically */
-			if ((i - m->nmaster) % 2 ) {
-				resize(c, lx, ly, lw - (2*c->bw), (lh / lfacts) + ((i - 2*m->nmaster) < 2*lrest ? 1 : 0) - (2*c->bw), 0);
-				ly += HEIGHT(c) + ih;
-			} else {
-				resize(c, rx, ry, rw - (2*c->bw), (rh / rfacts) + ((i - 2*m->nmaster) < 2*rrest ? 1 : 0) - (2*c->bw), 0);
-				ry += HEIGHT(c) + ih;
-			}
-		}
-	}
+void centeredfloatingmaster(Monitor *m) {
+  unsigned int i, n;
+  float mfacts, sfacts;
+  float mivf = 1.0; // master inner vertical gap factor
+  int oh, ov, ih, iv, mrest, srest;
+  int mx = 0, my = 0, mh = 0, mw = 0;
+  int sx = 0, sy = 0, sh = 0, sw = 0;
+  Client *c;
+
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+  if (n == 0)
+    return;
+
+  sx = mx = m->wx + ov;
+  sy = my = m->wy + oh;
+  sh = mh = m->wh - 2 * oh;
+  mw = m->ww - 2 * ov - iv * (n - 1);
+  sw = m->ww - 2 * ov - iv * (n - m->nmaster - 1);
+
+  if (m->nmaster && n > m->nmaster) {
+    mivf = 0.8;
+    /* go mfact box in the center if more than nmaster clients */
+    if (m->ww > m->wh) {
+      mw = m->ww * m->mfact - iv * mivf * (MIN(n, m->nmaster) - 1);
+      mh = m->wh * 0.9;
+    } else {
+      mw = m->ww * 0.9 - iv * mivf * (MIN(n, m->nmaster) - 1);
+      mh = m->wh * m->mfact;
+    }
+    mx = m->wx + (m->ww - mw) / 2;
+    my = m->wy + (m->wh - mh - 2 * oh) / 2;
+
+    sx = m->wx + ov;
+    sy = m->wy + oh;
+    sh = m->wh - 2 * oh;
+  }
+
+  getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest);
+
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+    if (i < m->nmaster) {
+      /* nmaster clients are stacked horizontally, in the center of the screen
+       */
+      resize(c, mx, my,
+             mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw),
+             mh - (2 * c->bw), 0);
+      mx += WIDTH(c) + iv * mivf;
+    } else {
+      /* stack clients are stacked horizontally */
+      resize(c, sx, sy,
+             sw * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) -
+                 (2 * c->bw),
+             sh - (2 * c->bw), 0);
+      sx += WIDTH(c) + iv;
+    }
 }
 
-void
-centeredfloatingmaster(Monitor *m)
-{
-	unsigned int i, n;
-	float mfacts, sfacts;
-	int mrest, srest;
-	int mx = 0, my = 0, mh = 0, mw = 0;
-	int sx = 0, sy = 0, sh = 0, sw = 0;
-	Client *c;
-
-	float mivf = 1.0; // master inner vertical gap factor
-	int oh, ov, ih, iv;
-	getgaps(m, &oh, &ov, &ih, &iv, &n);
-
-	if (n == 0)
-		return;
-
-	sx = mx = m->wx + ov;
-	sy = my = m->wy + oh;
-	sh = mh = m->wh - 2*oh;
-	mw = m->ww - 2*ov - iv*(n - 1);
-	sw = m->ww - 2*ov - iv*(n - m->nmaster - 1);
-
-	if (m->nmaster && n > m->nmaster) {
-		mivf = 0.8;
-		/* go mfact box in the center if more than nmaster clients */
-		if (m->ww > m->wh) {
-			mw = m->ww * m->mfact - iv*mivf*(MIN(n, m->nmaster) - 1);
-			mh = m->wh * 0.9 - 2*oh;
-		} else {
-			mw = m->ww * 0.9 - iv*mivf*(MIN(n, m->nmaster) - 1);
-			mh = m->wh * m->mfact;
-		}
-		mx = m->wx + (m->ww - mw) / 2;
-		my = m->wy + (m->wh - mh) / 2;
-
-		sx = m->wx + ov;
-		sy = m->wy + oh;
-		sh = m->wh - 2*oh;
-	}
-
-	getfacts(m, mw, sw, &mfacts, &sfacts, &mrest, &srest);
-
-	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
-		if (i < m->nmaster) {
-			/* nmaster clients are stacked horizontally, in the center of the screen */
-			resize(c, mx, my, (mw / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), mh - (2*c->bw), 0);
-			mx += WIDTH(c) + iv*mivf;
-		} else {
-			/* stack clients are stacked horizontally */
-			resize(c, sx, sy, (sw / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), sh - (2*c->bw), 0);
-			sx += WIDTH(c) + iv;
-		}
+static void col(Monitor *m) {
+  unsigned int i, n;
+  int oh, ov, ih, iv, x, y, w, h;
+  Client *c;
+
+  getgaps(m, &oh, &ov, &ih, &iv, &n); // Assuming this sets outer and inner gaps
+  if (n == 0)
+    return;
+
+  x = m->wx + ov; // Start x after left outer gap
+  y = m->wy + oh; // Start y after top outer gap
+  w = (m->ww - 2 * ov - (n - 1) * ih) / n; // Width for each client
+  h = m->wh - 2 * oh; // Full height minus vertical outer gaps
+
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
+    resize(c, x, y, w - (2 * c->bw), h - (2 * c->bw), 0); // Resize and position client
+    x += w + ih; // Move x to the start of the next client, including inner gap
+  }
 }
 
 /*
  * Deck layout + gaps
  * https://dwm.suckless.org/patches/deck/
  */
-
-static void
-deck(Monitor *m)
-{
-	unsigned int i, n;
-	int mx = 0, my = 0, mh = 0, mw = 0;
-	int sx = 0, sy = 0, sh = 0, sw = 0;
-	float mfacts, sfacts;
-	int mrest, srest;
-	Client *c;
-
-	int oh, ov, ih, iv;
-	getgaps(m, &oh, &ov, &ih, &iv, &n);
-
-	if (n == 0)
-		return;
-
-	sx = mx = m->wx + ov;
-	sy = my = m->wy + oh;
-	sh = mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1);
-	sw = mw = m->ww - 2*ov;
-
-	if (m->nmaster && n > m->nmaster) {
-		sw = (mw - iv) * (1 - m->mfact);
-		mw = (mw - iv) * m->mfact;
-		sx = mx + mw + iv;
-		sh = m->wh - 2*oh;
-	}
-
-	getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest);
-
-	if (n - m->nmaster > 0) /* override layout symbol */
-		snprintf(m->ltsymbol, sizeof m->ltsymbol, "D %d", n - m->nmaster);
-
-	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
-		if (i < m->nmaster) {
-			resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0);
-			my += HEIGHT(c) + ih;
-		} else {
-			resize(c, sx, sy, sw - (2*c->bw), sh - (2*c->bw), 0);
-		}
+void deck(Monitor *m) {
+  unsigned int i, n;
+  int oh, ov, ih, iv;
+  int mx = 0, my = 0, mh = 0, mw = 0;
+  int sx = 0, sy = 0, sh = 0, sw = 0;
+  float mfacts, sfacts;
+  int mrest, srest;
+  Client *c;
+
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+  if (n == 0)
+    return;
+
+  sx = mx = m->wx + ov;
+  sy = my = m->wy + oh;
+  sh = mh = m->wh - 2 * oh - ih * (MIN(n, m->nmaster) - 1);
+  sw = mw = m->ww - 2 * ov;
+
+  if (m->nmaster && n > m->nmaster) {
+    sw = (mw - iv) * (1 - m->mfact);
+    mw = mw - iv - sw;
+    sx = mx + mw + iv;
+    sh = m->wh - 2 * oh;
+  }
+
+  getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest);
+
+  if (n - m->nmaster > 0) /* override layout symbol */
+    snprintf(m->ltsymbol, sizeof m->ltsymbol, "D %d", n - m->nmaster);
+
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+    if (i < m->nmaster) {
+      resize(c, mx, my, mw - (2 * c->bw),
+             mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw), 0);
+      my += HEIGHT(c) + ih;
+    } else {
+      resize(c, sx, sy, sw - (2 * c->bw), sh - (2 * c->bw), 0);
+    }
 }
 
 /*
  * Fibonacci layout + gaps
  * https://dwm.suckless.org/patches/fibonacci/
  */
+void fibonacci(Monitor *m, int s) {
+  unsigned int i, n;
+  int nx, ny, nw, nh;
+  int oh, ov, ih, iv;
+  int nv, hrest = 0, wrest = 0, r = 1;
+  Client *c;
+
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+  if (n == 0)
+    return;
+
+  nx = m->wx + ov;
+  ny = m->wy + oh;
+  nw = m->ww - 2 * ov;
+  nh = m->wh - 2 * oh;
+
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) {
+    if (r) {
+      if ((i % 2 && (nh - ih) / 2 <= (bh + 2 * c->bw)) ||
+          (!(i % 2) && (nw - iv) / 2 <= (bh + 2 * c->bw))) {
+        r = 0;
+      }
+      if (r && i < n - 1) {
+        if (i % 2) {
+          nv = (nh - ih) / 2;
+          hrest = nh - 2 * nv - ih;
+          nh = nv;
+        } else {
+          nv = (nw - iv) / 2;
+          wrest = nw - 2 * nv - iv;
+          nw = nv;
+        }
+
+        if ((i % 4) == 2 && !s)
+          nx += nw + iv;
+        else if ((i % 4) == 3 && !s)
+          ny += nh + ih;
+      }
+
+      if ((i % 4) == 0) {
+        if (s) {
+          ny += nh + ih;
+          nh += hrest;
+        } else {
+          nh -= hrest;
+          ny -= nh + ih;
+        }
+      } else if ((i % 4) == 1) {
+        nx += nw + iv;
+        nw += wrest;
+      } else if ((i % 4) == 2) {
+        ny += nh + ih;
+        nh += hrest;
+        if (i < n - 1)
+          nw += wrest;
+      } else if ((i % 4) == 3) {
+        if (s) {
+          nx += nw + iv;
+          nw -= wrest;
+        } else {
+          nw -= wrest;
+          nx -= nw + iv;
+          nh += hrest;
+        }
+      }
+      if (i == 0) {
+        if (n != 1) {
+          nw = (m->ww - iv - 2 * ov) - (m->ww - iv - 2 * ov) * (1 - m->mfact);
+          wrest = 0;
+        }
+        ny = m->wy + oh;
+      } else if (i == 1)
+        nw = m->ww - nw - iv - 2 * ov;
+      i++;
+    }
+
+    resize(c, nx, ny, nw - (2 * c->bw), nh - (2 * c->bw), False);
+  }
+}
+
+void dwindle(Monitor *m) { fibonacci(m, 1); }
+
+void spiral(Monitor *m) { fibonacci(m, 0); }
 
-static void
-fibonacci(Monitor *m, int s)
-{
-	unsigned int i, n;
-	int nx, ny, nw, nh;
-	int oh, ov, ih, iv;
-	Client *c;
-
-	getgaps(m, &oh, &ov, &ih, &iv, &n);
-
-	if (n == 0)
-		return;
-
-	nx = m->wx + ov;
-	ny = oh;
-	nw = m->ww - 2*ov;
-	nh = m->wh - 2*oh;
-
-	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next)) {
-		if ((i % 2 && nh / 2 > 2*c->bw)
-		   || (!(i % 2) && nw / 2 > 2*c->bw)) {
-			if (i < n - 1) {
-				if (i % 2)
-					nh = (nh - ih) / 2;
-				else
-					nw = (nw - iv) / 2;
-
-				if ((i % 4) == 2 && !s)
-					nx += nw + iv;
-				else if ((i % 4) == 3 && !s)
-					ny += nh + ih;
-			}
-			if ((i % 4) == 0) {
-				if (s)
-					ny += nh + ih;
-				else
-					ny -= nh + ih;
-			}
-			else if ((i % 4) == 1)
-				nx += nw + iv;
-			else if ((i % 4) == 2)
-				ny += nh + ih;
-			else if ((i % 4) == 3) {
-				if (s)
-					nx += nw + iv;
-				else
-					nx -= nw + iv;
-			}
-			if (i == 0)	{
-				if (n != 1)
-					nw = (m->ww - 2*ov - iv) * m->mfact;
-				ny = m->wy + oh;
-			}
-			else if (i == 1)
-				nw = m->ww - nw - iv - 2*ov;
-			i++;
-		}
-
-		resize(c, nx, ny, nw - (2*c->bw), nh - (2*c->bw), False);
-	}
+/*
+ * Gappless grid layout + gaps (ironically)
+ * https://dwm.suckless.org/patches/gaplessgrid/
+ */
+void gaplessgrid(Monitor *m) {
+  unsigned int i, n;
+  int x, y, cols, rows, ch, cw, cn, rn, rrest, crest; // counters
+  int oh, ov, ih, iv;
+  Client *c;
+
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+  if (n == 0)
+    return;
+
+  /* grid dimensions */
+  for (cols = 0; cols <= n / 2; cols++)
+    if (cols * cols >= n)
+      break;
+  if (n ==
+      5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
+    cols = 2;
+  rows = n / cols;
+  cn = rn = 0; // reset column no, row no, client count
+
+  ch = (m->wh - 2 * oh - ih * (rows - 1)) / rows;
+  cw = (m->ww - 2 * ov - iv * (cols - 1)) / cols;
+  rrest = (m->wh - 2 * oh - ih * (rows - 1)) - ch * rows;
+  crest = (m->ww - 2 * ov - iv * (cols - 1)) - cw * cols;
+  x = m->wx + ov;
+  y = m->wy + oh;
+
+  for (i = 0, c = nexttiled(m->clients); c; i++, c = nexttiled(c->next)) {
+    if (i / rows + 1 > cols - n % cols) {
+      rows = n / cols + 1;
+      ch = (m->wh - 2 * oh - ih * (rows - 1)) / rows;
+      rrest = (m->wh - 2 * oh - ih * (rows - 1)) - ch * rows;
+    }
+    resize(c, x, y + rn * (ch + ih) + MIN(rn, rrest),
+           cw + (cn < crest ? 1 : 0) - 2 * c->bw,
+           ch + (rn < rrest ? 1 : 0) - 2 * c->bw, 0);
+    rn++;
+    if (rn >= rows) {
+      rn = 0;
+      x += cw + ih + (cn < crest ? 1 : 0);
+      cn++;
+    }
+  }
 }
 
-static void
-dwindle(Monitor *m)
-{
-	fibonacci(m, 1);
+/*
+ * Gridmode layout + gaps
+ * https://dwm.suckless.org/patches/gridmode/
+ */
+void grid(Monitor *m) {
+  unsigned int i, n;
+  int cx, cy, cw, ch, cc, cr, chrest, cwrest, cols, rows;
+  int oh, ov, ih, iv;
+  Client *c;
+
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+
+  /* grid dimensions */
+  for (rows = 0; rows <= n / 2; rows++)
+    if (rows * rows >= n)
+      break;
+  cols = (rows && (rows - 1) * rows >= n) ? rows - 1 : rows;
+
+  /* window geoms (cell height/width) */
+  ch = (m->wh - 2 * oh - ih * (rows - 1)) / (rows ? rows : 1);
+  cw = (m->ww - 2 * ov - iv * (cols - 1)) / (cols ? cols : 1);
+  chrest = (m->wh - 2 * oh - ih * (rows - 1)) - ch * rows;
+  cwrest = (m->ww - 2 * ov - iv * (cols - 1)) - cw * cols;
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) {
+    cc = i / rows;
+    cr = i % rows;
+    cx = m->wx + ov + cc * (cw + iv) + MIN(cc, cwrest);
+    cy = m->wy + oh + cr * (ch + ih) + MIN(cr, chrest);
+    resize(c, cx, cy, cw + (cc < cwrest ? 1 : 0) - 2 * c->bw,
+           ch + (cr < chrest ? 1 : 0) - 2 * c->bw, False);
+  }
 }
 
-static void
-spiral(Monitor *m)
-{
-	fibonacci(m, 0);
+/*
+ * Horizontal grid layout + gaps
+ * https://dwm.suckless.org/patches/horizgrid/
+ */
+void horizgrid(Monitor *m) {
+  Client *c;
+  unsigned int n, i;
+  int oh, ov, ih, iv;
+  int mx = 0, my = 0, mh = 0, mw = 0;
+  int sx = 0, sy = 0, sh = 0, sw = 0;
+  int ntop, nbottom = 1;
+  float mfacts = 0, sfacts = 0;
+  int mrest, srest, mtotal = 0, stotal = 0;
+
+  /* Count windows */
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+  if (n == 0)
+    return;
+
+  if (n <= 2)
+    ntop = n;
+  else {
+    ntop = n / 2;
+    nbottom = n - ntop;
+  }
+  sx = mx = m->wx + ov;
+  sy = my = m->wy + oh;
+  sh = mh = m->wh - 2 * oh;
+  sw = mw = m->ww - 2 * ov;
+
+  if (n > ntop) {
+    sh = (mh - ih) / 2;
+    mh = mh - ih - sh;
+    sy = my + mh + ih;
+    mw = m->ww - 2 * ov - iv * (ntop - 1);
+    sw = m->ww - 2 * ov - iv * (nbottom - 1);
+  }
+
+  /* calculate facts */
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+    if (i < ntop)
+      mfacts += c->cfact;
+    else
+      sfacts += c->cfact;
+
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+    if (i < ntop)
+      mtotal += mh * (c->cfact / mfacts);
+    else
+      stotal += sw * (c->cfact / sfacts);
+
+  mrest = mh - mtotal;
+  srest = sw - stotal;
+
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+    if (i < ntop) {
+      resize(c, mx, my,
+             mw * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw),
+             mh - (2 * c->bw), 0);
+      mx += WIDTH(c) + iv;
+    } else {
+      resize(c, sx, sy,
+             sw * (c->cfact / sfacts) + ((i - ntop) < srest ? 1 : 0) -
+                 (2 * c->bw),
+             sh - (2 * c->bw), 0);
+      sx += WIDTH(c) + iv;
+    }
 }
 
 /*
- * Default tile layout + gaps
+ * nrowgrid layout + gaps
+ * https://dwm.suckless.org/patches/nrowgrid/
  */
+void nrowgrid(Monitor *m) {
+  unsigned int n;
+  int ri = 0, ci = 0;                  /* counters */
+  int oh, ov, ih, iv;                  /* vanitygap settings */
+  unsigned int cx, cy, cw, ch;         /* client geometry */
+  unsigned int uw = 0, uh = 0, uc = 0; /* utilization trackers */
+  unsigned int cols, rows = m->nmaster + 1;
+  Client *c;
+
+  /* count clients */
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+
+  /* nothing to do here */
+  if (n == 0)
+    return;
+
+  /* force 2 clients to always split vertically */
+  if (FORCE_VSPLIT && n == 2)
+    rows = 1;
+
+  /* never allow empty rows */
+  if (n < rows)
+    rows = n;
+
+  /* define first row */
+  cols = n / rows;
+  uc = cols;
+  cy = m->wy + oh;
+  ch = (m->wh - 2 * oh - ih * (rows - 1)) / rows;
+  uh = ch;
+
+  for (c = nexttiled(m->clients); c; c = nexttiled(c->next), ci++) {
+    if (ci == cols) {
+      uw = 0;
+      ci = 0;
+      ri++;
+
+      /* next row */
+      cols = (n - uc) / (rows - ri);
+      uc += cols;
+      cy = m->wy + oh + uh + ih;
+      uh += ch + ih;
+    }
+
+    cx = m->wx + ov + uw;
+    cw = (m->ww - 2 * ov - uw) / (cols - ci);
+    uw += cw + iv;
+
+    resize(c, cx, cy, cw - (2 * c->bw), ch - (2 * c->bw), 0);
+  }
+}
 
-static void
-tile(Monitor *m)
-{
-	unsigned int i, n;
-	int mx = 0, my = 0, mh = 0, mw = 0;
-	int sx = 0, sy = 0, sh = 0, sw = 0;
-	float mfacts, sfacts;
-	int mrest, srest;
-	Client *c;
-
-
-	int oh, ov, ih, iv;
-	getgaps(m, &oh, &ov, &ih, &iv, &n);
-
-	if (n == 0)
-		return;
-
-	sx = mx = m->wx + ov;
-	sy = my = m->wy + oh;
-	mh = m->wh - 2*oh - ih * (MIN(n, m->nmaster) - 1);
-	sh = m->wh - 2*oh - ih * (n - m->nmaster - 1);
-	sw = mw = m->ww - 2*ov;
-
-	if (m->nmaster && n > m->nmaster) {
-		sw = (mw - iv) * (1 - m->mfact);
-		mw = (mw - iv) * m->mfact;
-		sx = mx + mw + iv;
-	}
-
-	getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest);
-
-	for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
-		if (i < m->nmaster) {
-			resize(c, mx, my, mw - (2*c->bw), (mh / mfacts) + (i < mrest ? 1 : 0) - (2*c->bw), 0);
-			my += HEIGHT(c) + ih;
-		} else {
-			resize(c, sx, sy, sw - (2*c->bw), (sh / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) - (2*c->bw), 0);
-			sy += HEIGHT(c) + ih;
-		}
+/*
+ * Default tile layout + gaps
+ */
+static void tile(Monitor *m) {
+  unsigned int i, n;
+  int oh, ov, ih, iv;
+  int mx = 0, my = 0, mh = 0, mw = 0;
+  int sx = 0, sy = 0, sh = 0, sw = 0;
+  float mfacts, sfacts;
+  int mrest, srest;
+  Client *c;
+
+  getgaps(m, &oh, &ov, &ih, &iv, &n);
+  if (n == 0)
+    return;
+
+  sx = mx = m->wx + ov;
+  sy = my = m->wy + oh;
+  mh = m->wh - 2 * oh - ih * (MIN(n, m->nmaster) - 1);
+  sh = m->wh - 2 * oh - ih * (n - m->nmaster - 1);
+  sw = mw = m->ww - 2 * ov;
+
+  if (m->nmaster && n > m->nmaster) {
+    sw = (mw - iv) * (1 - m->mfact);
+    mw = mw - iv - sw;
+    sx = mx + mw + iv;
+  }
+
+  getfacts(m, mh, sh, &mfacts, &sfacts, &mrest, &srest);
+
+  for (i = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+    if (i < m->nmaster) {
+      resize(c, mx, my, mw - (2 * c->bw),
+             mh * (c->cfact / mfacts) + (i < mrest ? 1 : 0) - (2 * c->bw), 0);
+      my += HEIGHT(c) + ih;
+    } else {
+      resize(c, sx, sy, sw - (2 * c->bw),
+             sh * (c->cfact / sfacts) + ((i - m->nmaster) < srest ? 1 : 0) -
+                 (2 * c->bw),
+             0);
+      sy += HEIGHT(c) + ih;
+    }
 }
diff --git a/dwmblocks/FUNDING.yml b/dwmblocks/FUNDING.yml
index f8e6076..f8e6076 100755..100644
--- a/dwmblocks/FUNDING.yml
+++ b/dwmblocks/FUNDING.yml
diff --git a/dwmblocks/LICENSE b/dwmblocks/LICENSE
index d159169..d159169 100755..100644
--- a/dwmblocks/LICENSE
+++ b/dwmblocks/LICENSE
diff --git a/dwmblocks/Makefile b/dwmblocks/Makefile
index 5cfbb5a..5cfbb5a 100755..100644
--- a/dwmblocks/Makefile
+++ b/dwmblocks/Makefile
diff --git a/dwmblocks/README.md b/dwmblocks/README.md
index 7d21e30..7d21e30 100755..100644
--- a/dwmblocks/README.md
+++ b/dwmblocks/README.md
diff --git a/dwmblocks/config.def.h b/dwmblocks/config.def.h
new file mode 100644
index 0000000..d664850
--- /dev/null
+++ b/dwmblocks/config.def.h
@@ -0,0 +1,34 @@
+static const Block blocks[] = {
+    /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/
+    {"", "sb-music", 0, 11},
+    // {"⌨", "sb-kbselect", 0, 30},
+    {"", "cat /tmp/recordingicon 2>/dev/null", 0, 9},
+    {"", "sb-tasks", 10, 26},
+    {"", "sb-torrent", 20, 7},
+    {"", "sb-pacpackages", 0, 8},
+    {"", "sb-news", 0, 6},
+    {"", "sb-mailbox", 180, 12},
+    /* {"",	"sb-price xmr-btc \"Monero to Bitcoin\" 🔒 25",	9000,	25}, */
+    /* {"",	"sb-price xmr Monero 🔒 24",			9000,	24}, */
+    /* {"",	"sb-price eth Ethereum 🍸 23",			9000,	23}, */
+    /* {"",	"sb-price btc Bitcoin 💰 21",			9000,	21}, */
+    {"", "sb-doppler", 0, 13},
+    {"", "sb-forecast", 10800, 5},
+    {"", "sb-cpu", 10, 18},
+    {"", "sb-memory", 10, 14},
+    // {"", "sb-nettraf", 1, 16},
+    {"", "sb-volume", 0, 10},
+    {"", "sb-battery", 5, 3},
+    {"", "sb-inputs", 1, 29},
+    /* {"",	"sb-moonphase",	18000,	17}, */
+    {"", "sb-clock", 60, 1},
+    {"", "sb-internet", 5, 4},
+    /* {"",	"sb-iplocate", 0,	27}, */
+    {"", "sb-ecrypt", 0, 19},
+    {"", "sb-help-icon", 0, 15},
+
+};
+
+// Sets delimiter between status commands. NULL character ('\0') means no
+// delimiter.
+static char *delim = " ";
diff --git a/dwmblocks/config.def.h.bak b/dwmblocks/config.def.h.bak
new file mode 100644
index 0000000..4b00496
--- /dev/null
+++ b/dwmblocks/config.def.h.bak
@@ -0,0 +1,33 @@
+static const Block blocks[] = {
+    /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/
+    {"", "sb-music", 0, 11},
+    // {"⌨", "sb-kbselect", 0, 30},
+    {"", "cat /tmp/recordingicon 2>/dev/null", 0, 9},
+    {"", "sb-tasks", 10, 26},
+    {"", "sb-torrent", 20, 7},
+    {"", "sb-pacpackages", 0, 8},
+    {"", "sb-news", 0, 6},
+    {"", "sb-mailbox", 180, 12},
+    /* {"",	"sb-price xmr-btc \"Monero to Bitcoin\" 🔒 25",	9000,	25}, */
+    /* {"",	"sb-price xmr Monero 🔒 24",			9000,	24}, */
+    /* {"",	"sb-price eth Ethereum 🍸 23",			9000,	23}, */
+    /* {"",	"sb-price btc Bitcoin 💰 21",			9000,	21}, */
+    {"", "sb-doppler", 0, 13},
+    {"", "sb-forecast", 10800, 5},
+    {"", "sb-cpu", 10, 18},
+    {"", "sb-memory", 10, 14},
+    // {"", "sb-nettraf", 1, 16},
+    {"", "sb-volume", 0, 10},
+    {"", "sb-battery", 5, 3},
+    {"", "sb-inputs", 1, 29},
+    /* {"",	"sb-moonphase",	18000,	17}, */
+    {"", "sb-clock", 60, 1},
+    {"", "sb-internet", 5, 4},
+    /* {"",	"sb-iplocate", 0,	27}, */
+    {"", "sb-help-icon", 0, 15},
+
+};
+
+// Sets delimiter between status commands. NULL character ('\0') means no
+// delimiter.
+static char *delim = " ";
diff --git a/dwmblocks/config.h b/dwmblocks/config.h
index 4b00496..648cdfe 100755..100644
--- a/dwmblocks/config.h
+++ b/dwmblocks/config.h
@@ -1,6 +1,6 @@
 static const Block blocks[] = {
     /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/
-    {"", "sb-music", 0, 11},
+    {"", "sb-music", 1, 11},
     // {"⌨", "sb-kbselect", 0, 30},
     {"", "cat /tmp/recordingicon 2>/dev/null", 0, 9},
     {"", "sb-tasks", 10, 26},
@@ -14,18 +14,19 @@ static const Block blocks[] = {
     /* {"",	"sb-price btc Bitcoin 💰 21",			9000,	21}, */
     {"", "sb-doppler", 0, 13},
     {"", "sb-forecast", 10800, 5},
-    {"", "sb-cpu", 10, 18},
-    {"", "sb-memory", 10, 14},
+    {"", "sb-cpu", 60, 18},
+    {"", "sb-memory", 60, 14},
+    {"", "sb-disk", 10800, 20},
     // {"", "sb-nettraf", 1, 16},
     {"", "sb-volume", 0, 10},
     {"", "sb-battery", 5, 3},
-    {"", "sb-inputs", 1, 29},
+    {"", "sb-inputs", 0, 29},
     /* {"",	"sb-moonphase",	18000,	17}, */
     {"", "sb-clock", 60, 1},
     {"", "sb-internet", 5, 4},
     /* {"",	"sb-iplocate", 0,	27}, */
+    {"", "sb-ecrypt", 0, 19},
     {"", "sb-help-icon", 0, 15},
-
 };
 
 // Sets delimiter between status commands. NULL character ('\0') means no
diff --git a/dwmblocks/config.h.bak b/dwmblocks/config.h.bak
new file mode 100644
index 0000000..d664850
--- /dev/null
+++ b/dwmblocks/config.h.bak
@@ -0,0 +1,34 @@
+static const Block blocks[] = {
+    /*Icon*/ /*Command*/ /*Update Interval*/ /*Update Signal*/
+    {"", "sb-music", 0, 11},
+    // {"⌨", "sb-kbselect", 0, 30},
+    {"", "cat /tmp/recordingicon 2>/dev/null", 0, 9},
+    {"", "sb-tasks", 10, 26},
+    {"", "sb-torrent", 20, 7},
+    {"", "sb-pacpackages", 0, 8},
+    {"", "sb-news", 0, 6},
+    {"", "sb-mailbox", 180, 12},
+    /* {"",	"sb-price xmr-btc \"Monero to Bitcoin\" 🔒 25",	9000,	25}, */
+    /* {"",	"sb-price xmr Monero 🔒 24",			9000,	24}, */
+    /* {"",	"sb-price eth Ethereum 🍸 23",			9000,	23}, */
+    /* {"",	"sb-price btc Bitcoin 💰 21",			9000,	21}, */
+    {"", "sb-doppler", 0, 13},
+    {"", "sb-forecast", 10800, 5},
+    {"", "sb-cpu", 10, 18},
+    {"", "sb-memory", 10, 14},
+    // {"", "sb-nettraf", 1, 16},
+    {"", "sb-volume", 0, 10},
+    {"", "sb-battery", 5, 3},
+    {"", "sb-inputs", 1, 29},
+    /* {"",	"sb-moonphase",	18000,	17}, */
+    {"", "sb-clock", 60, 1},
+    {"", "sb-internet", 5, 4},
+    /* {"",	"sb-iplocate", 0,	27}, */
+    {"", "sb-ecrypt", 0, 19},
+    {"", "sb-help-icon", 0, 15},
+
+};
+
+// Sets delimiter between status commands. NULL character ('\0') means no
+// delimiter.
+static char *delim = " ";
diff --git a/dwmblocks/dwmblocks.c b/dwmblocks/dwmblocks.c
index 6983418..ae9b5ce 100755..100644
--- a/dwmblocks/dwmblocks.c
+++ b/dwmblocks/dwmblocks.c
@@ -9,7 +9,7 @@
 #include <sys/signalfd.h>
 #include <poll.h>
 #define LENGTH(X) (sizeof(X) / sizeof (X[0]))
-#define CMDLENGTH		50
+#define CMDLENGTH 256
 
 typedef struct {
 	char* icon;
diff --git a/slock/LICENSE b/slock/LICENSE
index cb52dba..2e4419b 100755..100644
--- a/slock/LICENSE
+++ b/slock/LICENSE
@@ -4,7 +4,6 @@ MIT/X Consortium License
 © 2014 Dimitris Papastamos <sin@2f30.org>
 © 2006-2014 Anselm R Garbe <anselm@garbe.us>
 © 2014-2016 Laslo Hunhold <dev@frign.de>
-© 2016-2023 Hiltjo Posthuma <hiltjo@codemadness.org>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
diff --git a/slock/Makefile b/slock/Makefile
index 6d74b21..b20fd4e 100755..100644
--- a/slock/Makefile
+++ b/slock/Makefile
@@ -6,41 +6,56 @@ include config.mk
 SRC = slock.c ${COMPATSRC}
 OBJ = ${SRC:.c=.o}
 
-all: slock
+all: options slock
+
+options:
+	@echo slock build options:
+	@echo "CFLAGS   = ${CFLAGS}"
+	@echo "LDFLAGS  = ${LDFLAGS}"
+	@echo "CC       = ${CC}"
 
 .c.o:
-	${CC} -c ${CFLAGS} $<
+	@echo CC $<
+	@${CC} -c ${CFLAGS} $<
 
 ${OBJ}: config.h config.mk arg.h util.h
 
 config.h:
-	cp config.def.h $@
+	@echo creating $@ from config.def.h
+	@cp config.def.h $@
 
 slock: ${OBJ}
-	${CC} -o $@ ${OBJ} ${LDFLAGS}
+	@echo CC -o $@
+	@${CC} -o $@ ${OBJ} ${LDFLAGS}
 
 clean:
-	rm -f slock ${OBJ} slock-${VERSION}.tar.gz
+	@echo cleaning
+	@rm -f slock ${OBJ} slock-${VERSION}.tar.gz
 
 dist: clean
-	mkdir -p slock-${VERSION}
-	cp -R LICENSE Makefile README slock.1 config.mk \
+	@echo creating dist tarball
+	@mkdir -p slock-${VERSION}
+	@cp -R LICENSE Makefile README slock.1 config.mk \
 		${SRC} config.def.h arg.h util.h slock-${VERSION}
-	tar -cf slock-${VERSION}.tar slock-${VERSION}
-	gzip slock-${VERSION}.tar
-	rm -rf slock-${VERSION}
+	@tar -cf slock-${VERSION}.tar slock-${VERSION}
+	@gzip slock-${VERSION}.tar
+	@rm -rf slock-${VERSION}
 
 install: all
-	mkdir -p ${DESTDIR}${PREFIX}/bin
-	cp -f slock ${DESTDIR}${PREFIX}/bin
-	chmod 755 ${DESTDIR}${PREFIX}/bin/slock
-	chmod u+s ${DESTDIR}${PREFIX}/bin/slock
-	mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	sed "s/VERSION/${VERSION}/g" <slock.1 >${DESTDIR}${MANPREFIX}/man1/slock.1
-	chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
+	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
+	@mkdir -p ${DESTDIR}${PREFIX}/bin
+	@cp -f slock ${DESTDIR}${PREFIX}/bin
+	@chmod 755 ${DESTDIR}${PREFIX}/bin/slock
+	@chmod u+s ${DESTDIR}${PREFIX}/bin/slock
+	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
+	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
+	@sed "s/VERSION/${VERSION}/g" <slock.1 >${DESTDIR}${MANPREFIX}/man1/slock.1
+	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/slock.1
 
 uninstall:
-	rm -f ${DESTDIR}${PREFIX}/bin/slock
-	rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
+	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
+	@rm -f ${DESTDIR}${PREFIX}/bin/slock
+	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
+	@rm -f ${DESTDIR}${MANPREFIX}/man1/slock.1
 
-.PHONY: all clean dist install uninstall
+.PHONY: all options clean dist install uninstall
diff --git a/slock/README b/slock/README
index dcacd01..dcacd01 100755..100644
--- a/slock/README
+++ b/slock/README
diff --git a/slock/arg.h b/slock/arg.h
index 0b23c53..0b23c53 100755..100644
--- a/slock/arg.h
+++ b/slock/arg.h
diff --git a/slock/config.def.h b/slock/config.def.h
index 6b2f461..6fbd851 100755..100644
--- a/slock/config.def.h
+++ b/slock/config.def.h
@@ -1,19 +1,37 @@
 /* user and group to drop privileges to */
-static const char *user = "nobody";
-static const char *group = "nogroup";
+static const char *group = "wheel";
+static int personalblur = 0;
 
 static const char *colorname[NUMCOLS] = {
-    [INIT] = "black",     /* after initialization */
-    [INPUT] = "#005577",  /* during input */
-    [FAILED] = "#CC3333", /* wrong password */
-    [CAPS] = "red",       /* CapsLock on */
+	[INIT] =   "#3c3836",         /* after initialization */
+	[INPUT] =  "#005577",       /* during input */
+	[INPUT_ALT] = "#227799",    /* during input, second color */
+	[FAILED] = "#CC3333",       /* wrong password */
+	[CAPS] = "#FF0000",             /* CapsLock on */
+    [CAPS_ALT] = "#FFA666",     /* hypothetical alternate color for CapsLock on */
+	[PAM] =    "#9400D3",       /* waiting for PAM */
 };
 
 /* treat a cleared input like a wrong password (color) */
 static const int failonclear = 1;
 
-/* time to cancel lock with mouse movement in seconds */
-static const int timetocancel = 3;
+/* Background image path, should be available to the user above */
+static const char* background_image = "/home/si/Pictures/wallpaper/yejin-wall.png";
+
+/* default message */
+static const char *message = "THESIAH";
+
+/* text color */
+static const char *text_color = "#131313";
+
+/* text size */
+static const char *font_name = "monospace:size=18:bold";
+
+/* time in seconds before the monitor shuts down */
+static const int monitortime = 600;
+
+/* PAM service that's used for authentication */
+static const char* pam_service = "login";
 
 /* insert grid pattern with scale 1:1, the size can be changed with logosize */
 static const int logosize = 75;
@@ -22,16 +40,38 @@ static const int logow = 12;
 static const int logoh = 6;
 
 static XRectangle rectangles[9] = {
-    /* x    y       w       h */
-    {0, 3, 1, 3}, {1, 3, 2, 1}, {0, 5, 8, 1}, {3, 0, 1, 5},  {5, 3, 1, 2},
-    {7, 3, 1, 2}, {8, 3, 4, 1}, {9, 4, 1, 2}, {11, 4, 1, 2},
+	/* x    y       w       h */
+	{ 0,    3,      1,      3 },
+	{ 1,    3,      2,      1 },
+	{ 0,    5,      8,      1 },
+	{ 3,    0,      1,      5 },
+	{ 5,    3,      1,      2 },
+	{ 7,    3,      1,      2 },
+	{ 8,    3,      4,      1 },
+	{ 9,    4,      1,      2 },
+	{ 11,   4,      1,      2 },
 };
 
 /*Enable blur*/
 #define BLUR
 /*Set blur radius*/
-static const int blurRadius = 5;
+static int blurRadius=5;
 /*Enable Pixelation*/
-// #define PIXELATION
+//#define PIXELATION
 /*Set pixelation radius*/
-static const int pixelSize = 0;
+static const int pixelSize=0;
+
+/*
+ * Xresources preferences to load at startup
+ */
+ResourcePref resources[] = {
+		{ "color0",    STRING,  &colorname[INIT] },
+		{ "color4",     STRING,  &colorname[INPUT] },
+		{ "color12",    STRING,  &colorname[INPUT_ALT] },
+		{ "color1",     STRING,  &colorname[FAILED] },
+		{ "color3",     STRING,  &colorname[CAPS] },
+		{ "color11",    STRING,  &colorname[CAPS_ALT] },
+		{ "color13",    STRING,  &colorname[PAM] },
+		{ "color0",     STRING,  &text_color },
+};
+
diff --git a/slock/config.def.h.bak b/slock/config.def.h.bak
new file mode 100644
index 0000000..946c17d
--- /dev/null
+++ b/slock/config.def.h.bak
@@ -0,0 +1,77 @@
+/* user and group to drop privileges to */
+static const char *group = "wheel";
+static int personalblur = 0;
+
+static const char *colorname[NUMCOLS] = {
+	[INIT] =   "#3c3836",         /* after initialization */
+	[INPUT] =  "#005577",       /* during input */
+	[INPUT_ALT] = "#227799",    /* during input, second color */
+	[FAILED] = "#CC3333",       /* wrong password */
+	[CAPS] = "#FF0000",             /* CapsLock on */
+    [CAPS_ALT] = "#FFA666",     /* hypothetical alternate color for CapsLock on */
+	[PAM] =    "#9400D3",       /* waiting for PAM */
+};
+
+/* treat a cleared input like a wrong password (color) */
+static const int failonclear = 1;
+
+/* Background image path, should be available to the user above */
+static const char* background_image = "/home/si/Pictures/yejin-wall.png";
+
+/* default message */
+static const char *message = "THESIAH";
+
+/* text color */
+static const char *text_color = "#131313";
+
+/* text size */
+static const char *font_name = "monospace:size=18:bold";
+
+/* time in seconds before the monitor shuts down */
+static const int monitortime = 600;
+
+/* PAM service that's used for authentication */
+static const char* pam_service = "login";
+
+/* insert grid pattern with scale 1:1, the size can be changed with logosize */
+static const int logosize = 75;
+/* grid width and height for right center alignment */
+static const int logow = 12;
+static const int logoh = 6;
+
+static XRectangle rectangles[9] = {
+	/* x    y       w       h */
+	{ 0,    3,      1,      3 },
+	{ 1,    3,      2,      1 },
+	{ 0,    5,      8,      1 },
+	{ 3,    0,      1,      5 },
+	{ 5,    3,      1,      2 },
+	{ 7,    3,      1,      2 },
+	{ 8,    3,      4,      1 },
+	{ 9,    4,      1,      2 },
+	{ 11,   4,      1,      2 },
+};
+
+/*Enable blur*/
+#define BLUR
+/*Set blur radius*/
+static int blurRadius=5;
+/*Enable Pixelation*/
+//#define PIXELATION
+/*Set pixelation radius*/
+static const int pixelSize=0;
+
+/*
+ * Xresources preferences to load at startup
+ */
+ResourcePref resources[] = {
+		{ "color0",    STRING,  &colorname[INIT] },
+		{ "color4",     STRING,  &colorname[INPUT] },
+		{ "color12",    STRING,  &colorname[INPUT_ALT] },
+		{ "color1",     STRING,  &colorname[FAILED] },
+		{ "color3",     STRING,  &colorname[CAPS] },
+		{ "color11",    STRING,  &colorname[CAPS_ALT] },
+		{ "color13",    STRING,  &colorname[PAM] },
+		{ "color0",     STRING,  &text_color },
+};
+
diff --git a/slock/config.h b/slock/config.h
index b347559..6fbd851 100755..100644
--- a/slock/config.h
+++ b/slock/config.h
@@ -1,19 +1,37 @@
 /* user and group to drop privileges to */
-static const char *user = "nobody";
-static const char *group = "nogroup";
+static const char *group = "wheel";
+static int personalblur = 0;
 
 static const char *colorname[NUMCOLS] = {
-    [INIT] = "black",     /* after initialization */
-    [INPUT] = "#005577",  /* during input */
-    [FAILED] = "#CC3333", /* wrong password */
-    [CAPS] = "orange",    /* CapsLock on */
+	[INIT] =   "#3c3836",         /* after initialization */
+	[INPUT] =  "#005577",       /* during input */
+	[INPUT_ALT] = "#227799",    /* during input, second color */
+	[FAILED] = "#CC3333",       /* wrong password */
+	[CAPS] = "#FF0000",             /* CapsLock on */
+    [CAPS_ALT] = "#FFA666",     /* hypothetical alternate color for CapsLock on */
+	[PAM] =    "#9400D3",       /* waiting for PAM */
 };
 
 /* treat a cleared input like a wrong password (color) */
 static const int failonclear = 1;
 
-/* time to cancel lock with mouse movement in seconds */
-static const int timetocancel = 3;
+/* Background image path, should be available to the user above */
+static const char* background_image = "/home/si/Pictures/wallpaper/yejin-wall.png";
+
+/* default message */
+static const char *message = "THESIAH";
+
+/* text color */
+static const char *text_color = "#131313";
+
+/* text size */
+static const char *font_name = "monospace:size=18:bold";
+
+/* time in seconds before the monitor shuts down */
+static const int monitortime = 600;
+
+/* PAM service that's used for authentication */
+static const char* pam_service = "login";
 
 /* insert grid pattern with scale 1:1, the size can be changed with logosize */
 static const int logosize = 75;
@@ -22,16 +40,38 @@ static const int logow = 12;
 static const int logoh = 6;
 
 static XRectangle rectangles[9] = {
-    /* x    y       w       h */
-    {0, 3, 1, 3}, {1, 3, 2, 1}, {0, 5, 8, 1}, {3, 0, 1, 5},  {5, 3, 1, 2},
-    {7, 3, 1, 2}, {8, 3, 4, 1}, {9, 4, 1, 2}, {11, 4, 1, 2},
+	/* x    y       w       h */
+	{ 0,    3,      1,      3 },
+	{ 1,    3,      2,      1 },
+	{ 0,    5,      8,      1 },
+	{ 3,    0,      1,      5 },
+	{ 5,    3,      1,      2 },
+	{ 7,    3,      1,      2 },
+	{ 8,    3,      4,      1 },
+	{ 9,    4,      1,      2 },
+	{ 11,   4,      1,      2 },
 };
 
 /*Enable blur*/
 #define BLUR
 /*Set blur radius*/
-static const int blurRadius = 5;
+static int blurRadius=5;
 /*Enable Pixelation*/
-// #define PIXELATION
+//#define PIXELATION
 /*Set pixelation radius*/
-static const int pixelSize = 0;
+static const int pixelSize=0;
+
+/*
+ * Xresources preferences to load at startup
+ */
+ResourcePref resources[] = {
+		{ "color0",    STRING,  &colorname[INIT] },
+		{ "color4",     STRING,  &colorname[INPUT] },
+		{ "color12",    STRING,  &colorname[INPUT_ALT] },
+		{ "color1",     STRING,  &colorname[FAILED] },
+		{ "color3",     STRING,  &colorname[CAPS] },
+		{ "color11",    STRING,  &colorname[CAPS_ALT] },
+		{ "color13",    STRING,  &colorname[PAM] },
+		{ "color0",     STRING,  &text_color },
+};
+
diff --git a/slock/config.h.bak b/slock/config.h.bak
new file mode 100644
index 0000000..6fbd851
--- /dev/null
+++ b/slock/config.h.bak
@@ -0,0 +1,77 @@
+/* user and group to drop privileges to */
+static const char *group = "wheel";
+static int personalblur = 0;
+
+static const char *colorname[NUMCOLS] = {
+	[INIT] =   "#3c3836",         /* after initialization */
+	[INPUT] =  "#005577",       /* during input */
+	[INPUT_ALT] = "#227799",    /* during input, second color */
+	[FAILED] = "#CC3333",       /* wrong password */
+	[CAPS] = "#FF0000",             /* CapsLock on */
+    [CAPS_ALT] = "#FFA666",     /* hypothetical alternate color for CapsLock on */
+	[PAM] =    "#9400D3",       /* waiting for PAM */
+};
+
+/* treat a cleared input like a wrong password (color) */
+static const int failonclear = 1;
+
+/* Background image path, should be available to the user above */
+static const char* background_image = "/home/si/Pictures/wallpaper/yejin-wall.png";
+
+/* default message */
+static const char *message = "THESIAH";
+
+/* text color */
+static const char *text_color = "#131313";
+
+/* text size */
+static const char *font_name = "monospace:size=18:bold";
+
+/* time in seconds before the monitor shuts down */
+static const int monitortime = 600;
+
+/* PAM service that's used for authentication */
+static const char* pam_service = "login";
+
+/* insert grid pattern with scale 1:1, the size can be changed with logosize */
+static const int logosize = 75;
+/* grid width and height for right center alignment */
+static const int logow = 12;
+static const int logoh = 6;
+
+static XRectangle rectangles[9] = {
+	/* x    y       w       h */
+	{ 0,    3,      1,      3 },
+	{ 1,    3,      2,      1 },
+	{ 0,    5,      8,      1 },
+	{ 3,    0,      1,      5 },
+	{ 5,    3,      1,      2 },
+	{ 7,    3,      1,      2 },
+	{ 8,    3,      4,      1 },
+	{ 9,    4,      1,      2 },
+	{ 11,   4,      1,      2 },
+};
+
+/*Enable blur*/
+#define BLUR
+/*Set blur radius*/
+static int blurRadius=5;
+/*Enable Pixelation*/
+//#define PIXELATION
+/*Set pixelation radius*/
+static const int pixelSize=0;
+
+/*
+ * Xresources preferences to load at startup
+ */
+ResourcePref resources[] = {
+		{ "color0",    STRING,  &colorname[INIT] },
+		{ "color4",     STRING,  &colorname[INPUT] },
+		{ "color12",    STRING,  &colorname[INPUT_ALT] },
+		{ "color1",     STRING,  &colorname[FAILED] },
+		{ "color3",     STRING,  &colorname[CAPS] },
+		{ "color11",    STRING,  &colorname[CAPS_ALT] },
+		{ "color13",    STRING,  &colorname[PAM] },
+		{ "color0",     STRING,  &text_color },
+};
+
diff --git a/slock/config.mk b/slock/config.mk
index 587adb4..7dab153 100755..100644
--- a/slock/config.mk
+++ b/slock/config.mk
@@ -20,7 +20,7 @@ FREETYPEINC = /usr/include/freetype2
 
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC} -I${FREETYPEINC}
-LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXext -lXrandr -lImlib2
+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXext -lXrandr -lImlib2 -lpam -lcairo
 
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H ${XINERAMAFLAGS}
@@ -35,3 +35,6 @@ COMPATSRC = explicit_bzero.c
 #CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_NETBSD_SOURCE
 # On OpenBSD set COMPATSRC to empty
 #COMPATSRC =
+
+# compiler and linker
+CC = cc
diff --git a/slock/explicit_bzero.c b/slock/explicit_bzero.c
index 3e33ca8..3e33ca8 100755..100644
--- a/slock/explicit_bzero.c
+++ b/slock/explicit_bzero.c
diff --git a/slock/slock.1 b/slock/slock.1
index 40c15e1..541a264 100755..100644
--- a/slock/slock.1
+++ b/slock/slock.1
@@ -1,45 +1,43 @@
-.Dd October 6, 2023
+.Dd 2016-08-23
 .Dt SLOCK 1
-.Os
 .Sh NAME
 .Nm slock
 .Nd simple X screen locker
 .Sh SYNOPSIS
 .Nm
 .Op Fl v
+.Op Fl m Ar message
 .Op Ar cmd Op Ar arg ...
 .Sh DESCRIPTION
 .Nm
-is a simple X screen locker.
-If provided,
-.Ar cmd
+is a simple X screen locker. If provided,
+.Ar cmd Op Ar arg ...
 is executed after the screen has been locked.
-.Pp
-The options are as follows:
+.Sh OPTIONS
 .Bl -tag -width Ds
 .It Fl v
 Print version information to stdout and exit.
+.It Fl m Ar message
+Overrides default slock lock message.
+.TP
 .El
-.Sh EXIT STATUS
-.Ex -std
-.Sh EXAMPLES
-$
-.Nm
-/usr/sbin/s2ram
 .Sh SECURITY CONSIDERATIONS
 To make sure a locked screen can not be bypassed by switching VTs
 or killing the X server with Ctrl+Alt+Backspace, it is recommended
 to disable both in
 .Xr xorg.conf 5
 for maximum security:
-.Bd -literal
+.Bd -literal -offset left
 Section "ServerFlags"
 	Option "DontVTSwitch" "True"
 	Option "DontZap"      "True"
 EndSection
 .Ed
+.Sh EXAMPLES
+$
+.Nm
+/usr/sbin/s2ram
 .Sh CUSTOMIZATION
 .Nm
 can be customized by creating a custom config.h from config.def.h and
-(re)compiling the source code.
-This keeps it fast, secure and simple.
+(re)compiling the source code. This keeps it fast, secure and simple.
diff --git a/slock/slock.c b/slock/slock.c
index 4efd4a2..22f0a29 100755..100644
--- a/slock/slock.c
+++ b/slock/slock.c
@@ -1,512 +1,850 @@
 /* See LICENSE file for license details. */
-#define _XOPEN_SOURCE 500
-#define LENGTH(X) (sizeof X / sizeof X[0])
+#include <X11/Xmd.h>
+#define _XOPEN_SOURCE   500
+#define LENGTH(X)       (sizeof X / sizeof X[0])
 #if HAVE_SHADOW_H
 #include <shadow.h>
 #endif
 
-#include <X11/extensions/Xrandr.h>
 #include <ctype.h>
+#include <cairo/cairo-xlib.h>
 #include <errno.h>
+#include <math.h>
 #include <grp.h>
 #include <pwd.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
-#include <sys/types.h>
-#include <time.h>
 #include <unistd.h>
+#include <sys/types.h>
+#include <X11/extensions/Xrandr.h>
 #ifdef XINERAMA
 #include <X11/extensions/Xinerama.h>
 #endif
-#include <Imlib2.h>
-#include <X11/XKBlib.h>
-#include <X11/Xft/Xft.h>
+#include <X11/extensions/dpms.h>
+#include <X11/keysym.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
-#include <X11/keysym.h>
+#include <X11/XKBlib.h>
+#include <X11/Xresource.h>
+#include <X11/Xft/Xft.h>
+#include <Imlib2.h>
+#include <security/pam_appl.h>
+#include <security/pam_misc.h>
 
+#include <pthread.h>
+#include <time.h>
 #include "arg.h"
 #include "util.h"
 
 char *argv0;
+static int pam_conv(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr);
+struct pam_conv pamc = {pam_conv, NULL};
+char passwd[256];
+
+/* global count to prevent repeated error messages */
+int count_error = 0;
+
+enum {
+	CAPS,
+    CAPS_ALT,
+	INIT,
+	INPUT,
+	INPUT_ALT,
+	FAILED,
+	PAM,
+	NUMCOLS
+};
+
+/* Xresources preferences */
+enum resource_type {
+	STRING = 0,
+	INTEGER = 1,
+	FLOAT = 2
+};
 
-enum { INIT, INPUT, FAILED, CAPS, NUMCOLS };
+typedef struct {
+	char *name;
+	enum resource_type type;
+	void *dst;
+} ResourcePref;
+
+struct displayData{
+	struct lock **locks;
+	Display* dpy;
+	int nscreens;
+	cairo_t **crs;
+	cairo_surface_t **surfaces;
+};
+static pthread_mutex_t mutex= PTHREAD_MUTEX_INITIALIZER;
 
 #include "config.h"
 
 struct lock {
-  int screen;
-  Window root, win;
-  Pixmap pmap;
-  Pixmap bgmap;
-  unsigned long colors[NUMCOLS];
-  unsigned int x, y;
-  unsigned int xoff, yoff, mw, mh;
-  Drawable drawable;
-  GC gc;
-  XRectangle rectangles[LENGTH(rectangles)];
+	int screen;
+	Window root, win;
+	Pixmap pmap;
+	Pixmap bgmap;
+	unsigned long colors[NUMCOLS];
+	unsigned int x, y;
+	unsigned int xoff, yoff, mw, mh;
+	Drawable drawable;
+	GC gc;
+	XRectangle rectangles[LENGTH(rectangles)];
 };
 
 struct xrandr {
-  int active;
-  int evbase;
-  int errbase;
+	int active;
+	int evbase;
+	int errbase;
 };
 
 Imlib_Image image;
 
-static time_t tim;
+static void
+die(const char *errstr, ...)
+{
+	va_list ap;
 
-static void die(const char *errstr, ...) {
-  va_list ap;
+	va_start(ap, errstr);
+	vfprintf(stderr, errstr, ap);
+	va_end(ap);
+	exit(1);
+}
 
-  va_start(ap, errstr);
-  vfprintf(stderr, errstr, ap);
-  va_end(ap);
-  exit(1);
+static int
+pam_conv(int num_msg, const struct pam_message **msg,
+		struct pam_response **resp, void *appdata_ptr)
+{
+	int retval = PAM_CONV_ERR;
+	for(int i=0; i<num_msg; i++) {
+		if (msg[i]->msg_style == PAM_PROMPT_ECHO_OFF &&
+				strncmp(msg[i]->msg, "Password: ", 10) == 0) {
+			struct pam_response *resp_msg = malloc(sizeof(struct pam_response));
+			if (!resp_msg)
+				die("malloc failed\n");
+			char *password = malloc(strlen(passwd) + 1);
+			if (!password)
+				die("malloc failed\n");
+			memset(password, 0, strlen(passwd) + 1);
+			strcpy(password, passwd);
+			resp_msg->resp_retcode = 0;
+			resp_msg->resp = password;
+			resp[i] = resp_msg;
+			retval = PAM_SUCCESS;
+		}
+	}
+	return retval;
 }
 
 #ifdef __linux__
 #include <fcntl.h>
 #include <linux/oom.h>
 
-static void dontkillme(void) {
-  FILE *f;
-  const char oomfile[] = "/proc/self/oom_score_adj";
-
-  if (!(f = fopen(oomfile, "w"))) {
-    if (errno == ENOENT)
-      return;
-    die("slock: fopen %s: %s\n", oomfile, strerror(errno));
-  }
-  fprintf(f, "%d", OOM_SCORE_ADJ_MIN);
-  if (fclose(f)) {
-    if (errno == EACCES)
-      die("slock: unable to disable OOM killer. "
-          "Make sure to suid or sgid slock.\n");
-    else
-      die("slock: fclose %s: %s\n", oomfile, strerror(errno));
-  }
+static void
+dontkillme(void)
+{
+	FILE *f;
+	const char oomfile[] = "/proc/self/oom_score_adj";
+
+	if (!(f = fopen(oomfile, "w"))) {
+		if (errno == ENOENT)
+			return;
+		die("slock: fopen %s: %s\n", oomfile, strerror(errno));
+	}
+	fprintf(f, "%d", OOM_SCORE_ADJ_MIN);
+	if (fclose(f)) {
+		if (errno == EACCES)
+			die("slock: unable to disable OOM killer. "
+			    "Make sure to suid or sgid slock.\n");
+		else
+			die("slock: fclose %s: %s\n", oomfile, strerror(errno));
+	}
 }
 #endif
 
-static const char *gethash(void) {
-  const char *hash;
-  struct passwd *pw;
+static void writemessage(Display *dpy, Window win, int screen) {
+    Visual *visual = DefaultVisual(dpy, screen);
+    Colormap colormap = DefaultColormap(dpy, screen);
+    XftDraw *draw;
+    XftFont *font;
+    XftColor color;
+    XGlyphInfo extents;  // Use XGlyphInfo for text extents
+    int x, y;
+    XWindowAttributes attr;
+
+    XGetWindowAttributes(dpy, win, &attr);
+
+    draw = XftDrawCreate(dpy, win, visual, colormap);
+    font = XftFontOpenName(dpy, screen, font_name); // Make sure font_name is defined, such as "monospace:size=18"
+    if (!XftColorAllocName(dpy, visual, colormap, text_color, &color)) { // Ensure text_color is defined, e.g., "#FFFFFF"
+        fprintf(stderr, "slock: failed to allocate color\n");
+    }
+
+    // Measure the text
+    XftTextExtentsUtf8(dpy, font, (FcChar8 *)message, strlen(message), &extents);
+    // Center the text horizontally and vertically
+    x = (attr.width - extents.xOff) / 2;
+    y = (attr.height - (font->ascent + font->descent)) / 1.32 + font->ascent;
+
+    // Draw the text
+    XftDrawStringUtf8(draw, &color, font, x, y, (FcChar8 *)message, strlen(message));
 
-  /* Check if the current user has a password entry */
-  errno = 0;
-  if (!(pw = getpwuid(getuid()))) {
-    if (errno)
-      die("slock: getpwuid: %s\n", strerror(errno));
-    else
-      die("slock: cannot retrieve password entry\n");
-  }
-  hash = pw->pw_passwd;
+    // Cleanup
+    XftColorFree(dpy, visual, colormap, &color);
+    XftDrawDestroy(draw);
+    XftFontClose(dpy, font);
+}
+
+static const char *
+gethash(void)
+{
+	const char *hash;
+	struct passwd *pw;
+
+	/* Check if the current user has a password entry */
+	errno = 0;
+	if (!(pw = getpwuid(getuid()))) {
+		if (errno)
+			die("slock: getpwuid: %s\n", strerror(errno));
+		else
+			die("slock: cannot retrieve password entry\n");
+	}
+	hash = pw->pw_passwd;
 
 #if HAVE_SHADOW_H
-  if (!strcmp(hash, "x")) {
-    struct spwd *sp;
-    if (!(sp = getspnam(pw->pw_name)))
-      die("slock: getspnam: cannot retrieve shadow entry. "
-          "Make sure to suid or sgid slock.\n");
-    hash = sp->sp_pwdp;
-  }
+	if (!strcmp(hash, "x")) {
+		struct spwd *sp;
+		if (!(sp = getspnam(pw->pw_name)))
+			die("slock: getspnam: cannot retrieve shadow entry. "
+			    "Make sure to suid or sgid slock.\n");
+		hash = sp->sp_pwdp;
+	}
 #else
-  if (!strcmp(hash, "*")) {
+	if (!strcmp(hash, "*")) {
 #ifdef __OpenBSD__
-    if (!(pw = getpwuid_shadow(getuid())))
-      die("slock: getpwnam_shadow: cannot retrieve shadow entry. "
-          "Make sure to suid or sgid slock.\n");
-    hash = pw->pw_passwd;
+		if (!(pw = getpwuid_shadow(getuid())))
+			die("slock: getpwnam_shadow: cannot retrieve shadow entry. "
+			    "Make sure to suid or sgid slock.\n");
+		hash = pw->pw_passwd;
 #else
-    die("slock: getpwuid: cannot retrieve shadow entry. "
-        "Make sure to suid or sgid slock.\n");
+		die("slock: getpwuid: cannot retrieve shadow entry. "
+		    "Make sure to suid or sgid slock.\n");
 #endif /* __OpenBSD__ */
-  }
+	}
 #endif /* HAVE_SHADOW_H */
 
-  return hash;
+	/* pam, store user name */
+	hash = pw->pw_name;
+	return hash;
 }
 
-static void resizerectangles(struct lock *lock) {
-  int i;
-
-  for (i = 0; i < LENGTH(rectangles); i++) {
-    lock->rectangles[i].x = (rectangles[i].x * logosize) + lock->xoff +
-                            ((lock->mw) / 2) - (logow / 2 * logosize);
-    lock->rectangles[i].y = (rectangles[i].y * logosize) + lock->yoff +
-                            ((lock->mh) / 2) - (logoh / 2 * logosize);
-    lock->rectangles[i].width = rectangles[i].width * logosize;
-    lock->rectangles[i].height = rectangles[i].height * logosize;
-  }
+static void
+resizerectangles(struct lock *lock)
+{
+	int i;
+
+	for (i = 0; i < LENGTH(rectangles); i++){
+		lock->rectangles[i].x = (rectangles[i].x * logosize)
+                                + lock->xoff + ((lock->mw) / 2) - (logow / 2 * logosize);
+		lock->rectangles[i].y = (rectangles[i].y * logosize)
+                                + lock->yoff + ((lock->mh) / 2) - (logoh / 2 * logosize);
+		lock->rectangles[i].width = rectangles[i].width * logosize;
+		lock->rectangles[i].height = rectangles[i].height * logosize;
+	}
 }
 
-static void drawlogo(Display *dpy, struct lock *lock, int color) {
-  /*
-  XSetForeground(dpy, lock->gc, lock->colors[BACKGROUND]);
-  XFillRectangle(dpy, lock->drawable, lock->gc, 0, 0, lock->x, lock->y); */
-  lock->drawable = lock->bgmap;
-  XSetForeground(dpy, lock->gc, lock->colors[color]);
-  XFillRectangles(dpy, lock->drawable, lock->gc, lock->rectangles,
-                  LENGTH(rectangles));
-  XCopyArea(dpy, lock->drawable, lock->win, lock->gc, 0, 0, lock->x, lock->y, 0,
-            0);
-  XSync(dpy, False);
+static void
+drawlogo(Display *dpy, struct lock *lock, int color)
+{
+	/* 
+	XSetForeground(dpy, lock->gc, lock->colors[BACKGROUND]);
+	XFillRectangle(dpy, lock->drawable, lock->gc, 0, 0, lock->x, lock->y); */
+	lock->drawable = lock->bgmap;
+	XSetForeground(dpy, lock->gc, lock->colors[color]);
+	XFillRectangles(dpy, lock->drawable, lock->gc, lock->rectangles, LENGTH(rectangles));
+	XCopyArea(dpy, lock->drawable, lock->win, lock->gc, 0, 0, lock->x, lock->y, 0, 0);
+	XSync(dpy, False);
 }
 
-static void readpw(Display *dpy, struct xrandr *rr, struct lock **locks,
-                   int nscreens, const char *hash) {
-  XRRScreenChangeNotifyEvent *rre;
-  char buf[32], passwd[256], *inputhash;
-  int caps, num, screen, running, failure, oldc;
-  unsigned int len, color, indicators;
-  KeySym ksym;
-  XEvent ev;
-
-  len = 0;
-  caps = 0;
-  running = 1;
-  failure = 0;
-  oldc = INIT;
-
-  if (!XkbGetIndicatorState(dpy, XkbUseCoreKbd, &indicators))
-    caps = indicators & 1;
-
-  while (running && !XNextEvent(dpy, &ev)) {
-    running = !((time(NULL) - tim < timetocancel) && (ev.type == MotionNotify));
-    if (ev.type == KeyPress) {
-      explicit_bzero(&buf, sizeof(buf));
-      num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
-      if (IsKeypadKey(ksym)) {
-        if (ksym == XK_KP_Enter)
-          ksym = XK_Return;
-        else if (ksym >= XK_KP_0 && ksym <= XK_KP_9)
-          ksym = (ksym - XK_KP_0) + XK_0;
-      }
-      if (IsFunctionKey(ksym) || IsKeypadKey(ksym) || IsMiscFunctionKey(ksym) ||
-          IsPFKey(ksym) || IsPrivateKeypadKey(ksym))
-        continue;
-      switch (ksym) {
-      case XK_Return:
-        passwd[len] = '\0';
-        errno = 0;
-        if (!(inputhash = crypt(passwd, hash)))
-          fprintf(stderr, "slock: crypt: %s\n", strerror(errno));
-        else
-          running = !!strcmp(inputhash, hash);
-        if (running) {
-          XBell(dpy, 100);
-          failure = 1;
-        }
-        explicit_bzero(&passwd, sizeof(passwd));
-        len = 0;
-        break;
-      case XK_Escape:
-        explicit_bzero(&passwd, sizeof(passwd));
-        len = 0;
-        break;
-      case XK_BackSpace:
-        if (len)
-          passwd[--len] = '\0';
-        break;
-      case XK_Caps_Lock:
-        caps = !caps;
-        break;
-      default:
-        if (num && !iscntrl((int)buf[0]) && (len + num < sizeof(passwd))) {
-          memcpy(passwd + len, buf, num);
-          len += num;
-        }
-        break;
-      }
-      color = len ? (caps ? CAPS : INPUT)
-                  : (failure || failonclear ? FAILED : INIT);
-      if (running && oldc != color) {
-        for (screen = 0; screen < nscreens; screen++) {
-          drawlogo(dpy, locks[screen], color);
-        }
-        oldc = color;
-      }
-    } else if (rr->active && ev.type == rr->evbase + RRScreenChangeNotify) {
-      rre = (XRRScreenChangeNotifyEvent *)&ev;
-      for (screen = 0; screen < nscreens; screen++) {
-        if (locks[screen]->win == rre->window) {
-          if (rre->rotation == RR_Rotate_90 || rre->rotation == RR_Rotate_270)
-            XResizeWindow(dpy, locks[screen]->win, rre->height, rre->width);
-          else
-            XResizeWindow(dpy, locks[screen]->win, rre->width, rre->height);
-          XClearWindow(dpy, locks[screen]->win);
-          break;
-        }
-      }
-    } else {
-      for (screen = 0; screen < nscreens; screen++)
-        XRaiseWindow(dpy, locks[screen]->win);
-    }
-  }
+static void
+refresh(Display *dpy, Window win , int screen, struct tm time, cairo_t* cr, cairo_surface_t* sfc)
+{/*Function that displays given time on the given screen*/
+	static char tm[32]="";
+	double xpos,ypos;
+    cairo_text_extents_t extents;
+
+	sprintf(tm,"%02d/%02d/%d %02d:%02d",time.tm_year+1900,time.tm_mon+1,time.tm_mday,time.tm_hour,time.tm_min);
+
+    XClearWindow(dpy, win);
+    cairo_set_source_rgb(cr, 1, 1, 1); // Corrected color values (0 to 1 range)
+    cairo_select_font_face(cr, "serif", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+    cairo_set_font_size(cr, 64.0);
+
+    // Measure the text to be rendered
+    cairo_text_extents(cr, tm, &extents);
+    xpos = (DisplayWidth(dpy, screen) - extents.width) / 2 - extents.x_bearing;
+    ypos = (DisplayHeight(dpy, screen) - extents.height) / 1.2 - extents.y_bearing;
+
+    cairo_move_to(cr, xpos, ypos);
+    cairo_show_text(cr, tm);
+
+    writemessage(dpy, win, screen);
+
+    cairo_surface_flush(sfc);
+    XFlush(dpy);
+}
+
+static void*
+displayTime(void* input)
+{ /*Thread that keeps track of time and refreshes it every 5 seconds */
+ struct displayData* displayData=(struct displayData*)input;
+ while (1){
+ pthread_mutex_lock(&mutex); /*Mutex to prevent interference with refreshing screen while typing password*/
+ time_t rawtime;
+ time(&rawtime);
+ struct tm tm = *localtime(&rawtime);
+ for (int k=0;k<displayData->nscreens;k++){
+	 refresh(displayData->dpy, displayData->locks[k]->win, displayData->locks[k]->screen, tm,displayData->crs[k],displayData->surfaces[k]);
+	 }
+ pthread_mutex_unlock(&mutex);
+ sleep(5);
+ }
+ return NULL;
 }
 
-static struct lock *lockscreen(Display *dpy, struct xrandr *rr, int screen) {
-  char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
-  int i, ptgrab, kbgrab;
-  struct lock *lock;
-  XColor color, dummy;
-  XSetWindowAttributes wa;
-  Cursor invisible;
+static void
+readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
+       const char *hash,cairo_t **crs,cairo_surface_t **surfaces)
+{
+	XRRScreenChangeNotifyEvent *rre;
+	char buf[32];
+	int caps, num, screen, running, failure, oldc, retval;
+	unsigned int len, color, indicators;
+	KeySym ksym;
+	XEvent ev;
+	pam_handle_t *pamh;
+
+	len = 0;
+	caps = 0;
+	running = 1;
+	failure = 0;
+	oldc = INIT;
+
+	if (!XkbGetIndicatorState(dpy, XkbUseCoreKbd, &indicators))
+		caps = indicators & 1;
+
+	while (running && !XNextEvent(dpy, &ev)) {
+		if (ev.type == KeyPress) {
+			explicit_bzero(&buf, sizeof(buf));
+			num = XLookupString(&ev.xkey, buf, sizeof(buf), &ksym, 0);
+			if (IsKeypadKey(ksym)) {
+				if (ksym == XK_KP_Enter)
+					ksym = XK_Return;
+				else if (ksym >= XK_KP_0 && ksym <= XK_KP_9)
+					ksym = (ksym - XK_KP_0) + XK_0;
+			}
+			if (IsFunctionKey(ksym) ||
+			    IsKeypadKey(ksym) ||
+			    IsMiscFunctionKey(ksym) ||
+			    IsPFKey(ksym) ||
+			    IsPrivateKeypadKey(ksym))
+				continue;
+			switch (ksym) {
+			case XK_Return:
+				passwd[len] = '\0';
+				errno = 0;
+				retval = pam_start(pam_service, hash, &pamc, &pamh);
+				color = PAM;
+				for (screen = 0; screen < nscreens; screen++) {
+					XSetWindowBackground(dpy, locks[screen]->win, locks[screen]->colors[color]);
+					XClearWindow(dpy, locks[screen]->win);
+					XRaiseWindow(dpy, locks[screen]->win);
+				}
+				XSync(dpy, False);
+
+				if (retval == PAM_SUCCESS)
+					retval = pam_authenticate(pamh, 0);
+				if (retval == PAM_SUCCESS)
+					retval = pam_acct_mgmt(pamh, 0);
+
+				running = 1;
+				if (retval == PAM_SUCCESS)
+					running = 0;
+				else
+					fprintf(stderr, "slock: %s\n", pam_strerror(pamh, retval));
+				pam_end(pamh, retval);
+				if (running) {
+					XBell(dpy, 100);
+					failure = 1;
+				}
+				explicit_bzero(&passwd, sizeof(passwd));
+				len = 0;
+				break;
+			case XK_Escape:
+				explicit_bzero(&passwd, sizeof(passwd));
+				len = 0;
+				break;
+			case XK_BackSpace:
+				if (len)
+					passwd[--len] = '\0';
+				break;
+			case XK_Caps_Lock:
+				caps = !caps;
+				break;
+			default:
+				if (num && !iscntrl((int)buf[0]) &&
+				    (len + num < sizeof(passwd))) {
+					memcpy(passwd + len, buf, num);
+					len += num;
+				}
+				break;
+			}
+            color = len ? (caps ? (len % 2 ? CAPS : CAPS_ALT) : (len % 2 ? INPUT : INPUT_ALT))
+                  : ((failure || failonclear) ? FAILED : INIT);
+			if (running && oldc != color) {
+		        pthread_mutex_lock(&mutex); /*Stop the time refresh thread from interfering*/
+				for (screen = 0; screen < nscreens; screen++) {
+                    time_t rawtime;
+                    time(&rawtime);
+					drawlogo(dpy, locks[screen], color);
+					writemessage(dpy, locks[screen]->win, screen);
+	                refresh(dpy, locks[screen]->win,locks[screen]->screen, *localtime(&rawtime),crs[screen],surfaces[screen]);
+				}
+				pthread_mutex_unlock(&mutex);
+				oldc = color;
+			}
+		} else if (rr->active && ev.type == rr->evbase + RRScreenChangeNotify) {
+			rre = (XRRScreenChangeNotifyEvent*)&ev;
+		    pthread_mutex_lock(&mutex); /*Stop the time refresh thread from interfering.*/
+			for (screen = 0; screen < nscreens; screen++) {
+				if (locks[screen]->win == rre->window) {
+					if (rre->rotation == RR_Rotate_90 ||
+					    rre->rotation == RR_Rotate_270)
+						XResizeWindow(dpy, locks[screen]->win,
+						              rre->height, rre->width);
+					else
+						XResizeWindow(dpy, locks[screen]->win,
+						              rre->width, rre->height);
+					XClearWindow(dpy, locks[screen]->win);
+					break;
+				}
+			}
+            pthread_mutex_unlock(&mutex);
+		} else {
+			for (screen = 0; screen < nscreens; screen++)
+				XRaiseWindow(dpy, locks[screen]->win);
+		}
+	}
+}
+
+static struct lock *
+lockscreen(Display *dpy, struct xrandr *rr, int screen)
+{
+	char curs[] = {0, 0, 0, 0, 0, 0, 0, 0};
+	int i, ptgrab, kbgrab;
+	struct lock *lock;
+	XColor color, dummy;
+	XSetWindowAttributes wa;
+	Cursor invisible;
 #ifdef XINERAMA
-  XineramaScreenInfo *info;
-  int n;
+	XineramaScreenInfo *info;
+	int n;
 #endif
 
-  if (dpy == NULL || screen < 0 || !(lock = malloc(sizeof(struct lock))))
-    return NULL;
-
-  lock->screen = screen;
-  lock->root = RootWindow(dpy, lock->screen);
-
-  if (image) {
-    lock->bgmap = XCreatePixmap(
-        dpy, lock->root, DisplayWidth(dpy, lock->screen),
-        DisplayHeight(dpy, lock->screen), DefaultDepth(dpy, lock->screen));
-    imlib_context_set_image(image);
-    imlib_context_set_display(dpy);
-    imlib_context_set_visual(DefaultVisual(dpy, lock->screen));
-    imlib_context_set_colormap(DefaultColormap(dpy, lock->screen));
-    imlib_context_set_drawable(lock->bgmap);
-    imlib_render_image_on_drawable(0, 0);
-    imlib_free_image();
-  }
-  for (i = 0; i < NUMCOLS; i++) {
-    XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen), colorname[i],
-                     &color, &dummy);
-    lock->colors[i] = color.pixel;
-  }
-
-  lock->x = DisplayWidth(dpy, lock->screen);
-  lock->y = DisplayHeight(dpy, lock->screen);
+	if (dpy == NULL || screen < 0 || !(lock = malloc(sizeof(struct lock))))
+		return NULL;
+
+	lock->screen = screen;
+	lock->root = RootWindow(dpy, lock->screen);
+
+    if(image) 
+    {
+        lock->bgmap = XCreatePixmap(dpy, lock->root, DisplayWidth(dpy, lock->screen), DisplayHeight(dpy, lock->screen), DefaultDepth(dpy, lock->screen));
+        imlib_context_set_image(image);
+        imlib_context_set_display(dpy);
+        imlib_context_set_visual(DefaultVisual(dpy, lock->screen));
+        imlib_context_set_colormap(DefaultColormap(dpy, lock->screen));
+        imlib_context_set_drawable(lock->bgmap);
+        imlib_render_image_on_drawable(0, 0);
+        imlib_free_image();
+    }
+	for (i = 0; i < NUMCOLS; i++) {
+		XAllocNamedColor(dpy, DefaultColormap(dpy, lock->screen),
+		                 colorname[i], &color, &dummy);
+		lock->colors[i] = color.pixel;
+	}
+
+	lock->x = DisplayWidth(dpy, lock->screen);
+	lock->y = DisplayHeight(dpy, lock->screen);
 #ifdef XINERAMA
-  if ((info = XineramaQueryScreens(dpy, &n))) {
-    lock->xoff = info[0].x_org;
-    lock->yoff = info[0].y_org;
-    lock->mw = info[0].width;
-    lock->mh = info[0].height;
-  } else
+	if ((info = XineramaQueryScreens(dpy, &n))) {
+		lock->xoff = info[0].x_org;
+		lock->yoff = info[0].y_org;
+		lock->mw = info[0].width;
+		lock->mh = info[0].height;
+	} else
 #endif
-  {
-    lock->xoff = lock->yoff = 0;
-    lock->mw = lock->x;
-    lock->mh = lock->y;
-  }
-  lock->drawable = XCreatePixmap(dpy, lock->root, lock->x, lock->y,
-                                 DefaultDepth(dpy, screen));
-  lock->gc = XCreateGC(dpy, lock->root, 0, NULL);
-  XSetLineAttributes(dpy, lock->gc, 1, LineSolid, CapButt, JoinMiter);
-
-  /* init */
-  wa.override_redirect = 1;
-  lock->win = XCreateWindow(dpy, lock->root, 0, 0, lock->x, lock->y, 0,
-                            DefaultDepth(dpy, lock->screen), CopyFromParent,
-                            DefaultVisual(dpy, lock->screen),
-                            CWOverrideRedirect | CWBackPixel, &wa);
-  if (lock->bgmap)
-    XSetWindowBackgroundPixmap(dpy, lock->win, lock->bgmap);
-  lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
-  invisible =
-      XCreatePixmapCursor(dpy, lock->pmap, lock->pmap, &color, &color, 0, 0);
-  XDefineCursor(dpy, lock->win, invisible);
-
-  resizerectangles(lock);
-
-  /* Try to grab mouse pointer *and* keyboard for 600ms, else fail the lock */
-  for (i = 0, ptgrab = kbgrab = -1; i < 6; i++) {
-    if (ptgrab != GrabSuccess) {
-      ptgrab = XGrabPointer(
-          dpy, lock->root, False,
-          ButtonPressMask | ButtonReleaseMask | PointerMotionMask,
-          GrabModeAsync, GrabModeAsync, None, invisible, CurrentTime);
-    }
-    if (kbgrab != GrabSuccess) {
-      kbgrab = XGrabKeyboard(dpy, lock->root, True, GrabModeAsync,
-                             GrabModeAsync, CurrentTime);
-    }
+	{
+		lock->xoff = lock->yoff = 0;
+		lock->mw = lock->x;
+		lock->mh = lock->y;
+	}
+	lock->drawable = XCreatePixmap(dpy, lock->root,
+            lock->x, lock->y, DefaultDepth(dpy, screen));
+	lock->gc = XCreateGC(dpy, lock->root, 0, NULL);
+	XSetLineAttributes(dpy, lock->gc, 1, LineSolid, CapButt, JoinMiter);
+
+	/* init */
+	wa.override_redirect = 1;
+	lock->win = XCreateWindow(dpy, lock->root, 0, 0,
+	                          lock->x, lock->y,
+	                          0, DefaultDepth(dpy, lock->screen),
+	                          CopyFromParent,
+	                          DefaultVisual(dpy, lock->screen),
+	                          CWOverrideRedirect | CWBackPixel, &wa);
+    if(lock->bgmap) XSetWindowBackgroundPixmap(dpy, lock->win, lock->bgmap);
+	lock->pmap = XCreateBitmapFromData(dpy, lock->win, curs, 8, 8);
+	invisible = XCreatePixmapCursor(dpy, lock->pmap, lock->pmap,
+	                                &color, &color, 0, 0);
+	XDefineCursor(dpy, lock->win, invisible);
+
+	resizerectangles(lock);
+
+	/* Try to grab mouse pointer *and* keyboard for 600ms, else fail the lock */
+	for (i = 0, ptgrab = kbgrab = -1; i < 6; i++) {
+		if (ptgrab != GrabSuccess) {
+			ptgrab = XGrabPointer(dpy, lock->root, False,
+			                      ButtonPressMask | ButtonReleaseMask |
+			                      PointerMotionMask, GrabModeAsync,
+			                      GrabModeAsync, None, invisible, CurrentTime);
+		}
+		if (kbgrab != GrabSuccess) {
+			kbgrab = XGrabKeyboard(dpy, lock->root, True,
+			                       GrabModeAsync, GrabModeAsync, CurrentTime);
+		}
+
+		/* input is grabbed: we can lock the screen */
+		if (ptgrab == GrabSuccess && kbgrab == GrabSuccess) {
+			XMapRaised(dpy, lock->win);
+			if (rr->active)
+				XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask);
+
+			XSelectInput(dpy, lock->root, SubstructureNotifyMask);
+			drawlogo(dpy, lock, INIT);
+			return lock;
+		}
+
+		/* retry on AlreadyGrabbed but fail on other errors */
+		if ((ptgrab != AlreadyGrabbed && ptgrab != GrabSuccess) ||
+		    (kbgrab != AlreadyGrabbed && kbgrab != GrabSuccess))
+			break;
+
+		usleep(100000);
+	}
+
+	/* we couldn't grab all input: fail out */
+	if (ptgrab != GrabSuccess)
+		fprintf(stderr, "slock: unable to grab mouse pointer for screen %d\n",
+		        screen);
+	if (kbgrab != GrabSuccess)
+		fprintf(stderr, "slock: unable to grab keyboard for screen %d\n",
+		        screen);
+	return NULL;
+}
 
-    /* input is grabbed: we can lock the screen */
-    if (ptgrab == GrabSuccess && kbgrab == GrabSuccess) {
-      XMapRaised(dpy, lock->win);
-      if (rr->active)
-        XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask);
+int
+resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
+{
+	char **sdst = dst;
+	int *idst = dst;
+	float *fdst = dst;
+
+	char fullname[256];
+	char fullclass[256];
+	char *type;
+	XrmValue ret;
+
+	snprintf(fullname, sizeof(fullname), "%s.%s", "slock", name);
+	snprintf(fullclass, sizeof(fullclass), "%s.%s", "Slock", name);
+	fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0';
+
+	XrmGetResource(db, fullname, fullclass, &type, &ret);
+	if (ret.addr == NULL || strncmp("String", type, 64))
+		return 1;
+
+	switch (rtype) {
+	case STRING:
+		*sdst = ret.addr;
+		break;
+	case INTEGER:
+		*idst = strtoul(ret.addr, NULL, 10);
+		break;
+	case FLOAT:
+		*fdst = strtof(ret.addr, NULL);
+		break;
+	}
+	return 0;
+}
 
-      XSelectInput(dpy, lock->root, SubstructureNotifyMask);
-      drawlogo(dpy, lock, INIT);
-      tim = time(NULL);
-      return lock;
-    }
+void
+config_init(Display *dpy)
+{
+	char *resm;
+	XrmDatabase db;
+	ResourcePref *p;
+
+	XrmInitialize();
+	resm = XResourceManagerString(dpy);
+	if (!resm)
+		return;
+
+	db = XrmGetStringDatabase(resm);
+	for (p = resources; p < resources + LEN(resources); p++)
+		resource_load(db, p->name, p->type, p->dst);
+}
 
-    /* retry on AlreadyGrabbed but fail on other errors */
-    if ((ptgrab != AlreadyGrabbed && ptgrab != GrabSuccess) ||
-        (kbgrab != AlreadyGrabbed && kbgrab != GrabSuccess))
-      break;
-
-    usleep(100000);
-  }
-
-  /* we couldn't grab all input: fail out */
-  if (ptgrab != GrabSuccess)
-    fprintf(stderr, "slock: unable to grab mouse pointer for screen %d\n",
-            screen);
-  if (kbgrab != GrabSuccess)
-    fprintf(stderr, "slock: unable to grab keyboard for screen %d\n", screen);
-  return NULL;
+static void
+usage(void)
+{
+	die("usage: slock [-v] [-m message] [cmd [arg ...]]\n");
 }
 
-static void usage(void) { die("usage: slock [-v] [cmd [arg ...]]\n"); }
-
-int main(int argc, char **argv) {
-  struct xrandr rr;
-  struct lock **locks;
-  struct passwd *pwd;
-  struct group *grp;
-  uid_t duid;
-  gid_t dgid;
-  const char *hash;
-  Display *dpy;
-  int s, nlocks, nscreens;
-
-  ARGBEGIN {
-  case 'v':
-    puts("slock-" VERSION);
-    return 0;
-  default:
-    usage();
-  }
-  ARGEND
-
-  /* validate drop-user and -group */
-  errno = 0;
-  if (!(pwd = getpwnam(user)))
-    die("slock: getpwnam %s: %s\n", user,
-        errno ? strerror(errno) : "user entry not found");
-  duid = pwd->pw_uid;
-  errno = 0;
-  if (!(grp = getgrnam(group)))
-    die("slock: getgrnam %s: %s\n", group,
-        errno ? strerror(errno) : "group entry not found");
-  dgid = grp->gr_gid;
+int
+main(int argc, char **argv) {
+	struct xrandr rr;
+	struct lock **locks;
+	struct passwd *pwd;
+	struct group *grp;
+	uid_t duid;
+	gid_t dgid;
+	const char *hash;
+	Display *dpy;
+	int s, nlocks, nscreens;
+	CARD16 standby, suspend, off;
+	BOOL dpms_state;
+
+	ARGBEGIN {
+	case 'v':
+		fprintf(stderr, "slock-"VERSION"\n");
+		return 0;
+	case 'm':
+		message = EARGF(usage());
+		break;
+	default:
+		usage();
+	} ARGEND
+
+	/* validate drop-user and -group */
+	errno = 0;
+	if (!(pwd = getpwnam(getenv("USER"))))
+		die("slock: getpwnam %s: %s\n", getenv("USER"),
+		    errno ? strerror(errno) : "user entry not found");
+	duid = pwd->pw_uid;
+	errno = 0;
+	if (!(grp = getgrnam(group)))
+		die("slock: getgrnam %s: %s\n", group,
+		    errno ? strerror(errno) : "group entry not found");
+	dgid = grp->gr_gid;
 
 #ifdef __linux__
-  dontkillme();
+	dontkillme();
 #endif
 
-  hash = gethash();
-  errno = 0;
-  if (!crypt("", hash))
-    die("slock: crypt: %s\n", strerror(errno));
-
-  if (!(dpy = XOpenDisplay(NULL)))
-    die("slock: cannot open display\n");
-
-  /* drop privileges */
-  if (setgroups(0, NULL) < 0)
-    die("slock: setgroups: %s\n", strerror(errno));
-  if (setgid(dgid) < 0)
-    die("slock: setgid: %s\n", strerror(errno));
-  if (setuid(duid) < 0)
-    die("slock: setuid: %s\n", strerror(errno));
-
-  /*Create screenshot Image*/
-  Screen *scr = ScreenOfDisplay(dpy, DefaultScreen(dpy));
-  image = imlib_create_image(scr->width, scr->height);
-  imlib_context_set_image(image);
-  imlib_context_set_display(dpy);
-  imlib_context_set_visual(DefaultVisual(dpy, 0));
-  imlib_context_set_drawable(RootWindow(dpy, XScreenNumberOfScreen(scr)));
-  imlib_copy_drawable_to_image(0, 0, 0, scr->width, scr->height, 0, 0, 1);
+	/* the contents of hash are used to transport the current user name */
+	hash = gethash();
+	errno = 0;
 
-#ifdef BLUR
+	XInitThreads();
 
-  /*Blur function*/
-  imlib_image_blur(blurRadius);
-#endif // BLUR
+	if (!(dpy = XOpenDisplay(NULL)))
+		die("slock: cannot open display\n");
 
-#ifdef PIXELATION
-  /*Pixelation*/
-  int width = scr->width;
-  int height = scr->height;
-
-  for (int y = 0; y < height; y += pixelSize) {
-    for (int x = 0; x < width; x += pixelSize) {
-      int red = 0;
-      int green = 0;
-      int blue = 0;
-
-      Imlib_Color pixel;
-      Imlib_Color *pp;
-      pp = &pixel;
-      for (int j = 0; j < pixelSize && j < height; j++) {
-        for (int i = 0; i < pixelSize && i < width; i++) {
-          imlib_image_query_pixel(x + i, y + j, pp);
-          red += pixel.red;
-          green += pixel.green;
-          blue += pixel.blue;
+	/* drop privileges */
+	if (setgroups(0, NULL) < 0)
+		die("slock: setgroups: %s\n", strerror(errno));
+	if (setgid(dgid) < 0)
+		die("slock: setgid: %s\n", strerror(errno));
+	if (setuid(duid) < 0)
+		die("slock: setuid: %s\n", strerror(errno));
+
+	config_init(dpy);
+
+    /* Load picture */
+    Imlib_Image buffer = imlib_load_image(background_image);
+    if (buffer) {
+        blurRadius = personalblur;
+
+        imlib_context_set_image(buffer);
+        int background_image_width = imlib_image_get_width();
+        int background_image_height = imlib_image_get_height();
+
+        /* Create an image to be rendered */
+        Screen *scr = ScreenOfDisplay(dpy, DefaultScreen(dpy));
+        image = imlib_create_image(scr->width, scr->height);
+        imlib_context_set_image(image);
+
+        /* Fill the image for every X monitor */
+        XRRMonitorInfo	*monitors;
+        int number_of_monitors;
+        monitors = XRRGetMonitors(dpy, RootWindow(dpy, XScreenNumberOfScreen(scr)), True, &number_of_monitors);
+
+        int i;
+        for (i = 0; i < number_of_monitors; i++) {
+          imlib_blend_image_onto_image(buffer, 0, 0, 0, background_image_width, background_image_height, monitors[i].x, monitors[i].y, monitors[i].width, monitors[i].height);
         }
-      }
-      red /= (pixelSize * pixelSize);
-      green /= (pixelSize * pixelSize);
-      blue /= (pixelSize * pixelSize);
-      imlib_context_set_color(red, green, blue, pixel.alpha);
-      imlib_image_fill_rectangle(x, y, pixelSize, pixelSize);
-      red = 0;
-      green = 0;
-      blue = 0;
-    }
-  }
 
-#endif
-  /* check for Xrandr support */
-  rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
-
-  /* get number of screens in display "dpy" and blank them */
-  nscreens = ScreenCount(dpy);
-  if (!(locks = calloc(nscreens, sizeof(struct lock *))))
-    die("slock: out of memory\n");
-  for (nlocks = 0, s = 0; s < nscreens; s++) {
-    if ((locks[s] = lockscreen(dpy, &rr, s)) != NULL)
-      nlocks++;
-    else
-      break;
-  }
-  XSync(dpy, 0);
-
-  /* did we manage to lock everything? */
-  if (nlocks != nscreens)
-    return 1;
-
-  /* run post-lock command */
-  if (argc > 0) {
-    switch (fork()) {
-    case -1:
-      die("slock: fork failed: %s\n", strerror(errno));
-    case 0:
-      if (close(ConnectionNumber(dpy)) < 0)
-        die("slock: close: %s\n", strerror(errno));
-      execvp(argv[0], argv);
-      fprintf(stderr, "slock: execvp %s: %s\n", argv[0], strerror(errno));
-      _exit(1);
+        /* Clean up */
+        imlib_context_set_image(buffer);
+        imlib_free_image();
+        imlib_context_set_image(image);
+    } else {
+          /*Create screenshot Image*/
+          Screen *scr = ScreenOfDisplay(dpy, DefaultScreen(dpy));
+          image = imlib_create_image(scr->width,scr->height);
+          imlib_context_set_image(image);
+          imlib_context_set_display(dpy);
+          imlib_context_set_visual(DefaultVisual(dpy,0));
+          imlib_context_set_drawable(RootWindow(dpy,XScreenNumberOfScreen(scr)));	
+          imlib_copy_drawable_to_image(0,0,0,scr->width,scr->height,0,0,1);
     }
-  }
 
-  /* everything is now blank. Wait for the correct password */
-  readpw(dpy, &rr, locks, nscreens, hash);
-
-  for (nlocks = 0, s = 0; s < nscreens; s++) {
-    XFreePixmap(dpy, locks[s]->drawable);
-    XFreeGC(dpy, locks[s]->gc);
-  }
+#ifdef BLUR
+	/*Blur function*/
+	imlib_image_blur(blurRadius);
+#endif // BLUR	
 
-  XSync(dpy, 0);
-  XCloseDisplay(dpy);
-  return 0;
+#ifdef PIXELATION
+	/*Pixelation*/
+	int width = scr->width;
+	int height = scr->height;
+	
+	for(int y = 0; y < height; y += pixelSize)
+	{
+		for(int x = 0; x < width; x += pixelSize)
+		{
+			int red = 0;
+			int green = 0;
+			int blue = 0;
+
+			Imlib_Color pixel; 
+			Imlib_Color* pp;
+			pp = &pixel;
+			for(int j = 0; j < pixelSize && j < height; j++)
+			{
+				for(int i = 0; i < pixelSize && i < width; i++)
+				{
+					imlib_image_query_pixel(x+i,y+j,pp);
+					red += pixel.red;
+					green += pixel.green;
+					blue += pixel.blue;
+				}
+			}
+			red /= (pixelSize*pixelSize);
+			green /= (pixelSize*pixelSize);
+			blue /= (pixelSize*pixelSize);
+			imlib_context_set_color(red,green,blue,pixel.alpha);
+			imlib_image_fill_rectangle(x,y,pixelSize,pixelSize);
+			red = 0;
+			green = 0;
+			blue = 0;
+		}
+	}
+	
+	
+#endif
+	/* check for Xrandr support */
+	rr.active = XRRQueryExtension(dpy, &rr.evbase, &rr.errbase);
+
+	/* get number of screens in display "dpy" and blank them */
+	nscreens = ScreenCount(dpy);
+	if (!(locks = calloc(nscreens, sizeof(struct lock *))))
+		die("slock: out of memory\n");
+	for (nlocks = 0, s = 0; s < nscreens; s++) {
+		if ((locks[s] = lockscreen(dpy, &rr, s)) != NULL) {
+			writemessage(dpy, locks[s]->win, s);
+			nlocks++;
+		} else {
+ 			break;
+		}
+	}
+
+	/* did we manage to lock everything? */
+	if (nlocks != nscreens)
+		return 1;
+
+	/* DPMS magic to disable the monitor */
+	if (!DPMSCapable(dpy))
+		die("slock: DPMSCapable failed\n");
+	if (!DPMSInfo(dpy, &standby, &dpms_state))
+		die("slock: DPMSInfo failed\n");
+	if (!DPMSEnable(dpy) && !dpms_state)
+		die("slock: DPMSEnable failed\n");
+	if (!DPMSGetTimeouts(dpy, &standby, &suspend, &off))
+		die("slock: DPMSGetTimeouts failed\n");
+	if (!standby || !suspend || !off)
+		die("slock: at least one DPMS variable is zero\n");
+	if (!DPMSSetTimeouts(dpy, monitortime, monitortime, monitortime))
+		die("slock: DPMSSetTimeouts failed\n");
+
+	XSync(dpy, 0);
+
+	/* run post-lock command */
+	if (argc > 0) {
+		switch (fork()) {
+		case -1:
+			die("slock: fork failed: %s\n", strerror(errno));
+		case 0:
+			if (close(ConnectionNumber(dpy)) < 0)
+				die("slock: close: %s\n", strerror(errno));
+			execvp(argv[0], argv);
+			fprintf(stderr, "slock: execvp %s: %s\n", argv[0], strerror(errno));
+			_exit(1);
+		}
+	}
+
+	/* everything is now blank. Wait for the correct password */
+	pthread_t thredid;
+    /* Create Cairo drawables upon which the time will be shown. */
+    struct displayData displayData;
+	cairo_surface_t **surfaces;
+	cairo_t **crs;
+    if (!(surfaces=calloc(nscreens, sizeof(cairo_surface_t*)))){
+		die("Out of memory");
+	}
+	if (!(crs=calloc(nscreens, sizeof(cairo_t*)))){
+		die("Out of memory");
+	}
+	for (int k=0;k<nscreens;k++){
+		Drawable win=locks[k]->win;
+		int screen=locks[k]->screen;
+		XMapWindow(dpy, win);
+		surfaces[k]=cairo_xlib_surface_create(dpy, win, DefaultVisual(dpy, screen),DisplayWidth(dpy, screen) , DisplayHeight(dpy, screen));
+		crs[k]=cairo_create(surfaces[k]);
+	}
+	displayData.dpy=dpy;
+	displayData.locks=locks;
+	displayData.nscreens=nscreens;
+	displayData.crs=crs;
+	displayData.surfaces=surfaces;
+    /*Start the thread that redraws time every 5 seconds*/
+	pthread_create(&thredid, NULL, displayTime, &displayData);
+	/*Wait for the password*/
+	readpw(dpy, &rr, locks, nscreens, hash,crs,surfaces);
+
+	/* reset DPMS values to inital ones */
+	DPMSSetTimeouts(dpy, standby, suspend, off);
+	if (!dpms_state)
+		DPMSDisable(dpy);
+	XSync(dpy, 0);
+
+	for (nlocks = 0, s = 0; s < nscreens; s++) {
+		XFreePixmap(dpy, locks[s]->drawable);
+		XFreeGC(dpy, locks[s]->gc);
+	}
+
+	XSync(dpy, 0);
+	XCloseDisplay(dpy);
+	return 0;
 }
diff --git a/slock/util.h b/slock/util.h
index 6f748b8..148dbc1 100755..100644
--- a/slock/util.h
+++ b/slock/util.h
@@ -1,2 +1,5 @@
+/* macros */
+#define LEN(a)			(sizeof(a) / sizeof(a)[0])
+
 #undef explicit_bzero
 void explicit_bzero(void *, size_t);
diff --git a/st/PKGBUILD b/st/PKGBUILD
index 66dd05e..8698a8e 100644
--- a/st/PKGBUILD
+++ b/st/PKGBUILD
@@ -1,19 +1,19 @@
 # Maintainer:
 
-pkgname=st-luke-git
+pkgname=st-soomin-git
 _pkgname=st
 pkgver=0.8.2.r1062.2087ab9
 pkgrel=1
 epoch=1
-pkgdesc="Luke's simple (suckless) terminal with vim-bindings, transparency, xresources, etc. "
-url='https://github.com/LukeSmithxyz/st'
+pkgdesc="Soomin's simple (suckless) terminal with vim-bindings, transparency, xresources, etc. "
+url='https://github.com/SoominImxyz/st'
 arch=('i686' 'x86_64')
 license=('MIT')
 options=('zipman')
 depends=('libxft')
 makedepends=('ncurses' 'libxext' 'git')
 optdepends=('dmenu: feed urls to dmenu')
-source=(git+https://github.com/LukeSmithxyz/st)
+source=(git+https://github.com/SoominImxyz/st)
 sha1sums=('SKIP')
 
 provides=("${_pkgname}")
diff --git a/st/config.h b/st/config.h
index 733f5ac..0eb1dbd 100755..100644
--- a/st/config.h
+++ b/st/config.h
@@ -5,9 +5,8 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "mono:pixelsize=10:antialias=true:autohint=true";
-static char *font2[] = {
-    "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true"};
+static char *font = "mono:pixelsize=16:antialias=true:autohint=true";
+static char *font2[] = { "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" };
 static int borderpx = 2;
 
 /*
@@ -109,15 +108,28 @@ unsigned int tabspaces = 8;
 
 /* bg opacity */
 float alpha = 0.8;
-float alphaOffset = 0.0;
+float alphaOffset = 0.02;
 float alphaUnfocus;
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
     "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
-    "#cc241d", "#839E45", "#d79921", "#458588", "#b16286", "#689d6a", "#a89984",
-    "#928374", "#fb4934", "#b8bb26", "#fabd2f", "#83a598", "#d3869b", "#8ec07c",
-    "#ebdbb2", [255] = 0,
+    "#cc241d",
+    "#839E45",
+    "#d79921",
+    "#458588",
+    "#b16286",
+    "#689d6a",
+    "#a89984",
+    "#928374",
+    "#fb4934",
+    "#b8bb26",
+    "#fabd2f",
+    "#83a598",
+    "#d3869b",
+    "#8ec07c",
+    "#ebdbb2",
+    [255] = 0,
     /* more colors can be added after 255 to use with DefaultXX */
     "#add8e6", /* 256 -> cursor */
     "#555555", /* 257 -> rev cursor*/
@@ -175,39 +187,39 @@ static uint forcemousemod = ShiftMask;
  * Xresources preferences to load at startup
  */
 ResourcePref resources[] = {
-    {"font", STRING, &font},
-    {"fontalt0", STRING, &font2[0]},
-    {"color0", STRING, &colorname[0]},
-    {"color1", STRING, &colorname[1]},
-    {"color2", STRING, &colorname[2]},
-    {"color3", STRING, &colorname[3]},
-    {"color4", STRING, &colorname[4]},
-    {"color5", STRING, &colorname[5]},
-    {"color6", STRING, &colorname[6]},
-    {"color7", STRING, &colorname[7]},
-    {"color8", STRING, &colorname[8]},
-    {"color9", STRING, &colorname[9]},
-    {"color10", STRING, &colorname[10]},
-    {"color11", STRING, &colorname[11]},
-    {"color12", STRING, &colorname[12]},
-    {"color13", STRING, &colorname[13]},
-    {"color14", STRING, &colorname[14]},
-    {"color15", STRING, &colorname[15]},
-    {"background", STRING, &colorname[258]},
-    {"foreground", STRING, &colorname[259]},
-    {"cursorColor", STRING, &colorname[256]},
-    {"termname", STRING, &termname},
-    {"shell", STRING, &shell},
-    {"minlatency", INTEGER, &minlatency},
-    {"maxlatency", INTEGER, &maxlatency},
-    {"blinktimeout", INTEGER, &blinktimeout},
-    {"bellvolume", INTEGER, &bellvolume},
-    {"tabspaces", INTEGER, &tabspaces},
-    {"borderpx", INTEGER, &borderpx},
-    {"cwscale", FLOAT, &cwscale},
-    {"chscale", FLOAT, &chscale},
-    {"alpha", FLOAT, &alpha},
-    {"alphaOffset", FLOAT, &alphaOffset},
+    { "font",           STRING,         &font },
+    { "fontalt0",       STRING,         &font2[0] },
+    { "color0",         STRING,         &colorname[0] },
+    { "color1",         STRING,         &colorname[1] },
+    { "color2",         STRING,         &colorname[2] },
+    { "color3",         STRING,         &colorname[3] },
+    { "color4",         STRING,         &colorname[4] },
+    { "color5",         STRING,         &colorname[5] },
+    { "color6",         STRING,         &colorname[6] },
+    { "color7",         STRING,         &colorname[7] },
+    { "color8",         STRING,         &colorname[8] },
+    { "color9",         STRING,         &colorname[9] },
+    { "color10",        STRING,         &colorname[10] },
+    { "color11",        STRING,         &colorname[11] },
+    { "color12",        STRING,         &colorname[12] },
+    { "color13",        STRING,         &colorname[13] },
+    { "color14",        STRING,         &colorname[14] },
+    { "color15",        STRING,         &colorname[15] },
+    { "background",     STRING,         &colorname[258] },
+    { "foreground",     STRING,         &colorname[259] },
+    { "cursorColor",    STRING,         &colorname[256] },
+    { "termname",       STRING,         &termname },
+    { "shell",          STRING,         &shell },
+    { "minlatency",     INTEGER,        &minlatency },
+    { "maxlatency",     INTEGER,        &maxlatency },
+    { "blinktimeout",   INTEGER,        &blinktimeout },
+    { "bellvolume",     INTEGER,        &bellvolume },
+    { "tabspaces",      INTEGER,        &tabspaces },
+    { "borderpx",       INTEGER,        &borderpx },
+    { "cwscale",        FLOAT,          &cwscale },
+    { "chscale",        FLOAT,          &chscale },
+    { "alpha",          FLOAT,          &alpha },
+    { "alphaOffset",    FLOAT,          &alphaOffset },
 };
 
 /*
@@ -215,64 +227,74 @@ ResourcePref resources[] = {
  * Beware that overloading Button1 will disable the selection.
  */
 static MouseShortcut mshortcuts[] = {
-    /* mask                 button   function        argument       release */
-    {XK_NO_MOD, Button4, kscrollup, {.i = 1}},
-    {XK_NO_MOD, Button5, kscrolldown, {.i = 1}},
-    {XK_ANY_MOD, Button2, selpaste, {.i = 0}, 1},
-    {ShiftMask, Button4, ttysend, {.s = "\033[5;2~"}},
-    {XK_ANY_MOD, Button4, ttysend, {.s = "\031"}},
-    {ShiftMask, Button5, ttysend, {.s = "\033[6;2~"}},
-    {XK_ANY_MOD, Button5, ttysend, {.s = "\005"}},
+    /* mask                 button   function        argument               release */
+    { XK_NO_MOD,            Button4, kscrollup,     { .i = 1 }              },
+    { XK_NO_MOD,            Button5, kscrolldown,   { .i = 1 }              },
+    { XK_ANY_MOD,           Button2, selpaste,      { .i = 0 },             1 },
+    { ShiftMask,            Button4, ttysend,       { .s = "\033[5;2~" }    },
+    { XK_ANY_MOD,           Button4, ttysend,       { .s = "\031" }         },
+    { ShiftMask,            Button5, ttysend,       { .s = "\033[6;2~" }    },
+    { XK_ANY_MOD,           Button5, ttysend,       { .s = "\005" }         },
 };
 
 /* Internal keyboard shortcuts. */
 #define MODKEY Mod1Mask
-#define TERMMOD (Mod1Mask | ShiftMask)
+#define MODKEY2 Mod4Mask
+#define TERMMOD (MODKEY | ShiftMask)
 
-static char *openurlcmd[] = {"/bin/sh", "-c", "st-urlhandler -o",
-                             "externalpipe", NULL};
-static char *copyurlcmd[] = {"/bin/sh", "-c", "st-urlhandler -c",
-                             "externalpipe", NULL};
-static char *copyoutput[] = {"/bin/sh", "-c", "st-copyout", "externalpipe",
-                             NULL};
+static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -o", "externalpipe", NULL };
+static char *copyurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -c", "externalpipe", NULL };
+static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NULL };
 
 static Shortcut shortcuts[] = {
     /* mask                 keysym          function        argument */
-    {XK_ANY_MOD, XK_Break, sendbreak, {.i = 0}},
-    {ControlMask, XK_Print, toggleprinter, {.i = 0}},
-    {ShiftMask, XK_Print, printscreen, {.i = 0}},
-    {XK_ANY_MOD, XK_Print, printsel, {.i = 0}},
-    {TERMMOD, XK_Prior, zoom, {.f = +1}},
-    {TERMMOD, XK_Next, zoom, {.f = -1}},
-    {TERMMOD, XK_Home, zoomreset, {.f = 0}},
-    {TERMMOD, XK_C, clipcopy, {.i = 0}},
-    {TERMMOD, XK_V, clippaste, {.i = 0}},
-    {MODKEY, XK_c, clipcopy, {.i = 0}},
-    {ShiftMask, XK_Insert, clippaste, {.i = 0}},
-    {MODKEY, XK_v, clippaste, {.i = 0}},
-    {ShiftMask, XK_Insert, selpaste, {.i = 0}},
-    {TERMMOD, XK_Num_Lock, numlock, {.i = 0}},
-    {ShiftMask, XK_Page_Up, kscrollup, {.i = -1}},
-    {ShiftMask, XK_Page_Down, kscrolldown, {.i = -1}},
-    {MODKEY, XK_Page_Up, kscrollup, {.i = -1}},
-    {MODKEY, XK_Page_Down, kscrolldown, {.i = -1}},
-    {MODKEY, XK_k, kscrollup, {.i = 1}},
-    {MODKEY, XK_j, kscrolldown, {.i = 1}},
-    {MODKEY, XK_Up, kscrollup, {.i = 1}},
-    {MODKEY, XK_Down, kscrolldown, {.i = 1}},
-    {MODKEY, XK_u, kscrollup, {.i = -1}},
-    {MODKEY, XK_d, kscrolldown, {.i = -1}},
-    {MODKEY, XK_s, changealpha, {.f = -0.05}},
-    {MODKEY, XK_a, changealpha, {.f = +0.05}},
-    {TERMMOD, XK_Up, zoom, {.f = +1}},
-    {TERMMOD, XK_Down, zoom, {.f = -1}},
-    {TERMMOD, XK_K, zoom, {.f = +1}},
-    {TERMMOD, XK_J, zoom, {.f = -1}},
-    {TERMMOD, XK_U, zoom, {.f = +2}},
-    {TERMMOD, XK_D, zoom, {.f = -2}},
-    {MODKEY, XK_l, externalpipe, {.v = openurlcmd}},
-    {MODKEY, XK_y, externalpipe, {.v = copyurlcmd}},
-    {MODKEY, XK_o, externalpipe, {.v = copyoutput}},
+    /* APPEAREANCE */
+    { MODKEY,               XK_a,           changealpha,    { .f = +0.05 } },
+    { MODKEY,               XK_s,           changealpha,    { .f = -0.05 } },
+    { TERMMOD,              XK_Down,        zoom,           { .f = -1 } },
+    { TERMMOD,              XK_Up,          zoom,           { .f = +1 } },
+    { TERMMOD,              XK_Next,        zoom,           { .f = -1 } },
+    { TERMMOD,              XK_Prior,       zoom,           { .f = +1 } },
+    { TERMMOD,              XK_J,           zoom,           { .f = -1 } },
+    { TERMMOD,              XK_K,           zoom,           { .f = +1 } },
+    { TERMMOD,              XK_D,           zoom,           { .f = -2 } },
+    { TERMMOD,              XK_U,           zoom,           { .f = +2 } },
+    { TERMMOD,              XK_parenright,  zoomreset,      { .f = 0 } },
+
+    /* COPY */
+    { MODKEY,               XK_y,           clipcopy,       { .i = 0 } },
+    { TERMMOD,              XK_Y,           clipcopy,       { .i = 0 } },
+    { MODKEY,               XK_c,           externalpipe,   { .v = copyurlcmd } },
+    { MODKEY,               XK_o,           externalpipe,   { .v = copyoutput } },
+
+    /* PASTE */
+    { MODKEY,               XK_p,           clippaste,      { .i = 0 } },
+    { TERMMOD,              XK_P,           clippaste,      { .i = 0 } },
+    { ShiftMask,            XK_Insert,      clippaste,      { .i = 0 } },
+    { ShiftMask,            XK_Insert,      selpaste,       { .i = 0 } },
+    { MODKEY,               XK_v,           externalpipe,   { .v = openurlcmd } },
+
+    /* PRINTER */
+    { ShiftMask,            XK_Print,       printscreen,    { .i = 0 } },
+    { XK_ANY_MOD,           XK_Print,       printsel,       { .i = 0 } },
+    { ControlMask,          XK_Print,       toggleprinter,  { .i = 0 } },
+
+    /* TRAVERSAL */
+    { MODKEY,               XK_k,           kscrollup,      { .i = 1 } },
+    { MODKEY,               XK_j,           kscrolldown,    { .i = 1 } },
+    { MODKEY,               XK_u,           kscrollup,      { .i = -1 } },
+    { MODKEY,               XK_d,           kscrolldown,    { .i = -1 } },
+    { MODKEY,               XK_Up,          kscrollup,      { .i = 1 } },
+    { MODKEY,               XK_Down,        kscrolldown,    { .i = 1 } },
+    { MODKEY,               XK_Page_Up,     kscrollup,      { .i = -1 } },
+    { MODKEY,               XK_Page_Down,   kscrolldown,    { .i = -1 } },
+    { ShiftMask,            XK_Page_Up,     kscrollup,      { .i = -1 } },
+    { ShiftMask,            XK_Page_Down,   kscrolldown,    { .i = -1 } },
+
+    /* EXTRA */
+    { TERMMOD,              XK_Num_Lock,    numlock,        { .i = 0 } },
+    { XK_ANY_MOD,           XK_Break,       sendbreak,      { .i = 0 } },
+
 };
 
 /*
@@ -300,7 +322,7 @@ static Shortcut shortcuts[] = {
  * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
  * to be mapped below, add them to this array.
  */
-static KeySym mappedkeys[] = {-1};
+static KeySym mappedkeys[] = { -1 };
 
 /*
  * State bits to ignore when matching key or button events.  By default,
@@ -313,216 +335,216 @@ static uint ignoremod = Mod2Mask | XK_SWITCH_MOD;
  * world. Please decide about changes wisely.
  */
 static Key key[] = {
-    /* keysym           mask            string      appkey appcursor */
-    {XK_KP_Home, ShiftMask, "\033[2J", 0, -1},
-    {XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1},
-    {XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1},
-    {XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1},
-    {XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0},
-    {XK_KP_Up, XK_ANY_MOD, "\033[A", 0, -1},
-    {XK_KP_Up, XK_ANY_MOD, "\033OA", 0, +1},
-    {XK_KP_Down, XK_ANY_MOD, "\033Or", +1, 0},
-    {XK_KP_Down, XK_ANY_MOD, "\033[B", 0, -1},
-    {XK_KP_Down, XK_ANY_MOD, "\033OB", 0, +1},
-    {XK_KP_Left, XK_ANY_MOD, "\033Ot", +1, 0},
-    {XK_KP_Left, XK_ANY_MOD, "\033[D", 0, -1},
-    {XK_KP_Left, XK_ANY_MOD, "\033OD", 0, +1},
-    {XK_KP_Right, XK_ANY_MOD, "\033Ov", +1, 0},
-    {XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1},
-    {XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1},
-    {XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0},
-    {XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
-    {XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0},
-    {XK_KP_End, ControlMask, "\033[J", -1, 0},
-    {XK_KP_End, ControlMask, "\033[1;5F", +1, 0},
-    {XK_KP_End, ShiftMask, "\033[K", -1, 0},
-    {XK_KP_End, ShiftMask, "\033[1;2F", +1, 0},
-    {XK_KP_End, XK_ANY_MOD, "\033[4~", 0, 0},
-    {XK_KP_Next, ShiftMask, "\033[6;2~", 0, 0},
-    {XK_KP_Next, XK_ANY_MOD, "\033[6~", 0, 0},
-    {XK_KP_Insert, ShiftMask, "\033[2;2~", +1, 0},
-    {XK_KP_Insert, ShiftMask, "\033[4l", -1, 0},
-    {XK_KP_Insert, ControlMask, "\033[L", -1, 0},
-    {XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0},
-    {XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
-    {XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
-    {XK_KP_Delete, ControlMask, "\033[M", -1, 0},
-    {XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0},
-    {XK_KP_Delete, ShiftMask, "\033[2K", -1, 0},
-    {XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0},
-    {XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0},
-    {XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
-    {XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0},
-    {XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0},
-    {XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0},
-    {XK_KP_Enter, XK_ANY_MOD, "\r", -1, 0},
-    {XK_KP_Subtract, XK_ANY_MOD, "\033Om", +2, 0},
-    {XK_KP_Decimal, XK_ANY_MOD, "\033On", +2, 0},
-    {XK_KP_Divide, XK_ANY_MOD, "\033Oo", +2, 0},
-    {XK_KP_0, XK_ANY_MOD, "\033Op", +2, 0},
-    {XK_KP_1, XK_ANY_MOD, "\033Oq", +2, 0},
-    {XK_KP_2, XK_ANY_MOD, "\033Or", +2, 0},
-    {XK_KP_3, XK_ANY_MOD, "\033Os", +2, 0},
-    {XK_KP_4, XK_ANY_MOD, "\033Ot", +2, 0},
-    {XK_KP_5, XK_ANY_MOD, "\033Ou", +2, 0},
-    {XK_KP_6, XK_ANY_MOD, "\033Ov", +2, 0},
-    {XK_KP_7, XK_ANY_MOD, "\033Ow", +2, 0},
-    {XK_KP_8, XK_ANY_MOD, "\033Ox", +2, 0},
-    {XK_KP_9, XK_ANY_MOD, "\033Oy", +2, 0},
-    {XK_Up, ShiftMask, "\033[1;2A", 0, 0},
-    {XK_Up, Mod1Mask, "\033[1;3A", 0, 0},
-    {XK_Up, ShiftMask | Mod1Mask, "\033[1;4A", 0, 0},
-    {XK_Up, ControlMask, "\033[1;5A", 0, 0},
-    {XK_Up, ShiftMask | ControlMask, "\033[1;6A", 0, 0},
-    {XK_Up, ControlMask | Mod1Mask, "\033[1;7A", 0, 0},
-    {XK_Up, ShiftMask | ControlMask | Mod1Mask, "\033[1;8A", 0, 0},
-    {XK_Up, XK_ANY_MOD, "\033[A", 0, -1},
-    {XK_Up, XK_ANY_MOD, "\033OA", 0, +1},
-    {XK_Down, ShiftMask, "\033[1;2B", 0, 0},
-    {XK_Down, Mod1Mask, "\033[1;3B", 0, 0},
-    {XK_Down, ShiftMask | Mod1Mask, "\033[1;4B", 0, 0},
-    {XK_Down, ControlMask, "\033[1;5B", 0, 0},
-    {XK_Down, ShiftMask | ControlMask, "\033[1;6B", 0, 0},
-    {XK_Down, ControlMask | Mod1Mask, "\033[1;7B", 0, 0},
-    {XK_Down, ShiftMask | ControlMask | Mod1Mask, "\033[1;8B", 0, 0},
-    {XK_Down, XK_ANY_MOD, "\033[B", 0, -1},
-    {XK_Down, XK_ANY_MOD, "\033OB", 0, +1},
-    {XK_Left, ShiftMask, "\033[1;2D", 0, 0},
-    {XK_Left, Mod1Mask, "\033[1;3D", 0, 0},
-    {XK_Left, ShiftMask | Mod1Mask, "\033[1;4D", 0, 0},
-    {XK_Left, ControlMask, "\033[1;5D", 0, 0},
-    {XK_Left, ShiftMask | ControlMask, "\033[1;6D", 0, 0},
-    {XK_Left, ControlMask | Mod1Mask, "\033[1;7D", 0, 0},
-    {XK_Left, ShiftMask | ControlMask | Mod1Mask, "\033[1;8D", 0, 0},
-    {XK_Left, XK_ANY_MOD, "\033[D", 0, -1},
-    {XK_Left, XK_ANY_MOD, "\033OD", 0, +1},
-    {XK_Right, ShiftMask, "\033[1;2C", 0, 0},
-    {XK_Right, Mod1Mask, "\033[1;3C", 0, 0},
-    {XK_Right, ShiftMask | Mod1Mask, "\033[1;4C", 0, 0},
-    {XK_Right, ControlMask, "\033[1;5C", 0, 0},
-    {XK_Right, ShiftMask | ControlMask, "\033[1;6C", 0, 0},
-    {XK_Right, ControlMask | Mod1Mask, "\033[1;7C", 0, 0},
-    {XK_Right, ShiftMask | ControlMask | Mod1Mask, "\033[1;8C", 0, 0},
-    {XK_Right, XK_ANY_MOD, "\033[C", 0, -1},
-    {XK_Right, XK_ANY_MOD, "\033OC", 0, +1},
-    {XK_ISO_Left_Tab, ShiftMask, "\033[Z", 0, 0},
-    {XK_Return, Mod1Mask, "\033\r", 0, 0},
-    {XK_Return, XK_ANY_MOD, "\r", 0, 0},
-    {XK_Insert, ShiftMask, "\033[4l", -1, 0},
-    {XK_Insert, ShiftMask, "\033[2;2~", +1, 0},
-    {XK_Insert, ControlMask, "\033[L", -1, 0},
-    {XK_Insert, ControlMask, "\033[2;5~", +1, 0},
-    {XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0},
-    {XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0},
-    {XK_Delete, ControlMask, "\033[M", -1, 0},
-    {XK_Delete, ControlMask, "\033[3;5~", +1, 0},
-    {XK_Delete, ShiftMask, "\033[2K", -1, 0},
-    {XK_Delete, ShiftMask, "\033[3;2~", +1, 0},
-    {XK_Delete, XK_ANY_MOD, "\033[P", -1, 0},
-    {XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0},
-    {XK_BackSpace, XK_NO_MOD, "\177", 0, 0},
-    {XK_BackSpace, Mod1Mask, "\033\177", 0, 0},
-    {XK_Home, ShiftMask, "\033[2J", 0, -1},
-    {XK_Home, ShiftMask, "\033[1;2H", 0, +1},
-    {XK_Home, XK_ANY_MOD, "\033[H", 0, -1},
-    {XK_Home, XK_ANY_MOD, "\033[1~", 0, +1},
-    {XK_End, ControlMask, "\033[J", -1, 0},
-    {XK_End, ControlMask, "\033[1;5F", +1, 0},
-    {XK_End, ShiftMask, "\033[K", -1, 0},
-    {XK_End, ShiftMask, "\033[1;2F", +1, 0},
-    {XK_End, XK_ANY_MOD, "\033[4~", 0, 0},
-    {XK_Prior, ControlMask, "\033[5;5~", 0, 0},
-    {XK_Prior, ShiftMask, "\033[5;2~", 0, 0},
-    {XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0},
-    {XK_Next, ControlMask, "\033[6;5~", 0, 0},
-    {XK_Next, ShiftMask, "\033[6;2~", 0, 0},
-    {XK_Next, XK_ANY_MOD, "\033[6~", 0, 0},
-    {XK_F1, XK_NO_MOD, "\033OP", 0, 0},
-    {XK_F1, /* F13 */ ShiftMask, "\033[1;2P", 0, 0},
-    {XK_F1, /* F25 */ ControlMask, "\033[1;5P", 0, 0},
-    {XK_F1, /* F37 */ Mod4Mask, "\033[1;6P", 0, 0},
-    {XK_F1, /* F49 */ Mod1Mask, "\033[1;3P", 0, 0},
-    {XK_F1, /* F61 */ Mod3Mask, "\033[1;4P", 0, 0},
-    {XK_F2, XK_NO_MOD, "\033OQ", 0, 0},
-    {XK_F2, /* F14 */ ShiftMask, "\033[1;2Q", 0, 0},
-    {XK_F2, /* F26 */ ControlMask, "\033[1;5Q", 0, 0},
-    {XK_F2, /* F38 */ Mod4Mask, "\033[1;6Q", 0, 0},
-    {XK_F2, /* F50 */ Mod1Mask, "\033[1;3Q", 0, 0},
-    {XK_F2, /* F62 */ Mod3Mask, "\033[1;4Q", 0, 0},
-    {XK_F3, XK_NO_MOD, "\033OR", 0, 0},
-    {XK_F3, /* F15 */ ShiftMask, "\033[1;2R", 0, 0},
-    {XK_F3, /* F27 */ ControlMask, "\033[1;5R", 0, 0},
-    {XK_F3, /* F39 */ Mod4Mask, "\033[1;6R", 0, 0},
-    {XK_F3, /* F51 */ Mod1Mask, "\033[1;3R", 0, 0},
-    {XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0},
-    {XK_F4, XK_NO_MOD, "\033OS", 0, 0},
-    {XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0},
-    {XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0},
-    {XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0},
-    {XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0},
-    {XK_F5, XK_NO_MOD, "\033[15~", 0, 0},
-    {XK_F5, /* F17 */ ShiftMask, "\033[15;2~", 0, 0},
-    {XK_F5, /* F29 */ ControlMask, "\033[15;5~", 0, 0},
-    {XK_F5, /* F41 */ Mod4Mask, "\033[15;6~", 0, 0},
-    {XK_F5, /* F53 */ Mod1Mask, "\033[15;3~", 0, 0},
-    {XK_F6, XK_NO_MOD, "\033[17~", 0, 0},
-    {XK_F6, /* F18 */ ShiftMask, "\033[17;2~", 0, 0},
-    {XK_F6, /* F30 */ ControlMask, "\033[17;5~", 0, 0},
-    {XK_F6, /* F42 */ Mod4Mask, "\033[17;6~", 0, 0},
-    {XK_F6, /* F54 */ Mod1Mask, "\033[17;3~", 0, 0},
-    {XK_F7, XK_NO_MOD, "\033[18~", 0, 0},
-    {XK_F7, /* F19 */ ShiftMask, "\033[18;2~", 0, 0},
-    {XK_F7, /* F31 */ ControlMask, "\033[18;5~", 0, 0},
-    {XK_F7, /* F43 */ Mod4Mask, "\033[18;6~", 0, 0},
-    {XK_F7, /* F55 */ Mod1Mask, "\033[18;3~", 0, 0},
-    {XK_F8, XK_NO_MOD, "\033[19~", 0, 0},
-    {XK_F8, /* F20 */ ShiftMask, "\033[19;2~", 0, 0},
-    {XK_F8, /* F32 */ ControlMask, "\033[19;5~", 0, 0},
-    {XK_F8, /* F44 */ Mod4Mask, "\033[19;6~", 0, 0},
-    {XK_F8, /* F56 */ Mod1Mask, "\033[19;3~", 0, 0},
-    {XK_F9, XK_NO_MOD, "\033[20~", 0, 0},
-    {XK_F9, /* F21 */ ShiftMask, "\033[20;2~", 0, 0},
-    {XK_F9, /* F33 */ ControlMask, "\033[20;5~", 0, 0},
-    {XK_F9, /* F45 */ Mod4Mask, "\033[20;6~", 0, 0},
-    {XK_F9, /* F57 */ Mod1Mask, "\033[20;3~", 0, 0},
-    {XK_F10, XK_NO_MOD, "\033[21~", 0, 0},
-    {XK_F10, /* F22 */ ShiftMask, "\033[21;2~", 0, 0},
-    {XK_F10, /* F34 */ ControlMask, "\033[21;5~", 0, 0},
-    {XK_F10, /* F46 */ Mod4Mask, "\033[21;6~", 0, 0},
-    {XK_F10, /* F58 */ Mod1Mask, "\033[21;3~", 0, 0},
-    {XK_F11, XK_NO_MOD, "\033[23~", 0, 0},
-    {XK_F11, /* F23 */ ShiftMask, "\033[23;2~", 0, 0},
-    {XK_F11, /* F35 */ ControlMask, "\033[23;5~", 0, 0},
-    {XK_F11, /* F47 */ Mod4Mask, "\033[23;6~", 0, 0},
-    {XK_F11, /* F59 */ Mod1Mask, "\033[23;3~", 0, 0},
-    {XK_F12, XK_NO_MOD, "\033[24~", 0, 0},
-    {XK_F12, /* F24 */ ShiftMask, "\033[24;2~", 0, 0},
-    {XK_F12, /* F36 */ ControlMask, "\033[24;5~", 0, 0},
-    {XK_F12, /* F48 */ Mod4Mask, "\033[24;6~", 0, 0},
-    {XK_F12, /* F60 */ Mod1Mask, "\033[24;3~", 0, 0},
-    {XK_F13, XK_NO_MOD, "\033[1;2P", 0, 0},
-    {XK_F14, XK_NO_MOD, "\033[1;2Q", 0, 0},
-    {XK_F15, XK_NO_MOD, "\033[1;2R", 0, 0},
-    {XK_F16, XK_NO_MOD, "\033[1;2S", 0, 0},
-    {XK_F17, XK_NO_MOD, "\033[15;2~", 0, 0},
-    {XK_F18, XK_NO_MOD, "\033[17;2~", 0, 0},
-    {XK_F19, XK_NO_MOD, "\033[18;2~", 0, 0},
-    {XK_F20, XK_NO_MOD, "\033[19;2~", 0, 0},
-    {XK_F21, XK_NO_MOD, "\033[20;2~", 0, 0},
-    {XK_F22, XK_NO_MOD, "\033[21;2~", 0, 0},
-    {XK_F23, XK_NO_MOD, "\033[23;2~", 0, 0},
-    {XK_F24, XK_NO_MOD, "\033[24;2~", 0, 0},
-    {XK_F25, XK_NO_MOD, "\033[1;5P", 0, 0},
-    {XK_F26, XK_NO_MOD, "\033[1;5Q", 0, 0},
-    {XK_F27, XK_NO_MOD, "\033[1;5R", 0, 0},
-    {XK_F28, XK_NO_MOD, "\033[1;5S", 0, 0},
-    {XK_F29, XK_NO_MOD, "\033[15;5~", 0, 0},
-    {XK_F30, XK_NO_MOD, "\033[17;5~", 0, 0},
-    {XK_F31, XK_NO_MOD, "\033[18;5~", 0, 0},
-    {XK_F32, XK_NO_MOD, "\033[19;5~", 0, 0},
-    {XK_F33, XK_NO_MOD, "\033[20;5~", 0, 0},
-    {XK_F34, XK_NO_MOD, "\033[21;5~", 0, 0},
-    {XK_F35, XK_NO_MOD, "\033[23;5~", 0, 0},
+    /* keysym           mask                                string          appkey  appcursor */
+    { XK_KP_Home,       ShiftMask,                          "\033[2J",       0,     -1 },
+    { XK_KP_Home,       ShiftMask,                          "\033[1;2H",     0,     +1 },
+    { XK_KP_Home,       XK_ANY_MOD,                         "\033[H",        0,     -1 },
+    { XK_KP_Home,       XK_ANY_MOD,                         "\033[1~",       0,     +1 },
+    { XK_KP_Up,         XK_ANY_MOD,                         "\033Ox",       +1,      0 },
+    { XK_KP_Up,         XK_ANY_MOD,                         "\033[A",        0,     -1 },
+    { XK_KP_Up,         XK_ANY_MOD,                         "\033OA",        0,     +1 },
+    { XK_KP_Down,       XK_ANY_MOD,                         "\033Or",       +1,      0 },
+    { XK_KP_Down,       XK_ANY_MOD,                         "\033[B",        0,     -1 },
+    { XK_KP_Down,       XK_ANY_MOD,                         "\033OB",        0,     +1 },
+    { XK_KP_Left,       XK_ANY_MOD,                         "\033Ot",       +1,      0 },
+    { XK_KP_Left,       XK_ANY_MOD,                         "\033[D",        0,     -1 },
+    { XK_KP_Left,       XK_ANY_MOD,                         "\033OD",        0,     +1 },
+    { XK_KP_Right,      XK_ANY_MOD,                         "\033Ov",       +1,      0 },
+    { XK_KP_Right,      XK_ANY_MOD,                         "\033[C",        0,     -1 },
+    { XK_KP_Right,      XK_ANY_MOD,                         "\033OC",        0,     +1 },
+    { XK_KP_Prior,      ShiftMask,                          "\033[5;2~",     0,      0 },
+    { XK_KP_Prior,      XK_ANY_MOD,                         "\033[5~",       0,      0 },
+    { XK_KP_Begin,      XK_ANY_MOD,                         "\033[E",        0,      0 },
+    { XK_KP_End,        ControlMask,                        "\033[J",       -1,      0 },
+    { XK_KP_End,        ControlMask,                        "\033[1;5F",    +1,      0 },
+    { XK_KP_End,        ShiftMask,                          "\033[K",       -1,      0 },
+    { XK_KP_End,        ShiftMask,                          "\033[1;2F",    +1,      0 },
+    { XK_KP_End,        XK_ANY_MOD,                         "\033[4~",       0,      0 },
+    { XK_KP_Next,       ShiftMask,                          "\033[6;2~",     0,      0 },
+    { XK_KP_Next,       XK_ANY_MOD,                         "\033[6~",       0,      0 },
+    { XK_KP_Insert,     ShiftMask,                          "\033[2;2~",    +1,      0 },
+    { XK_KP_Insert,     ShiftMask,                          "\033[4l",      -1,      0 },
+    { XK_KP_Insert,     ControlMask,                        "\033[L",       -1,      0 },
+    { XK_KP_Insert,     ControlMask,                        "\033[2;5~",    +1,      0 },
+    { XK_KP_Insert,     XK_ANY_MOD,                         "\033[4h",      -1,      0 },
+    { XK_KP_Insert,     XK_ANY_MOD,                         "\033[2~",      +1,      0 },
+    { XK_KP_Delete,     ControlMask,                        "\033[M",       -1,      0 },
+    { XK_KP_Delete,     ControlMask,                        "\033[3;5~",    +1,      0 },
+    { XK_KP_Delete,     ShiftMask,                          "\033[2K",      -1,      0 },
+    { XK_KP_Delete,     ShiftMask,                          "\033[3;2~",    +1,      0 },
+    { XK_KP_Delete,     XK_ANY_MOD,                         "\033[P",       -1,      0 },
+    { XK_KP_Delete,     XK_ANY_MOD,                         "\033[3~",      +1,      0 },
+    { XK_KP_Multiply,   XK_ANY_MOD,                         "\033Oj",       +2,      0 },
+    { XK_KP_Add,        XK_ANY_MOD,                         "\033Ok",       +2,      0 },
+    { XK_KP_Enter,      XK_ANY_MOD,                         "\033OM",       +2,      0 },
+    { XK_KP_Enter,      XK_ANY_MOD,                         "\r",           -1,      0 },
+    { XK_KP_Subtract,   XK_ANY_MOD,                         "\033Om",       +2,      0 },
+    { XK_KP_Decimal,    XK_ANY_MOD,                         "\033On",       +2,      0 },
+    { XK_KP_Divide,     XK_ANY_MOD,                         "\033Oo",       +2,      0 },
+    { XK_KP_0,          XK_ANY_MOD,                         "\033Op",       +2,      0 },
+    { XK_KP_1,          XK_ANY_MOD,                         "\033Oq",       +2,      0 },
+    { XK_KP_2,          XK_ANY_MOD,                         "\033Or",       +2,      0 },
+    { XK_KP_3,          XK_ANY_MOD,                         "\033Os",       +2,      0 },
+    { XK_KP_4,          XK_ANY_MOD,                         "\033Ot",       +2,      0 },
+    { XK_KP_5,          XK_ANY_MOD,                         "\033Ou",       +2,      0 },
+    { XK_KP_6,          XK_ANY_MOD,                         "\033Ov",       +2,      0 },
+    { XK_KP_7,          XK_ANY_MOD,                         "\033Ow",       +2,      0 },
+    { XK_KP_8,          XK_ANY_MOD,                         "\033Ox",       +2,      0 },
+    { XK_KP_9,          XK_ANY_MOD,                         "\033Oy",       +2,      0 },
+    { XK_Up,            ShiftMask,                          "\033[1;2A",     0,      0 },
+    { XK_Up,            MODKEY,                             "\033[1;3A",     0,      0 },
+    { XK_Up,            ShiftMask | MODKEY,                 "\033[1;4A",     0,      0 },
+    { XK_Up,            ControlMask,                        "\033[1;5A",     0,      0 },
+    { XK_Up,            ShiftMask | ControlMask,            "\033[1;6A",     0,      0 },
+    { XK_Up,            ControlMask | MODKEY,               "\033[1;7A",     0,      0 },
+    { XK_Up,            ShiftMask | ControlMask | MODKEY,   "\033[1;8A",     0,      0 },
+    { XK_Up,            XK_ANY_MOD,                         "\033[A",        0,     -1 },
+    { XK_Up,            XK_ANY_MOD,                         "\033OA",        0,     +1 },
+    { XK_Down,          ShiftMask,                          "\033[1;2B",     0,      0 },
+    { XK_Down,          MODKEY,                             "\033[1;3B",     0,      0 },
+    { XK_Down,          ShiftMask | MODKEY,                 "\033[1;4B",     0,      0 },
+    { XK_Down,          ControlMask,                        "\033[1;5B",     0,      0 },
+    { XK_Down,          ShiftMask | ControlMask,            "\033[1;6B",     0,      0 },
+    { XK_Down,          ControlMask | MODKEY,               "\033[1;7B",     0,      0 },
+    { XK_Down,          ShiftMask | ControlMask | MODKEY,   "\033[1;8B",     0,      0 },
+    { XK_Down,          XK_ANY_MOD,                         "\033[B",        0,     -1 },
+    { XK_Down,          XK_ANY_MOD,                         "\033OB",        0,     +1 },
+    { XK_Left,          ShiftMask,                          "\033[1;2D",     0,      0 },
+    { XK_Left,          MODKEY,                             "\033[1;3D",     0,      0 },
+    { XK_Left,          ShiftMask | MODKEY,                 "\033[1;4D",     0,      0 },
+    { XK_Left,          ControlMask,                        "\033[1;5D",     0,      0 },
+    { XK_Left,          ShiftMask | ControlMask,            "\033[1;6D",     0,      0 },
+    { XK_Left,          ControlMask | MODKEY,               "\033[1;7D",     0,      0 },
+    { XK_Left,          ShiftMask | ControlMask | MODKEY,   "\033[1;8D",     0,      0 },
+    { XK_Left,          XK_ANY_MOD,                         "\033[D",        0,     -1 },
+    { XK_Left,          XK_ANY_MOD,                         "\033OD",        0,     +1 },
+    { XK_Right,         ShiftMask,                          "\033[1;2C",     0,      0 },
+    { XK_Right,         MODKEY,                             "\033[1;3C",     0,      0 },
+    { XK_Right,         ShiftMask | MODKEY,                 "\033[1;4C",     0,      0 },
+    { XK_Right,         ControlMask,                        "\033[1;5C",     0,      0 },
+    { XK_Right,         ShiftMask | ControlMask,            "\033[1;6C",     0,      0 },
+    { XK_Right,         ControlMask | MODKEY,               "\033[1;7C",     0,      0 },
+    { XK_Right,         ShiftMask | ControlMask | MODKEY,   "\033[1;8C",     0,      0 },
+    { XK_Right,         XK_ANY_MOD,                         "\033[C",        0,     -1 },
+    { XK_Right,         XK_ANY_MOD,                         "\033OC",        0,     +1 },
+    { XK_ISO_Left_Tab,  ShiftMask,                          "\033[Z",        0,      0 },
+    { XK_Return,        MODKEY,                             "\033\r",        0,      0 },
+    { XK_Return,        XK_ANY_MOD,                         "\r",            0,      0 },
+    { XK_Insert,        ShiftMask,                          "\033[4l",      -1,      0 },
+    { XK_Insert,        ShiftMask,                          "\033[2;2~",    +1,      0 },
+    { XK_Insert,        ControlMask,                        "\033[L",       -1,      0 },
+    { XK_Insert,        ControlMask,                        "\033[2;5~",    +1,      0 },
+    { XK_Insert,        XK_ANY_MOD,                         "\033[4h",      -1,      0 },
+    { XK_Insert,        XK_ANY_MOD,                         "\033[2~",      +1,      0 },
+    { XK_Delete,        ControlMask,                        "\033[M",       -1,      0 },
+    { XK_Delete,        ControlMask,                        "\033[3;5~",    +1,      0 },
+    { XK_Delete,        ShiftMask,                          "\033[2K",      -1,      0 },
+    { XK_Delete,        ShiftMask,                          "\033[3;2~",    +1,      0 },
+    { XK_Delete,        XK_ANY_MOD,                         "\033[P",       -1,      0 },
+    { XK_Delete,        XK_ANY_MOD,                         "\033[3~",      +1,      0 },
+    { XK_BackSpace,     XK_NO_MOD,                          "\177",          0,      0 },
+    { XK_BackSpace,     MODKEY,                             "\033\177",      0,      0 },
+    { XK_Home,          ShiftMask,                          "\033[2J",       0,     -1 },
+    { XK_Home,          ShiftMask,                          "\033[1;2H",     0,     +1 },
+    { XK_Home,          XK_ANY_MOD,                         "\033[H",        0,     -1 },
+    { XK_Home,          XK_ANY_MOD,                         "\033[1~",       0,     +1 },
+    { XK_End,           ControlMask,                        "\033[J",       -1,      0 },
+    { XK_End,           ControlMask,                        "\033[1;5F",    +1,      0 },
+    { XK_End,           ShiftMask,                          "\033[K",       -1,      0 },
+    { XK_End,           ShiftMask,                          "\033[1;2F",    +1,      0 },
+    { XK_End,           XK_ANY_MOD,                         "\033[4~",       0,      0 },
+    { XK_Prior,         ControlMask,                        "\033[5;5~",     0,      0 },
+    { XK_Prior,         ShiftMask,                          "\033[5;2~",     0,      0 },
+    { XK_Prior,         XK_ANY_MOD,                         "\033[5~",       0,      0 },
+    { XK_Next,          ControlMask,                        "\033[6;5~",     0,      0 },
+    { XK_Next,          ShiftMask,                          "\033[6;2~",     0,      0 },
+    { XK_Next,          XK_ANY_MOD,                         "\033[6~",       0,      0 },
+    { XK_F1,            XK_NO_MOD,                          "\033OP",        0,      0 },
+    { XK_F1, /* F13 */  ShiftMask,                          "\033[1;2P",     0,      0 },
+    { XK_F1, /* F25 */  ControlMask,                        "\033[1;5P",     0,      0 },
+    { XK_F1, /* F37 */  MODKEY2,                            "\033[1;6P",     0,      0 },
+    { XK_F1, /* F49 */  MODKEY,                             "\033[1;3P",     0,      0 },
+    { XK_F1, /* F61 */  Mod3Mask,                           "\033[1;4P",     0,      0 },
+    { XK_F2,            XK_NO_MOD,                          "\033OQ",        0,      0 },
+    { XK_F2, /* F14 */  ShiftMask,                          "\033[1;2Q",     0,      0 },
+    { XK_F2, /* F26 */  ControlMask,                        "\033[1;5Q",     0,      0 },
+    { XK_F2, /* F38 */  MODKEY2,                            "\033[1;6Q",     0,      0 },
+    { XK_F2, /* F50 */  MODKEY,                             "\033[1;3Q",     0,      0 },
+    { XK_F2, /* F62 */  Mod3Mask,                           "\033[1;4Q",     0,      0 },
+    { XK_F3,            XK_NO_MOD,                          "\033OR",        0,      0 },
+    { XK_F3, /* F15 */  ShiftMask,                          "\033[1;2R",     0,      0 },
+    { XK_F3, /* F27 */  ControlMask,                        "\033[1;5R",     0,      0 },
+    { XK_F3, /* F39 */  MODKEY2,                            "\033[1;6R",     0,      0 },
+    { XK_F3, /* F51 */  MODKEY,                             "\033[1;3R",     0,      0 },
+    { XK_F3, /* F63 */  Mod3Mask,                           "\033[1;4R",     0,      0 },
+    { XK_F4,            XK_NO_MOD,                          "\033OS",        0,      0 },
+    { XK_F4, /* F16 */  ShiftMask,                          "\033[1;2S",     0,      0 },
+    { XK_F4, /* F28 */  ControlMask,                        "\033[1;5S",     0,      0 },
+    { XK_F4, /* F40 */  MODKEY2,                            "\033[1;6S",     0,      0 },
+    { XK_F4, /* F52 */  MODKEY,                             "\033[1;3S",     0,      0 },
+    { XK_F5,            XK_NO_MOD,                          "\033[15~",      0,      0 },
+    { XK_F5, /* F17 */  ShiftMask,                          "\033[15;2~",    0,      0 },
+    { XK_F5, /* F29 */  ControlMask,                        "\033[15;5~",    0,      0 },
+    { XK_F5, /* F41 */  MODKEY2,                            "\033[15;6~",    0,      0 },
+    { XK_F5, /* F53 */  MODKEY,                             "\033[15;3~",    0,      0 },
+    { XK_F6,            XK_NO_MOD,                          "\033[17~",      0,      0 },
+    { XK_F6, /* F18 */  ShiftMask,                          "\033[17;2~",    0,      0 },
+    { XK_F6, /* F30 */  ControlMask,                        "\033[17;5~",    0,      0 },
+    { XK_F6, /* F42 */  MODKEY2,                            "\033[17;6~",    0,      0 },
+    { XK_F6, /* F54 */  MODKEY,                             "\033[17;3~",    0,      0 },
+    { XK_F7,            XK_NO_MOD,                          "\033[18~",      0,      0 },
+    { XK_F7, /* F19 */  ShiftMask,                          "\033[18;2~",    0,      0 },
+    { XK_F7, /* F31 */  ControlMask,                        "\033[18;5~",    0,      0 },
+    { XK_F7, /* F43 */  MODKEY2,                            "\033[18;6~",    0,      0 },
+    { XK_F7, /* F55 */  MODKEY,                             "\033[18;3~",    0,      0 },
+    { XK_F8,            XK_NO_MOD,                          "\033[19~",      0,      0 },
+    { XK_F8, /* F20 */  ShiftMask,                          "\033[19;2~",    0,      0 },
+    { XK_F8, /* F32 */  ControlMask,                        "\033[19;5~",    0,      0 },
+    { XK_F8, /* F44 */  MODKEY2,                            "\033[19;6~",    0,      0 },
+    { XK_F8, /* F56 */  MODKEY,                             "\033[19;3~",    0,      0 },
+    { XK_F9,            XK_NO_MOD,                          "\033[20~",      0,      0 },
+    { XK_F9, /* F21 */  ShiftMask,                          "\033[20;2~",    0,      0 },
+    { XK_F9, /* F33 */  ControlMask,                        "\033[20;5~",    0,      0 },
+    { XK_F9, /* F45 */  MODKEY2,                            "\033[20;6~",    0,      0 },
+    { XK_F9, /* F57 */  MODKEY,                             "\033[20;3~",    0,      0 },
+    { XK_F10,           XK_NO_MOD,                          "\033[21~",      0,      0 },
+    { XK_F10, /* F22 */ ShiftMask,                          "\033[21;2~",    0,      0 },
+    { XK_F10, /* F34 */ ControlMask,                        "\033[21;5~",    0,      0 },
+    { XK_F10, /* F46 */ MODKEY2,                            "\033[21;6~",    0,      0 },
+    { XK_F10, /* F58 */ MODKEY,                             "\033[21;3~",    0,      0 },
+    { XK_F11,           XK_NO_MOD,                          "\033[23~",      0,      0 },
+    { XK_F11, /* F23 */ ShiftMask,                          "\033[23;2~",    0,      0 },
+    { XK_F11, /* F35 */ ControlMask,                        "\033[23;5~",    0,      0 },
+    { XK_F11, /* F47 */ MODKEY2,                            "\033[23;6~",    0,      0 },
+    { XK_F11, /* F59 */ MODKEY,                             "\033[23;3~",    0,      0 },
+    { XK_F12,           XK_NO_MOD,                          "\033[24~",      0,      0 },
+    { XK_F12, /* F24 */ ShiftMask,                          "\033[24;2~",    0,      0 },
+    { XK_F12, /* F36 */ ControlMask,                        "\033[24;5~",    0,      0 },
+    { XK_F12, /* F48 */ MODKEY2,                            "\033[24;6~",    0,      0 },
+    { XK_F12, /* F60 */ MODKEY,                             "\033[24;3~",    0,      0 },
+    { XK_F13,           XK_NO_MOD,                          "\033[1;2P",     0,      0 },
+    { XK_F14,           XK_NO_MOD,                          "\033[1;2Q",     0,      0 },
+    { XK_F15,           XK_NO_MOD,                          "\033[1;2R",     0,      0 },
+    { XK_F16,           XK_NO_MOD,                          "\033[1;2S",     0,      0 },
+    { XK_F17,           XK_NO_MOD,                          "\033[15;2~",    0,      0 },
+    { XK_F18,           XK_NO_MOD,                          "\033[17;2~",    0,      0 },
+    { XK_F19,           XK_NO_MOD,                          "\033[18;2~",    0,      0 },
+    { XK_F20,           XK_NO_MOD,                          "\033[19;2~",    0,      0 },
+    { XK_F21,           XK_NO_MOD,                          "\033[20;2~",    0,      0 },
+    { XK_F22,           XK_NO_MOD,                          "\033[21;2~",    0,      0 },
+    { XK_F23,           XK_NO_MOD,                          "\033[23;2~",    0,      0 },
+    { XK_F24,           XK_NO_MOD,                          "\033[24;2~",    0,      0 },
+    { XK_F25,           XK_NO_MOD,                          "\033[1;5P",     0,      0 },
+    { XK_F26,           XK_NO_MOD,                          "\033[1;5Q",     0,      0 },
+    { XK_F27,           XK_NO_MOD,                          "\033[1;5R",     0,      0 },
+    { XK_F28,           XK_NO_MOD,                          "\033[1;5S",     0,      0 },
+    { XK_F29,           XK_NO_MOD,                          "\033[15;5~",    0,      0 },
+    { XK_F30,           XK_NO_MOD,                          "\033[17;5~",    0,      0 },
+    { XK_F31,           XK_NO_MOD,                          "\033[18;5~",    0,      0 },
+    { XK_F32,           XK_NO_MOD,                          "\033[19;5~",    0,      0 },
+    { XK_F33,           XK_NO_MOD,                          "\033[20;5~",    0,      0 },
+    { XK_F34,           XK_NO_MOD,                          "\033[21;5~",    0,      0 },
+    { XK_F35,           XK_NO_MOD,                          "\033[23;5~",    0,      0 },
 };
 
 /*
@@ -533,7 +555,7 @@ static Key key[] = {
  * If no match is found, regular selection is used.
  */
 static uint selmasks[] = {
-    [SEL_RECTANGULAR] = Mod1Mask,
+    [SEL_RECTANGULAR] = MODKEY,
 };
 
 /*
diff --git a/st/config.h.bak b/st/config.h.bak
new file mode 100644
index 0000000..0eb1dbd
--- /dev/null
+++ b/st/config.h.bak
@@ -0,0 +1,567 @@
+/* See LICENSE file for copyright and license details. */
+
+/*
+ * appearance
+ *
+ * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
+ */
+static char *font = "mono:pixelsize=16:antialias=true:autohint=true";
+static char *font2[] = { "NotoColorEmoji:pixelsize=10:antialias=true:autohint=true" };
+static int borderpx = 2;
+
+/*
+ * What program is execed by st depends of these precedence rules:
+ * 1: program passed with -e
+ * 2: scroll and/or utmp
+ * 3: SHELL environment variable
+ * 4: value of shell in /etc/passwd
+ * 5: value of shell in config.h
+ */
+static char *shell = "/bin/sh";
+char *utmp = NULL;
+/* scroll program: to enable use a string like "scroll" */
+char *scroll = NULL;
+char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
+
+/* identification sequence returned in DA and DECID */
+char *vtiden = "\033[?6c";
+
+/* Kerning / character bounding-box multipliers */
+static float cwscale = 1.0;
+static float chscale = 1.0;
+
+/*
+ * word delimiter string
+ *
+ * More advanced example: L" `'\"()[]{}"
+ */
+wchar_t *worddelimiters = L" ";
+
+/* selection timeouts (in milliseconds) */
+static unsigned int doubleclicktimeout = 300;
+static unsigned int tripleclicktimeout = 600;
+
+/* alt screens */
+int allowaltscreen = 1;
+
+/* allow certain non-interactive (insecure) window operations such as:
+   setting the clipboard text */
+int allowwindowops = 0;
+
+/*
+ * draw latency range in ms - from new content/keypress/etc until drawing.
+ * within this range, st draws when content stops arriving (idle). mostly it's
+ * near minlatency, but it waits longer for slow updates to avoid partial draw.
+ * low minlatency will tear/flicker more, as it can "detect" idle too early.
+ */
+static double minlatency = 8;
+static double maxlatency = 33;
+
+/*
+ * blinking timeout (set to 0 to disable blinking) for the terminal blinking
+ * attribute.
+ */
+static unsigned int blinktimeout = 800;
+
+/*
+ * thickness of underline and bar cursors
+ */
+static unsigned int cursorthickness = 2;
+
+/*
+ * 1: render most of the lines/blocks characters without using the font for
+ *    perfect alignment between cells (U2500 - U259F except dashes/diagonals).
+ *    Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
+ * 0: disable (render all U25XX glyphs normally from the font).
+ */
+const int boxdraw = 1;
+const int boxdraw_bold = 0;
+
+/* braille (U28XX):  1: render as adjacent "pixels",  0: use font */
+const int boxdraw_braille = 0;
+
+/*
+ * bell volume. It must be a value between -100 and 100. Use 0 for disabling
+ * it
+ */
+static int bellvolume = 0;
+
+/* default TERM value */
+char *termname = "st-256color";
+
+/*
+ * spaces per tab
+ *
+ * When you are changing this value, don't forget to adapt the »it« value in
+ * the st.info and appropriately install the st.info in the environment where
+ * you use this st version.
+ *
+ *	it#$tabspaces,
+ *
+ * Secondly make sure your kernel is not expanding tabs. When running `stty
+ * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
+ *  running following command:
+ *
+ *	stty tabs
+ */
+unsigned int tabspaces = 8;
+
+/* bg opacity */
+float alpha = 0.8;
+float alphaOffset = 0.02;
+float alphaUnfocus;
+
+/* Terminal colors (16 first used in escape sequence) */
+static const char *colorname[] = {
+    "#282828", /* hard contrast: #1d2021 / soft contrast: #32302f */
+    "#cc241d",
+    "#839E45",
+    "#d79921",
+    "#458588",
+    "#b16286",
+    "#689d6a",
+    "#a89984",
+    "#928374",
+    "#fb4934",
+    "#b8bb26",
+    "#fabd2f",
+    "#83a598",
+    "#d3869b",
+    "#8ec07c",
+    "#ebdbb2",
+    [255] = 0,
+    /* more colors can be added after 255 to use with DefaultXX */
+    "#add8e6", /* 256 -> cursor */
+    "#555555", /* 257 -> rev cursor*/
+    "#282828", /* 258 -> bg */
+    "#ebdbb2", /* 259 -> fg */
+};
+
+/*
+ * Default colors (colorname index)
+ * foreground, background, cursor, reverse cursor
+ */
+unsigned int defaultfg = 259;
+unsigned int defaultbg = 258;
+unsigned int defaultcs = 256;
+unsigned int defaultrcs = 257;
+unsigned int background = 258;
+
+/*
+ * Default shape of cursor
+ * 2: Block ("█")
+ * 4: Underline ("_")
+ * 6: Bar ("|")
+ * 7: Snowman ("☃")
+ */
+static unsigned int cursorshape = 2;
+
+/*
+ * Default columns and rows numbers
+ */
+
+static unsigned int cols = 80;
+static unsigned int rows = 24;
+
+/*
+ * Default colour and shape of the mouse cursor
+ */
+static unsigned int mouseshape = XC_xterm;
+static unsigned int mousefg = 7;
+static unsigned int mousebg = 0;
+
+/*
+ * Color used to display font attributes when fontconfig selected a font which
+ * doesn't match the ones requested.
+ */
+static unsigned int defaultattr = 11;
+
+/*
+ * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
+ * Note that if you want to use ShiftMask with selmasks, set this to an other
+ * modifier, set to 0 to not use it.
+ */
+static uint forcemousemod = ShiftMask;
+
+/*
+ * Xresources preferences to load at startup
+ */
+ResourcePref resources[] = {
+    { "font",           STRING,         &font },
+    { "fontalt0",       STRING,         &font2[0] },
+    { "color0",         STRING,         &colorname[0] },
+    { "color1",         STRING,         &colorname[1] },
+    { "color2",         STRING,         &colorname[2] },
+    { "color3",         STRING,         &colorname[3] },
+    { "color4",         STRING,         &colorname[4] },
+    { "color5",         STRING,         &colorname[5] },
+    { "color6",         STRING,         &colorname[6] },
+    { "color7",         STRING,         &colorname[7] },
+    { "color8",         STRING,         &colorname[8] },
+    { "color9",         STRING,         &colorname[9] },
+    { "color10",        STRING,         &colorname[10] },
+    { "color11",        STRING,         &colorname[11] },
+    { "color12",        STRING,         &colorname[12] },
+    { "color13",        STRING,         &colorname[13] },
+    { "color14",        STRING,         &colorname[14] },
+    { "color15",        STRING,         &colorname[15] },
+    { "background",     STRING,         &colorname[258] },
+    { "foreground",     STRING,         &colorname[259] },
+    { "cursorColor",    STRING,         &colorname[256] },
+    { "termname",       STRING,         &termname },
+    { "shell",          STRING,         &shell },
+    { "minlatency",     INTEGER,        &minlatency },
+    { "maxlatency",     INTEGER,        &maxlatency },
+    { "blinktimeout",   INTEGER,        &blinktimeout },
+    { "bellvolume",     INTEGER,        &bellvolume },
+    { "tabspaces",      INTEGER,        &tabspaces },
+    { "borderpx",       INTEGER,        &borderpx },
+    { "cwscale",        FLOAT,          &cwscale },
+    { "chscale",        FLOAT,          &chscale },
+    { "alpha",          FLOAT,          &alpha },
+    { "alphaOffset",    FLOAT,          &alphaOffset },
+};
+
+/*
+ * Internal mouse shortcuts.
+ * Beware that overloading Button1 will disable the selection.
+ */
+static MouseShortcut mshortcuts[] = {
+    /* mask                 button   function        argument               release */
+    { XK_NO_MOD,            Button4, kscrollup,     { .i = 1 }              },
+    { XK_NO_MOD,            Button5, kscrolldown,   { .i = 1 }              },
+    { XK_ANY_MOD,           Button2, selpaste,      { .i = 0 },             1 },
+    { ShiftMask,            Button4, ttysend,       { .s = "\033[5;2~" }    },
+    { XK_ANY_MOD,           Button4, ttysend,       { .s = "\031" }         },
+    { ShiftMask,            Button5, ttysend,       { .s = "\033[6;2~" }    },
+    { XK_ANY_MOD,           Button5, ttysend,       { .s = "\005" }         },
+};
+
+/* Internal keyboard shortcuts. */
+#define MODKEY Mod1Mask
+#define MODKEY2 Mod4Mask
+#define TERMMOD (MODKEY | ShiftMask)
+
+static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -o", "externalpipe", NULL };
+static char *copyurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -c", "externalpipe", NULL };
+static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NULL };
+
+static Shortcut shortcuts[] = {
+    /* mask                 keysym          function        argument */
+    /* APPEAREANCE */
+    { MODKEY,               XK_a,           changealpha,    { .f = +0.05 } },
+    { MODKEY,               XK_s,           changealpha,    { .f = -0.05 } },
+    { TERMMOD,              XK_Down,        zoom,           { .f = -1 } },
+    { TERMMOD,              XK_Up,          zoom,           { .f = +1 } },
+    { TERMMOD,              XK_Next,        zoom,           { .f = -1 } },
+    { TERMMOD,              XK_Prior,       zoom,           { .f = +1 } },
+    { TERMMOD,              XK_J,           zoom,           { .f = -1 } },
+    { TERMMOD,              XK_K,           zoom,           { .f = +1 } },
+    { TERMMOD,              XK_D,           zoom,           { .f = -2 } },
+    { TERMMOD,              XK_U,           zoom,           { .f = +2 } },
+    { TERMMOD,              XK_parenright,  zoomreset,      { .f = 0 } },
+
+    /* COPY */
+    { MODKEY,               XK_y,           clipcopy,       { .i = 0 } },
+    { TERMMOD,              XK_Y,           clipcopy,       { .i = 0 } },
+    { MODKEY,               XK_c,           externalpipe,   { .v = copyurlcmd } },
+    { MODKEY,               XK_o,           externalpipe,   { .v = copyoutput } },
+
+    /* PASTE */
+    { MODKEY,               XK_p,           clippaste,      { .i = 0 } },
+    { TERMMOD,              XK_P,           clippaste,      { .i = 0 } },
+    { ShiftMask,            XK_Insert,      clippaste,      { .i = 0 } },
+    { ShiftMask,            XK_Insert,      selpaste,       { .i = 0 } },
+    { MODKEY,               XK_v,           externalpipe,   { .v = openurlcmd } },
+
+    /* PRINTER */
+    { ShiftMask,            XK_Print,       printscreen,    { .i = 0 } },
+    { XK_ANY_MOD,           XK_Print,       printsel,       { .i = 0 } },
+    { ControlMask,          XK_Print,       toggleprinter,  { .i = 0 } },
+
+    /* TRAVERSAL */
+    { MODKEY,               XK_k,           kscrollup,      { .i = 1 } },
+    { MODKEY,               XK_j,           kscrolldown,    { .i = 1 } },
+    { MODKEY,               XK_u,           kscrollup,      { .i = -1 } },
+    { MODKEY,               XK_d,           kscrolldown,    { .i = -1 } },
+    { MODKEY,               XK_Up,          kscrollup,      { .i = 1 } },
+    { MODKEY,               XK_Down,        kscrolldown,    { .i = 1 } },
+    { MODKEY,               XK_Page_Up,     kscrollup,      { .i = -1 } },
+    { MODKEY,               XK_Page_Down,   kscrolldown,    { .i = -1 } },
+    { ShiftMask,            XK_Page_Up,     kscrollup,      { .i = -1 } },
+    { ShiftMask,            XK_Page_Down,   kscrolldown,    { .i = -1 } },
+
+    /* EXTRA */
+    { TERMMOD,              XK_Num_Lock,    numlock,        { .i = 0 } },
+    { XK_ANY_MOD,           XK_Break,       sendbreak,      { .i = 0 } },
+
+};
+
+/*
+ * Special keys (change & recompile st.info accordingly)
+ *
+ * Mask value:
+ * * Use XK_ANY_MOD to match the key no matter modifiers state
+ * * Use XK_NO_MOD to match the key alone (no modifiers)
+ * appkey value:
+ * * 0: no value
+ * * > 0: keypad application mode enabled
+ * *   = 2: term.numlock = 1
+ * * < 0: keypad application mode disabled
+ * appcursor value:
+ * * 0: no value
+ * * > 0: cursor application mode enabled
+ * * < 0: cursor application mode disabled
+ *
+ * Be careful with the order of the definitions because st searches in
+ * this table sequentially, so any XK_ANY_MOD must be in the last
+ * position for a key.
+ */
+
+/*
+ * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
+ * to be mapped below, add them to this array.
+ */
+static KeySym mappedkeys[] = { -1 };
+
+/*
+ * State bits to ignore when matching key or button events.  By default,
+ * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
+ */
+static uint ignoremod = Mod2Mask | XK_SWITCH_MOD;
+
+/*
+ * This is the huge key array which defines all compatibility to the Linux
+ * world. Please decide about changes wisely.
+ */
+static Key key[] = {
+    /* keysym           mask                                string          appkey  appcursor */
+    { XK_KP_Home,       ShiftMask,                          "\033[2J",       0,     -1 },
+    { XK_KP_Home,       ShiftMask,                          "\033[1;2H",     0,     +1 },
+    { XK_KP_Home,       XK_ANY_MOD,                         "\033[H",        0,     -1 },
+    { XK_KP_Home,       XK_ANY_MOD,                         "\033[1~",       0,     +1 },
+    { XK_KP_Up,         XK_ANY_MOD,                         "\033Ox",       +1,      0 },
+    { XK_KP_Up,         XK_ANY_MOD,                         "\033[A",        0,     -1 },
+    { XK_KP_Up,         XK_ANY_MOD,                         "\033OA",        0,     +1 },
+    { XK_KP_Down,       XK_ANY_MOD,                         "\033Or",       +1,      0 },
+    { XK_KP_Down,       XK_ANY_MOD,                         "\033[B",        0,     -1 },
+    { XK_KP_Down,       XK_ANY_MOD,                         "\033OB",        0,     +1 },
+    { XK_KP_Left,       XK_ANY_MOD,                         "\033Ot",       +1,      0 },
+    { XK_KP_Left,       XK_ANY_MOD,                         "\033[D",        0,     -1 },
+    { XK_KP_Left,       XK_ANY_MOD,                         "\033OD",        0,     +1 },
+    { XK_KP_Right,      XK_ANY_MOD,                         "\033Ov",       +1,      0 },
+    { XK_KP_Right,      XK_ANY_MOD,                         "\033[C",        0,     -1 },
+    { XK_KP_Right,      XK_ANY_MOD,                         "\033OC",        0,     +1 },
+    { XK_KP_Prior,      ShiftMask,                          "\033[5;2~",     0,      0 },
+    { XK_KP_Prior,      XK_ANY_MOD,                         "\033[5~",       0,      0 },
+    { XK_KP_Begin,      XK_ANY_MOD,                         "\033[E",        0,      0 },
+    { XK_KP_End,        ControlMask,                        "\033[J",       -1,      0 },
+    { XK_KP_End,        ControlMask,                        "\033[1;5F",    +1,      0 },
+    { XK_KP_End,        ShiftMask,                          "\033[K",       -1,      0 },
+    { XK_KP_End,        ShiftMask,                          "\033[1;2F",    +1,      0 },
+    { XK_KP_End,        XK_ANY_MOD,                         "\033[4~",       0,      0 },
+    { XK_KP_Next,       ShiftMask,                          "\033[6;2~",     0,      0 },
+    { XK_KP_Next,       XK_ANY_MOD,                         "\033[6~",       0,      0 },
+    { XK_KP_Insert,     ShiftMask,                          "\033[2;2~",    +1,      0 },
+    { XK_KP_Insert,     ShiftMask,                          "\033[4l",      -1,      0 },
+    { XK_KP_Insert,     ControlMask,                        "\033[L",       -1,      0 },
+    { XK_KP_Insert,     ControlMask,                        "\033[2;5~",    +1,      0 },
+    { XK_KP_Insert,     XK_ANY_MOD,                         "\033[4h",      -1,      0 },
+    { XK_KP_Insert,     XK_ANY_MOD,                         "\033[2~",      +1,      0 },
+    { XK_KP_Delete,     ControlMask,                        "\033[M",       -1,      0 },
+    { XK_KP_Delete,     ControlMask,                        "\033[3;5~",    +1,      0 },
+    { XK_KP_Delete,     ShiftMask,                          "\033[2K",      -1,      0 },
+    { XK_KP_Delete,     ShiftMask,                          "\033[3;2~",    +1,      0 },
+    { XK_KP_Delete,     XK_ANY_MOD,                         "\033[P",       -1,      0 },
+    { XK_KP_Delete,     XK_ANY_MOD,                         "\033[3~",      +1,      0 },
+    { XK_KP_Multiply,   XK_ANY_MOD,                         "\033Oj",       +2,      0 },
+    { XK_KP_Add,        XK_ANY_MOD,                         "\033Ok",       +2,      0 },
+    { XK_KP_Enter,      XK_ANY_MOD,                         "\033OM",       +2,      0 },
+    { XK_KP_Enter,      XK_ANY_MOD,                         "\r",           -1,      0 },
+    { XK_KP_Subtract,   XK_ANY_MOD,                         "\033Om",       +2,      0 },
+    { XK_KP_Decimal,    XK_ANY_MOD,                         "\033On",       +2,      0 },
+    { XK_KP_Divide,     XK_ANY_MOD,                         "\033Oo",       +2,      0 },
+    { XK_KP_0,          XK_ANY_MOD,                         "\033Op",       +2,      0 },
+    { XK_KP_1,          XK_ANY_MOD,                         "\033Oq",       +2,      0 },
+    { XK_KP_2,          XK_ANY_MOD,                         "\033Or",       +2,      0 },
+    { XK_KP_3,          XK_ANY_MOD,                         "\033Os",       +2,      0 },
+    { XK_KP_4,          XK_ANY_MOD,                         "\033Ot",       +2,      0 },
+    { XK_KP_5,          XK_ANY_MOD,                         "\033Ou",       +2,      0 },
+    { XK_KP_6,          XK_ANY_MOD,                         "\033Ov",       +2,      0 },
+    { XK_KP_7,          XK_ANY_MOD,                         "\033Ow",       +2,      0 },
+    { XK_KP_8,          XK_ANY_MOD,                         "\033Ox",       +2,      0 },
+    { XK_KP_9,          XK_ANY_MOD,                         "\033Oy",       +2,      0 },
+    { XK_Up,            ShiftMask,                          "\033[1;2A",     0,      0 },
+    { XK_Up,            MODKEY,                             "\033[1;3A",     0,      0 },
+    { XK_Up,            ShiftMask | MODKEY,                 "\033[1;4A",     0,      0 },
+    { XK_Up,            ControlMask,                        "\033[1;5A",     0,      0 },
+    { XK_Up,            ShiftMask | ControlMask,            "\033[1;6A",     0,      0 },
+    { XK_Up,            ControlMask | MODKEY,               "\033[1;7A",     0,      0 },
+    { XK_Up,            ShiftMask | ControlMask | MODKEY,   "\033[1;8A",     0,      0 },
+    { XK_Up,            XK_ANY_MOD,                         "\033[A",        0,     -1 },
+    { XK_Up,            XK_ANY_MOD,                         "\033OA",        0,     +1 },
+    { XK_Down,          ShiftMask,                          "\033[1;2B",     0,      0 },
+    { XK_Down,          MODKEY,                             "\033[1;3B",     0,      0 },
+    { XK_Down,          ShiftMask | MODKEY,                 "\033[1;4B",     0,      0 },
+    { XK_Down,          ControlMask,                        "\033[1;5B",     0,      0 },
+    { XK_Down,          ShiftMask | ControlMask,            "\033[1;6B",     0,      0 },
+    { XK_Down,          ControlMask | MODKEY,               "\033[1;7B",     0,      0 },
+    { XK_Down,          ShiftMask | ControlMask | MODKEY,   "\033[1;8B",     0,      0 },
+    { XK_Down,          XK_ANY_MOD,                         "\033[B",        0,     -1 },
+    { XK_Down,          XK_ANY_MOD,                         "\033OB",        0,     +1 },
+    { XK_Left,          ShiftMask,                          "\033[1;2D",     0,      0 },
+    { XK_Left,          MODKEY,                             "\033[1;3D",     0,      0 },
+    { XK_Left,          ShiftMask | MODKEY,                 "\033[1;4D",     0,      0 },
+    { XK_Left,          ControlMask,                        "\033[1;5D",     0,      0 },
+    { XK_Left,          ShiftMask | ControlMask,            "\033[1;6D",     0,      0 },
+    { XK_Left,          ControlMask | MODKEY,               "\033[1;7D",     0,      0 },
+    { XK_Left,          ShiftMask | ControlMask | MODKEY,   "\033[1;8D",     0,      0 },
+    { XK_Left,          XK_ANY_MOD,                         "\033[D",        0,     -1 },
+    { XK_Left,          XK_ANY_MOD,                         "\033OD",        0,     +1 },
+    { XK_Right,         ShiftMask,                          "\033[1;2C",     0,      0 },
+    { XK_Right,         MODKEY,                             "\033[1;3C",     0,      0 },
+    { XK_Right,         ShiftMask | MODKEY,                 "\033[1;4C",     0,      0 },
+    { XK_Right,         ControlMask,                        "\033[1;5C",     0,      0 },
+    { XK_Right,         ShiftMask | ControlMask,            "\033[1;6C",     0,      0 },
+    { XK_Right,         ControlMask | MODKEY,               "\033[1;7C",     0,      0 },
+    { XK_Right,         ShiftMask | ControlMask | MODKEY,   "\033[1;8C",     0,      0 },
+    { XK_Right,         XK_ANY_MOD,                         "\033[C",        0,     -1 },
+    { XK_Right,         XK_ANY_MOD,                         "\033OC",        0,     +1 },
+    { XK_ISO_Left_Tab,  ShiftMask,                          "\033[Z",        0,      0 },
+    { XK_Return,        MODKEY,                             "\033\r",        0,      0 },
+    { XK_Return,        XK_ANY_MOD,                         "\r",            0,      0 },
+    { XK_Insert,        ShiftMask,                          "\033[4l",      -1,      0 },
+    { XK_Insert,        ShiftMask,                          "\033[2;2~",    +1,      0 },
+    { XK_Insert,        ControlMask,                        "\033[L",       -1,      0 },
+    { XK_Insert,        ControlMask,                        "\033[2;5~",    +1,      0 },
+    { XK_Insert,        XK_ANY_MOD,                         "\033[4h",      -1,      0 },
+    { XK_Insert,        XK_ANY_MOD,                         "\033[2~",      +1,      0 },
+    { XK_Delete,        ControlMask,                        "\033[M",       -1,      0 },
+    { XK_Delete,        ControlMask,                        "\033[3;5~",    +1,      0 },
+    { XK_Delete,        ShiftMask,                          "\033[2K",      -1,      0 },
+    { XK_Delete,        ShiftMask,                          "\033[3;2~",    +1,      0 },
+    { XK_Delete,        XK_ANY_MOD,                         "\033[P",       -1,      0 },
+    { XK_Delete,        XK_ANY_MOD,                         "\033[3~",      +1,      0 },
+    { XK_BackSpace,     XK_NO_MOD,                          "\177",          0,      0 },
+    { XK_BackSpace,     MODKEY,                             "\033\177",      0,      0 },
+    { XK_Home,          ShiftMask,                          "\033[2J",       0,     -1 },
+    { XK_Home,          ShiftMask,                          "\033[1;2H",     0,     +1 },
+    { XK_Home,          XK_ANY_MOD,                         "\033[H",        0,     -1 },
+    { XK_Home,          XK_ANY_MOD,                         "\033[1~",       0,     +1 },
+    { XK_End,           ControlMask,                        "\033[J",       -1,      0 },
+    { XK_End,           ControlMask,                        "\033[1;5F",    +1,      0 },
+    { XK_End,           ShiftMask,                          "\033[K",       -1,      0 },
+    { XK_End,           ShiftMask,                          "\033[1;2F",    +1,      0 },
+    { XK_End,           XK_ANY_MOD,                         "\033[4~",       0,      0 },
+    { XK_Prior,         ControlMask,                        "\033[5;5~",     0,      0 },
+    { XK_Prior,         ShiftMask,                          "\033[5;2~",     0,      0 },
+    { XK_Prior,         XK_ANY_MOD,                         "\033[5~",       0,      0 },
+    { XK_Next,          ControlMask,                        "\033[6;5~",     0,      0 },
+    { XK_Next,          ShiftMask,                          "\033[6;2~",     0,      0 },
+    { XK_Next,          XK_ANY_MOD,                         "\033[6~",       0,      0 },
+    { XK_F1,            XK_NO_MOD,                          "\033OP",        0,      0 },
+    { XK_F1, /* F13 */  ShiftMask,                          "\033[1;2P",     0,      0 },
+    { XK_F1, /* F25 */  ControlMask,                        "\033[1;5P",     0,      0 },
+    { XK_F1, /* F37 */  MODKEY2,                            "\033[1;6P",     0,      0 },
+    { XK_F1, /* F49 */  MODKEY,                             "\033[1;3P",     0,      0 },
+    { XK_F1, /* F61 */  Mod3Mask,                           "\033[1;4P",     0,      0 },
+    { XK_F2,            XK_NO_MOD,                          "\033OQ",        0,      0 },
+    { XK_F2, /* F14 */  ShiftMask,                          "\033[1;2Q",     0,      0 },
+    { XK_F2, /* F26 */  ControlMask,                        "\033[1;5Q",     0,      0 },
+    { XK_F2, /* F38 */  MODKEY2,                            "\033[1;6Q",     0,      0 },
+    { XK_F2, /* F50 */  MODKEY,                             "\033[1;3Q",     0,      0 },
+    { XK_F2, /* F62 */  Mod3Mask,                           "\033[1;4Q",     0,      0 },
+    { XK_F3,            XK_NO_MOD,                          "\033OR",        0,      0 },
+    { XK_F3, /* F15 */  ShiftMask,                          "\033[1;2R",     0,      0 },
+    { XK_F3, /* F27 */  ControlMask,                        "\033[1;5R",     0,      0 },
+    { XK_F3, /* F39 */  MODKEY2,                            "\033[1;6R",     0,      0 },
+    { XK_F3, /* F51 */  MODKEY,                             "\033[1;3R",     0,      0 },
+    { XK_F3, /* F63 */  Mod3Mask,                           "\033[1;4R",     0,      0 },
+    { XK_F4,            XK_NO_MOD,                          "\033OS",        0,      0 },
+    { XK_F4, /* F16 */  ShiftMask,                          "\033[1;2S",     0,      0 },
+    { XK_F4, /* F28 */  ControlMask,                        "\033[1;5S",     0,      0 },
+    { XK_F4, /* F40 */  MODKEY2,                            "\033[1;6S",     0,      0 },
+    { XK_F4, /* F52 */  MODKEY,                             "\033[1;3S",     0,      0 },
+    { XK_F5,            XK_NO_MOD,                          "\033[15~",      0,      0 },
+    { XK_F5, /* F17 */  ShiftMask,                          "\033[15;2~",    0,      0 },
+    { XK_F5, /* F29 */  ControlMask,                        "\033[15;5~",    0,      0 },
+    { XK_F5, /* F41 */  MODKEY2,                            "\033[15;6~",    0,      0 },
+    { XK_F5, /* F53 */  MODKEY,                             "\033[15;3~",    0,      0 },
+    { XK_F6,            XK_NO_MOD,                          "\033[17~",      0,      0 },
+    { XK_F6, /* F18 */  ShiftMask,                          "\033[17;2~",    0,      0 },
+    { XK_F6, /* F30 */  ControlMask,                        "\033[17;5~",    0,      0 },
+    { XK_F6, /* F42 */  MODKEY2,                            "\033[17;6~",    0,      0 },
+    { XK_F6, /* F54 */  MODKEY,                             "\033[17;3~",    0,      0 },
+    { XK_F7,            XK_NO_MOD,                          "\033[18~",      0,      0 },
+    { XK_F7, /* F19 */  ShiftMask,                          "\033[18;2~",    0,      0 },
+    { XK_F7, /* F31 */  ControlMask,                        "\033[18;5~",    0,      0 },
+    { XK_F7, /* F43 */  MODKEY2,                            "\033[18;6~",    0,      0 },
+    { XK_F7, /* F55 */  MODKEY,                             "\033[18;3~",    0,      0 },
+    { XK_F8,            XK_NO_MOD,                          "\033[19~",      0,      0 },
+    { XK_F8, /* F20 */  ShiftMask,                          "\033[19;2~",    0,      0 },
+    { XK_F8, /* F32 */  ControlMask,                        "\033[19;5~",    0,      0 },
+    { XK_F8, /* F44 */  MODKEY2,                            "\033[19;6~",    0,      0 },
+    { XK_F8, /* F56 */  MODKEY,                             "\033[19;3~",    0,      0 },
+    { XK_F9,            XK_NO_MOD,                          "\033[20~",      0,      0 },
+    { XK_F9, /* F21 */  ShiftMask,                          "\033[20;2~",    0,      0 },
+    { XK_F9, /* F33 */  ControlMask,                        "\033[20;5~",    0,      0 },
+    { XK_F9, /* F45 */  MODKEY2,                            "\033[20;6~",    0,      0 },
+    { XK_F9, /* F57 */  MODKEY,                             "\033[20;3~",    0,      0 },
+    { XK_F10,           XK_NO_MOD,                          "\033[21~",      0,      0 },
+    { XK_F10, /* F22 */ ShiftMask,                          "\033[21;2~",    0,      0 },
+    { XK_F10, /* F34 */ ControlMask,                        "\033[21;5~",    0,      0 },
+    { XK_F10, /* F46 */ MODKEY2,                            "\033[21;6~",    0,      0 },
+    { XK_F10, /* F58 */ MODKEY,                             "\033[21;3~",    0,      0 },
+    { XK_F11,           XK_NO_MOD,                          "\033[23~",      0,      0 },
+    { XK_F11, /* F23 */ ShiftMask,                          "\033[23;2~",    0,      0 },
+    { XK_F11, /* F35 */ ControlMask,                        "\033[23;5~",    0,      0 },
+    { XK_F11, /* F47 */ MODKEY2,                            "\033[23;6~",    0,      0 },
+    { XK_F11, /* F59 */ MODKEY,                             "\033[23;3~",    0,      0 },
+    { XK_F12,           XK_NO_MOD,                          "\033[24~",      0,      0 },
+    { XK_F12, /* F24 */ ShiftMask,                          "\033[24;2~",    0,      0 },
+    { XK_F12, /* F36 */ ControlMask,                        "\033[24;5~",    0,      0 },
+    { XK_F12, /* F48 */ MODKEY2,                            "\033[24;6~",    0,      0 },
+    { XK_F12, /* F60 */ MODKEY,                             "\033[24;3~",    0,      0 },
+    { XK_F13,           XK_NO_MOD,                          "\033[1;2P",     0,      0 },
+    { XK_F14,           XK_NO_MOD,                          "\033[1;2Q",     0,      0 },
+    { XK_F15,           XK_NO_MOD,                          "\033[1;2R",     0,      0 },
+    { XK_F16,           XK_NO_MOD,                          "\033[1;2S",     0,      0 },
+    { XK_F17,           XK_NO_MOD,                          "\033[15;2~",    0,      0 },
+    { XK_F18,           XK_NO_MOD,                          "\033[17;2~",    0,      0 },
+    { XK_F19,           XK_NO_MOD,                          "\033[18;2~",    0,      0 },
+    { XK_F20,           XK_NO_MOD,                          "\033[19;2~",    0,      0 },
+    { XK_F21,           XK_NO_MOD,                          "\033[20;2~",    0,      0 },
+    { XK_F22,           XK_NO_MOD,                          "\033[21;2~",    0,      0 },
+    { XK_F23,           XK_NO_MOD,                          "\033[23;2~",    0,      0 },
+    { XK_F24,           XK_NO_MOD,                          "\033[24;2~",    0,      0 },
+    { XK_F25,           XK_NO_MOD,                          "\033[1;5P",     0,      0 },
+    { XK_F26,           XK_NO_MOD,                          "\033[1;5Q",     0,      0 },
+    { XK_F27,           XK_NO_MOD,                          "\033[1;5R",     0,      0 },
+    { XK_F28,           XK_NO_MOD,                          "\033[1;5S",     0,      0 },
+    { XK_F29,           XK_NO_MOD,                          "\033[15;5~",    0,      0 },
+    { XK_F30,           XK_NO_MOD,                          "\033[17;5~",    0,      0 },
+    { XK_F31,           XK_NO_MOD,                          "\033[18;5~",    0,      0 },
+    { XK_F32,           XK_NO_MOD,                          "\033[19;5~",    0,      0 },
+    { XK_F33,           XK_NO_MOD,                          "\033[20;5~",    0,      0 },
+    { XK_F34,           XK_NO_MOD,                          "\033[21;5~",    0,      0 },
+    { XK_F35,           XK_NO_MOD,                          "\033[23;5~",    0,      0 },
+};
+
+/*
+ * Selection types' masks.
+ * Use the same masks as usual.
+ * Button1Mask is always unset, to make masks match between ButtonPress.
+ * ButtonRelease and MotionNotify.
+ * If no match is found, regular selection is used.
+ */
+static uint selmasks[] = {
+    [SEL_RECTANGULAR] = MODKEY,
+};
+
+/*
+ * Printable characters in ASCII, used to estimate the advance width
+ * of single wide characters.
+ */
+static char ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?"
+                                "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+                                "`abcdefghijklmnopqrstuvwxyz{|}~";
diff --git a/st/st-copyout b/st/st-copyout
index 0d19e5a..0d19e5a 100755..100644
--- a/st/st-copyout
+++ b/st/st-copyout
diff --git a/st/st-urlhandler b/st/st-urlhandler
index 0eb4586..0eb4586 100755..100644
--- a/st/st-urlhandler
+++ b/st/st-urlhandler