initialize branch at st 0.9 upstream

16 files changed, 225 insertions, 4759 deletions

diff --git a/FAQ b/FAQ
index 969b195..6287a27 100644
--- a/FAQ
+++ b/FAQ
@@ -248,3 +248,6 @@ fonts:
 
 Please don't bother reporting this bug to st, but notify the upstream Xft
 developers about fixing this bug.
+
+As of 2022-09-05 this now seems to be finally fixed in libXft 2.3.5:
+https://gitlab.freedesktop.org/xorg/lib/libxft/-/blob/libXft-2.3.5/NEWS
diff --git a/LICENSE b/LICENSE
index d80eb47..3cbf420 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT/X Consortium License
 
-© 2014-2020 Hiltjo Posthuma <hiltjo at codemadness dot org>
+© 2014-2022 Hiltjo Posthuma <hiltjo at codemadness dot org>
 © 2018 Devin J. Pohly <djpohly at gmail dot com>
 © 2014-2017 Quentin Rameau <quinq at fifth dot space>
 © 2009-2012 Aurélien APTEL <aurelien dot aptel at gmail dot com>
diff --git a/Makefile b/Makefile
index eacc2ef..470ac86 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: options st
@@ -22,8 +22,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
 
@@ -50,12 +49,9 @@ install: st
 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
 	tic -sx st.info
 	@echo Please see the README file regarding the terminfo entry of st.
-	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
-	cp -f st.desktop $(DESTDIR)$(PREFIX)/share/applications
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/st
 	rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/st.desktop
 
 .PHONY: all options clean dist install uninstall
diff --git a/config.def.h b/config.def.h
index f55682e..91ab8ca 100644
--- a/config.def.h
+++ b/config.def.h
@@ -6,13 +6,6 @@
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
 static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
-/* Spare fonts */
-static char *font2[] = {
-/*	"Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */
-/*	"Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */
-        "Symbola:pixelsize=11:antialias=true:autohint=true"
-};
-
 static int borderpx = 2;
 
 /*
@@ -100,9 +93,6 @@ char *termname = "st-256color";
  */
 unsigned int tabspaces = 8;
 
-/* bg opacity */
-float alpha = 0.8;
-
 /* Terminal colors (16 first used in escape sequence) */
 static const char *colorname[] = {
 	/* 8 normal colors */
@@ -128,10 +118,10 @@ static const char *colorname[] = {
 	[255] = 0,
 
 	/* more colors can be added after 255 to use with DefaultXX */
-	"black", /* default background colour */
-	"gray90", /* default foreground colour */
 	"#cccccc",
 	"#555555",
+	"gray90", /* default foreground colour */
+	"black", /* default background colour */
 };
 
 
@@ -139,10 +129,10 @@ static const char *colorname[] = {
  * Default colors (colorname index)
  * foreground, background, cursor, reverse cursor
  */
-unsigned int defaultfg = 257;
-unsigned int defaultbg = 256;
-unsigned int defaultcs = 258;
-static unsigned int defaultrcs = 259;
+unsigned int defaultfg = 258;
+unsigned int defaultbg = 259;
+unsigned int defaultcs = 256;
+static unsigned int defaultrcs = 257;
 
 /*
  * Default shape of cursor
@@ -174,43 +164,6 @@ static unsigned int mousebg = 0;
 static unsigned int defaultattr = 11;
 
 /*
- * Xresources preferences to load at startup
- */
-ResourcePref resources[] = {
-		{ "font",         STRING,  &font },
-		{ "color0",       STRING,  &colorname[0] },
-		{ "color1",       STRING,  &colorname[1] },
-		{ "color2",       STRING,  &colorname[2] },
-		{ "color3",       STRING,  &colorname[3] },
-		{ "color4",       STRING,  &colorname[4] },
-		{ "color5",       STRING,  &colorname[5] },
-		{ "color6",       STRING,  &colorname[6] },
-		{ "color7",       STRING,  &colorname[7] },
-		{ "color8",       STRING,  &colorname[8] },
-		{ "color9",       STRING,  &colorname[9] },
-		{ "color10",      STRING,  &colorname[10] },
-		{ "color11",      STRING,  &colorname[11] },
-		{ "color12",      STRING,  &colorname[12] },
-		{ "color13",      STRING,  &colorname[13] },
-		{ "color14",      STRING,  &colorname[14] },
-		{ "color15",      STRING,  &colorname[15] },
-		{ "background",   STRING,  &colorname[256] },
-		{ "foreground",   STRING,  &colorname[257] },
-		{ "cursorColor",  STRING,  &colorname[258] },
-                { "reverseCursor",STRING,  &colorname[259] },
-		{ "termname",     STRING,  &termname },
-		{ "shell",        STRING,  &shell },
-		{ "minlatency",   INTEGER, &minlatency },
-		{ "maxlatency",   INTEGER, &maxlatency },
-		{ "blinktimeout", INTEGER, &blinktimeout },
-		{ "bellvolume",   INTEGER, &bellvolume },
-		{ "tabspaces",    INTEGER, &tabspaces },
-		{ "borderpx",     INTEGER, &borderpx },
-		{ "cwscale",      FLOAT,   &cwscale },
-		{ "chscale",      FLOAT,   &chscale },
-};
-
-/*
  * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
  * Note that if you want to use ShiftMask with selmasks, set this to an other
  * modifier, set to 0 to not use it.
@@ -218,19 +171,11 @@ ResourcePref resources[] = {
 static uint forcemousemod = ShiftMask;
 
 /*
- * Command used to query unicode glyphs.
- */
-char *iso14755_cmd = "dmenu -w \"$WINDOWID\" -p codepoint: </dev/null";
-
-/*
  * Internal mouse shortcuts.
  * Beware that overloading Button1 will disable the selection.
  */
-const unsigned int mousescrollincrement = 1;
 static MouseShortcut mshortcuts[] = {
 	/* mask                 button   function        argument       release */
-	{ XK_ANY_MOD,           Button4, kscrollup,      {.i = mousescrollincrement},      0, /* !alt */ -1 },
-	{ XK_ANY_MOD,           Button5, kscrolldown,    {.i = mousescrollincrement},      0, /* !alt */ -1 },
 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
 	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
@@ -256,9 +201,6 @@ static Shortcut shortcuts[] = {
 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
-	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
-        { TERMMOD,              XK_I,           iso14755,       {.i =  0} },
 };
 
 /*
diff --git a/config.h b/config.h
deleted file mode 100644
index 6941d51..0000000
--- a/config.h
+++ /dev/null
@@ -1,532 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/*
- * appearance
- *
- * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
- */
-static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
-/* Spare fonts */
-static char *font2[] = {
-/*	"Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */
-/*	"Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */
-        "Symbola:pixelsize=11:antialias=true:autohint=true"
-};
-
-static int borderpx = 2;
-
-/*
- * What program is execed by st depends of these precedence rules:
- * 1: program passed with -e
- * 2: scroll and/or utmp
- * 3: SHELL environment variable
- * 4: value of shell in /etc/passwd
- * 5: value of shell in config.h
- */
-static char *shell = "/bin/sh";
-char *utmp = NULL;
-/* scroll program: to enable use a string like "scroll" */
-char *scroll = NULL;
-char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
-
-/* identification sequence returned in DA and DECID */
-char *vtiden = "\033[?6c";
-
-/* Kerning / character bounding-box multipliers */
-static float cwscale = 1.0;
-static float chscale = 1.0;
-
-/*
- * word delimiter string
- *
- * More advanced example: L" `'\"()[]{}"
- */
-wchar_t *worddelimiters = L" ";
-
-/* selection timeouts (in milliseconds) */
-static unsigned int doubleclicktimeout = 300;
-static unsigned int tripleclicktimeout = 600;
-
-/* alt screens */
-int allowaltscreen = 1;
-
-/* allow certain non-interactive (insecure) window operations such as:
-   setting the clipboard text */
-int allowwindowops = 0;
-
-/*
- * draw latency range in ms - from new content/keypress/etc until drawing.
- * within this range, st draws when content stops arriving (idle). mostly it's
- * near minlatency, but it waits longer for slow updates to avoid partial draw.
- * low minlatency will tear/flicker more, as it can "detect" idle too early.
- */
-static double minlatency = 8;
-static double maxlatency = 33;
-
-/*
- * blinking timeout (set to 0 to disable blinking) for the terminal blinking
- * attribute.
- */
-static unsigned int blinktimeout = 800;
-
-/*
- * thickness of underline and bar cursors
- */
-static unsigned int cursorthickness = 2;
-
-/*
- * bell volume. It must be a value between -100 and 100. Use 0 for disabling
- * it
- */
-static int bellvolume = 0;
-
-/* default TERM value */
-char *termname = "st-256color";
-
-/*
- * spaces per tab
- *
- * When you are changing this value, don't forget to adapt the »it« value in
- * the st.info and appropriately install the st.info in the environment where
- * you use this st version.
- *
- *	it#$tabspaces,
- *
- * Secondly make sure your kernel is not expanding tabs. When running `stty
- * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
- *  running following command:
- *
- *	stty tabs
- */
-unsigned int tabspaces = 8;
-
-/* bg opacity */
-float alpha = 0.8;
-
-/* Terminal colors (16 first used in escape sequence) */
-static const char *colorname[] = {
-	/* 8 normal colors */
-	"black",
-	"red3",
-	"green3",
-	"yellow3",
-	"blue2",
-	"magenta3",
-	"cyan3",
-	"gray90",
-
-	/* 8 bright colors */
-	"gray50",
-	"red",
-	"green",
-	"yellow",
-	"#5c5cff",
-	"magenta",
-	"cyan",
-	"white",
-
-	[255] = 0,
-
-	/* more colors can be added after 255 to use with DefaultXX */
-	"black", /* default background colour */
-	"gray90", /* default foreground colour */
-	"#cccccc",
-	"#555555",
-};
-
-
-/*
- * Default colors (colorname index)
- * foreground, background, cursor, reverse cursor
- */
-unsigned int defaultfg = 257;
-unsigned int defaultbg = 256;
-unsigned int defaultcs = 258;
-static unsigned int defaultrcs = 259;
-
-/*
- * Default shape of cursor
- * 2: Block ("█")
- * 4: Underline ("_")
- * 6: Bar ("|")
- * 7: Snowman ("☃")
- */
-static unsigned int cursorshape = 2;
-
-/*
- * Default columns and rows numbers
- */
-
-static unsigned int cols = 80;
-static unsigned int rows = 24;
-
-/*
- * Default colour and shape of the mouse cursor
- */
-static unsigned int mouseshape = XC_xterm;
-static unsigned int mousefg = 7;
-static unsigned int mousebg = 0;
-
-/*
- * Color used to display font attributes when fontconfig selected a font which
- * doesn't match the ones requested.
- */
-static unsigned int defaultattr = 11;
-
-/*
- * Xresources preferences to load at startup
- */
-ResourcePref resources[] = {
-		{ "font",         STRING,  &font },
-		{ "color0",       STRING,  &colorname[0] },
-		{ "color1",       STRING,  &colorname[1] },
-		{ "color2",       STRING,  &colorname[2] },
-		{ "color3",       STRING,  &colorname[3] },
-		{ "color4",       STRING,  &colorname[4] },
-		{ "color5",       STRING,  &colorname[5] },
-		{ "color6",       STRING,  &colorname[6] },
-		{ "color7",       STRING,  &colorname[7] },
-		{ "color8",       STRING,  &colorname[8] },
-		{ "color9",       STRING,  &colorname[9] },
-		{ "color10",      STRING,  &colorname[10] },
-		{ "color11",      STRING,  &colorname[11] },
-		{ "color12",      STRING,  &colorname[12] },
-		{ "color13",      STRING,  &colorname[13] },
-		{ "color14",      STRING,  &colorname[14] },
-		{ "color15",      STRING,  &colorname[15] },
-		{ "background",   STRING,  &colorname[256] },
-		{ "foreground",   STRING,  &colorname[257] },
-		{ "cursorColor",  STRING,  &colorname[258] },
-                { "reverseCursor",STRING,  &colorname[259] },
-		{ "termname",     STRING,  &termname },
-		{ "shell",        STRING,  &shell },
-		{ "minlatency",   INTEGER, &minlatency },
-		{ "maxlatency",   INTEGER, &maxlatency },
-		{ "blinktimeout", INTEGER, &blinktimeout },
-		{ "bellvolume",   INTEGER, &bellvolume },
-		{ "tabspaces",    INTEGER, &tabspaces },
-		{ "borderpx",     INTEGER, &borderpx },
-		{ "cwscale",      FLOAT,   &cwscale },
-		{ "chscale",      FLOAT,   &chscale },
-};
-
-/*
- * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
- * Note that if you want to use ShiftMask with selmasks, set this to an other
- * modifier, set to 0 to not use it.
- */
-static uint forcemousemod = ShiftMask;
-
-/*
- * Command used to query unicode glyphs.
- */
-char *iso14755_cmd = "dmenu -w \"$WINDOWID\" -p codepoint: </dev/null";
-
-/*
- * Internal mouse shortcuts.
- * Beware that overloading Button1 will disable the selection.
- */
-const unsigned int mousescrollincrement = 1;
-static MouseShortcut mshortcuts[] = {
-	/* mask                 button   function        argument       release */
-	{ XK_ANY_MOD,           Button4, kscrollup,      {.i = mousescrollincrement},      0, /* !alt */ -1 },
-	{ XK_ANY_MOD,           Button5, kscrolldown,    {.i = mousescrollincrement},      0, /* !alt */ -1 },
-	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
-	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
-	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
-	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} },
-	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
-};
-
-/* Internal keyboard shortcuts. */
-#define MODKEY Mod1Mask
-#define TERMMOD (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} },
-	{ ControlMask,          XK_equal,       zoom,           {.f = +1} },
-	{ ControlMask,          XK_minus,       zoom,           {.f = -1} },
-	{ TERMMOD,              XK_plus,        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} },
-        { TERMMOD,              XK_I,           iso14755,       {.i =  0} },
-};
-
-/*
- * Special keys (change & recompile st.info accordingly)
- *
- * Mask value:
- * * Use XK_ANY_MOD to match the key no matter modifiers state
- * * Use XK_NO_MOD to match the key alone (no modifiers)
- * appkey value:
- * * 0: no value
- * * > 0: keypad application mode enabled
- * *   = 2: term.numlock = 1
- * * < 0: keypad application mode disabled
- * appcursor value:
- * * 0: no value
- * * > 0: cursor application mode enabled
- * * < 0: cursor application mode disabled
- *
- * Be careful with the order of the definitions because st searches in
- * this table sequentially, so any XK_ANY_MOD must be in the last
- * position for a key.
- */
-
-/*
- * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
- * to be mapped below, add them to this array.
- */
-static KeySym mappedkeys[] = { -1 };
-
-/*
- * State bits to ignore when matching key or button events.  By default,
- * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
- */
-static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
-
-/*
- * This is the huge key array which defines all compatibility to the Linux
- * world. Please decide about changes wisely.
- */
-static Key key[] = {
-	/* keysym           mask            string      appkey appcursor */
-	{ XK_KP_Home,       ShiftMask,      "\033[2J",       0,   -1},
-	{ XK_KP_Home,       ShiftMask,      "\033[1;2H",     0,   +1},
-	{ XK_KP_Home,       XK_ANY_MOD,     "\033[H",        0,   -1},
-	{ XK_KP_Home,       XK_ANY_MOD,     "\033[1~",       0,   +1},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033Ox",       +1,    0},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033[A",        0,   -1},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033OA",        0,   +1},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033Or",       +1,    0},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033[B",        0,   -1},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033OB",        0,   +1},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033Ot",       +1,    0},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033[D",        0,   -1},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033OD",        0,   +1},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033Ov",       +1,    0},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033[C",        0,   -1},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033OC",        0,   +1},
-	{ XK_KP_Prior,      ShiftMask,      "\033[5;2~",     0,    0},
-	{ XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0},
-	{ XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        0,    0},
-	{ XK_KP_End,        ControlMask,    "\033[J",       -1,    0},
-	{ XK_KP_End,        ControlMask,    "\033[1;5F",    +1,    0},
-	{ XK_KP_End,        ShiftMask,      "\033[K",       -1,    0},
-	{ XK_KP_End,        ShiftMask,      "\033[1;2F",    +1,    0},
-	{ XK_KP_End,        XK_ANY_MOD,     "\033[4~",       0,    0},
-	{ XK_KP_Next,       ShiftMask,      "\033[6;2~",     0,    0},
-	{ XK_KP_Next,       XK_ANY_MOD,     "\033[6~",       0,    0},
-	{ XK_KP_Insert,     ShiftMask,      "\033[2;2~",    +1,    0},
-	{ XK_KP_Insert,     ShiftMask,      "\033[4l",      -1,    0},
-	{ XK_KP_Insert,     ControlMask,    "\033[L",       -1,    0},
-	{ XK_KP_Insert,     ControlMask,    "\033[2;5~",    +1,    0},
-	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[4h",      -1,    0},
-	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[2~",      +1,    0},
-	{ XK_KP_Delete,     ControlMask,    "\033[M",       -1,    0},
-	{ XK_KP_Delete,     ControlMask,    "\033[3;5~",    +1,    0},
-	{ XK_KP_Delete,     ShiftMask,      "\033[2K",      -1,    0},
-	{ XK_KP_Delete,     ShiftMask,      "\033[3;2~",    +1,    0},
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[P",       -1,    0},
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",      +1,    0},
-	{ XK_KP_Multiply,   XK_ANY_MOD,     "\033Oj",       +2,    0},
-	{ XK_KP_Add,        XK_ANY_MOD,     "\033Ok",       +2,    0},
-	{ XK_KP_Enter,      XK_ANY_MOD,     "\033OM",       +2,    0},
-	{ XK_KP_Enter,      XK_ANY_MOD,     "\r",           -1,    0},
-	{ XK_KP_Subtract,   XK_ANY_MOD,     "\033Om",       +2,    0},
-	{ XK_KP_Decimal,    XK_ANY_MOD,     "\033On",       +2,    0},
-	{ XK_KP_Divide,     XK_ANY_MOD,     "\033Oo",       +2,    0},
-	{ XK_KP_0,          XK_ANY_MOD,     "\033Op",       +2,    0},
-	{ XK_KP_1,          XK_ANY_MOD,     "\033Oq",       +2,    0},
-	{ XK_KP_2,          XK_ANY_MOD,     "\033Or",       +2,    0},
-	{ XK_KP_3,          XK_ANY_MOD,     "\033Os",       +2,    0},
-	{ XK_KP_4,          XK_ANY_MOD,     "\033Ot",       +2,    0},
-	{ XK_KP_5,          XK_ANY_MOD,     "\033Ou",       +2,    0},
-	{ XK_KP_6,          XK_ANY_MOD,     "\033Ov",       +2,    0},
-	{ XK_KP_7,          XK_ANY_MOD,     "\033Ow",       +2,    0},
-	{ XK_KP_8,          XK_ANY_MOD,     "\033Ox",       +2,    0},
-	{ XK_KP_9,          XK_ANY_MOD,     "\033Oy",       +2,    0},
-	{ XK_Up,            ShiftMask,      "\033[1;2A",     0,    0},
-	{ XK_Up,            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},
-};
-
-/*
- * Selection types' masks.
- * Use the same masks as usual.
- * Button1Mask is always unset, to make masks match between ButtonPress.
- * ButtonRelease and MotionNotify.
- * If no match is found, regular selection is used.
- */
-static uint selmasks[] = {
-	[SEL_RECTANGULAR] = Mod1Mask,
-};
-
-/*
- * Printable characters in ASCII, used to estimate the advance width
- * of single wide characters.
- */
-static char ascii_printable[] =
-	" !\"#$%&'()*+,-./0123456789:;<=>?"
-	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
-	"`abcdefghijklmnopqrstuvwxyz{|}~";
diff --git a/config.mk b/config.mk
index 201a144..1e306f8 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # st version
-VERSION = 0.8.5
+VERSION = 0.9
 
 # Customize below to fit your system
 
@@ -15,15 +15,12 @@ PKG_CONFIG = pkg-config
 # includes and libs
 INCS = -I$(X11INC) \
        `$(PKG_CONFIG) --cflags fontconfig` \
-       `$(PKG_CONFIG) --cflags freetype2` \
-       `$(PKG_CONFIG) --cflags harfbuzz`
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
+       `$(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
-CFLAGS= -Wall -pedantic -O3 -march=native -std=c99
 STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
 STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
 STLDFLAGS = $(LIBS) $(LDFLAGS)
@@ -33,6 +30,7 @@ STLDFLAGS = $(LIBS) $(LDFLAGS)
 #LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
 #       `$(PKG_CONFIG) --libs fontconfig` \
 #       `$(PKG_CONFIG) --libs freetype2`
+#MANPREFIX = ${PREFIX}/man
 
 # compiler and linker
 # CC = c99
diff --git a/hb.c b/hb.c
deleted file mode 100644
index 7df2828..0000000
--- a/hb.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <X11/Xft/Xft.h>
-#include <hb.h>
-#include <hb-ft.h>
-
-#include "st.h"
-
-void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
-hb_font_t *hbfindfont(XftFont *match);
-
-typedef struct {
-	XftFont *match;
-	hb_font_t *font;
-} HbFontMatch;
-
-static int hbfontslen = 0;
-static HbFontMatch *hbfontcache = NULL;
-
-void
-hbunloadfonts()
-{
-	for (int i = 0; i < hbfontslen; i++) {
-		hb_font_destroy(hbfontcache[i].font);
-		XftUnlockFace(hbfontcache[i].match);
-	}
-
-	if (hbfontcache != NULL) {
-		free(hbfontcache);
-		hbfontcache = NULL;
-	}
-	hbfontslen = 0;
-}
-
-hb_font_t *
-hbfindfont(XftFont *match)
-{
-	for (int i = 0; i < hbfontslen; i++) {
-		if (hbfontcache[i].match == match)
-			return hbfontcache[i].font;
-	}
-
-	/* Font not found in cache, caching it now. */
-	hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 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[hbfontslen].match = match;
-	hbfontcache[hbfontslen].font = font;
-	hbfontslen += 1;
-
-	return font;
-}
-
-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));
-
-	for (int idx = 1, specidx = 1; idx < len; idx++) {
-		if (glyphs[idx].mode & ATTR_WDUMMY) {
-			length += 1;
-			continue;
-		}
-
-		if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
-			hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
-
-			/* Reset the sequence. */
-			length = 1;
-			start = specidx;
-			gstart = idx;
-		} else {
-			length += 1;
-		}
-
-		specidx++;
-	}
-
-	/* EOL. */
-	hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
-
-	/* Apply the transformation to glyph specs. */
-	for (int i = 0, specidx = 0; i < len; i++) {
-		if (glyphs[i].mode & ATTR_WDUMMY)
-			continue;
-
-		if (codepoints[i] != specs[specidx].glyph)
-			((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
-
-		specs[specidx++].glyph = codepoints[i];
-	}
-
-	free(codepoints);
-}
-
-void
-hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
-{
-	hb_font_t *font = hbfindfont(xfont);
-	if (font == NULL)
-		return;
-
-	Rune rune;
-	ushort mode = USHRT_MAX;
-	hb_buffer_t *buffer = hb_buffer_create();
-	hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
-
-	/* Fill buffer with codepoints. */
-	for (int i = start; i < (start+length); i++) {
-		rune = string[i].u;
-		mode = string[i].mode;
-		if (mode & ATTR_WDUMMY)
-			rune = 0x0020;
-		hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
-	}
-
-	/* Shape the segment. */
-	hb_shape(font, buffer, NULL, 0);
-
-	/* Get new glyph info. */
-	hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
-
-	/* Write new codepoints. */
-	for (int i = 0; i < length; i++) {
-		hb_codepoint_t gid = info[i].codepoint;
-		codepoints[start+i] = gid;
-	}
-
-	/* Cleanup. */
-	hb_buffer_destroy(buffer);
-}
diff --git a/hb.h b/hb.h
deleted file mode 100644
index b3e02d0..0000000
--- a/hb.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#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/icon.h b/icon.h
deleted file mode 100644
index 7ab09d0..0000000
--- a/icon.h
+++ /dev/null
@@ -1,686 +0,0 @@
-unsigned long icon[] = {
-	64, 64,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02000000, 0x03000000,
-	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-	0x03000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000,
-	0x20181818, 0x4e868686, 0x74b2b2b2, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x74b2b2b2,
-	0x4e868686, 0x20181818, 0x03000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x03000000, 0x46717171, 0xcef3f3f3, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xcdf3f3f3,
-	0x456f6f6f, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x211f1f1f, 0xd1f4f4f4, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xd0f3f3f3, 0x20181818,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x59959595, 0xffffffff,
-	0xffffffff, 0xff8b8b8b, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff8c8c8c, 0xffffffff, 0xffffffff, 0x58919191, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x83b3b3b3, 0xffffffff, 0xffffffff, 0xff262626,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff262626, 0xffffffff,
-	0xffffffff, 0x83b3b3b3, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff2c2c2c, 0xffe0e0e0, 0xff1c1c1c, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff202020,
-	0xff6c6c6c, 0xffffffff, 0xff6d6d6d, 0xff3c3c3c, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff2d2d2d, 0xffe1e1e1, 0xffc3c3c3, 0xffffffff,
-	0xffa1a1a1, 0xffdddddd, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff7f7f7f, 0xffbfbfbf, 0xff303030, 0xffffffff, 0xff1c1c1c, 0xff181818,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff717171, 0xffe1e1e1,
-	0xff545454, 0xffffffff, 0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff1c1c1c, 0xffa1a1a1, 0xfff6f6f6, 0xffffffff,
-	0xffaeaeae, 0xff515151, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff343434, 0xffffffff, 0xff979797, 0xfff9f9f9,
-	0xff515151, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff303030, 0xffffffff, 0xff1c1c1c, 0xffb3b3b3, 0xff8d8d8d, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff686868, 0xff616161, 0xff3c3c3c, 0xffffffff,
-	0xff545454, 0xffe8e8e8, 0xff5b5b5b, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff4b4b4b, 0xffb3b3b3, 0xffe1e1e1, 0xffffffff, 0xffcccccc, 0xff717171,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff303030, 0xffffffff, 0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff2b2b2b, 0xffd1d1d1,
-	0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff7f7f7f, 0xffe9e9e9, 0xffe9e9e9, 0xffe9e9e9, 0xffe9e9e9,
-	0xffe9e9e9, 0xffe9e9e9, 0xff444444, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x8aacacac, 0xffffffff, 0xffffffff, 0xff262626,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff262626, 0xffffffff,
-	0xffffffff, 0x8aacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x62858585, 0xffffffff, 0xffffffff, 0xff8c8c8c, 0xff373737, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-	0xff363636, 0xff373737, 0xff8d8d8d, 0xffffffff, 0xffffffff, 0x62828282,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x21171717, 0xdee2e2e2,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xdee1e1e1, 0x1f101010, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x03000000, 0x5f4e4e4e, 0xdbe1e1e1, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xdae1e1e1,
-	0x5f4b4b4b, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x12000000, 0x48040404, 0x6d595959, 0x8d929292, 0x90979797,
-	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-	0x90979797, 0x8d929292, 0x6d595959, 0x48040404, 0x12000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x06000000, 0x22000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-	0x22000000, 0x06000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-};
diff --git a/patch.diff b/patch.diff
deleted file mode 100644
index 22758c7..0000000
--- a/patch.diff
+++ /dev/null
@@ -1,2576 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 470ac86..eacc2ef 100644
---- a/Makefile
-+++ b/Makefile
-@@ -4,7 +4,7 @@
- 
- include config.mk
- 
--SRC = st.c x.c
-+SRC = st.c x.c hb.c
- OBJ = $(SRC:.c=.o)
- 
- all: options st
-@@ -22,7 +22,8 @@ config.h:
- 	$(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
- 
-@@ -49,9 +50,12 @@ install: st
- 	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
- 	tic -sx st.info
- 	@echo Please see the README file regarding the terminfo entry of st.
-+	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
-+	cp -f st.desktop $(DESTDIR)$(PREFIX)/share/applications
- 
- uninstall:
- 	rm -f $(DESTDIR)$(PREFIX)/bin/st
- 	rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
-+	rm -f $(DESTDIR)$(PREFIX)/share/applications/st.desktop
- 
- .PHONY: all options clean dist install uninstall
-diff --git a/config.def.h b/config.def.h
-index 91ab8ca..1f9b5e3 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -6,6 +6,13 @@
-  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
-  */
- static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
-+/* Spare fonts */
-+static char *font2[] = {
-+/*	"Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */
-+/*	"Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */
-+        "Symbola:pixelsize=11:antialias=true:autohint=true"
-+};
-+
- static int borderpx = 2;
- 
- /*
-@@ -93,6 +100,9 @@ char *termname = "st-256color";
-  */
- unsigned int tabspaces = 8;
- 
-+/* bg opacity */
-+float alpha = 0.8;
-+
- /* Terminal colors (16 first used in escape sequence) */
- static const char *colorname[] = {
- 	/* 8 normal colors */
-@@ -163,6 +173,43 @@ static unsigned int mousebg = 0;
-  */
- static unsigned int defaultattr = 11;
- 
-+/*
-+ * Xresources preferences to load at startup
-+ */
-+ResourcePref resources[] = {
-+		{ "font",         STRING,  &font },
-+		{ "color0",       STRING,  &colorname[0] },
-+		{ "color1",       STRING,  &colorname[1] },
-+		{ "color2",       STRING,  &colorname[2] },
-+		{ "color3",       STRING,  &colorname[3] },
-+		{ "color4",       STRING,  &colorname[4] },
-+		{ "color5",       STRING,  &colorname[5] },
-+		{ "color6",       STRING,  &colorname[6] },
-+		{ "color7",       STRING,  &colorname[7] },
-+		{ "color8",       STRING,  &colorname[8] },
-+		{ "color9",       STRING,  &colorname[9] },
-+		{ "color10",      STRING,  &colorname[10] },
-+		{ "color11",      STRING,  &colorname[11] },
-+		{ "color12",      STRING,  &colorname[12] },
-+		{ "color13",      STRING,  &colorname[13] },
-+		{ "color14",      STRING,  &colorname[14] },
-+		{ "color15",      STRING,  &colorname[15] },
-+		{ "background",   STRING,  &colorname[256] },
-+		{ "foreground",   STRING,  &colorname[257] },
-+		{ "cursorColor",  STRING,  &colorname[258] },
-+                { "reverseCursor",STRING,  &colorname[259] },
-+		{ "termname",     STRING,  &termname },
-+		{ "shell",        STRING,  &shell },
-+		{ "minlatency",   INTEGER, &minlatency },
-+		{ "maxlatency",   INTEGER, &maxlatency },
-+		{ "blinktimeout", INTEGER, &blinktimeout },
-+		{ "bellvolume",   INTEGER, &bellvolume },
-+		{ "tabspaces",    INTEGER, &tabspaces },
-+		{ "borderpx",     INTEGER, &borderpx },
-+		{ "cwscale",      FLOAT,   &cwscale },
-+		{ "chscale",      FLOAT,   &chscale },
-+};
-+
- /*
-  * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
-  * Note that if you want to use ShiftMask with selmasks, set this to an other
-@@ -170,12 +217,20 @@ static unsigned int defaultattr = 11;
-  */
- static uint forcemousemod = ShiftMask;
- 
-+/*
-+ * Command used to query unicode glyphs.
-+ */
-+char *iso14755_cmd = "dmenu -w \"$WINDOWID\" -p codepoint: </dev/null";
-+
- /*
-  * Internal mouse shortcuts.
-  * Beware that overloading Button1 will disable the selection.
-  */
-+const unsigned int mousescrollincrement = 1;
- static MouseShortcut mshortcuts[] = {
- 	/* mask                 button   function        argument       release */
-+	{ XK_ANY_MOD,           Button4, kscrollup,      {.i = mousescrollincrement},      0, /* !alt */ -1 },
-+	{ XK_ANY_MOD,           Button5, kscrolldown,    {.i = mousescrollincrement},      0, /* !alt */ -1 },
- 	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
- 	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
- 	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
-@@ -201,6 +256,9 @@ static Shortcut shortcuts[] = {
- 	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
- 	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
- 	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-+	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
-+	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
-+        { TERMMOD,              XK_I,           iso14755,       {.i =  0} },
- };
- 
- /*
-diff --git a/config.mk b/config.mk
-index 4c4c5d5..201a144 100644
---- a/config.mk
-+++ b/config.mk
-@@ -15,12 +15,15 @@ PKG_CONFIG = pkg-config
- # includes and libs
- INCS = -I$(X11INC) \
-        `$(PKG_CONFIG) --cflags fontconfig` \
--       `$(PKG_CONFIG) --cflags freetype2`
--LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
-+       `$(PKG_CONFIG) --cflags freetype2` \
-+       `$(PKG_CONFIG) --cflags harfbuzz`
-+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft -lXrender\
-        `$(PKG_CONFIG) --libs fontconfig` \
--       `$(PKG_CONFIG) --libs freetype2`
-+       `$(PKG_CONFIG) --libs freetype2` \
-+       `$(PKG_CONFIG) --libs harfbuzz`
- 
- # flags
-+CFLAGS= -Wall -pedantic -O3 -march=native -std=c99
- STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
- STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
- STLDFLAGS = $(LIBS) $(LDFLAGS)
-diff --git a/hb.c b/hb.c
-new file mode 100644
-index 0000000..7df2828
---- /dev/null
-+++ b/hb.c
-@@ -0,0 +1,136 @@
-+#include <stdlib.h>
-+#include <stdio.h>
-+#include <math.h>
-+#include <X11/Xft/Xft.h>
-+#include <hb.h>
-+#include <hb-ft.h>
-+
-+#include "st.h"
-+
-+void hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length);
-+hb_font_t *hbfindfont(XftFont *match);
-+
-+typedef struct {
-+	XftFont *match;
-+	hb_font_t *font;
-+} HbFontMatch;
-+
-+static int hbfontslen = 0;
-+static HbFontMatch *hbfontcache = NULL;
-+
-+void
-+hbunloadfonts()
-+{
-+	for (int i = 0; i < hbfontslen; i++) {
-+		hb_font_destroy(hbfontcache[i].font);
-+		XftUnlockFace(hbfontcache[i].match);
-+	}
-+
-+	if (hbfontcache != NULL) {
-+		free(hbfontcache);
-+		hbfontcache = NULL;
-+	}
-+	hbfontslen = 0;
-+}
-+
-+hb_font_t *
-+hbfindfont(XftFont *match)
-+{
-+	for (int i = 0; i < hbfontslen; i++) {
-+		if (hbfontcache[i].match == match)
-+			return hbfontcache[i].font;
-+	}
-+
-+	/* Font not found in cache, caching it now. */
-+	hbfontcache = realloc(hbfontcache, sizeof(HbFontMatch) * (hbfontslen + 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[hbfontslen].match = match;
-+	hbfontcache[hbfontslen].font = font;
-+	hbfontslen += 1;
-+
-+	return font;
-+}
-+
-+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));
-+
-+	for (int idx = 1, specidx = 1; idx < len; idx++) {
-+		if (glyphs[idx].mode & ATTR_WDUMMY) {
-+			length += 1;
-+			continue;
-+		}
-+
-+		if (specs[specidx].font != specs[start].font || ATTRCMP(glyphs[gstart], glyphs[idx]) || selected(x + idx, y) != selected(x + gstart, y)) {
-+			hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
-+
-+			/* Reset the sequence. */
-+			length = 1;
-+			start = specidx;
-+			gstart = idx;
-+		} else {
-+			length += 1;
-+		}
-+
-+		specidx++;
-+	}
-+
-+	/* EOL. */
-+	hbtransformsegment(specs[start].font, glyphs, codepoints, gstart, length);
-+
-+	/* Apply the transformation to glyph specs. */
-+	for (int i = 0, specidx = 0; i < len; i++) {
-+		if (glyphs[i].mode & ATTR_WDUMMY)
-+			continue;
-+
-+		if (codepoints[i] != specs[specidx].glyph)
-+			((Glyph *)glyphs)[i].mode |= ATTR_LIGA;
-+
-+		specs[specidx++].glyph = codepoints[i];
-+	}
-+
-+	free(codepoints);
-+}
-+
-+void
-+hbtransformsegment(XftFont *xfont, const Glyph *string, hb_codepoint_t *codepoints, int start, int length)
-+{
-+	hb_font_t *font = hbfindfont(xfont);
-+	if (font == NULL)
-+		return;
-+
-+	Rune rune;
-+	ushort mode = USHRT_MAX;
-+	hb_buffer_t *buffer = hb_buffer_create();
-+	hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
-+
-+	/* Fill buffer with codepoints. */
-+	for (int i = start; i < (start+length); i++) {
-+		rune = string[i].u;
-+		mode = string[i].mode;
-+		if (mode & ATTR_WDUMMY)
-+			rune = 0x0020;
-+		hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
-+	}
-+
-+	/* Shape the segment. */
-+	hb_shape(font, buffer, NULL, 0);
-+
-+	/* Get new glyph info. */
-+	hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, NULL);
-+
-+	/* Write new codepoints. */
-+	for (int i = 0; i < length; i++) {
-+		hb_codepoint_t gid = info[i].codepoint;
-+		codepoints[start+i] = gid;
-+	}
-+
-+	/* Cleanup. */
-+	hb_buffer_destroy(buffer);
-+}
-diff --git a/hb.h b/hb.h
-new file mode 100644
-index 0000000..b3e02d0
---- /dev/null
-+++ b/hb.h
-@@ -0,0 +1,7 @@
-+#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/icon.h b/icon.h
-new file mode 100644
-index 0000000..7ab09d0
---- /dev/null
-+++ b/icon.h
-@@ -0,0 +1,686 @@
-+unsigned long icon[] = {
-+	64, 64,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x02000000, 0x03000000,
-+	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-+	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-+	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-+	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-+	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-+	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-+	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-+	0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000, 0x03000000,
-+	0x03000000, 0x02000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000,
-+	0x20181818, 0x4e868686, 0x74b2b2b2, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-+	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-+	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-+	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-+	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-+	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-+	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-+	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6,
-+	0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x77b6b6b6, 0x74b2b2b2,
-+	0x4e868686, 0x20181818, 0x03000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x03000000, 0x46717171, 0xcef3f3f3, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xcdf3f3f3,
-+	0x456f6f6f, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x211f1f1f, 0xd1f4f4f4, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xd0f3f3f3, 0x20181818,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x59959595, 0xffffffff,
-+	0xffffffff, 0xff8b8b8b, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff8c8c8c, 0xffffffff, 0xffffffff, 0x58919191, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x83b3b3b3, 0xffffffff, 0xffffffff, 0xff262626,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff262626, 0xffffffff,
-+	0xffffffff, 0x83b3b3b3, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff2c2c2c, 0xffe0e0e0, 0xff1c1c1c, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff202020,
-+	0xff6c6c6c, 0xffffffff, 0xff6d6d6d, 0xff3c3c3c, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff2d2d2d, 0xffe1e1e1, 0xffc3c3c3, 0xffffffff,
-+	0xffa1a1a1, 0xffdddddd, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff7f7f7f, 0xffbfbfbf, 0xff303030, 0xffffffff, 0xff1c1c1c, 0xff181818,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff717171, 0xffe1e1e1,
-+	0xff545454, 0xffffffff, 0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff1c1c1c, 0xffa1a1a1, 0xfff6f6f6, 0xffffffff,
-+	0xffaeaeae, 0xff515151, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff343434, 0xffffffff, 0xff979797, 0xfff9f9f9,
-+	0xff515151, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff303030, 0xffffffff, 0xff1c1c1c, 0xffb3b3b3, 0xff8d8d8d, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff686868, 0xff616161, 0xff3c3c3c, 0xffffffff,
-+	0xff545454, 0xffe8e8e8, 0xff5b5b5b, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff4b4b4b, 0xffb3b3b3, 0xffe1e1e1, 0xffffffff, 0xffcccccc, 0xff717171,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff303030, 0xffffffff, 0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff2b2b2b, 0xffd1d1d1,
-+	0xff1c1c1c, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff7f7f7f, 0xffe9e9e9, 0xffe9e9e9, 0xffe9e9e9, 0xffe9e9e9,
-+	0xffe9e9e9, 0xffe9e9e9, 0xff444444, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff222222, 0xffffffff,
-+	0xffffffff, 0x8eacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x8eacacac, 0xffffffff, 0xffffffff, 0xff222222, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x8eacacac, 0xffffffff,
-+	0xffffffff, 0xff222222, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff222222, 0xffffffff, 0xffffffff, 0x8eacacac, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x8aacacac, 0xffffffff, 0xffffffff, 0xff262626,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff171717,
-+	0xff171717, 0xff171717, 0xff171717, 0xff171717, 0xff262626, 0xffffffff,
-+	0xffffffff, 0x8aacacac, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x62858585, 0xffffffff, 0xffffffff, 0xff8c8c8c, 0xff373737, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636, 0xff363636,
-+	0xff363636, 0xff373737, 0xff8d8d8d, 0xffffffff, 0xffffffff, 0x62828282,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x21171717, 0xdee2e2e2,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xdee1e1e1, 0x1f101010, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x03000000, 0x5f4e4e4e, 0xdbe1e1e1, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff,
-+	0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff, 0xdae1e1e1,
-+	0x5f4b4b4b, 0x03000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x12000000, 0x48040404, 0x6d595959, 0x8d929292, 0x90979797,
-+	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-+	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-+	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-+	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-+	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-+	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-+	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-+	0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797, 0x90979797,
-+	0x90979797, 0x8d929292, 0x6d595959, 0x48040404, 0x12000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x06000000, 0x22000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-+	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-+	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-+	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-+	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-+	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-+	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-+	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-+	0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000, 0x29000000,
-+	0x22000000, 0x06000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+	0x00000000, 0x00000000, 0x00000000, 0x00000000,
-+};
-diff --git a/st.1 b/st.1
-index 39120b4..4a98626 100644
---- a/st.1
-+++ b/st.1
-@@ -159,6 +159,10 @@ Copy the selected text to the clipboard selection.
- .TP
- .B Ctrl-Shift-v
- Paste from the clipboard selection.
-+.TP
-+.B Ctrl-Shift-i
-+Launch dmenu to enter a unicode codepoint and send the corresponding glyph
-+to st.
- .SH CUSTOMIZATION
- .B st
- can be customized by creating a custom config.h and (re)compiling the source
-diff --git a/st.c b/st.c
-index 51049ba..8b687d7 100644
---- a/st.c
-+++ b/st.c
-@@ -35,6 +35,7 @@
- #define ESC_ARG_SIZ   16
- #define STR_BUF_SIZ   ESC_BUF_SIZ
- #define STR_ARG_SIZ   ESC_ARG_SIZ
-+#define HISTSIZE      2000
- 
- /* macros */
- #define IS_SET(flag)		((term.mode & (flag)) != 0)
-@@ -42,6 +43,11 @@
- #define ISCONTROLC1(c)		(BETWEEN(c, 0x80, 0x9f))
- #define ISCONTROL(c)		(ISCONTROLC0(c) || ISCONTROLC1(c))
- #define ISDELIM(u)		(u && wcschr(worddelimiters, u))
-+#define TLINE(y)		((y) < term.scr ? term.hist[((y) + term.histi - \
-+				term.scr + HISTSIZE + 1) % HISTSIZE] : \
-+				term.line[(y) - term.scr])
-+#define STRESCARGREST(n)       ((n) == 0 ? strescseq.buf : strescseq.argp[(n)-1] + 1)
-+#define STRESCARGJUST(n)        (*(strescseq.argp[n]) = '\0', STRESCARGREST(n))
- 
- enum term_mode {
- 	MODE_WRAP        = 1 << 0,
-@@ -115,6 +121,9 @@ typedef struct {
- 	int col;      /* nb col */
- 	Line *line;   /* screen */
- 	Line *alt;    /* alternate screen */
-+	Line hist[HISTSIZE]; /* history buffer */
-+	int histi;    /* history index */
-+	int scr;      /* scroll back */
- 	int *dirty;   /* dirtyness of lines */
- 	TCursor c;    /* cursor */
- 	int ocx;      /* old cursor col */
-@@ -148,7 +157,7 @@ typedef struct {
- 	char *buf;             /* allocated raw string */
- 	size_t siz;            /* allocation size */
- 	size_t len;            /* raw string length */
--	char *args[STR_ARG_SIZ];
-+	char *argp[STR_ARG_SIZ]; /* pointers to the end of nth argument */
- 	int narg;              /* nb of args */
- } STREscape;
- 
-@@ -184,8 +193,8 @@ static void tnewline(int);
- static void tputtab(int);
- static void tputc(Rune);
- static void treset(void);
--static void tscrollup(int, int);
--static void tscrolldown(int, int);
-+static void tscrollup(int, int, int);
-+static void tscrolldown(int, int, int);
- static void tsetattr(const int *, int);
- static void tsetchar(Rune, const Glyph *, int, int);
- static void tsetdirt(int, int);
-@@ -416,10 +425,10 @@ tlinelen(int y)
- {
- 	int i = term.col;
- 
--	if (term.line[y][i - 1].mode & ATTR_WRAP)
-+	if (TLINE(y)[i - 1].mode & ATTR_WRAP)
- 		return i;
- 
--	while (i > 0 && term.line[y][i - 1].u == ' ')
-+	while (i > 0 && TLINE(y)[i - 1].u == ' ')
- 		--i;
- 
- 	return i;
-@@ -528,7 +537,7 @@ selsnap(int *x, int *y, int direction)
- 		 * Snap around if the word wraps around at the end or
- 		 * beginning of a line.
- 		 */
--		prevgp = &term.line[*y][*x];
-+		prevgp = &TLINE(*y)[*x];
- 		prevdelim = ISDELIM(prevgp->u);
- 		for (;;) {
- 			newx = *x + direction;
-@@ -543,14 +552,14 @@ selsnap(int *x, int *y, int direction)
- 					yt = *y, xt = *x;
- 				else
- 					yt = newy, xt = newx;
--				if (!(term.line[yt][xt].mode & ATTR_WRAP))
-+				if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
- 					break;
- 			}
- 
- 			if (newx >= tlinelen(newy))
- 				break;
- 
--			gp = &term.line[newy][newx];
-+			gp = &TLINE(newy)[newx];
- 			delim = ISDELIM(gp->u);
- 			if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
- 					|| (delim && gp->u != prevgp->u)))
-@@ -571,14 +580,14 @@ selsnap(int *x, int *y, int direction)
- 		*x = (direction < 0) ? 0 : term.col - 1;
- 		if (direction < 0) {
- 			for (; *y > 0; *y += direction) {
--				if (!(term.line[*y-1][term.col-1].mode
-+				if (!(TLINE(*y-1)[term.col-1].mode
- 						& ATTR_WRAP)) {
- 					break;
- 				}
- 			}
- 		} else if (direction > 0) {
- 			for (; *y < term.row-1; *y += direction) {
--				if (!(term.line[*y][term.col-1].mode
-+				if (!(TLINE(*y)[term.col-1].mode
- 						& ATTR_WRAP)) {
- 					break;
- 				}
-@@ -609,13 +618,13 @@ getsel(void)
- 		}
- 
- 		if (sel.type == SEL_RECTANGULAR) {
--			gp = &term.line[y][sel.nb.x];
-+			gp = &TLINE(y)[sel.nb.x];
- 			lastx = sel.ne.x;
- 		} else {
--			gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
-+			gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
- 			lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
- 		}
--		last = &term.line[y][MIN(lastx, linelen-1)];
-+		last = &TLINE(y)[MIN(lastx, linelen-1)];
- 		while (last >= gp && last->u == ' ')
- 			--last;
- 
-@@ -725,8 +734,14 @@ sigchld(int a)
- 	if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
- 		die("waiting for pid %hd failed: %s\n", pid, strerror(errno));
- 
--	if (pid != p)
-+	if (pid != p) {
-+		if (p == 0 && wait(&stat) < 0)
-+			die("wait: %s\n", strerror(errno));
-+
-+		/* reinstall sigchld handler */
-+		signal(SIGCHLD, sigchld);
- 		return;
-+	}
- 
- 	if (WIFEXITED(stat) && WEXITSTATUS(stat))
- 		die("child exited with status %d\n", WEXITSTATUS(stat));
-@@ -851,6 +866,9 @@ void
- ttywrite(const char *s, size_t n, int may_echo)
- {
- 	const char *next;
-+	Arg arg = (Arg) { .i = term.scr };
-+
-+	kscrolldown(&arg);
- 
- 	if (may_echo && IS_SET(MODE_ECHO))
- 		twrite(s, n, 1);
-@@ -1050,6 +1068,11 @@ tnew(int col, int row)
- 	treset();
- }
- 
-+int tisaltscr(void)
-+{
-+	return IS_SET(MODE_ALTSCREEN);
-+}
-+
- void
- tswapscreen(void)
- {
-@@ -1062,13 +1085,53 @@ tswapscreen(void)
- }
- 
- void
--tscrolldown(int orig, int n)
-+kscrolldown(const Arg* a)
-+{
-+	int n = a->i;
-+
-+	if (n < 0)
-+		n = term.row + n;
-+
-+	if (n > term.scr)
-+		n = term.scr;
-+
-+	if (term.scr > 0) {
-+		term.scr -= n;
-+		selscroll(0, -n);
-+		tfulldirt();
-+	}
-+}
-+
-+void
-+kscrollup(const Arg* a)
-+{
-+	int n = a->i;
-+
-+	if (n < 0)
-+		n = term.row + n;
-+
-+	if (term.scr <= HISTSIZE-n) {
-+		term.scr += n;
-+		selscroll(0, n);
-+		tfulldirt();
-+	}
-+}
-+
-+void
-+tscrolldown(int orig, int n, int copyhist)
- {
- 	int i;
- 	Line temp;
- 
- 	LIMIT(n, 0, term.bot-orig+1);
- 
-+	if (copyhist) {
-+		term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
-+		temp = term.hist[term.histi];
-+		term.hist[term.histi] = term.line[term.bot];
-+		term.line[term.bot] = temp;
-+	}
-+
- 	tsetdirt(orig, term.bot-n);
- 	tclearregion(0, term.bot-n+1, term.col-1, term.bot);
- 
-@@ -1078,17 +1141,28 @@ tscrolldown(int orig, int n)
- 		term.line[i-n] = temp;
- 	}
- 
--	selscroll(orig, n);
-+	if (term.scr == 0)
-+		selscroll(orig, n);
- }
- 
- void
--tscrollup(int orig, int n)
-+tscrollup(int orig, int n, int copyhist)
- {
- 	int i;
- 	Line temp;
- 
- 	LIMIT(n, 0, term.bot-orig+1);
- 
-+	if (copyhist) {
-+		term.histi = (term.histi + 1) % HISTSIZE;
-+		temp = term.hist[term.histi];
-+		term.hist[term.histi] = term.line[orig];
-+		term.line[orig] = temp;
-+	}
-+
-+	if (term.scr > 0 && term.scr < HISTSIZE)
-+		term.scr = MIN(term.scr + n, HISTSIZE-1);
-+
- 	tclearregion(0, orig, term.col-1, orig+n-1);
- 	tsetdirt(orig+n, term.bot);
- 
-@@ -1098,7 +1172,8 @@ tscrollup(int orig, int n)
- 		term.line[i+n] = temp;
- 	}
- 
--	selscroll(orig, -n);
-+	if (term.scr == 0)
-+		selscroll(orig, -n);
- }
- 
- void
-@@ -1127,7 +1202,7 @@ tnewline(int first_col)
- 	int y = term.c.y;
- 
- 	if (y == term.bot) {
--		tscrollup(term.top, 1);
-+		tscrollup(term.top, 1, 1);
- 	} else {
- 		y++;
- 	}
-@@ -1292,14 +1367,14 @@ void
- tinsertblankline(int n)
- {
- 	if (BETWEEN(term.c.y, term.top, term.bot))
--		tscrolldown(term.c.y, n);
-+		tscrolldown(term.c.y, n, 0);
- }
- 
- void
- tdeleteline(int n)
- {
- 	if (BETWEEN(term.c.y, term.top, term.bot))
--		tscrollup(term.c.y, n);
-+		tscrollup(term.c.y, n, 0);
- }
- 
- int32_t
-@@ -1736,11 +1811,11 @@ csihandle(void)
- 		break;
- 	case 'S': /* SU -- Scroll <n> line up */
- 		DEFAULT(csiescseq.arg[0], 1);
--		tscrollup(term.top, csiescseq.arg[0]);
-+		tscrollup(term.top, csiescseq.arg[0], 0);
- 		break;
- 	case 'T': /* SD -- Scroll <n> line down */
- 		DEFAULT(csiescseq.arg[0], 1);
--		tscrolldown(term.top, csiescseq.arg[0]);
-+		tscrolldown(term.top, csiescseq.arg[0], 0);
- 		break;
- 	case 'L': /* IL -- Insert <n> blank lines */
- 		DEFAULT(csiescseq.arg[0], 1);
-@@ -1809,6 +1884,33 @@ csihandle(void)
- 			goto unknown;
- 		}
- 		break;
-+       case 't': /* title stack operations */
-+               switch (csiescseq.arg[0]) {
-+               case 22: /* pust current title on stack */
-+                       switch (csiescseq.arg[1]) {
-+                       case 0:
-+                       case 1:
-+                       case 2:
-+                               xpushtitle();
-+                               break;
-+                       default:
-+                               goto unknown;
-+                       }
-+                       break;
-+               case 23: /* pop last title from stack */
-+                       switch (csiescseq.arg[1]) {
-+                       case 0:
-+                       case 1:
-+                       case 2:
-+                               xsettitle(NULL, 1);
-+                               break;
-+                       default:
-+                               goto unknown;
-+                       }
-+                       break;
-+               default:
-+                       goto unknown;
-+               }
- 	}
- }
- 
-@@ -1885,29 +1987,30 @@ strhandle(void)
- 	int j, narg, par;
- 
- 	term.esc &= ~(ESC_STR_END|ESC_STR);
--	strparse();
--	par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;
-+        strescseq.buf[strescseq.len] = '\0';
- 
- 	switch (strescseq.type) {
- 	case ']': /* OSC -- Operating System Command */
-+          strparse();
-+          par = (narg = strescseq.narg) ? atoi(STRESCARGJUST(0)) : 0;
- 		switch (par) {
- 		case 0:
- 			if (narg > 1) {
--				xsettitle(strescseq.args[1]);
--				xseticontitle(strescseq.args[1]);
-+				xsettitle(STRESCARGREST(1), 0);
-+				xseticontitle(STRESCARGREST(1));
- 			}
- 			return;
- 		case 1:
- 			if (narg > 1)
--				xseticontitle(strescseq.args[1]);
-+				xsettitle(STRESCARGREST(1), 0);
- 			return;
- 		case 2:
- 			if (narg > 1)
--				xsettitle(strescseq.args[1]);
-+				xsettitle(STRESCARGREST(1), 0);
- 			return;
- 		case 52:
- 			if (narg > 2 && allowwindowops) {
--				dec = base64dec(strescseq.args[2]);
-+				dec = base64dec(STRESCARGJUST(2));
- 				if (dec) {
- 					xsetsel(dec);
- 					xclipcopy();
-@@ -1916,11 +2019,12 @@ strhandle(void)
- 				}
- 			}
- 			return;
--		case 10:
-+		/*
-+                case 10:
- 			if (narg < 2)
- 				break;
- 
--			p = strescseq.args[1];
-+			p = STRESCARGREST(1);
- 
- 			if (!strcmp(p, "?"))
- 				osc_color_response(defaultfg, 10);
-@@ -1933,7 +2037,7 @@ strhandle(void)
- 			if (narg < 2)
- 				break;
- 
--			p = strescseq.args[1];
-+			p = STRESCARGREST(1);
- 
- 			if (!strcmp(p, "?"))
- 				osc_color_response(defaultbg, 11);
-@@ -1946,7 +2050,7 @@ strhandle(void)
- 			if (narg < 2)
- 				break;
- 
--			p = strescseq.args[1];
-+			p = STRESCARGREST(1);
- 
- 			if (!strcmp(p, "?"))
- 				osc_color_response(defaultcs, 12);
-@@ -1955,13 +2059,44 @@ strhandle(void)
- 			else
- 				redraw();
- 			return;
-+                */
-+		case 10: /* set foreground color */
-+			if (narg < 2)
-+				break;
-+
-+			p = STRESCARGJUST(1);
-+			if (xsetcolorname(defaultfg, p))
-+				fprintf(stderr, "erresc: invalid foreground color %s\n", p);
-+			else
-+				redraw();
-+			break;
-+		case 11: /* set background color */
-+			if (narg < 2)
-+				break;
-+
-+			p = STRESCARGJUST(1);
-+			if (xsetcolorname(defaultbg, p))
-+				fprintf(stderr, "erresc: invalid background color %s\n", p);
-+			else
-+				redraw();
-+			break;
-+		case 12: /* set cursor color */
-+			if (narg < 2)
-+				break;
-+
-+			p = STRESCARGJUST(1);
-+			if (xsetcolorname(defaultcs, p))
-+				fprintf(stderr, "erresc: invalid cursor color %s\n", p);
-+			else
-+				redraw();
-+			break;
- 		case 4: /* color set */
- 			if (narg < 3)
- 				break;
--			p = strescseq.args[2];
-+			p = STRESCARGJUST(2);
- 			/* FALLTHROUGH */
- 		case 104: /* color reset */
--			j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
-+			j = (narg > 1) ? atoi(STRESCARGJUST(1)) : -1;
- 
- 			if (p && !strcmp(p, "?"))
- 				osc4_color_response(j);
-@@ -1975,13 +2110,15 @@ strhandle(void)
- 				 * TODO if defaultbg color is changed, borders
- 				 * are dirty
- 				 */
-+                                if (j == defaultbg)
-+                                      xclearwin();
- 				redraw();
- 			}
- 			return;
- 		}
- 		break;
- 	case 'k': /* old title set compatibility */
--		xsettitle(strescseq.args[0]);
-+		xsettitle(strescseq.buf, 0);
- 		return;
- 	case 'P': /* DCS -- Device Control String */
- 	case '_': /* APC -- Application Program Command */
-@@ -2000,21 +2137,73 @@ strparse(void)
- 	char *p = strescseq.buf;
- 
- 	strescseq.narg = 0;
--	strescseq.buf[strescseq.len] = '\0';
- 
- 	if (*p == '\0')
- 		return;
- 
- 	while (strescseq.narg < STR_ARG_SIZ) {
--		strescseq.args[strescseq.narg++] = p;
- 		while ((c = *p) != ';' && c != '\0')
--			++p;
-+			p++;
-+		strescseq.argp[strescseq.narg++] = p;
- 		if (c == '\0')
- 			return;
--		*p++ = '\0';
-+		p++;
- 	}
- }
- 
-+void
-+externalpipe(const Arg *arg)
-+{
-+	int to[2];
-+	char buf[UTF_SIZ];
-+	void (*oldsigpipe)(int);
-+	Glyph *bp, *end;
-+	int lastpos, n, newline;
-+
-+	if (pipe(to) == -1)
-+		return;
-+
-+	switch (fork()) {
-+	case -1:
-+		close(to[0]);
-+		close(to[1]);
-+		return;
-+	case 0:
-+		dup2(to[0], STDIN_FILENO);
-+		close(to[0]);
-+		close(to[1]);
-+		execvp(((char **)arg->v)[0], (char **)arg->v);
-+		fprintf(stderr, "st: execvp %s\n", ((char **)arg->v)[0]);
-+		perror("failed");
-+		exit(0);
-+	}
-+
-+	close(to[0]);
-+	/* ignore sigpipe for now, in case child exists early */
-+	oldsigpipe = signal(SIGPIPE, SIG_IGN);
-+	newline = 0;
-+	for (n = 0; n < term.row; n++) {
-+		bp = term.line[n];
-+		lastpos = MIN(tlinelen(n) + 1, term.col) - 1;
-+		if (lastpos < 0)
-+			break;
-+		end = &bp[lastpos + 1];
-+		for (; bp < end; ++bp)
-+			if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0)
-+				break;
-+		if ((newline = term.line[n][lastpos].mode & ATTR_WRAP))
-+			continue;
-+		if (xwrite(to[1], "\n", 1) < 0)
-+			break;
-+		newline = 0;
-+	}
-+	if (newline)
-+		(void)xwrite(to[1], "\n", 1);
-+	close(to[1]);
-+	/* restore */
-+	signal(SIGPIPE, oldsigpipe);
-+}
-+
- void
- strdump(void)
- {
-@@ -2068,6 +2257,28 @@ tprinter(char *s, size_t len)
- 	}
- }
- 
-+void
-+iso14755(const Arg *arg)
-+{
-+	FILE *p;
-+	char *us, *e, codepoint[9], uc[UTF_SIZ];
-+	unsigned long utf32;
-+
-+	if (!(p = popen(iso14755_cmd, "r")))
-+		return;
-+
-+	us = fgets(codepoint, sizeof(codepoint), p);
-+	pclose(p);
-+
-+	if (!us || *us == '\0' || *us == '-' || strlen(us) > 7)
-+		return;
-+	if ((utf32 = strtoul(us, &e, 16)) == ULONG_MAX ||
-+	    (*e != '\n' && *e != '\0'))
-+		return;
-+
-+	ttywrite(uc, utf8encode(utf32, uc), 1);
-+}
-+
- void
- toggleprinter(const Arg *arg)
- {
-@@ -2330,7 +2541,7 @@ eschandle(uchar ascii)
- 		return 0;
- 	case 'D': /* IND -- Linefeed */
- 		if (term.c.y == term.bot) {
--			tscrollup(term.top, 1);
-+			tscrollup(term.top, 1, 1);
- 		} else {
- 			tmoveto(term.c.x, term.c.y+1);
- 		}
-@@ -2343,7 +2554,7 @@ eschandle(uchar ascii)
- 		break;
- 	case 'M': /* RI -- Reverse index */
- 		if (term.c.y == term.top) {
--			tscrolldown(term.top, 1);
-+			tscrolldown(term.top, 1, 1);
- 		} else {
- 			tmoveto(term.c.x, term.c.y-1);
- 		}
-@@ -2353,6 +2564,7 @@ eschandle(uchar ascii)
- 		break;
- 	case 'c': /* RIS -- Reset to initial state */
- 		treset();
-+		xfreetitlestack();
- 		resettitle();
- 		xloadcols();
- 		break;
-@@ -2557,7 +2769,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
- void
- tresize(int col, int row)
- {
--	int i;
-+	int i, j;
- 	int minrow = MIN(row, term.row);
- 	int mincol = MIN(col, term.col);
- 	int *bp;
-@@ -2594,6 +2806,14 @@ tresize(int col, int row)
- 	term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
- 	term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
- 
-+	for (i = 0; i < HISTSIZE; i++) {
-+		term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
-+		for (j = mincol; j < col; j++) {
-+			term.hist[i][j] = term.c.attr;
-+			term.hist[i][j].u = ' ';
-+		}
-+	}
-+
- 	/* resize each row to new width, zero-pad if needed */
- 	for (i = 0; i < minrow; i++) {
- 		term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
-@@ -2639,7 +2859,7 @@ tresize(int col, int row)
- void
- resettitle(void)
- {
--	xsettitle(NULL);
-+	xsettitle(NULL, 0);
- }
- 
- void
-@@ -2652,7 +2872,7 @@ drawregion(int x1, int y1, int x2, int y2)
- 			continue;
- 
- 		term.dirty[y] = 0;
--		xdrawline(term.line[y], x1, y, x2);
-+		xdrawline(TLINE(y), x1, y, x2);
- 	}
- }
- 
-@@ -2673,8 +2893,10 @@ draw(void)
- 		cx--;
- 
- 	drawregion(0, 0, term.col, term.row);
--	xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
--			term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
-+	if (term.scr == 0)
-+		xdrawcursor(cx, term.c.y, term.line[term.c.y][cx],
-+				term.ocx, term.ocy, term.line[term.ocy][term.ocx],
-+				term.line[term.ocy], term.col);
- 	term.ocx = cx;
- 	term.ocy = term.c.y;
- 	xfinishdraw();
-diff --git a/st.desktop b/st.desktop
-new file mode 100644
-index 0000000..49029d8
---- /dev/null
-+++ b/st.desktop
-@@ -0,0 +1,8 @@
-+[Desktop Entry]
-+Name=st
-+Comment=st is a simple terminal implementation for X
-+Exec=st
-+Icon=utilities-terminal
-+Terminal=false
-+Type=Application
-+Categories=System;TerminalEmulator;
-diff --git a/st.h b/st.h
-index 519b9bd..22af9d5 100644
---- a/st.h
-+++ b/st.h
-@@ -11,7 +11,8 @@
- #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) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
-+				(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)
-@@ -33,6 +34,7 @@ enum glyph_attribute {
- 	ATTR_WRAP       = 1 << 8,
- 	ATTR_WIDE       = 1 << 9,
- 	ATTR_WDUMMY     = 1 << 10,
-+	ATTR_LIGA       = 1 << 11,
- 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
- };
- 
-@@ -81,12 +83,17 @@ void die(const char *, ...);
- void redraw(void);
- void draw(void);
- 
-+void iso14755(const Arg *);
-+void externalpipe(const Arg *);
-+void kscrolldown(const Arg *);
-+void kscrollup(const Arg *);
- void printscreen(const Arg *);
- void printsel(const Arg *);
- void sendbreak(const Arg *);
- void toggleprinter(const Arg *);
- 
- int tattrset(int);
-+int tisaltscr(void);
- void tnew(int, int);
- void tresize(int, int);
- void tsetdirtattr(int);
-@@ -126,3 +133,5 @@ extern unsigned int tabspaces;
- extern unsigned int defaultfg;
- extern unsigned int defaultbg;
- extern unsigned int defaultcs;
-+extern char *iso14755_cmd;
-+extern float alpha;
-diff --git a/win.h b/win.h
-index e6e4369..1eff487 100644
---- a/win.h
-+++ b/win.h
-@@ -25,16 +25,19 @@ 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 *);
- void xseticontitle(char *);
--void xsettitle(char *);
-+void xfreetitlestack(void);
-+void xsettitle(char *, int);
-+void xpushtitle(void);
- int xsetcursor(int);
- void xsetmode(int, unsigned int);
- void xsetpointermotion(int);
- void xsetsel(char *);
- int xstartdraw(void);
- void xximspot(int, int);
-+void xclearwin(void);
-diff --git a/x.c b/x.c
-index 8a16faa..5f8c2b6 100644
---- a/x.c
-+++ b/x.c
-@@ -14,11 +14,14 @@
- #include <X11/keysym.h>
- #include <X11/Xft/Xft.h>
- #include <X11/XKBlib.h>
-+#include <X11/Xresource.h>
- 
- char *argv0;
- #include "arg.h"
-+#include "icon.h"
- #include "st.h"
- #include "win.h"
-+#include "hb.h"
- 
- /* types used in config.h */
- typedef struct {
-@@ -34,6 +37,7 @@ typedef struct {
- 	void (*func)(const Arg *);
- 	const Arg arg;
- 	uint  release;
-+	int  altscrn;  /* 0: don't care, -1: not alt screen, 1: alt screen */
- } MouseShortcut;
- 
- typedef struct {
-@@ -45,6 +49,19 @@ typedef struct {
- 	signed char appcursor; /* application cursor */
- } Key;
- 
-+/* Xresources preferences */
-+enum resource_type {
-+	STRING = 0,
-+	INTEGER = 1,
-+	FLOAT = 2
-+};
-+
-+typedef struct {
-+	char *name;
-+	enum resource_type type;
-+	void *dst;
-+} ResourcePref;
-+
- /* X modifiers */
- #define XK_ANY_MOD    UINT_MAX
- #define XK_NO_MOD     0
-@@ -63,6 +80,9 @@ static void ttysend(const Arg *);
- /* config.h for applying patches and the configuration. */
- #include "config.h"
- 
-+/* size of title stack */
-+#define TITLESTACKSIZE 8
-+
- /* XEMBED messages */
- #define XEMBED_FOCUS_IN  4
- #define XEMBED_FOCUS_OUT 5
-@@ -81,8 +101,10 @@ typedef XftGlyphFontSpec GlyphFontSpec;
- typedef struct {
- 	int tw, th; /* tty width and height */
- 	int w, h; /* window width and height */
-+	int hborderpx, vborderpx;
- 	int ch; /* char height */
- 	int cw; /* char width  */
-+	int cyo; /* char y offset */
- 	int mode; /* window state/mode flags */
- 	int cursor; /* cursor style */
- } TermWindow;
-@@ -93,7 +115,7 @@ typedef struct {
- 	Window win;
- 	Drawable buf;
- 	GlyphFontSpec *specbuf; /* font spec buffer used for rendering */
--	Atom xembed, wmdeletewin, netwmname, netwmiconname, netwmpid;
-+	Atom xembed, wmdeletewin, netwmname, netwmiconname, netwmicon, netwmpid;
- 	struct {
- 		XIM xim;
- 		XIC xic;
-@@ -103,8 +125,14 @@ typedef struct {
- 	Draw draw;
- 	Visual *vis;
- 	XSetWindowAttributes attrs;
-+	/* Here, we use the term *pointer* to differentiate the cursor
-+	 * one sees when hovering the mouse over the terminal from, e.g.,
-+	 * a green rectangle where text would be entered. */
-+	Cursor vpointer, bpointer; /* visible and hidden pointers */
-+	int pointerisvisible;
- 	int scr;
- 	int isfixed; /* is fixed geometry? */
-+	int depth; /* bit depth */
- 	int l, t; /* left and top offset */
- 	int gm; /* geometry mask */
- } XWindow;
-@@ -157,6 +185,8 @@ static void xhints(void);
- static int xloadcolor(int, const char *, Color *);
- static int xloadfont(Font *, FcPattern *);
- static void xloadfonts(const char *, double);
-+static int xloadsparefont(FcPattern *, int);
-+static void xloadsparefonts(void);
- static void xunloadfont(Font *);
- static void xunloadfonts(void);
- static void xsetenv(void);
-@@ -178,7 +208,6 @@ static void bpress(XEvent *);
- static void bmotion(XEvent *);
- static void propnotify(XEvent *);
- static void selnotify(XEvent *);
--static void selclear_(XEvent *);
- static void selrequest(XEvent *);
- static void setsel(char *, Time);
- static void mousesel(XEvent *, int);
-@@ -220,6 +249,8 @@ static DC dc;
- static XWindow xw;
- static XSelection xsel;
- static TermWindow win;
-+static int tstki; /* title stack index */
-+static char *titlestack[TITLESTACKSIZE]; /* title stack */
- 
- /* Font Ring Cache */
- enum {
-@@ -243,6 +274,7 @@ static char *usedfont = NULL;
- static double usedfontsize = 0;
- static double defaultfontsize = 0;
- 
-+static char *opt_alpha = NULL;
- static char *opt_class = NULL;
- static char **opt_cmd  = NULL;
- static char *opt_embed = NULL;
-@@ -306,6 +338,7 @@ zoomabs(const Arg *arg)
- {
- 	xunloadfonts();
- 	xloadfonts(usedfont, arg->f);
-+	xloadsparefonts();
- 	cresize(0, 0);
- 	redraw();
- 	xhints();
-@@ -331,7 +364,7 @@ ttysend(const Arg *arg)
- int
- evcol(XEvent *e)
- {
--	int x = e->xbutton.x - borderpx;
-+	int x = e->xbutton.x - win.hborderpx;
- 	LIMIT(x, 0, win.tw - 1);
- 	return x / win.cw;
- }
-@@ -339,7 +372,7 @@ evcol(XEvent *e)
- int
- evrow(XEvent *e)
- {
--	int y = e->xbutton.y - borderpx;
-+	int y = e->xbutton.y - win.vborderpx;
- 	LIMIT(y, 0, win.th - 1);
- 	return y / win.ch;
- }
-@@ -448,6 +481,7 @@ mouseaction(XEvent *e, uint release)
- 	for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
- 		if (ms->release == release &&
- 		    ms->button == e->xbutton.button &&
-+		    (!ms->altscrn || (ms->altscrn == (tisaltscr() ? 1 : -1))) &&
- 		    (match(ms->mod, state) ||  /* exact or forced */
- 		     match(ms->mod, state & ~forcemousemod))) {
- 			ms->func(&(ms->arg));
-@@ -599,12 +633,6 @@ xclipcopy(void)
- 	clipcopy(NULL);
- }
- 
--void
--selclear_(XEvent *e)
--{
--	selclear();
--}
--
- void
- selrequest(XEvent *e)
- {
-@@ -675,6 +703,7 @@ setsel(char *str, Time t)
- 	XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
- 	if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
- 		selclear();
-+	clipcopy(NULL);
- }
- 
- void
-@@ -700,6 +729,13 @@ brelease(XEvent *e)
- void
- bmotion(XEvent *e)
- {
-+	if (!xw.pointerisvisible) {
-+		XDefineCursor(xw.dpy, xw.win, xw.vpointer);
-+		xw.pointerisvisible = 1;
-+		if (!IS_SET(MODE_MOUSEMANY))
-+			xsetpointermotion(0);
-+	}
-+
- 	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
- 		mousereport(e);
- 		return;
-@@ -723,6 +759,9 @@ cresize(int width, int height)
- 	col = MAX(1, col);
- 	row = MAX(1, row);
- 
-+	win.hborderpx = (win.w - col * win.cw) / 2;
-+	win.vborderpx = (win.h - row * win.ch) / 2;
-+
- 	tresize(col, row);
- 	xresize(col, row);
- 	ttyresize(win.tw, win.th);
-@@ -736,7 +775,7 @@ xresize(int col, int row)
- 
- 	XFreePixmap(xw.dpy, xw.buf);
- 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
--			DefaultDepth(xw.dpy, xw.scr));
-+			xw.depth);
- 	XftDrawChange(xw.draw, xw.buf);
- 	xclear(0, 0, win.w, win.h);
- 
-@@ -796,6 +835,13 @@ xloadcols(void)
- 			else
- 				die("could not allocate color %d\n", i);
- 		}
-+
-+	/* set alpha value of bg color */
-+	if (opt_alpha)
-+		alpha = strtof(opt_alpha, NULL);
-+	dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
-+	dc.col[defaultbg].pixel &= 0x00FFFFFF;
-+	dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
- 	loaded = 1;
- }
- 
-@@ -840,11 +886,17 @@ xclear(int x1, int y1, int x2, int y2)
- 			x1, y1, x2-x1, y2-y1);
- }
- 
-+void
-+xclearwin(void)
-+{
-+	xclear(0, 0, win.w, win.h);
-+}
-+
- void
- xhints(void)
- {
--	XClassHint class = {opt_name ? opt_name : termname,
--	                    opt_class ? opt_class : termname};
-+	XClassHint class = {opt_name ? opt_name : "st",
-+	                    opt_class ? opt_class : "St"};
- 	XWMHints wm = {.flags = InputHint, .input = 1};
- 	XSizeHints *sizeh;
- 
-@@ -853,8 +905,8 @@ xhints(void)
- 	sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
- 	sizeh->height = win.h;
- 	sizeh->width = win.w;
--	sizeh->height_inc = win.ch;
--	sizeh->width_inc = win.cw;
-+	sizeh->height_inc = 1;
-+	sizeh->width_inc = 1;
- 	sizeh->base_height = 2 * borderpx;
- 	sizeh->base_width = 2 * borderpx;
- 	sizeh->min_height = win.ch + 2 * borderpx;
-@@ -1015,6 +1067,7 @@ xloadfonts(const char *fontstr, double fontsize)
- 	/* Setting character width and height. */
- 	win.cw = ceilf(dc.font.width * cwscale);
- 	win.ch = ceilf(dc.font.height * chscale);
-+	win.cyo = ceilf(dc.font.height * (chscale - 1) / 2);
- 
- 	FcPatternDel(pattern, FC_SLANT);
- 	FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
-@@ -1034,6 +1087,101 @@ xloadfonts(const char *fontstr, double fontsize)
- 	FcPatternDestroy(pattern);
- }
- 
-+int
-+xloadsparefont(FcPattern *pattern, int flags)
-+{
-+	FcPattern *match;
-+	FcResult result;
-+	
-+	match = FcFontMatch(NULL, pattern, &result);
-+	if (!match) {
-+		return 1;
-+	}
-+
-+	if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) {
-+		FcPatternDestroy(match);
-+		return 1;
-+	}
-+
-+	frc[frclen].flags = flags;
-+	/* Believe U+0000 glyph will present in each default font */
-+	frc[frclen].unicodep = 0;
-+	frclen++;
-+
-+	return 0;
-+}
-+
-+void
-+xloadsparefonts(void)
-+{
-+	FcPattern *pattern;
-+	double sizeshift, fontval;
-+	int fc;
-+	char **fp;
-+
-+	if (frclen != 0)
-+		die("can't embed spare fonts. cache isn't empty");
-+
-+	/* Calculate count of spare fonts */
-+	fc = sizeof(font2) / sizeof(*font2);
-+	if (fc == 0)
-+		return;
-+
-+	/* Allocate memory for cache entries. */
-+	if (frccap < 4 * fc) {
-+		frccap += 4 * fc - frccap;
-+		frc = xrealloc(frc, frccap * sizeof(Fontcache));
-+	}
-+
-+	for (fp = font2; fp - font2 < fc; ++fp) {
-+	
-+		if (**fp == '-')
-+			pattern = XftXlfdParse(*fp, False, False);
-+		else
-+			pattern = FcNameParse((FcChar8 *)*fp);
-+	
-+		if (!pattern)
-+			die("can't open spare font %s\n", *fp);
-+	   		
-+		if (defaultfontsize > 0) {
-+			sizeshift = usedfontsize - defaultfontsize;
-+			if (sizeshift != 0 &&
-+					FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
-+					FcResultMatch) {	
-+				fontval += sizeshift;
-+				FcPatternDel(pattern, FC_PIXEL_SIZE);
-+				FcPatternDel(pattern, FC_SIZE);
-+				FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
-+			}
-+		}
-+	
-+		FcPatternAddBool(pattern, FC_SCALABLE, 1);
-+	
-+		FcConfigSubstitute(NULL, pattern, FcMatchPattern);
-+		XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
-+	
-+		if (xloadsparefont(pattern, FRC_NORMAL))
-+			die("can't open spare font %s\n", *fp);
-+	
-+		FcPatternDel(pattern, FC_SLANT);
-+		FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
-+		if (xloadsparefont(pattern, FRC_ITALIC))
-+			die("can't open spare font %s\n", *fp);
-+			
-+		FcPatternDel(pattern, FC_WEIGHT);
-+		FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
-+		if (xloadsparefont(pattern, FRC_ITALICBOLD))
-+			die("can't open spare font %s\n", *fp);
-+	
-+		FcPatternDel(pattern, FC_SLANT);
-+		FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
-+		if (xloadsparefont(pattern, FRC_BOLD))
-+			die("can't open spare font %s\n", *fp);
-+	
-+		FcPatternDestroy(pattern);
-+	}
-+}
-+
- void
- xunloadfont(Font *f)
- {
-@@ -1046,6 +1194,9 @@ 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);
-@@ -1114,15 +1265,25 @@ void
- xinit(int cols, int rows)
- {
- 	XGCValues gcvalues;
--	Cursor cursor;
- 	Window parent;
- 	pid_t thispid = getpid();
- 	XColor xmousefg, xmousebg;
-+        Pixmap blankpm;
-+	XWindowAttributes attr;
-+	XVisualInfo vis;
- 
--	if (!(xw.dpy = XOpenDisplay(NULL)))
--		die("can't open display\n");
- 	xw.scr = XDefaultScreen(xw.dpy);
--	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
-+
-+	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
-+		parent = XRootWindow(xw.dpy, xw.scr);
-+		xw.depth = 32;
-+	} else {
-+		XGetWindowAttributes(xw.dpy, parent, &attr);
-+		xw.depth = attr.depth;
-+	}
-+
-+	XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
-+	xw.vis = vis.visual;
- 
- 	/* font */
- 	if (!FcInit())
-@@ -1131,13 +1292,16 @@ xinit(int cols, int rows)
- 	usedfont = (opt_font == NULL)? font : opt_font;
- 	xloadfonts(usedfont, 0);
- 
-+	/* spare fonts */
-+	xloadsparefonts();
-+
- 	/* colors */
--	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
-+	xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
- 	xloadcols();
- 
- 	/* adjust fixed window geometry */
--	win.w = 2 * borderpx + cols * win.cw;
--	win.h = 2 * borderpx + rows * win.ch;
-+	win.w = 2 * win.hborderpx + 2 * borderpx + cols * win.cw;
-+	win.h = 2 * win.vborderpx + 2 * borderpx + rows * win.ch;
- 	if (xw.gm & XNegative)
- 		xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
- 	if (xw.gm & YNegative)
-@@ -1152,19 +1316,15 @@ xinit(int cols, int rows)
- 		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
- 	xw.attrs.colormap = xw.cmap;
- 
--	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
--		parent = XRootWindow(xw.dpy, xw.scr);
- 	xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
--			win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
-+			win.w, win.h, 0, xw.depth, InputOutput,
- 			xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
- 			| CWEventMask | CWColormap, &xw.attrs);
- 
- 	memset(&gcvalues, 0, sizeof(gcvalues));
- 	gcvalues.graphics_exposures = False;
--	dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
--			&gcvalues);
--	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
--			DefaultDepth(xw.dpy, xw.scr));
-+	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
-+	dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
- 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
- 
-@@ -1181,8 +1341,9 @@ xinit(int cols, int rows)
- 	}
- 
- 	/* white cursor, black outline */
--	cursor = XCreateFontCursor(xw.dpy, mouseshape);
--	XDefineCursor(xw.dpy, xw.win, cursor);
-+	xw.pointerisvisible = 1;
-+	xw.vpointer = XCreateFontCursor(xw.dpy, mouseshape);
-+	XDefineCursor(xw.dpy, xw.win, xw.vpointer);
- 
- 	if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
- 		xmousefg.red   = 0xffff;
-@@ -1196,7 +1357,10 @@ xinit(int cols, int rows)
- 		xmousebg.blue  = 0x0000;
- 	}
- 
--	XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);
-+	XRecolorCursor(xw.dpy, xw.vpointer, &xmousefg, &xmousebg);
-+        blankpm = XCreateBitmapFromData(xw.dpy, xw.win, &(char){0}, 1, 1);
-+        xw.bpointer = XCreatePixmapCursor(xw.dpy, blankpm, blankpm,
-+            &xmousefg, &mousebg, 0, 0);
- 
- 	xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
- 	xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
-@@ -1204,6 +1368,10 @@ xinit(int cols, int rows)
- 	xw.netwmiconname = XInternAtom(xw.dpy, "_NET_WM_ICON_NAME", False);
- 	XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
- 
-+        xw.netwmicon = XInternAtom(xw.dpy, "_NET_WM_ICON", False);
-+        XChangeProperty(xw.dpy, xw.win, xw.netwmicon, XA_CARDINAL, 32,
-+            PropModeReplace, (uchar *)&icon, LEN(icon));
-+
- 	xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
- 	XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
- 			PropModeReplace, (uchar *)&thispid, 1);
-@@ -1226,7 +1394,7 @@ xinit(int cols, int rows)
- 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;
-+	float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp;
- 	ushort mode, prevmode = USHRT_MAX;
- 	Font *font = &dc.font;
- 	int frcflags = FRC_NORMAL;
-@@ -1239,13 +1407,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
- 	FcCharSet *fccharset;
- 	int i, f, numspecs = 0;
- 
--	for (i = 0, xp = winx, yp = winy + font->ascent; i < len; ++i) {
-+	for (i = 0, xp = winx, yp = winy + font->ascent + win.cyo; i < len; ++i) {
- 		/* Fetch rune and mode for current glyph. */
- 		rune = glyphs[i].u;
- 		mode = glyphs[i].mode;
- 
- 		/* Skip dummy wide-character spacing. */
--		if (mode == ATTR_WDUMMY)
-+		if (mode & ATTR_WDUMMY)
- 			continue;
- 
- 		/* Determine font for glyph if different from previous glyph. */
-@@ -1264,7 +1432,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
- 				font = &dc.bfont;
- 				frcflags = FRC_BOLD;
- 			}
--			yp = winy + font->ascent;
-+			yp = winy + font->ascent + win.cyo;
- 		}
- 
- 		/* Lookup character index with default font. */
-@@ -1352,6 +1520,9 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
- 		numspecs++;
- 	}
- 
-+	/* Harfbuzz transformation for ligatures. */
-+	hbtransform(specs, glyphs, len, x, y);
-+
- 	return numspecs;
- }
- 
-@@ -1359,7 +1530,7 @@ void
- 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,
-+	int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch,
- 	    width = charlen * win.cw;
- 	Color *fg, *bg, *temp, revfg, revbg, truefg, truebg;
- 	XRenderColor colfg, colbg;
-@@ -1449,17 +1620,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
- 
- 	/* Intelligent cleaning up of the borders. */
- 	if (x == 0) {
--		xclear(0, (y == 0)? 0 : winy, borderpx,
-+		xclear(0, (y == 0)? 0 : winy, win.vborderpx,
- 			winy + win.ch +
--			((winy + win.ch >= borderpx + win.th)? win.h : 0));
-+			((winy + win.ch >= win.vborderpx + win.th)? win.h : 0));
- 	}
--	if (winx + width >= borderpx + win.tw) {
-+	if (winx + width >= win.hborderpx + win.tw) {
- 		xclear(winx + width, (y == 0)? 0 : winy, win.w,
--			((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
-+			((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch)));
- 	}
- 	if (y == 0)
--		xclear(winx, 0, winx + width, borderpx);
--	if (winy + win.ch >= borderpx + win.th)
-+		xclear(winx, 0, winx + width, win.vborderpx);
-+	if (winy + win.ch >= win.vborderpx + win.th)
- 		xclear(winx, winy + win.ch, winx + width, win.h);
- 
- 	/* Clean up the region we want to draw to. */
-@@ -1477,12 +1648,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
- 
- 	/* Render underline and strikethrough. */
- 	if (base.mode & ATTR_UNDERLINE) {
--		XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent + 1,
-+		XftDrawRect(xw.draw, fg, winx, winy + win.cyo + dc.font.ascent + 1,
- 				width, 1);
- 	}
- 
- 	if (base.mode & ATTR_STRUCK) {
--		XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent / 3,
-+		XftDrawRect(xw.draw, fg, winx, winy + win.cyo + 2 * dc.font.ascent / 3,
- 				width, 1);
- 	}
- 
-@@ -1501,14 +1672,17 @@ xdrawglyph(Glyph g, int x, int y)
- }
- 
- 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;
-@@ -1553,35 +1727,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og)
- 		case 3: /* Blinking Underline */
- 		case 4: /* Steady Underline */
- 			XftDrawRect(xw.draw, &drawcol,
--					borderpx + cx * win.cw,
--					borderpx + (cy + 1) * win.ch - \
-+					win.hborderpx + cx * win.cw,
-+					win.vborderpx + (cy + 1) * win.ch - \
- 						cursorthickness,
- 					win.cw, cursorthickness);
- 			break;
- 		case 5: /* Blinking bar */
- 		case 6: /* Steady bar */
- 			XftDrawRect(xw.draw, &drawcol,
--					borderpx + cx * win.cw,
--					borderpx + cy * win.ch,
-+					win.hborderpx + cx * win.cw,
-+					win.vborderpx + cy * win.ch,
- 					cursorthickness, win.ch);
- 			break;
- 		}
- 	} else {
- 		XftDrawRect(xw.draw, &drawcol,
--				borderpx + cx * win.cw,
--				borderpx + cy * win.ch,
-+				win.hborderpx + cx * win.cw,
-+				win.vborderpx + cy * win.ch,
- 				win.cw - 1, 1);
- 		XftDrawRect(xw.draw, &drawcol,
--				borderpx + cx * win.cw,
--				borderpx + cy * win.ch,
-+				win.hborderpx + cx * win.cw,
-+				win.vborderpx + cy * win.ch,
- 				1, win.ch - 1);
- 		XftDrawRect(xw.draw, &drawcol,
--				borderpx + (cx + 1) * win.cw - 1,
--				borderpx + cy * win.ch,
-+				win.hborderpx + (cx + 1) * win.cw - 1,
-+				win.vborderpx + cy * win.ch,
- 				1, win.ch - 1);
- 		XftDrawRect(xw.draw, &drawcol,
--				borderpx + cx * win.cw,
--				borderpx + (cy + 1) * win.ch - 1,
-+				win.hborderpx + cx * win.cw,
-+				win.vborderpx + (cy + 1) * win.ch - 1,
- 				win.cw, 1);
- 	}
- }
-@@ -1609,23 +1783,51 @@ xseticontitle(char *p)
- 	XFree(prop.value);
- }
- 
-+void xfreetitlestack(void)
-+{
-+  for (int i = 0; i < LEN(titlestack); i++) {
-+    free(titlestack[i]);
-+    titlestack[i] = NULL;
-+  }
-+}
-+
- void
--xsettitle(char *p)
-+xsettitle(char *p, int pop)
- {
- 	XTextProperty prop;
--	DEFAULT(p, opt_title);
- 
--	if (Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle,
--	                                &prop) != Success)
--		return;
-+        free(titlestack[tstki]);
-+        if (pop) {
-+          titlestack[tstki] = NULL;
-+          tstki = (tstki - 1 + TITLESTACKSIZE) % TITLESTACKSIZE;
-+          p = titlestack[tstki] ? titlestack[tstki] : opt_title;
-+        } else if (p) {
-+          titlestack[tstki] = xstrdup(p);
-+        } else {
-+          titlestack[tstki] = NULL;
-+          p = opt_title;
-+        }
-+
-+        Xutf8TextListToTextProperty(xw.dpy, &p, 1, XUTF8StringStyle, &prop);
- 	XSetWMName(xw.dpy, xw.win, &prop);
- 	XSetTextProperty(xw.dpy, xw.win, &prop, xw.netwmname);
- 	XFree(prop.value);
- }
- 
-+void
-+xpushtitle(void)
-+{
-+  int tstkin = (tstki + 1) % TITLESTACKSIZE;
-+  free(titlestack[tstkin]);
-+  titlestack[tstkin] = titlestack[tstki] ? xstrdup(titlestack[tstki]) : NULL;
-+  tstki = tstkin;
-+}
-+
- int
- xstartdraw(void)
- {
-+        if (IS_SET(MODE_VISIBLE))
-+          XCopyArea(xw.dpy, xw.win, xw.buf, dc.gc, 0, 0, win.w, win.h, 0, 0);
- 	return IS_SET(MODE_VISIBLE);
- }
- 
-@@ -1705,6 +1907,8 @@ unmap(XEvent *ev)
- void
- xsetpointermotion(int set)
- {
-+	if (!set && !xw.pointerisvisible)
-+		return;
- 	MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
- 	XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
- }
-@@ -1824,6 +2028,12 @@ kpress(XEvent *ev)
- 	Status status;
- 	Shortcut *bp;
- 
-+	if (xw.pointerisvisible) {
-+		XDefineCursor(xw.dpy, xw.win, xw.bpointer);
-+		xsetpointermotion(1);
-+		xw.pointerisvisible = 0;
-+	}
-+
- 	if (IS_SET(MODE_KBDLOCK))
- 		return;
- 
-@@ -1995,6 +2205,59 @@ run(void)
- 	}
- }
- 
-+int
-+resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
-+{
-+	char **sdst = dst;
-+	int *idst = dst;
-+	float *fdst = dst;
-+
-+	char fullname[256];
-+	char fullclass[256];
-+	char *type;
-+	XrmValue ret;
-+
-+	snprintf(fullname, sizeof(fullname), "%s.%s",
-+			opt_name ? opt_name : "st", name);
-+	snprintf(fullclass, sizeof(fullclass), "%s.%s",
-+			opt_class ? opt_class : "St", name);
-+	fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0';
-+
-+	XrmGetResource(db, fullname, fullclass, &type, &ret);
-+	if (ret.addr == NULL || strncmp("String", type, 64))
-+		return 1;
-+
-+	switch (rtype) {
-+	case STRING:
-+		*sdst = ret.addr;
-+		break;
-+	case INTEGER:
-+		*idst = strtoul(ret.addr, NULL, 10);
-+		break;
-+	case FLOAT:
-+		*fdst = strtof(ret.addr, NULL);
-+		break;
-+	}
-+	return 0;
-+}
-+
-+void
-+config_init(void)
-+{
-+	char *resm;
-+	XrmDatabase db;
-+	ResourcePref *p;
-+
-+	XrmInitialize();
-+	resm = XResourceManagerString(xw.dpy);
-+	if (!resm)
-+		return;
-+
-+	db = XrmGetStringDatabase(resm);
-+	for (p = resources; p < resources + LEN(resources); p++)
-+		resource_load(db, p->name, p->type, p->dst);
-+}
-+
- void
- usage(void)
- {
-@@ -2019,6 +2282,9 @@ main(int argc, char *argv[])
- 	case 'a':
- 		allowaltscreen = 0;
- 		break;
-+	case 'A':
-+		opt_alpha = EARGF(usage());
-+		break;
- 	case 'c':
- 		opt_class = EARGF(usage());
- 		break;
-@@ -2068,6 +2334,11 @@ run:
- 
- 	setlocale(LC_CTYPE, "");
- 	XSetLocaleModifiers("");
-+
-+	if(!(xw.dpy = XOpenDisplay(NULL)))
-+		die("Can't open display\n");
-+
-+	config_init();
- 	cols = MAX(cols, 1);
- 	rows = MAX(rows, 1);
- 	tnew(cols, rows);
diff --git a/st.1 b/st.1
index 4a98626..39120b4 100644
--- a/st.1
+++ b/st.1
@@ -159,10 +159,6 @@ Copy the selected text to the clipboard selection.
 .TP
 .B Ctrl-Shift-v
 Paste from the clipboard selection.
-.TP
-.B Ctrl-Shift-i
-Launch dmenu to enter a unicode codepoint and send the corresponding glyph
-to st.
 .SH CUSTOMIZATION
 .B st
 can be customized by creating a custom config.h and (re)compiling the source
diff --git a/st.c b/st.c
index 8b687d7..62def59 100644
--- a/st.c
+++ b/st.c
@@ -35,7 +35,6 @@
 #define ESC_ARG_SIZ   16
 #define STR_BUF_SIZ   ESC_BUF_SIZ
 #define STR_ARG_SIZ   ESC_ARG_SIZ
-#define HISTSIZE      2000
 
 /* macros */
 #define IS_SET(flag)		((term.mode & (flag)) != 0)
@@ -43,11 +42,6 @@
 #define ISCONTROLC1(c)		(BETWEEN(c, 0x80, 0x9f))
 #define ISCONTROL(c)		(ISCONTROLC0(c) || ISCONTROLC1(c))
 #define ISDELIM(u)		(u && wcschr(worddelimiters, u))
-#define TLINE(y)		((y) < term.scr ? term.hist[((y) + term.histi - \
-				term.scr + HISTSIZE + 1) % HISTSIZE] : \
-				term.line[(y) - term.scr])
-#define STRESCARGREST(n)       ((n) == 0 ? strescseq.buf : strescseq.argp[(n)-1] + 1)
-#define STRESCARGJUST(n)        (*(strescseq.argp[n]) = '\0', STRESCARGREST(n))
 
 enum term_mode {
 	MODE_WRAP        = 1 << 0,
@@ -121,9 +115,6 @@ typedef struct {
 	int col;      /* nb col */
 	Line *line;   /* screen */
 	Line *alt;    /* alternate screen */
-	Line hist[HISTSIZE]; /* history buffer */
-	int histi;    /* history index */
-	int scr;      /* scroll back */
 	int *dirty;   /* dirtyness of lines */
 	TCursor c;    /* cursor */
 	int ocx;      /* old cursor col */
@@ -157,7 +148,7 @@ typedef struct {
 	char *buf;             /* allocated raw string */
 	size_t siz;            /* allocation size */
 	size_t len;            /* raw string length */
-	char *argp[STR_ARG_SIZ]; /* pointers to the end of nth argument */
+	char *args[STR_ARG_SIZ];
 	int narg;              /* nb of args */
 } STREscape;
 
@@ -170,6 +161,7 @@ static void csidump(void);
 static void csihandle(void);
 static void csiparse(void);
 static void csireset(void);
+static void osc_color_response(int, int, int);
 static int eschandle(uchar);
 static void strdump(void);
 static void strhandle(void);
@@ -193,8 +185,8 @@ static void tnewline(int);
 static void tputtab(int);
 static void tputc(Rune);
 static void treset(void);
-static void tscrollup(int, int, int);
-static void tscrolldown(int, int, int);
+static void tscrollup(int, int);
+static void tscrolldown(int, int);
 static void tsetattr(const int *, int);
 static void tsetchar(Rune, const Glyph *, int, int);
 static void tsetdirt(int, int);
@@ -358,25 +350,10 @@ utf8validate(Rune *u, size_t i)
 	return i;
 }
 
-static const char base64_digits[] = {
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 0, 0, 0,
-	63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 0, 0, 0, -1, 0, 0, 0, 0, 1,
-	2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21,
-	22, 23, 24, 25, 0, 0, 0, 0, 0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34,
-	35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-};
-
 char
 base64dec_getc(const char **src)
 {
-	while (**src && !isprint(**src))
+	while (**src && !isprint((unsigned char)**src))
 		(*src)++;
 	return **src ? *((*src)++) : '=';  /* emulate padding if string ends */
 }
@@ -386,6 +363,13 @@ base64dec(const char *src)
 {
 	size_t in_len = strlen(src);
 	char *result, *dst;
+	static const char base64_digits[256] = {
+		[43] = 62, 0, 0, 0, 63, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
+		0, 0, 0, -1, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12,
+		13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 0, 0, 0, 0,
+		0, 0, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,
+		40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51
+	};
 
 	if (in_len % 4)
 		in_len += 4 - (in_len % 4);
@@ -425,10 +409,10 @@ tlinelen(int y)
 {
 	int i = term.col;
 
-	if (TLINE(y)[i - 1].mode & ATTR_WRAP)
+	if (term.line[y][i - 1].mode & ATTR_WRAP)
 		return i;
 
-	while (i > 0 && TLINE(y)[i - 1].u == ' ')
+	while (i > 0 && term.line[y][i - 1].u == ' ')
 		--i;
 
 	return i;
@@ -537,7 +521,7 @@ selsnap(int *x, int *y, int direction)
 		 * Snap around if the word wraps around at the end or
 		 * beginning of a line.
 		 */
-		prevgp = &TLINE(*y)[*x];
+		prevgp = &term.line[*y][*x];
 		prevdelim = ISDELIM(prevgp->u);
 		for (;;) {
 			newx = *x + direction;
@@ -552,14 +536,14 @@ selsnap(int *x, int *y, int direction)
 					yt = *y, xt = *x;
 				else
 					yt = newy, xt = newx;
-				if (!(TLINE(yt)[xt].mode & ATTR_WRAP))
+				if (!(term.line[yt][xt].mode & ATTR_WRAP))
 					break;
 			}
 
 			if (newx >= tlinelen(newy))
 				break;
 
-			gp = &TLINE(newy)[newx];
+			gp = &term.line[newy][newx];
 			delim = ISDELIM(gp->u);
 			if (!(gp->mode & ATTR_WDUMMY) && (delim != prevdelim
 					|| (delim && gp->u != prevgp->u)))
@@ -580,14 +564,14 @@ selsnap(int *x, int *y, int direction)
 		*x = (direction < 0) ? 0 : term.col - 1;
 		if (direction < 0) {
 			for (; *y > 0; *y += direction) {
-				if (!(TLINE(*y-1)[term.col-1].mode
+				if (!(term.line[*y-1][term.col-1].mode
 						& ATTR_WRAP)) {
 					break;
 				}
 			}
 		} else if (direction > 0) {
 			for (; *y < term.row-1; *y += direction) {
-				if (!(TLINE(*y)[term.col-1].mode
+				if (!(term.line[*y][term.col-1].mode
 						& ATTR_WRAP)) {
 					break;
 				}
@@ -618,13 +602,13 @@ getsel(void)
 		}
 
 		if (sel.type == SEL_RECTANGULAR) {
-			gp = &TLINE(y)[sel.nb.x];
+			gp = &term.line[y][sel.nb.x];
 			lastx = sel.ne.x;
 		} else {
-			gp = &TLINE(y)[sel.nb.y == y ? sel.nb.x : 0];
+			gp = &term.line[y][sel.nb.y == y ? sel.nb.x : 0];
 			lastx = (sel.ne.y == y) ? sel.ne.x : term.col-1;
 		}
-		last = &TLINE(y)[MIN(lastx, linelen-1)];
+		last = &term.line[y][MIN(lastx, linelen-1)];
 		while (last >= gp && last->u == ' ')
 			--last;
 
@@ -734,14 +718,8 @@ sigchld(int a)
 	if ((p = waitpid(pid, &stat, WNOHANG)) < 0)
 		die("waiting for pid %hd failed: %s\n", pid, strerror(errno));
 
-	if (pid != p) {
-		if (p == 0 && wait(&stat) < 0)
-			die("wait: %s\n", strerror(errno));
-
-		/* reinstall sigchld handler */
-		signal(SIGCHLD, sigchld);
+	if (pid != p)
 		return;
-	}
 
 	if (WIFEXITED(stat) && WEXITSTATUS(stat))
 		die("child exited with status %d\n", WEXITSTATUS(stat));
@@ -866,9 +844,6 @@ void
 ttywrite(const char *s, size_t n, int may_echo)
 {
 	const char *next;
-	Arg arg = (Arg) { .i = term.scr };
-
-	kscrolldown(&arg);
 
 	if (may_echo && IS_SET(MODE_ECHO))
 		twrite(s, n, 1);
@@ -964,7 +939,7 @@ ttyresize(int tw, int th)
 }
 
 void
-ttyhangup()
+ttyhangup(void)
 {
 	/* Send SIGHUP to shell */
 	kill(pid, SIGHUP);
@@ -1068,11 +1043,6 @@ tnew(int col, int row)
 	treset();
 }
 
-int tisaltscr(void)
-{
-	return IS_SET(MODE_ALTSCREEN);
-}
-
 void
 tswapscreen(void)
 {
@@ -1085,53 +1055,13 @@ tswapscreen(void)
 }
 
 void
-kscrolldown(const Arg* a)
-{
-	int n = a->i;
-
-	if (n < 0)
-		n = term.row + n;
-
-	if (n > term.scr)
-		n = term.scr;
-
-	if (term.scr > 0) {
-		term.scr -= n;
-		selscroll(0, -n);
-		tfulldirt();
-	}
-}
-
-void
-kscrollup(const Arg* a)
-{
-	int n = a->i;
-
-	if (n < 0)
-		n = term.row + n;
-
-	if (term.scr <= HISTSIZE-n) {
-		term.scr += n;
-		selscroll(0, n);
-		tfulldirt();
-	}
-}
-
-void
-tscrolldown(int orig, int n, int copyhist)
+tscrolldown(int orig, int n)
 {
 	int i;
 	Line temp;
 
 	LIMIT(n, 0, term.bot-orig+1);
 
-	if (copyhist) {
-		term.histi = (term.histi - 1 + HISTSIZE) % HISTSIZE;
-		temp = term.hist[term.histi];
-		term.hist[term.histi] = term.line[term.bot];
-		term.line[term.bot] = temp;
-	}
-
 	tsetdirt(orig, term.bot-n);
 	tclearregion(0, term.bot-n+1, term.col-1, term.bot);
 
@@ -1141,28 +1071,17 @@ tscrolldown(int orig, int n, int copyhist)
 		term.line[i-n] = temp;
 	}
 
-	if (term.scr == 0)
-		selscroll(orig, n);
+	selscroll(orig, n);
 }
 
 void
-tscrollup(int orig, int n, int copyhist)
+tscrollup(int orig, int n)
 {
 	int i;
 	Line temp;
 
 	LIMIT(n, 0, term.bot-orig+1);
 
-	if (copyhist) {
-		term.histi = (term.histi + 1) % HISTSIZE;
-		temp = term.hist[term.histi];
-		term.hist[term.histi] = term.line[orig];
-		term.line[orig] = temp;
-	}
-
-	if (term.scr > 0 && term.scr < HISTSIZE)
-		term.scr = MIN(term.scr + n, HISTSIZE-1);
-
 	tclearregion(0, orig, term.col-1, orig+n-1);
 	tsetdirt(orig+n, term.bot);
 
@@ -1172,8 +1091,7 @@ tscrollup(int orig, int n, int copyhist)
 		term.line[i+n] = temp;
 	}
 
-	if (term.scr == 0)
-		selscroll(orig, -n);
+	selscroll(orig, -n);
 }
 
 void
@@ -1202,7 +1120,7 @@ tnewline(int first_col)
 	int y = term.c.y;
 
 	if (y == term.bot) {
-		tscrollup(term.top, 1, 1);
+		tscrollup(term.top, 1);
 	} else {
 		y++;
 	}
@@ -1367,14 +1285,14 @@ void
 tinsertblankline(int n)
 {
 	if (BETWEEN(term.c.y, term.top, term.bot))
-		tscrolldown(term.c.y, n, 0);
+		tscrolldown(term.c.y, n);
 }
 
 void
 tdeleteline(int n)
 {
 	if (BETWEEN(term.c.y, term.top, term.bot))
-		tscrollup(term.c.y, n, 0);
+		tscrollup(term.c.y, n);
 }
 
 int32_t
@@ -1811,11 +1729,11 @@ csihandle(void)
 		break;
 	case 'S': /* SU -- Scroll <n> line up */
 		DEFAULT(csiescseq.arg[0], 1);
-		tscrollup(term.top, csiescseq.arg[0], 0);
+		tscrollup(term.top, csiescseq.arg[0]);
 		break;
 	case 'T': /* SD -- Scroll <n> line down */
 		DEFAULT(csiescseq.arg[0], 1);
-		tscrolldown(term.top, csiescseq.arg[0], 0);
+		tscrolldown(term.top, csiescseq.arg[0]);
 		break;
 	case 'L': /* IL -- Insert <n> blank lines */
 		DEFAULT(csiescseq.arg[0], 1);
@@ -1884,33 +1802,6 @@ csihandle(void)
 			goto unknown;
 		}
 		break;
-       case 't': /* title stack operations */
-               switch (csiescseq.arg[0]) {
-               case 22: /* pust current title on stack */
-                       switch (csiescseq.arg[1]) {
-                       case 0:
-                       case 1:
-                       case 2:
-                               xpushtitle();
-                               break;
-                       default:
-                               goto unknown;
-                       }
-                       break;
-               case 23: /* pop last title from stack */
-                       switch (csiescseq.arg[1]) {
-                       case 0:
-                       case 1:
-                       case 2:
-                               xsettitle(NULL, 1);
-                               break;
-                       default:
-                               goto unknown;
-                       }
-                       break;
-               default:
-                       goto unknown;
-               }
 	}
 }
 
@@ -1945,39 +1836,28 @@ csireset(void)
 }
 
 void
-osc4_color_response(int num)
+osc_color_response(int num, int index, int is_osc4)
 {
 	int n;
 	char buf[32];
 	unsigned char r, g, b;
 
-	if (xgetcolor(num, &r, &g, &b)) {
-		fprintf(stderr, "erresc: failed to fetch osc4 color %d\n", num);
+	if (xgetcolor(is_osc4 ? num : index, &r, &g, &b)) {
+		fprintf(stderr, "erresc: failed to fetch %s color %d\n",
+		        is_osc4 ? "osc4" : "osc",
+		        is_osc4 ? num : index);
 		return;
 	}
 
-	n = snprintf(buf, sizeof buf, "\033]4;%d;rgb:%02x%02x/%02x%02x/%02x%02x\007",
-		     num, r, r, g, g, b, b);
-
-	ttywrite(buf, n, 1);
-}
-
-void
-osc_color_response(int index, int num)
-{
-	int n;
-	char buf[32];
-	unsigned char r, g, b;
-
-	if (xgetcolor(index, &r, &g, &b)) {
-		fprintf(stderr, "erresc: failed to fetch osc color %d\n", index);
-		return;
+	n = snprintf(buf, sizeof buf, "\033]%s%d;rgb:%02x%02x/%02x%02x/%02x%02x\007",
+	             is_osc4 ? "4;" : "", num, r, r, g, g, b, b);
+	if (n < 0 || n >= sizeof(buf)) {
+		fprintf(stderr, "error: %s while printing %s response\n",
+		        n < 0 ? "snprintf failed" : "truncation occurred",
+		        is_osc4 ? "osc4" : "osc");
+	} else {
+		ttywrite(buf, n, 1);
 	}
-
-	n = snprintf(buf, sizeof buf, "\033]%d;rgb:%02x%02x/%02x%02x/%02x%02x\007",
-		     num, r, r, g, g, b, b);
-
-	ttywrite(buf, n, 1);
 }
 
 void
@@ -1985,32 +1865,36 @@ strhandle(void)
 {
 	char *p = NULL, *dec;
 	int j, narg, par;
+	const struct { int idx; char *str; } osc_table[] = {
+		{ defaultfg, "foreground" },
+		{ defaultbg, "background" },
+		{ defaultcs, "cursor" }
+	};
 
 	term.esc &= ~(ESC_STR_END|ESC_STR);
-        strescseq.buf[strescseq.len] = '\0';
+	strparse();
+	par = (narg = strescseq.narg) ? atoi(strescseq.args[0]) : 0;
 
 	switch (strescseq.type) {
 	case ']': /* OSC -- Operating System Command */
-          strparse();
-          par = (narg = strescseq.narg) ? atoi(STRESCARGJUST(0)) : 0;
 		switch (par) {
 		case 0:
 			if (narg > 1) {
-				xsettitle(STRESCARGREST(1), 0);
-				xseticontitle(STRESCARGREST(1));
+				xsettitle(strescseq.args[1]);
+				xseticontitle(strescseq.args[1]);
 			}
 			return;
 		case 1:
 			if (narg > 1)
-				xsettitle(STRESCARGREST(1), 0);
+				xseticontitle(strescseq.args[1]);
 			return;
 		case 2:
 			if (narg > 1)
-				xsettitle(STRESCARGREST(1), 0);
+				xsettitle(strescseq.args[1]);
 			return;
 		case 52:
 			if (narg > 2 && allowwindowops) {
-				dec = base64dec(STRESCARGJUST(2));
+				dec = base64dec(strescseq.args[2]);
 				if (dec) {
 					xsetsel(dec);
 					xclipcopy();
@@ -2019,88 +1903,35 @@ strhandle(void)
 				}
 			}
 			return;
-		/*
-                case 10:
-			if (narg < 2)
-				break;
-
-			p = STRESCARGREST(1);
-
-			if (!strcmp(p, "?"))
-				osc_color_response(defaultfg, 10);
-			else if (xsetcolorname(defaultfg, p))
-				fprintf(stderr, "erresc: invalid foreground color: %s\n", p);
-			else
-				redraw();
-			return;
+		case 10:
 		case 11:
-			if (narg < 2)
-				break;
-
-			p = STRESCARGREST(1);
-
-			if (!strcmp(p, "?"))
-				osc_color_response(defaultbg, 11);
-			else if (xsetcolorname(defaultbg, p))
-				fprintf(stderr, "erresc: invalid background color: %s\n", p);
-			else
-				redraw();
-			return;
 		case 12:
 			if (narg < 2)
 				break;
-
-			p = STRESCARGREST(1);
-
-			if (!strcmp(p, "?"))
-				osc_color_response(defaultcs, 12);
-			else if (xsetcolorname(defaultcs, p))
-				fprintf(stderr, "erresc: invalid cursor color: %s\n", p);
-			else
-				redraw();
+			p = strescseq.args[1];
+			if ((j = par - 10) < 0 || j >= LEN(osc_table))
+				break; /* shouldn't be possible */
+
+			if (!strcmp(p, "?")) {
+				osc_color_response(par, osc_table[j].idx, 0);
+			} else if (xsetcolorname(osc_table[j].idx, p)) {
+				fprintf(stderr, "erresc: invalid %s color: %s\n",
+				        osc_table[j].str, p);
+			} else {
+				tfulldirt();
+			}
 			return;
-                */
-		case 10: /* set foreground color */
-			if (narg < 2)
-				break;
-
-			p = STRESCARGJUST(1);
-			if (xsetcolorname(defaultfg, p))
-				fprintf(stderr, "erresc: invalid foreground color %s\n", p);
-			else
-				redraw();
-			break;
-		case 11: /* set background color */
-			if (narg < 2)
-				break;
-
-			p = STRESCARGJUST(1);
-			if (xsetcolorname(defaultbg, p))
-				fprintf(stderr, "erresc: invalid background color %s\n", p);
-			else
-				redraw();
-			break;
-		case 12: /* set cursor color */
-			if (narg < 2)
-				break;
-
-			p = STRESCARGJUST(1);
-			if (xsetcolorname(defaultcs, p))
-				fprintf(stderr, "erresc: invalid cursor color %s\n", p);
-			else
-				redraw();
-			break;
 		case 4: /* color set */
 			if (narg < 3)
 				break;
-			p = STRESCARGJUST(2);
+			p = strescseq.args[2];
 			/* FALLTHROUGH */
 		case 104: /* color reset */
-			j = (narg > 1) ? atoi(STRESCARGJUST(1)) : -1;
+			j = (narg > 1) ? atoi(strescseq.args[1]) : -1;
 
-			if (p && !strcmp(p, "?"))
-				osc4_color_response(j);
-			else if (xsetcolorname(j, p)) {
+			if (p && !strcmp(p, "?")) {
+				osc_color_response(j, 0, 1);
+			} else if (xsetcolorname(j, p)) {
 				if (par == 104 && narg <= 1)
 					return; /* color reset without parameter */
 				fprintf(stderr, "erresc: invalid color j=%d, p=%s\n",
@@ -2110,15 +1941,13 @@ strhandle(void)
 				 * TODO if defaultbg color is changed, borders
 				 * are dirty
 				 */
-                                if (j == defaultbg)
-                                      xclearwin();
-				redraw();
+				tfulldirt();
 			}
 			return;
 		}
 		break;
 	case 'k': /* old title set compatibility */
-		xsettitle(strescseq.buf, 0);
+		xsettitle(strescseq.args[0]);
 		return;
 	case 'P': /* DCS -- Device Control String */
 	case '_': /* APC -- Application Program Command */
@@ -2137,74 +1966,22 @@ strparse(void)
 	char *p = strescseq.buf;
 
 	strescseq.narg = 0;
+	strescseq.buf[strescseq.len] = '\0';
 
 	if (*p == '\0')
 		return;
 
 	while (strescseq.narg < STR_ARG_SIZ) {
+		strescseq.args[strescseq.narg++] = p;
 		while ((c = *p) != ';' && c != '\0')
-			p++;
-		strescseq.argp[strescseq.narg++] = p;
+			++p;
 		if (c == '\0')
 			return;
-		p++;
+		*p++ = '\0';
 	}
 }
 
 void
-externalpipe(const Arg *arg)
-{
-	int to[2];
-	char buf[UTF_SIZ];
-	void (*oldsigpipe)(int);
-	Glyph *bp, *end;
-	int lastpos, n, newline;
-
-	if (pipe(to) == -1)
-		return;
-
-	switch (fork()) {
-	case -1:
-		close(to[0]);
-		close(to[1]);
-		return;
-	case 0:
-		dup2(to[0], STDIN_FILENO);
-		close(to[0]);
-		close(to[1]);
-		execvp(((char **)arg->v)[0], (char **)arg->v);
-		fprintf(stderr, "st: execvp %s\n", ((char **)arg->v)[0]);
-		perror("failed");
-		exit(0);
-	}
-
-	close(to[0]);
-	/* ignore sigpipe for now, in case child exists early */
-	oldsigpipe = signal(SIGPIPE, SIG_IGN);
-	newline = 0;
-	for (n = 0; n < term.row; n++) {
-		bp = term.line[n];
-		lastpos = MIN(tlinelen(n) + 1, term.col) - 1;
-		if (lastpos < 0)
-			break;
-		end = &bp[lastpos + 1];
-		for (; bp < end; ++bp)
-			if (xwrite(to[1], buf, utf8encode(bp->u, buf)) < 0)
-				break;
-		if ((newline = term.line[n][lastpos].mode & ATTR_WRAP))
-			continue;
-		if (xwrite(to[1], "\n", 1) < 0)
-			break;
-		newline = 0;
-	}
-	if (newline)
-		(void)xwrite(to[1], "\n", 1);
-	close(to[1]);
-	/* restore */
-	signal(SIGPIPE, oldsigpipe);
-}
-
-void
 strdump(void)
 {
 	size_t i;
@@ -2258,28 +2035,6 @@ tprinter(char *s, size_t len)
 }
 
 void
-iso14755(const Arg *arg)
-{
-	FILE *p;
-	char *us, *e, codepoint[9], uc[UTF_SIZ];
-	unsigned long utf32;
-
-	if (!(p = popen(iso14755_cmd, "r")))
-		return;
-
-	us = fgets(codepoint, sizeof(codepoint), p);
-	pclose(p);
-
-	if (!us || *us == '\0' || *us == '-' || strlen(us) > 7)
-		return;
-	if ((utf32 = strtoul(us, &e, 16)) == ULONG_MAX ||
-	    (*e != '\n' && *e != '\0'))
-		return;
-
-	ttywrite(uc, utf8encode(utf32, uc), 1);
-}
-
-void
 toggleprinter(const Arg *arg)
 {
 	term.mode ^= MODE_PRINT;
@@ -2541,7 +2296,7 @@ eschandle(uchar ascii)
 		return 0;
 	case 'D': /* IND -- Linefeed */
 		if (term.c.y == term.bot) {
-			tscrollup(term.top, 1, 1);
+			tscrollup(term.top, 1);
 		} else {
 			tmoveto(term.c.x, term.c.y+1);
 		}
@@ -2554,7 +2309,7 @@ eschandle(uchar ascii)
 		break;
 	case 'M': /* RI -- Reverse index */
 		if (term.c.y == term.top) {
-			tscrolldown(term.top, 1, 1);
+			tscrolldown(term.top, 1);
 		} else {
 			tmoveto(term.c.x, term.c.y-1);
 		}
@@ -2564,7 +2319,6 @@ eschandle(uchar ascii)
 		break;
 	case 'c': /* RIS -- Reset to initial state */
 		treset();
-		xfreetitlestack();
 		resettitle();
 		xloadcols();
 		break;
@@ -2769,7 +2523,7 @@ twrite(const char *buf, int buflen, int show_ctrl)
 void
 tresize(int col, int row)
 {
-	int i, j;
+	int i;
 	int minrow = MIN(row, term.row);
 	int mincol = MIN(col, term.col);
 	int *bp;
@@ -2806,14 +2560,6 @@ tresize(int col, int row)
 	term.dirty = xrealloc(term.dirty, row * sizeof(*term.dirty));
 	term.tabs = xrealloc(term.tabs, col * sizeof(*term.tabs));
 
-	for (i = 0; i < HISTSIZE; i++) {
-		term.hist[i] = xrealloc(term.hist[i], col * sizeof(Glyph));
-		for (j = mincol; j < col; j++) {
-			term.hist[i][j] = term.c.attr;
-			term.hist[i][j].u = ' ';
-		}
-	}
-
 	/* resize each row to new width, zero-pad if needed */
 	for (i = 0; i < minrow; i++) {
 		term.line[i] = xrealloc(term.line[i], col * sizeof(Glyph));
@@ -2859,7 +2605,7 @@ tresize(int col, int row)
 void
 resettitle(void)
 {
-	xsettitle(NULL, 0);
+	xsettitle(NULL);
 }
 
 void
@@ -2872,7 +2618,7 @@ drawregion(int x1, int y1, int x2, int y2)
 			continue;
 
 		term.dirty[y] = 0;
-		xdrawline(TLINE(y), x1, y, x2);
+		xdrawline(term.line[y], x1, y, x2);
 	}
 }
 
@@ -2893,10 +2639,8 @@ draw(void)
 		cx--;
 
 	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.ocx = cx;
 	term.ocy = term.c.y;
 	xfinishdraw();
diff --git a/st.desktop b/st.desktop
deleted file mode 100644
index 49029d8..0000000
--- a/st.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=st
-Comment=st is a simple terminal implementation for X
-Exec=st
-Icon=utilities-terminal
-Terminal=false
-Type=Application
-Categories=System;TerminalEmulator;
diff --git a/st.h b/st.h
index 22af9d5..fd3b0d8 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) & (~ATTR_LIGA)) != ((b).mode & (~ATTR_WRAP) & (~ATTR_LIGA)) || \
-				(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)
@@ -34,7 +33,6 @@ enum glyph_attribute {
 	ATTR_WRAP       = 1 << 8,
 	ATTR_WIDE       = 1 << 9,
 	ATTR_WDUMMY     = 1 << 10,
-	ATTR_LIGA       = 1 << 11,
 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
 };
 
@@ -83,17 +81,12 @@ void die(const char *, ...);
 void redraw(void);
 void draw(void);
 
-void iso14755(const Arg *);
-void externalpipe(const Arg *);
-void kscrolldown(const Arg *);
-void kscrollup(const Arg *);
 void printscreen(const Arg *);
 void printsel(const Arg *);
 void sendbreak(const Arg *);
 void toggleprinter(const Arg *);
 
 int tattrset(int);
-int tisaltscr(void);
 void tnew(int, int);
 void tresize(int, int);
 void tsetdirtattr(int);
@@ -118,8 +111,6 @@ void *xmalloc(size_t);
 void *xrealloc(void *, size_t);
 char *xstrdup(const char *);
 
-int xgetcolor(int x, unsigned char *r, unsigned char *g, unsigned char *b);
-
 /* config.h globals */
 extern char *utmp;
 extern char *scroll;
@@ -133,5 +124,3 @@ extern unsigned int tabspaces;
 extern unsigned int defaultfg;
 extern unsigned int defaultbg;
 extern unsigned int defaultcs;
-extern char *iso14755_cmd;
-extern float alpha;
diff --git a/win.h b/win.h
index 1eff487..6de960d 100644
--- a/win.h
+++ b/win.h
@@ -25,19 +25,17 @@ 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);
 int xsetcolorname(int, const char *);
+int xgetcolor(int, unsigned char *, unsigned char *, unsigned char *);
 void xseticontitle(char *);
-void xfreetitlestack(void);
-void xsettitle(char *, int);
-void xpushtitle(void);
+void xsettitle(char *);
 int xsetcursor(int);
 void xsetmode(int, unsigned int);
 void xsetpointermotion(int);
 void xsetsel(char *);
 int xstartdraw(void);
 void xximspot(int, int);
-void xclearwin(void);
diff --git a/x.c b/x.c
index 5f8c2b6..2a3bd38 100644
--- a/x.c
+++ b/x.c
@@ -14,14 +14,11 @@
 #include <X11/keysym.h>
 #include <X11/Xft/Xft.h>
 #include <X11/XKBlib.h>
-#include <X11/Xresource.h>
 
 char *argv0;
 #include "arg.h"
-#include "icon.h"
 #include "st.h"
 #include "win.h"
-#include "hb.h"
 
 /* types used in config.h */
 typedef struct {
@@ -37,7 +34,6 @@ typedef struct {
 	void (*func)(const Arg *);
 	const Arg arg;
 	uint  release;
-	int  altscrn;  /* 0: don't care, -1: not alt screen, 1: alt screen */
 } MouseShortcut;
 
 typedef struct {
@@ -49,19 +45,6 @@ typedef struct {
 	signed char appcursor; /* application cursor */
 } Key;
 
-/* Xresources preferences */
-enum resource_type {
-	STRING = 0,
-	INTEGER = 1,
-	FLOAT = 2
-};
-
-typedef struct {
-	char *name;
-	enum resource_type type;
-	void *dst;
-} ResourcePref;
-
 /* X modifiers */
 #define XK_ANY_MOD    UINT_MAX
 #define XK_NO_MOD     0
@@ -80,9 +63,6 @@ static void ttysend(const Arg *);
 /* config.h for applying patches and the configuration. */
 #include "config.h"
 
-/* size of title stack */
-#define TITLESTACKSIZE 8
-
 /* XEMBED messages */
 #define XEMBED_FOCUS_IN  4
 #define XEMBED_FOCUS_OUT 5
@@ -101,10 +81,8 @@ typedef XftGlyphFontSpec GlyphFontSpec;
 typedef struct {
 	int tw, th; /* tty width and height */
 	int w, h; /* window width and height */
-	int hborderpx, vborderpx;
 	int ch; /* char height */
 	int cw; /* char width  */
-	int cyo; /* char y offset */
 	int mode; /* window state/mode flags */
 	int cursor; /* cursor style */
 } TermWindow;
@@ -115,7 +93,7 @@ typedef struct {
 	Window win;
 	Drawable buf;
 	GlyphFontSpec *specbuf; /* font spec buffer used for rendering */
-	Atom xembed, wmdeletewin, netwmname, netwmiconname, netwmicon, netwmpid;
+	Atom xembed, wmdeletewin, netwmname, netwmiconname, netwmpid;
 	struct {
 		XIM xim;
 		XIC xic;
@@ -125,14 +103,8 @@ typedef struct {
 	Draw draw;
 	Visual *vis;
 	XSetWindowAttributes attrs;
-	/* Here, we use the term *pointer* to differentiate the cursor
-	 * one sees when hovering the mouse over the terminal from, e.g.,
-	 * a green rectangle where text would be entered. */
-	Cursor vpointer, bpointer; /* visible and hidden pointers */
-	int pointerisvisible;
 	int scr;
 	int isfixed; /* is fixed geometry? */
-	int depth; /* bit depth */
 	int l, t; /* left and top offset */
 	int gm; /* geometry mask */
 } XWindow;
@@ -185,8 +157,6 @@ static void xhints(void);
 static int xloadcolor(int, const char *, Color *);
 static int xloadfont(Font *, FcPattern *);
 static void xloadfonts(const char *, double);
-static int xloadsparefont(FcPattern *, int);
-static void xloadsparefonts(void);
 static void xunloadfont(Font *);
 static void xunloadfonts(void);
 static void xsetenv(void);
@@ -208,6 +178,7 @@ static void bpress(XEvent *);
 static void bmotion(XEvent *);
 static void propnotify(XEvent *);
 static void selnotify(XEvent *);
+static void selclear_(XEvent *);
 static void selrequest(XEvent *);
 static void setsel(char *, Time);
 static void mousesel(XEvent *, int);
@@ -249,8 +220,6 @@ static DC dc;
 static XWindow xw;
 static XSelection xsel;
 static TermWindow win;
-static int tstki; /* title stack index */
-static char *titlestack[TITLESTACKSIZE]; /* title stack */
 
 /* Font Ring Cache */
 enum {
@@ -274,7 +243,6 @@ static char *usedfont = NULL;
 static double usedfontsize = 0;
 static double defaultfontsize = 0;
 
-static char *opt_alpha = NULL;
 static char *opt_class = NULL;
 static char **opt_cmd  = NULL;
 static char *opt_embed = NULL;
@@ -284,7 +252,7 @@ static char *opt_line  = NULL;
 static char *opt_name  = NULL;
 static char *opt_title = NULL;
 
-static int oldbutton = 3; /* button event on startup: 3 = release */
+static uint buttons; /* bit field of pressed buttons */
 
 void
 clipcopy(const Arg *dummy)
@@ -338,7 +306,6 @@ zoomabs(const Arg *arg)
 {
 	xunloadfonts();
 	xloadfonts(usedfont, arg->f);
-	xloadsparefonts();
 	cresize(0, 0);
 	redraw();
 	xhints();
@@ -364,7 +331,7 @@ ttysend(const Arg *arg)
 int
 evcol(XEvent *e)
 {
-	int x = e->xbutton.x - win.hborderpx;
+	int x = e->xbutton.x - borderpx;
 	LIMIT(x, 0, win.tw - 1);
 	return x / win.cw;
 }
@@ -372,7 +339,7 @@ evcol(XEvent *e)
 int
 evrow(XEvent *e)
 {
-	int y = e->xbutton.y - win.vborderpx;
+	int y = e->xbutton.y - borderpx;
 	LIMIT(y, 0, win.th - 1);
 	return y / win.ch;
 }
@@ -397,61 +364,68 @@ mousesel(XEvent *e, int done)
 void
 mousereport(XEvent *e)
 {
-	int len, x = evcol(e), y = evrow(e),
-	    button = e->xbutton.button, state = e->xbutton.state;
+	int len, btn, code;
+	int x = evcol(e), y = evrow(e);
+	int state = e->xbutton.state;
 	char buf[40];
 	static int ox, oy;
 
-	/* from urxvt */
-	if (e->xbutton.type == MotionNotify) {
+	if (e->type == MotionNotify) {
 		if (x == ox && y == oy)
 			return;
 		if (!IS_SET(MODE_MOUSEMOTION) && !IS_SET(MODE_MOUSEMANY))
 			return;
-		/* MOUSE_MOTION: no reporting if no button is pressed */
-		if (IS_SET(MODE_MOUSEMOTION) && oldbutton == 3)
+		/* MODE_MOUSEMOTION: no reporting if no button is pressed */
+		if (IS_SET(MODE_MOUSEMOTION) && buttons == 0)
 			return;
-
-		button = oldbutton + 32;
-		ox = x;
-		oy = y;
+		/* Set btn to lowest-numbered pressed button, or 12 if no
+		 * buttons are pressed. */
+		for (btn = 1; btn <= 11 && !(buttons & (1<<(btn-1))); btn++)
+			;
+		code = 32;
 	} else {
-		if (!IS_SET(MODE_MOUSESGR) && e->xbutton.type == ButtonRelease) {
-			button = 3;
-		} else {
-			button -= Button1;
-			if (button >= 7)
-				button += 128 - 7;
-			else if (button >= 3)
-				button += 64 - 3;
-		}
-		if (e->xbutton.type == ButtonPress) {
-			oldbutton = button;
-			ox = x;
-			oy = y;
-		} else if (e->xbutton.type == ButtonRelease) {
-			oldbutton = 3;
+		btn = e->xbutton.button;
+		/* Only buttons 1 through 11 can be encoded */
+		if (btn < 1 || btn > 11)
+			return;
+		if (e->type == ButtonRelease) {
 			/* MODE_MOUSEX10: no button release reporting */
 			if (IS_SET(MODE_MOUSEX10))
 				return;
-			if (button == 64 || button == 65)
+			/* Don't send release events for the scroll wheel */
+			if (btn == 4 || btn == 5)
 				return;
 		}
+		code = 0;
 	}
 
+	ox = x;
+	oy = y;
+
+	/* Encode btn into code. If no button is pressed for a motion event in
+	 * MODE_MOUSEMANY, then encode it as a release. */
+	if ((!IS_SET(MODE_MOUSESGR) && e->type == ButtonRelease) || btn == 12)
+		code += 3;
+	else if (btn >= 8)
+		code += 128 + btn - 8;
+	else if (btn >= 4)
+		code += 64 + btn - 4;
+	else
+		code += btn - 1;
+
 	if (!IS_SET(MODE_MOUSEX10)) {
-		button += ((state & ShiftMask  ) ? 4  : 0)
-			+ ((state & Mod4Mask   ) ? 8  : 0)
-			+ ((state & ControlMask) ? 16 : 0);
+		code += ((state & ShiftMask  ) ?  4 : 0)
+		      + ((state & Mod1Mask   ) ?  8 : 0) /* meta key: alt */
+		      + ((state & ControlMask) ? 16 : 0);
 	}
 
 	if (IS_SET(MODE_MOUSESGR)) {
 		len = snprintf(buf, sizeof(buf), "\033[<%d;%d;%d%c",
-				button, x+1, y+1,
-				e->xbutton.type == ButtonRelease ? 'm' : 'M');
+				code, x+1, y+1,
+				e->type == ButtonRelease ? 'm' : 'M');
 	} else if (x < 223 && y < 223) {
 		len = snprintf(buf, sizeof(buf), "\033[M%c%c%c",
-				32+button, 32+x+1, 32+y+1);
+				32+code, 32+x+1, 32+y+1);
 	} else {
 		return;
 	}
@@ -481,7 +455,6 @@ mouseaction(XEvent *e, uint release)
 	for (ms = mshortcuts; ms < mshortcuts + LEN(mshortcuts); ms++) {
 		if (ms->release == release &&
 		    ms->button == e->xbutton.button &&
-		    (!ms->altscrn || (ms->altscrn == (tisaltscr() ? 1 : -1))) &&
 		    (match(ms->mod, state) ||  /* exact or forced */
 		     match(ms->mod, state & ~forcemousemod))) {
 			ms->func(&(ms->arg));
@@ -495,9 +468,13 @@ mouseaction(XEvent *e, uint release)
 void
 bpress(XEvent *e)
 {
+	int btn = e->xbutton.button;
 	struct timespec now;
 	int snap;
 
+	if (1 <= btn && btn <= 11)
+		buttons |= 1 << (btn-1);
+
 	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
 		mousereport(e);
 		return;
@@ -506,7 +483,7 @@ bpress(XEvent *e)
 	if (mouseaction(e, 0))
 		return;
 
-	if (e->xbutton.button == Button1) {
+	if (btn == Button1) {
 		/*
 		 * If the user clicks below predefined timeouts specific
 		 * snapping behaviour is exposed.
@@ -634,6 +611,12 @@ xclipcopy(void)
 }
 
 void
+selclear_(XEvent *e)
+{
+	selclear();
+}
+
+void
 selrequest(XEvent *e)
 {
 	XSelectionRequestEvent *xsre;
@@ -703,7 +686,6 @@ setsel(char *str, Time t)
 	XSetSelectionOwner(xw.dpy, XA_PRIMARY, xw.win, t);
 	if (XGetSelectionOwner(xw.dpy, XA_PRIMARY) != xw.win)
 		selclear();
-	clipcopy(NULL);
 }
 
 void
@@ -715,6 +697,11 @@ xsetsel(char *str)
 void
 brelease(XEvent *e)
 {
+	int btn = e->xbutton.button;
+
+	if (1 <= btn && btn <= 11)
+		buttons &= ~(1 << (btn-1));
+
 	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
 		mousereport(e);
 		return;
@@ -722,20 +709,13 @@ brelease(XEvent *e)
 
 	if (mouseaction(e, 1))
 		return;
-	if (e->xbutton.button == Button1)
+	if (btn == Button1)
 		mousesel(e, 1);
 }
 
 void
 bmotion(XEvent *e)
 {
-	if (!xw.pointerisvisible) {
-		XDefineCursor(xw.dpy, xw.win, xw.vpointer);
-		xw.pointerisvisible = 1;
-		if (!IS_SET(MODE_MOUSEMANY))
-			xsetpointermotion(0);
-	}
-
 	if (IS_SET(MODE_MOUSE) && !(e->xbutton.state & forcemousemod)) {
 		mousereport(e);
 		return;
@@ -759,9 +739,6 @@ cresize(int width, int height)
 	col = MAX(1, col);
 	row = MAX(1, row);
 
-	win.hborderpx = (win.w - col * win.cw) / 2;
-	win.vborderpx = (win.h - row * win.ch) / 2;
-
 	tresize(col, row);
 	xresize(col, row);
 	ttyresize(win.tw, win.th);
@@ -775,7 +752,7 @@ xresize(int col, int row)
 
 	XFreePixmap(xw.dpy, xw.buf);
 	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-			xw.depth);
+			DefaultDepth(xw.dpy, xw.scr));
 	XftDrawChange(xw.draw, xw.buf);
 	xclear(0, 0, win.w, win.h);
 
@@ -835,13 +812,6 @@ xloadcols(void)
 			else
 				die("could not allocate color %d\n", i);
 		}
-
-	/* set alpha value of bg color */
-	if (opt_alpha)
-		alpha = strtof(opt_alpha, NULL);
-	dc.col[defaultbg].color.alpha = (unsigned short)(0xffff * alpha);
-	dc.col[defaultbg].pixel &= 0x00FFFFFF;
-	dc.col[defaultbg].pixel |= (unsigned char)(0xff * alpha) << 24;
 	loaded = 1;
 }
 
@@ -887,16 +857,10 @@ xclear(int x1, int y1, int x2, int y2)
 }
 
 void
-xclearwin(void)
-{
-	xclear(0, 0, win.w, win.h);
-}
-
-void
 xhints(void)
 {
-	XClassHint class = {opt_name ? opt_name : "st",
-	                    opt_class ? opt_class : "St"};
+	XClassHint class = {opt_name ? opt_name : termname,
+	                    opt_class ? opt_class : termname};
 	XWMHints wm = {.flags = InputHint, .input = 1};
 	XSizeHints *sizeh;
 
@@ -905,8 +869,8 @@ xhints(void)
 	sizeh->flags = PSize | PResizeInc | PBaseSize | PMinSize;
 	sizeh->height = win.h;
 	sizeh->width = win.w;
-	sizeh->height_inc = 1;
-	sizeh->width_inc = 1;
+	sizeh->height_inc = win.ch;
+	sizeh->width_inc = win.cw;
 	sizeh->base_height = 2 * borderpx;
 	sizeh->base_width = 2 * borderpx;
 	sizeh->min_height = win.ch + 2 * borderpx;
@@ -1067,7 +1031,6 @@ xloadfonts(const char *fontstr, double fontsize)
 	/* Setting character width and height. */
 	win.cw = ceilf(dc.font.width * cwscale);
 	win.ch = ceilf(dc.font.height * chscale);
-	win.cyo = ceilf(dc.font.height * (chscale - 1) / 2);
 
 	FcPatternDel(pattern, FC_SLANT);
 	FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
@@ -1087,101 +1050,6 @@ xloadfonts(const char *fontstr, double fontsize)
 	FcPatternDestroy(pattern);
 }
 
-int
-xloadsparefont(FcPattern *pattern, int flags)
-{
-	FcPattern *match;
-	FcResult result;
-	
-	match = FcFontMatch(NULL, pattern, &result);
-	if (!match) {
-		return 1;
-	}
-
-	if (!(frc[frclen].font = XftFontOpenPattern(xw.dpy, match))) {
-		FcPatternDestroy(match);
-		return 1;
-	}
-
-	frc[frclen].flags = flags;
-	/* Believe U+0000 glyph will present in each default font */
-	frc[frclen].unicodep = 0;
-	frclen++;
-
-	return 0;
-}
-
-void
-xloadsparefonts(void)
-{
-	FcPattern *pattern;
-	double sizeshift, fontval;
-	int fc;
-	char **fp;
-
-	if (frclen != 0)
-		die("can't embed spare fonts. cache isn't empty");
-
-	/* Calculate count of spare fonts */
-	fc = sizeof(font2) / sizeof(*font2);
-	if (fc == 0)
-		return;
-
-	/* Allocate memory for cache entries. */
-	if (frccap < 4 * fc) {
-		frccap += 4 * fc - frccap;
-		frc = xrealloc(frc, frccap * sizeof(Fontcache));
-	}
-
-	for (fp = font2; fp - font2 < fc; ++fp) {
-	
-		if (**fp == '-')
-			pattern = XftXlfdParse(*fp, False, False);
-		else
-			pattern = FcNameParse((FcChar8 *)*fp);
-	
-		if (!pattern)
-			die("can't open spare font %s\n", *fp);
-	   		
-		if (defaultfontsize > 0) {
-			sizeshift = usedfontsize - defaultfontsize;
-			if (sizeshift != 0 &&
-					FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
-					FcResultMatch) {	
-				fontval += sizeshift;
-				FcPatternDel(pattern, FC_PIXEL_SIZE);
-				FcPatternDel(pattern, FC_SIZE);
-				FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
-			}
-		}
-	
-		FcPatternAddBool(pattern, FC_SCALABLE, 1);
-	
-		FcConfigSubstitute(NULL, pattern, FcMatchPattern);
-		XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
-	
-		if (xloadsparefont(pattern, FRC_NORMAL))
-			die("can't open spare font %s\n", *fp);
-	
-		FcPatternDel(pattern, FC_SLANT);
-		FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
-		if (xloadsparefont(pattern, FRC_ITALIC))
-			die("can't open spare font %s\n", *fp);
-			
-		FcPatternDel(pattern, FC_WEIGHT);
-		FcPatternAddInteger(pattern, FC_WEIGHT, FC_WEIGHT_BOLD);
-		if (xloadsparefont(pattern, FRC_ITALICBOLD))
-			die("can't open spare font %s\n", *fp);
-	
-		FcPatternDel(pattern, FC_SLANT);
-		FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ROMAN);
-		if (xloadsparefont(pattern, FRC_BOLD))
-			die("can't open spare font %s\n", *fp);
-	
-		FcPatternDestroy(pattern);
-	}
-}
-
 void
 xunloadfont(Font *f)
 {
@@ -1194,9 +1062,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);
@@ -1265,25 +1130,15 @@ void
 xinit(int cols, int rows)
 {
 	XGCValues gcvalues;
+	Cursor cursor;
 	Window parent;
 	pid_t thispid = getpid();
 	XColor xmousefg, xmousebg;
-        Pixmap blankpm;
-	XWindowAttributes attr;
-	XVisualInfo vis;
 
+	if (!(xw.dpy = XOpenDisplay(NULL)))
+		die("can't open display\n");
 	xw.scr = XDefaultScreen(xw.dpy);
-
-	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0)))) {
-		parent = XRootWindow(xw.dpy, xw.scr);
-		xw.depth = 32;
-	} else {
-		XGetWindowAttributes(xw.dpy, parent, &attr);
-		xw.depth = attr.depth;
-	}
-
-	XMatchVisualInfo(xw.dpy, xw.scr, xw.depth, TrueColor, &vis);
-	xw.vis = vis.visual;
+	xw.vis = XDefaultVisual(xw.dpy, xw.scr);
 
 	/* font */
 	if (!FcInit())
@@ -1292,16 +1147,13 @@ xinit(int cols, int rows)
 	usedfont = (opt_font == NULL)? font : opt_font;
 	xloadfonts(usedfont, 0);
 
-	/* spare fonts */
-	xloadsparefonts();
-
 	/* colors */
-	xw.cmap = XCreateColormap(xw.dpy, parent, xw.vis, None);
+	xw.cmap = XDefaultColormap(xw.dpy, xw.scr);
 	xloadcols();
 
 	/* adjust fixed window geometry */
-	win.w = 2 * win.hborderpx + 2 * borderpx + cols * win.cw;
-	win.h = 2 * win.vborderpx + 2 * borderpx + rows * win.ch;
+	win.w = 2 * borderpx + cols * win.cw;
+	win.h = 2 * borderpx + rows * win.ch;
 	if (xw.gm & XNegative)
 		xw.l += DisplayWidth(xw.dpy, xw.scr) - win.w - 2;
 	if (xw.gm & YNegative)
@@ -1316,15 +1168,19 @@ xinit(int cols, int rows)
 		| ButtonMotionMask | ButtonPressMask | ButtonReleaseMask;
 	xw.attrs.colormap = xw.cmap;
 
+	if (!(opt_embed && (parent = strtol(opt_embed, NULL, 0))))
+		parent = XRootWindow(xw.dpy, xw.scr);
 	xw.win = XCreateWindow(xw.dpy, parent, xw.l, xw.t,
-			win.w, win.h, 0, xw.depth, InputOutput,
+			win.w, win.h, 0, XDefaultDepth(xw.dpy, xw.scr), InputOutput,
 			xw.vis, CWBackPixel | CWBorderPixel | CWBitGravity
 			| CWEventMask | CWColormap, &xw.attrs);
 
 	memset(&gcvalues, 0, sizeof(gcvalues));
 	gcvalues.graphics_exposures = False;
-	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h, xw.depth);
-	dc.gc = XCreateGC(xw.dpy, xw.buf, GCGraphicsExposures, &gcvalues);
+	dc.gc = XCreateGC(xw.dpy, parent, GCGraphicsExposures,
+			&gcvalues);
+	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
+			DefaultDepth(xw.dpy, xw.scr));
 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
 
@@ -1341,9 +1197,8 @@ xinit(int cols, int rows)
 	}
 
 	/* white cursor, black outline */
-	xw.pointerisvisible = 1;
-	xw.vpointer = XCreateFontCursor(xw.dpy, mouseshape);
-	XDefineCursor(xw.dpy, xw.win, xw.vpointer);
+	cursor = XCreateFontCursor(xw.dpy, mouseshape);
+	XDefineCursor(xw.dpy, xw.win, cursor);
 
 	if (XParseColor(xw.dpy, xw.cmap, colorname[mousefg], &xmousefg) == 0) {
 		xmousefg.red   = 0xffff;
@@ -1357,10 +1212,7 @@ xinit(int cols, int rows)
 		xmousebg.blue  = 0x0000;
 	}
 
-	XRecolorCursor(xw.dpy, xw.vpointer, &xmousefg, &xmousebg);
-        blankpm = XCreateBitmapFromData(xw.dpy, xw.win, &(char){0}, 1, 1);
-        xw.bpointer = XCreatePixmapCursor(xw.dpy, blankpm, blankpm,
-            &xmousefg, &mousebg, 0, 0);
+	XRecolorCursor(xw.dpy, cursor, &xmousefg, &xmousebg);
 
 	xw.xembed = XInternAtom(xw.dpy, "_XEMBED", False);
 	xw.wmdeletewin = XInternAtom(xw.dpy, "WM_DELETE_WINDOW", False);
@@ -1368,10 +1220,6 @@ xinit(int cols, int rows)
 	xw.netwmiconname = XInternAtom(xw.dpy, "_NET_WM_ICON_NAME", False);
 	XSetWMProtocols(xw.dpy, xw.win, &xw.wmdeletewin, 1);
 
-        xw.netwmicon = XInternAtom(xw.dpy, "_NET_WM_ICON", False);
-        XChangeProperty(xw.dpy, xw.win, xw.netwmicon, XA_CARDINAL, 32,
-            PropModeReplace, (uchar *)&icon, LEN(icon));
-
 	xw.netwmpid = XInternAtom(xw.dpy, "_NET_WM_PID", False);
 	XChangeProperty(xw.dpy, xw.win, xw.netwmpid, XA_CARDINAL, 32,
 			PropModeReplace, (uchar *)&thispid, 1);
@@ -1394,7 +1242,7 @@ xinit(int cols, int rows)
 int
 xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x, int y)
 {
-	float winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch, xp, yp;
+	float winx = borderpx + x * win.cw, winy = borderpx + y * win.ch, xp, yp;
 	ushort mode, prevmode = USHRT_MAX;
 	Font *font = &dc.font;
 	int frcflags = FRC_NORMAL;
@@ -1407,13 +1255,13 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 	FcCharSet *fccharset;
 	int i, f, numspecs = 0;
 
-	for (i = 0, xp = winx, yp = winy + font->ascent + win.cyo; i < len; ++i) {
+	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;
 
 		/* Skip dummy wide-character spacing. */
-		if (mode & ATTR_WDUMMY)
+		if (mode == ATTR_WDUMMY)
 			continue;
 
 		/* Determine font for glyph if different from previous glyph. */
@@ -1432,7 +1280,7 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 				font = &dc.bfont;
 				frcflags = FRC_BOLD;
 			}
-			yp = winy + font->ascent + win.cyo;
+			yp = winy + font->ascent;
 		}
 
 		/* Lookup character index with default font. */
@@ -1520,9 +1368,6 @@ xmakeglyphfontspecs(XftGlyphFontSpec *specs, const Glyph *glyphs, int len, int x
 		numspecs++;
 	}
 
-	/* Harfbuzz transformation for ligatures. */
-	hbtransform(specs, glyphs, len, x, y);
-
 	return numspecs;
 }
 
@@ -1530,7 +1375,7 @@ void
 xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, int y)
 {
 	int charlen = len * ((base.mode & ATTR_WIDE) ? 2 : 1);
-	int winx = win.hborderpx + x * win.cw, winy = win.vborderpx + y * win.ch,
+	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;
@@ -1620,17 +1465,17 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
 
 	/* Intelligent cleaning up of the borders. */
 	if (x == 0) {
-		xclear(0, (y == 0)? 0 : winy, win.vborderpx,
+		xclear(0, (y == 0)? 0 : winy, borderpx,
 			winy + win.ch +
-			((winy + win.ch >= win.vborderpx + win.th)? win.h : 0));
+			((winy + win.ch >= borderpx + win.th)? win.h : 0));
 	}
-	if (winx + width >= win.hborderpx + win.tw) {
+	if (winx + width >= borderpx + win.tw) {
 		xclear(winx + width, (y == 0)? 0 : winy, win.w,
-			((winy + win.ch >= win.vborderpx + win.th)? win.h : (winy + win.ch)));
+			((winy + win.ch >= borderpx + win.th)? win.h : (winy + win.ch)));
 	}
 	if (y == 0)
-		xclear(winx, 0, winx + width, win.vborderpx);
-	if (winy + win.ch >= win.vborderpx + win.th)
+		xclear(winx, 0, winx + width, borderpx);
+	if (winy + win.ch >= borderpx + win.th)
 		xclear(winx, winy + win.ch, winx + width, win.h);
 
 	/* Clean up the region we want to draw to. */
@@ -1648,12 +1493,12 @@ xdrawglyphfontspecs(const XftGlyphFontSpec *specs, Glyph base, int len, int x, i
 
 	/* Render underline and strikethrough. */
 	if (base.mode & ATTR_UNDERLINE) {
-		XftDrawRect(xw.draw, fg, winx, winy + win.cyo + dc.font.ascent + 1,
+		XftDrawRect(xw.draw, fg, winx, winy + dc.font.ascent * chscale + 1,
 				width, 1);
 	}
 
 	if (base.mode & ATTR_STRUCK) {
-		XftDrawRect(xw.draw, fg, winx, winy + win.cyo + 2 * dc.font.ascent / 3,
+		XftDrawRect(xw.draw, fg, winx, winy + 2 * dc.font.ascent * chscale / 3,
 				width, 1);
 	}
 
@@ -1672,17 +1517,14 @@ xdrawglyph(Glyph g, int x, int 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;
@@ -1727,35 +1569,35 @@ xdrawcursor(int cx, int cy, Glyph g, int ox, int oy, Glyph og, Line line, int le
 		case 3: /* Blinking Underline */
 		case 4: /* Steady Underline */
 			XftDrawRect(xw.draw, &drawcol,
-					win.hborderpx + cx * win.cw,
-					win.vborderpx + (cy + 1) * win.ch - \
+					borderpx + cx * win.cw,
+					borderpx + (cy + 1) * win.ch - \
 						cursorthickness,
 					win.cw, cursorthickness);
 			break;
 		case 5: /* Blinking bar */
 		case 6: /* Steady bar */
 			XftDrawRect(xw.draw, &drawcol,
-					win.hborderpx + cx * win.cw,
-					win.vborderpx + cy * win.ch,
+					borderpx + cx * win.cw,
+					borderpx + cy * win.ch,
 					cursorthickness, win.ch);
 			break;
 		}
 	} else {
 		XftDrawRect(xw.draw, &drawcol,
-				win.hborderpx + cx * win.cw,
-				win.vborderpx + cy * win.ch,
+				borderpx + cx * win.cw,
+				borderpx + cy * win.ch,
 				win.cw - 1, 1);
 		XftDrawRect(xw.draw, &drawcol,
-				win.hborderpx + cx * win.cw,
-				win.vborderpx + cy * win.ch,
+				borderpx + cx * win.cw,
+				borderpx + cy * win.ch,
 				1, win.ch - 1);
 		XftDrawRect(xw.draw, &drawcol,
-				win.hborderpx + (cx + 1) * win.cw - 1,
-				win.vborderpx + cy * win.ch,
+				borderpx + (cx + 1) * win.cw - 1,
+				borderpx + cy * win.ch,
 				1, win.ch - 1);
 		XftDrawRect(xw.draw, &drawcol,
-				win.hborderpx + cx * win.cw,
-				win.vborderpx + (cy + 1) * win.ch - 1,
+				borderpx + cx * win.cw,
+				borderpx + (cy + 1) * win.ch - 1,
 				win.cw, 1);
 	}
 }
@@ -1783,51 +1625,23 @@ xseticontitle(char *p)
 	XFree(prop.value);
 }
 
-void xfreetitlestack(void)
-{
-  for (int i = 0; i < LEN(titlestack); i++) {
-    free(titlestack[i]);
-    titlestack[i] = NULL;
-  }
-}
-
 void
-xsettitle(char *p, int pop)
+xsettitle(char *p)
 {
 	XTextProperty prop;
+	DEFAULT(p, opt_title);
 
-        free(titlestack[tstki]);
-        if (pop) {
-          titlestack[tstki] = NULL;
-          tstki = (tstki - 1 + TITLESTACKSIZE) % TITLESTACKSIZE;
-          p = titlestack[tstki] ? titlestack[tstki] : opt_title;
-        } else if (p) {
-          titlestack[tstki] = xstrdup(p);
-        } else {
-          titlestack[tstki] = NULL;
-          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);
 }
 
-void
-xpushtitle(void)
-{
-  int tstkin = (tstki + 1) % TITLESTACKSIZE;
-  free(titlestack[tstkin]);
-  titlestack[tstkin] = titlestack[tstki] ? xstrdup(titlestack[tstki]) : NULL;
-  tstki = tstkin;
-}
-
 int
 xstartdraw(void)
 {
-        if (IS_SET(MODE_VISIBLE))
-          XCopyArea(xw.dpy, xw.win, xw.buf, dc.gc, 0, 0, win.w, win.h, 0, 0);
 	return IS_SET(MODE_VISIBLE);
 }
 
@@ -1907,8 +1721,6 @@ unmap(XEvent *ev)
 void
 xsetpointermotion(int set)
 {
-	if (!set && !xw.pointerisvisible)
-		return;
 	MODBIT(xw.attrs.event_mask, set, PointerMotionMask);
 	XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
 }
@@ -2028,12 +1840,6 @@ kpress(XEvent *ev)
 	Status status;
 	Shortcut *bp;
 
-	if (xw.pointerisvisible) {
-		XDefineCursor(xw.dpy, xw.win, xw.bpointer);
-		xsetpointermotion(1);
-		xw.pointerisvisible = 0;
-	}
-
 	if (IS_SET(MODE_KBDLOCK))
 		return;
 
@@ -2205,59 +2011,6 @@ run(void)
 	}
 }
 
-int
-resource_load(XrmDatabase db, char *name, enum resource_type rtype, void *dst)
-{
-	char **sdst = dst;
-	int *idst = dst;
-	float *fdst = dst;
-
-	char fullname[256];
-	char fullclass[256];
-	char *type;
-	XrmValue ret;
-
-	snprintf(fullname, sizeof(fullname), "%s.%s",
-			opt_name ? opt_name : "st", name);
-	snprintf(fullclass, sizeof(fullclass), "%s.%s",
-			opt_class ? opt_class : "St", name);
-	fullname[sizeof(fullname) - 1] = fullclass[sizeof(fullclass) - 1] = '\0';
-
-	XrmGetResource(db, fullname, fullclass, &type, &ret);
-	if (ret.addr == NULL || strncmp("String", type, 64))
-		return 1;
-
-	switch (rtype) {
-	case STRING:
-		*sdst = ret.addr;
-		break;
-	case INTEGER:
-		*idst = strtoul(ret.addr, NULL, 10);
-		break;
-	case FLOAT:
-		*fdst = strtof(ret.addr, NULL);
-		break;
-	}
-	return 0;
-}
-
-void
-config_init(void)
-{
-	char *resm;
-	XrmDatabase db;
-	ResourcePref *p;
-
-	XrmInitialize();
-	resm = XResourceManagerString(xw.dpy);
-	if (!resm)
-		return;
-
-	db = XrmGetStringDatabase(resm);
-	for (p = resources; p < resources + LEN(resources); p++)
-		resource_load(db, p->name, p->type, p->dst);
-}
-
 void
 usage(void)
 {
@@ -2282,9 +2035,6 @@ main(int argc, char *argv[])
 	case 'a':
 		allowaltscreen = 0;
 		break;
-	case 'A':
-		opt_alpha = EARGF(usage());
-		break;
 	case 'c':
 		opt_class = EARGF(usage());
 		break;
@@ -2334,11 +2084,6 @@ run:
 
 	setlocale(LC_CTYPE, "");
 	XSetLocaleModifiers("");
-
-	if(!(xw.dpy = XOpenDisplay(NULL)))
-		die("Can't open display\n");
-
-	config_init();
 	cols = MAX(cols, 1);
 	rows = MAX(rows, 1);
 	tnew(cols, rows);