diff --git a/Makefile b/Makefile
index dfcea0f..15db421 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 
 include config.mk
 
-SRC = st.c x.c hb.c
+SRC = st.c x.c
 OBJ = $(SRC:.c=.o)
 
 all: st
@@ -16,8 +16,7 @@ config.h:
 	$(CC) $(STCFLAGS) -c $<
 
 st.o: config.h st.h win.h
-x.o: arg.h config.h st.h win.h hb.h
-hb.o: st.h
+x.o: arg.h config.h st.h win.h
 
 $(OBJ): config.h config.mk
 
diff --git a/config.h b/config.h
index a9dec6a..8b25d40 100644
--- a/config.h
+++ b/config.h
@@ -5,8 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font =
-    "JetBrainsMono Nerd Font:pixelsize=18:antialias=true:autohint=true";
+static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
 static int borderpx = 2;
 
 /*
@@ -96,35 +95,36 @@ unsigned int tabspaces = 8;
 
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
-    /* 8 normal colors */
-    "black",
-    "red3",
-    "green3",
-    "yellow3",
-    "blue2",
-    "magenta3",
-    "cyan3",
-    "gray90",
+	/* 8 normal colors */
+	"black",
+	"red3",
+	"green3",
+	"yellow3",
+	"blue2",
+	"magenta3",
+	"cyan3",
+	"gray90",
 
-    /* 8 bright colors */
-    "gray50",
-    "red",
-    "green",
-    "yellow",
-    "#5c5cff",
-    "magenta",
-    "cyan",
-    "white",
+	/* 8 bright colors */
+	"gray50",
+	"red",
+	"green",
+	"yellow",
+	"#5c5cff",
+	"magenta",
+	"cyan",
+	"white",
 
-    [255] = 0,
+	[255] = 0,
 
-    /* more colors can be added after 255 to use with DefaultXX */
-    "#cccccc",
-    "#555555",
-    "gray90", /* default foreground colour */
-    "black",  /* default background colour */
+	/* more colors can be added after 255 to use with DefaultXX */
+	"#cccccc",
+	"#555555",
+	"gray90", /* default foreground colour */
+	"black", /* default background colour */
 };
 
+
 /*
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
@@ -175,34 +175,34 @@ static uint forcemousemod = ShiftMask;
  * Beware that overloading Button1 will disable the selection.
  */
 static MouseShortcut mshortcuts[] = {
-    /* mask                 button   function        argument       release */
-    {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_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 (ControlMask | ShiftMask)
+#define TERMMOD (ControlMask|ShiftMask)
 
 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}},
-    {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}},
+	/* 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} },
+	{ 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} },
 };
 
 /*
@@ -230,229 +230,229 @@ 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,
  * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
  */
-static uint ignoremod = Mod2Mask | XK_SWITCH_MOD;
+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, 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,            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},
 };
 
 /*
@@ -463,13 +463,14 @@ static Key key[] = {
  * If no match is found, regular selection is used.
  */
 static uint selmasks[] = {
-    [SEL_RECTANGULAR] = Mod1Mask,
+	[SEL_RECTANGULAR] = Mod1Mask,
 };
 
 /*
  * Printable characters in ASCII, used to estimate the advance width
  * of single wide characters.
  */
-static char ascii_printable[] = " !\"#$%&'()*+,-./0123456789:;<=>?"
-                                "@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
-                                "`abcdefghijklmnopqrstuvwxyz{|}~";
+static char ascii_printable[] =
+	" !\"#$%&'()*+,-./0123456789:;<=>?"
+	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
+	"`abcdefghijklmnopqrstuvwxyz{|}~";
diff --git a/config.mk b/config.mk
index 704184b..2fc854e 100644
--- a/config.mk
+++ b/config.mk
@@ -15,12 +15,10 @@ PKG_CONFIG = pkg-config
 # includes and libs
 INCS = -I$(X11INC) \
        `$(PKG_CONFIG) --cflags fontconfig` \
-       `$(PKG_CONFIG) --cflags freetype2` \
-       `$(PKG_CONFIG) --cflags harfbuzz`
+       `$(PKG_CONFIG) --cflags freetype2`
 LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
        `$(PKG_CONFIG) --libs fontconfig` \
-       `$(PKG_CONFIG) --libs freetype2` \
-       `$(PKG_CONFIG) --libs harfbuzz`
+       `$(PKG_CONFIG) --libs freetype2`
 
 # flags
 STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
@@ -31,9 +29,8 @@ STLDFLAGS = $(LIBS) $(LDFLAGS)
 #CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
 #LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
 #       `$(PKG_CONFIG) --libs fontconfig` \
-#       `$(PKG_CONFIG) --libs freetype2` \
-#       `$(PKG_CONFIG) --libs harfbuzz`
+#       `$(PKG_CONFIG) --libs freetype2`
 #MANPREFIX = ${PREFIX}/man
 
 # compiler and linker
-CC = tcc
+# CC = c99
diff --git a/hb.c b/hb.c
deleted file mode 100644
index 1a7a7c7..0000000
--- a/hb.c
+++ /dev/null
@@ -1,136 +0,0 @@
-// clang-format off
-#include <X11/Xft/Xft.h>
-#include <X11/cursorfont.h>
-#include <hb-ft.h>
-#include <hb.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "st.h"
-#include "hb.h"
-// clang-format on
-
-#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}
-#define BUFFER_STEP 256
-
-hb_font_t *hbfindfont(XftFont *match);
-
-typedef struct {
-  XftFont *match;
-  hb_font_t *font;
-} HbFontMatch;
-
-typedef struct {
-  size_t capacity;
-  HbFontMatch *fonts;
-} HbFontCache;
-
-static HbFontCache hbfontcache = {0, NULL};
-
-typedef struct {
-  size_t capacity;
-  Rune *runes;
-} RuneBuffer;
-
-static RuneBuffer hbrunebuffer = {0, NULL};
-
-/*
- * Poplulate the array 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[] = {FEATURE('c', 'a', 'l', 't'),
-                           FEATURE('d', 'l', 'i', 'g')
-
-};
-
-void hbunloadfonts() {
-  for (int i = 0; i < hbfontcache.capacity; i++) {
-    hb_font_destroy(hbfontcache.fonts[i].font);
-    XftUnlockFace(hbfontcache.fonts[i].match);
-  }
-
-  if (hbfontcache.fonts != NULL) {
-    free(hbfontcache.fonts);
-    hbfontcache.fonts = NULL;
-  }
-  hbfontcache.capacity = 0;
-}
-
-hb_font_t *hbfindfont(XftFont *match) {
-  for (int i = 0; i < hbfontcache.capacity; i++) {
-    if (hbfontcache.fonts[i].match == match)
-      return hbfontcache.fonts[i].font;
-  }
-
-  /* Font not found in cache, caching it now. */
-  hbfontcache.fonts = realloc(hbfontcache.fonts,
-                              sizeof(HbFontMatch) * (hbfontcache.capacity + 1));
-  FT_Face face = XftLockFace(match);
-  hb_font_t *font = hb_ft_font_create(face, NULL);
-  if (font == NULL)
-    die("Failed to load Harfbuzz font.");
-
-  hbfontcache.fonts[hbfontcache.capacity].match = match;
-  hbfontcache.fonts[hbfontcache.capacity].font = font;
-  hbfontcache.capacity += 1;
-
-  return font;
-}
-
-void hbtransform(HbTransformData *data, XftFont *xfont, const Glyph *glyphs,
-                 int start, int length) {
-  ushort mode = USHRT_MAX;
-  unsigned int glyph_count;
-  int rune_idx, glyph_idx, end = start + length;
-
-  hb_font_t *font = hbfindfont(xfont);
-  if (font == NULL)
-    return;
-
-  hb_buffer_t *buffer = hb_buffer_create();
-  hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
-  hb_buffer_set_cluster_level(buffer,
-                              HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
-
-  /* Resize the buffer if required length is larger. */
-  if (hbrunebuffer.capacity < length) {
-    hbrunebuffer.capacity = (length / BUFFER_STEP + 1) * BUFFER_STEP;
-    hbrunebuffer.runes =
-        realloc(hbrunebuffer.runes, hbrunebuffer.capacity * sizeof(Rune));
-  }
-
-  /* Fill buffer with codepoints. */
-  for (rune_idx = 0, glyph_idx = start; glyph_idx < end;
-       glyph_idx++, rune_idx++) {
-    hbrunebuffer.runes[rune_idx] = glyphs[glyph_idx].u;
-    mode = glyphs[glyph_idx].mode;
-    if (mode & ATTR_WDUMMY)
-      hbrunebuffer.runes[rune_idx] = 0x0020;
-  }
-  hb_buffer_add_codepoints(buffer, hbrunebuffer.runes, length, 0, length);
-
-  /* Shape the segment. */
-  hb_shape(font, buffer, features, sizeof(features) / sizeof(hb_feature_t));
-
-  /* Get new glyph info. */
-  hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, &glyph_count);
-  hb_glyph_position_t *pos =
-      hb_buffer_get_glyph_positions(buffer, &glyph_count);
-
-  /* Fill the output. */
-  data->buffer = buffer;
-  data->glyphs = info;
-  data->positions = pos;
-  data->count = glyph_count;
-}
-
-void hbcleanup(HbTransformData *data) {
-  hb_buffer_destroy(data->buffer);
-  memset(data, 0, sizeof(HbTransformData));
-}
diff --git a/hb.h b/hb.h
deleted file mode 100644
index 96e808b..0000000
--- a/hb.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <X11/Xft/Xft.h>
-#include <hb.h>
-#include <hb-ft.h>
-
-typedef struct {
-	hb_buffer_t *buffer;
-	hb_glyph_info_t *glyphs;
-	hb_glyph_position_t *positions;
-	unsigned int count;
-} HbTransformData;
-
-void hbunloadfonts();
-void hbtransform(HbTransformData *, XftFont *, const Glyph *, int, int);
-void hbcleanup(HbTransformData *);
-
diff --git a/st b/st
index b2515a0..cda1958 100755
Binary files a/st and b/st differ
diff --git a/st-ligatures-scrollback-ringbuffer-20251007-0.9.3.diff b/st-ligatures-scrollback-ringbuffer-20251007-0.9.3.diff
deleted file mode 100644
index 32aea22..0000000
--- a/st-ligatures-scrollback-ringbuffer-20251007-0.9.3.diff
+++ /dev/null
@@ -1,651 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 15db421..dfcea0f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,9 +3,9 @@
- .POSIX:
- 
- include config.mk
- 
--SRC = st.c x.c
-+SRC = st.c x.c hb.c
- OBJ = $(SRC:.c=.o)
- 
- all: st
- 
-@@ -15,9 +15,10 @@ config.h:
- .c.o:
- 	$(CC) $(STCFLAGS) -c $<
- 
- st.o: config.h st.h win.h
--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
- 
- $(OBJ): config.h config.mk
- 
- st: $(OBJ)
-diff --git a/config.mk b/config.mk
-index 2fc854e..ec69d1a 100644
---- a/config.mk
-+++ b/config.mk
-@@ -14,12 +14,14 @@ PKG_CONFIG = pkg-config
- 
- # includes and libs
- INCS = -I$(X11INC) \
-        `$(PKG_CONFIG) --cflags fontconfig` \
--       `$(PKG_CONFIG) --cflags freetype2`
-+       `$(PKG_CONFIG) --cflags freetype2` \
-+       `$(PKG_CONFIG) --cflags harfbuzz`
- LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
-        `$(PKG_CONFIG) --libs fontconfig` \
--       `$(PKG_CONFIG) --libs freetype2`
-+       `$(PKG_CONFIG) --libs freetype2` \
-+       `$(PKG_CONFIG) --libs harfbuzz`
- 
- # flags
- STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
- STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-@@ -28,9 +30,10 @@ STLDFLAGS = $(LIBS) $(LDFLAGS)
- # OpenBSD:
- #CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
- #LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
- #       `$(PKG_CONFIG) --libs fontconfig` \
--#       `$(PKG_CONFIG) --libs freetype2`
-+#       `$(PKG_CONFIG) --libs freetype2` \
-+#       `$(PKG_CONFIG) --libs harfbuzz`
- #MANPREFIX = ${PREFIX}/man
- 
- # compiler and linker
- # CC = c99
-diff --git a/hb.c b/hb.c
-new file mode 100644
-index 0000000..99412c8
---- /dev/null
-+++ b/hb.c
-@@ -0,0 +1,125 @@
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <math.h>
-+#include <X11/Xft/Xft.h>
-+#include <X11/cursorfont.h>
-+#include <hb.h>
-+#include <hb-ft.h>
-+
-+#include "st.h"
-+#include "hb.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 }
-+#define BUFFER_STEP 256
-+
-+hb_font_t *hbfindfont(XftFont *match);
-+
-+typedef struct {
-+	XftFont *match;
-+	hb_font_t *font;
-+} HbFontMatch;
-+
-+typedef struct {
-+	size_t capacity;
-+	HbFontMatch *fonts;
-+} HbFontCache;
-+
-+static HbFontCache hbfontcache = { 0, NULL };
-+
-+typedef struct {
-+	size_t capacity;
-+	Rune *runes;
-+} RuneBuffer;
-+
-+static RuneBuffer hbrunebuffer = { 0, NULL };
-+
-+/*
-+ * Poplulate the array 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[] = { };
-+
-+void
-+hbunloadfonts()
-+{
-+	for (int i = 0; i < hbfontcache.capacity; i++) {
-+		hb_font_destroy(hbfontcache.fonts[i].font);
-+		XftUnlockFace(hbfontcache.fonts[i].match);
-+	}
-+
-+	if (hbfontcache.fonts != NULL) {
-+		free(hbfontcache.fonts);
-+		hbfontcache.fonts = NULL;
-+	}
-+	hbfontcache.capacity = 0;
-+}
-+
-+hb_font_t *
-+hbfindfont(XftFont *match)
-+{
-+	for (int i = 0; i < hbfontcache.capacity; i++) {
-+		if (hbfontcache.fonts[i].match == match)
-+			return hbfontcache.fonts[i].font;
-+	}
-+
-+	/* Font not found in cache, caching it now. */
-+	hbfontcache.fonts = realloc(hbfontcache.fonts, sizeof(HbFontMatch) * (hbfontcache.capacity + 1));
-+	FT_Face face = XftLockFace(match);
-+	hb_font_t *font = hb_ft_font_create(face, NULL);
-+	if (font == NULL)
-+		die("Failed to load Harfbuzz font.");
-+
-+	hbfontcache.fonts[hbfontcache.capacity].match = match;
-+	hbfontcache.fonts[hbfontcache.capacity].font = font;
-+	hbfontcache.capacity += 1;
-+
-+	return font;
-+}
-+
-+void hbtransform(HbTransformData *data, XftFont *xfont, const Glyph *glyphs, int start, int length) {
-+	ushort mode = USHRT_MAX;
-+	unsigned int glyph_count;
-+	int rune_idx, glyph_idx, end = start + length;
-+
-+	hb_font_t *font = hbfindfont(xfont);
-+	if (font == NULL)
-+		return;
-+
-+	hb_buffer_t *buffer = hb_buffer_create();
-+	hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
-+	hb_buffer_set_cluster_level(buffer, HB_BUFFER_CLUSTER_LEVEL_MONOTONE_CHARACTERS);
-+
-+	/* Resize the buffer if required length is larger. */
-+	if (hbrunebuffer.capacity < length) {
-+		hbrunebuffer.capacity = (length / BUFFER_STEP + 1) * BUFFER_STEP;
-+		hbrunebuffer.runes = realloc(hbrunebuffer.runes, hbrunebuffer.capacity * sizeof(Rune));
-+	}
-+
-+	/* Fill buffer with codepoints. */
-+	for (rune_idx = 0, glyph_idx = start; glyph_idx < end; glyph_idx++, rune_idx++) {
-+		hbrunebuffer.runes[rune_idx] = glyphs[glyph_idx].u;
-+		mode = glyphs[glyph_idx].mode;
-+		if (mode & ATTR_WDUMMY)
-+			hbrunebuffer.runes[rune_idx] = 0x0020;
-+	}
-+	hb_buffer_add_codepoints(buffer, hbrunebuffer.runes, length, 0, length);
-+
-+	/* Shape the segment. */
-+	hb_shape(font, buffer, features, sizeof(features)/sizeof(hb_feature_t));
-+
-+	/* Get new glyph info. */
-+	hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, &glyph_count);
-+	hb_glyph_position_t *pos = hb_buffer_get_glyph_positions(buffer, &glyph_count);
-+
-+	/* Fill the output. */
-+	data->buffer = buffer;
-+	data->glyphs = info;
-+	data->positions = pos;
-+	data->count = glyph_count;
-+}
-+
-+void hbcleanup(HbTransformData *data) {
-+	hb_buffer_destroy(data->buffer);
-+	memset(data, 0, sizeof(HbTransformData));
-+}
-diff --git a/hb.h b/hb.h
-new file mode 100644
-index 0000000..96e808b
---- /dev/null
-+++ b/hb.h
-@@ -0,0 +1,15 @@
-+#include <X11/Xft/Xft.h>
-+#include <hb.h>
-+#include <hb-ft.h>
-+
-+typedef struct {
-+	hb_buffer_t *buffer;
-+	hb_glyph_info_t *glyphs;
-+	hb_glyph_position_t *positions;
-+	unsigned int count;
-+} HbTransformData;
-+
-+void hbunloadfonts();
-+void hbtransform(HbTransformData *, XftFont *, const Glyph *, int, int);
-+void hbcleanup(HbTransformData *);
-+
-diff --git a/st.c b/st.c
-index 0074ec7..fc916e9 100644
---- a/st.c
-+++ b/st.c
-@@ -2803,9 +2803,10 @@ draw(void)
- 
- 	drawregion(0, 0, term.col, term.row);
- 	if (TSCREEN.off == 0)
- 		xdrawcursor(cx, term.c.y, TLINE(term.c.y)[cx],
--				term.ocx, term.ocy, TLINE(term.ocy)[term.ocx]);
-+			term.ocx, term.ocy, TLINE(term.ocy)[term.ocx],
-+			TLINE(term.ocy), term.col);
- 	term.ocx = cx;
- 	term.ocy = term.c.y;
- 	xfinishdraw();
- 	if (ocx != term.ocx || ocy != term.ocy)
-diff --git a/st.h b/st.h
-index 3cea73b..709a369 100644
---- a/st.h
-+++ b/st.h
-@@ -10,9 +10,10 @@
- #define BETWEEN(x, a, b)	((a) <= (x) && (x) <= (b))
- #define DIVCEIL(n, d)		(((n) + ((d) - 1)) / (d))
- #define DEFAULT(a, b)		(a) = (a) ? (a) : (b)
- #define LIMIT(x, a, b)		(x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
--#define ATTRCMP(a, b)		((a).mode != (b).mode || (a).fg != (b).fg || \
-+#define ATTRCMP(a, b)		(((a).mode & (~ATTR_WRAP)) != ((b).mode & (~ATTR_WRAP)) || \
-+				(a).fg != (b).fg || \
- 				(a).bg != (b).bg)
- #define TIMEDIFF(t1, t2)	((t1.tv_sec-t2.tv_sec)*1000 + \
- 				(t1.tv_nsec-t2.tv_nsec)/1E6)
- #define MODBIT(x, set, bit)	((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
-diff --git a/win.h b/win.h
-index 6de960d..94679e4 100644
---- a/win.h
-+++ b/win.h
-@@ -24,9 +24,9 @@ enum win_mode {
- };
- 
- void xbell(void);
- void xclipcopy(void);
--void xdrawcursor(int, int, Glyph, int, int, Glyph);
-+void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
- void xdrawline(Line, int, int, int);
- void xfinishdraw(void);
- void xloadcols(void);
- int xsetcolorname(int, const char *);
-diff --git a/x.c b/x.c
-index 1e4bdf5..f8372ba 100644
---- a/x.c
-+++ b/x.c
-@@ -18,8 +18,9 @@
- char *argv0;
- #include "arg.h"
- #include "st.h"
- #include "win.h"
-+#include "hb.h"
- 
- /* types used in config.h */
- typedef struct {
- 	uint mod;
-@@ -142,10 +143,11 @@ typedef struct {
- 	GC gc;
- } DC;
- 
- static inline ushort sixd_to_16bit(int);
-+static void xresetfontsettings(ushort mode, Font **font, int *frcflags);
- static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
--static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
-+static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int);
- static void xdrawglyph(Glyph, int, int);
- static void xclear(int, int, int, int);
- static int xgeommasktogravity(int);
- static int ximopen(Display *);
-@@ -758,9 +760,9 @@ xresize(int col, int row)
- 	XftDrawChange(xw.draw, xw.buf);
- 	xclear(0, 0, win.w, win.h);
- 
- 	/* resize to new width */
--	xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec));
-+	xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec) * 4);
- }
- 
- ushort
- sixd_to_16bit(int x)
-@@ -1063,8 +1065,11 @@ xunloadfont(Font *f)
- 
- void
- xunloadfonts(void)
- {
-+	/* Clear Harfbuzz font cache. */
-+	hbunloadfonts();
-+
- 	/* Free the loaded fonts in the font cache.  */
- 	while (frclen > 0)
- 		XftFontClose(xw.dpy, frc[--frclen].font);
- 
-@@ -1189,9 +1194,9 @@ xinit(int cols, int rows)
- 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
- 
- 	/* font spec buffer */
--	xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec));
-+	xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec) * 4);
- 
- 	/* Xft rendering context */
- 	xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
- 
-@@ -1243,144 +1248,155 @@ xinit(int cols, int rows)
- 	if (xsel.xtarget == None)
- 		xsel.xtarget = XA_STRING;
- }
- 
-+void
-+xresetfontsettings(ushort mode, Font **font, int *frcflags)
-+{
-+	*font = &dc.font;
-+	if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
-+		*font = &dc.ibfont;
-+		*frcflags = FRC_ITALICBOLD;
-+	} else if (mode & ATTR_ITALIC) {
-+		*font = &dc.ifont;
-+		*frcflags = FRC_ITALIC;
-+	} else if (mode & ATTR_BOLD) {
-+		*font = &dc.bfont;
-+		*frcflags = FRC_BOLD;
-+	}
-+}
-+
- int
- xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
- {
- 	float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
--	ushort mode, prevmode = USHRT_MAX;
-+	ushort mode = glyphs[0].mode & ~ATTR_WRAP;
- 	Font *font = &dc.font;
- 	int frcflags = FRC_NORMAL;
--	float runewidth = win.cw;
-+	float runewidth = win.cw * ((glyphs[0].mode & ATTR_WIDE) ? 2.0f : 1.0f);
- 	Rune rune;
- 	FT_UInt glyphidx;
- 	FcResult fcres;
- 	FcPattern *fcpattern, *fontpattern;
- 	FcFontSet *fcsets[] = { NULL };
- 	FcCharSet *fccharset;
--	int i, f, numspecs = 0;
-+	int f, code_idx, numspecs = 0;
-+	float cluster_xp = xp, cluster_yp = yp;
-+	HbTransformData shaped = { 0 };
- 
--	for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
--		/* Fetch rune and mode for current glyph. */
--		rune = glyphs[i].u;
--		mode = glyphs[i].mode;
-+	/* Initial values. */
-+	xresetfontsettings(mode, &font, &frcflags);
- 
--		/* Skip dummy wide-character spacing. */
--		if (mode == ATTR_WDUMMY)
-+	/* Shape the segment. */
-+	hbtransform(&shaped, font->match, glyphs, 0, len);
-+	xp = winx; yp = winy + font->ascent;
-+	cluster_xp = xp; cluster_yp = yp;
-+
-+	for (code_idx = 0; code_idx < shaped.count; code_idx++) {
-+		int idx = shaped.glyphs[code_idx].cluster;
-+
-+		if (glyphs[idx].mode & ATTR_WDUMMY)
- 			continue;
- 
--		/* Determine font for glyph if different from previous glyph. */
--		if (prevmode != mode) {
--			prevmode = mode;
--			font = &dc.font;
--			frcflags = FRC_NORMAL;
--			runewidth = win.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f);
--			if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
--				font = &dc.ibfont;
--				frcflags = FRC_ITALICBOLD;
--			} else if (mode & ATTR_ITALIC) {
--				font = &dc.ifont;
--				frcflags = FRC_ITALIC;
--			} else if (mode & ATTR_BOLD) {
--				font = &dc.bfont;
--				frcflags = FRC_BOLD;
--			}
--			yp = winy + font->ascent;
-+		/* Advance the drawing cursor if we've moved to a new cluster */
-+		if (code_idx > 0 && (idx != shaped.glyphs[code_idx - 1].cluster)) {
-+			xp += runewidth * (idx - shaped.glyphs[code_idx - 1].cluster);
-+			cluster_xp = xp;
-+			cluster_yp = yp;
- 		}
- 
--		/* Lookup character index with default font. */
--		glyphidx = XftCharIndex(xw.dpy, font->match, rune);
--		if (glyphidx) {
-+		if (shaped.glyphs[code_idx].codepoint != 0) {
-+			/* If symbol is found, put it into the specs. */
- 			specs[numspecs].font = font->match;
--			specs[numspecs].glyph = glyphidx;
--			specs[numspecs].x = (short)xp;
--			specs[numspecs].y = (short)yp;
--			xp += runewidth;
-+			specs[numspecs].glyph = shaped.glyphs[code_idx].codepoint;
-+			specs[numspecs].x = cluster_xp + (short)(shaped.positions[code_idx].x_offset / 64.);
-+			specs[numspecs].y = cluster_yp - (short)(shaped.positions[code_idx].y_offset / 64.);
-+			cluster_xp += shaped.positions[code_idx].x_advance / 64.;
-+			cluster_yp += shaped.positions[code_idx].y_advance / 64.;
- 			numspecs++;
--			continue;
--		}
--
--		/* Fallback on font cache, search the font cache for match. */
--		for (f = 0; f < frclen; f++) {
--			glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
--			/* Everything correct. */
--			if (glyphidx && frc[f].flags == frcflags)
--				break;
--			/* We got a default font for a not found glyph. */
--			if (!glyphidx && frc[f].flags == frcflags
--					&& frc[f].unicodep == rune) {
--				break;
-+		} else {
-+			/* If it's not found, try to fetch it through the font cache. */
-+			rune = glyphs[idx].u;
-+			for (f = 0; f < frclen; f++) {
-+				glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
-+				/* Everything correct. */
-+				if (glyphidx && frc[f].flags == frcflags)
-+					break;
-+				/* We got a default font for a not found glyph. */
-+				if (!glyphidx && frc[f].flags == frcflags
-+						&& frc[f].unicodep == rune) {
-+					break;
-+				}
- 			}
--		}
--
--		/* Nothing was found. Use fontconfig to find matching font. */
--		if (f >= frclen) {
--			if (!font->set)
--				font->set = FcFontSort(0, font->pattern,
--				                       1, 0, &fcres);
--			fcsets[0] = font->set;
- 
--			/*
--			 * Nothing was found in the cache. Now use
--			 * some dozen of Fontconfig calls to get the
--			 * font for one single character.
--			 *
--			 * Xft and fontconfig are design failures.
--			 */
--			fcpattern = FcPatternDuplicate(font->pattern);
--			fccharset = FcCharSetCreate();
--
--			FcCharSetAddChar(fccharset, rune);
--			FcPatternAddCharSet(fcpattern, FC_CHARSET,
--					fccharset);
--			FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
--
--			FcConfigSubstitute(0, fcpattern,
--					FcMatchPattern);
--			FcDefaultSubstitute(fcpattern);
--
--			fontpattern = FcFontSetMatch(0, fcsets, 1,
--					fcpattern, &fcres);
--
--			/* Allocate memory for the new cache entry. */
--			if (frclen >= frccap) {
--				frccap += 16;
--				frc = xrealloc(frc, frccap * sizeof(Fontcache));
-+			/* Nothing was found. Use fontconfig to find matching font. */
-+			if (f >= frclen) {
-+				if (!font->set)
-+					font->set = FcFontSort(0, font->pattern,
-+							       1, 0, &fcres);
-+				fcsets[0] = font->set;
-+
-+				/*
-+				 * Nothing was found in the cache. Now use
-+				 * some dozen of Fontconfig calls to get the
-+				 * font for one single character.
-+				 *
-+				 * Xft and fontconfig are design failures.
-+				 */
-+				fcpattern = FcPatternDuplicate(font->pattern);
-+				fccharset = FcCharSetCreate();
-+
-+				FcCharSetAddChar(fccharset, rune);
-+				FcPatternAddCharSet(fcpattern, FC_CHARSET,
-+						fccharset);
-+				FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
-+
-+				FcConfigSubstitute(0, fcpattern,
-+						FcMatchPattern);
-+				FcDefaultSubstitute(fcpattern);
-+
-+				fontpattern = FcFontSetMatch(0, fcsets, 1,
-+						fcpattern, &fcres);
-+
-+				/* Allocate memory for the new cache entry. */
-+				if (frclen >= frccap) {
-+					frccap += 16;
-+					frc = xrealloc(frc, frccap * sizeof(Fontcache));
-+				}
-+
-+				frc[frclen].font = XftFontOpenPattern(xw.dpy,
-+						fontpattern);
-+				if (!frc[frclen].font)
-+					die("XftFontOpenPattern failed seeking fallback font: %s\n",
-+						strerror(errno));
-+				frc[frclen].flags = frcflags;
-+				frc[frclen].unicodep = rune;
-+
-+				glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
-+
-+				f = frclen;
-+				frclen++;
-+
-+				FcPatternDestroy(fcpattern);
-+				FcCharSetDestroy(fccharset);
- 			}
- 
--			frc[frclen].font = XftFontOpenPattern(xw.dpy,
--					fontpattern);
--			if (!frc[frclen].font)
--				die("XftFontOpenPattern failed seeking fallback font: %s\n",
--					strerror(errno));
--			frc[frclen].flags = frcflags;
--			frc[frclen].unicodep = rune;
--
--			glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
--
--			f = frclen;
--			frclen++;
--
--			FcPatternDestroy(fcpattern);
--			FcCharSetDestroy(fccharset);
-+			specs[numspecs].font = frc[f].font;
-+			specs[numspecs].glyph = glyphidx;
-+			specs[numspecs].x = (short)xp;
-+			specs[numspecs].y = (short)yp;
-+			numspecs++;
- 		}
--
--		specs[numspecs].font = frc[f].font;
--		specs[numspecs].glyph = glyphidx;
--		specs[numspecs].x = (short)xp;
--		specs[numspecs].y = (short)yp;
--		xp += runewidth;
--		numspecs++;
- 	}
- 
-+	/* Cleanup and get ready for next segment. */
-+	hbcleanup(&shaped);
- 	return numspecs;
- }
- 
- void
--xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
-+xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y, int charlen)
- {
--	int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
- 	int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
- 	    width = charlen * win.cw;
- 	Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
- 	XRenderColor colfg, colbg;
-@@ -1514,23 +1530,26 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
- void
- xdrawglyph(Glyph g, int x, int y)
- {
- 	int numspecs;
--	XftGlyphFontSpec spec;
-+	XftGlyphFontSpec *specs = xw.specbuf;
- 
--	numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
--	xdrawglyphfontspecs(&spec, g, numspecs, x, y);
-+	numspecs = xmakeglyphfontspecs(specs, &g, 1, x, y);
-+	xdrawglyphfontspecs(specs, g, numspecs, x, y, (g.mode & ATTR_WIDE) ? 2 : 1);
- }
- 
- void
--xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
-+xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
- {
- 	Color drawcol;
- 
- 	/* remove the old cursor */
- 	if (selected(ox, oy))
- 		og.mode ^= ATTR_REVERSE;
--	xdrawglyph(og, ox, oy);
-+
-+	/* Redraw the line where cursor was previously.
-+	 * It will restore the ligatures broken by the cursor. */
-+	xdrawline(line, 0, oy, len);
- 
- 	if (IS_SET(MODE_HIDE))
- 		return;
- 
-@@ -1662,30 +1681,30 @@ xdrawline(Line line, int x1, int y1, int x2)
- 	int i, x, ox, numspecs;
- 	Glyph base, new;
- 	XftGlyphFontSpec *specs = xw.specbuf;
- 
--	numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
- 	i = ox = 0;
--	for (x = x1; x < x2 && i < numspecs; x++) {
-+	for (x = x1; x < x2; x++) {
- 		new = line[x];
- 		if (new.mode == ATTR_WDUMMY)
- 			continue;
- 		if (selected(x, y1))
- 			new.mode ^= ATTR_REVERSE;
--		if (i > 0 && ATTRCMP(base, new)) {
--			xdrawglyphfontspecs(specs, base, i, ox, y1);
--			specs += i;
--			numspecs -= i;
-+		if ((i > 0) && ATTRCMP(base, new)) {
-+			numspecs = xmakeglyphfontspecs(specs, &line[ox], x - ox, ox, y1);
-+			xdrawglyphfontspecs(specs, base, numspecs, ox, y1, x - ox);
- 			i = 0;
- 		}
- 		if (i == 0) {
- 			ox = x;
- 			base = new;
- 		}
- 		i++;
- 	}
--	if (i > 0)
--		xdrawglyphfontspecs(specs, base, i, ox, y1);
-+	if (i > 0) {
-+		numspecs = xmakeglyphfontspecs(specs, &line[ox], x2 - ox, ox, y1);
-+		xdrawglyphfontspecs(specs, base, numspecs, ox, y1, x2 - ox);
-+	}
- }
- 
- void
- xfinishdraw(void)
diff --git a/st.c b/st.c
index 8a3ca0f..af45169 100644
--- a/st.c
+++ b/st.c
@@ -2805,8 +2805,7 @@ draw(void)
 	drawregion(0, 0, term.col, term.row);
 	if (TSCREEN.off == 0)
 		xdrawcursor(cx, term.c.y, TLINE(term.c.y)[cx],
-			term.ocx, term.ocy, TLINE(term.ocy)[term.ocx],
-			TLINE(term.ocy), term.col);
+				term.ocx, term.ocy, TLINE(term.ocy)[term.ocx]);
 	term.ocx = cx;
 	term.ocy = term.c.y;
 	xfinishdraw();
diff --git a/st.h b/st.h
index 709a369..3cea73b 100644
--- a/st.h
+++ b/st.h
@@ -11,8 +11,7 @@
 #define DIVCEIL(n, d)		(((n) + ((d) - 1)) / (d))
 #define DEFAULT(a, b)		(a) = (a) ? (a) : (b)
 #define LIMIT(x, a, b)		(x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
-#define ATTRCMP(a, b)		(((a).mode & (~ATTR_WRAP)) != ((b).mode & (~ATTR_WRAP)) || \
-				(a).fg != (b).fg || \
+#define ATTRCMP(a, b)		((a).mode != (b).mode || (a).fg != (b).fg || \
 				(a).bg != (b).bg)
 #define TIMEDIFF(t1, t2)	((t1.tv_sec-t2.tv_sec)*1000 + \
 				(t1.tv_nsec-t2.tv_nsec)/1E6)
diff --git a/st.o b/st.o
index 3bb5b10..a6cb309 100644
Binary files a/st.o and b/st.o differ
diff --git a/win.h b/win.h
index 94679e4..6de960d 100644
--- a/win.h
+++ b/win.h
@@ -25,7 +25,7 @@ enum win_mode {
 
 void xbell(void);
 void xclipcopy(void);
-void xdrawcursor(int, int, Glyph, int, int, Glyph, Line, int);
+void xdrawcursor(int, int, Glyph, int, int, Glyph);
 void xdrawline(Line, int, int, int);
 void xfinishdraw(void);
 void xloadcols(void);
diff --git a/x.c b/x.c
index b4d56a3..82c9002 100644
--- a/x.c
+++ b/x.c
@@ -19,7 +19,6 @@ char *argv0;
 #include "arg.h"
 #include "st.h"
 #include "win.h"
-#include "hb.h"
 
 /* types used in config.h */
 typedef struct {
@@ -144,9 +143,8 @@ typedef struct {
 } DC;
 
 static inline ushort sixd_to_16bit(int);
-static void xresetfontsettings(ushort mode, Font **font, int *frcflags);
 static int xmakeglyphfontspecs(XftGlyphFontSpec *, const Glyph *, int, int, int);
-static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int, int);
+static void xdrawglyphfontspecs(const XftGlyphFontSpec *, Glyph, int, int, int);
 static void xdrawglyph(Glyph, int, int);
 static void xclear(int, int, int, int);
 static int xgeommasktogravity(int);
@@ -761,7 +759,7 @@ xresize(int col, int row)
 	xclear(0, 0, win.w, win.h);
 
 	/* resize to new width */
-	xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec) * 4);
+	xw.specbuf = xrealloc(xw.specbuf, col * sizeof(GlyphFontSpec));
 }
 
 ushort
@@ -1066,9 +1064,6 @@ xunloadfont(Font *f)
 void
 xunloadfonts(void)
 {
-	/* Clear Harfbuzz font cache. */
-	hbunloadfonts();
-
 	/* Free the loaded fonts in the font cache.  */
 	while (frclen > 0)
 		XftFontClose(xw.dpy, frc[--frclen].font);
@@ -1195,7 +1190,7 @@ xinit(int cols, int rows)
 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
 
 	/* font spec buffer */
-	xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec) * 4);
+	xw.specbuf = xmalloc(cols * sizeof(GlyphFontSpec));
 
 	/* Xft rendering context */
 	xw.draw = XftDrawCreate(xw.dpy, xw.buf, xw.vis, xw.cmap);
@@ -1249,153 +1244,142 @@ xinit(int cols, int rows)
 		xsel.xtarget = XA_STRING;
 }
 
-void
-xresetfontsettings(ushort mode, Font **font, int *frcflags)
-{
-	*font = &dc.font;
-	if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
-		*font = &dc.ibfont;
-		*frcflags = FRC_ITALICBOLD;
-	} else if (mode & ATTR_ITALIC) {
-		*font = &dc.ifont;
-		*frcflags = FRC_ITALIC;
-	} else if (mode & ATTR_BOLD) {
-		*font = &dc.bfont;
-		*frcflags = FRC_BOLD;
-	}
-}
-
 int
 xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
 {
 	float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
-	ushort mode = glyphs[0].mode & ~ATTR_WRAP;
+	ushort mode, prevmode = USHRT_MAX;
 	Font *font = &dc.font;
 	int frcflags = FRC_NORMAL;
-	float runewidth = win.cw * ((glyphs[0].mode & ATTR_WIDE) ? 2.0f : 1.0f);
+	float runewidth = win.cw;
 	Rune rune;
 	FT_UInt glyphidx;
 	FcResult fcres;
 	FcPattern *fcpattern, *fontpattern;
 	FcFontSet *fcsets[] = { NULL };
 	FcCharSet *fccharset;
-	int f, code_idx, numspecs = 0;
-	float cluster_xp = xp, cluster_yp = yp;
-	HbTransformData shaped = { 0 };
+	int i, f, numspecs = 0;
 
-	/* Initial values. */
-	xresetfontsettings(mode, &font, &frcflags);
+	for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
+		/* Fetch rune and mode for current glyph. */
+		rune = glyphs[i].u;
+		mode = glyphs[i].mode;
 
-	/* Shape the segment. */
-	hbtransform(&shaped, font->match, glyphs, 0, len);
-	xp = winx; yp = winy + font->ascent;
-	cluster_xp = xp; cluster_yp = yp;
-
-	for (code_idx = 0; code_idx < shaped.count; code_idx++) {
-		int idx = shaped.glyphs[code_idx].cluster;
-
-		if (glyphs[idx].mode & ATTR_WDUMMY)
+		/* Skip dummy wide-character spacing. */
+		if (mode == ATTR_WDUMMY)
 			continue;
 
-		/* Advance the drawing cursor if we've moved to a new cluster */
-		if (code_idx > 0 && (idx != shaped.glyphs[code_idx - 1].cluster)) {
-			xp += runewidth * (idx - shaped.glyphs[code_idx - 1].cluster);
-			cluster_xp = xp;
-			cluster_yp = yp;
+		/* Determine font for glyph if different from previous glyph. */
+		if (prevmode != mode) {
+			prevmode = mode;
+			font = &dc.font;
+			frcflags = FRC_NORMAL;
+			runewidth = win.cw * ((mode & ATTR_WIDE) ? 2.0f : 1.0f);
+			if ((mode & ATTR_ITALIC) && (mode & ATTR_BOLD)) {
+				font = &dc.ibfont;
+				frcflags = FRC_ITALICBOLD;
+			} else if (mode & ATTR_ITALIC) {
+				font = &dc.ifont;
+				frcflags = FRC_ITALIC;
+			} else if (mode & ATTR_BOLD) {
+				font = &dc.bfont;
+				frcflags = FRC_BOLD;
+			}
+			yp = winy + font->ascent;
 		}
 
-		if (shaped.glyphs[code_idx].codepoint != 0) {
-			/* If symbol is found, put it into the specs. */
+		/* Lookup character index with default font. */
+		glyphidx = XftCharIndex(xw.dpy, font->match, rune);
+		if (glyphidx) {
 			specs[numspecs].font = font->match;
-			specs[numspecs].glyph = shaped.glyphs[code_idx].codepoint;
-			specs[numspecs].x = cluster_xp + (short)(shaped.positions[code_idx].x_offset / 64.);
-			specs[numspecs].y = cluster_yp - (short)(shaped.positions[code_idx].y_offset / 64.);
-			cluster_xp += shaped.positions[code_idx].x_advance / 64.;
-			cluster_yp += shaped.positions[code_idx].y_advance / 64.;
-			numspecs++;
-		} else {
-			/* If it's not found, try to fetch it through the font cache. */
-			rune = glyphs[idx].u;
-			for (f = 0; f < frclen; f++) {
-				glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
-				/* Everything correct. */
-				if (glyphidx && frc[f].flags == frcflags)
-					break;
-				/* We got a default font for a not found glyph. */
-				if (!glyphidx && frc[f].flags == frcflags
-						&& frc[f].unicodep == rune) {
-					break;
-				}
-			}
-
-			/* Nothing was found. Use fontconfig to find matching font. */
-			if (f >= frclen) {
-				if (!font->set)
-					font->set = FcFontSort(0, font->pattern,
-							       1, 0, &fcres);
-				fcsets[0] = font->set;
-
-				/*
-				 * Nothing was found in the cache. Now use
-				 * some dozen of Fontconfig calls to get the
-				 * font for one single character.
-				 *
-				 * Xft and fontconfig are design failures.
-				 */
-				fcpattern = FcPatternDuplicate(font->pattern);
-				fccharset = FcCharSetCreate();
-
-				FcCharSetAddChar(fccharset, rune);
-				FcPatternAddCharSet(fcpattern, FC_CHARSET,
-						fccharset);
-				FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
-
-				FcConfigSubstitute(0, fcpattern,
-						FcMatchPattern);
-				FcDefaultSubstitute(fcpattern);
-
-				fontpattern = FcFontSetMatch(0, fcsets, 1,
-						fcpattern, &fcres);
-
-				/* Allocate memory for the new cache entry. */
-				if (frclen >= frccap) {
-					frccap += 16;
-					frc = xrealloc(frc, frccap * sizeof(Fontcache));
-				}
-
-				frc[frclen].font = XftFontOpenPattern(xw.dpy,
-						fontpattern);
-				if (!frc[frclen].font)
-					die("XftFontOpenPattern failed seeking fallback font: %s\n",
-						strerror(errno));
-				frc[frclen].flags = frcflags;
-				frc[frclen].unicodep = rune;
-
-				glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
-
-				f = frclen;
-				frclen++;
-
-				FcPatternDestroy(fcpattern);
-				FcCharSetDestroy(fccharset);
-			}
-
-			specs[numspecs].font = frc[f].font;
 			specs[numspecs].glyph = glyphidx;
 			specs[numspecs].x = (short)xp;
 			specs[numspecs].y = (short)yp;
+			xp += runewidth;
 			numspecs++;
+			continue;
 		}
+
+		/* Fallback on font cache, search the font cache for match. */
+		for (f = 0; f < frclen; f++) {
+			glyphidx = XftCharIndex(xw.dpy, frc[f].font, rune);
+			/* Everything correct. */
+			if (glyphidx && frc[f].flags == frcflags)
+				break;
+			/* We got a default font for a not found glyph. */
+			if (!glyphidx && frc[f].flags == frcflags
+					&& frc[f].unicodep == rune) {
+				break;
+			}
+		}
+
+		/* Nothing was found. Use fontconfig to find matching font. */
+		if (f >= frclen) {
+			if (!font->set)
+				font->set = FcFontSort(0, font->pattern,
+				                       1, 0, &fcres);
+			fcsets[0] = font->set;
+
+			/*
+			 * Nothing was found in the cache. Now use
+			 * some dozen of Fontconfig calls to get the
+			 * font for one single character.
+			 *
+			 * Xft and fontconfig are design failures.
+			 */
+			fcpattern = FcPatternDuplicate(font->pattern);
+			fccharset = FcCharSetCreate();
+
+			FcCharSetAddChar(fccharset, rune);
+			FcPatternAddCharSet(fcpattern, FC_CHARSET,
+					fccharset);
+			FcPatternAddBool(fcpattern, FC_SCALABLE, 1);
+
+			FcConfigSubstitute(0, fcpattern,
+					FcMatchPattern);
+			FcDefaultSubstitute(fcpattern);
+
+			fontpattern = FcFontSetMatch(0, fcsets, 1,
+					fcpattern, &fcres);
+
+			/* Allocate memory for the new cache entry. */
+			if (frclen >= frccap) {
+				frccap += 16;
+				frc = xrealloc(frc, frccap * sizeof(Fontcache));
+			}
+
+			frc[frclen].font = XftFontOpenPattern(xw.dpy,
+					fontpattern);
+			if (!frc[frclen].font)
+				die("XftFontOpenPattern failed seeking fallback font: %s\n",
+					strerror(errno));
+			frc[frclen].flags = frcflags;
+			frc[frclen].unicodep = rune;
+
+			glyphidx = XftCharIndex(xw.dpy, frc[frclen].font, rune);
+
+			f = frclen;
+			frclen++;
+
+			FcPatternDestroy(fcpattern);
+			FcCharSetDestroy(fccharset);
+		}
+
+		specs[numspecs].font = frc[f].font;
+		specs[numspecs].glyph = glyphidx;
+		specs[numspecs].x = (short)xp;
+		specs[numspecs].y = (short)yp;
+		xp += runewidth;
+		numspecs++;
 	}
 
-	/* Cleanup and get ready for next segment. */
-	hbcleanup(&shaped);
 	return numspecs;
 }
 
 void
-xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y, int charlen)
+xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
 {
+	int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
 	int winx = borderpx + x * win.cw, winy = borderpx + y * win.ch,
 	    width = charlen * win.cw;
 	Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
@@ -1527,24 +1511,21 @@ void
 xdrawglyph(Glyph g, int x, int y)
 {
 	int numspecs;
-	XftGlyphFontSpec *specs = xw.specbuf;
+	XftGlyphFontSpec spec;
 
-	numspecs = xmakeglyphfontspecs(specs, &g, 1, x, y);
-	xdrawglyphfontspecs(specs, g, numspecs, x, y, (g.mode & ATTR_WIDE) ? 2 : 1);
+	numspecs = xmakeglyphfontspecs(&spec, &g, 1, x, y);
+	xdrawglyphfontspecs(&spec, g, numspecs, x, y);
 }
 
 void
-xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int len)
+xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
 {
 	Color drawcol;
 
 	/* remove the old cursor */
 	if (selected(ox, oy))
 		og.mode ^= ATTR_REVERSE;
-
-	/* Redraw the line where cursor was previously.
-	 * It will restore the ligatures broken by the cursor. */
-	xdrawline(line, 0, oy, len);
+	xdrawglyph(og, ox, oy);
 
 	if (IS_SET(MODE_HIDE))
 		return;
@@ -1678,16 +1659,18 @@ xdrawline(Line line, int x1, int y1, int x2)
 	Glyph base, new;
 	XftGlyphFontSpec *specs = xw.specbuf;
 
+	numspecs = xmakeglyphfontspecs(specs, &line[x1], x2 - x1, x1, y1);
 	i = ox = 0;
-	for (x = x1; x < x2; x++) {
+	for (x = x1; x < x2 && i < numspecs; x++) {
 		new = line[x];
 		if (new.mode == ATTR_WDUMMY)
 			continue;
 		if (selected(x, y1))
 			new.mode ^= ATTR_REVERSE;
-		if ((i > 0) && ATTRCMP(base, new)) {
-			numspecs = xmakeglyphfontspecs(specs, &line[ox], x - ox, ox, y1);
-			xdrawglyphfontspecs(specs, base, numspecs, ox, y1, x - ox);
+		if (i > 0 && ATTRCMP(base, new)) {
+			xdrawglyphfontspecs(specs, base, i, ox, y1);
+			specs += i;
+			numspecs -= i;
 			i = 0;
 		}
 		if (i == 0) {
@@ -1696,10 +1679,8 @@ xdrawline(Line line, int x1, int y1, int x2)
 		}
 		i++;
 	}
-	if (i > 0) {
-		numspecs = xmakeglyphfontspecs(specs, &line[ox], x2 - ox, ox, y1);
-		xdrawglyphfontspecs(specs, base, numspecs, ox, y1, x2 - ox);
-	}
+	if (i > 0)
+		xdrawglyphfontspecs(specs, base, i, ox, y1);
 }
 
 void
diff --git a/x.c.orig b/x.c.orig
index 82c9002..d73152b 100644
--- a/x.c.orig
+++ b/x.c.orig
@@ -59,8 +59,6 @@ static void zoom(const Arg *);
 static void zoomabs(const Arg *);
 static void zoomreset(const Arg *);
 static void ttysend(const Arg *);
-void kscrollup(const Arg *);
-void kscrolldown(const Arg *);
 
 /* config.h for applying patches and the configuration. */
 #include "config.h"
@@ -1417,6 +1415,10 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
 		bg = &dc.col[base.bg];
 	}
 
+	/* Change basic system colors [0-7] to bright system colors [8-15] */
+	if ((base.mode & ATTR_BOLD_FAINT) == ATTR_BOLD && BETWEEN(base.fg, 0, 7))
+		fg = &dc.col[base.fg + 8];
+
 	if (IS_SET(MODE_REVERSE)) {
 		if (fg == &dc.col[defaultfg]) {
 			fg = &dc.col[defaultbg];
diff --git a/x.o b/x.o
index 230059b..f388641 100644
Binary files a/x.o and b/x.o differ