diff --git a/_suckless/dmenu/README b/_suckless/dmenu/README
new file mode 100644
index 0000000..87fd9c2
--- /dev/null
+++ b/_suckless/dmenu/README
@@ -0,0 +1,25 @@
+# ftpd's dmenu build
+
+## Patches applied
+
+These patches from suckless.org were applied from the newest versions, in order:
+
+1. dmenu-border-20201112-1a13d04.diff
+1. dmenu-center-20200111-8cd37e1.diff
+
+## Fix color emoji
+
+Delete the following from drw.c:
+
+    /* Do not allow using color fonts. This is a workaround for a BadLength
+     * error from Xft with color glyphs. Modelled on the Xterm workaround. See
+     * https://bugzilla.redhat.com/show_bug.cgi?id=1498269
+     * https://lists.suckless.org/dev/1701/30932.html
+     * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
+     * and lots more all over the internet.
+     */
+    FcBool iscol;
+    if(FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
+    	XftFontClose(drw->dpy, xfont);
+    	return NULL;
+    }
diff --git a/_suckless/dmenu/patches/00-dmenu-border-20201112-1a13d04.diff b/_suckless/dmenu/patches/00-dmenu-border-20201112-1a13d04.diff
deleted file mode 100644
index bea0cee..0000000
--- a/_suckless/dmenu/patches/00-dmenu-border-20201112-1a13d04.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From d0c3fc8a634c153856cd41438f705175a21ec69a Mon Sep 17 00:00:00 2001
-From: braskin <benjaminiraskin@gmail.com>
-Date: Thu, 12 Nov 2020 10:13:29 -0500
-Subject: [PATCH] fixed border width draw for topbar
-
----
- config.def.h | 3 +++
- dmenu.c      | 6 +++++-
- 2 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/config.def.h b/config.def.h
-index 1edb647..dd3eb31 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -21,3 +21,6 @@ static unsigned int lines      = 0;
-  * for example: " /?\"&[]"
-  */
- static const char worddelimiters[] = " ";
-+
-+/* Size of the window border */
-+static unsigned int border_width = 0;
-diff --git a/dmenu.c b/dmenu.c
-index 65f25ce..716e655 100644
---- a/dmenu.c
-+++ b/dmenu.c
-@@ -659,9 +659,11 @@ setup(void)
- 	swa.override_redirect = True;
- 	swa.background_pixel = scheme[SchemeNorm][ColBg].pixel;
- 	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
--	win = XCreateWindow(dpy, parentwin, x, y, mw, mh, 0,
-+	win = XCreateWindow(dpy, parentwin, x, y - (topbar ? 0 : border_width * 2), mw - border_width * 2, mh, border_width,
- 	                    CopyFromParent, CopyFromParent, CopyFromParent,
- 	                    CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
-+	if (border_width)
-+		XSetWindowBorder(dpy, win, scheme[SchemeSel][ColBg].pixel);
- 	XSetClassHint(dpy, win, &ch);
- 
- 
-@@ -733,6 +735,8 @@ main(int argc, char *argv[])
- 			colors[SchemeSel][ColFg] = argv[++i];
- 		else if (!strcmp(argv[i], "-w"))   /* embedding window id */
- 			embed = argv[++i];
-+		else if (!strcmp(argv[i], "-bw"))
-+			border_width = atoi(argv[++i]); /* border width */
- 		else
- 			usage();
- 
--- 
-2.25.1
-
diff --git a/_suckless/dmenu/patches/01-dmenu-center-20200111-8cd37e1.diff b/_suckless/dmenu/patches/01-dmenu-center-20200111-8cd37e1.diff
deleted file mode 100644
index af249a6..0000000
--- a/_suckless/dmenu/patches/01-dmenu-center-20200111-8cd37e1.diff
+++ /dev/null
@@ -1,120 +0,0 @@
-From 8cd37e1ab9e7cb025224aeb3543f1a5be8bceb93 Mon Sep 17 00:00:00 2001
-From: Nihal Jere <nihal@nihaljere.xyz>
-Date: Sat, 11 Jan 2020 21:16:08 -0600
-Subject: [PATCH] center patch now has adjustable minimum width
-
----
- config.def.h |  2 ++
- dmenu.1      |  3 +++
- dmenu.c      | 39 ++++++++++++++++++++++++++++++++-------
- 3 files changed, 37 insertions(+), 7 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 1edb647..88ef264 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -2,6 +2,8 @@
- /* Default settings; can be overriden by command line. */
- 
- static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom     */
-+static int centered = 0;                    /* -c option; centers dmenu on screen */
-+static int min_width = 500;                    /* minimum width when centered */
- /* -fn option overrides fonts[0]; default X11 font or font set */
- static const char *fonts[] = {
- 	"monospace:size=10"
-diff --git a/dmenu.1 b/dmenu.1
-index 323f93c..c036baa 100644
---- a/dmenu.1
-+++ b/dmenu.1
-@@ -40,6 +40,9 @@ which lists programs in the user's $PATH and runs the result in their $SHELL.
- .B \-b
- dmenu appears at the bottom of the screen.
- .TP
-+.B \-c
-+dmenu appears centered on the screen.
-+.TP
- .B \-f
- dmenu grabs the keyboard before reading stdin if not reading from a tty. This
- is faster, but will lock up X until stdin reaches end\-of\-file.
-diff --git a/dmenu.c b/dmenu.c
-index 65f25ce..041c7f8 100644
---- a/dmenu.c
-+++ b/dmenu.c
-@@ -89,6 +89,15 @@ calcoffsets(void)
- 			break;
- }
- 
-+static int
-+max_textw(void)
-+{
-+	int len = 0;
-+	for (struct item *item = items; item && item->text; item++)
-+		len = MAX(TEXTW(item->text), len);
-+	return len;
-+}
-+
- static void
- cleanup(void)
- {
-@@ -611,6 +620,7 @@ setup(void)
- 	bh = drw->fonts->h + 2;
- 	lines = MAX(lines, 0);
- 	mh = (lines + 1) * bh;
-+	promptw = (prompt && *prompt) ? TEXTW(prompt) - lrpad / 4 : 0;
- #ifdef XINERAMA
- 	i = 0;
- 	if (parentwin == root && (info = XineramaQueryScreens(dpy, &n))) {
-@@ -637,9 +647,16 @@ setup(void)
- 				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;
-+		if (centered) {
-+			mw = MIN(MAX(max_textw() + promptw, min_width), info[i].width);
-+			x = info[i].x_org + ((info[i].width  - mw) / 2);
-+			y = info[i].y_org + ((info[i].height - mh) / 2);
-+		} else {
-+			x = info[i].x_org;
-+			y = info[i].y_org + (topbar ? 0 : info[i].height - mh);
-+			mw = info[i].width;
-+		}
-+
- 		XFree(info);
- 	} else
- #endif
-@@ -647,11 +664,17 @@ setup(void)
- 		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;
-+
-+		if (centered) {
-+			mw = MIN(MAX(max_textw() + promptw, min_width), wa.width);
-+			x = (wa.width  - mw) / 2;
-+			y = (wa.height - mh) / 2;
-+		} else {
-+			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();
- 
-@@ -709,6 +732,8 @@ main(int argc, char *argv[])
- 			topbar = 0;
- 		else if (!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
- 			fast = 1;
-+		else if (!strcmp(argv[i], "-c"))   /* centers dmenu on screen */
-+			centered = 1;
- 		else if (!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
- 			fstrncmp = strncasecmp;
- 			fstrstr = cistrstr;
--- 
-2.24.1
-
diff --git a/_suckless/dwm/README b/_suckless/dwm/README
index 491d79f..f9b0181 100644
--- a/_suckless/dwm/README
+++ b/_suckless/dwm/README
@@ -2,7 +2,7 @@
 
 ## Patches applied
 
-These patches were applied from the newest versions, in order:
+These patches from suckless.org were applied from the newest versions, in order:
 
 1. dwm-status2d-systray-6.3.diff
 1. dwm-restartsig-20180523-6.2.diff
diff --git a/_suckless/slock/README b/_suckless/slock/README
new file mode 100644
index 0000000..c0596d2
--- /dev/null
+++ b/_suckless/slock/README
@@ -0,0 +1,7 @@
+# ftpd's slock build
+
+## Patches applied
+
+These patches from suckless.org were applied from the newest versions, in order:
+
+1. slock-dwmlogo-20210324.diff
diff --git a/_suckless/slock/patches/01-slock-dwmlogo-20210324.diff b/_suckless/slock/patches/01-slock-dwmlogo-20210324.diff
deleted file mode 100644
index 90625ea..0000000
--- a/_suckless/slock/patches/01-slock-dwmlogo-20210324.diff
+++ /dev/null
@@ -1,246 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 9855e21..0940fb8 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -3,10 +3,30 @@ static const char *user  = "nobody";
- static const char *group = "nogroup";
- 
- static const char *colorname[NUMCOLS] = {
--	[INIT] =   "black",     /* after initialization */
-+	[BACKGROUND] =   "black",     /* after initialization */
-+	[INIT] =   "#2d2d2d",     /* after initialization */
- 	[INPUT] =  "#005577",   /* during input */
- 	[FAILED] = "#CC3333",   /* wrong password */
- };
- 
- /* treat a cleared input like a wrong password (color) */
- static const int failonclear = 1;
-+
-+/* insert grid pattern with scale 1:1, the size can be changed with logosize */
-+static const int logosize = 75;
-+static const int logow = 12;	/* grid width and height for right center alignment*/
-+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 },
-+
-+};
-diff --git a/config.mk b/config.mk
-index 74429ae..08356e8 100644
---- a/config.mk
-+++ b/config.mk
-@@ -10,12 +10,20 @@ MANPREFIX = ${PREFIX}/share/man
- X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
- 
-+# Xinerama, comment if you don't want it
-+XINERAMALIBS  = -lXinerama
-+XINERAMAFLAGS = -DXINERAMA
-+
-+# freetype
-+FREETYPELIBS = -lXft
-+FREETYPEINC = /usr/include/freetype2
-+
- # includes and libs
--INCS = -I. -I/usr/include -I${X11INC}
--LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext -lXrandr
-+INCS = -I. -I/usr/include -I${X11INC} -I${FREETYPEINC}
-+LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXext -lXrandr
- 
- # flags
--CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H
-+CPPFLAGS = -DVERSION=\"${VERSION}\" -D_DEFAULT_SOURCE -DHAVE_SHADOW_H ${XINERAMAFLAGS}
- CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
- LDFLAGS = -s ${LIBS}
- COMPATSRC = explicit_bzero.c
-diff --git a/slock.c b/slock.c
-index 5ae738c..3ea9b7f 100644
---- a/slock.c
-+++ b/slock.c
-@@ -1,5 +1,6 @@
- /* See LICENSE file for license details. */
--#define _XOPEN_SOURCE 500
-+#define _XOPEN_SOURCE   500
-+#define LENGTH(X)       (sizeof X / sizeof X[0])
- #if HAVE_SHADOW_H
- #include <shadow.h>
- #endif
-@@ -15,9 +16,13 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <X11/extensions/Xrandr.h>
-+#ifdef XINERAMA
-+#include <X11/extensions/Xinerama.h>
-+#endif
- #include <X11/keysym.h>
- #include <X11/Xlib.h>
- #include <X11/Xutil.h>
-+#include <X11/Xft/Xft.h>
- 
- #include "arg.h"
- #include "util.h"
-@@ -25,17 +30,25 @@
- char *argv0;
- 
- enum {
-+	BACKGROUND,
- 	INIT,
- 	INPUT,
- 	FAILED,
- 	NUMCOLS
- };
- 
-+#include "config.h"
-+
- struct lock {
- 	int screen;
- 	Window root, win;
- 	Pixmap pmap;
- 	unsigned long colors[NUMCOLS];
-+	unsigned int x, y;
-+	unsigned int xoff, yoff, mw, mh;
-+	Drawable drawable;
-+	GC gc;
-+	XRectangle rectangles[LENGTH(rectangles)];
- };
- 
- struct xrandr {
-@@ -44,8 +57,6 @@ struct xrandr {
- 	int errbase;
- };
- 
--#include "config.h"
--
- static void
- die(const char *errstr, ...)
- {
-@@ -124,6 +135,32 @@ gethash(void)
- 	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
-+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);
-+	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)
-@@ -190,10 +227,7 @@ readpw(Display *dpy, struct xrandr *rr, struct lock **locks, int nscreens,
- 			color = len ? INPUT : ((failure || failonclear) ? FAILED : INIT);
- 			if (running && oldc != color) {
- 				for (screen = 0; screen < nscreens; screen++) {
--					XSetWindowBackground(dpy,
--					                     locks[screen]->win,
--					                     locks[screen]->colors[color]);
--					XClearWindow(dpy, locks[screen]->win);
-+					drawlogo(dpy, locks[screen], color);
- 				}
- 				oldc = color;
- 			}
-@@ -228,6 +262,10 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
- 	XColor color, dummy;
- 	XSetWindowAttributes wa;
- 	Cursor invisible;
-+#ifdef XINERAMA
-+	XineramaScreenInfo *info;
-+	int n;
-+#endif
- 
- 	if (dpy == NULL || screen < 0 || !(lock = malloc(sizeof(struct lock))))
- 		return NULL;
-@@ -241,12 +279,31 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
- 		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
-+#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;
--	wa.background_pixel = lock->colors[INIT];
-+	wa.background_pixel = lock->colors[BACKGROUND];
- 	lock->win = XCreateWindow(dpy, lock->root, 0, 0,
--	                          DisplayWidth(dpy, lock->screen),
--	                          DisplayHeight(dpy, lock->screen),
-+	                          lock->x, lock->y,
- 	                          0, DefaultDepth(dpy, lock->screen),
- 	                          CopyFromParent,
- 	                          DefaultVisual(dpy, lock->screen),
-@@ -256,6 +313,8 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
- 	                                &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) {
-@@ -276,6 +335,7 @@ lockscreen(Display *dpy, struct xrandr *rr, int screen)
- 				XRRSelectInput(dpy, lock->win, RRScreenChangeNotifyMask);
- 
- 			XSelectInput(dpy, lock->root, SubstructureNotifyMask);
-+			drawlogo(dpy, lock, INIT);
- 			return lock;
- 		}
- 
-@@ -391,5 +451,12 @@ main(int argc, char **argv) {
- 	/* 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);
-+	}
-+
-+	XSync(dpy, 0);
-+	XCloseDisplay(dpy);
- 	return 0;
- }
diff --git a/_suckless/st/README b/_suckless/st/README
new file mode 100644
index 0000000..9ff69d8
--- /dev/null
+++ b/_suckless/st/README
@@ -0,0 +1,11 @@
+# ftpd's slock build
+
+## Patches applied
+
+These patches from suckless.org were applied from the newest versions, in order:
+
+1. st-w3m-0.8.3.diff
+1. st-font2-20190416-ba72400.diff
+1. st-scrollback-0.8.4.diff
+1. st-externalpipe-0.8.4.diff
+1. fix-wide-glyphs.diff (local, see _patches/)
diff --git a/_suckless/st/patches/10-fix-wide-glyphs.diff b/_suckless/st/_patches/fix-wide-glyphs.diff
similarity index 100%
rename from _suckless/st/patches/10-fix-wide-glyphs.diff
rename to _suckless/st/_patches/fix-wide-glyphs.diff
diff --git a/_suckless/st/patches/00-st-w3m-0.8.3.diff b/_suckless/st/patches/00-st-w3m-0.8.3.diff
deleted file mode 100644
index a4e104b..0000000
--- a/_suckless/st/patches/00-st-w3m-0.8.3.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-From 69cffc587b54b0a9cd81adb87abad8e526d5b25b Mon Sep 17 00:00:00 2001
-From: "Avi Halachmi (:avih)" <avihpit@yahoo.com>
-Date: Thu, 4 Jun 2020 17:35:08 +0300
-Subject: [PATCH] support w3m images
-
-w3m images are a hack which renders on top of the terminal's drawable,
-which didn't work in st because when using double buffering, the front
-buffer (on which w3m draws its images) is ignored, and st draws only
-on the back buffer, which is then copied to the front buffer.
-
-There's a patch to make it work at the FAQ already, but that patch
-canceles double-buffering, which can have negative side effects on
-some cases such as flickering.
-
-This patch achieves the same goal but instead of canceling the double
-buffer it first copies the front buffer to the back buffer.
-
-This has the same issues as the FAQ patch in that the cursor line is
-deleted at the image (because st renders always full lines), but
-otherwise it's simpler and does keeps double buffering.
----
- x.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/x.c b/x.c
-index e5f1737..b6ae162 100644
---- a/x.c
-+++ b/x.c
-@@ -1594,6 +1594,8 @@ xsettitle(char *p)
- int
- xstartdraw(void)
- {
-+	if (IS_SET(MODE_VISIBLE))
-+		XCopyArea(xw.dpy, xw.win, xw.buf, dc.gc, 0, 0, win.w, win.h, 0, 0);
- 	return IS_SET(MODE_VISIBLE);
- }
- 
-
-base-commit: 43a395ae91f7d67ce694e65edeaa7bbc720dd027
--- 
-2.17.1
-
diff --git a/_suckless/st/patches/01-st-font2-20190416-ba72400.diff b/_suckless/st/patches/01-st-font2-20190416-ba72400.diff
deleted file mode 100644
index c7a2950..0000000
--- a/_suckless/st/patches/01-st-font2-20190416-ba72400.diff
+++ /dev/null
@@ -1,167 +0,0 @@
-From ba724004c6a368e452114f7dc147a9978fe0f3b4 Mon Sep 17 00:00:00 2001
-From: Kirill Bugaev <kirill.bugaev87@gmail.com>
-Date: Tue, 16 Apr 2019 04:31:30 +0800
-Subject: [PATCH] This patch allows to add spare font besides default. Some
- glyphs can be not present in default font. For this glyphs st uses
- font-config and try to find them in font cache first. This patch append fonts
- defined in font2 variable to the beginning of font cache. So they will be
- used first for glyphs that absent in default font.
-
----
- config.def.h |   6 +++
- x.c          | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 107 insertions(+)
-
-diff --git a/config.def.h b/config.def.h
-index 482901e..676719e 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -6,6 +6,12 @@
-  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
-  */
- static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
-+/* Spare fonts */
-+static char *font2[] = {
-+/*	"Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */
-+/*	"Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */
-+};
-+
- static int borderpx = 2;
- 
- /*
-diff --git a/x.c b/x.c
-index 5828a3b..d37e59d 100644
---- a/x.c
-+++ b/x.c
-@@ -149,6 +149,8 @@ static void xhints(void);
- static int xloadcolor(int, const char *, Color *);
- static int xloadfont(Font *, FcPattern *);
- static void xloadfonts(char *, double);
-+static int xloadsparefont(FcPattern *, int);
-+static void xloadsparefonts(void);
- static void xunloadfont(Font *);
- static void xunloadfonts(void);
- static void xsetenv(void);
-@@ -296,6 +298,7 @@ zoomabs(const Arg *arg)
- {
- 	xunloadfonts();
- 	xloadfonts(usedfont, arg->f);
-+	xloadsparefonts();
- 	cresize(0, 0);
- 	redraw();
- 	xhints();
-@@ -977,6 +980,101 @@ xloadfonts(char *fontstr, double fontsize)
- 	FcPatternDestroy(pattern);
- }
- 
-+int
-+xloadsparefont(FcPattern *pattern, int flags)
-+{
-+	FcPattern *match;
-+	FcResult result;
-+	
-+	match = FcFontMatch(NULL, pattern, &result);
-+	if (!match) {
-+		return 1;
-+	}
-+
-+	if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) {
-+		FcPatternDestroy(match);
-+		return 1;
-+	}
-+
-+	frc[frclen].flags = flags;
-+	/* Believe U+0000 glyph will present in each default font */
-+	frc[frclen].unicodep = 0;
-+	frclen++;
-+
-+	return 0;
-+}
-+
-+void
-+xloadsparefonts(void)
-+{
-+	FcPattern *pattern;
-+	double sizeshift, fontval;
-+	int fc;
-+	char **fp;
-+
-+	if (frclen != 0)
-+		die("can't embed spare fonts. cache isn't empty");
-+
-+	/* Calculate count of spare fonts */
-+	fc = sizeof(font2) / sizeof(*font2);
-+	if (fc == 0)
-+		return;
-+
-+	/* Allocate memory for cache entries. */
-+	if (frccap < 4 * fc) {
-+		frccap += 4 * fc - frccap;
-+		frc = xrealloc(frc, frccap * sizeof(Fontcache));
-+	}
-+
-+	for (fp = font2; fp - font2 < fc; ++fp) {
-+	
-+		if (**fp == '-')
-+			pattern = XftXlfdParse(*fp, False, False);
-+		else
-+			pattern = FcNameParse((FcChar8 *)*fp);
-+	
-+		if (!pattern)
-+			die("can't open spare font %s\n", *fp);
-+	   		
-+		if (defaultfontsize > 0) {
-+			sizeshift = usedfontsize - defaultfontsize;
-+			if (sizeshift != 0 &&
-+					FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
-+					FcResultMatch) {	
-+				fontval += sizeshift;
-+				FcPatternDel(pattern, FC_PIXEL_SIZE);
-+				FcPatternDel(pattern, FC_SIZE);
-+				FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
-+			}
-+		}
-+	
-+		FcPatternAddBool(pattern, FC_SCALABLE, 1);
-+	
-+		FcConfigSubstitute(NULL, pattern, FcMatchPattern);
-+		XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
-+	
-+		if (xloadsparefont(pattern, FRC_NORMAL))
-+			die("can't open spare font %s\n", *fp);
-+	
-+		FcPatternDel(pattern, FC_SLANT);
-+		FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
-+		if (xloadsparefont(pattern, FRC_ITALIC))
-+			die("can't open spare font %s\n", *fp);
-+			
-+		FcPatternDel(pattern, FC_WEIGHT);
-+		FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
-+		if (xloadsparefont(pattern, FRC_ITALICBOLD))
-+			die("can't open spare font %s\n", *fp);
-+	
-+		FcPatternDel(pattern, FC_SLANT);
-+		FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
-+		if (xloadsparefont(pattern, FRC_BOLD))
-+			die("can't open spare font %s\n", *fp);
-+	
-+		FcPatternDestroy(pattern);
-+	}
-+}
-+
- void
- xunloadfont(Font *f)
- {
-@@ -1057,6 +1155,9 @@ xinit(int cols, int rows)
- 	usedfont = (opt_font == NULL)? font : opt_font;
- 	xloadfonts(usedfont, 0);
- 
-+	/* spare fonts */
-+	xloadsparefonts();
-+
- 	/* colors */
- 	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
- 	xloadcols();
--- 
-2.21.0
-
diff --git a/_suckless/st/patches/02-st-scrollback-0.8.4.diff b/_suckless/st/patches/02-st-scrollback-0.8.4.diff
deleted file mode 100644
index 88e0c79..0000000
--- a/_suckless/st/patches/02-st-scrollback-0.8.4.diff
+++ /dev/null
@@ -1,351 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 6f05dce..93cbcc0 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -199,6 +199,8 @@ static Shortcut shortcuts[] = {
- 	{ TERMMOD,              XK_Y,           selpaste,       {.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} },
- };
- 
- /*
-diff --git a/st.c b/st.c
-index 76b7e0d..edec064 100644
---- a/st.c
-+++ b/st.c
-@@ -35,6 +35,7 @@
- #define ESC_ARG_SIZ   16
- #define STR_BUF_SIZ   ESC_BUF_SIZ
- #define STR_ARG_SIZ   ESC_ARG_SIZ
-+#define HISTSIZE      2000
- 
- /* macros */
- #define IS_SET(flag)		((term.mode & (flag)) != 0)
-@@ -42,6 +43,9 @@
- #define ISCONTROLC1(c)		(BETWEEN(c, 0x80, 0x9f))
- #define ISCONTROL(c)		(ISCONTROLC0(c) || ISCONTROLC1(c))
- #define ISDELIM(u)		(u && wcschr(worddelimiters, u))
-+#define TLINE(y)		((y) < term.scr ? term.hist[((y) + term.histi - \
-+				term.scr + HISTSIZE + 1) % HISTSIZE] : \
-+				term.line[(y) - term.scr])
- 
- enum term_mode {
- 	MODE_WRAP        = 1 << 0,
-@@ -115,6 +119,9 @@ typedef struct {
- 	int col;      /* nb col */
- 	Line *line;   /* screen */
- 	Line *alt;    /* alternate screen */
-+	Line hist[HISTSIZE]; /* history buffer */
-+	int histi;    /* history index */
-+	int scr;      /* scroll back */
- 	int *dirty;   /* dirtyness of lines */
- 	TCursor c;    /* cursor */
- 	int ocx;      /* old cursor col */
-@@ -184,8 +191,8 @@ static void tnewline(int);
- static void tputtab(int);
- static void tputc(Rune);
- static void treset(void);
--static void tscrollup(int, int);
--static void tscrolldown(int, int);
-+static void tscrollup(int, int, int);
-+static void tscrolldown(int, int, int);
- static void tsetattr(int *, int);
- static void tsetchar(Rune, Glyph *, int, int);
- static void tsetdirt(int, int);
-@@ -414,10 +421,10 @@ tlinelen(int y)
- {
- 	int i = term.col;
- 
--	if (term.line[y][i - 1].mode & ATTR_WRAP)
-+	if (TLINE(y)[i - 1].mode & ATTR_WRAP)
- 		return i;
- 
--	while (i > 0 && term.line[y][i - 1].u == ' ')
-+	while (i > 0 && TLINE(y)[i - 1].u == ' ')
- 		--i;
- 
- 	return i;
-@@ -526,7 +533,7 @@ selsnap(int *x, int *y, int direction)
- 		 * Snap around if the word wraps around at the end or
- 		 * beginning of a line.
- 		 */
--		prevgp = &term.line[*y][*x];
-+		prevgp = &TLINE(*y)[*x];
- 		prevdelim = ISDELIM(prevgp->u);
- 		for (;;) {
- 			newx = *x + direction;
-@@ -541,14 +548,14 @@ selsnap(int *x, int *y, int direction)
- 					yt = *y, xt = *x;
- 				else
- 					yt = newy, xt = newx;
--				if (!(term.line[yt][xt].mode & ATTR_WRAP))
-+				if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
- 					break;
- 			}
- 
- 			if (newx >= tlinelen(newy))
- 				break;
- 
--			gp = &term.line[newy][newx];
-+			gp = &TLINE(newy)[newx];
- 			delim = ISDELIM(gp->u);
- 			if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
- 					|| (delim && gp->u != prevgp->u)))
-@@ -569,14 +576,14 @@ selsnap(int *x, int *y, int direction)
- 		*x = (direction < 0) ? 0 : term.col - 1;
- 		if (direction < 0) {
- 			for (; *y > 0; *y += direction) {
--				if (!(term.line[*y-1][term.col-1].mode
-+				if (!(TLINE(*y-1)[term.col-1].mode
- 						& ATTR_WRAP)) {
- 					break;
- 				}
- 			}
- 		} else if (direction > 0) {
- 			for (; *y < term.row-1; *y += direction) {
--				if (!(term.line[*y][term.col-1].mode
-+				if (!(TLINE(*y)[term.col-1].mode
- 						& ATTR_WRAP)) {
- 					break;
- 				}
-@@ -607,13 +614,13 @@ getsel(void)
- 		}
- 
- 		if (sel.type == SEL_RECTANGULAR) {
--			gp = &term.line[y][sel.nb.x];
-+			gp = &TLINE(y)[sel.nb.x];
- 			lastx = sel.ne.x;
- 		} else {
--			gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
-+			gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
- 			lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
- 		}
--		last = &term.line[y][MIN(lastx, linelen-1)];
-+		last = &TLINE(y)[MIN(lastx, linelen-1)];
- 		while (last >= gp && last->u == ' ')
- 			--last;
- 
-@@ -848,6 +855,9 @@ void
- ttywrite(const char *s, size_t n, int may_echo)
- {
- 	const char *next;
-+	Arg arg = (Arg) { .i = term.scr };
-+
-+	kscrolldown(&arg);
- 
- 	if (may_echo && IS_SET(MODE_ECHO))
- 		twrite(s, n, 1);
-@@ -1059,13 +1069,53 @@ tswapscreen(void)
- }
- 
- void
--tscrolldown(int orig, int n)
-+kscrolldown(const Arg* a)
-+{
-+	int n = a->i;
-+
-+	if (n < 0)
-+		n = term.row + n;
-+
-+	if (n > term.scr)
-+		n = term.scr;
-+
-+	if (term.scr > 0) {
-+		term.scr -= n;
-+		selscroll(0, -n);
-+		tfulldirt();
-+	}
-+}
-+
-+void
-+kscrollup(const Arg* a)
-+{
-+	int n = a->i;
-+
-+	if (n < 0)
-+		n = term.row + n;
-+
-+	if (term.scr <= HISTSIZE-n) {
-+		term.scr += n;
-+		selscroll(0, n);
-+		tfulldirt();
-+	}
-+}
-+
-+void
-+tscrolldown(int orig, int n, int copyhist)
- {
- 	int i;
- 	Line temp;
- 
- 	LIMIT(n, 0, term.bot-orig+1);
- 
-+	if (copyhist) {
-+		term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
-+		temp = term.hist[term.histi];
-+		term.hist[term.histi] = term.line[term.bot];
-+		term.line[term.bot] = temp;
-+	}
-+
- 	tsetdirt(orig, term.bot-n);
- 	tclearregion(0, term.bot-n+1, term.col-1, term.bot);
- 
-@@ -1075,17 +1125,28 @@ tscrolldown(int orig, int n)
- 		term.line[i-n] = temp;
- 	}
- 
--	selscroll(orig, n);
-+	if (term.scr == 0)
-+		selscroll(orig, n);
- }
- 
- void
--tscrollup(int orig, int n)
-+tscrollup(int orig, int n, int copyhist)
- {
- 	int i;
- 	Line temp;
- 
- 	LIMIT(n, 0, term.bot-orig+1);
- 
-+	if (copyhist) {
-+		term.histi = (term.histi + 1) % HISTSIZE;
-+		temp = term.hist[term.histi];
-+		term.hist[term.histi] = term.line[orig];
-+		term.line[orig] = temp;
-+	}
-+
-+	if (term.scr > 0 && term.scr < HISTSIZE)
-+		term.scr = MIN(term.scr + n, HISTSIZE-1);
-+
- 	tclearregion(0, orig, term.col-1, orig+n-1);
- 	tsetdirt(orig+n, term.bot);
- 
-@@ -1095,7 +1156,8 @@ tscrollup(int orig, int n)
- 		term.line[i+n] = temp;
- 	}
- 
--	selscroll(orig, -n);
-+	if (term.scr == 0)
-+		selscroll(orig, -n);
- }
- 
- void
-@@ -1124,7 +1186,7 @@ tnewline(int first_col)
- 	int y = term.c.y;
- 
- 	if (y == term.bot) {
--		tscrollup(term.top, 1);
-+		tscrollup(term.top, 1, 1);
- 	} else {
- 		y++;
- 	}
-@@ -1289,14 +1351,14 @@ void
- tinsertblankline(int n)
- {
- 	if (BETWEEN(term.c.y, term.top, term.bot))
--		tscrolldown(term.c.y, n);
-+		tscrolldown(term.c.y, n, 0);
- }
- 
- void
- tdeleteline(int n)
- {
- 	if (BETWEEN(term.c.y, term.top, term.bot))
--		tscrollup(term.c.y, n);
-+		tscrollup(term.c.y, n, 0);
- }
- 
- int32_t
-@@ -1733,11 +1795,11 @@ csihandle(void)
- 		break;
- 	case 'S': /* SU -- Scroll <n> line up */
- 		DEFAULT(csiescseq.arg[0], 1);
--		tscrollup(term.top, csiescseq.arg[0]);
-+		tscrollup(term.top, csiescseq.arg[0], 0);
- 		break;
- 	case 'T': /* SD -- Scroll <n> line down */
- 		DEFAULT(csiescseq.arg[0], 1);
--		tscrolldown(term.top, csiescseq.arg[0]);
-+		tscrolldown(term.top, csiescseq.arg[0], 0);
- 		break;
- 	case 'L': /* IL -- Insert <n> blank lines */
- 		DEFAULT(csiescseq.arg[0], 1);
-@@ -2241,7 +2303,7 @@ eschandle(uchar ascii)
- 		return 0;
- 	case 'D': /* IND -- Linefeed */
- 		if (term.c.y == term.bot) {
--			tscrollup(term.top, 1);
-+			tscrollup(term.top, 1, 1);
- 		} else {
- 			tmoveto(term.c.x, term.c.y+1);
- 		}
-@@ -2254,7 +2316,7 @@ eschandle(uchar ascii)
- 		break;
- 	case 'M': /* RI -- Reverse index */
- 		if (term.c.y == term.top) {
--			tscrolldown(term.top, 1);
-+			tscrolldown(term.top, 1, 1);
- 		} else {
- 			tmoveto(term.c.x, term.c.y-1);
- 		}
-@@ -2464,7 +2526,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
- void
- tresize(int col, int row)
- {
--	int i;
-+	int i, j;
- 	int minrow = MIN(row, term.row);
- 	int mincol = MIN(col, term.col);
- 	int *bp;
-@@ -2501,6 +2563,14 @@ tresize(int col, int row)
- 	term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
- 	term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
- 
-+	for (i = 0; i < HISTSIZE; i++) {
-+		term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
-+		for (j = mincol; j < col; j++) {
-+			term.hist[i][j] = term.c.attr;
-+			term.hist[i][j].u = ' ';
-+		}
-+	}
-+
- 	/* resize each row to new width, zero-pad if needed */
- 	for (i = 0; i < minrow; i++) {
- 		term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
-@@ -2559,7 +2629,7 @@ drawregion(int x1, int y1, int x2, int y2)
- 			continue;
- 
- 		term.dirty[y] = 0;
--		xdrawline(term.line[y], x1, y, x2);
-+		xdrawline(TLINE(y), x1, y, x2);
- 	}
- }
- 
-@@ -2580,8 +2650,9 @@ draw(void)
- 		cx--;
- 
- 	drawregion(0, 0, term.col, term.row);
--	xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
--			term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
-+	if (term.scr == 0)
-+		xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
-+				term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
- 	term.ocx = cx;
- 	term.ocy = term.c.y;
- 	xfinishdraw();
-diff --git a/st.h b/st.h
-index 3d351b6..f44e1d3 100644
---- a/st.h
-+++ b/st.h
-@@ -81,6 +81,8 @@ void die(const char *, ...);
- void redraw(void);
- void draw(void);
- 
-+void kscrolldown(const Arg *);
-+void kscrollup(const Arg *);
- void printscreen(const Arg *);
- void printsel(const Arg *);
- void sendbreak(const Arg *);
diff --git a/_suckless/st/patches/03-st-externalpipe-0.8.4.diff b/_suckless/st/patches/03-st-externalpipe-0.8.4.diff
deleted file mode 100644
index 297d746..0000000
--- a/_suckless/st/patches/03-st-externalpipe-0.8.4.diff
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/st.c b/st.c
-index 76b7e0d..0e9a614 100644
---- a/st.c
-+++ b/st.c
-@@ -723,8 +723,14 @@ sigchld(int a)
- 	if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
- 		die("waiting for pid %hd failed: %s\n", pid, strerror(errno));
- 
--	if (pid != p)
-+	if (pid != p) {
-+		if (p == 0 && wait(&stat) < 0)
-+			die("wait: %s\n", strerror(errno));
-+
-+		/* reinstall sigchld handler */
-+		signal(SIGCHLD, sigchld);
- 		return;
-+	}
- 
- 	if (WIFEXITED(stat) && WEXITSTATUS(stat))
- 		die("child exited with status %d\n", WEXITSTATUS(stat));
-@@ -1926,6 +1932,59 @@ strparse(void)
- 	}
- }
- 
-+void
-+externalpipe(const Arg *arg)
-+{
-+	int to[2];
-+	char buf[UTF_SIZ];
-+	void (*oldsigpipe)(int);
-+	Glyph *bp, *end;
-+	int lastpos, n, newline;
-+
-+	if (pipe(to) == -1)
-+		return;
-+
-+	switch (fork()) {
-+	case -1:
-+		close(to[0]);
-+		close(to[1]);
-+		return;
-+	case 0:
-+		dup2(to[0], STDIN_FILENO);
-+		close(to[0]);
-+		close(to[1]);
-+		execvp(((char **)arg->v)[0], (char **)arg->v);
-+		fprintf(stderr, "st: execvp %s\n", ((char **)arg->v)[0]);
-+		perror("failed");
-+		exit(0);
-+	}
-+
-+	close(to[0]);
-+	/* ignore sigpipe for now, in case child exists early */
-+	oldsigpipe = signal(SIGPIPE, SIG_IGN);
-+	newline = 0;
-+	for (n = 0; n < term.row; n++) {
-+		bp = term.line[n];
-+		lastpos = MIN(tlinelen(n) + 1, term.col) - 1;
-+		if (lastpos < 0)
-+			break;
-+		end = &bp[lastpos + 1];
-+		for (; bp < end; ++bp)
-+			if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0)
-+				break;
-+		if ((newline = term.line[n][lastpos].mode & ATTR_WRAP))
-+			continue;
-+		if (xwrite(to[1], "\n", 1) < 0)
-+			break;
-+		newline = 0;
-+	}
-+	if (newline)
-+		(void)xwrite(to[1], "\n", 1);
-+	close(to[1]);
-+	/* restore */
-+	signal(SIGPIPE, oldsigpipe);
-+}
-+
- void
- strdump(void)
- {
-diff --git a/st.h b/st.h
-index 3d351b6..392b64e 100644
---- a/st.h
-+++ b/st.h
-@@ -81,6 +81,7 @@ void die(const char *, ...);
- void redraw(void);
- void draw(void);
- 
-+void externalpipe(const Arg *);
- void printscreen(const Arg *);
- void printsel(const Arg *);
- void sendbreak(const Arg *);