diff --git a/_suckless/st/Makefile b/_suckless/st/Makefile
index 6f1855e..d286a95 100644
--- a/_suckless/st/Makefile
+++ b/_suckless/st/Makefile
@@ -4,7 +4,7 @@
 
 include config.mk
 
-SRC = st.c x.c boxdraw.c hb.c
+SRC = st.c x.c hb.c
 OBJ = $(SRC:.c=.o)
 
 all: options st
@@ -24,7 +24,6 @@ config.h:
 st.o: config.h st.h win.h
 x.o: arg.h config.h st.h win.h hb.h
 hb.o: st.h
-boxdraw.o: config.h st.h boxdraw_data.h
 
 $(OBJ): config.h config.mk
 
diff --git a/_suckless/st/boxdraw.c b/_suckless/st/boxdraw.c
deleted file mode 100644
index 28a92d0..0000000
--- a/_suckless/st/boxdraw.c
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
- * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
- * MIT/X Consortium License
- */
-
-#include <X11/Xft/Xft.h>
-#include "st.h"
-#include "boxdraw_data.h"
-
-/* Rounded non-negative integers division of n / d  */
-#define DIV(n, d) (((n) + (d) / 2) / (d))
-
-static Display *xdpy;
-static Colormap xcmap;
-static XftDraw *xd;
-static Visual *xvis;
-
-static void drawbox(int, int, int, int, XftColor *, XftColor *, ushort);
-static void drawboxlines(int, int, int, int, XftColor *, ushort);
-
-/* public API */
-
-void
-boxdraw_xinit(Display *dpy, Colormap cmap, XftDraw *draw, Visual *vis)
-{
-	xdpy = dpy; xcmap = cmap; xd = draw, xvis = vis;
-}
-
-int
-isboxdraw(Rune u)
-{
-	Rune block = u & ~0xff;
-	return (boxdraw && block == 0x2500 && boxdata[(uint8_t)u]) ||
-	       (boxdraw_braille && block == 0x2800);
-}
-
-/* the "index" is actually the entire shape data encoded as ushort */
-ushort
-boxdrawindex(const Glyph *g)
-{
-	if (boxdraw_braille && (g->u & ~0xff) == 0x2800)
-		return BRL | (uint8_t)g->u;
-	if (boxdraw_bold && (g->mode & ATTR_BOLD))
-		return BDB | boxdata[(uint8_t)g->u];
-	return boxdata[(uint8_t)g->u];
-}
-
-void
-drawboxes(int x, int y, int cw, int ch, XftColor *fg, XftColor *bg,
-          const XftGlyphFontSpec *specs, int len)
-{
-	for ( ; len-- > 0; x += cw, specs++)
-		drawbox(x, y, cw, ch, fg, bg, (ushort)specs->glyph);
-}
-
-/* implementation */
-
-void
-drawbox(int x, int y, int w, int h, XftColor *fg, XftColor *bg, ushort bd)
-{
-	ushort cat = bd & ~(BDB | 0xff);  /* mask out bold and data */
-	if (bd & (BDL | BDA)) {
-		/* lines (light/double/heavy/arcs) */
-		drawboxlines(x, y, w, h, fg, bd);
-
-	} else if (cat == BBD) {
-		/* lower (8-X)/8 block */
-		int d = DIV((uint8_t)bd * h, 8);
-		XftDrawRect(xd, fg, x, y + d, w, h - d);
-
-	} else if (cat == BBU) {
-		/* upper X/8 block */
-		XftDrawRect(xd, fg, x, y, w, DIV((uint8_t)bd * h, 8));
-
-	} else if (cat == BBL) {
-		/* left X/8 block */
-		XftDrawRect(xd, fg, x, y, DIV((uint8_t)bd * w, 8), h);
-
-	} else if (cat == BBR) {
-		/* right (8-X)/8 block */
-		int d = DIV((uint8_t)bd * w, 8);
-		XftDrawRect(xd, fg, x + d, y, w - d, h);
-
-	} else if (cat == BBQ) {
-		/* Quadrants */
-		int w2 = DIV(w, 2), h2 = DIV(h, 2);
-		if (bd & TL)
-			XftDrawRect(xd, fg, x, y, w2, h2);
-		if (bd & TR)
-			XftDrawRect(xd, fg, x + w2, y, w - w2, h2);
-		if (bd & BL)
-			XftDrawRect(xd, fg, x, y + h2, w2, h - h2);
-		if (bd & BR)
-			XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2);
-
-	} else if (bd & BBS) {
-		/* Shades - data is 1/2/3 for 25%/50%/75% alpha, respectively */
-		int d = (uint8_t)bd;
-		XftColor xfc;
-		XRenderColor xrc = { .alpha = 0xffff };
-
-		xrc.red = DIV(fg->color.red * d + bg->color.red * (4 - d), 4);
-		xrc.green = DIV(fg->color.green * d + bg->color.green * (4 - d), 4);
-		xrc.blue = DIV(fg->color.blue * d + bg->color.blue * (4 - d), 4);
-
-		XftColorAllocValue(xdpy, xvis, xcmap, &xrc, &xfc);
-		XftDrawRect(xd, &xfc, x, y, w, h);
-		XftColorFree(xdpy, xvis, xcmap, &xfc);
-
-	} else if (cat == BRL) {
-		/* braille, each data bit corresponds to one dot at 2x4 grid */
-		int w1 = DIV(w, 2);
-		int h1 = DIV(h, 4), h2 = DIV(h, 2), h3 = DIV(3 * h, 4);
-
-		if (bd & 1)   XftDrawRect(xd, fg, x, y, w1, h1);
-		if (bd & 2)   XftDrawRect(xd, fg, x, y + h1, w1, h2 - h1);
-		if (bd & 4)   XftDrawRect(xd, fg, x, y + h2, w1, h3 - h2);
-		if (bd & 8)   XftDrawRect(xd, fg, x + w1, y, w - w1, h1);
-		if (bd & 16)  XftDrawRect(xd, fg, x + w1, y + h1, w - w1, h2 - h1);
-		if (bd & 32)  XftDrawRect(xd, fg, x + w1, y + h2, w - w1, h3 - h2);
-		if (bd & 64)  XftDrawRect(xd, fg, x, y + h3, w1, h - h3);
-		if (bd & 128) XftDrawRect(xd, fg, x + w1, y + h3, w - w1, h - h3);
-
-	}
-}
-
-void
-drawboxlines(int x, int y, int w, int h, XftColor *fg, ushort bd)
-{
-	/* s: stem thickness. width/8 roughly matches underscore thickness. */
-	/* We draw bold as 1.5 * normal-stem and at least 1px thicker.      */
-	/* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */
-	int mwh = MIN(w, h);
-	int base_s = MAX(1, DIV(mwh, 8));
-	int bold = (bd & BDB) && mwh >= 6;  /* possibly ignore boldness */
-	int s = bold ? MAX(base_s + 1, DIV(3 * base_s, 2)) : base_s;
-	int w2 = DIV(w - s, 2), h2 = DIV(h - s, 2);
-	/* the s-by-s square (x + w2, y + h2, s, s) is the center texel.    */
-	/* The base length (per direction till edge) includes this square.  */
-
-	int light = bd & (LL | LU | LR | LD);
-	int double_ = bd & (DL | DU | DR | DD);
-
-	if (light) {
-		/* d: additional (negative) length to not-draw the center   */
-		/* texel - at arcs and avoid drawing inside (some) doubles  */
-		int arc = bd & BDA;
-		int multi_light = light & (light - 1);
-		int multi_double = double_ & (double_ - 1);
-		/* light crosses double only at DH+LV, DV+LH (ref. shapes)  */
-		int d = arc || (multi_double && !multi_light) ? -s : 0;
-
-		if (bd & LL)
-			XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s);
-		if (bd & LU)
-			XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d);
-		if (bd & LR)
-			XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s);
-		if (bd & LD)
-			XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d);
-	}
-
-	/* double lines - also align with light to form heavy when combined */
-	if (double_) {
-		/*
-		* going clockwise, for each double-ray: p is additional length
-		* to the single-ray nearer to the previous direction, and n to
-		* the next. p and n adjust from the base length to lengths
-		* which consider other doubles - shorter to avoid intersections
-		* (p, n), or longer to draw the far-corner texel (n).
-		*/
-		int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD;
-		if (dl) {
-			int p = dd ? -s : 0, n = du ? -s : dd ? s : 0;
-			XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s);
-			XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s);
-		}
-		if (du) {
-			int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0;
-			XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p);
-			XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n);
-		}
-		if (dr) {
-			int p = du ? -s : 0, n = dd ? -s : du ? s : 0;
-			XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s);
-			XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s);
-		}
-		if (dd) {
-			int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0;
-			XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p);
-			XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n);
-		}
-	}
-}
diff --git a/_suckless/st/boxdraw_data.h b/_suckless/st/boxdraw_data.h
deleted file mode 100644
index 7890500..0000000
--- a/_suckless/st/boxdraw_data.h
+++ /dev/null
@@ -1,214 +0,0 @@
-/*
- * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
- * MIT/X Consortium License
- */
-
-/*
- * U+25XX codepoints data
- *
- * References:
- *   http://www.unicode.org/charts/PDF/U2500.pdf
- *   http://www.unicode.org/charts/PDF/U2580.pdf
- *
- * Test page:
- *   https://github.com/GNOME/vte/blob/master/doc/boxes.txt
- */
-
-/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */
-/* Categories (mutually exclusive except BDB): */
-/* For convenience, BDL/BDA/BBS/BDB are 1 bit each, the rest are enums */
-#define BDL (1<<8)   /* Box Draw Lines (light/double/heavy) */
-#define BDA (1<<9)   /* Box Draw Arc (light) */
-
-#define BBD (1<<10)  /* Box Block Down (lower) X/8 */
-#define BBL (2<<10)  /* Box Block Left X/8 */
-#define BBU (3<<10)  /* Box Block Upper X/8 */
-#define BBR (4<<10)  /* Box Block Right X/8 */
-#define BBQ (5<<10)  /* Box Block Quadrants */
-#define BRL (6<<10)  /* Box Braille (data is lower byte of U28XX) */
-
-#define BBS (1<<14)  /* Box Block Shades */
-#define BDB (1<<15)  /* Box Draw is Bold */
-
-/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical      */
-/* Heavy is light+double (literally drawing light+double align to form heavy) */
-#define LL (1<<0)
-#define LU (1<<1)
-#define LR (1<<2)
-#define LD (1<<3)
-#define LH (LL+LR)
-#define LV (LU+LD)
-
-#define DL (1<<4)
-#define DU (1<<5)
-#define DR (1<<6)
-#define DD (1<<7)
-#define DH (DL+DR)
-#define DV (DU+DD)
-
-#define HL (LL+DL)
-#define HU (LU+DU)
-#define HR (LR+DR)
-#define HD (LD+DD)
-#define HH (HL+HR)
-#define HV (HU+HD)
-
-/* (BBQ) Quadrants Top/Bottom x Left/Right */
-#define TL (1<<0)
-#define TR (1<<1)
-#define BL (1<<2)
-#define BR (1<<3)
-
-/* Data for U+2500 - U+259F except dashes/diagonals */
-static const unsigned short boxdata[256] = {
-	/* light lines */
-	[0x00] = BDL + LH,       /* light horizontal */
-	[0x02] = BDL + LV,       /* light vertical */
-	[0x0c] = BDL + LD + LR,  /* light down and right */
-	[0x10] = BDL + LD + LL,  /* light down and left */
-	[0x14] = BDL + LU + LR,  /* light up and right */
-	[0x18] = BDL + LU + LL,  /* light up and left */
-	[0x1c] = BDL + LV + LR,  /* light vertical and right */
-	[0x24] = BDL + LV + LL,  /* light vertical and left */
-	[0x2c] = BDL + LH + LD,  /* light horizontal and down */
-	[0x34] = BDL + LH + LU,  /* light horizontal and up */
-	[0x3c] = BDL + LV + LH,  /* light vertical and horizontal */
-	[0x74] = BDL + LL,       /* light left */
-	[0x75] = BDL + LU,       /* light up */
-	[0x76] = BDL + LR,       /* light right */
-	[0x77] = BDL + LD,       /* light down */
-
-	/* heavy [+light] lines */
-	[0x01] = BDL + HH,
-	[0x03] = BDL + HV,
-	[0x0d] = BDL + HR + LD,
-	[0x0e] = BDL + HD + LR,
-	[0x0f] = BDL + HD + HR,
-	[0x11] = BDL + HL + LD,
-	[0x12] = BDL + HD + LL,
-	[0x13] = BDL + HD + HL,
-	[0x15] = BDL + HR + LU,
-	[0x16] = BDL + HU + LR,
-	[0x17] = BDL + HU + HR,
-	[0x19] = BDL + HL + LU,
-	[0x1a] = BDL + HU + LL,
-	[0x1b] = BDL + HU + HL,
-	[0x1d] = BDL + HR + LV,
-	[0x1e] = BDL + HU + LD + LR,
-	[0x1f] = BDL + HD + LR + LU,
-	[0x20] = BDL + HV + LR,
-	[0x21] = BDL + HU + HR + LD,
-	[0x22] = BDL + HD + HR + LU,
-	[0x23] = BDL + HV + HR,
-	[0x25] = BDL + HL + LV,
-	[0x26] = BDL + HU + LD + LL,
-	[0x27] = BDL + HD + LU + LL,
-	[0x28] = BDL + HV + LL,
-	[0x29] = BDL + HU + HL + LD,
-	[0x2a] = BDL + HD + HL + LU,
-	[0x2b] = BDL + HV + HL,
-	[0x2d] = BDL + HL + LD + LR,
-	[0x2e] = BDL + HR + LL + LD,
-	[0x2f] = BDL + HH + LD,
-	[0x30] = BDL + HD + LH,
-	[0x31] = BDL + HD + HL + LR,
-	[0x32] = BDL + HR + HD + LL,
-	[0x33] = BDL + HH + HD,
-	[0x35] = BDL + HL + LU + LR,
-	[0x36] = BDL + HR + LU + LL,
-	[0x37] = BDL + HH + LU,
-	[0x38] = BDL + HU + LH,
-	[0x39] = BDL + HU + HL + LR,
-	[0x3a] = BDL + HU + HR + LL,
-	[0x3b] = BDL + HH + HU,
-	[0x3d] = BDL + HL + LV + LR,
-	[0x3e] = BDL + HR + LV + LL,
-	[0x3f] = BDL + HH + LV,
-	[0x40] = BDL + HU + LH + LD,
-	[0x41] = BDL + HD + LH + LU,
-	[0x42] = BDL + HV + LH,
-	[0x43] = BDL + HU + HL + LD + LR,
-	[0x44] = BDL + HU + HR + LD + LL,
-	[0x45] = BDL + HD + HL + LU + LR,
-	[0x46] = BDL + HD + HR + LU + LL,
-	[0x47] = BDL + HH + HU + LD,
-	[0x48] = BDL + HH + HD + LU,
-	[0x49] = BDL + HV + HL + LR,
-	[0x4a] = BDL + HV + HR + LL,
-	[0x4b] = BDL + HV + HH,
-	[0x78] = BDL + HL,
-	[0x79] = BDL + HU,
-	[0x7a] = BDL + HR,
-	[0x7b] = BDL + HD,
-	[0x7c] = BDL + HR + LL,
-	[0x7d] = BDL + HD + LU,
-	[0x7e] = BDL + HL + LR,
-	[0x7f] = BDL + HU + LD,
-
-	/* double [+light] lines */
-	[0x50] = BDL + DH,
-	[0x51] = BDL + DV,
-	[0x52] = BDL + DR + LD,
-	[0x53] = BDL + DD + LR,
-	[0x54] = BDL + DR + DD,
-	[0x55] = BDL + DL + LD,
-	[0x56] = BDL + DD + LL,
-	[0x57] = BDL + DL + DD,
-	[0x58] = BDL + DR + LU,
-	[0x59] = BDL + DU + LR,
-	[0x5a] = BDL + DU + DR,
-	[0x5b] = BDL + DL + LU,
-	[0x5c] = BDL + DU + LL,
-	[0x5d] = BDL + DL + DU,
-	[0x5e] = BDL + DR + LV,
-	[0x5f] = BDL + DV + LR,
-	[0x60] = BDL + DV + DR,
-	[0x61] = BDL + DL + LV,
-	[0x62] = BDL + DV + LL,
-	[0x63] = BDL + DV + DL,
-	[0x64] = BDL + DH + LD,
-	[0x65] = BDL + DD + LH,
-	[0x66] = BDL + DD + DH,
-	[0x67] = BDL + DH + LU,
-	[0x68] = BDL + DU + LH,
-	[0x69] = BDL + DH + DU,
-	[0x6a] = BDL + DH + LV,
-	[0x6b] = BDL + DV + LH,
-	[0x6c] = BDL + DH + DV,
-
-	/* (light) arcs */
-	[0x6d] = BDA + LD + LR,
-	[0x6e] = BDA + LD + LL,
-	[0x6f] = BDA + LU + LL,
-	[0x70] = BDA + LU + LR,
-
-	/* Lower (Down) X/8 block (data is 8 - X) */
-	[0x81] = BBD + 7, [0x82] = BBD + 6, [0x83] = BBD + 5, [0x84] = BBD + 4,
-	[0x85] = BBD + 3, [0x86] = BBD + 2, [0x87] = BBD + 1, [0x88] = BBD + 0,
-
-	/* Left X/8 block (data is X) */
-	[0x89] = BBL + 7, [0x8a] = BBL + 6, [0x8b] = BBL + 5, [0x8c] = BBL + 4,
-	[0x8d] = BBL + 3, [0x8e] = BBL + 2, [0x8f] = BBL + 1,
-
-	/* upper 1/2 (4/8), 1/8 block (X), right 1/2, 1/8 block (8-X) */
-	[0x80] = BBU + 4, [0x94] = BBU + 1,
-	[0x90] = BBR + 4, [0x95] = BBR + 7,
-
-	/* Quadrants */
-	[0x96] = BBQ + BL,
-	[0x97] = BBQ + BR,
-	[0x98] = BBQ + TL,
-	[0x99] = BBQ + TL + BL + BR,
-	[0x9a] = BBQ + TL + BR,
-	[0x9b] = BBQ + TL + TR + BL,
-	[0x9c] = BBQ + TL + TR + BR,
-	[0x9d] = BBQ + TR,
-	[0x9e] = BBQ + BL + TR,
-	[0x9f] = BBQ + BL + TR + BR,
-
-	/* Shades, data is an alpha value in 25% units (1/4, 1/2, 3/4) */
-	[0x91] = BBS + 1, [0x92] = BBS + 2, [0x93] = BBS + 3,
-
-	/* U+2504 - U+250B, U+254C - U+254F: unsupported (dashes) */
-	/* U+2571 - U+2573: unsupported (diagonals) */
-};
diff --git a/_suckless/st/config.def.h b/_suckless/st/config.def.h
index 5f6d7d2..e607430 100644
--- a/_suckless/st/config.def.h
+++ b/_suckless/st/config.def.h
@@ -73,18 +73,6 @@ static unsigned int blinktimeout = 800;
  */
 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 = 0;
-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
@@ -196,8 +184,6 @@ static uint forcemousemod = ShiftMask;
  */
 static MouseShortcut mshortcuts[] = {
 	/* mask                 button   function        argument       release */
- 	{ ShiftMask,            Button4, kscrollup,      {.i = 1} },
-	{ ShiftMask,            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"} },
diff --git a/_suckless/st/config.h b/_suckless/st/config.h
index afe1839..83966a6 100644
--- a/_suckless/st/config.h
+++ b/_suckless/st/config.h
@@ -68,18 +68,6 @@ static unsigned int blinktimeout = 800;
  */
 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 = 0;
-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
diff --git a/_suckless/st/hb.c b/_suckless/st/hb.c
index 467bcac..4846d22 100644
--- a/_suckless/st/hb.c
+++ b/_suckless/st/hb.c
@@ -7,6 +7,8 @@
 
 #include "st.h"
 
+#define FEATURE(c1,c2,c3,c4) { .tag = HB_TAG(c1,c2,c3,c4), .value = 1, .start = HB_FEATURE_GLOBAL_START, .end = HB_FEATURE_GLOBAL_END }
+
 void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
 hb_font_t *hbfindfont(XftFont *match);
 
@@ -18,6 +20,12 @@ typedef struct {
 static int hbfontslen = 0;
 static HbFontMatch *hbfontcache = NULL;
 
+/*
+ * Replace 0 with a list of font features, wrapped in FEATURE macro, e.g.
+ * FEATURE('c', 'a', 'l', 't'), FEATURE('d', 'l', 'i', 'g')
+ */
+hb_feature_t features[] = { 0 };
+
 void
 hbunloadfonts()
 {
@@ -59,7 +67,7 @@ void
 hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
 {
 	int start = 0, length = 1, gstart = 0;
-	hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
+	hb_codepoint_t *codepoints = calloc((unsigned int)len, sizeof(hb_codepoint_t));
 
 	for (int idx = 1, specidx = 1; idx < len; idx++) {
 		if (glyphs[idx].mode & ATTR_WDUMMY) {
@@ -88,10 +96,6 @@ hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int
 	for (int i = 0, specidx = 0; i < len; i++) {
 		if (glyphs[i].mode & ATTR_WDUMMY)
 			continue;
-		if (glyphs[i].mode & ATTR_BOXDRAW) {
-			specidx++;
-			continue;
-		}
 
 		if (codepoints[i] != specs[specidx].glyph)
 			((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
@@ -124,7 +128,7 @@ hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoin
 	}
 
 	/* Shape the segment. */
-	hb_shape(font, buffer, NULL, 0);
+	hb_shape(font, buffer, features, sizeof(features));
 
 	/* Get new glyph info. */
 	hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
diff --git a/_suckless/st/hb.h b/_suckless/st/hb.h
index b3e02d0..07888df 100644
--- a/_suckless/st/hb.h
+++ b/_suckless/st/hb.h
@@ -4,4 +4,3 @@
 
 void hbunloadfonts();
 void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
-
diff --git a/_suckless/st/patches/st-alpha-0.8.2.diff b/_suckless/st/patches/00-st-alpha-0.8.2.diff
similarity index 100%
rename from _suckless/st/patches/st-alpha-0.8.2.diff
rename to _suckless/st/patches/00-st-alpha-0.8.2.diff
diff --git a/_suckless/st/patches/st-externalpipe-0.8.4.diff b/_suckless/st/patches/01-st-externalpipe-0.8.4.diff
similarity index 100%
rename from _suckless/st/patches/st-externalpipe-0.8.4.diff
rename to _suckless/st/patches/01-st-externalpipe-0.8.4.diff
diff --git a/_suckless/st/patches/st-font2-20190416-ba72400.diff b/_suckless/st/patches/02-st-font2-20190416-ba72400.diff
similarity index 100%
rename from _suckless/st/patches/st-font2-20190416-ba72400.diff
rename to _suckless/st/patches/02-st-font2-20190416-ba72400.diff
diff --git a/_suckless/st/patches/st-scrollback-0.8.4.diff b/_suckless/st/patches/03-st-scrollback-0.8.4.diff
similarity index 100%
rename from _suckless/st/patches/st-scrollback-0.8.4.diff
rename to _suckless/st/patches/03-st-scrollback-0.8.4.diff
diff --git a/_suckless/st/patches/st-ligatures-boxdraw-20200430-0.8.3.diff b/_suckless/st/patches/04-st-ligatures-alpha-scrollback-20210824-0.8.4.diff
similarity index 83%
rename from _suckless/st/patches/st-ligatures-boxdraw-20200430-0.8.3.diff
rename to _suckless/st/patches/04-st-ligatures-alpha-scrollback-20210824-0.8.4.diff
index f92c28d..0db9356 100644
--- a/_suckless/st/patches/st-ligatures-boxdraw-20200430-0.8.3.diff
+++ b/_suckless/st/patches/04-st-ligatures-alpha-scrollback-20210824-0.8.4.diff
@@ -1,13 +1,13 @@
 diff --git a/Makefile b/Makefile
-index 6dfa212..2ffd3c8 100644
+index 470ac86..38240da 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -4,7 +4,7 @@
  
  include config.mk
  
--SRC = st.c x.c boxdraw.c
-+SRC = st.c x.c boxdraw.c hb.c
+-SRC = st.c x.c
++SRC = st.c x.c hb.c
  OBJ = $(SRC:.c=.o)
  
  all: options st
@@ -18,11 +18,11 @@ index 6dfa212..2ffd3c8 100644
 -x.o: arg.h config.h st.h win.h
 +x.o: arg.h config.h st.h win.h hb.h
 +hb.o: st.h
- boxdraw.o: config.h st.h boxdraw_data.h
  
  $(OBJ): config.h config.mk
+ 
 diff --git a/config.mk b/config.mk
-index beafc35..3df5c83 100644
+index aaa54ff..1741840 100644
 --- a/config.mk
 +++ b/config.mk
 @@ -15,10 +15,12 @@ PKG_CONFIG = pkg-config
@@ -32,7 +32,7 @@ index beafc35..3df5c83 100644
 -       `$(PKG_CONFIG) --cflags freetype2`
 +       `$(PKG_CONFIG) --cflags freetype2` \
 +       `$(PKG_CONFIG) --cflags harfbuzz`
- LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
+ LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
         `$(PKG_CONFIG) --libs fontconfig` \
 -       `$(PKG_CONFIG) --libs freetype2`
 +       `$(PKG_CONFIG) --libs freetype2` \
@@ -42,10 +42,10 @@ index beafc35..3df5c83 100644
  STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
 diff --git a/hb.c b/hb.c
 new file mode 100644
-index 0000000..467bcac
+index 0000000..f9c4f76
 --- /dev/null
 +++ b/hb.c
-@@ -0,0 +1,140 @@
+@@ -0,0 +1,144 @@
 +#include <stdlib.h>
 +#include <stdio.h>
 +#include <math.h>
@@ -55,6 +55,8 @@ index 0000000..467bcac
 +
 +#include "st.h"
 +
++#define FEATURE(c1,c2,c3,c4) { .tag = HB_TAG(c1,c2,c3,c4), .value = 1, .start = HB_FEATURE_GLOBAL_START, .end = HB_FEATURE_GLOBAL_END }
++
 +void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
 +hb_font_t *hbfindfont(XftFont *match);
 +
@@ -66,6 +68,12 @@ index 0000000..467bcac
 +static int hbfontslen = 0;
 +static HbFontMatch *hbfontcache = NULL;
 +
++/*
++ * Replace 0 with a list of font features, wrapped in FEATURE macro, e.g.
++ * FEATURE('c', 'a', 'l', 't'), FEATURE('d', 'l', 'i', 'g')
++ */
++hb_feature_t features[] = { 0 };
++
 +void
 +hbunloadfonts()
 +{
@@ -107,7 +115,7 @@ index 0000000..467bcac
 +hbtransform(XftGlyphFontSpec *specs, const Glyph *glyphs, size_t len, int x, int y)
 +{
 +	int start = 0, length = 1, gstart = 0;
-+	hb_codepoint_t *codepoints = calloc(len, sizeof(hb_codepoint_t));
++	hb_codepoint_t *codepoints = calloc((unsigned int)len, sizeof(hb_codepoint_t));
 +
 +	for (int idx = 1, specidx = 1; idx < len; idx++) {
 +		if (glyphs[idx].mode & ATTR_WDUMMY) {
@@ -136,10 +144,6 @@ index 0000000..467bcac
 +	for (int i = 0, specidx = 0; i < len; i++) {
 +		if (glyphs[i].mode & ATTR_WDUMMY)
 +			continue;
-+		if (glyphs[i].mode & ATTR_BOXDRAW) {
-+			specidx++;
-+			continue;
-+		}
 +
 +		if (codepoints[i] != specs[specidx].glyph)
 +			((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
@@ -172,7 +176,7 @@ index 0000000..467bcac
 +	}
 +
 +	/* Shape the segment. */
-+	hb_shape(font, buffer, NULL, 0);
++	hb_shape(font, buffer, features, sizeof(features));
 +
 +	/* Get new glyph info. */
 +	hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
@@ -188,33 +192,32 @@ index 0000000..467bcac
 +}
 diff --git a/hb.h b/hb.h
 new file mode 100644
-index 0000000..b3e02d0
+index 0000000..07888df
 --- /dev/null
 +++ b/hb.h
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,6 @@
 +#include <X11/Xft/Xft.h>
 +#include <hb.h>
 +#include <hb-ft.h>
 +
 +void hbunloadfonts();
 +void hbtransform(XftGlyphFontSpec *, const Glyph *, size_t, int, int);
-+
 diff --git a/st.c b/st.c
-index c035e19..13cbcf7 100644
+index edec064..ea13c13 100644
 --- a/st.c
 +++ b/st.c
-@@ -2602,7 +2602,8 @@ draw(void)
- 
+@@ -2652,7 +2652,8 @@ draw(void)
  	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]);
-+			term.ocx, term.ocy, term.line[term.ocy][term.ocx],
-+			term.line[term.ocy], term.col);
+ 	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, term.ocy, term.line[term.ocy][term.ocx],
++				term.line[term.ocy], term.col);
  	term.ocx = cx;
  	term.ocy = term.c.y;
  	xfinishdraw();
 diff --git a/st.h b/st.h
-index a6c382a..c7e79c6 100644
+index 7ea2fd3..089b92d 100644
 --- a/st.h
 +++ b/st.h
 @@ -11,7 +11,8 @@
@@ -227,11 +230,11 @@ index a6c382a..c7e79c6 100644
  				(a).bg != (b).bg)
  #define TIMEDIFF(t1, t2)	((t1.tv_sec-t2.tv_sec)*1000 + \
  				(t1.tv_nsec-t2.tv_nsec)/1E6)
-@@ -34,6 +35,7 @@ enum glyph_attribute {
+@@ -33,6 +34,7 @@ enum glyph_attribute {
+ 	ATTR_WRAP       = 1 << 8,
  	ATTR_WIDE       = 1 << 9,
  	ATTR_WDUMMY     = 1 << 10,
- 	ATTR_BOXDRAW    = 1 << 11,
-+	ATTR_LIGA       = 1 << 12,
++	ATTR_LIGA       = 1 << 11,
  	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
  };
  
@@ -249,7 +252,7 @@ index a6ef1b9..bc0d180 100644
  void xfinishdraw(void);
  void xloadcols(void);
 diff --git a/x.c b/x.c
-index 6f7ea2c..a79384c 100644
+index 73545d8..9e980e3 100644
 --- a/x.c
 +++ b/x.c
 @@ -19,6 +19,7 @@ char *argv0;
@@ -260,7 +263,7 @@ index 6f7ea2c..a79384c 100644
  
  /* types used in config.h */
  typedef struct {
-@@ -1031,6 +1032,9 @@ xunloadfont(Font *f)
+@@ -1040,6 +1041,9 @@ xunloadfont(Font *f)
  void
  xunloadfonts(void)
  {
@@ -270,7 +273,7 @@ index 6f7ea2c..a79384c 100644
  	/* Free the loaded fonts in the font cache.  */
  	while (frclen > 0)
  		XftFontClose(xw.dpy, frc[--frclen].font);
-@@ -1231,7 +1235,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+@@ -1246,7 +1250,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
  		mode = glyphs[i].mode;
  
  		/* Skip dummy wide-character spacing. */
@@ -279,7 +282,7 @@ index 6f7ea2c..a79384c 100644
  			continue;
  
  		/* Determine font for glyph if different from previous glyph. */
-@@ -1343,6 +1347,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
+@@ -1353,6 +1357,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
  		numspecs++;
  	}
  
@@ -289,7 +292,7 @@ index 6f7ea2c..a79384c 100644
  	return numspecs;
  }
  
-@@ -1496,14 +1503,17 @@ xdrawglyph(Glyph g, int x, int y)
+@@ -1502,14 +1509,17 @@ xdrawglyph(Glyph g, int x, int y)
  }
  
  void
diff --git a/_suckless/st/patches/st-boxdraw_v2-0.8.3.diff b/_suckless/st/patches/st-boxdraw_v2-0.8.3.diff
deleted file mode 100644
index 04a868c..0000000
--- a/_suckless/st/patches/st-boxdraw_v2-0.8.3.diff
+++ /dev/null
@@ -1,600 +0,0 @@
-From 3f3b80b9966c60086f4ed80ce4de0cbf03468d36 Mon Sep 17 00:00:00 2001
-From: "Avi Halachmi (:avih)" <avihpit@yahoo.com>
-Date: Wed, 26 Dec 2018 14:51:45 +0200
-Subject: [PATCH] boxdraw_v2: custom render lines/blocks/braille for perfect
- alignment
-
-It seems impossible to ensure that blocks and line drawing glyphs
-align without visible gaps for all combinations of arbitrary font,
-size and width/height scale factor.
-
-This commit adds options to render most of the lines/blocks and
-braille codepoints without using the font such that they align
-perfectly regardless of font, size or other configuration values.
-
-Supported codepoints are U+2500 - U+259F except dashes/diagonals,
-and U28XX.
-
-The lines/blocks data is stored as 16-bit values at boxdraw_data.h
-
-boxdraw/braille are independent, disabled by default at config[.def].h
----
- Makefile       |   3 +-
- boxdraw.c      | 194 ++++++++++++++++++++++++++++++++++++++++++++
- boxdraw_data.h | 214 +++++++++++++++++++++++++++++++++++++++++++++++++
- config.def.h   |  12 +++
- st.c           |   3 +
- st.h           |  10 +++
- x.c            |  21 +++--
- 7 files changed, 451 insertions(+), 6 deletions(-)
- create mode 100644 boxdraw.c
- create mode 100644 boxdraw_data.h
-
-diff --git a/Makefile b/Makefile
-index 470ac86..6dfa212 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,7 +4,7 @@
- 
- include config.mk
- 
--SRC = st.c x.c
-+SRC = st.c x.c boxdraw.c
- OBJ = $(SRC:.c=.o)
- 
- all: options st
-@@ -23,6 +23,7 @@ config.h:
- 
- st.o: config.h st.h win.h
- x.o: arg.h config.h st.h win.h
-+boxdraw.o: config.h st.h boxdraw_data.h
- 
- $(OBJ): config.h config.mk
- 
-diff --git a/boxdraw.c b/boxdraw.c
-new file mode 100644
-index 0000000..28a92d0
---- /dev/null
-+++ b/boxdraw.c
-@@ -0,0 +1,194 @@
-+/*
-+ * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
-+ * MIT/X Consortium License
-+ */
-+
-+#include <X11/Xft/Xft.h>
-+#include "st.h"
-+#include "boxdraw_data.h"
-+
-+/* Rounded non-negative integers division of n / d  */
-+#define DIV(n, d) (((n) + (d) / 2) / (d))
-+
-+static Display *xdpy;
-+static Colormap xcmap;
-+static XftDraw *xd;
-+static Visual *xvis;
-+
-+static void drawbox(int, int, int, int, XftColor *, XftColor *, ushort);
-+static void drawboxlines(int, int, int, int, XftColor *, ushort);
-+
-+/* public API */
-+
-+void
-+boxdraw_xinit(Display *dpy, Colormap cmap, XftDraw *draw, Visual *vis)
-+{
-+	xdpy = dpy; xcmap = cmap; xd = draw, xvis = vis;
-+}
-+
-+int
-+isboxdraw(Rune u)
-+{
-+	Rune block = u & ~0xff;
-+	return (boxdraw && block == 0x2500 && boxdata[(uint8_t)u]) ||
-+	       (boxdraw_braille && block == 0x2800);
-+}
-+
-+/* the "index" is actually the entire shape data encoded as ushort */
-+ushort
-+boxdrawindex(const Glyph *g)
-+{
-+	if (boxdraw_braille && (g->u & ~0xff) == 0x2800)
-+		return BRL | (uint8_t)g->u;
-+	if (boxdraw_bold && (g->mode & ATTR_BOLD))
-+		return BDB | boxdata[(uint8_t)g->u];
-+	return boxdata[(uint8_t)g->u];
-+}
-+
-+void
-+drawboxes(int x, int y, int cw, int ch, XftColor *fg, XftColor *bg,
-+          const XftGlyphFontSpec *specs, int len)
-+{
-+	for ( ; len-- > 0; x += cw, specs++)
-+		drawbox(x, y, cw, ch, fg, bg, (ushort)specs->glyph);
-+}
-+
-+/* implementation */
-+
-+void
-+drawbox(int x, int y, int w, int h, XftColor *fg, XftColor *bg, ushort bd)
-+{
-+	ushort cat = bd & ~(BDB | 0xff);  /* mask out bold and data */
-+	if (bd & (BDL | BDA)) {
-+		/* lines (light/double/heavy/arcs) */
-+		drawboxlines(x, y, w, h, fg, bd);
-+
-+	} else if (cat == BBD) {
-+		/* lower (8-X)/8 block */
-+		int d = DIV((uint8_t)bd * h, 8);
-+		XftDrawRect(xd, fg, x, y + d, w, h - d);
-+
-+	} else if (cat == BBU) {
-+		/* upper X/8 block */
-+		XftDrawRect(xd, fg, x, y, w, DIV((uint8_t)bd * h, 8));
-+
-+	} else if (cat == BBL) {
-+		/* left X/8 block */
-+		XftDrawRect(xd, fg, x, y, DIV((uint8_t)bd * w, 8), h);
-+
-+	} else if (cat == BBR) {
-+		/* right (8-X)/8 block */
-+		int d = DIV((uint8_t)bd * w, 8);
-+		XftDrawRect(xd, fg, x + d, y, w - d, h);
-+
-+	} else if (cat == BBQ) {
-+		/* Quadrants */
-+		int w2 = DIV(w, 2), h2 = DIV(h, 2);
-+		if (bd & TL)
-+			XftDrawRect(xd, fg, x, y, w2, h2);
-+		if (bd & TR)
-+			XftDrawRect(xd, fg, x + w2, y, w - w2, h2);
-+		if (bd & BL)
-+			XftDrawRect(xd, fg, x, y + h2, w2, h - h2);
-+		if (bd & BR)
-+			XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2);
-+
-+	} else if (bd & BBS) {
-+		/* Shades - data is 1/2/3 for 25%/50%/75% alpha, respectively */
-+		int d = (uint8_t)bd;
-+		XftColor xfc;
-+		XRenderColor xrc = { .alpha = 0xffff };
-+
-+		xrc.red = DIV(fg->color.red * d + bg->color.red * (4 - d), 4);
-+		xrc.green = DIV(fg->color.green * d + bg->color.green * (4 - d), 4);
-+		xrc.blue = DIV(fg->color.blue * d + bg->color.blue * (4 - d), 4);
-+
-+		XftColorAllocValue(xdpy, xvis, xcmap, &xrc, &xfc);
-+		XftDrawRect(xd, &xfc, x, y, w, h);
-+		XftColorFree(xdpy, xvis, xcmap, &xfc);
-+
-+	} else if (cat == BRL) {
-+		/* braille, each data bit corresponds to one dot at 2x4 grid */
-+		int w1 = DIV(w, 2);
-+		int h1 = DIV(h, 4), h2 = DIV(h, 2), h3 = DIV(3 * h, 4);
-+
-+		if (bd & 1)   XftDrawRect(xd, fg, x, y, w1, h1);
-+		if (bd & 2)   XftDrawRect(xd, fg, x, y + h1, w1, h2 - h1);
-+		if (bd & 4)   XftDrawRect(xd, fg, x, y + h2, w1, h3 - h2);
-+		if (bd & 8)   XftDrawRect(xd, fg, x + w1, y, w - w1, h1);
-+		if (bd & 16)  XftDrawRect(xd, fg, x + w1, y + h1, w - w1, h2 - h1);
-+		if (bd & 32)  XftDrawRect(xd, fg, x + w1, y + h2, w - w1, h3 - h2);
-+		if (bd & 64)  XftDrawRect(xd, fg, x, y + h3, w1, h - h3);
-+		if (bd & 128) XftDrawRect(xd, fg, x + w1, y + h3, w - w1, h - h3);
-+
-+	}
-+}
-+
-+void
-+drawboxlines(int x, int y, int w, int h, XftColor *fg, ushort bd)
-+{
-+	/* s: stem thickness. width/8 roughly matches underscore thickness. */
-+	/* We draw bold as 1.5 * normal-stem and at least 1px thicker.      */
-+	/* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */
-+	int mwh = MIN(w, h);
-+	int base_s = MAX(1, DIV(mwh, 8));
-+	int bold = (bd & BDB) && mwh >= 6;  /* possibly ignore boldness */
-+	int s = bold ? MAX(base_s + 1, DIV(3 * base_s, 2)) : base_s;
-+	int w2 = DIV(w - s, 2), h2 = DIV(h - s, 2);
-+	/* the s-by-s square (x + w2, y + h2, s, s) is the center texel.    */
-+	/* The base length (per direction till edge) includes this square.  */
-+
-+	int light = bd & (LL | LU | LR | LD);
-+	int double_ = bd & (DL | DU | DR | DD);
-+
-+	if (light) {
-+		/* d: additional (negative) length to not-draw the center   */
-+		/* texel - at arcs and avoid drawing inside (some) doubles  */
-+		int arc = bd & BDA;
-+		int multi_light = light & (light - 1);
-+		int multi_double = double_ & (double_ - 1);
-+		/* light crosses double only at DH+LV, DV+LH (ref. shapes)  */
-+		int d = arc || (multi_double && !multi_light) ? -s : 0;
-+
-+		if (bd & LL)
-+			XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s);
-+		if (bd & LU)
-+			XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d);
-+		if (bd & LR)
-+			XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s);
-+		if (bd & LD)
-+			XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d);
-+	}
-+
-+	/* double lines - also align with light to form heavy when combined */
-+	if (double_) {
-+		/*
-+		* going clockwise, for each double-ray: p is additional length
-+		* to the single-ray nearer to the previous direction, and n to
-+		* the next. p and n adjust from the base length to lengths
-+		* which consider other doubles - shorter to avoid intersections
-+		* (p, n), or longer to draw the far-corner texel (n).
-+		*/
-+		int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD;
-+		if (dl) {
-+			int p = dd ? -s : 0, n = du ? -s : dd ? s : 0;
-+			XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s);
-+			XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s);
-+		}
-+		if (du) {
-+			int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0;
-+			XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p);
-+			XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n);
-+		}
-+		if (dr) {
-+			int p = du ? -s : 0, n = dd ? -s : du ? s : 0;
-+			XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s);
-+			XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s);
-+		}
-+		if (dd) {
-+			int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0;
-+			XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p);
-+			XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n);
-+		}
-+	}
-+}
-diff --git a/boxdraw_data.h b/boxdraw_data.h
-new file mode 100644
-index 0000000..7890500
---- /dev/null
-+++ b/boxdraw_data.h
-@@ -0,0 +1,214 @@
-+/*
-+ * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
-+ * MIT/X Consortium License
-+ */
-+
-+/*
-+ * U+25XX codepoints data
-+ *
-+ * References:
-+ *   http://www.unicode.org/charts/PDF/U2500.pdf
-+ *   http://www.unicode.org/charts/PDF/U2580.pdf
-+ *
-+ * Test page:
-+ *   https://github.com/GNOME/vte/blob/master/doc/boxes.txt
-+ */
-+
-+/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */
-+/* Categories (mutually exclusive except BDB): */
-+/* For convenience, BDL/BDA/BBS/BDB are 1 bit each, the rest are enums */
-+#define BDL (1<<8)   /* Box Draw Lines (light/double/heavy) */
-+#define BDA (1<<9)   /* Box Draw Arc (light) */
-+
-+#define BBD (1<<10)  /* Box Block Down (lower) X/8 */
-+#define BBL (2<<10)  /* Box Block Left X/8 */
-+#define BBU (3<<10)  /* Box Block Upper X/8 */
-+#define BBR (4<<10)  /* Box Block Right X/8 */
-+#define BBQ (5<<10)  /* Box Block Quadrants */
-+#define BRL (6<<10)  /* Box Braille (data is lower byte of U28XX) */
-+
-+#define BBS (1<<14)  /* Box Block Shades */
-+#define BDB (1<<15)  /* Box Draw is Bold */
-+
-+/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical      */
-+/* Heavy is light+double (literally drawing light+double align to form heavy) */
-+#define LL (1<<0)
-+#define LU (1<<1)
-+#define LR (1<<2)
-+#define LD (1<<3)
-+#define LH (LL+LR)
-+#define LV (LU+LD)
-+
-+#define DL (1<<4)
-+#define DU (1<<5)
-+#define DR (1<<6)
-+#define DD (1<<7)
-+#define DH (DL+DR)
-+#define DV (DU+DD)
-+
-+#define HL (LL+DL)
-+#define HU (LU+DU)
-+#define HR (LR+DR)
-+#define HD (LD+DD)
-+#define HH (HL+HR)
-+#define HV (HU+HD)
-+
-+/* (BBQ) Quadrants Top/Bottom x Left/Right */
-+#define TL (1<<0)
-+#define TR (1<<1)
-+#define BL (1<<2)
-+#define BR (1<<3)
-+
-+/* Data for U+2500 - U+259F except dashes/diagonals */
-+static const unsigned short boxdata[256] = {
-+	/* light lines */
-+	[0x00] = BDL + LH,       /* light horizontal */
-+	[0x02] = BDL + LV,       /* light vertical */
-+	[0x0c] = BDL + LD + LR,  /* light down and right */
-+	[0x10] = BDL + LD + LL,  /* light down and left */
-+	[0x14] = BDL + LU + LR,  /* light up and right */
-+	[0x18] = BDL + LU + LL,  /* light up and left */
-+	[0x1c] = BDL + LV + LR,  /* light vertical and right */
-+	[0x24] = BDL + LV + LL,  /* light vertical and left */
-+	[0x2c] = BDL + LH + LD,  /* light horizontal and down */
-+	[0x34] = BDL + LH + LU,  /* light horizontal and up */
-+	[0x3c] = BDL + LV + LH,  /* light vertical and horizontal */
-+	[0x74] = BDL + LL,       /* light left */
-+	[0x75] = BDL + LU,       /* light up */
-+	[0x76] = BDL + LR,       /* light right */
-+	[0x77] = BDL + LD,       /* light down */
-+
-+	/* heavy [+light] lines */
-+	[0x01] = BDL + HH,
-+	[0x03] = BDL + HV,
-+	[0x0d] = BDL + HR + LD,
-+	[0x0e] = BDL + HD + LR,
-+	[0x0f] = BDL + HD + HR,
-+	[0x11] = BDL + HL + LD,
-+	[0x12] = BDL + HD + LL,
-+	[0x13] = BDL + HD + HL,
-+	[0x15] = BDL + HR + LU,
-+	[0x16] = BDL + HU + LR,
-+	[0x17] = BDL + HU + HR,
-+	[0x19] = BDL + HL + LU,
-+	[0x1a] = BDL + HU + LL,
-+	[0x1b] = BDL + HU + HL,
-+	[0x1d] = BDL + HR + LV,
-+	[0x1e] = BDL + HU + LD + LR,
-+	[0x1f] = BDL + HD + LR + LU,
-+	[0x20] = BDL + HV + LR,
-+	[0x21] = BDL + HU + HR + LD,
-+	[0x22] = BDL + HD + HR + LU,
-+	[0x23] = BDL + HV + HR,
-+	[0x25] = BDL + HL + LV,
-+	[0x26] = BDL + HU + LD + LL,
-+	[0x27] = BDL + HD + LU + LL,
-+	[0x28] = BDL + HV + LL,
-+	[0x29] = BDL + HU + HL + LD,
-+	[0x2a] = BDL + HD + HL + LU,
-+	[0x2b] = BDL + HV + HL,
-+	[0x2d] = BDL + HL + LD + LR,
-+	[0x2e] = BDL + HR + LL + LD,
-+	[0x2f] = BDL + HH + LD,
-+	[0x30] = BDL + HD + LH,
-+	[0x31] = BDL + HD + HL + LR,
-+	[0x32] = BDL + HR + HD + LL,
-+	[0x33] = BDL + HH + HD,
-+	[0x35] = BDL + HL + LU + LR,
-+	[0x36] = BDL + HR + LU + LL,
-+	[0x37] = BDL + HH + LU,
-+	[0x38] = BDL + HU + LH,
-+	[0x39] = BDL + HU + HL + LR,
-+	[0x3a] = BDL + HU + HR + LL,
-+	[0x3b] = BDL + HH + HU,
-+	[0x3d] = BDL + HL + LV + LR,
-+	[0x3e] = BDL + HR + LV + LL,
-+	[0x3f] = BDL + HH + LV,
-+	[0x40] = BDL + HU + LH + LD,
-+	[0x41] = BDL + HD + LH + LU,
-+	[0x42] = BDL + HV + LH,
-+	[0x43] = BDL + HU + HL + LD + LR,
-+	[0x44] = BDL + HU + HR + LD + LL,
-+	[0x45] = BDL + HD + HL + LU + LR,
-+	[0x46] = BDL + HD + HR + LU + LL,
-+	[0x47] = BDL + HH + HU + LD,
-+	[0x48] = BDL + HH + HD + LU,
-+	[0x49] = BDL + HV + HL + LR,
-+	[0x4a] = BDL + HV + HR + LL,
-+	[0x4b] = BDL + HV + HH,
-+	[0x78] = BDL + HL,
-+	[0x79] = BDL + HU,
-+	[0x7a] = BDL + HR,
-+	[0x7b] = BDL + HD,
-+	[0x7c] = BDL + HR + LL,
-+	[0x7d] = BDL + HD + LU,
-+	[0x7e] = BDL + HL + LR,
-+	[0x7f] = BDL + HU + LD,
-+
-+	/* double [+light] lines */
-+	[0x50] = BDL + DH,
-+	[0x51] = BDL + DV,
-+	[0x52] = BDL + DR + LD,
-+	[0x53] = BDL + DD + LR,
-+	[0x54] = BDL + DR + DD,
-+	[0x55] = BDL + DL + LD,
-+	[0x56] = BDL + DD + LL,
-+	[0x57] = BDL + DL + DD,
-+	[0x58] = BDL + DR + LU,
-+	[0x59] = BDL + DU + LR,
-+	[0x5a] = BDL + DU + DR,
-+	[0x5b] = BDL + DL + LU,
-+	[0x5c] = BDL + DU + LL,
-+	[0x5d] = BDL + DL + DU,
-+	[0x5e] = BDL + DR + LV,
-+	[0x5f] = BDL + DV + LR,
-+	[0x60] = BDL + DV + DR,
-+	[0x61] = BDL + DL + LV,
-+	[0x62] = BDL + DV + LL,
-+	[0x63] = BDL + DV + DL,
-+	[0x64] = BDL + DH + LD,
-+	[0x65] = BDL + DD + LH,
-+	[0x66] = BDL + DD + DH,
-+	[0x67] = BDL + DH + LU,
-+	[0x68] = BDL + DU + LH,
-+	[0x69] = BDL + DH + DU,
-+	[0x6a] = BDL + DH + LV,
-+	[0x6b] = BDL + DV + LH,
-+	[0x6c] = BDL + DH + DV,
-+
-+	/* (light) arcs */
-+	[0x6d] = BDA + LD + LR,
-+	[0x6e] = BDA + LD + LL,
-+	[0x6f] = BDA + LU + LL,
-+	[0x70] = BDA + LU + LR,
-+
-+	/* Lower (Down) X/8 block (data is 8 - X) */
-+	[0x81] = BBD + 7, [0x82] = BBD + 6, [0x83] = BBD + 5, [0x84] = BBD + 4,
-+	[0x85] = BBD + 3, [0x86] = BBD + 2, [0x87] = BBD + 1, [0x88] = BBD + 0,
-+
-+	/* Left X/8 block (data is X) */
-+	[0x89] = BBL + 7, [0x8a] = BBL + 6, [0x8b] = BBL + 5, [0x8c] = BBL + 4,
-+	[0x8d] = BBL + 3, [0x8e] = BBL + 2, [0x8f] = BBL + 1,
-+
-+	/* upper 1/2 (4/8), 1/8 block (X), right 1/2, 1/8 block (8-X) */
-+	[0x80] = BBU + 4, [0x94] = BBU + 1,
-+	[0x90] = BBR + 4, [0x95] = BBR + 7,
-+
-+	/* Quadrants */
-+	[0x96] = BBQ + BL,
-+	[0x97] = BBQ + BR,
-+	[0x98] = BBQ + TL,
-+	[0x99] = BBQ + TL + BL + BR,
-+	[0x9a] = BBQ + TL + BR,
-+	[0x9b] = BBQ + TL + TR + BL,
-+	[0x9c] = BBQ + TL + TR + BR,
-+	[0x9d] = BBQ + TR,
-+	[0x9e] = BBQ + BL + TR,
-+	[0x9f] = BBQ + BL + TR + BR,
-+
-+	/* Shades, data is an alpha value in 25% units (1/4, 1/2, 3/4) */
-+	[0x91] = BBS + 1, [0x92] = BBS + 2, [0x93] = BBS + 3,
-+
-+	/* U+2504 - U+250B, U+254C - U+254F: unsupported (dashes) */
-+	/* U+2571 - U+2573: unsupported (diagonals) */
-+};
-diff --git a/config.def.h b/config.def.h
-index 0895a1f..bf6718b 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -58,6 +58,18 @@ static unsigned int blinktimeout = 800;
-  */
- 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 = 0;
-+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
-diff --git a/st.c b/st.c
-index 0ce6ac2..c035e19 100644
---- a/st.c
-+++ b/st.c
-@@ -1230,6 +1230,9 @@ tsetchar(Rune u, Glyph *attr, int x, int y)
- 	term.dirty[y] = 1;
- 	term.line[y][x] = *attr;
- 	term.line[y][x].u = u;
-+
-+	if (isboxdraw(u))
-+		term.line[y][x].mode |= ATTR_BOXDRAW;
- }
- 
- void
-diff --git a/st.h b/st.h
-index d978458..a6c382a 100644
---- a/st.h
-+++ b/st.h
-@@ -33,6 +33,7 @@ enum glyph_attribute {
- 	ATTR_WRAP       = 1 << 8,
- 	ATTR_WIDE       = 1 << 9,
- 	ATTR_WDUMMY     = 1 << 10,
-+	ATTR_BOXDRAW    = 1 << 11,
- 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
- };
- 
-@@ -111,6 +112,14 @@ void *xmalloc(size_t);
- void *xrealloc(void *, size_t);
- char *xstrdup(char *);
- 
-+int isboxdraw(Rune);
-+ushort boxdrawindex(const Glyph *);
-+#ifdef XFT_VERSION
-+/* only exposed to x.c, otherwise we'll need Xft.h for the types */
-+void boxdraw_xinit(Display *, Colormap, XftDraw *, Visual *);
-+void drawboxes(int, int, int, int, XftColor *, XftColor *, const XftGlyphFontSpec *, int);
-+#endif
-+
- /* config.h globals */
- extern char *utmp;
- extern char *scroll;
-@@ -122,3 +131,4 @@ extern char *termname;
- extern unsigned int tabspaces;
- extern unsigned int defaultfg;
- extern unsigned int defaultbg;
-+extern const int boxdraw, boxdraw_bold, boxdraw_braille;
-diff --git a/x.c b/x.c
-index e5f1737..6f7ea2c 100644
---- a/x.c
-+++ b/x.c
-@@ -1205,6 +1205,8 @@ xinit(int cols, int rows)
- 	xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
- 	if (xsel.xtarget == None)
- 		xsel.xtarget = XA_STRING;
-+
-+	boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis);
- }
- 
- int
-@@ -1251,8 +1253,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
- 			yp = winy + font->ascent;
- 		}
- 
--		/* Lookup character index with default font. */
--		glyphidx = XftCharIndex(xw.dpy, font->match, rune);
-+		if (mode & ATTR_BOXDRAW) {
-+			/* minor shoehorning: boxdraw uses only this ushort */
-+			glyphidx = boxdrawindex(&glyphs[i]);
-+		} else {
-+			/* Lookup character index with default font. */
-+			glyphidx = XftCharIndex(xw.dpy, font->match, rune);
-+		}
- 		if (glyphidx) {
- 			specs[numspecs].font = font->match;
- 			specs[numspecs].glyph = glyphidx;
-@@ -1456,8 +1463,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
- 	r.width = width;
- 	XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
- 
--	/* Render the glyphs. */
--	XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
-+	if (base.mode & ATTR_BOXDRAW) {
-+		drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len);
-+	} else {
-+		/* Render the glyphs. */
-+		XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
-+	}
- 
- 	/* Render underline and strikethrough. */
- 	if (base.mode & ATTR_UNDERLINE) {
-@@ -1500,7 +1511,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
- 	/*
- 	 * Select the right color for the right mode.
- 	 */
--	g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
-+	g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW;
- 
- 	if (IS_SET(MODE_REVERSE)) {
- 		g.mode |= ATTR_REVERSE;
-
-base-commit: 43a395ae91f7d67ce694e65edeaa7bbc720dd027
--- 
-2.20.1
-
diff --git a/_suckless/st/st-url b/_suckless/st/st-url
old mode 100755
new mode 100644
index ee3a751..46dde09
--- a/_suckless/st/st-url
+++ b/_suckless/st/st-url
@@ -3,17 +3,17 @@
 urlregex="(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)"
 
 urls="$(sed 's/.*│//g' | tr -d '\n' | # First remove linebreaks and mutt sidebars:
-	grep -aEo "$urlregex" | # grep only urls as defined above.
-	uniq | # Ignore neighboring duplicates.
-	sed "s/\(\.\|,\|;\|\!\\|\?\)$//;
-	s/^www./http:\/\/www\./")" # xdg-open will not detect url without http
+        grep -aEo "$urlregex" | # grep only urls as defined above.
+        uniq | # Ignore neighboring duplicates.
+        sed "s/\(\.\|,\|;\|\!\\|\?\)$//;
+        s/^www./http:\/\/www\./")" # xdg-open will not detect url without http
 
 [ -z "$urls" ] && exit 1
 
 while getopts "hoc" o; do case "${o}" in
-	h) printf "Optional arguments for custom use:\\n  -c: copy\\n  -o: xdg-open\\n  -h: Show this message\\n" && exit 1 ;;
-	o) chosen="$(echo "$urls" | dmenu -l 20 -i -p 'open')"
-	setsid xdg-open "$chosen" >/dev/null 2>&1 & ;;
-	c) echo "$urls" | dmenu -i -p 'copy' -l 10 | tr -d '\n' | xsel -l /dev/null ;;
-	*) printf "Invalid option: -%s\\n" "$OPTARG" && exit 1 ;;
+        h) printf "Optional arguments for custom use:\\n  -c: copy\\n  -o: xdg-open\\n  -h: Show this message\\n" && exit 1 ;;
+        o) chosen="$(echo "$urls" | dmenu -l 20 -i -p 'open')"
+        setsid xdg-open "$chosen" >/dev/null 2>&1 & ;;
+        c) echo "$urls" | dmenu -i -p 'copy' -l 10 | tr -d '\n' | xsel -l /dev/null ;;
+        *) printf "Invalid option: -%s\\n" "$OPTARG" && exit 1 ;;
 esac done
diff --git a/_suckless/st/st.c b/_suckless/st/st.c
index c47d632..86e7bc1 100644
--- a/_suckless/st/st.c
+++ b/_suckless/st/st.c
@@ -193,18 +193,18 @@ static void tputc(Rune);
 static void treset(void);
 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 tsetattr(const int *, int);
+static void tsetchar(Rune, const Glyph *, int, int);
 static void tsetdirt(int, int);
 static void tsetscroll(int, int);
 static void tswapscreen(void);
-static void tsetmode(int, int, int *, int);
+static void tsetmode(int, int, const int *, int);
 static int twrite(const char *, int, int);
 static void tfulldirt(void);
 static void tcontrolcode(uchar );
 static void tdectest(char );
 static void tdefutf8(char);
-static int32_t tdefcolor(int *, int *, int);
+static int32_t tdefcolor(const int *, int *, int);
 static void tdeftran(char);
 static void tstrsequence(uchar);
 
@@ -233,10 +233,10 @@ static int iofd = 1;
 static int cmdfd;
 static pid_t pid;
 
-static uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
-static uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
-static Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
+static const uchar utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
+static const uchar utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
+static const Rune utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
+static const Rune utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
 
 ssize_t
 xwrite(int fd, const char *s, size_t len)
@@ -276,12 +276,14 @@ xrealloc(void *p, size_t len)
 }
 
 char *
-xstrdup(char *s)
+xstrdup(const char *s)
 {
-	if ((s = strdup(s)) == NULL)
+	char *p;
+
+	if ((p = strdup(s)) == NULL)
 		die("strdup: %s\n", strerror(errno));
 
-	return s;
+	return p;
 }
 
 size_t
@@ -525,7 +527,7 @@ selsnap(int *x, int *y, int direction)
 {
 	int newx, newy, xt, yt;
 	int delim, prevdelim;
-	Glyph *gp, *prevgp;
+	const Glyph *gp, *prevgp;
 
 	switch (sel.snap) {
 	case SNAP_WORD:
@@ -598,7 +600,7 @@ getsel(void)
 {
 	char *str, *ptr;
 	int y, bufsize, lastx, linelen;
-	Glyph *gp, *last;
+	const Glyph *gp, *last;
 
 	if (sel.ob.x == -1)
 		return NULL;
@@ -771,7 +773,7 @@ stty(char **args)
 }
 
 int
-ttynew(char *line, char *cmd, char *out, char **args)
+ttynew(const char *line, char *cmd, const char *out, char **args)
 {
 	int m, s;
 
@@ -804,14 +806,15 @@ ttynew(char *line, char *cmd, char *out, char **args)
 		break;
 	case 0:
 		close(iofd);
+		close(m);
 		setsid(); /* create a new process group */
 		dup2(s, 0);
 		dup2(s, 1);
 		dup2(s, 2);
 		if (ioctl(s, TIOCSCTTY, NULL) < 0)
 			die("ioctl TIOCSCTTY failed: %s\n", strerror(errno));
-		close(s);
-		close(m);
+		if (s > 2)
+			close(s);
 #ifdef __OpenBSD__
 		if (pledge("stdio getpw proc exec", NULL) == -1)
 			die("pledge\n");
@@ -1254,9 +1257,9 @@ tmoveto(int x, int y)
 }
 
 void
-tsetchar(Rune u, Glyph *attr, int x, int y)
+tsetchar(Rune u, const Glyph *attr, int x, int y)
 {
-	static char *vt100_0[62] = { /* 0x41 - 0x7e */
+	static const char *vt100_0[62] = { /* 0x41 - 0x7e */
 		"↑", "↓", "→", "←", "█", "▚", "☃", /* A - G */
 		0, 0, 0, 0, 0, 0, 0, 0, /* H - O */
 		0, 0, 0, 0, 0, 0, 0, 0, /* P - W */
@@ -1287,9 +1290,6 @@ tsetchar(Rune u, Glyph *attr, int x, int y)
 	term.dirty[y] = 1;
 	term.line[y][x] = *attr;
 	term.line[y][x].u = u;
-
-	if (isboxdraw(u))
-		term.line[y][x].mode |= ATTR_BOXDRAW;
 }
 
 void
@@ -1371,7 +1371,7 @@ tdeleteline(int n)
 }
 
 int32_t
-tdefcolor(int *attr, int *npar, int l)
+tdefcolor(const int *attr, int *npar, int l)
 {
 	int32_t idx = -1;
 	uint r, g, b;
@@ -1421,7 +1421,7 @@ tdefcolor(int *attr, int *npar, int l)
 }
 
 void
-tsetattr(int *attr, int l)
+tsetattr(const int *attr, int l)
 {
 	int i;
 	int32_t idx;
@@ -1539,9 +1539,9 @@ tsetscroll(int t, int b)
 }
 
 void
-tsetmode(int priv, int set, int *args, int narg)
+tsetmode(int priv, int set, const int *args, int narg)
 {
-	int alt, *lim;
+	int alt; const int *lim;
 
 	for (lim = args + narg; args < lim; ++args) {
 		if (priv) {
@@ -2144,7 +2144,7 @@ void
 tdumpline(int n)
 {
 	char buf[UTF_SIZ];
-	Glyph *bp, *end;
+	const Glyph *bp, *end;
 
 	bp = &term.line[n][0];
 	end = &bp[MIN(tlinelen(n), term.col) - 1];
@@ -2721,9 +2721,9 @@ draw(void)
 
 	drawregion(0, 0, term.col, term.row);
 	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.line[term.ocy], term.col);
+		xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
+				term.ocx, term.ocy, term.line[term.ocy][term.ocx],
+				term.line[term.ocy], term.col);
 	term.ocx = cx;
 	term.ocy = term.c.y;
 	xfinishdraw();
diff --git a/_suckless/st/st.h b/_suckless/st/st.h
index 9a87005..641383a 100644
--- a/_suckless/st/st.h
+++ b/_suckless/st/st.h
@@ -34,8 +34,7 @@ enum glyph_attribute {
 	ATTR_WRAP       = 1 << 8,
 	ATTR_WIDE       = 1 << 9,
 	ATTR_WDUMMY     = 1 << 10,
-	ATTR_BOXDRAW    = 1 << 11,
-	ATTR_LIGA       = 1 << 12,
+	ATTR_LIGA       = 1 << 11,
 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
 };
 
@@ -97,7 +96,7 @@ void tnew(int, int);
 void tresize(int, int);
 void tsetdirtattr(int);
 void ttyhangup(void);
-int ttynew(char *, char *, char *, char **);
+int ttynew(const char *, char *, const char *, char **);
 size_t ttyread(void);
 void ttyresize(int, int);
 void ttywrite(const char *, size_t, int);
@@ -115,15 +114,7 @@ size_t utf8encode(Rune, char *);
 
 void *xmalloc(size_t);
 void *xrealloc(void *, size_t);
-char *xstrdup(char *);
-
-int isboxdraw(Rune);
-ushort boxdrawindex(const Glyph *);
-#ifdef XFT_VERSION
-/* only exposed to x.c, otherwise we'll need Xft.h for the types */
-void boxdraw_xinit(Display *, Colormap, XftDraw *, Visual *);
-void drawboxes(int, int, int, int, XftColor *, XftColor *, const XftGlyphFontSpec *, int);
-#endif
+char *xstrdup(const char *);
 
 /* config.h globals */
 extern char *utmp;
@@ -137,5 +128,4 @@ extern char *termname;
 extern unsigned int tabspaces;
 extern unsigned int defaultfg;
 extern unsigned int defaultbg;
-extern const int boxdraw, boxdraw_bold, boxdraw_braille;
 extern float alpha;
diff --git a/_suckless/st/x.c b/_suckless/st/x.c
index 3c7cc70..48a4dfc 100644
--- a/_suckless/st/x.c
+++ b/_suckless/st/x.c
@@ -49,7 +49,7 @@ typedef struct {
 /* X modifiers */
 #define XK_ANY_MOD    UINT_MAX
 #define XK_NO_MOD     0
-#define XK_SWITCH_MOD (1<<13)
+#define XK_SWITCH_MOD (1<<13|1<<14)
 
 /* function definitions used in config.h */
 static void clipcopy(const Arg *);
@@ -158,7 +158,7 @@ static void xresize(int, int);
 static void xhints(void);
 static int xloadcolor(int, const char *, Color *);
 static int xloadfont(Font *, FcPattern *);
-static void xloadfonts(char *, double);
+static void xloadfonts(const char *, double);
 static int xloadsparefont(FcPattern *, int);
 static void xloadsparefonts(void);
 static void xunloadfont(Font *);
@@ -965,7 +965,7 @@ xloadfont(Font *f, FcPattern *pattern)
 }
 
 void
-xloadfonts(char *fontstr, double fontsize)
+xloadfonts(const char *fontstr, double fontsize)
 {
 	FcPattern *pattern;
 	double fontval;
@@ -973,7 +973,7 @@ xloadfonts(char *fontstr, double fontsize)
 	if (fontstr[0] == '-')
 		pattern = XftXlfdParse(fontstr, False, False);
 	else
-		pattern = FcNameParse((FcChar8 *)fontstr);
+		pattern = FcNameParse((const FcChar8 *)fontstr);
 
 	if (!pattern)
 		die("can't open font %s\n", fontstr);
@@ -1330,8 +1330,6 @@ xinit(int cols, int rows)
 	xsel.xtarget = XInternAtom(xw.dpy, "UTF8_STRING", 0);
 	if (xsel.xtarget == None)
 		xsel.xtarget = XA_STRING;
-
-	boxdraw_xinit(xw.dpy, xw.cmap, xw.draw, xw.vis);
 }
 
 int
@@ -1378,13 +1376,8 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 			yp = winy + font->ascent;
 		}
 
-		if (mode & ATTR_BOXDRAW) {
-			/* minor shoehorning: boxdraw uses only this ushort */
-			glyphidx = boxdrawindex(&glyphs[i]);
-		} else {
-			/* Lookup character index with default font. */
-			glyphidx = XftCharIndex(xw.dpy, font->match, rune);
-		}
+		/* Lookup character index with default font. */
+		glyphidx = XftCharIndex(xw.dpy, font->match, rune);
 		if (glyphidx) {
 			specs[numspecs].font = font->match;
 			specs[numspecs].glyph = glyphidx;
@@ -1591,12 +1584,8 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
 	r.width = width;
 	XftDrawSetClipRectangles(xw.draw, winx, winy, &r, 1);
 
-	if (base.mode & ATTR_BOXDRAW) {
-		drawboxes(winx, winy, width / len, win.ch, fg, bg, specs, len);
-	} else {
-		/* Render the glyphs. */
-		XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
-	}
+	/* Render the glyphs. */
+	XftDrawGlyphFontSpec(xw.draw, fg, specs, len);
 
 	/* Render underline and strikethrough. */
 	if (base.mode & ATTR_UNDERLINE) {
@@ -1642,7 +1631,7 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int le
 	/*
 	 * Select the right color for the right mode.
 	 */
-	g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE|ATTR_BOXDRAW;
+	g.mode &= ATTR_BOLD|ATTR_ITALIC|ATTR_UNDERLINE|ATTR_STRUCK|ATTR_WIDE;
 
 	if (IS_SET(MODE_REVERSE)) {
 		g.mode |= ATTR_REVERSE;
@@ -1727,8 +1716,9 @@ xseticontitle(char *p)
 	XTextProperty prop;
 	DEFAULT(p, opt_title);
 
-	Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
-			&prop);
+	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
+	                                &prop) != Success)
+		return;
 	XSetWMIconName(xw.dpy, xw.win, &prop);
 	XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmiconname);
 	XFree(prop.value);
@@ -1740,8 +1730,9 @@ xsettitle(char *p)
 	XTextProperty prop;
 	DEFAULT(p, opt_title);
 
-	Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
-			&prop);
+	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
+	                                &prop) != Success)
+		return;
 	XSetWMName(xw.dpy, xw.win, &prop);
 	XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
 	XFree(prop.value);