software moving

2025-12-16 07:26:12 +01:00 · 2023-09-18 22:31:25 +02:00
parent 0a3a7b1d15
commit 3ed54811f1
121 changed files with 8 additions and 20439 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,11 @@
 [submodule "desktop/.dwm"]
 	path = desktop/.dwm
 	url = https://github.com/eRgo35/dwm
+
+[submodule "desktop/.dmenu"]
+	path = desktop/.dmenu
+	url = https://github.com/eRgo35/dmenu
+
+[submodule "desktop/.st"]
+	path = desktop/.st
+	url = https://github.com/eRgo35/st
--- a/desktop/.dmenu/.gitignore
+++ b/desktop/.dmenu/.gitignore
@@ -1,5 +0,0 @@
-*.o
-config.h
-patches.h
-dmenu
-stest
--- a/desktop/.dmenu/LICENSE
+++ b/desktop/.dmenu/LICENSE
@@ -1,30 +0,0 @@
-MIT/X Consortium License
-
-© 2006-2019 Anselm R Garbe <anselm@garbe.ca>
-© 2006-2008 Sander van Dijk <a.h.vandijk@gmail.com>
-© 2006-2007 Michał Janeczek <janeczek@gmail.com>
-© 2007 Kris Maglione <jg@suckless.org>
-© 2009 Gottox <gottox@s01.de>
-© 2009 Markus Schnalke <meillo@marmaro.de>
-© 2009 Evan Gates <evan.gates@gmail.com>
-© 2010-2012 Connor Lane Smith <cls@lubutu.com>
-© 2014-2022 Hiltjo Posthuma <hiltjo@codemadness.org>
-© 2015-2019 Quentin Rameau <quinq@fifth.space>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--- a/desktop/.dmenu/Makefile
+++ b/desktop/.dmenu/Makefile
@@ -1,67 +0,0 @@
-# dmenu - dynamic menu
-# See LICENSE file for copyright and license details.
-
-include config.mk
-
-SRC = drw.c dmenu.c stest.c util.c
-OBJ = $(SRC:.c=.o)
-
-all: options dmenu stest
-
-options:
-	@echo dmenu build options:
-	@echo "CFLAGS   = $(CFLAGS)"
-	@echo "LDFLAGS  = $(LDFLAGS)"
-	@echo "CC       = $(CC)"
-
-.c.o:
-	$(CC) -c $(CFLAGS) $<
-
-config.h:
-	cp config.def.h $@
-
-patches.h:
-	cp patches.def.h $@
-
-$(OBJ): arg.h config.h config.mk drw.h patches.h
-
-dmenu: dmenu.o drw.o util.o
-	$(CC) -o $@ dmenu.o drw.o util.o $(LDFLAGS)
-
-stest: stest.o
-	$(CC) -o $@ stest.o $(LDFLAGS)
-
-clean:
-	rm -f dmenu stest $(OBJ) dmenu-$(VERSION).tar.gz
-
-dist: clean
-	mkdir -p dmenu-$(VERSION)
-	cp LICENSE Makefile README arg.h config.def.h config.mk dmenu.1\
-		drw.h util.h dmenu_path dmenu_run stest.1 $(SRC)\
-		dmenu-$(VERSION)
-	tar -cf dmenu-$(VERSION).tar dmenu-$(VERSION)
-	gzip dmenu-$(VERSION).tar
-	rm -rf dmenu-$(VERSION)
-
-install: all
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f dmenu dmenu_path dmenu_run stest $(DESTDIR)$(PREFIX)/bin
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_path
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/dmenu_run
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/stest
-	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-	sed "s/VERSION/$(VERSION)/g" < dmenu.1 > $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
-	sed "s/VERSION/$(VERSION)/g" < stest.1 > $(DESTDIR)$(MANPREFIX)/man1/stest.1
-	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/dmenu.1
-	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/stest.1
-
-uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/dmenu\
-		$(DESTDIR)$(PREFIX)/bin/dmenu_path\
-		$(DESTDIR)$(PREFIX)/bin/dmenu_run\
-		$(DESTDIR)$(PREFIX)/bin/stest\
-		$(DESTDIR)$(MANPREFIX)/man1/dmenu.1\
-		$(DESTDIR)$(MANPREFIX)/man1/stest.1
-
-.PHONY: all options clean dist install uninstall
--- a/desktop/.dmenu/README
+++ b/desktop/.dmenu/README
@@ -1,24 +0,0 @@
-dmenu - dynamic menu
-====================
-dmenu is an efficient dynamic menu for X.
-
-
-Requirements
------------
-In order to build dmenu you need the Xlib header files.
-
-
-Installation
------------
-Edit config.mk to match your local setup (dmenu is installed into
-the /usr/local namespace by default).
-
-Afterwards enter the following command to build and install dmenu
-(if necessary as root):
-
-    make clean install
-
-
-Running dmenu
-------------
-See the man page for details.
--- a/desktop/.dmenu/README.md
+++ b/desktop/.dmenu/README.md
@@ -1,260 +0,0 @@
-Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this dmenu 5.2 (e42c036,
-2022-10-26) project has a different take on patching. It uses preprocessor directives to decide
-whether or not to include a patch during build time. Essentially this means that this build, for
-better or worse, contains both the patched _and_ the original code. The aim being that you can
-select which patches to include and the build will contain that code and nothing more.
-
-For example to include the `alpha` patch then you would only need to flip this setting from 0
-to 1 in [patches.h](https://github.com/bakkeby/dmenu-flexipatch/blob/master/patches.def.h):
-```c
-#define ALPHA_PATCH 1
-```
-
-Once you have found out what works for you and what doesn't then you should be in a better position
-to choose patches should you want to start patching from scratch.
-
-Alternatively if you have found the patches you want, but don't want the rest of the flexipatch
-entanglement on your plate then you may want to have a look at
-[flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer); a custom pre-processor
-tool that removes all the unused flexipatch code leaving you with a build that contains the patches
-you selected.
-
-Refer to [https://tools.suckless.org/dmenu/](https://tools.suckless.org/dmenu/) for details on
-dmenu, how to install it and how it works.
-
-Browsing patches? There is a [map of patches](https://coggle.it/diagram/YjT2DD6jBM9dayf3) diagram which tries to organise patches into categories.
-
---
-
-### Changelog:
-
-2022-09-05 - Removed the json patch due to maintenance and compatibility reasons, added the
-             separator patch
-
-2022-09-04 - Added the fzfexpect patch
-
-2022-06-21 - Adding barpadding patch and relative input width patch
-
-2022-03-02 - Bump to 5.1
-
-2021-05-23 - Adding support for `ctrl+v` to paste and adding emoji-highlight patch
-
-2021-05-17 - Added the restrict return, no sort, gridnav and plain-prompt (listfullwidth) patches
-
-2021-05-15 - Added the tsv and printindex patches
-
-2020-08-08 - Added the json, symbols, managed, morecolor, multi-selection and preselect patches
-
-2020-08-05 - Added the grid, highlight, highpriority, dynamic options and numbers patches
-
-2020-06-13 - Added the pango patch
-
-2020-06-10 - Added the case-insensitive patch
-
-2020-05-29 - Added the alpha patch (derived from Baitinq's [build](https://github.com/Baitinq/dmenu))
-             and the color emoji patch
-
-2020-04-05 - Added fuzzyhighlight patch
-
-2020-02-09 - Added revised border patch (adding command line parameter for setting border width)
-
-2019-12-29 - Added xresources patch
-
-2019-10-16 - Introduced [flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer)
-
-2019-09-18 - Added border, center, fuzzymatch, incremental, initialtext, instant, line-height,
-             mouse-support, navhistory, non-blocking-stdin, password, pipeout, printinputtext,
-             rejectnomatch, scroll, vertfull, wmtype and xyw patches
-
-### Patches included:
-
-   - [alpha](https://github.com/bakkeby/patches/blob/master/dmenu/dmenu-alpha-5.0_20210725_523aa08.diff)
-      - adds transparency for the dmenu window
-
-   - [barpadding](https://github.com/bakkeby/patches/wiki/barpadding)
-      - adds padding for dmenu in similar fashion to the [barpadding](https://dwm.suckless.org/patches/barpadding/)
-        patch for dwm
-
-   - [border](http://tools.suckless.org/dmenu/patches/border/)
-      - adds a border around the dmenu window
-
-   - [case-insensitive](http://tools.suckless.org/dmenu/patches/case-insensitive/)
-      - makes dmenu case-insensitive by default, replacing the case-insensitive `-i` option with a
-        case sensitive `-s` option
-
-   - [center](https://tools.suckless.org/dmenu/patches/center/)
-      - this patch centers dmenu in the middle of the screen
-
-   - color_emoji
-      - enables color emoji in dmenu by removing a workaround for a BadLength error in the Xft
-        library when color glyphs are used
-      - enabling this will crash dmenu on encountering such glyphs unless you also have an updated
-        Xft library that can handle them
-
-   - [dynamic_options](https://tools.suckless.org/dmenu/patches/dynamicoptions/)
-      - adds a flag (`-dy`) which makes dmenu run the command given to it whenever input is changed
-        with the current input as the last argument and update the option list according to the
-        output of that command
-
-   - [emoji-highlight](https://tools.suckless.org/dmenu/patches/emoji-highlight/)
-      - this patch will allow for emojis on the left side with a colored background when selected
-
-   - [fuzzyhighlight](https://tools.suckless.org/dmenu/patches/fuzzyhighlight/)
-      - intended to be combined with the fuzzymatch patch, this makes it so that fuzzy matches are
-        highlighted
-
-   - [fuzzymatch](https://tools.suckless.org/dmenu/patches/fuzzymatch/)
-      - adds support for fuzzy-matching to dmenu, allowing users to type non-consecutive portions
-        of the string to be matched
-
-   - [fzfexpect](https://github.com/DAFF0D11/dafmenu/blob/master/patches/dmenu-fzfexpect-5.1.diff)
-      - adds fzf expect functionality in dmenu
-
-   - [grid](https://tools.suckless.org/dmenu/patches/grid/)
-      - allows dmenu's entries to be rendered in a grid by adding a new `-g` flag to specify the
-        number of grid columns
-      - the `-g` and `-l` options can be used together to create a G columns * L lines grid
-
-   - [gridnav](https://tools.suckless.org/dmenu/patches/gridnav/)
-      - adds the ability to move left and right through a grid (when using the grid patch)
-
-   - [highlight](https://tools.suckless.org/dmenu/patches/highlight/)
-      - this patch highlights the individual characters of matched text for each dmenu list entry
-
-   - [highpriority](https://tools.suckless.org/dmenu/patches/highpriority/)
-      - this patch will automatically sort the search result so that high priority items are shown
-        first
-
-   - [incremental](https://tools.suckless.org/dmenu/patches/incremental/)
-      - this patch causes dmenu to print out the current text each time a key is pressed
-
-   - [initialtext](https://tools.suckless.org/dmenu/patches/initialtext/)
-      - adds an option to provide preselected text
-
-   - [instant](https://tools.suckless.org/dmenu/patches/instant/)
-      - adds a flag that will cause dmenu to select an item immediately if there is only one
-        matching option left
-
-   - [~json~](https://tools.suckless.org/dmenu/patches/json/)
-      - ~adds basic support for json files~
-
-   - [line-height](http://tools.suckless.org/dmenu/patches/line-height/)
-      - adds a `-h` option which sets the minimum height of a dmenu line
-      - this helps integrate dmenu with other UI elements that require a particular vertical size
-
-   - [managed](https://tools.suckless.org/dmenu/patches/managed/)
-      - adds a `-wm` flag which sets override_redirect to false; thus letting your window manager
-        manage the dmenu window
-      - this may be helpful in contexts where you don't want to exclusively bind dmenu or want to
-        treat dmenu more as a "window" rather than as an overlay
-
-   - [morecolor](https://tools.suckless.org/dmenu/patches/morecolor/)
-      - adds an additional color scheme for highlighting entries adjacent to the current selection
-
-   - [mouse-support](https://tools.suckless.org/dmenu/patches/mouse-support/)
-      - adds basic mouse support for dmenu
-
-   - [multi-selection](https://tools.suckless.org/dmenu/patches/multi-selection/)
-      - without this patch when you press `Ctrl+Enter` dmenu just outputs current item and it is
-        not possible to undo that
-      - with this patch dmenu will output all selected items only on exit
-      - it is also possible to deselect any selected item
-
-   - [navhistory](https://tools.suckless.org/dmenu/patches/navhistory/)
-      - provides dmenu the ability for history navigation similar to that of bash
-
-   - [no-sort](https://tools.suckless.org/dmenu/patches/no-sort/)
-      - adds the `-S` option to disable sorting menu items after matching
-      - useful, for example, when menu items are sorted by their frequency of use (using an
-        external cache) and the most frequently selected items should always appear first regardless
-        of how they were exact, prefix, or substring matches
-
-   - [non-blocking-stdin](https://tools.suckless.org/dmenu/patches/non_blocking_stdin/)
-      - this is a patch to have dmenu read stdin in a non blocking way, making it wait for input
-        both from stdin and from X
-      - this means that you can continue feeding dmenu while you type
-      - the patch is meant to be used along with the incremental patch in order to use stdout to
-        feed stdin
-
-   - [numbers](https://tools.suckless.org/dmenu/patches/numbers/)
-      - adds text which displays the number of matched and total items in the top right corner of
-        dmenu
-
-   - [pango](https://github.com/StillANixRookie/dmenu-pango/)
-      - adds simple markup for dmenu using pango markup
-
-   - [password](https://tools.suckless.org/dmenu/patches/password/)
-      - with this patch dmenu will not directly display the keyboard input, but instead replace it
-        with dots
-      - all data from stdin will be ignored
-
-   - [pipeout](https://tools.suckless.org/dmenu/patches/pipeout/)
-      - this patch allows the selected text to be piped back out with dmenu
-      - this can be useful if you want to display the output of a command on the screen
-
-   - [plain-prompt](https://tools.suckless.org/dmenu/patches/listfullwidth/)
-      - simple change that avoids colors for the prompt by making it use the same style as the
-        rest of the input field
-
-   - [prefix-completion](https://tools.suckless.org/dmenu/patches/prefix-completion/)
-      - changes the behaviour of matched items and the Tab key to allow tab completion
-
-   - [preselect](https://tools.suckless.org/dmenu/patches/preselect/)
-      - adds an option `-ps` to preselect an item by providing the index that should be pre-selected
-
-   - [printindex](https://tools.suckless.org/dmenu/patches/printindex/)
-      - allows dmenu to print out the 0-based index of matched text instead of the matched text
-        itself
-      - this can be useful in cases where you would like to select entries from one array of text
-        but index into another, or when you are selecting from an ordered list of non-unique items
-
-   - [printinputtext](https://tools.suckless.org/dmenu/patches/printinputtext/)
-      - this patch adds a flag `-t` which makes Return key ignore selection and print the input
-        text to stdout
-      - the flag basically swaps the functions of Return and Shift+Return hotkeys
-
-   - [rejectnomatch](https://tools.suckless.org/dmenu/patches/reject-no-match/)
-      - adds a new flag to dmenu with which text input will be rejected if it would result in no
-        matching item
-
-   - relative_input_width
-      - prior to commit [e1e1de7](https://git.suckless.org/dmenu/commit/e1e1de7b3b8399cba90ddca9613f837b2dbef7b9.html)
-        the input width was calculated based on the input options
-      - this feature was removed in favour of hardcoding the input width to always take up 1/3rd of
-        the available space
-      - this patch adds that feature back in with some bespoke performance optimisations at the cost
-        of accuracy and correctness
-
-   - [restrict-return](https://tools.suckless.org/dmenu/patches/restrict-return/)
-      - adds a `-1` option which disables Shift-Return and Ctrl-Return
-      - this guarantees that dmenu will only output one item, and that item was read from stdin
-
-   - [scroll](https://tools.suckless.org/dmenu/patches/scroll/)
-      - this patch adds support for text scrolling
-      - it doesn't append `...` for long input anymore as it can handle long text
-
-   - [separator](https://tools.suckless.org/dmenu/patches/separator/)
-      - adds `-d` and `-D` flags which separates the input into two halves; one half to be
-        displayed in dmenu and the other to be printed to stdout
-
-   - [symbols](https://tools.suckless.org/dmenu/patches/symbols/)
-      - allows the symbols, which are printed in dmenu to indicate that either the input is too
-        long or there are too many options to be shown in dmenu in one line, to be defined
-
-   - [tsv](https://tools.suckless.org/dmenu/patches/tsv/)
-      - makes dmenu split input lines at first tab character and only display first part, but it
-        will perform matching on and output full lines as usual
-      - can be useful if you want to separate data and representation
-
-   - [vertfull](https://tools.suckless.org/dmenu/patches/vertfull/)
-      - prevents dmenu from indenting items at the same level as the prompt length
-
-   - [wmtype](https://github.com/Baitinq/dmenu/blob/master/patches/dmenu-wm_type.diff)
-      - adds extended window manager hints such as \_NET_WM_WINDOW_TYPE and \_NET_WM_WINDOW_TYPE_DOCK
-
-   - [xresources](https://tools.suckless.org/dmenu/patches/xresources/)
-      - allows dmenu to read font and colors from Xresources
-      - note that with this patch the Xresources settings takes precedence over command line arguments
-
-   - [xyw](https://tools.suckless.org/dmenu/patches/xyw/)
-      - adds options for specifying dmenu window position and width
--- a/desktop/.dmenu/arg.h
+++ b/desktop/.dmenu/arg.h
@@ -1,49 +0,0 @@
-/*
- * Copy me if you can.
- * by 20h
- */
-
-#ifndef ARG_H__
-#define ARG_H__
-
-extern char *argv0;
-
-/* use main(int argc, char *argv[]) */
-#define ARGBEGIN	for (argv0 = *argv, argv++, argc--;\
-					argv[0] && argv[0][0] == '-'\
-					&& argv[0][1];\
-					argc--, argv++) {\
-				char argc_;\
-				char **argv_;\
-				int brk_;\
-				if (argv[0][1] == '-' && argv[0][2] == '\0') {\
-					argv++;\
-					argc--;\
-					break;\
-				}\
-				for (brk_ = 0, argv[0]++, argv_ = argv;\
-						argv[0][0] && !brk_;\
-						argv[0]++) {\
-					if (argv_ != argv)\
-						break;\
-					argc_ = argv[0][0];\
-					switch (argc_)
-
-#define ARGEND			}\
-			}
-
-#define ARGC()		argc_
-
-#define EARGF(x)	((argv[0][1] == '\0' && argv[1] == NULL)?\
-				((x), abort(), (char *)0) :\
-				(brk_ = 1, (argv[0][1] != '\0')?\
-					(&argv[0][1]) :\
-					(argc--, argv++, argv[0])))
-
-#define ARGF()		((argv[0][1] == '\0' && argv[1] == NULL)?\
-				(char *)0 :\
-				(brk_ = 1, (argv[0][1] != '\0')?\
-					(&argv[0][1]) :\
-					(argc--, argv++, argv[0])))
-
-#endif
--- a/desktop/.dmenu/config.def.h
+++ b/desktop/.dmenu/config.def.h
@@ -1,151 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-/* Default settings; can be overriden by command line. */
-
-static int topbar = 1;                      /* -b  option; if 0, dmenu appears at bottom */
-#if ALPHA_PATCH
-static int opacity = 1;                     /* -o  option; if 0, then alpha is disabled */
-#endif // ALPHA_PATCH
-#if FUZZYMATCH_PATCH
-static int fuzzy = 1;                       /* -F  option; if 0, dmenu doesn't use fuzzy matching */
-#endif // FUZZYMATCH_PATCH
-#if INCREMENTAL_PATCH
-static int incremental = 0;                 /* -r  option; if 1, outputs text each time a key is pressed */
-#endif // INCREMENTAL_PATCH
-#if INSTANT_PATCH
-static int instant = 0;                     /* -n  option; if 1, selects matching item without the need to press enter */
-#endif // INSTANT_PATCH
-#if CENTER_PATCH
-static int center = 1;                      /* -c  option; if 0, dmenu won't be centered on the screen */
-static int min_width = 500;                 /* minimum width when centered */
-#endif // CENTER_PATCH
-#if BARPADDING_PATCH
-static const int vertpad = 10;              /* vertical padding of bar */
-static const int sidepad = 30;              /* horizontal padding of bar */
-#endif // BARPADDING_PATCH
-#if RESTRICT_RETURN_PATCH
-static int restrict_return = 0;             /* -1 option; if 1, disables shift-return and ctrl-return */
-#endif // RESTRICT_RETURN_PATCH
-/* -fn option overrides fonts[0]; default X11 font or font set */
-#if PANGO_PATCH
-static char font[] = "monospace 10";
-#else
-#if XRESOURCES_PATCH
-static char *fonts[] =
-#else
-static const char *fonts[] =
-#endif // XRESOURCES_PATCH
-{
-	"SauceCodePro Nerd Font Mono:size=11:antialias=true"
-	"monospace:size=10"
-};
-#endif // PANGO_PATCH
-#if MANAGED_PATCH
-static char *prompt            = NULL;      /* -p  option; prompt to the left of input field */
-#else
-static const char *prompt      = NULL;      /* -p  option; prompt to the left of input field */
-#endif // MANAGED_PATCH
-#if DYNAMIC_OPTIONS_PATCH
-static const char *dynamic     = NULL;      /* -dy option; dynamic command to run on input change */
-#endif // DYNAMIC_OPTIONS_PATCH
-#if SYMBOLS_PATCH
-static const char *symbol_1 = "<";
-static const char *symbol_2 = ">";
-#endif // SYMBOLS_PATCH
-
-#if ALPHA_PATCH
-static const unsigned int baralpha = 0xd0;
-static const unsigned int borderalpha = OPAQUE;
-static const unsigned int alphas[][3]      = {
-	/*               fg      bg        border     */
-	[SchemeNorm] = { OPAQUE, baralpha, borderalpha },
-	[SchemeSel]  = { OPAQUE, baralpha, borderalpha },
-	#if BORDER_PATCH
-	[SchemeBorder] = { OPAQUE, OPAQUE, OPAQUE },
-	#endif // BORDER_PATCH
-	#if MORECOLOR_PATCH
-	[SchemeMid] = { OPAQUE, baralpha, borderalpha },
-	#endif // MORECOLOR_PATCH
-	#if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH
-	[SchemeSelHighlight] = { OPAQUE, baralpha, borderalpha },
-	[SchemeNormHighlight] = { OPAQUE, baralpha, borderalpha },
-	#endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH
-	#if HIGHPRIORITY_PATCH
-	[SchemeHp] = { OPAQUE, baralpha, borderalpha },
-	#endif // HIGHPRIORITY_PATCH
-	#if EMOJI_HIGHLIGHT_PATCH
-	[SchemeHover] = { OPAQUE, baralpha, borderalpha },
-	[SchemeGreen] = { OPAQUE, baralpha, borderalpha },
-	[SchemeRed] = { OPAQUE, baralpha, borderalpha },
-	[SchemeYellow] = { OPAQUE, baralpha, borderalpha },
-	[SchemeBlue] = { OPAQUE, baralpha, borderalpha },
-	[SchemePurple] = { OPAQUE, baralpha, borderalpha },
-	#endif // EMOJI_HIGHLIGHT_PATCH
-};
-#endif // ALPHA_PATCH
-
-static
-#if !XRESOURCES_PATCH
-const
-#endif // XRESOURCES_PATCH
-char *colors[][2] = {
-	/*               fg         bg       */
-	[SchemeNorm] = { "#bbbbbb", "#222222" },
-	[SchemeSel]  = { "#eeeeee", "#005577" },
-	[SchemeOut]  = { "#000000", "#00ffff" },
-	#if BORDER_PATCH
-	[SchemeBorder] = { "#000000", "#005577" },
-	#endif // BORDER_PATCH
-	#if MORECOLOR_PATCH
-	[SchemeMid]  = { "#eeeeee", "#770000" },
-	#endif // MORECOLOR_PATCH
-	#if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH
-	[SchemeSelHighlight]  = { "#ffc978", "#005577" },
-	[SchemeNormHighlight] = { "#ffc978", "#222222" },
-	#endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH
-	#if HIGHPRIORITY_PATCH
-	[SchemeHp]   = { "#bbbbbb", "#333333" },
-	#endif // HIGHPRIORITY_PATCH
-	#if EMOJI_HIGHLIGHT_PATCH
-	[SchemeHover]  = { "#ffffff", "#353D4B" },
-	[SchemeGreen]  = { "#ffffff", "#52E067" },
-	[SchemeRed]    = { "#ffffff", "#e05252" },
-	[SchemeYellow] = { "#ffffff", "#e0c452" },
-	[SchemeBlue]   = { "#ffffff", "#5280e0" },
-	[SchemePurple] = { "#ffffff", "#9952e0" },
-	#endif // EMOJI_HIGHLIGHT_PATCH
-};
-/* -l option; if nonzero, dmenu uses vertical list with given number of lines */
-static unsigned int lines      = 0;
-#if GRID_PATCH
-/* -g option; if nonzero, dmenu uses a grid comprised of columns and lines */
-static unsigned int columns    = 0;
-#endif // GRID_PATCH
-#if LINE_HEIGHT_PATCH
-static unsigned int lineheight = 32;         /* -h option; minimum height of a menu line     */
-static unsigned int min_lineheight = 8;
-#endif // LINE_HEIGHT_PATCH
-#if NAVHISTORY_PATCH
-static unsigned int maxhist    = 15;
-static int histnodup           = 1;	/* if 0, record repeated histories */
-#endif // NAVHISTORY_PATCH
-
-/*
- * Characters not considered part of a word while deleting words
- * for example: " /?\"&[]"
- */
-#if PIPEOUT_PATCH
-static const char startpipe[] = "#";
-#endif // PIPEOUT_PATCH
-static const char worddelimiters[] = " ";
-
-#if BORDER_PATCH
-/* Size of the window border */
-static unsigned int border_width = 0;
-#endif // BORDER_PATCH
-
-#if PREFIXCOMPLETION_PATCH
-/*
- * Use prefix matching by default; can be inverted with the -x flag.
- */
-static int use_prefix = 1;
-#endif // PREFIXCOMPLETION_PATCH
--- a/desktop/.dmenu/config.mk
+++ b/desktop/.dmenu/config.mk
@@ -1,42 +0,0 @@
-# dmenu version
-VERSION = 5.2
-
-# paths
-PREFIX = /usr/local
-MANPREFIX = $(PREFIX)/share/man
-
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
-
-# Xinerama, comment if you don't want it
-XINERAMALIBS  = -lXinerama
-XINERAMAFLAGS = -DXINERAMA
-
-# freetype
-FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC = /usr/include/freetype2
-# OpenBSD (uncomment)
-#FREETYPEINC = $(X11INC)/freetype2
-#MANPREFIX = ${PREFIX}/man
-
-# uncomment on RHEL for strcasecmp
-#EXTRAFLAGS=-D_GNU_SOURCE
-
-# Uncomment this for the alpha patch / ALPHA_PATCH
-XRENDER = -lXrender
-
-# Uncomment for the pango patch / PANGO_PATCH
-#PANGOINC = `pkg-config --cflags xft pango pangoxft`
-#PANGOLIB = `pkg-config --libs xft pango pangoxft`
-
-# includes and libs
-INCS = -I$(X11INC) -I$(FREETYPEINC) ${PANGOINC}
-LIBS = -L$(X11LIB) -lX11 $(XINERAMALIBS) $(FREETYPELIBS) -lm $(XRENDER) ${PANGOLIB}
-
-# flags
-CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700 -D_POSIX_C_SOURCE=200809L -DVERSION=\"$(VERSION)\" $(XINERAMAFLAGS) $(EXTRAFLAGS)
-CFLAGS   = -std=c99 -pedantic -Wall -Os $(INCS) $(CPPFLAGS)
-LDFLAGS  = $(LIBS)
-
-# compiler and linker
-CC = cc
--- a/desktop/.dmenu/dmenu.1
+++ b/desktop/.dmenu/dmenu.1
@@ -1,194 +0,0 @@
-.TH DMENU 1 dmenu\-VERSION
-.SH NAME
-dmenu \- dynamic menu
-.SH SYNOPSIS
-.B dmenu
-.RB [ \-bfiv ]
-.RB [ \-l
-.IR lines ]
-.RB [ \-m
-.IR monitor ]
-.RB [ \-p
-.IR prompt ]
-.RB [ \-fn
-.IR font ]
-.RB [ \-nb
-.IR color ]
-.RB [ \-nf
-.IR color ]
-.RB [ \-sb
-.IR color ]
-.RB [ \-sf
-.IR color ]
-.RB [ \-w
-.IR windowid ]
-.P
-.BR dmenu_run " ..."
-.SH DESCRIPTION
-.B dmenu
-is a dynamic menu for X, which reads a list of newline\-separated items from
-stdin.  When the user selects an item and presses Return, their choice is printed
-to stdout and dmenu terminates.  Entering text will narrow the items to those
-matching the tokens in the input.
-.P
-.B dmenu_run
-is a script used by
-.IR dwm (1)
-which lists programs in the user's $PATH and runs the result in their $SHELL.
-.SH OPTIONS
-.TP
-.B \-b
-dmenu appears at the bottom of the screen.
-.TP
-.B \-f
-dmenu grabs the keyboard before reading stdin if not reading from a tty. This
-is faster, but will lock up X until stdin reaches end\-of\-file.
-.TP
-.B \-i
-dmenu matches menu items case insensitively.
-.TP
-.BI \-l " lines"
-dmenu lists items vertically, with the given number of lines.
-.TP
-.BI \-m " monitor"
-dmenu is displayed on the monitor number supplied. Monitor numbers are starting
-from 0.
-.TP
-.BI \-p " prompt"
-defines the prompt to be displayed to the left of the input field.
-.TP
-.BI \-fn " font"
-defines the font or font set used.
-.TP
-.BI \-nb " color"
-defines the normal background color.
-.IR #RGB ,
-.IR #RRGGBB ,
-and X color names are supported.
-.TP
-.BI \-nf " color"
-defines the normal foreground color.
-.TP
-.BI \-sb " color"
-defines the selected background color.
-.TP
-.BI \-sf " color"
-defines the selected foreground color.
-.TP
-.B \-v
-prints version information to stdout, then exits.
-.TP
-.BI \-w " windowid"
-embed into windowid.
-.SH USAGE
-dmenu is completely controlled by the keyboard.  Items are selected using the
-arrow keys, page up, page down, home, and end.
-.TP
-.B Tab
-Copy the selected item to the input field.
-.TP
-.B Return
-Confirm selection.  Prints the selected item to stdout and exits, returning
-success.
-.TP
-.B Ctrl-Return
-Confirm selection.  Prints the selected item to stdout and continues.
-.TP
-.B Shift\-Return
-Confirm input.  Prints the input text to stdout and exits, returning success.
-.TP
-.B Escape
-Exit without selecting an item, returning failure.
-.TP
-.B Ctrl-Left
-Move cursor to the start of the current word
-.TP
-.B Ctrl-Right
-Move cursor to the end of the current word
-.TP
-.B C\-a
-Home
-.TP
-.B C\-b
-Left
-.TP
-.B C\-c
-Escape
-.TP
-.B C\-d
-Delete
-.TP
-.B C\-e
-End
-.TP
-.B C\-f
-Right
-.TP
-.B C\-g
-Escape
-.TP
-.B C\-h
-Backspace
-.TP
-.B C\-i
-Tab
-.TP
-.B C\-j
-Return
-.TP
-.B C\-J
-Shift-Return
-.TP
-.B C\-k
-Delete line right
-.TP
-.B C\-m
-Return
-.TP
-.B C\-M
-Shift-Return
-.TP
-.B C\-n
-Down
-.TP
-.B C\-p
-Up
-.TP
-.B C\-u
-Delete line left
-.TP
-.B C\-w
-Delete word left
-.TP
-.B C\-y
-Paste from primary X selection
-.TP
-.B C\-Y
-Paste from X clipboard
-.TP
-.B M\-b
-Move cursor to the start of the current word
-.TP
-.B M\-f
-Move cursor to the end of the current word
-.TP
-.B M\-g
-Home
-.TP
-.B M\-G
-End
-.TP
-.B M\-h
-Up
-.TP
-.B M\-j
-Page down
-.TP
-.B M\-k
-Page up
-.TP
-.B M\-l
-Down
-.SH SEE ALSO
-.IR dwm (1),
-.IR stest (1)
--- a/desktop/.dmenu/dmenu.c
+++ b/desktop/.dmenu/dmenu.c
--- a/desktop/.dmenu/dmenu_path
+++ b/desktop/.dmenu/dmenu_path
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-cachedir="${XDG_CACHE_HOME:-"$HOME/.cache"}"
-cache="$cachedir/dmenu_run"
-
-[ ! -e "$cachedir" ] && mkdir -p "$cachedir"
-
-IFS=:
-if stest -dqr -n "$cache" $PATH; then
-	stest -flx $PATH | sort -u | tee "$cache"
-else
-	cat "$cache"
-fi
--- a/desktop/.dmenu/dmenu_run
+++ b/desktop/.dmenu/dmenu_run
@@ -1,6 +0,0 @@
-#!/bin/sh
-export _JAVA_AWT_WM_NONREPARENTING=1
-exec $(dmenu_path | dmenu "$@")
-
-# Uncomment for the NAVHISTORY patch (and remove the exec above)
-#dmenu_path | dmenu -H "${XDG_CACHE_HOME:-$HOME/.cache/}/dmenu_run.hist" "$@" | ${SHELL:-"/bin/sh"} &
--- a/desktop/.dmenu/drw.c
+++ b/desktop/.dmenu/drw.c
@@ -1,696 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
-
-#include "patches.h"
-#include "drw.h"
-#include "util.h"
-
-#if !PANGO_PATCH
-#define UTF_INVALID 0xFFFD
-#define UTF_SIZ     4
-
-static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
-static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static const long utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
-static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
-
-static long
-utf8decodebyte(const char c, size_t *i)
-{
-	for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
-		if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
-			return (unsigned char)c & ~utfmask[*i];
-	return 0;
-}
-
-static size_t
-utf8validate(long *u, size_t i)
-{
-	if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
-		*u = UTF_INVALID;
-	for (i = 1; *u > utfmax[i]; ++i)
-		;
-	return i;
-}
-
-static size_t
-utf8decode(const char *c, long *u, size_t clen)
-{
-	size_t i, j, len, type;
-	long udecoded;
-
-	*u = UTF_INVALID;
-	if (!clen)
-		return 0;
-	udecoded = utf8decodebyte(c[0], &len);
-	if (!BETWEEN(len, 1, UTF_SIZ))
-		return 1;
-	for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
-		udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
-		if (type)
-			return j;
-	}
-	if (j < len)
-		return 0;
-	*u = udecoded;
-	utf8validate(u, len);
-
-	return len;
-}
-#endif // PANGO_PATCH
-
-Drw *
-#if ALPHA_PATCH
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
-#else
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
-#endif // ALPHA_PATCH
-{
-	Drw *drw = ecalloc(1, sizeof(Drw));
-
-	drw->dpy = dpy;
-	drw->screen = screen;
-	drw->root = root;
-	drw->w = w;
-	drw->h = h;
-	#if ALPHA_PATCH
-	drw->visual = visual;
-	drw->depth = depth;
-	drw->cmap = cmap;
-	drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
-	drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
-	#else
-	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
-	drw->gc = XCreateGC(dpy, root, 0, NULL);
-	#endif // ALPHA_PATCH
-	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
-
-	return drw;
-}
-
-void
-drw_resize(Drw *drw, unsigned int w, unsigned int h)
-{
-	if (!drw)
-		return;
-
-	drw->w = w;
-	drw->h = h;
-	if (drw->drawable)
-		XFreePixmap(drw->dpy, drw->drawable);
-	#if ALPHA_PATCH
-	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
-	#else
-	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
-	#endif // ALPHA_PATCH
-}
-
-void
-drw_free(Drw *drw)
-{
-	XFreePixmap(drw->dpy, drw->drawable);
-	XFreeGC(drw->dpy, drw->gc);
-	#if PANGO_PATCH
-	drw_font_free(drw->font);
-	#else
-	drw_fontset_free(drw->fonts);
-	#endif // PANGO_PATCH
-	free(drw);
-}
-
-#if PANGO_PATCH
-/* This function is an implementation detail. Library users should use
- * drw_font_create instead.
- */
-static Fnt *
-xfont_create(Drw *drw, const char *fontname)
-{
-	Fnt *font;
-	PangoFontMap *fontmap;
-	PangoContext *context;
-	PangoFontDescription *desc;
-	PangoFontMetrics *metrics;
-
-	if (!fontname) {
-		die("no font specified.");
-	}
-
-	font = ecalloc(1, sizeof(Fnt));
-	font->dpy = drw->dpy;
-
-	fontmap = pango_xft_get_font_map(drw->dpy, drw->screen);
-	context = pango_font_map_create_context(fontmap);
-	desc = pango_font_description_from_string(fontname);
-	font->layout = pango_layout_new(context);
-	pango_layout_set_font_description(font->layout, desc);
-
-	metrics = pango_context_get_metrics(context, desc, pango_language_from_string ("en-us"));
-	font->h = pango_font_metrics_get_height(metrics) / PANGO_SCALE;
-
-	pango_font_metrics_unref(metrics);
-	g_object_unref(context);
-
-	return font;
-}
-#else
-/* This function is an implementation detail. Library users should use
- * drw_fontset_create instead.
- */
-static Fnt *
-xfont_create(Drw *drw, const char *fontname, FcPattern *fontpattern)
-{
-	Fnt *font;
-	XftFont *xfont = NULL;
-	FcPattern *pattern = NULL;
-
-	if (fontname) {
-		/* Using the pattern found at font->xfont->pattern does not yield the
-		 * same substitution results as using the pattern returned by
-		 * FcNameParse; using the latter results in the desired fallback
-		 * behaviour whereas the former just results in missing-character
-		 * rectangles being drawn, at least with some fonts. */
-		if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
-			fprintf(stderr, "error, cannot load font from name: '%s'\n", fontname);
-			return NULL;
-		}
-		if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
-			fprintf(stderr, "error, cannot parse font name to pattern: '%s'\n", fontname);
-			XftFontClose(drw->dpy, xfont);
-			return NULL;
-		}
-	} else if (fontpattern) {
-		if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
-			fprintf(stderr, "error, cannot load font from pattern.\n");
-			return NULL;
-		}
-	} else {
-		die("no font specified.");
-	}
-
-	#if NO_COLOR_EMOJI_PATCH
-	/* Do not allow using color fonts. This is a workaround for a BadLength
-	 * error from Xft with color glyphs. Modelled on the Xterm workaround. See
-	 * https://bugzilla.redhat.com/show_bug.cgi?id=1498269
-	 * https://lists.suckless.org/dev/1701/30932.html
-	 * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=916349
-	 * and lots more all over the internet.
-	 */
-	FcBool iscol;
-	if (FcPatternGetBool(xfont->pattern, FC_COLOR, 0, &iscol) == FcResultMatch && iscol) {
-		XftFontClose(drw->dpy, xfont);
-		return NULL;
-	}
-	#endif // NO_COLOR_EMOJI_PATCH
-
-	font = ecalloc(1, sizeof(Fnt));
-	font->xfont = xfont;
-	font->pattern = pattern;
-	font->h = xfont->ascent + xfont->descent;
-	font->dpy = drw->dpy;
-
-	return font;
-}
-#endif // PANGO_PATCH
-
-static void
-xfont_free(Fnt *font)
-{
-	if (!font)
-		return;
-	#if PANGO_PATCH
-	if (font->layout)
-		g_object_unref(font->layout);
-	#else
-	if (font->pattern)
-		FcPatternDestroy(font->pattern);
-	XftFontClose(font->dpy, font->xfont);
-	#endif // PANGO_PATCH
-	free(font);
-}
-
-#if PANGO_PATCH
-Fnt*
-drw_font_create(Drw* drw, const char font[])
-{
-	Fnt *fnt = NULL;
-
-	if (!drw || !font)
-		return NULL;
-
-	fnt = xfont_create(drw, font);
-
-	return (drw->font = fnt);
-}
-#else
-Fnt*
-drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount)
-{
-	Fnt *cur, *ret = NULL;
-	size_t i;
-
-	if (!drw || !fonts)
-		return NULL;
-
-	for (i = 1; i <= fontcount; i++) {
-		if ((cur = xfont_create(drw, fonts[fontcount - i], NULL))) {
-			cur->next = ret;
-			ret = cur;
-		}
-	}
-	return (drw->fonts = ret);
-}
-#endif // PANGO_PATCH
-
-#if PANGO_PATCH
-void
-drw_font_free(Fnt *font)
-{
-	if (font)
-		xfont_free(font);
-}
-#else
-void
-drw_fontset_free(Fnt *font)
-{
-	if (font) {
-		drw_fontset_free(font->next);
-		xfont_free(font);
-	}
-}
-#endif // PANGO_PATCH
-
-void
-#if ALPHA_PATCH
-drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha)
-#else
-drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
-#endif // ALPHA_PATCH
-{
-	if (!drw || !dest || !clrname)
-		return;
-
-	#if ALPHA_PATCH
-	if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap,
-	                       clrname, dest))
-		die("error, cannot allocate color '%s'", clrname);
-
-	dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24);
-	#else
-	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
-	                       DefaultColormap(drw->dpy, drw->screen),
-	                       clrname, dest))
-		die("error, cannot allocate color '%s'", clrname);
-	#endif // ALPHA_PATCH
-}
-
-/* Wrapper to create color schemes. The caller has to call free(3) on the
- * returned color scheme when done using it. */
-Clr *
-#if ALPHA_PATCH
-drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount)
-#else
-drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
-#endif // ALPHA_PATCH
-{
-	size_t i;
-	Clr *ret;
-
-	/* need at least two colors for a scheme */
-	if (!drw || !clrnames || clrcount < 2 || !(ret = ecalloc(clrcount, sizeof(XftColor))))
-		return NULL;
-
-	for (i = 0; i < clrcount; i++)
-		#if ALPHA_PATCH
-		drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]);
-		#else
-		drw_clr_create(drw, &ret[i], clrnames[i]);
-		#endif // ALPHA_PATCH
-	return ret;
-}
-
-#if !PANGO_PATCH
-void
-drw_setfontset(Drw *drw, Fnt *set)
-{
-	if (drw)
-		drw->fonts = set;
-}
-#endif // PANGO_PATCH
-
-void
-drw_setscheme(Drw *drw, Clr *scm)
-{
-	if (drw)
-		drw->scheme = scm;
-}
-
-void
-drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert)
-{
-	if (!drw || !drw->scheme)
-		return;
-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme[ColBg].pixel : drw->scheme[ColFg].pixel);
-	if (filled)
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-	else
-		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w - 1, h - 1);
-}
-
-#if PANGO_PATCH
-int
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, Bool markup)
-{
-	char buf[1024];
-	int ty;
-	unsigned int ew;
-	XftDraw *d = NULL;
-	size_t i, len;
-	int render = x || y || w || h;
-
-	if (!drw || (render && !drw->scheme) || !text || !drw->font)
-		return 0;
-
-	if (!render) {
-		w = invert ? invert : ~invert;
-	} else {
-		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-		#if ALPHA_PATCH
-		d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
-		#else
-		d = XftDrawCreate(drw->dpy, drw->drawable,
-		                  DefaultVisual(drw->dpy, drw->screen),
-		                  DefaultColormap(drw->dpy, drw->screen));
-		#endif // ALPHA_PATCH
-		x += lpad;
-		w -= lpad;
-	}
-
-	len = strlen(text);
-
-	if (len) {
-		drw_font_getexts(drw->font, text, len, &ew, NULL, markup);
-		/* shorten text if necessary */
-		for (len = MIN(len, sizeof(buf) - 1); len && ew > w; len--)
-			drw_font_getexts(drw->font, text, len, &ew, NULL, markup);
-
-		if (len) {
-			memcpy(buf, text, len);
-			buf[len] = '\0';
-			if (len < strlen(text))
-				for (i = len; i && i > len - 3; buf[--i] = '.')
-					; /* NOP */
-
-			if (render) {
-				ty = y + (h - drw->font->h) / 2;
-				if (markup)
-					pango_layout_set_markup(drw->font->layout, buf, len);
-				else
-					pango_layout_set_text(drw->font->layout, buf, len);
-				pango_xft_render_layout(d, &drw->scheme[invert ? ColBg : ColFg],
-					drw->font->layout, x * PANGO_SCALE, ty * PANGO_SCALE);
-				if (markup) /* clear markup attributes */
-					pango_layout_set_attributes(drw->font->layout, NULL);
-			}
-			x += ew;
-			w -= ew;
-		}
-	}
-
-	if (d)
-		XftDrawDestroy(d);
-
-	return x + (render ? w : 0);
-}
-#else
-int
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert)
-{
-	int i, ty, ellipsis_x = 0;
-	unsigned int tmpw, ew, ellipsis_w = 0, ellipsis_len;
-	XftDraw *d = NULL;
-	Fnt *usedfont, *curfont, *nextfont;
-	int utf8strlen, utf8charlen, render = x || y || w || h;
-	long utf8codepoint = 0;
-	const char *utf8str;
-	FcCharSet *fccharset;
-	FcPattern *fcpattern;
-	FcPattern *match;
-	XftResult result;
-	int charexists = 0, overflow = 0;
-	/* keep track of a couple codepoints for which we have no match. */
-	enum { nomatches_len = 64 };
-	static struct { long codepoint[nomatches_len]; unsigned int idx; } nomatches;
-	const char *ellipsis = "...";
-	static unsigned int ellipsis_width = 0;
-
-	if (!drw || (render && (!drw->scheme || !w)) || !text || !drw->fonts)
-		return 0;
-
-	if (!render) {
-		w = invert ? invert : ~invert;
-	} else {
-		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-		#if ALPHA_PATCH
-		d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
-		#else
-		d = XftDrawCreate(drw->dpy, drw->drawable,
-		                  DefaultVisual(drw->dpy, drw->screen),
-		                  DefaultColormap(drw->dpy, drw->screen));
-		#endif // ALPHA_PATCH
-		x += lpad;
-		w -= lpad;
-	}
-
-	usedfont = drw->fonts;
-	if (!ellipsis_width && render)
-		ellipsis_width = drw_fontset_getwidth(drw, ellipsis);
-	while (1) {
-		ew = ellipsis_len = utf8strlen = 0;
-		utf8str = text;
-		nextfont = NULL;
-		while (*text) {
-			utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
-			for (curfont = drw->fonts; curfont; curfont = curfont->next) {
-				charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
-				if (charexists) {
-					drw_font_getexts(curfont, text, utf8charlen, &tmpw, NULL);
-					if (ew + ellipsis_width <= w) {
-						/* keep track where the ellipsis still fits */
-						ellipsis_x = x + ew;
-						ellipsis_w = w - ew;
-						ellipsis_len = utf8strlen;
-					}
-
-					if (ew + tmpw > w) {
-						overflow = 1;
-						/* called from drw_fontset_getwidth_clamp():
-						 * it wants the width AFTER the overflow
-						 */
-						if (!render)
-							x += tmpw;
-						else
-							utf8strlen = ellipsis_len;
-					} else if (curfont == usedfont) {
- 						utf8strlen += utf8charlen;
- 						text += utf8charlen;
-						ew += tmpw;
- 					} else {
- 						nextfont = curfont;
- 					}
-					break;
-				}
-			}
-
-			if (overflow || !charexists || nextfont)
-				break;
-			else
-				charexists = 0;
-		}
-
-		if (utf8strlen) {
-			if (render) {
-				ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
-				XftDrawStringUtf8(d, &drw->scheme[invert ? ColBg : ColFg],
-				                  usedfont->xfont, x, ty, (XftChar8 *)utf8str, utf8strlen);
- 			}
-			x += ew;
-			w -= ew;
-		}
-		if (render && overflow && ellipsis_w)
-			drw_text(drw, ellipsis_x, y, ellipsis_w, h, 0, ellipsis, invert);
-
-		if (!*text || overflow) {
-			break;
-		} else if (nextfont) {
-			charexists = 0;
-			usedfont = nextfont;
-		} else {
-			/* Regardless of whether or not a fallback font is found, the
-			 * character must be drawn. */
-			charexists = 1;
-
-			for (i = 0; i < nomatches_len; ++i) {
-				/* avoid calling XftFontMatch if we know we won't find a match */
-				if (utf8codepoint == nomatches.codepoint[i])
-					goto no_match;
-			}
-
-			fccharset = FcCharSetCreate();
-			FcCharSetAddChar(fccharset, utf8codepoint);
-
-			if (!drw->fonts->pattern) {
-				/* Refer to the comment in xfont_create for more information. */
-				die("the first font in the cache must be loaded from a font string.");
-			}
-
-			fcpattern = FcPatternDuplicate(drw->fonts->pattern);
-			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
-			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-			#if NO_COLOR_EMOJI_PATCH
-			FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
-			#endif // NO_COLOR_EMOJI_PATCH
-
-			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
-			FcDefaultSubstitute(fcpattern);
-			match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
-
-			FcCharSetDestroy(fccharset);
-			FcPatternDestroy(fcpattern);
-
-			if (match) {
-				usedfont = xfont_create(drw, NULL, match);
-				if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
-					for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
-						; /* NOP */
-					curfont->next = usedfont;
-				} else {
-					xfont_free(usedfont);
-					nomatches.codepoint[++nomatches.idx % nomatches_len] = utf8codepoint;
-no_match:
-					usedfont = drw->fonts;
-				}
-			}
-		}
-	}
-	if (d)
-		XftDrawDestroy(d);
-
-	return x + (render ? w : 0);
-}
-#endif // PANGO_PATCH
-
-void
-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
-{
-	if (!drw)
-		return;
-
-	XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
-	XSync(drw->dpy, False);
-}
-
-#if PANGO_PATCH
-unsigned int
-drw_font_getwidth(Drw *drw, const char *text, Bool markup)
-{
-	if (!drw || !drw->font || !text)
-		return 0;
-	return drw_text(drw, 0, 0, 0, 0, 0, text, 0, markup);
-}
-
-unsigned int
-drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
-{
-	unsigned int tmp = 0;
-	if (drw && drw->font && text && n)
-		tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n, True);
-	return MIN(n, tmp);
-}
-#else
-unsigned int
-drw_fontset_getwidth(Drw *drw, const char *text)
-{
-	if (!drw || !drw->fonts || !text)
-		return 0;
-	return drw_text(drw, 0, 0, 0, 0, 0, text, 0);
-}
-
-unsigned int
-drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n)
-{
-	unsigned int tmp = 0;
-	if (drw && drw->fonts && text && n)
-		tmp = drw_text(drw, 0, 0, 0, 0, 0, text, n);
-	return MIN(n, tmp);
-}
-#endif // PANGO_PATCH
-
-#if PANGO_PATCH
-void
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup)
-{
-	if (!font || !text)
-		return;
-
-	PangoRectangle r;
-	if (markup)
-		pango_layout_set_markup(font->layout, text, len);
-	else
-		pango_layout_set_text(font->layout, text, len);
-	pango_layout_get_extents(font->layout, 0, &r);
-	if (markup) /* clear markup attributes */
-		pango_layout_set_attributes(font->layout, NULL);
-	if (w)
-		*w = r.width / PANGO_SCALE;
-	if (h)
-		*h = font->h;
-}
-#else
-void
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h)
-{
-	XGlyphInfo ext;
-
-	if (!font || !text)
-		return;
-
-	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
-	if (w)
-		*w = ext.xOff;
-	if (h)
-		*h = font->h;
-}
-#endif // PANGO_PATCH
-
-Cur *
-drw_cur_create(Drw *drw, int shape)
-{
-	Cur *cur;
-
-	if (!drw || !(cur = ecalloc(1, sizeof(Cur))))
-		return NULL;
-
-	cur->cursor = XCreateFontCursor(drw->dpy, shape);
-
-	return cur;
-}
-
-void
-drw_cur_free(Drw *drw, Cur *cursor)
-{
-	if (!cursor)
-		return;
-
-	XFreeCursor(drw->dpy, cursor->cursor);
-	free(cursor);
-}
-
-#if SCROLL_PATCH
-#include "patch/scroll.c"
-#endif
--- a/desktop/.dmenu/drw.h
+++ b/desktop/.dmenu/drw.h
@@ -1,103 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#if PANGO_PATCH
-#include <pango/pango.h>
-#include <pango/pangoxft.h>
-#endif // PANGO_PATCH
-
-typedef struct {
-	Cursor cursor;
-} Cur;
-
-typedef struct Fnt {
-	Display *dpy;
-	unsigned int h;
-	#if PANGO_PATCH
-	PangoLayout *layout;
-	#else
-	XftFont *xfont;
-	FcPattern *pattern;
-	struct Fnt *next;
-	#endif // PANGO_PATCH
-} Fnt;
-
-enum { ColFg, ColBg }; /* Clr scheme index */
-typedef XftColor Clr;
-
-typedef struct {
-	unsigned int w, h;
-	Display *dpy;
-	int screen;
-	Window root;
-	#if ALPHA_PATCH
-	Visual *visual;
-	unsigned int depth;
-	Colormap cmap;
-	#endif // ALPHA_PATCH
-	Drawable drawable;
-	GC gc;
-	Clr *scheme;
-	#if PANGO_PATCH
-	Fnt *font;
-	#else
-	Fnt *fonts;
-	#endif // PANGO_PATCH
-} Drw;
-
-/* Drawable abstraction */
-#if ALPHA_PATCH
-Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap);
-#else
-Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
-#endif // ALPHA_PATCH
-void drw_resize(Drw *drw, unsigned int w, unsigned int h);
-void drw_free(Drw *drw);
-
-/* Fnt abstraction */
-#if PANGO_PATCH
-Fnt *drw_font_create(Drw* drw, const char font[]);
-void drw_font_free(Fnt* set);
-unsigned int drw_font_getwidth(Drw *drw, const char *text, Bool markup);
-unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
-void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h, Bool markup);
-#else
-Fnt *drw_fontset_create(Drw* drw, const char *fonts[], size_t fontcount);
-void drw_fontset_free(Fnt* set);
-unsigned int drw_fontset_getwidth(Drw *drw, const char *text);
-unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int n);
-void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
-#endif // PANGO_PATCH
-
-/* Colorscheme abstraction */
-#if ALPHA_PATCH
-void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha);
-Clr *drw_scm_create(Drw *drw, const char *clrnames[], const unsigned int alphas[], size_t clrcount);
-#else
-void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
-Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
-#endif // ALPHA_PATCH
-
-/* Cursor abstraction */
-Cur *drw_cur_create(Drw *drw, int shape);
-void drw_cur_free(Drw *drw, Cur *cursor);
-
-/* Drawing context manipulation */
-#if !PANGO_PATCH
-void drw_setfontset(Drw *drw, Fnt *set);
-#endif // PANGO_PATCH
-void drw_setscheme(Drw *drw, Clr *scm);
-
-/* Drawing functions */
-void drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int invert);
-#if PANGO_PATCH
-int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert, Bool markup);
-#else
-int drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lpad, const char *text, int invert);
-#endif // PANGO_PATCH
-
-/* Map functions */
-void drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h);
-
-#if SCROLL_PATCH
-#include "patch/scroll.h"
-#endif
--- a/desktop/.dmenu/patch/center.c
+++ b/desktop/.dmenu/patch/center.c
@@ -1,8 +0,0 @@
-static int
-max_textw(void)
-{
-	int len = 0;
-	for (struct item *item = items; item && item->text; item++)
-		len = MAX(TEXTW(item->text), len);
-	return len;
-}
--- a/desktop/.dmenu/patch/dynamicoptions.c
+++ b/desktop/.dmenu/patch/dynamicoptions.c
@@ -1,91 +0,0 @@
-static void
-refreshoptions()
-{
-	int dynlen = strlen(dynamic);
-	char* cmd= malloc(dynlen + strlen(text) + 2);
-	if (cmd == NULL)
-		die("malloc:");
-	sprintf(cmd, "%s %s", dynamic, text);
-	FILE *stream = popen(cmd, "r");
-	if (!stream)
-		die("popen(%s):", cmd);
-	readstream(stream);
-	int pc = pclose(stream);
-	if (pc == -1)
-		die("pclose:");
-	free(cmd);
-	curr = sel = items;
-}
-
-static void
-readstream(FILE* stream)
-{
-	char buf[sizeof text], *p;
-	size_t i, imax = 0, size = 0;
-	unsigned int tmpmax = 0;
-
-	/* read each line from stdin and add it to the item list */
-	for (i = 0; fgets(buf, sizeof buf, stream); i++) {
-		if (i + 1 >= size / sizeof *items)
-			if (!(items = realloc(items, (size += BUFSIZ))))
-				die("cannot realloc %u bytes:", size);
-		if ((p = strchr(buf, '\n')))
-			*p = '\0';
-		if (!(items[i].text = strdup(buf)))
-			die("cannot strdup %u bytes:", strlen(buf) + 1);
-		#if SEPARATOR_PATCH
-		if (separator && (p = separator_greedy ?
-			strrchr(items[i].text, separator) : strchr(items[i].text, separator))) {
-			*p = '\0';
-			items[i].text_output = ++p;
-		} else {
-			items[i].text_output = items[i].text;
-		}
-		if (separator_reverse) {
-			p = items[i].text;
-			items[i].text = items[i].text_output;
-			items[i].text_output = p;
-		}
-		#elif TSV_PATCH
-		if ((p = strchr(buf, '\t')))
-			*p = '\0';
-		if (!(items[i].stext = strdup(buf)))
-			die("cannot strdup %u bytes:", strlen(buf) + 1);
-		#endif // TSV_PATCH
-		#if MULTI_SELECTION_PATCH
-		items[i].id = i;
-		#else
-		items[i].out = 0;
-		#endif // MULTI_SELECTION_PATCH
-		#if HIGHPRIORITY_PATCH
-		items[i].hp = arrayhas(hpitems, hplength, items[i].text);
-		#endif // HIGHPRIORITY_PATCH
-		#if PANGO_PATCH
-		drw_font_getexts(drw->font, buf, strlen(buf), &tmpmax, NULL, True);
-		#else
-		drw_font_getexts(drw->fonts, buf, strlen(buf), &tmpmax, NULL);
-		#endif // PANGO_PATCH
-		if (tmpmax > inputw) {
-			inputw = tmpmax;
-			imax = i;
-		}
-	}
-
-	/* If the command did not give any output at all, then do not clear the existing items */
-	if (!i)
-		return;
-
-	if (items)
-		items[i].text = NULL;
-	#if PANGO_PATCH
-	inputw = items ? TEXTWM(items[imax].text) : 0;
-	#else
-	inputw = items ? TEXTW(items[imax].text) : 0;
-	#endif // PANGO_PATCH
-	if (!dynamic || !*dynamic)
-		lines = MIN(lines, i);
-	else {
-		text[0] = '\0';
-		cursor = 0;
-	}
-}
--- a/desktop/.dmenu/patch/dynamicoptions.h
+++ b/desktop/.dmenu/patch/dynamicoptions.h
@@ -1,2 +0,0 @@
-static void refreshoptions();
-static void readstream(FILE* stream);
--- a/desktop/.dmenu/patch/fuzzyhighlight.c
+++ b/desktop/.dmenu/patch/fuzzyhighlight.c
@@ -1,57 +0,0 @@
-static void
-#if EMOJI_HIGHLIGHT_PATCH
-drawhighlights(struct item *item, char *output, int x, int y, int maxw)
-#else
-drawhighlights(struct item *item, int x, int y, int maxw)
-#endif // EMOJI_HIGHLIGHT_PATCH
-{
-	int i, indent;
-	char *highlight;
-	char c;
-
-	#if EMOJI_HIGHLIGHT_PATCH
-	char *itemtext = output;
-	#elif TSV_PATCH && !SEPARATOR_PATCH
-	char *itemtext = item->stext;
-	#else
-	char *itemtext = item->text;
-	#endif // TSV_PATCH
-
-	if (!(strlen(itemtext) && strlen(text)))
-		return;
-
-	drw_setscheme(drw, scheme[item == sel
-	                   ? SchemeSelHighlight
-	                   : SchemeNormHighlight]);
-	for (i = 0, highlight = itemtext; *highlight && text[i];) {
-		#if FUZZYMATCH_PATCH
-		if (!fstrncmp(&(*highlight), &text[i], 1))
-		#else
-		if (*highlight == text[i])
-		#endif // FUZZYMATCH_PATCH
-		{
-			/* get indentation */
-			c = *highlight;
-			*highlight = '\0';
-			indent = TEXTW(itemtext) - lrpad;
-			*highlight = c;
-
-			/* highlight character */
-			c = highlight[1];
-			highlight[1] = '\0';
-			drw_text(
-				drw,
-				x + indent + (lrpad / 2),
-				y,
-				MIN(maxw - indent - lrpad, TEXTW(highlight) - lrpad),
-				bh, 0, highlight, 0
-				#if PANGO_PATCH
-				, True
-				#endif // PANGO_PATCH
-			);
-			highlight[1] = c;
-			i++;
-		}
-		highlight++;
-	}
-}
--- a/desktop/.dmenu/patch/fuzzymatch.c
+++ b/desktop/.dmenu/patch/fuzzymatch.c
@@ -1,106 +0,0 @@
-#include <math.h>
-
-int
-compare_distance(const void *a, const void *b)
-{
-	struct item *da = *(struct item **) a;
-	struct item *db = *(struct item **) b;
-
-	if (!db)
-		return 1;
-	if (!da)
-		return -1;
-
-	return da->distance == db->distance ? 0 : da->distance < db->distance ? -1 : 1;
-}
-
-void
-fuzzymatch(void)
-{
-	/* bang - we have so much memory */
-	struct item *it;
-	struct item **fuzzymatches = NULL;
-	char c;
-	int number_of_matches = 0, i, pidx, sidx, eidx;
-	int text_len = strlen(text), itext_len;
-	#if HIGHPRIORITY_PATCH
-	struct item *lhpprefix, *hpprefixend;
-	lhpprefix = hpprefixend = NULL;
-	#endif // HIGHPRIORITY_PATCH
-	matches = matchend = NULL;
-
-	/* walk through all items */
-	for (it = items; it && it->text; it++) {
-		if (text_len) {
-			itext_len = strlen(it->text);
-			pidx = 0; /* pointer */
-			sidx = eidx = -1; /* start of match, end of match */
-			/* walk through item text */
-			for (i = 0; i < itext_len && (c = it->text[i]); i++) {
-				/* fuzzy match pattern */
-				if (!fstrncmp(&text[pidx], &c, 1)) {
-					if (sidx == -1)
-						sidx = i;
-					pidx++;
-					if (pidx == text_len) {
-						eidx = i;
-						break;
-					}
-				}
-			}
-			/* build list of matches */
-			if (eidx != -1) {
-				/* compute distance */
-				/* add penalty if match starts late (log(sidx+2))
-				 * add penalty for long a match without many matching characters */
-				it->distance = log(sidx + 2) + (double)(eidx - sidx - text_len);
-				/* fprintf(stderr, "distance %s %f\n", it->text, it->distance); */
-				appenditem(it, &matches, &matchend);
-				number_of_matches++;
-			}
-		} else {
-			appenditem(it, &matches, &matchend);
-		}
-	}
-
-	if (number_of_matches) {
-		/* initialize array with matches */
-		if (!(fuzzymatches = realloc(fuzzymatches, number_of_matches * sizeof(struct item*))))
-			die("cannot realloc %u bytes:", number_of_matches * sizeof(struct item*));
-		for (i = 0, it = matches; it && i < number_of_matches; i++, it = it->right) {
-			fuzzymatches[i] = it;
-		}
-
-		#if NO_SORT_PATCH
-		if (sortmatches)
-		#endif // NO_SORT_PATCH
-		/* sort matches according to distance */
-		qsort(fuzzymatches, number_of_matches, sizeof(struct item*), compare_distance);
-		/* rebuild list of matches */
-		matches = matchend = NULL;
-		for (i = 0, it = fuzzymatches[i];  i < number_of_matches && it && \
-				it->text; i++, it = fuzzymatches[i]) {
-			#if HIGHPRIORITY_PATCH
-			#if NO_SORT_PATCH
-			if (sortmatches && it->hp)
-			#else
-			if (it->hp)
-			#endif // NO_SORT_PATCH
-				appenditem(it, &lhpprefix, &hpprefixend);
-			else
-				appenditem(it, &matches, &matchend);
-			#else
-			appenditem(it, &matches, &matchend);
-			#endif // HIGHPRIORITY_PATCH
-		}
-		free(fuzzymatches);
-	}
-	#if HIGHPRIORITY_PATCH
-	if (lhpprefix) {
-		hpprefixend->right = matches;
-		matches = lhpprefix;
-	}
-	#endif // HIGHPRIORITY_PATCH
-	curr = sel = matches;
-	calcoffsets();
-}
--- a/desktop/.dmenu/patch/fzfexpect.c
+++ b/desktop/.dmenu/patch/fzfexpect.c
@@ -1,39 +0,0 @@
-static char *expected;
-#if MULTI_SELECTION_PATCH
-void
-expect(char *expect, XKeyEvent *ev)
-{
-	if (sel && expected && strstr(expected, expect)) {
-		if (expected && sel && !(ev->state & ShiftMask))
-			puts(expect);
-		for (int i = 0; i < selidsize; i++)
-			if (selid[i] != -1 && (!sel || sel->id != selid[i]))
-				puts(items[selid[i]].text);
-		if (sel && !(ev->state & ShiftMask)) {
-			puts(sel->text);
-		} else
-			puts(text);
-		cleanup();
-		exit(1);
-	} else if (!sel && expected && strstr(expected, expect)) {
-		puts(expect);
-		cleanup();
-		exit(1);
-	}
-}
-#else
-void
-expect(char *expect, XKeyEvent *ignored)
-{
-	if (sel && expected && strstr(expected, expect)) {
-		puts(expect);
-		puts(sel->text);
-		cleanup();
-		exit(1);
-	} else if (!sel && expected && strstr(expected, expect)){
-		puts(expect);
-		cleanup();
-		exit(1);
-	}
-}
-#endif // MULTI_SELECTION_PATCH
--- a/desktop/.dmenu/patch/fzfexpect.h
+++ b/desktop/.dmenu/patch/fzfexpect.h
@@ -1 +0,0 @@
-static void expect(char *expect, XKeyEvent *ev);
--- a/desktop/.dmenu/patch/highlight.c
+++ b/desktop/.dmenu/patch/highlight.c
@@ -1,51 +0,0 @@
-static void
-#if EMOJI_HIGHLIGHT_PATCH
-drawhighlights(struct item *item, char *output, int x, int y, int maxw)
-#else
-drawhighlights(struct item *item, int x, int y, int maxw)
-#endif // EMOJI_HIGHLIGHT_PATCH
-{
-	char restorechar, tokens[sizeof text], *highlight,  *token;
-	int indentx, highlightlen;
-	#if EMOJI_HIGHLIGHT_PATCH
-	char *itemtext = output;
-	#elif TSV_PATCH && !SEPARATOR_PATCH
-	char *itemtext = item->stext;
-	#else
-	char *itemtext = item->text;
-	#endif // EMOJI_HIGHLIGHT_PATCH | TSV_PATCH
-
-	drw_setscheme(drw, scheme[item == sel ? SchemeSelHighlight : SchemeNormHighlight]);
-	strcpy(tokens, text);
-	for (token = strtok(tokens, " "); token; token = strtok(NULL, " ")) {
-		highlight = fstrstr(itemtext, token);
-		while (highlight) {
-			// Move item str end, calc width for highlight indent, & restore
-			highlightlen = highlight - itemtext;
-			restorechar = *highlight;
-			itemtext[highlightlen] = '\0';
-			indentx = TEXTW(itemtext);
-			itemtext[highlightlen] = restorechar;
-
-			// Move highlight str end, draw highlight, & restore
-			restorechar = highlight[strlen(token)];
-			highlight[strlen(token)] = '\0';
-			if (indentx - (lrpad / 2) - 1 < maxw)
-				drw_text(
-					drw,
-					x + indentx - (lrpad / 2) - 1,
-					y,
-					MIN(maxw - indentx, TEXTW(highlight) - lrpad),
-					bh, 0, highlight, 0
-					#if PANGO_PATCH
-					, True
-					#endif // PANGO_PATCH
-				);
-			highlight[strlen(token)] = restorechar;
-
-			if (strlen(highlight) - strlen(token) < strlen(token))
-				break;
-			highlight = fstrstr(highlight + strlen(token), token);
-		}
-	}
-}
--- a/desktop/.dmenu/patch/highpriority.c
+++ b/desktop/.dmenu/patch/highpriority.c
@@ -1,35 +0,0 @@
-static char **hpitems = NULL;
-static int hplength = 0;
-
-static char **
-tokenize(char *source, const char *delim, int *llen)
-{
-	int listlength = 0, list_size = 0;
-	char **list = NULL, *token;
-
-	token = strtok(source, delim);
-	while (token) {
-		if (listlength + 1 >= list_size) {
-			if (!(list = realloc(list, (list_size += 8) * sizeof(*list))))
-				die("Unable to realloc %zu bytes\n", list_size * sizeof(*list));
-		}
-		if (!(list[listlength] = strdup(token)))
-			die("Unable to strdup %zu bytes\n", strlen(token) + 1);
-		token = strtok(NULL, delim);
-		listlength++;
-	}
-
-	*llen = listlength;
-	return list;
-}
-
-static int
-arrayhas(char **list, int length, char *item) {
-	for (int i = 0; i < length; i++) {
-		int len1 = strlen(list[i]);
-		int len2 = strlen(item);
-		if (fstrncmp(list[i], item, len1 > len2 ? len2 : len1) == 0)
-			return 1;
-	}
-	return 0;
-}
--- a/desktop/.dmenu/patch/highpriority.h
+++ b/desktop/.dmenu/patch/highpriority.h
@@ -1,2 +0,0 @@
-static int arrayhas(char **list, int length, char *item);
-
--- a/desktop/.dmenu/patch/include.c
+++ b/desktop/.dmenu/patch/include.c
@@ -1,38 +0,0 @@
-#if CENTER_PATCH
-#include "center.c"
-#endif
-#if FUZZYHIGHLIGHT_PATCH
-#include "fuzzyhighlight.c"
-#elif HIGHLIGHT_PATCH
-#include "highlight.c"
-#endif
-#if FUZZYMATCH_PATCH
-#include "fuzzymatch.c"
-#endif
-#if FZFEXPECT_PATCH
-#include "fzfexpect.c"
-#endif
-#if HIGHPRIORITY_PATCH
-#include "highpriority.c"
-#endif
-#if DYNAMIC_OPTIONS_PATCH
-#include "dynamicoptions.c"
-#endif
-#if MULTI_SELECTION_PATCH
-#include "multiselect.c"
-#endif
-#if MOUSE_SUPPORT_PATCH
-#include "mousesupport.c"
-#endif
-#if NAVHISTORY_PATCH
-#include "navhistory.c"
-#endif
-#if NON_BLOCKING_STDIN_PATCH
-#include "nonblockingstdin.c"
-#endif
-#if NUMBERS_PATCH
-#include "numbers.c"
-#endif
-#if XRESOURCES_PATCH
-#include "xresources.c"
-#endif
--- a/desktop/.dmenu/patch/include.h
+++ b/desktop/.dmenu/patch/include.h
@@ -1,15 +0,0 @@
-#if DYNAMIC_OPTIONS_PATCH
-#include "dynamicoptions.h"
-#endif
-#if FZFEXPECT_PATCH
-#include "fzfexpect.h"
-#endif
-#if HIGHPRIORITY_PATCH
-#include "highpriority.h"
-#endif
-#if NON_BLOCKING_STDIN_PATCH
-#include "nonblockingstdin.h"
-#endif
-#if NUMBERS_PATCH
-#include "numbers.h"
-#endif
--- a/desktop/.dmenu/patch/mousesupport.c
+++ b/desktop/.dmenu/patch/mousesupport.c
@@ -1,159 +0,0 @@
-static void
-buttonpress(XEvent *e)
-{
-	struct item *item;
-	XButtonPressedEvent *ev = &e->xbutton;
-	int x = 0, y = 0, h = bh, w;
-
-	if (ev->window != win)
-		return;
-
-	/* right-click: exit */
-	if (ev->button == Button3)
-		exit(1);
-
-	if (prompt && *prompt)
-		x += promptw;
-
-	/* input field */
-	w = (lines > 0 || !matches) ? mw - x : inputw;
-
-	/* left-click on input: clear input,
-	 * NOTE: if there is no left-arrow the space for < is reserved so
-	 *       add that to the input width */
-	#if SYMBOLS_PATCH
-	if (ev->button == Button1 &&
-	   ((lines <= 0 && ev->x >= 0 && ev->x <= x + w +
-	   ((!prev || !curr->left) ? TEXTW(symbol_1) : 0)) ||
-	   (lines > 0 && ev->y >= y && ev->y <= y + h))) {
-		insert(NULL, -cursor);
-		drawmenu();
-		return;
-	}
-	#else
-	if (ev->button == Button1 &&
-	   ((lines <= 0 && ev->x >= 0 && ev->x <= x + w +
-	   ((!prev || !curr->left) ? TEXTW("<") : 0)) ||
-	   (lines > 0 && ev->y >= y && ev->y <= y + h))) {
-		insert(NULL, -cursor);
-		drawmenu();
-		return;
-	}
-	#endif // SYMBOLS_PATCH
-	/* middle-mouse click: paste selection */
-	if (ev->button == Button2) {
-		XConvertSelection(dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
-		                  utf8, utf8, win, CurrentTime);
-		drawmenu();
-		return;
-	}
-	/* scroll up */
-	if (ev->button == Button4 && prev) {
-		sel = curr = prev;
-		calcoffsets();
-		drawmenu();
-		return;
-	}
-	/* scroll down */
-	if (ev->button == Button5 && next) {
-		sel = curr = next;
-		calcoffsets();
-		drawmenu();
-		return;
-	}
-	if (ev->button != Button1)
-		return;
-	if (ev->state & ~ControlMask)
-		return;
-	if (lines > 0) {
-		/* vertical list: (ctrl)left-click on item */
-		w = mw - x;
-		for (item = curr; item != next; item = item->right) {
-			y += h;
-			if (ev->y >= y && ev->y <= (y + h)) {
-				#if !MULTI_SELECTION_PATCH
-				puts(item->text);
-				#endif // MULTI_SELECTION_PATCH
-				if (!(ev->state & ControlMask)) {
-					#if MULTI_SELECTION_PATCH
-					sel = item;
-					selsel();
-					printsel(ev->state);
-					#endif // MULTI_SELECTION_PATCH
-					exit(0);
-				}
-				sel = item;
-				if (sel) {
-					#if MULTI_SELECTION_PATCH
-					selsel();
-					#else
-					sel->out = 1;
-					#endif // MULTI_SELECTION_PATCH
-					drawmenu();
-				}
-				return;
-			}
-		}
-	} else if (matches) {
-		/* left-click on left arrow */
-		x += inputw;
-		#if SYMBOLS_PATCH
-		w = TEXTW(symbol_1);
-		#else
-		w = TEXTW("<");
-		#endif // SYMBOLS_PATCH
-		if (prev && curr->left) {
-			if (ev->x >= x && ev->x <= x + w) {
-				sel = curr = prev;
-				calcoffsets();
-				drawmenu();
-				return;
-			}
-		}
-		/* horizontal list: (ctrl)left-click on item */
-		for (item = curr; item != next; item = item->right) {
-			x += w;
-			#if SYMBOLS_PATCH
-			w = MIN(TEXTW(item->text), mw - x - TEXTW(symbol_2));
-			#else
-			w = MIN(TEXTW(item->text), mw - x - TEXTW(">"));
-			#endif // SYMBOLS_PATCH
-			if (ev->x >= x && ev->x <= x + w) {
-				#if !MULTI_SELECTION_PATCH
-				puts(item->text);
-				#endif // MULTI_SELECTION_PATCH
-				if (!(ev->state & ControlMask)) {
-					#if MULTI_SELECTION_PATCH
-					sel = item;
-					selsel();
-					printsel(ev->state);
-					#endif // MULTI_SELECTION_PATCH
-					exit(0);
-				}
-				sel = item;
-				if (sel) {
-					#if MULTI_SELECTION_PATCH
-					selsel();
-					#else
-					sel->out = 1;
-					#endif // MULTI_SELECTION_PATCH
-					drawmenu();
-				}
-				return;
-			}
-		}
-		/* left-click on right arrow */
-		#if SYMBOLS_PATCH
-		w = TEXTW(symbol_2);
-		#else
-		w = TEXTW(">");
-		#endif // SYMBOLS_PATCH
-		x = mw - w;
-		if (next && ev->x >= x && ev->x <= x + w) {
-			sel = curr = next;
-			calcoffsets();
-			drawmenu();
-			return;
-		}
-	}
-}
--- a/desktop/.dmenu/patch/multiselect.c
+++ b/desktop/.dmenu/patch/multiselect.c
@@ -1,53 +0,0 @@
-static int
-issel(size_t id)
-{
-	for (int i = 0;i < selidsize;i++)
-		if (selid[i] == id)
-			return 1;
-	return 0;
-}
-
-static void
-printsel(unsigned int state)
-{
-	for (int i = 0;i < selidsize;i++)
-		if (selid[i] != -1 && (!sel || sel->id != selid[i])) {
-			#if PRINTINDEX_PATCH
-			if (print_index)
-				printf("%d\n", selid[i]);
-			else
-			#endif // PRINTINDEX_PATCH
-			puts(items[selid[i]].text);
-		}
-	if (sel && !(state & ShiftMask)) {
-		#if PRINTINDEX_PATCH
-		if (print_index)
-			printf("%d\n", sel->index);
-		else
-		#endif // PRINTINDEX_PATCH
-		puts(sel->text);
-	} else
-		puts(text);
-
-}
-
-static void
-selsel()
-{
-	if (!sel)
-		return;
-	if (issel(sel->id)) {
-		for (int i = 0; i < selidsize; i++)
-			if (selid[i] == sel->id)
-				selid[i] = -1;
-	} else {
-		for (int i = 0; i < selidsize; i++)
-			if (selid[i] == -1) {
-				selid[i] = sel->id;
-				return;
-			}
-		selidsize++;
-		selid = realloc(selid, (selidsize + 1) * sizeof(int));
-		selid[selidsize - 1] = sel->id;
-	}
-}
--- a/desktop/.dmenu/patch/navhistory.c
+++ b/desktop/.dmenu/patch/navhistory.c
@@ -1,126 +0,0 @@
-static char *histfile;
-static char **history;
-static size_t histsz, histpos;
-
-static void
-loadhistory(void)
-{
-	FILE *fp = NULL;
-	static size_t cap = 0;
-	size_t llen;
-	char *line;
-
-	if (!histfile) {
-		return;
-	}
-
-	fp = fopen(histfile, "r");
-	if (!fp) {
-		return;
-	}
-
-	for (;;) {
-		line = NULL;
-		llen = 0;
-		if (-1 == getline(&line, &llen, fp)) {
-			if (ferror(fp)) {
-				die("failed to read history");
-			}
-			free(line);
-			break;
-		}
-
-		if (cap == histsz) {
-			cap += 64 * sizeof(char*);
-			history = realloc(history, cap);
-			if (!history) {
-				die("failed to realloc memory");
-			}
-		}
-		strtok(line, "\n");
-		history[histsz] = line;
-		histsz++;
-	}
-	histpos = histsz;
-
-	if (fclose(fp)) {
-		die("failed to close file %s", histfile);
-	}
-}
-
-static void
-navhistory(int dir)
-{
-	static char def[BUFSIZ];
-	char *p = NULL;
-	size_t len = 0;
-
-	if (!history || histpos + 1 == 0)
-		return;
-
-	if (histsz == histpos) {
-		strncpy(def, text, sizeof(def));
-	}
-
-	switch(dir) {
-	case 1:
-		if (histpos < histsz - 1) {
-			p = history[++histpos];
-		} else if (histpos == histsz - 1) {
-			p = def;
-			histpos++;
-		}
-		break;
-	case -1:
-		if (histpos > 0) {
-			p = history[--histpos];
-		}
-		break;
-	}
-	if (p == NULL) {
-		return;
-	}
-
-	len = MIN(strlen(p), BUFSIZ - 1);
-	strncpy(text, p, len);
-	text[len] = '\0';
-	cursor = len;
-	match();
-}
-
-static void
-savehistory(char *input)
-{
-	unsigned int i;
-	FILE *fp;
-
-	if (!histfile ||
-	    0 == maxhist ||
-	    0 == strlen(input)) {
-		goto out;
-	}
-
-	fp = fopen(histfile, "w");
-	if (!fp) {
-		die("failed to open %s", histfile);
-	}
-	for (i = histsz < maxhist ? 0 : histsz - maxhist; i < histsz; i++) {
-		if (0 >= fprintf(fp, "%s\n", history[i])) {
-			die("failed to write to %s", histfile);
-		}
-	}
-	if (histsz == 0 || !histnodup || (histsz > 0 && strcmp(input, history[histsz-1]) != 0)) { /* TODO */
-		if (0 >= fputs(input, fp)) {
-			die("failed to write to %s", histfile);
-		}
-	}
-	if (fclose(fp)) {
-		die("failed to close file %s", histfile);
-	}
-
-out:
-	for (i = 0; i < histsz; i++) {
-		free(history[i]);
-	}
-	free(history);
-}
--- a/desktop/.dmenu/patch/nonblockingstdin.c
+++ b/desktop/.dmenu/patch/nonblockingstdin.c
@@ -1,68 +0,0 @@
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/select.h>
-
-static void
-readstdin(void)
-{
-	static size_t max = 0;
-	static struct item **end = &items;
-
-	char buf[sizeof text], *p, *maxstr;
-	struct item *item;
-
-	#if PASSWORD_PATCH
-	if (passwd) {
-		inputw = lines = 0;
-		return;
-	}
-	#endif // PASSWORD_PATCH
-
-	/* read each line from stdin and add it to the item list */
-	while (fgets(buf, sizeof buf, stdin)) {
-		if (!(item = malloc(sizeof *item)))
-			die("cannot malloc %u bytes:", sizeof *item);
-		if ((p = strchr(buf, '\n')))
-			*p = '\0';
-		if (!(item->text = strdup(buf)))
-			die("cannot strdup %u bytes:", strlen(buf)+1);
-		if (strlen(item->text) > max) {
-			max = strlen(maxstr = item->text);
-			#if PANGO_PATCH
-			inputw = maxstr ? TEXTWM(maxstr) : 0;
-			#else
-			inputw = maxstr ? TEXTW(maxstr) : 0;
-			#endif // PANGO_PATCH
-		}
-		*end = item;
-		end = &item->next;
-		item->next = NULL;
-		item->out = 0;
-	}
-	match();
-	drawmenu();
-}
-
-static void
-run(void)
-{
-	fd_set fds;
-	int flags, xfd = XConnectionNumber(dpy);
-
-	if ((flags = fcntl(0, F_GETFL)) == -1)
-		die("cannot get stdin control flags:");
-	if (fcntl(0, F_SETFL, flags | O_NONBLOCK) == -1)
-		die("cannot set stdin control flags:");
-	for (;;) {
-		FD_ZERO(&fds);
-		FD_SET(xfd, &fds);
-		if (!feof(stdin))
-			FD_SET(0, &fds);
-		if (select(xfd + 1, &fds, NULL, NULL, NULL) == -1)
-			die("cannot multiplex input:");
-		if (FD_ISSET(xfd, &fds))
-			readevent();
-		if (FD_ISSET(0, &fds))
-			readstdin();
-	}
-}
--- a/desktop/.dmenu/patch/nonblockingstdin.h
+++ b/desktop/.dmenu/patch/nonblockingstdin.h
@@ -1 +0,0 @@
-static void readevent();
--- a/desktop/.dmenu/patch/numbers.c
+++ b/desktop/.dmenu/patch/numbers.c
@@ -1,16 +0,0 @@
-static char numbers[NUMBERSBUFSIZE] = "";
-
-static void
-recalculatenumbers()
-{
-	unsigned int numer = 0, denom = 0;
-	struct item *item;
-	if (matchend) {
-		numer++;
-		for (item = matchend; item && item->left; item = item->left)
-			numer++;
-	}
-	for (item = items; item && item->text; item++)
-		denom++;
-	snprintf(numbers, NUMBERSBUFSIZE, "%d/%d", numer, denom);
-}
--- a/desktop/.dmenu/patch/numbers.h
+++ b/desktop/.dmenu/patch/numbers.h
@@ -1,4 +0,0 @@
-#define NUMBERSMAXDIGITS      100
-#define NUMBERSBUFSIZE        (NUMBERSMAXDIGITS * 2) + 1
-
-static void recalculatenumbers();
--- a/desktop/.dmenu/patch/scroll.c
+++ b/desktop/.dmenu/patch/scroll.c
@@ -1,168 +0,0 @@
-int
-utf8nextchar(const char *str, int len, int i, int inc)
-{
-	int n;
-
-	for (n = i + inc; n + inc >= 0 && n + inc <= len
-	  && (str[n] & 0xc0) == 0x80; n += inc)
-		;
-	return n;
-}
-
-int
-drw_text_align(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int textlen, int align)
-{
-	int ty;
-	unsigned int ew;
-	XftDraw *d = NULL;
-	Fnt *usedfont, *curfont, *nextfont;
-	size_t len;
-	int utf8strlen, utf8charlen, render = x || y || w || h;
-	long utf8codepoint = 0;
-	const char *utf8str;
-	FcCharSet *fccharset;
-	FcPattern *fcpattern;
-	FcPattern *match;
-	XftResult result;
-	int charexists = 0;
-	int i, n;
-
-	if (!drw || (render && !drw->scheme) || !text || !drw->fonts || textlen <= 0
-	  || (align != AlignL && align != AlignR))
-		return 0;
-
-	if (!render) {
-		w = ~w;
-	} else {
-		XSetForeground(drw->dpy, drw->gc, drw->scheme[ColBg].pixel);
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-		d = XftDrawCreate(drw->dpy, drw->drawable,
-		                  DefaultVisual(drw->dpy, drw->screen),
-		                  DefaultColormap(drw->dpy, drw->screen));
-	}
-
-	usedfont = drw->fonts;
-	i = align == AlignL ? 0 : textlen;
-	x = align == AlignL ? x : x + w;
-	while (1) {
-		utf8strlen = 0;
-		nextfont = NULL;
-		/* if (align == AlignL) */
-		utf8str = text + i;
-
-		while ((align == AlignL && i < textlen) || (align == AlignR && i > 0)) {
-			if (align == AlignL) {
-				utf8charlen = utf8decode(text + i, &utf8codepoint, MIN(textlen - i, UTF_SIZ));
-				if (!utf8charlen) {
-					textlen = i;
-					break;
-				}
-			} else {
-				n = utf8nextchar(text, textlen, i, -1);
-				utf8charlen = utf8decode(text + n, &utf8codepoint, MIN(textlen - n, UTF_SIZ));
-				if (!utf8charlen) {
-					textlen -= i;
-					text += i;
-					i = 0;
-					break;
-				}
-			}
-			for (curfont = drw->fonts; curfont; curfont = curfont->next) {
-				charexists = charexists || XftCharExists(drw->dpy, curfont->xfont, utf8codepoint);
-				if (charexists) {
-					if (curfont == usedfont) {
-						utf8strlen += utf8charlen;
-						i += align == AlignL ? utf8charlen : -utf8charlen;
-					} else {
-						nextfont = curfont;
-					}
-					break;
-				}
-			}
-
-			if (!charexists || nextfont)
-				break;
-			else
-				charexists = 0;
-		}
-
-		if (align == AlignR)
-			utf8str = text + i;
-
-		if (utf8strlen) {
-			drw_font_getexts(usedfont, utf8str, utf8strlen, &ew, NULL);
-			/* shorten text if necessary */
-			if (align == AlignL) {
-				for (len = utf8strlen; len && ew > w; ) {
-					len = utf8nextchar(utf8str, len, len, -1);
-					drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
-				}
-			} else {
-				for (len = utf8strlen; len && ew > w; ) {
-					n = utf8nextchar(utf8str, len, 0, +1);
-					utf8str += n;
-					len -= n;
-					drw_font_getexts(usedfont, utf8str, len, &ew, NULL);
-				}
-			}
-
-			if (len) {
-				if (render) {
-					ty = y + (h - usedfont->h) / 2 + usedfont->xfont->ascent;
-					XftDrawStringUtf8(d, &drw->scheme[ColFg],
-					                  usedfont->xfont, align == AlignL ? x : x - ew, ty, (XftChar8 *)utf8str, len);
-				}
-				x += align == AlignL ? ew : -ew;
-				w -= ew;
-			}
-			if (len < utf8strlen)
-				break;
-		}
-
-		if ((align == AlignR && i <= 0) || (align == AlignL && i >= textlen)) {
-			break;
-		} else if (nextfont) {
-			charexists = 0;
-			usedfont = nextfont;
-		} else {
-			/* Regardless of whether or not a fallback font is found, the
-			 * character must be drawn. */
-			charexists = 1;
-
-			fccharset = FcCharSetCreate();
-			FcCharSetAddChar(fccharset, utf8codepoint);
-
-			if (!drw->fonts->pattern) {
-				/* Refer to the comment in xfont_create for more information. */
-				die("the first font in the cache must be loaded from a font string.");
-			}
-
-			fcpattern = FcPatternDuplicate(drw->fonts->pattern);
-			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
-			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-
-			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
-			FcDefaultSubstitute(fcpattern);
-			match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
-
-			FcCharSetDestroy(fccharset);
-			FcPatternDestroy(fcpattern);
-
-			if (match) {
-				usedfont = xfont_create(drw, NULL, match);
-				if (usedfont && XftCharExists(drw->dpy, usedfont->xfont, utf8codepoint)) {
-					for (curfont = drw->fonts; curfont->next; curfont = curfont->next)
-						; /* NOP */
-					curfont->next = usedfont;
-				} else {
-					xfont_free(usedfont);
-					usedfont = drw->fonts;
-				}
-			}
-		}
-	}
-	if (d)
-		XftDrawDestroy(d);
-
-	return x;
-}
--- a/desktop/.dmenu/patch/scroll.h
+++ b/desktop/.dmenu/patch/scroll.h
@@ -1,3 +0,0 @@
-enum { AlignL, AlignR };
-
-int drw_text_align(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int textlen, int align);
--- a/desktop/.dmenu/patch/xresources.c
+++ b/desktop/.dmenu/patch/xresources.c
@@ -1,90 +0,0 @@
-#include <X11/Xresource.h>
-
-void
-readxresources(void)
-{
-	XrmInitialize();
-
-	char* xrm;
-	if ((xrm = XResourceManagerString(drw->dpy))) {
-		char *type;
-		XrmDatabase xdb = XrmGetStringDatabase(xrm);
-		XrmValue xval;
-
-		if (XrmGetResource(xdb, "dmenu.font", "*", &type, &xval))
-			#if PANGO_PATCH
-			strcpy(font, xval.addr);
-			#else
-			fonts[0] = strdup(xval.addr);
-			#endif // PANGO_PATCH
-		#if !PANGO_PATCH
-		else
-			fonts[0] = strdup(fonts[0]);
-		#endif // PANGO_PATCH
-		if (XrmGetResource(xdb, "dmenu.background", "*", &type, &xval))
-			colors[SchemeNorm][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.foreground", "*", &type, &xval))
-			colors[SchemeNorm][ColFg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.selbackground", "*", &type, &xval))
-			colors[SchemeSel][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.selforeground", "*", &type, &xval))
-			colors[SchemeSel][ColFg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.outbackground", "*", &type, &xval))
-			colors[SchemeOut][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.outforeground", "*", &type, &xval))
-			colors[SchemeOut][ColFg] = strdup(xval.addr);
-		#if MORECOLOR_PATCH
-		if (XrmGetResource(xdb, "dmenu.midbackground", "*", &type, &xval))
-			colors[SchemeMid][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.midforeground", "*", &type, &xval))
-			colors[SchemeMid][ColFg] = strdup(xval.addr);
-		#endif // MORECOLOR_PATCH
-		#if BORDER_PATCH
-		if (XrmGetResource(xdb, "dmenu.bordercolor", "*", &type, &xval))
-			colors[SchemeBorder][ColBg] = strdup(xval.addr);
-		#endif // BORDER_PATCH
-		#if HIGHLIGHT_PATCH || FUZZYHIGHLIGHT_PATCH
-		if (XrmGetResource(xdb, "dmenu.selhlbackground", "*", &type, &xval))
-			colors[SchemeSelHighlight][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.selhlforeground", "*", &type, &xval))
-			colors[SchemeSelHighlight][ColFg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.hlbackground", "*", &type, &xval))
-			colors[SchemeNormHighlight][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.hlforeground", "*", &type, &xval))
-			colors[SchemeNormHighlight][ColFg] = strdup(xval.addr);
-		#endif // HIGHLIGHT_PATCH | FUZZYHIGHLIGHT_PATCH
-		#if HIGHPRIORITY_PATCH
-		if (XrmGetResource(xdb, "dmenu.hpbackground", "*", &type, &xval))
-			colors[SchemeHp][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.hpforeground", "*", &type, &xval))
-			colors[SchemeHp][ColFg] = strdup(xval.addr);
-		#endif // HIGHPRIORITY_PATCH
-		#if EMOJI_HIGHLIGHT_PATCH
-		if (XrmGetResource(xdb, "dmenu.hoverbackground", "*", &type, &xval))
-			colors[SchemeHover][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.hoverforeground", "*", &type, &xval))
-			colors[SchemeHover][ColFg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.greenbackground", "*", &type, &xval))
-			colors[SchemeGreen][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.greenforeground", "*", &type, &xval))
-			colors[SchemeGreen][ColFg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.yellowbackground", "*", &type, &xval))
-			colors[SchemeYellow][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.yellowforeground", "*", &type, &xval))
-			colors[SchemeYellow][ColFg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.bluebackground", "*", &type, &xval))
-			colors[SchemeBlue][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.blueforeground", "*", &type, &xval))
-			colors[SchemeBlue][ColFg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.purplebackground", "*", &type, &xval))
-			colors[SchemePurple][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.purpleforeground", "*", &type, &xval))
-			colors[SchemePurple][ColFg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.redbackground", "*", &type, &xval))
-			colors[SchemeRed][ColBg] = strdup(xval.addr);
-		if (XrmGetResource(xdb, "dmenu.redforeground", "*", &type, &xval))
-			colors[SchemeRed][ColFg] = strdup(xval.addr);
-		#endif // EMOJI_HIGHLIGHT_PATCH
-		XrmDestroyDatabase(xdb);
-	}
-}
--- a/desktop/.dmenu/patches.def.h
+++ b/desktop/.dmenu/patches.def.h
@@ -1,349 +0,0 @@
-/* Patches */
-
-/* The alpha patch adds transparency for the dmenu window.
- * You need to uncomment the corresponding line in config.mk to use the -lXrender library
- * when including this patch.
- * https://github.com/bakkeby/patches/blob/master/dmenu/dmenu-alpha-5.0_20210725_523aa08.diff
- */
-#define ALPHA_PATCH 0
-
-/* This adds padding for dmenu in similar fashion to the similarly named patch for dwm. The idea
- * is to have dmenu appear on top of the bar when using said patch in dwm.
- * https://github.com/bakkeby/patches/wiki/barpadding
- */
-#define BARPADDING_PATCH 1
-
-/* This patch adds a border around the dmenu window. It is intended to be used with the center
- * or xyw patches, to make the menu stand out from similarly coloured windows.
- * http://tools.suckless.org/dmenu/patches/border/
- */
-#define BORDER_PATCH 0
-
-/* This patch makes dmenu case-insensitive by default, replacing the
- * case-insensitive -i option with a case sensitive -s option.
- * http://tools.suckless.org/dmenu/patches/case-insensitive/
- */
-#define CASEINSENSITIVE_PATCH 1
-
-/* This patch centers dmenu in the middle of the screen.
- * https://tools.suckless.org/dmenu/patches/center/
- */
-#define CENTER_PATCH 0
-
-/* Minor patch to enable the use of Ctrl+v (XA_PRIMARY) and Ctrl+Shift+v (CLIPBOARD) to paste.
- * By default dmenu only supports Ctrl+y and Ctrl+Shift+y to paste.
- */
-#define CTRL_V_TO_PASTE_PATCH 1
-
-/* This patch adds a flag (-dy) which makes dmenu run the command given to it whenever input
- * is changed with the current input as the last argument and update the option list according
- * to the output of that command.
- * https://tools.suckless.org/dmenu/patches/dynamicoptions/
- */
-#define DYNAMIC_OPTIONS_PATCH 0
-
-/* This patch will allow for emojis on the left side with a colored background when selected.
- * To test this try running:
- *    $ echo -e ":b here\n:p there\n:r and here" | ./dmenu -p "Search..." -W 400 -l 20 -i -h -1
- * NB: the original patch came embedded with the the xyw patch, the morecolors patch and the
- * line height patch and as such is intended to be combined with these.
- * https://tools.suckless.org/dmenu/patches/emoji-highlight/
- */
-#define EMOJI_HIGHLIGHT_PATCH 0
-
-/* This patch make it so that fuzzy matches gets highlighted and is therefore meant
- * to be used together with the fuzzymatch patch.
- * https://tools.suckless.org/dmenu/patches/fuzzyhighlight/
- */
-#define FUZZYHIGHLIGHT_PATCH 1
-
-/* This patch adds support for fuzzy-matching to dmenu, allowing users to type non-consecutive
- * portions of the string to be matched.
- * https://tools.suckless.org/dmenu/patches/fuzzymatch/
- */
-#define FUZZYMATCH_PATCH 1
-
-/* Adds fzf-like functionality for dmenu.
- * Refer to https://github.com/DAFF0D11/dafmenu/ for documentation and example use cases.
- * https://github.com/DAFF0D11/dafmenu/blob/master/patches/dmenu-fzfexpect-5.1.diff
- */
-#define FZFEXPECT_PATCH 0
-
-/* Allows dmenu's entries to be rendered in a grid by adding a new -g flag to specify
- * the number of grid columns. The -g and -l options can be used together to create a
- * G columns * L lines grid.
- * https://tools.suckless.org/dmenu/patches/grid/
- */
-#define GRID_PATCH 0
-
-/* This patch adds the ability to move left and right through a grid.
- * This patch depends on the grid patch.
- * https://tools.suckless.org/dmenu/patches/gridnav/
- */
-#define GRIDNAV_PATCH 0
-
-/* This patch highlights the individual characters of matched text for each dmenu list entry.
- * The fuzzy highlight patch takes precedence over this patch.
- * https://tools.suckless.org/dmenu/patches/highlight/
- */
-#define HIGHLIGHT_PATCH 0
-
-/* This will automatically sort the search result so that high priority items are shown first.
- * https://tools.suckless.org/dmenu/patches/highpriority/
- */
-#define HIGHPRIORITY_PATCH 0
-
-/* This patch causes dmenu to print out the current text each time a key is pressed.
- * https://tools.suckless.org/dmenu/patches/incremental/
- */
-#define INCREMENTAL_PATCH 0
-
-/* This patch adds an option to provide preselected text.
- * https://tools.suckless.org/dmenu/patches/initialtext/
- */
-#define INITIALTEXT_PATCH 0
-
-/* This patch adds a flag which will cause dmenu to select an item immediately if there
- * is only one matching option left.
- * https://tools.suckless.org/dmenu/patches/instant/
- */
-#define INSTANT_PATCH 0
-
-/* This patch adds a '-h' option which sets the minimum height of a dmenu line. This helps
- * integrate dmenu with other UI elements that require a particular vertical size.
- * http://tools.suckless.org/dmenu/patches/line-height/
- */
-#define LINE_HEIGHT_PATCH 1
-
-/* This patch adds a -wm flag which sets override_redirect to false; thus letting your window
- * manager manage the dmenu window.
- *
- * This may be helpful in contexts where you don't want to exclusively bind dmenu or want to
- * treat dmenu more as a "window" rather than as an overlay.
- * https://tools.suckless.org/dmenu/patches/managed/
- */
-#define MANAGED_PATCH 0
-
-/* This patch adds an additional color scheme for highlighting entries adjacent to the current
- * selection.
- * https://tools.suckless.org/dmenu/patches/morecolor/
- */
-#define MORECOLOR_PATCH 0
-
-/* This patch adds basic mouse support for dmenu.
- * https://tools.suckless.org/dmenu/patches/mouse-support/
- */
-#define MOUSE_SUPPORT_PATCH 1
-
-/* Without this patch when you press Ctrl+Enter dmenu just outputs current item and it is not
- * possible to undo that.
- * With this patch dmenu will output all selected items only on exit. It is also possible to
- * deselect any selected item.
- * Also refer to the dmenu_run replacement on the below URL that supports multiple selections.
- *
- * This patch is not compatible with, and takes precedence over, the json, printinputtext,
- * pipeout and non-blocking stdin patches.
- *
- * https://tools.suckless.org/dmenu/patches/multi-selection/
- */
-#define MULTI_SELECTION_PATCH 0
-
-/* This patch provides dmenu the ability for history navigation similar to that of bash.
- *
- * If you take this patch then it is recommended that you also uncomment the line in the
- * dmenu_run script which replaces the exec command.
- *
- * https://tools.suckless.org/dmenu/patches/navhistory/
- */
-#define NAVHISTORY_PATCH 0
-
-/* This patch adds back in the workaround for a BadLength error in the Xft library when color
- * glyphs are used. This is for systems that do not have an updated version of the Xft library
- * (or generally prefer monochrome fonts).
- */
-#define NO_COLOR_EMOJI_PATCH 0
-
-/* Adds the -S option to disable sorting menu items after matching. Useful, for example, when menu
- * items are sorted by their frequency of use (using an external cache) and the most frequently
- * selected items should always appear first regardless of how they were exact, prefix, or
- * substring matches.
- * https://tools.suckless.org/dmenu/patches/no-sort/
- */
-#define NO_SORT_PATCH 0
-
-/* This is a patch to have dmenu read stdin in a non blocking way, making it wait for input both
- * from stdin and from X. This means that you can continue feeding dmenu while you type.
- * This patch is meant to be used along with the incremental patch, so that you can use stdout
- * to feed stdin.
- *
- * This patch is not compatible with the json and multi-selection patches, both of which takes
- * precedence over this patch.
- *
- * https://tools.suckless.org/dmenu/patches/non_blocking_stdin/
- */
-#define NON_BLOCKING_STDIN_PATCH 0
-
-/* Adds text which displays the number of matched and total items in the top right corner of dmenu.
- * https://tools.suckless.org/dmenu/patches/numbers/
- */
-#define NUMBERS_PATCH 0
-
-/* This patch adds simple markup for dmenu using pango markup.
- * This depends on the pango library v1.44 or greater.
- * You need to uncomment the corresponding lines in config.mk to use the pango libraries
- * when including this patch.
- *
- * Note that the pango patch is incompatible with the scroll patch and will result in
- * compilation errors if both are enabled.
- *
- * Note that the pango patch does not protect against the BadLength error from Xft
- * when color glyphs are used, which means that dmenu will crash if color emoji is used.
- *
- * If you need color emoji then you may want to install this patched library from the AUR:
- * https://aur.archlinux.org/packages/libxft-bgra/
- *
- * A long term fix for the libXft library is pending approval of this pull request:
- * https://gitlab.freedesktop.org/xorg/lib/libxft/-/merge_requests/1
- *
- * Also see:
- * https://developer.gnome.org/pygtk/stable/pango-markup-language.html
- * https://github.com/StillANixRookie/dmenu-pango
- */
-#define PANGO_PATCH 0
-
-/* With this patch dmenu will not directly display the keyboard input, but instead replace
- * it with dots. All data from stdin will be ignored.
- * https://tools.suckless.org/dmenu/patches/password/
- */
-#define PASSWORD_PATCH 0
-
-/* This patch allows the selected text to be piped back out with dmenu. This can be useful if you
- * want to display the output of a command on the screen.
- * Only text starting with the character '#' is piped out by default.
- *
- * This patch is not compatible with the json and multi-select patches, both of which takes
- * precedence over this one.
- *
- * https://tools.suckless.org/dmenu/patches/pipeout/
- */
-#define PIPEOUT_PATCH 0
-
-/* Lifted from the listfullwidth patch this simple change just avoids colors for the prompt (with
- * the -p option or in config.h) by making it use the same style as the rest of the input field.
- * The rest of the listfullwidth patch is covered by the vertfull patch.
- * https://tools.suckless.org/dmenu/patches/listfullwidth/
- */
-#define PLAIN_PROMPT_PATCH 0
-
-/* This patch changes the behaviour of matched items and the Tab key to allow tab completion.
- * https://tools.suckless.org/dmenu/patches/prefix-completion/
- */
-#define PREFIXCOMPLETION_PATCH 0
-
-/* This patch adds an option -ps to specify an item by providing the index that should be
- * pre-selected.
- * https://tools.suckless.org/dmenu/patches/preselect/
- */
-#define PRESELECT_PATCH 0
-
-/* This patch allows dmenu to print out the 0-based index of matched text instead of the matched
- * text itself. This can be useful in cases where you would like to select entries from one array
- * of text but index into another, or when you are selecting from an ordered list of non-unique
- * items.
- * https://tools.suckless.org/dmenu/patches/printindex/
- */
-#define PRINTINDEX_PATCH 0
-
-/* This patch adds a flag (-t) which makes Return key to ignore selection and print the input
- * text to stdout. The flag basically swaps the functions of Return and Shift+Return hotkeys.
- *
- * This patch is not compatible with the multi-select and json patches, both of which takes
- * precedence over this one.
- *
- * https://tools.suckless.org/dmenu/patches/printinputtext/
- */
-#define PRINTINPUTTEXT_PATCH 0
-
-/* This patch adds a new flag to dmenu with which text input will be rejected if it would
- * result in no matching item.
- * https://tools.suckless.org/dmenu/patches/reject-no-match/
- */
-#define REJECTNOMATCH_PATCH 0
-
-/* The input width used to be relative to the input options prior to commit e1e1de7:
- * https://git.suckless.org/dmenu/commit/e1e1de7b3b8399cba90ddca9613f837b2dbef7b9.html
- *
- * This had a performance hit when using large data sets and was removed in favour of having the
- * input width take up 1/3rd of the available space.
- *
- * This option adds that feature back in with some performance optimisations at the cost of
- * accuracy and correctness.
- */
-#define RELATIVE_INPUT_WIDTH_PATCH 0
-
-/* This patch adds a '-1' option which disables Shift-Return and Ctrl-Return.
- * This guarantees that dmenu will only output one item, and that item was read from stdin.
- * The original patch used '-r'. This was changed to '-1' to avoid conflict with the incremental
- * patch.
- * https://tools.suckless.org/dmenu/patches/restrict-return/
- */
-#define RESTRICT_RETURN_PATCH 0
-
-/* This patch adds support for text scrolling and no longer appends '...' for long input as
- * it can handle long text.
- * https://tools.suckless.org/dmenu/patches/scroll/
- */
-#define SCROLL_PATCH 0
-
-/* This patch adds -d and -D flags which separates the input into two halves; one half to be
- * displayed in dmenu and the other to be printed to stdout. This patch takes precedence over
- * the TSV patch.
- * https://tools.suckless.org/dmenu/patches/separator/
- */
-#define SEPARATOR_PATCH 0
-
-/* This patch allows the symbols, which are printed in dmenu to indicate that either the input
- * is too long or there are too many options to be shown in dmenu in one line, to be defined.
- * https://tools.suckless.org/dmenu/patches/symbols/
- */
-#define SYMBOLS_PATCH 0
-
-/* With this patch dmenu will split input lines at first tab character and only display first
- * part, but it will perform matching on and output full lines as usual.
- *
- * This can be useful if you want to separate data and representation, for example, a music
- * player wrapper can display only a track title to user, but still supply full filename to
- * the underlying script.
- * https://tools.suckless.org/dmenu/patches/tsv/
- */
-#define TSV_PATCH 0
-
-/* This patch prevents dmenu from indenting items at the same level as the prompt length.
- * https://tools.suckless.org/dmenu/patches/vertfull/
- */
-#define VERTFULL_PATCH 0
-
-/* Adds extended window manager hints such as _NET_WM_WINDOW_TYPE and _NET_WM_WINDOW_TYPE_DOCK.
- * https://github.com/Baitinq/dmenu/blob/master/patches/dmenu-wm_type.diff
- */
-#define WMTYPE_PATCH 0
-
-/* This patch adds the ability to configure dmenu via Xresources. At startup, dmenu will read and
- * apply the resources named below:
- *    dmenu.font          : font or font set
- *    dmenu.background    : normal background color
- *    dmenu.foreground    : normal foreground color
- *    dmenu.selbackground : selected background color
- *    dmenu.selforeground : selected foreground color
- *
- * See patch/xresources.c for more color settings.
- *
- * https://tools.suckless.org/dmenu/patches/xresources/
- */
-#define XRESOURCES_PATCH 0
-
-/* This patch adds options for specifying dmenu window position and width.
- * The center patch takes precedence over the XYW patch if enabled.
- * https://tools.suckless.org/dmenu/patches/xyw/
- */
-#define XYW_PATCH 0
--- a/desktop/.dmenu/recompile
+++ b/desktop/.dmenu/recompile
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-rm -f ./config.h
-sudo make clean install
--- a/desktop/.dmenu/stest.1
+++ b/desktop/.dmenu/stest.1
@@ -1,90 +0,0 @@
-.TH STEST 1 dmenu\-VERSION
-.SH NAME
-stest \- filter a list of files by properties
-.SH SYNOPSIS
-.B stest
-.RB [ -abcdefghlpqrsuwx ]
-.RB [ -n
-.IR file ]
-.RB [ -o
-.IR file ]
-.RI [ file ...]
-.SH DESCRIPTION
-.B stest
-takes a list of files and filters by the files' properties, analogous to
-.IR test (1).
-Files which pass all tests are printed to stdout. If no files are given, stest
-reads files from stdin.
-.SH OPTIONS
-.TP
-.B \-a
-Test hidden files.
-.TP
-.B \-b
-Test that files are block specials.
-.TP
-.B \-c
-Test that files are character specials.
-.TP
-.B \-d
-Test that files are directories.
-.TP
-.B \-e
-Test that files exist.
-.TP
-.B \-f
-Test that files are regular files.
-.TP
-.B \-g
-Test that files have their set-group-ID flag set.
-.TP
-.B \-h
-Test that files are symbolic links.
-.TP
-.B \-l
-Test the contents of a directory given as an argument.
-.TP
-.BI \-n " file"
-Test that files are newer than
-.IR file .
-.TP
-.BI \-o " file"
-Test that files are older than
-.IR file .
-.TP
-.B \-p
-Test that files are named pipes.
-.TP
-.B \-q
-No files are printed, only the exit status is returned.
-.TP
-.B \-r
-Test that files are readable.
-.TP
-.B \-s
-Test that files are not empty.
-.TP
-.B \-u
-Test that files have their set-user-ID flag set.
-.TP
-.B \-v
-Invert the sense of tests, only failing files pass.
-.TP
-.B \-w
-Test that files are writable.
-.TP
-.B \-x
-Test that files are executable.
-.SH EXIT STATUS
-.TP
-.B 0
-At least one file passed all tests.
-.TP
-.B 1
-No files passed all tests.
-.TP
-.B 2
-An error occurred.
-.SH SEE ALSO
-.IR dmenu (1),
-.IR test (1)
--- a/desktop/.dmenu/stest.c
+++ b/desktop/.dmenu/stest.c
@@ -1,109 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <sys/stat.h>
-
-#include <dirent.h>
-#include <limits.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "arg.h"
-char *argv0;
-
-#define FLAG(x)  (flag[(x)-'a'])
-
-static void test(const char *, const char *);
-static void usage(void);
-
-static int match = 0;
-static int flag[26];
-static struct stat old, new;
-
-static void
-test(const char *path, const char *name)
-{
-	struct stat st, ln;
-
-	if ((!stat(path, &st) && (FLAG('a') || name[0] != '.')        /* hidden files      */
-	&& (!FLAG('b') || S_ISBLK(st.st_mode))                        /* block special     */
-	&& (!FLAG('c') || S_ISCHR(st.st_mode))                        /* character special */
-	&& (!FLAG('d') || S_ISDIR(st.st_mode))                        /* directory         */
-	&& (!FLAG('e') || access(path, F_OK) == 0)                    /* exists            */
-	&& (!FLAG('f') || S_ISREG(st.st_mode))                        /* regular file      */
-	&& (!FLAG('g') || st.st_mode & S_ISGID)                       /* set-group-id flag */
-	&& (!FLAG('h') || (!lstat(path, &ln) && S_ISLNK(ln.st_mode))) /* symbolic link     */
-	&& (!FLAG('n') || st.st_mtime > new.st_mtime)                 /* newer than file   */
-	&& (!FLAG('o') || st.st_mtime < old.st_mtime)                 /* older than file   */
-	&& (!FLAG('p') || S_ISFIFO(st.st_mode))                       /* named pipe        */
-	&& (!FLAG('r') || access(path, R_OK) == 0)                    /* readable          */
-	&& (!FLAG('s') || st.st_size > 0)                             /* not empty         */
-	&& (!FLAG('u') || st.st_mode & S_ISUID)                       /* set-user-id flag  */
-	&& (!FLAG('w') || access(path, W_OK) == 0)                    /* writable          */
-	&& (!FLAG('x') || access(path, X_OK) == 0)) != FLAG('v')) {   /* executable        */
-		if (FLAG('q'))
-			exit(0);
-		match = 1;
-		puts(name);
-	}
-}
-
-static void
-usage(void)
-{
-	fprintf(stderr, "usage: %s [-abcdefghlpqrsuvwx] "
-	        "[-n file] [-o file] [file...]\n", argv0);
-	exit(2); /* like test(1) return > 1 on error */
-}
-
-int
-main(int argc, char *argv[])
-{
-	struct dirent *d;
-	char path[PATH_MAX], *line = NULL, *file;
-	size_t linesiz = 0;
-	ssize_t n;
-	DIR *dir;
-	int r;
-
-	ARGBEGIN {
-	case 'n': /* newer than file */
-	case 'o': /* older than file */
-		file = EARGF(usage());
-		if (!(FLAG(ARGC()) = !stat(file, (ARGC() == 'n' ? &new : &old))))
-			perror(file);
-		break;
-	default:
-		/* miscellaneous operators */
-		if (strchr("abcdefghlpqrsuvwx", ARGC()))
-			FLAG(ARGC()) = 1;
-		else
-			usage(); /* unknown flag */
-	} ARGEND;
-
-	if (!argc) {
-		/* read list from stdin */
-		while ((n = getline(&line, &linesiz, stdin)) > 0) {
-			if (line[n - 1] == '\n')
-				line[n - 1] = '\0';
-			test(line, line);
-		}
-		free(line);
-	} else {
-		for (; argc; argc--, argv++) {
-			if (FLAG('l') && (dir = opendir(*argv))) {
-				/* test directory contents */
-				while ((d = readdir(dir))) {
-					r = snprintf(path, sizeof path, "%s/%s",
-					             *argv, d->d_name);
-					if (r >= 0 && (size_t)r < sizeof path)
-						test(path, d->d_name);
-				}
-				closedir(dir);
-			} else {
-				test(*argv, *argv);
-			}
-		}
-	}
-	return match ? 0 : 1;
-}
--- a/desktop/.dmenu/util.c
+++ b/desktop/.dmenu/util.c
@@ -1,36 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "util.h"
-
-void
-die(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	va_end(ap);
-
-	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
-		fputc(' ', stderr);
-		perror(NULL);
-	} else {
-		fputc('\n', stderr);
-	}
-
-	exit(1);
-}
-
-void *
-ecalloc(size_t nmemb, size_t size)
-{
-	void *p;
-
-	if (!(p = calloc(nmemb, size)))
-		die("calloc:");
-	return p;
-}
--- a/desktop/.dmenu/util.h
+++ b/desktop/.dmenu/util.h
@@ -1,12 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#ifndef MAX
-#define MAX(A, B)               ((A) > (B) ? (A) : (B))
-#endif
-#ifndef MIN
-#define MIN(A, B)               ((A) < (B) ? (A) : (B))
-#endif
-#define BETWEEN(X, A, B)        ((A) <= (X) && (X) <= (B))
-
-void die(const char *fmt, ...);
-void *ecalloc(size_t nmemb, size_t size);
--- a/desktop/.st/.gitignore
+++ b/desktop/.st/.gitignore
@@ -1,4 +0,0 @@
-*.o
-config.h
-patches.h
-st
--- a/desktop/.st/FAQ
+++ b/desktop/.st/FAQ
@@ -1,253 +0,0 @@
-## Why does st not handle utmp entries?
-
-Use the excellent tool of [utmp](https://git.suckless.org/utmp/) for this task.
-
-
-## Some _random program_ complains that st is unknown/not recognised/unsupported/whatever!
-
-It means that st doesn’t have any terminfo entry on your system. Chances are
-you did not `make install`. If you just want to test it without installing it,
-you can manually run `tic -sx st.info`.
-
-
-## Nothing works, and nothing is said about an unknown terminal!
-
-* Some programs just assume they’re running in xterm i.e. they don’t rely on
-  terminfo. What you see is the current state of the “xterm compliance”.
-* Some programs don’t complain about the lacking st description and default to
-  another terminal. In that case see the question about terminfo.
-
-
-## How do I scroll back up?
-
-* Using a terminal multiplexer.
-	* `st -e tmux` using C-b [
-	* `st -e screen` using C-a ESC
-* Using the excellent tool of [scroll](https://git.suckless.org/scroll/).
-* Using the scrollback [patch](https://st.suckless.org/patches/scrollback/).
-
-
-## I would like to have utmp and/or scroll functionality by default
-
-You can add the absolute path of both programs in your config.h file. You only
-have to modify the value of utmp and scroll variables.
-
-
-## Why doesn't the Del key work in some programs?
-
-Taken from the terminfo manpage:
-
-	If the terminal has a keypad that transmits codes when the keys
-	are pressed, this information can be given. Note that it is not
-	possible to handle terminals where the keypad only works in
-	local (this applies, for example, to the unshifted HP 2621 keys).
-	If the keypad can be set to transmit or not transmit, give these
-	codes as smkx and rmkx. Otherwise the keypad is assumed to
-	always transmit.
-
-In the st case smkx=E[?1hE= and rmkx=E[?1lE>, so it is mandatory that
-applications which want to test against keypad keys send these
-sequences.
-
-But buggy applications (like bash and irssi, for example) don't do this. A fast
-solution for them is to use the following command:
-
-	$ printf '\033[?1h\033=' >/dev/tty
-
-or
-	$ tput smkx
-
-In the case of bash, readline is used. Readline has a different note in its
-manpage about this issue:
-
-	enable-keypad (Off)
-		When set to On, readline will try to enable the
-		application keypad when it is called. Some systems
-		need this to enable arrow keys.
-
-Adding this option to your .inputrc will fix the keypad problem for all
-applications using readline.
-
-If you are using zsh, then read the zsh FAQ
-<http://zsh.sourceforge.net/FAQ/zshfaq03.html#l25>:
-
-	It should be noted that the O / [ confusion can occur with other keys
-	such as Home and End. Some systems let you query the key sequences
-	sent by these keys from the system's terminal database, terminfo.
-	Unfortunately, the key sequences given there typically apply to the
-	mode that is not the one zsh uses by default (it's the "application"
-	mode rather than the "raw" mode). Explaining the use of terminfo is
-	outside of the scope of this FAQ, but if you wish to use the key
-	sequences given there you can tell the line editor to turn on
-	"application" mode when it starts and turn it off when it stops:
-
-		function zle-line-init () { echoti smkx }
-		function zle-line-finish () { echoti rmkx }
-		zle -N zle-line-init
-		zle -N zle-line-finish
-
-Putting these lines into your .zshrc will fix the problems.
-
-
-## How can I use meta in 8bit mode?
-
-St supports meta in 8bit mode, but the default terminfo entry doesn't
-use this capability. If you want it, you have to use the 'st-meta' value
-in TERM.
-
-
-## I cannot compile st in OpenBSD
-
-OpenBSD lacks librt, despite it being mandatory in POSIX
-<http://pubs.opengroup.org/onlinepubs/9699919799/utilities/c99.html#tag_20_11_13>.
-If you want to compile st for OpenBSD you have to remove -lrt from config.mk, and
-st will compile without any loss of functionality, because all the functions are
-included in libc on this platform.
-
-
-## The Backspace Case
-
-St is emulating the Linux way of handling backspace being delete and delete being
-backspace.
-
-This is an issue that was discussed in suckless mailing list
-<https://lists.suckless.org/dev/1404/20697.html>. Here is why some old grumpy
-terminal users wants its backspace to be how he feels it:
-
-	Well, I am going to comment why I want to change the behaviour
-	of this key. When ASCII was defined in 1968, communication
-	with computers was done using punched cards, or hardcopy
-	terminals (basically a typewriter machine connected with the
-	computer using a serial port).  ASCII defines DELETE as 7F,
-	because, in punched-card terms, it means all the holes of the
-	card punched; it is thus a kind of 'physical delete'. In the
-	same way, the BACKSPACE key was a non-destructive backspace,
-	as on a typewriter.  So, if you wanted to delete a character,
-	you had to BACKSPACE and then DELETE.  Another use of BACKSPACE
-	was to type accented characters, for example 'a BACKSPACE `'.
-	The VT100 had no BACKSPACE key; it was generated using the
-	CONTROL key as another control character (CONTROL key sets to
-	0 b7 b6 b5, so it converts H (code 0x48) into BACKSPACE (code
-	0x08)), but it had a DELETE key in a similar position where
-	the BACKSPACE key is located today on common PC keyboards.
-	All the terminal emulators emulated the difference between
-	these keys correctly: the backspace key generated a BACKSPACE
-	(^H) and delete key generated a DELETE (^?).
-
-	But a problem arose when Linus Torvalds wrote Linux. Unlike
-	earlier terminals, the Linux virtual terminal (the terminal
-	emulator integrated in the kernel) returned a DELETE when
-	backspace was pressed, due to the VT100 having a DELETE key in
-	the same position.  This created a lot of problems (see [1]
-	and [2]). Since Linux has become the king, a lot of terminal
-	emulators today generate a DELETE when the backspace key is
-	pressed in order to avoid problems with Linux. The result is
-	that the only way of generating a BACKSPACE on these systems
-	is by using CONTROL + H. (I also think that emacs had an
-	important point here because the CONTROL + H prefix is used
-	in emacs in some commands (help commands).)
-
-	From point of view of the kernel, you can change the key
-	for deleting a previous character with stty erase. When you
-	connect a real terminal into a machine you describe the type
-	of terminal, so getty configures the correct value of stty
-	erase for this terminal. In the case of terminal emulators,
-	however, you don't have any getty that can set the correct
-	value of stty erase, so you always get the default value.
-	For this reason, it is necessary to add 'stty erase ^H' to your
-	profile if you have changed the value of the backspace key.
-	Of course, another solution is for st itself to modify the
-	value of stty erase.  I usually have the inverse problem:
-	when I connect to non-Unix machines, I have to press CONTROL +
-	h to get a BACKSPACE. The inverse problem occurs when a user
-	connects to my Unix machines from a different system with a
-	correct backspace key.
-
-	[1] http://www.ibb.net/~anne/keyboard.html
-	[2] http://www.tldp.org/HOWTO/Keyboard-and-Console-HOWTO-5.html
-
-
-## But I really want the old grumpy behaviour of my terminal
-
-Apply [1].
-
-[1] https://st.suckless.org/patches/delkey
-
-
-## Why do images not work in st using the w3m image hack?
-
-w3mimg uses a hack that draws an image on top of the terminal emulator Drawable
-window. The hack relies on the terminal to use a single buffer to draw its
-contents directly.
-
-st uses double-buffered drawing so the image is quickly replaced and may show a
-short flicker effect.
-
-Below is a patch example to change st double-buffering to a single Drawable
-buffer.
-
-diff --git a/x.c b/x.c
--- a/x.c
-+++ b/x.c
-@@ -732,10 +732,6 @@ xresize(int col, int row)
- 	win.tw = col * win.cw;
- 	win.th = row * win.ch;
- 
-	XFreePixmap(xw.dpy, xw.buf);
-	xw.buf = XCreatePixmap(xw.dpy, xw.win, win.w, win.h,
-			DefaultDepth(xw.dpy, xw.scr));
-	XftDrawChange(xw.draw, xw.buf);
- 	xclear(0, 0, win.w, win.h);
- 
- 	/* resize to new width */
-@@ -1148,8 +1144,7 @@ xinit(int cols, int rows)
- 	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 = xw.win;
- 	XSetForeground(xw.dpy, dc.gc, dc.col[defaultbg].pixel);
- 	XFillRectangle(xw.dpy, xw.buf, dc.gc, 0, 0, win.w, win.h);
- 
-@@ -1632,8 +1627,6 @@ xdrawline(Line line, int x1, int y1, int x2)
- void
- xfinishdraw(void)
- {
-	XCopyArea(xw.dpy, xw.buf, xw.win, dc.gc, 0, 0, win.w,
-			win.h, 0, 0);
- 	XSetForeground(xw.dpy, dc.gc,
- 			dc.col[IS_SET(MODE_REVERSE)?
- 				defaultfg : defaultbg].pixel);
-
-
-## BadLength X error in Xft when trying to render emoji
-
-Xft makes st crash when rendering color emojis with the following error:
-
-"X Error of failed request:  BadLength (poly request too large or internal Xlib length error)"
-  Major opcode of failed request:  139 (RENDER)
-  Minor opcode of failed request:  20 (RenderAddGlyphs)
-  Serial number of failed request: 1595
-  Current serial number in output stream:  1818"
-
-This is a known bug in Xft (not st) which happens on some platforms and
-combination of particular fonts and fontconfig settings.
-
-See also:
-https://gitlab.freedesktop.org/xorg/lib/libxft/issues/6
-https://bugs.freedesktop.org/show_bug.cgi?id=107534
-https://bugzilla.redhat.com/show_bug.cgi?id=1498269
-
-The solution is to remove color emoji fonts or disable this in the fontconfig
-XML configuration.  As an ugly workaround (which may work only on newer
-fontconfig versions (FC_COLOR)), the following code can be used to mask color
-fonts:
-
-	FcPatternAddBool(fcpattern, FC_COLOR, FcFalse);
-
-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
--- a/desktop/.st/LEGACY
+++ b/desktop/.st/LEGACY
@@ -1,17 +0,0 @@
-A STATEMENT ON LEGACY SUPPORT
-
-In the terminal world there is much cruft that comes from old and unsup‐
-ported terminals that inherit incompatible modes  and  escape  sequences
-which noone is able to know, except when he/she comes from that time and
-developed a graphical vt100 emulator at that time.
-
-One  goal  of  st is to only support what is really needed. When you en‐
-counter a sequence which you really need, implement it.  But  while  you
-are  at it,  do not add the other cruft you might encounter while sneek‐
-ing at other terminal emulators. History has bloated them and  there  is
-no real evidence that most of the sequences are used today.
-
-
-Christoph Lohmann <20h@r-36.net>
-2012-09-13T07:00:36.081271045+02:00
-
--- a/desktop/.st/LICENSE
+++ b/desktop/.st/LICENSE
@@ -1,34 +0,0 @@
-MIT/X Consortium License
-
-© 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>
-© 2008-2017 Anselm R Garbe <garbeam at gmail dot com>
-© 2012-2017 Roberto E. Vargas Caballero <k0ga at shike2 dot com>
-© 2012-2016 Christoph Lohmann <20h at r-36 dot net>
-© 2013 Eon S. Jeon <esjeon at hyunmu dot am>
-© 2013 Alexander Sedov <alex0player at gmail dot com>
-© 2013 Mark Edgar <medgar123 at gmail dot com>
-© 2013-2014 Eric Pruitt <eric.pruitt at gmail dot com>
-© 2013 Michael Forney <mforney at mforney dot org>
-© 2013-2014 Markus Teich <markus dot teich at stusta dot mhn dot de>
-© 2014-2015 Laslo Hunhold <dev at frign dot de>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
--- a/desktop/.st/Makefile
+++ b/desktop/.st/Makefile
@@ -1,63 +0,0 @@
-# st - simple terminal
-# See LICENSE file for copyright and license details.
-.POSIX:
-
-include config.mk
-
-SRC = st.c x.c $(LIGATURES_C) $(SIXEL_C)
-OBJ = $(SRC:.c=.o)
-
-all: options st
-
-options:
-	@echo st build options:
-	@echo "CFLAGS  = $(STCFLAGS)"
-	@echo "LDFLAGS = $(STLDFLAGS)"
-	@echo "CC      = $(CC)"
-
-config.h:
-	cp config.def.h config.h
-
-patches.h:
-	cp patches.def.h patches.h
-
-.c.o:
-	$(CC) $(STCFLAGS) -c $<
-
-st.o: config.h st.h win.h
-x.o: arg.h config.h st.h win.h $(LIGATURES_H)
-
-$(OBJ): config.h config.mk patches.h
-
-st: $(OBJ)
-	$(CC) -o $@ $(OBJ) $(STLDFLAGS)
-
-clean:
-	rm -f st $(OBJ) st-$(VERSION).tar.gz
-
-dist: clean
-	mkdir -p st-$(VERSION)
-	cp -R FAQ LEGACY TODO LICENSE Makefile README config.mk\
-		config.def.h st.info st.1 arg.h st.h win.h $(LIGATURES_H) $(SRC)\
-		st-$(VERSION)
-	tar -cf - st-$(VERSION) | gzip > st-$(VERSION).tar.gz
-	rm -rf st-$(VERSION)
-
-install: st
-	mkdir -p $(DESTDIR)$(PREFIX)/bin
-	cp -f st $(DESTDIR)$(PREFIX)/bin
-	chmod 755 $(DESTDIR)$(PREFIX)/bin/st
-	mkdir -p $(DESTDIR)$(MANPREFIX)/man1
-	sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
-	chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
-	tic -sx st.info
-	mkdir -p $(DESTDIR)$(PREFIX)/share/applications # desktop-entry patch
-	cp -n st.desktop $(DESTDIR)$(PREFIX)/share/applications # desktop-entry patch
-	@echo Please see the README file regarding the terminfo entry of st.
-
-uninstall:
-	rm -f $(DESTDIR)$(PREFIX)/bin/st
-	rm -f $(DESTDIR)$(MANPREFIX)/man1/st.1
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/st.desktop # desktop-entry patch
-
-.PHONY: all options clean dist install uninstall
--- a/desktop/.st/README
+++ b/desktop/.st/README
@@ -1,34 +0,0 @@
-st - simple terminal
--------------------
-st is a simple terminal emulator for X which sucks less.
-
-
-Requirements
------------
-In order to build st you need the Xlib header files.
-
-
-Installation
------------
-Edit config.mk to match your local setup (st is installed into
-the /usr/local namespace by default).
-
-Afterwards enter the following command to build and install st (if
-necessary as root):
-
-    make clean install
-
-
-Running st
----------
-If you did not install st with make clean install, you must compile
-the st terminfo entry with the following command:
-
-    tic -sx st.info
-
-See the man page for additional details.
-
-Credits
-------
-Based on Aurélien APTEL <aurelien dot aptel at gmail dot com> bt source code.
-
--- a/desktop/.st/README.md
+++ b/desktop/.st/README.md
@@ -1,307 +0,0 @@
-Similar to [dwm-flexipatch](https://github.com/bakkeby/dwm-flexipatch) this st 0.9 (e5e9598, 2022-10-25) project has a different take on st patching. It uses preprocessor directives to decide whether or not to include a patch during build time. Essentially this means that this build, for better or worse, contains both the patched _and_ the original code. The aim being that you can select which patches to include and the build will contain that code and nothing more.
-
-For example to include the `alpha` patch then you would only need to flip this setting from 0 to 1 in [patches.h](https://github.com/bakkeby/st-flexipatch/blob/master/patches.def.h):
-```c
-#define ALPHA_PATCH 1
-```
-
-Once you have found out what works for you and what doesn't then you should be in a better position to choose patches should you want to start patching from scratch.
-
-Alternatively if you have found the patches you want, but don't want the rest of the flexipatch entanglement on your plate then you may want to have a look at [flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer); a custom pre-processor tool that removes all the unused flexipatch code leaving you with a build that contains the patches you selected.
-
-Refer to [https://st.suckless.org/](https://st.suckless.org/) for details on the st terminal, how to install it and how it works.
-
---
-
-### Changelog:
-
-2022-10-24 - Added the fullscreen patch
-
-2022-08-28 - Added the use XftFontMatch patch
-
-2022-08-24 - Added the no window decorations patch
-
-2022-04-11 - Added the background image reload patch
-
-2022-03-10 - Added the background image patch
-
-2022-02-24 - Upgraded to st 0.8.5 e823e23, 2022-02-17 - removing osc_10_11_12_2 patch as no longer relevant
-
-2021-08-18 - Added the CSI 22 & 23 patch
-
-2021-07-26 - Added columns patch
-
-2021-07-07 - Added sixel scrollback and the openurlonclick patch
-
-2021-06-09 - Added the hide terminal cursor patch
-
-2021-05-16 - Added swapmouse patch
-
-2021-05-11 - Added default cursor patch
-
-2021-05-10 - Upgrade to 46b02f, 2021-03-28
-
-2021-05-09 - Added the sync, alpha-focus-hightlight and vim browse patches
-
-2021-05-08 - Added blinking cursor, delkey, undercurl,universcroll, desktopentry, netwmicon and osc_10_11_12_2 patches
-
-2021-05-07 - Added xresources reload patch
-
-2021-04-21 - Added (temporary?) hack for Variable Fonts (VT) support
-
-2021-03-10 - Added sixel support
-
-2021-02-26 - Added the dynamic cursor color patch
-
-2021-02-15 - Added the alpha gradient patch
-
-2020-11-14 - Added the wide glyphs patch
-
-2020-10-23 - Added the monochrome patch
-
-2020-08-08 - Re-added the visualbell patch
-
-2020-06-26 - Added the single drawable buffer patch as per the FAQ in order to get w3m images to display
-
-2020-06-25 - Upgrade to 0.8.4 (367803, 2020-06-19)
-
-2020-06-14 - Added w3m patch
-
-2020-06-10 - Upgrade to 249ef9, 2020-06-01
-
-2020-06-05 - Added the ligatures patch
-
-2020-05-20 - Upgrade to 222876, 2020-05-09, and removed visualbell 1, 2, 3 patches and force redraw after keypress due to incompatibility. Refer to tag [371878](https://github.com/bakkeby/st-flexipatch/tree/371878) if you want to try these out.
-
-2020-04-20 - Upgrade to c279f5, 2020-04-19, and added the force redraw on pselect after key is pressed patch and the externalpipein patch
-
-2020-03-29 - Added invert and workingdir patches
-
-2020-03-24 - Upgraded to latest (master) of st (commit 51e19ea11dd42eefed1ca136ee3f6be975f618b1 at the time of writing). Custom changes to make the altscreen mouse scollback patch working.
-
-2020-03-21 - Added font2 patch
-
-2020-01-07 - Added st embedder patch
-
-2019-10-16 - Introduced [flexipatch-finalizer](https://github.com/bakkeby/flexipatch-finalizer)
-
-2019-09-17 - Added relativeborder, fix-keyboard-input, iso14755, visualbell, right-click-to-plumb, boxdraw and keyboard-select patches
-
-2019-09-16 - Added alpha, anysize, bold-is-not-bright, clipboard, copyurl, disable-fonts, externalpipe, fixime, hidecursor, newterm, open-copied-url, vertcenter, scrollback, spoiler, themed cursor and xresources patches
-
-### Patches included:
-
-   - [alpha](https://st.suckless.org/patches/alpha/)
-      - adds transparency for the terminal
-
-   - [alpha-focus-highlight](https://st.suckless.org/patches/alpha_focus_highlight/)
-      - allows the user to specify two distinct opacity values or background colors in order to
-        easily differentiate between focused and unfocused terminal windows
-
-   - [anysize](https://st.suckless.org/patches/anysize/)
-      - allows st to reize to any pixel size rather than snapping to character width / height
-
-   - [~anysize\_nobar~](https://github.com/connor-brooks/st-anysize-nobar)
-      - ~a patch that aims to prevent black bars being drawn on the edges of st terminals using the
-        anysize patch~
-
-   - [background-image](https://st.suckless.org/patches/background_image/)
-      - draws a background image in farbfeld format in place of the defaultbg color allowing for
-        pseudo transparency
-
-   - background-image-reload
-      - allows the background image to be reloaded similar to xresources using USR1 signals
-
-   - [blinking-cursor](https://st.suckless.org/patches/blinking_cursor/)
-      - allows the use of a blinking cursor
-
-   - [bold-is-not-bright](https://st.suckless.org/patches/bold-is-not-bright/)
-      - by default bold text is rendered with a bold font in the bright variant of the current color
-      - this patch makes bold text rendered simply as bold, leaving the color unaffected
-
-   - [boxdraw](https://st.suckless.org/patches/boxdraw/)
-      - adds dustom rendering of lines/blocks/braille characters for gapless alignment
-
-   - [clipboard](https://st.suckless.org/patches/clipboard/)
-      - by default st only sets PRIMARY on selection
-      - this patch makes st set CLIPBOARD on selection
-
-   - [columns](https://github.com/bakkeby/st-flexipatch/issues/34)
-      - allows st to be resized without cutting off text when the terminal window is made larger again
-      - text does not wrap when the terminal window is made smaller
-
-   - [copyurl](https://st.suckless.org/patches/copyurl/)
-      - this patch allows you to select and copy the last URL displayed with Mod+l
-      - multiple invocations cycle through the available URLs
-
-   - [csi\_23\_23](https://st.suckless.org/patches/csi_22_23/)
-      - adds support for CSI escape sequences 22 and 23, which save and restores the window title
-        (for instance nvim does this when opening and closing)
-
-   - default-cursor
-      - minor change allowing escape sequences like `\e[ q` or `\e[0 q` to set the cursor back to default configuration instead of a blinking block
-      - while many terminals do this the behaviour is not according to the specification
-
-   - [delkey](https://st.suckless.org/patches/delkey/)
-      - return BS on pressing backspace and DEL on pressing the delete key
-
-   - [desktopentry](https://st.suckless.org/patches/desktopentry/)
-      - adds a desktop entry for st so that it can be displayed with an icon when using a graphical launcher
-      - this patch only applies to the Makefile and is enabled by default, remove if not needed
-
-   - [disable-fonts](https://st.suckless.org/patches/disable_bold_italic_fonts/)
-      - this patch adds the option of disabling bold/italic/roman fonts globally
-
-   - [dynamic-cursor-color](https://st.suckless.org/patches/dynamic-cursor-color/)
-      - this patch makes the cursor color the inverse of the current cell color
-
-   - [externalpipe](https://st.suckless.org/patches/externalpipe/)
-      - this patch allows for reading and writing st's screen through a pipe, e.g. to pass info to dmenu
-
-   - [externalpipein](https://lists.suckless.org/hackers/2004/17218.html)
-      - this patch prevents the reset of the signal handler set on SIGCHILD, when the forked process that executes the external process exits
-      - it adds the externalpipein function to redirect the standard output of the external command to the slave size of the pty, that is, as if the external program had been manually executed on the terminal
-      - this can be used to send desired escape sequences to the terminal with a shortcut (e.g. to change colors)
-
-   - [~fixime~](https://st.suckless.org/patches/fix_ime/)
-      - adds better Input Method Editor (IME) support
-      - (included in the base as per [35f7db](https://git.suckless.org/st/commit/e85b6b64660214121164ea97fb098eaa4935f7db.html))
-
-   - [fix-keyboard-input](https://st.suckless.org/patches/fix_keyboard_input/)
-      - allows cli applications to use all the fancy key combinations that are available to GUI applications
-
-   - [font2](https://st.suckless.org/patches/font2/)
-      - allows you to add a spare font besides the default
-
-   - [~force-redraw-after-keypress~](https://lists.suckless.org/hackers/2004/17221.html)
-      - ~this patch forces the terminal to check for new data on the tty on keypress with the aim of reducing input latency~
-
-   - [fullscreen](https://st.suckless.org/patches/fullscreen/)
-      - allows the st window to go into fullscreen mode
-
-   - [gradient](https://st.suckless.org/patches/gradient/)
-      - adds gradient transparency to st
-      - depends on the alpha patch
-
-   - [hidecursor](https://st.suckless.org/patches/hidecursor/)
-      - hides the X cursor whenever a key is pressed and show it back when the mouse is moved in the terminal window
-
-   - [hide-terminal-cursor](https://www.reddit.com/r/suckless/comments/nvee8h/how_to_hide_cursor_in_st_is_there_a_patch_for_it/)
-      - hides the terminal cursor when the window loses focus (as opposed to showing a hollow cursor)
-
-   - [invert](https://st.suckless.org/patches/invert/)
-      - adds a keybinding that lets you invert the current colorscheme of st
-      - this provides a simple way to temporarily switch to a light colorscheme if you use a dark colorscheme or visa-versa
-
-   - [iso14755](https://st.suckless.org/patches/iso14755/)
-      - pressing the default binding Ctrl+Shift-i will popup dmenu, asking you to enter a unicode codepoint that will be converted to a glyph and then pushed to st
-
-   - [keyboard-select](https://st.suckless.org/patches/keyboard_select/)
-      - allows you to select text on the terminal using keyboard shortcuts
-
-   - [ligatures](https://st.suckless.org/patches/ligatures/)
-      - adds support for drawing ligatures using the Harfbuzz library to transform original text of a single line to a list of glyphs with ligatures included
-
-   - [monochrome](https://www.reddit.com/r/suckless/comments/ixbx6z/how_to_use_black_and_white_only_for_st/)
-      - makes st ignore terminal color attributes to make for a monochrome look
-
-   - [netwmicon](https://st.suckless.org/patches/netwmicon/)
-      - this patch sets the \_NET\_WM\_ICON X property with a hardcoded icon for st
-
-   - [newterm](https://st.suckless.org/patches/newterm/)
-      - allows you to spawn a new st terminal using Ctrl-Shift-Return
-      - it will have the same CWD (current working directory) as the original st instance
-
-   - [no-window-decorations](https://github.com/bakkeby/patches/wiki/no_window_decorations)
-      - makes st show without window decorations if the WM supports it
-
-   - [open-copied-url](https://st.suckless.org/patches/open_copied_url/)
-      - open contents of the clipboard in a user-defined browser
-
-   - [openurlonclick](https://www.reddit.com/r/suckless/comments/cc83om/st_open_url/)
-      - allows for URLs to be opened directly when you click on them
-
-   - [~osc\_10\_11\_12\_2~](https://st.suckless.org/patches/osc_10_11_12_2/)
-      - ~this patch adds support for OSC escape sequences 10, 11, and 12 in the way they are~
-        ~implemented in most other terminals (e.g libvte, kitty)~
-      - ~specifically it differs from~ [~osc_10_11_12~](https://st.suckless.org/patches/osc_10_11_12/)
-        ~in that it treats the background and foreground colors as distinct from palette colours 01~
-        ~and 07 in order to facilitate the use of theme setting scripts like~
-        [~theme.sh~](https://github.com/lemnos/theme.sh) ~which expect these colours to be distinct~
-
-   - [relativeborder](https://st.suckless.org/patches/relativeborder/)
-      - allows you to specify a border that is relative in size to the width of a cell in the
-        terminal
-
-   - [right-click-to-plumb](https://st.suckless.org/patches/right_click_to_plumb/)
-      - allows you to right-click on some selected text to send it to the plumbing program of choice
-
-   - [scrollback](https://st.suckless.org/patches/scrollback/)
-      - allows you scroll back through terminal output using keyboard shortcuts or mousewheel
-
-   - sixel
-      - this patch adds SIXEL graphics support
-
-   - st-embedder
-      - this patch allows clients to embed into the st window and can be useful if you tend to
-        start X applications from the terminal
-      - the behavior is similar to Plan 9 where applications can take over windows
-
-   - [spoiler](https://st.suckless.org/patches/spoiler/)
-      - use inverted defaultbg/fg for selection when bg/fg are the same
-
-   - [swapmouse](https://st.suckless.org/patches/swapmouse/)
-      - changes the mouse shape to the global default when the running program subscribes for mouse
-        events, for instance, in programs like ranger and fzf
-      - it emulates the behaviour shown by vte terminals like termite
-
-   - [sync](https://st.suckless.org/patches/sync/)
-      - adds synchronized-updates/application-sync support in st
-      - this has no effect except when an application uses the synchronized-update escape sequences
-      - with this patch nearly all cursor flicker is eliminated in tmux, and tmux detects it
-        automatically via terminfo
-
-   - [themed-cursor](https://st.suckless.org/patches/themed_cursor/)
-      - instead of a default X cursor, use the xterm cursor from your cursor theme
-
-   - [undercurl](https://st.suckless.org/patches/undercurl/)
-      - adds support for special underlines, e.g. curly / wavy underlines
-
-   - [universcroll](https://st.suckless.org/patches/universcroll/)
-      - allows mouse scroll without modifier keys for regardless of alt screen using the external
-        scroll program
-
-   - [use-XftFontMatch](https://git.suckless.org/st/commit/528241aa3835e2f1f052abeeaf891737712955a0.html)
-      - use XftFontMatch in place of FcFontMatch to allow font to scale with Xft.dpi resource
-        setting
-
-   - [vertcenter](https://st.suckless.org/patches/vertcenter/)
-      - vertically center lines in the space available if you have set a larger chscale in config.h
-
-   - [vim-browse](https://st.suckless.org/patches/vim_browse/)
-      - the vim-browse patch offers the possibility to move through the terminal history-buffer,
-        search for strings using VIM-like motions, operations and quantifiers
-      - it overlays the screen with highlighted search results and displays the current operation
-        / motions / search string in the bottom right corner
-
-   - [visualbell](https://st.suckless.org/patches/visualbell/)
-      - adds visual indicators for the terminal bell event
-
-   - [w3m](https://st.suckless.org/patches/w3m/)
-      - adds support for w3m images
-
-   - [wide-glyphs](https://www.reddit.com/r/suckless/comments/jt90ai/update_support_for_proper_glyph_rendering_in_st/)
-      - adds proper support for wide glyphs, as opposed to rendering smaller or cut glyphs
-
-   - [wide-glyph-spacing](https://github.com/googlefonts/Inconsolata/issues/42#issuecomment-737508890)
-      - there is a known issue that Google's Variable Fonts (VF) can end up with letter spacing
-        that is too wide in programs that use Xft, for example Inconsolata v3.000
-      - this is intended as a temporary workaround / patch / hack until (if) this is fixed in the
-        Xft library itself
-
-   - [workingdir](https://st.suckless.org/patches/workingdir/)
-      - allows user to specify the initial path st should use as the working directory
-
-   - [xresources](https://st.suckless.org/patches/xresources/)
-      - adds the ability to configure st via Xresources
-      - during startup, st will read and apply the resources named in the resources[] array in config.h
--- a/desktop/.st/TODO
+++ b/desktop/.st/TODO
@@ -1,28 +0,0 @@
-vt emulation
------------
-
-* double-height support
-
-code & interface
----------------
-
-* add a simple way to do multiplexing
-
-drawing
-------
-* add diacritics support to xdraws()
-	* switch to a suckless font drawing library
-* make the font cache simpler
-* add better support for brightening of the upper colors
-
-bugs
----
-
-* fix shift up/down (shift selection in emacs)
-* remove DEC test sequence when appropriate
-
-misc
----
-
-    $ grep -nE 'XXX|TODO' st.c
-
--- a/desktop/.st/arg.h
+++ b/desktop/.st/arg.h
@@ -1,50 +0,0 @@
-/*
- * Copy me if you can.
- * by 20h
- */
-
-#ifndef ARG_H__
-#define ARG_H__
-
-extern char *argv0;
-
-/* use main(int argc, char *argv[]) */
-#define ARGBEGIN	for (argv0 = *argv, argv++, argc--;\
-					argv[0] && argv[0][0] == '-'\
-					&& argv[0][1];\
-					argc--, argv++) {\
-				char argc_;\
-				char **argv_;\
-				int brk_;\
-				if (argv[0][1] == '-' && argv[0][2] == '\0') {\
-					argv++;\
-					argc--;\
-					break;\
-				}\
-				int i_;\
-				for (i_ = 1, brk_ = 0, argv_ = argv;\
-						argv[0][i_] && !brk_;\
-						i_++) {\
-					if (argv_ != argv)\
-						break;\
-					argc_ = argv[0][i_];\
-					switch (argc_)
-
-#define ARGEND			}\
-			}
-
-#define ARGC()		argc_
-
-#define EARGF(x)	((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
-				((x), abort(), (char *)0) :\
-				(brk_ = 1, (argv[0][i_+1] != '\0')?\
-					(&argv[0][i_+1]) :\
-					(argc--, argv++, argv[0])))
-
-#define ARGF()		((argv[0][i_+1] == '\0' && argv[1] == NULL)?\
-				(char *)0 :\
-				(brk_ = 1, (argv[0][i_+1] != '\0')?\
-					(&argv[0][i_+1]) :\
-					(argc--, argv++, argv[0])))
-
-#endif
--- a/desktop/.st/config.def.h
+++ b/desktop/.st/config.def.h
@@ -1,763 +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";
-#if FONT2_PATCH
-/* Spare fonts */
-static char *font2[] = {
-/*	"Inconsolata for Powerline:pixelsize=12:antialias=true:autohint=true", */
-/*	"Hack Nerd Font Mono:pixelsize=11:antialias=true:autohint=true", */
-};
-#endif // FONT2_PATCH
-
-#if BACKGROUND_IMAGE_PATCH
-/*
- * background image
- * expects farbfeld format
- * pseudo transparency fixes coordinates to the screen origin
- */
-static const char *bgfile = "/path/to/image.ff";
-static const int pseudotransparency = 0;
-#endif // BACKGROUND_IMAGE_PATCH
-
-#if RELATIVEBORDER_PATCH
-/* borderperc: percentage of cell width to use as a border
- *             0 = no border, 100 = border width is same as cell width */
-int borderperc = 20;
-#else
-static int borderpx = 2;
-#endif // RELATIVEBORDER_PATCH
-
-#if OPENURLONCLICK_PATCH
-/* modkey options: ControlMask, ShiftMask or XK_ANY_MOD */
-static uint url_opener_modkey = XK_ANY_MOD;
-static char *url_opener = "xdg-open";
-#endif // OPENURLONCLICK_PATCH
-
-/*
- * 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 */
-#if SIXEL_PATCH
-char *vtiden = "\033[?12;4c";
-#else
-char *vtiden = "\033[?6c";
-#endif
-
-/* 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;
-
-#if SYNC_PATCH
-/*
- * Synchronized-Update timeout in ms
- * https://gitlab.com/gnachman/iterm2/-/wikis/synchronized-updates-spec
- */
-static uint su_timeout = 200;
-#endif // SYNC_PATCH
-
-/*
- * 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;
-
-#if BOXDRAW_PATCH
-/*
- * 1: render most of the lines/blocks characters without using the font for
- *    perfect alignment between cells (U2500 - U259F except dashes/diagonals).
- *    Bold affects lines thickness if boxdraw_bold is not 0. Italic is ignored.
- * 0: disable (render all U25XX glyphs normally from the font).
- */
-const int boxdraw = 0;
-const int boxdraw_bold = 0;
-
-/* braille (U28XX):  1: render as adjacent "pixels",  0: use font */
-const int boxdraw_braille = 0;
-#endif // BOXDRAW_PATCH
-
-/*
- * 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;
-
-#if ALPHA_PATCH
-/* bg opacity */
-float alpha = 0.8;
-#if ALPHA_GRADIENT_PATCH
-float grad_alpha = 0.54; //alpha value that'll change
-float stat_alpha = 0.46; //constant alpha value that'll get added to grad_alpha
-#endif // ALPHA_GRADIENT_PATCH
-#if ALPHA_FOCUS_HIGHLIGHT_PATCH
-float alphaUnfocused = 0.6;
-#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
-#endif // ALPHA_PATCH
-
-/* 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 */
-	"#add8e6", /* 256 -> cursor */
-	"#555555", /* 257 -> rev cursor*/
-	"#000000", /* 258 -> bg */
-	"#e5e5e5", /* 259 -> fg */
-};
-
-
-/*
- * Default colors (colorname index)
- * foreground, background, cursor, reverse cursor
- */
-#if ALPHA_PATCH && ALPHA_FOCUS_HIGHLIGHT_PATCH
-unsigned int defaultbg = 0;
-unsigned int bg = 17, bgUnfocused = 16;
-#else
-unsigned int defaultbg = 258;
-#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
-unsigned int defaultfg = 259;
-unsigned int defaultcs = 256;
-unsigned int defaultrcs = 257;
-
-#if VIM_BROWSE_PATCH
-unsigned int const currentBg = 6, buffSize = 2048;
-/// Enable double / triple click yanking / selection of word / line.
-int const mouseYank = 1, mouseSelect = 0;
-/// [Vim Browse] Colors for search results currently on screen.
-unsigned int const highlightBg = 160, highlightFg = 15;
-char const wDelS[] = "!\"#$%&'()*+,-./:;<=>?@[\\]^`{|}~", wDelL[] = " \t";
-char *nmKeys [] = {              ///< Shortcusts executed in normal mode
-  "R/Building\nN", "r/Building\n", "X/juli@machine\nN", "x/juli@machine\n",
-  "Q?[Leaving vim, starting execution]\n","F/: error:\nN", "f/: error:\n", "DQf"
-};
-unsigned int const amountNmKeys = sizeof(nmKeys) / sizeof(*nmKeys);
-/// Style of the {command, search} string shown in the right corner (y,v,V,/)
-Glyph styleSearch = {' ', ATTR_ITALIC | ATTR_BOLD_FAINT, 7, 16};
-Glyph style[] = {{' ',ATTR_ITALIC|ATTR_FAINT,15,16}, {' ',ATTR_ITALIC,232,11},
-                 {' ', ATTR_ITALIC, 232, 4}, {' ', ATTR_ITALIC, 232, 12}};
-#endif // VIM_BROWSE_PATCH
-
-#if BLINKING_CURSOR_PATCH
-/*
- * https://invisible-island.net/xterm/ctlseqs/ctlseqs.html#h4-Functions-using-CSI-_-ordered-by-the-final-character-lparen-s-rparen:CSI-Ps-SP-q.1D81
- * Default style of cursor
- * 0: Blinking block
- * 1: Blinking block (default)
- * 2: Steady block ("â–ˆ")
- * 3: Blinking underline
- * 4: Steady underline ("_")
- * 5: Blinking bar
- * 6: Steady bar ("|")
- * 7: Blinking st cursor
- * 8: Steady st cursor
- */
-static unsigned int cursorstyle = 1;
-static Rune stcursor = 0x2603; /* snowman (U+2603) */
-#else
-/*
- * Default shape of cursor
- * 2: Block ("█")
- * 4: Underline ("_")
- * 6: Bar ("|")
- * 7: Snowman ("☃")
- */
-static unsigned int cursorshape = 2;
-#endif // BLINKING_CURSOR_PATCH
-
-/*
- * Default columns and rows numbers
- */
-
-static unsigned int cols = 80;
-static unsigned int rows = 24;
-
-#if THEMED_CURSOR_PATCH
-/*
- * Default shape of the mouse cursor
- */
-static char* mouseshape = "xterm";
-#else
-/*
- * Default colour and shape of the mouse cursor
- */
-static unsigned int mouseshape = XC_xterm;
-static unsigned int mousefg = 7;
-static unsigned int mousebg = 0;
-#endif // THEMED_CURSOR_PATCH
-
-/*
- * Color used to display font attributes when fontconfig selected a font which
- * doesn't match the ones requested.
- */
-static unsigned int defaultattr = 11;
-
-#if XRESOURCES_PATCH
-/*
- * 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[258] },
-		{ "foreground",   STRING,  &colorname[259] },
-		{ "cursorColor",  STRING,  &colorname[256] },
-		{ "termname",     STRING,  &termname },
-		{ "shell",        STRING,  &shell },
-		{ "minlatency",   INTEGER, &minlatency },
-		{ "maxlatency",   INTEGER, &maxlatency },
-		{ "blinktimeout", INTEGER, &blinktimeout },
-		{ "bellvolume",   INTEGER, &bellvolume },
-		{ "tabspaces",    INTEGER, &tabspaces },
-		#if RELATIVEBORDER_PATCH
-		{ "borderperc",   INTEGER, &borderperc },
-		#else
-		{ "borderpx",     INTEGER, &borderpx },
-		#endif // RELATIVEBORDER_PATCH
-		{ "cwscale",      FLOAT,   &cwscale },
-		{ "chscale",      FLOAT,   &chscale },
-		#if ALPHA_PATCH
-		{ "alpha",        FLOAT,   &alpha },
-		#endif // ALPHA_PATCH
-		#if ALPHA_FOCUS_HIGHLIGHT_PATCH
-		{ "alphaUnfocused",FLOAT,  &alphaUnfocused },
-		#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
-};
-#endif // XRESOURCES_PATCH
-
-/*
- * 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;
-
-/*
- * Internal mouse shortcuts.
- * Beware that overloading Button1 will disable the selection.
- */
-static MouseShortcut mshortcuts[] = {
-	/* mask                 button   function        argument       release  screen */
-	#if CLIPBOARD_PATCH
-	{ XK_ANY_MOD,           Button2, clippaste,      {.i = 0},      1 },
-	#else
-	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
-	#endif // CLIPBOARD_PATCH
-	#if SCROLLBACK_MOUSE_PATCH
-	{ ShiftMask,            Button4, kscrollup,      {.i = 1},      0, S_PRI},
-	{ ShiftMask,            Button5, kscrolldown,    {.i = 1},      0, S_PRI},
-	#elif UNIVERSCROLL_PATCH
-	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\033[5;2~"}, 0, S_PRI },
-	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\033[6;2~"}, 0, S_PRI },
-	#else
-	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
-	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} },
-	#endif // SCROLLBACK_MOUSE_PATCH
-	#if SCROLLBACK_MOUSE_ALTSCREEN_PATCH
-	{ XK_NO_MOD,            Button4, kscrollup,      {.i = 1},      0, S_PRI },
-	{ XK_NO_MOD,            Button5, kscrolldown,    {.i = 1},      0, S_PRI },
-	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"}, 0, S_ALT },
-	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"}, 0, S_ALT },
-	#else
-	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
-	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
-	#endif // SCROLLBACK_MOUSE_ALTSCREEN_PATCH
-};
-
-/* Internal keyboard shortcuts. */
-#define MODKEY Mod1Mask
-#define TERMMOD (ControlMask|ShiftMask)
-
-#if EXTERNALPIPE_PATCH // example command
-static char *openurlcmd[] = { "/bin/sh", "-c",
-	"xurls | dmenu -l 10 -w $WINDOWID | xargs -r open",
-	"externalpipe", NULL };
-
-#if EXTERNALPIPEIN_PATCH // example command
-static char *setbgcolorcmd[] = { "/bin/sh", "-c",
-	"printf '\033]11;#008000\007'",
-	"externalpipein", NULL };
-#endif // EXTERNALPIPEIN_PATCH
-#endif // EXTERNALPIPE_PATCH
-
-static Shortcut shortcuts[] = {
-	/* mask                 keysym          function         argument   screen */
-	{ XK_ANY_MOD,           XK_Break,       sendbreak,       {.i =  0} },
-	{ ControlMask,          XK_Print,       toggleprinter,   {.i =  0} },
-	{ ShiftMask,            XK_Print,       printscreen,     {.i =  0} },
-	{ XK_ANY_MOD,           XK_Print,       printsel,        {.i =  0} },
-	{ TERMMOD,              XK_Prior,       zoom,            {.f = +1} },
-	{ TERMMOD,              XK_Next,        zoom,            {.f = -1} },
-	{ TERMMOD,              XK_Home,        zoomreset,       {.f =  0} },
-	{ TERMMOD,              XK_C,           clipcopy,        {.i =  0} },
-	{ TERMMOD,              XK_V,           clippaste,       {.i =  0} },
-	#if ALPHA_PATCH
-	{ TERMMOD,              XK_O,           changealpha,     {.f = +0.05} },
-	{ TERMMOD,              XK_P,           changealpha,     {.f = -0.05} },
-	#if ALPHA_FOCUS_HIGHLIGHT_PATCH
-	//{ TERMMOD,              XK_,           changealphaunfocused, {.f = +0.05} },
-	//{ TERMMOD,              XK_,           changealphaunfocused, {.f = -0.05} },
-	#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
-	#endif // ALPHA_PATCH
-	#if FULLSCREEN_PATCH
-	{ XK_NO_MOD,            XK_F11,         fullscreen,      {.i =  0} },
-	{ MODKEY,               XK_Return,      fullscreen,      {.i =  0} },
-	#endif // FULLSCREEN_PATCH
-	#if SCROLLBACK_PATCH
-	{ ShiftMask,            XK_Page_Up,     kscrollup,       {.i = -1}, S_PRI },
-	{ ShiftMask,            XK_Page_Down,   kscrolldown,     {.i = -1}, S_PRI },
-	#endif // SCROLLBACK_PATCH
-	#if CLIPBOARD_PATCH
-	{ TERMMOD,              XK_Y,           clippaste,       {.i =  0} },
-	{ ShiftMask,            XK_Insert,      clippaste,       {.i =  0} },
-	#else
-	{ TERMMOD,              XK_Y,           selpaste,        {.i =  0} },
-	{ ShiftMask,            XK_Insert,      selpaste,        {.i =  0} },
-	#endif // CLIPBOARD_PATCH
-	{ TERMMOD,              XK_Num_Lock,    numlock,         {.i =  0} },
-	#if COPYURL_PATCH || COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH
-	{ MODKEY,               XK_l,           copyurl,         {.i =  0} },
-	#endif // COPYURL_PATCH
-	#if OPENCOPIED_PATCH
-	{ MODKEY,               XK_o,           opencopied,      {.v = "xdg-open"} },
-	#endif // OPENCOPIED_PATCH
-	#if NEWTERM_PATCH
-	{ TERMMOD,              XK_Return,      newterm,         {.i =  0} },
-	#endif // NEWTERM_PATCH
-	#if EXTERNALPIPE_PATCH
-	{ TERMMOD,              XK_U,           externalpipe,    { .v = openurlcmd } },
-	#if EXTERNALPIPEIN_PATCH
-	{ TERMMOD,              XK_M,           externalpipein,  { .v = setbgcolorcmd } },
-	#endif // EXTERNALPIPEIN_PATCH
-	#endif // EXTERNALPIPE_PATCH
-	#if KEYBOARDSELECT_PATCH
-	{ TERMMOD,              XK_Escape,      keyboard_select, { 0 } },
-	#endif // KEYBOARDSELECT_PATCH
-	#if ISO14755_PATCH
-	{ TERMMOD,              XK_I,           iso14755,        {.i =  0} },
-	#endif // ISO14755_PATCH
-	#if INVERT_PATCH
-	{ TERMMOD,              XK_X,           invert,          { 0 } },
-	#endif // INVERT_PATCH
-	#if VIM_BROWSE_PATCH
-	{ MODKEY,               XK_c,           normalMode,      {.i =  0} },
-	#endif // VIM_BROWSE_PATCH
-};
-
-/*
- * 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 !FIXKEYBOARDINPUT_PATCH
-/*
- * 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 };
-#endif // FIXKEYBOARDINPUT_PATCH
-
-/*
- * 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;
-
-#if !FIXKEYBOARDINPUT_PATCH
-/*
- * 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},
-	#if DELKEY_PATCH
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",      -1,    0},
-	#else
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[P",       -1,    0},
-	#endif // DELKEY_PATCH
-	{ 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},
-	#if DELKEY_PATCH
-	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      -1,    0},
-	#else
-	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0},
-	#endif // DELKEY_PATCH
-	{ 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},
-};
-#endif // FIXKEYBOARDINPUT_PATCH
-
-/*
- * 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{|}~";
-
-#if RIGHTCLICKTOPLUMB_PATCH
-/*
- * plumb_cmd is run on mouse button 3 click, with argument set to
- * current selection and with cwd set to the cwd of the active shell
- */
-static char *plumb_cmd = "plumb";
-#endif // RIGHTCLICKTOPLUMB_PATCH
-
-#if UNDERCURL_PATCH
-/**
- * Undercurl style. Set UNDERCURL_STYLE to one of the available styles.
- *
- * Curly: Dunno how to draw it *shrug*
- *  _   _   _   _
- * ( ) ( ) ( ) ( )
- *	 (_) (_) (_) (_)
- *
- * Spiky:
- * /\  /\   /\	/\
- *   \/  \/	  \/
- *
- * Capped:
- *	_     _     _
- * / \   / \   / \
- *    \_/   \_/
- */
-// Available styles
-#define UNDERCURL_CURLY 0
-#define UNDERCURL_SPIKY 1
-#define UNDERCURL_CAPPED 2
-// Active style
-#define UNDERCURL_STYLE UNDERCURL_SPIKY
-#endif // UNDERCURL_PATCH
--- a/desktop/.st/config.mk
+++ b/desktop/.st/config.mk
@@ -1,53 +0,0 @@
-# st version
-VERSION = 0.9
-
-# Customize below to fit your system
-
-# paths
-PREFIX = /usr/local
-MANPREFIX = $(PREFIX)/share/man
-
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
-
-PKG_CONFIG = pkg-config
-
-# Uncomment this for the alpha patch / ALPHA_PATCH
-#XRENDER = -lXrender
-
-# Uncomment this for the themed cursor patch / THEMED_CURSOR_PATCH
-#XCURSOR = -lXcursor
-
-# Uncomment the lines below for the ligatures patch / LIGATURES_PATCH
-#LIGATURES_C = hb.c
-#LIGATURES_H = hb.h
-#LIGATURES_INC = `$(PKG_CONFIG) --cflags harfbuzz`
-#LIGATURES_LIBS = `$(PKG_CONFIG) --libs harfbuzz`
-
-# Uncomment this for the SIXEL patch / SIXEL_PATCH
-#SIXEL_C = sixel.c sixel_hls.c
-
-# includes and libs, uncomment harfbuzz for the ligatures patch
-INCS = -I$(X11INC) \
-       `$(PKG_CONFIG) --cflags fontconfig` \
-       `$(PKG_CONFIG) --cflags freetype2` \
-       $(LIGATURES_INC)
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft ${XRENDER} ${XCURSOR}\
-       `$(PKG_CONFIG) --libs fontconfig` \
-       `$(PKG_CONFIG) --libs freetype2` \
-       $(LIGATURES_LIBS)
-
-# flags
-STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
-STCFLAGS = $(INCS) $(STCPPFLAGS) $(CPPFLAGS) $(CFLAGS)
-STLDFLAGS = $(LIBS) $(LDFLAGS)
-
-# OpenBSD:
-#CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
-#LIBS = -L$(X11LIB) -lm -lX11 -lutil -lXft \
-#       `pkg-config --libs fontconfig` \
-#       `pkg-config --libs freetype2`
-#MANPREFIX = ${PREFIX}/man
-
-# compiler and linker
-# CC = c99
--- a/desktop/.st/hb.c
+++ b/desktop/.st/hb.c
@@ -1,108 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <time.h>
-#include <X11/Xft/Xft.h>
-#include <X11/cursorfont.h>
-#include <hb.h>
-#include <hb-ft.h>
-
-#include "st.h"
-#include "hb.h"
-
-#define FEATURE(c1,c2,c3,c4) { .tag = HB_TAG(c1,c2,c3,c4), .value = 1, .start = HB_FEATURE_GLOBAL_START, .end = HB_FEATURE_GLOBAL_END }
-
-hb_font_t *hbfindfont(XftFont *match);
-
-typedef struct {
-	XftFont *match;
-	hb_font_t *font;
-} HbFontMatch;
-
-static int hbfontslen = 0;
-static HbFontMatch *hbfontcache = NULL;
-
-/*
- * Poplulate the array with a list of font features, wrapped in FEATURE macro,
- * e. g.
- * FEATURE('c', 'a', 'l', 't'), FEATURE('d', 'l', 'i', 'g')
- */
-hb_feature_t features[] = { 0 };
-
-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(HbTransformData *data, XftFont *xfont, const Glyph *glyphs, int start, int length) {
-	Rune rune;
-	ushort mode = USHRT_MAX;
-	unsigned int glyph_count;
-	int i, end = start + length;
-
-	hb_font_t *font = hbfindfont(xfont);
-	if (font == NULL)
-		return;
-
-	hb_buffer_t *buffer = hb_buffer_create();
-	hb_buffer_set_direction(buffer, HB_DIRECTION_LTR);
-
-	/* Fill buffer with codepoints. */
-	for (i = start; i < end; i++) {
-		rune = glyphs[i].u;
-		mode = glyphs[i].mode;
-		if (mode & ATTR_WDUMMY)
-			rune = 0x0020;
-		hb_buffer_add_codepoints(buffer, &rune, 1, 0, 1);
-	}
-
-	/* Shape the segment. */
-	hb_shape(font, buffer, features, sizeof(features)/sizeof(hb_feature_t));
-
-	/* Get new glyph info. */
-	hb_glyph_info_t *info = hb_buffer_get_glyph_infos(buffer, &glyph_count);
-	hb_glyph_position_t *pos = hb_buffer_get_glyph_positions(buffer, &glyph_count);
-
-	/** Fill the output. */
-	data->buffer = buffer;
-	data->glyphs = info;
-	data->positions = pos;
-	data->count = glyph_count;
-}
-
-void hbcleanup(HbTransformData *data) {
-	hb_buffer_destroy(data->buffer);
-	memset(data, 0, sizeof(HbTransformData));
-}
--- a/desktop/.st/hb.h
+++ b/desktop/.st/hb.h
@@ -1,14 +0,0 @@
-#include <X11/Xft/Xft.h>
-#include <hb.h>
-#include <hb-ft.h>
-
-typedef struct {
-	hb_buffer_t *buffer;
-	hb_glyph_info_t *glyphs;
-	hb_glyph_position_t *positions;
-	unsigned int count;
-} HbTransformData;
-
-void hbunloadfonts();
-void hbtransform(HbTransformData *, XftFont *, const Glyph *, int, int);
-void hbcleanup(HbTransformData *);
--- a/desktop/.st/patch/alpha.c
+++ b/desktop/.st/patch/alpha.c
@@ -1,30 +0,0 @@
-float
-clamp(float value, float lower, float upper) {
-	if (value < lower)
-		return lower;
-	if (value > upper)
-		return upper;
-	return value;
-}
-
-void
-changealpha(const Arg *arg)
-{
-	if ((alpha > 0 && arg->f < 0) || (alpha < 1 && arg->f > 0))
-		alpha += arg->f;
-	alpha = clamp(alpha, 0.0, 1.0);
-	xloadcols();
-	redraw();
-}
-
-#if ALPHA_FOCUS_HIGHLIGHT_PATCH
-void
-changealphaunfocused(const Arg *arg)
-{
-	if ((alphaUnfocused > 0 && arg->f < 0) || (alphaUnfocused < 1 && arg->f > 0))
-		alphaUnfocused += arg->f;
-	alphaUnfocused = clamp(alphaUnfocused, 0.0, 1.0);
-	xloadcols();
-	redraw();
-}
-#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
--- a/desktop/.st/patch/alpha.h
+++ b/desktop/.st/patch/alpha.h
@@ -1,5 +0,0 @@
-static float clamp(float value, float lower, float upper);
-static void changealpha(const Arg *);
-#if ALPHA_FOCUS_HIGHLIGHT_PATCH
-static void changealphaunfocused(const Arg *arg);
-#endif // ALPHA_FOCUS_HIGHLIGHT_PATCH
--- a/desktop/.st/patch/background_image_x.c
+++ b/desktop/.st/patch/background_image_x.c
@@ -1,106 +0,0 @@
-void
-updatexy()
-{
-	Window child;
-	XTranslateCoordinates(xw.dpy, xw.win, DefaultRootWindow(xw.dpy), 0, 0, &win.x, &win.y, &child);
-}
-
-/*
- * load farbfeld file to XImage
- */
-XImage*
-loadff(const char *filename)
-{
-	uint32_t i, hdr[4], w, h, size;
-	uint64_t *data;
-	FILE *f = fopen(filename, "rb");
-
-	if (f == NULL) {
-		fprintf(stderr, "could not load background image.\n");
-		return NULL;
-	}
-
-	if (fread(hdr, sizeof(*hdr), LEN(hdr), f) != LEN(hdr)) {
-		fprintf(stderr, "fread: %s\n", ferror(f) ? "" : "Unexpected end of file reading header");
-		fclose(f);
-		return NULL;
-	}
-
-	if (memcmp("farbfeld", hdr, sizeof("farbfeld") - 1)) {
-		fprintf(stderr, "Invalid magic value\n");
-		fclose(f);
-		return NULL;
-	}
-
-	w = ntohl(hdr[2]);
-	h = ntohl(hdr[3]);
-	size = w * h;
-	data = xmalloc(size * sizeof(uint64_t));
-
-	if (fread(data, sizeof(uint64_t), size, f) != size) {
-		fprintf(stderr, "fread: %s\n", ferror(f) ? "" : "Unexpected end of file reading data");
-		fclose(f);
-		return NULL;
-	}
-
-	fclose(f);
-
-	for (i = 0; i < size; i++)
-		 data[i] = (data[i] & 0x00000000000000FF) << 16 |
-		           (data[i] & 0x0000000000FF0000) >> 8  |
-		           (data[i] & 0x000000FF00000000) >> 32 |
-		           (data[i] & 0x00FF000000000000) >> 24;
-
-	#if ALPHA_PATCH
-	XImage *xi = XCreateImage(xw.dpy, xw.vis, xw.depth, ZPixmap, 0,
-		(char *)data, w, h, 32, w * 8);
-	#else
-	XImage *xi = XCreateImage(xw.dpy, DefaultVisual(xw.dpy, xw.scr),
-		DefaultDepth(xw.dpy, xw.scr), ZPixmap, 0,
-		(char *)data, w, h, 32, w * 8);
-	#endif // ALPHA_PATCH
-	xi->bits_per_pixel = 64;
-	return xi;
-}
-
-/*
- * initialize background image
- */
-void
-bginit()
-{
-	XGCValues gcvalues;
-	Drawable bgimg;
-	XImage *bgxi = loadff(bgfile);
-
-	memset(&gcvalues, 0, sizeof(gcvalues));
-	xw.bggc = XCreateGC(xw.dpy, xw.win, 0, &gcvalues);
-	if (!bgxi)
-		return;
-	#if ALPHA_PATCH
-	bgimg = XCreatePixmap(xw.dpy, xw.win, bgxi->width, bgxi->height,
-		xw.depth);
-	#else
-	bgimg = XCreatePixmap(xw.dpy, xw.win, bgxi->width, bgxi->height,
-		DefaultDepth(xw.dpy, xw.scr));
-	#endif // ALPHA_PATCH
-	XPutImage(xw.dpy, bgimg, dc.gc, bgxi, 0, 0, 0, 0, bgxi->width, bgxi->height);
-	XDestroyImage(bgxi);
-	XSetTile(xw.dpy, xw.bggc, bgimg);
-	XSetFillStyle(xw.dpy, xw.bggc, FillTiled);
-	if (pseudotransparency) {
-		updatexy();
-		MODBIT(xw.attrs.event_mask, 1, PropertyChangeMask);
-		XChangeWindowAttributes(xw.dpy, xw.win, CWEventMask, &xw.attrs);
-	}
-}
-
-#if BACKGROUND_IMAGE_RELOAD_PATCH
-void
-reload_image()
-{
-	XFreeGC(xw.dpy, xw.bggc);
-	bginit();
-	redraw();
-}
-#endif // XRESOURCES_RELOAD_PATCH
--- a/desktop/.st/patch/background_image_x.h
+++ b/desktop/.st/patch/background_image_x.h
@@ -1,6 +0,0 @@
-#include <arpa/inet.h>
-
-static void updatexy(void);
-static XImage *loadff(const char *);
-static void bginit();
-static void reload_image();
--- a/desktop/.st/patch/boxdraw.c
+++ b/desktop/.st/patch/boxdraw.c
@@ -1,192 +0,0 @@
-/*
- * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
- * MIT/X Consortium License
- */
-
-#include <X11/Xft/Xft.h>
-
-/* Rounded non-negative integers division of n / d  */
-#define DIV(n, d) (((n) + (d) / 2) / (d))
-
-static Display *xdpy;
-static Colormap xcmap;
-static XftDraw *xd;
-static Visual *xvis;
-
-static void drawbox(int, int, int, int, XftColor *, XftColor *, ushort);
-static void drawboxlines(int, int, int, int, XftColor *, ushort);
-
-/* public API */
-
-void
-boxdraw_xinit(Display *dpy, Colormap cmap, XftDraw *draw, Visual *vis)
-{
-	xdpy = dpy; xcmap = cmap; xd = draw, xvis = vis;
-}
-
-int
-isboxdraw(Rune u)
-{
-	Rune block = u & ~0xff;
-	return (boxdraw && block == 0x2500 && boxdata[(uint8_t)u]) ||
-	       (boxdraw_braille && block == 0x2800);
-}
-
-/* the "index" is actually the entire shape data encoded as ushort */
-ushort
-boxdrawindex(const Glyph *g)
-{
-	if (boxdraw_braille && (g->u & ~0xff) == 0x2800)
-		return BRL | (uint8_t)g->u;
-	if (boxdraw_bold && (g->mode & ATTR_BOLD))
-		return BDB | boxdata[(uint8_t)g->u];
-	return boxdata[(uint8_t)g->u];
-}
-
-void
-drawboxes(int x, int y, int cw, int ch, XftColor *fg, XftColor *bg,
-          const XftGlyphFontSpec *specs, int len)
-{
-	for ( ; len-- > 0; x += cw, specs++)
-		drawbox(x, y, cw, ch, fg, bg, (ushort)specs->glyph);
-}
-
-/* implementation */
-
-void
-drawbox(int x, int y, int w, int h, XftColor *fg, XftColor *bg, ushort bd)
-{
-	ushort cat = bd & ~(BDB | 0xff);  /* mask out bold and data */
-	if (bd & (BDL | BDA)) {
-		/* lines (light/double/heavy/arcs) */
-		drawboxlines(x, y, w, h, fg, bd);
-
-	} else if (cat == BBD) {
-		/* lower (8-X)/8 block */
-		int d = DIV((uint8_t)bd * h, 8);
-		XftDrawRect(xd, fg, x, y + d, w, h - d);
-
-	} else if (cat == BBU) {
-		/* upper X/8 block */
-		XftDrawRect(xd, fg, x, y, w, DIV((uint8_t)bd * h, 8));
-
-	} else if (cat == BBL) {
-		/* left X/8 block */
-		XftDrawRect(xd, fg, x, y, DIV((uint8_t)bd * w, 8), h);
-
-	} else if (cat == BBR) {
-		/* right (8-X)/8 block */
-		int d = DIV((uint8_t)bd * w, 8);
-		XftDrawRect(xd, fg, x + d, y, w - d, h);
-
-	} else if (cat == BBQ) {
-		/* Quadrants */
-		int w2 = DIV(w, 2), h2 = DIV(h, 2);
-		if (bd & TL)
-			XftDrawRect(xd, fg, x, y, w2, h2);
-		if (bd & TR)
-			XftDrawRect(xd, fg, x + w2, y, w - w2, h2);
-		if (bd & BL)
-			XftDrawRect(xd, fg, x, y + h2, w2, h - h2);
-		if (bd & BR)
-			XftDrawRect(xd, fg, x + w2, y + h2, w - w2, h - h2);
-
-	} else if (bd & BBS) {
-		/* Shades - data is 1/2/3 for 25%/50%/75% alpha, respectively */
-		int d = (uint8_t)bd;
-		XftColor xfc;
-		XRenderColor xrc = { .alpha = 0xffff };
-
-		xrc.red = DIV(fg->color.red * d + bg->color.red * (4 - d), 4);
-		xrc.green = DIV(fg->color.green * d + bg->color.green * (4 - d), 4);
-		xrc.blue = DIV(fg->color.blue * d + bg->color.blue * (4 - d), 4);
-
-		XftColorAllocValue(xdpy, xvis, xcmap, &xrc, &xfc);
-		XftDrawRect(xd, &xfc, x, y, w, h);
-		XftColorFree(xdpy, xvis, xcmap, &xfc);
-
-	} else if (cat == BRL) {
-		/* braille, each data bit corresponds to one dot at 2x4 grid */
-		int w1 = DIV(w, 2);
-		int h1 = DIV(h, 4), h2 = DIV(h, 2), h3 = DIV(3 * h, 4);
-
-		if (bd & 1)   XftDrawRect(xd, fg, x, y, w1, h1);
-		if (bd & 2)   XftDrawRect(xd, fg, x, y + h1, w1, h2 - h1);
-		if (bd & 4)   XftDrawRect(xd, fg, x, y + h2, w1, h3 - h2);
-		if (bd & 8)   XftDrawRect(xd, fg, x + w1, y, w - w1, h1);
-		if (bd & 16)  XftDrawRect(xd, fg, x + w1, y + h1, w - w1, h2 - h1);
-		if (bd & 32)  XftDrawRect(xd, fg, x + w1, y + h2, w - w1, h3 - h2);
-		if (bd & 64)  XftDrawRect(xd, fg, x, y + h3, w1, h - h3);
-		if (bd & 128) XftDrawRect(xd, fg, x + w1, y + h3, w - w1, h - h3);
-
-	}
-}
-
-void
-drawboxlines(int x, int y, int w, int h, XftColor *fg, ushort bd)
-{
-	/* s: stem thickness. width/8 roughly matches underscore thickness. */
-	/* We draw bold as 1.5 * normal-stem and at least 1px thicker.      */
-	/* doubles draw at least 3px, even when w or h < 3. bold needs 6px. */
-	int mwh = MIN(w, h);
-	int base_s = MAX(1, DIV(mwh, 8));
-	int bold = (bd & BDB) && mwh >= 6;  /* possibly ignore boldness */
-	int s = bold ? MAX(base_s + 1, DIV(3 * base_s, 2)) : base_s;
-	int w2 = DIV(w - s, 2), h2 = DIV(h - s, 2);
-	/* the s-by-s square (x + w2, y + h2, s, s) is the center texel.    */
-	/* The base length (per direction till edge) includes this square.  */
-
-	int light = bd & (LL | LU | LR | LD);
-	int double_ = bd & (DL | DU | DR | DD);
-
-	if (light) {
-		/* d: additional (negative) length to not-draw the center   */
-		/* texel - at arcs and avoid drawing inside (some) doubles  */
-		int arc = bd & BDA;
-		int multi_light = light & (light - 1);
-		int multi_double = double_ & (double_ - 1);
-		/* light crosses double only at DH+LV, DV+LH (ref. shapes)  */
-		int d = arc || (multi_double && !multi_light) ? -s : 0;
-
-		if (bd & LL)
-			XftDrawRect(xd, fg, x, y + h2, w2 + s + d, s);
-		if (bd & LU)
-			XftDrawRect(xd, fg, x + w2, y, s, h2 + s + d);
-		if (bd & LR)
-			XftDrawRect(xd, fg, x + w2 - d, y + h2, w - w2 + d, s);
-		if (bd & LD)
-			XftDrawRect(xd, fg, x + w2, y + h2 - d, s, h - h2 + d);
-	}
-
-	/* double lines - also align with light to form heavy when combined */
-	if (double_) {
-		/*
-		* going clockwise, for each double-ray: p is additional length
-		* to the single-ray nearer to the previous direction, and n to
-		* the next. p and n adjust from the base length to lengths
-		* which consider other doubles - shorter to avoid intersections
-		* (p, n), or longer to draw the far-corner texel (n).
-		*/
-		int dl = bd & DL, du = bd & DU, dr = bd & DR, dd = bd & DD;
-		if (dl) {
-			int p = dd ? -s : 0, n = du ? -s : dd ? s : 0;
-			XftDrawRect(xd, fg, x, y + h2 + s, w2 + s + p, s);
-			XftDrawRect(xd, fg, x, y + h2 - s, w2 + s + n, s);
-		}
-		if (du) {
-			int p = dl ? -s : 0, n = dr ? -s : dl ? s : 0;
-			XftDrawRect(xd, fg, x + w2 - s, y, s, h2 + s + p);
-			XftDrawRect(xd, fg, x + w2 + s, y, s, h2 + s + n);
-		}
-		if (dr) {
-			int p = du ? -s : 0, n = dd ? -s : du ? s : 0;
-			XftDrawRect(xd, fg, x + w2 - p, y + h2 - s, w - w2 + p, s);
-			XftDrawRect(xd, fg, x + w2 - n, y + h2 + s, w - w2 + n, s);
-		}
-		if (dd) {
-			int p = dr ? -s : 0, n = dl ? -s : dr ? s : 0;
-			XftDrawRect(xd, fg, x + w2 + s, y + h2 - p, s, h - h2 + p);
-			XftDrawRect(xd, fg, x + w2 - s, y + h2 - n, s, h - h2 + n);
-		}
-	}
-}
--- a/desktop/.st/patch/boxdraw.h
+++ b/desktop/.st/patch/boxdraw.h
@@ -1,214 +0,0 @@
-/*
- * Copyright 2018 Avi Halachmi (:avih) avihpit@yahoo.com https://github.com/avih
- * MIT/X Consortium License
- */
-
-/*
- * U+25XX codepoints data
- *
- * References:
- *   http://www.unicode.org/charts/PDF/U2500.pdf
- *   http://www.unicode.org/charts/PDF/U2580.pdf
- *
- * Test page:
- *   https://github.com/GNOME/vte/blob/master/doc/boxes.txt
- */
-
-/* Each shape is encoded as 16-bits. Higher bits are category, lower are data */
-/* Categories (mutually exclusive except BDB): */
-/* For convenience, BDL/BDA/BBS/BDB are 1 bit each, the rest are enums */
-#define BDL (1<<8)   /* Box Draw Lines (light/double/heavy) */
-#define BDA (1<<9)   /* Box Draw Arc (light) */
-
-#define BBD (1<<10)  /* Box Block Down (lower) X/8 */
-#define BBL (2<<10)  /* Box Block Left X/8 */
-#define BBU (3<<10)  /* Box Block Upper X/8 */
-#define BBR (4<<10)  /* Box Block Right X/8 */
-#define BBQ (5<<10)  /* Box Block Quadrants */
-#define BRL (6<<10)  /* Box Braille (data is lower byte of U28XX) */
-
-#define BBS (1<<14)  /* Box Block Shades */
-#define BDB (1<<15)  /* Box Draw is Bold */
-
-/* (BDL/BDA) Light/Double/Heavy x Left/Up/Right/Down/Horizontal/Vertical      */
-/* Heavy is light+double (literally drawing light+double align to form heavy) */
-#define LL (1<<0)
-#define LU (1<<1)
-#define LR (1<<2)
-#define LD (1<<3)
-#define LH (LL+LR)
-#define LV (LU+LD)
-
-#define DL (1<<4)
-#define DU (1<<5)
-#define DR (1<<6)
-#define DD (1<<7)
-#define DH (DL+DR)
-#define DV (DU+DD)
-
-#define HL (LL+DL)
-#define HU (LU+DU)
-#define HR (LR+DR)
-#define HD (LD+DD)
-#define HH (HL+HR)
-#define HV (HU+HD)
-
-/* (BBQ) Quadrants Top/Bottom x Left/Right */
-#define TL (1<<0)
-#define TR (1<<1)
-#define BL (1<<2)
-#define BR (1<<3)
-
-/* Data for U+2500 - U+259F except dashes/diagonals */
-static const unsigned short boxdata[256] = {
-	/* light lines */
-	[0x00] = BDL + LH,       /* light horizontal */
-	[0x02] = BDL + LV,       /* light vertical */
-	[0x0c] = BDL + LD + LR,  /* light down and right */
-	[0x10] = BDL + LD + LL,  /* light down and left */
-	[0x14] = BDL + LU + LR,  /* light up and right */
-	[0x18] = BDL + LU + LL,  /* light up and left */
-	[0x1c] = BDL + LV + LR,  /* light vertical and right */
-	[0x24] = BDL + LV + LL,  /* light vertical and left */
-	[0x2c] = BDL + LH + LD,  /* light horizontal and down */
-	[0x34] = BDL + LH + LU,  /* light horizontal and up */
-	[0x3c] = BDL + LV + LH,  /* light vertical and horizontal */
-	[0x74] = BDL + LL,       /* light left */
-	[0x75] = BDL + LU,       /* light up */
-	[0x76] = BDL + LR,       /* light right */
-	[0x77] = BDL + LD,       /* light down */
-
-	/* heavy [+light] lines */
-	[0x01] = BDL + HH,
-	[0x03] = BDL + HV,
-	[0x0d] = BDL + HR + LD,
-	[0x0e] = BDL + HD + LR,
-	[0x0f] = BDL + HD + HR,
-	[0x11] = BDL + HL + LD,
-	[0x12] = BDL + HD + LL,
-	[0x13] = BDL + HD + HL,
-	[0x15] = BDL + HR + LU,
-	[0x16] = BDL + HU + LR,
-	[0x17] = BDL + HU + HR,
-	[0x19] = BDL + HL + LU,
-	[0x1a] = BDL + HU + LL,
-	[0x1b] = BDL + HU + HL,
-	[0x1d] = BDL + HR + LV,
-	[0x1e] = BDL + HU + LD + LR,
-	[0x1f] = BDL + HD + LR + LU,
-	[0x20] = BDL + HV + LR,
-	[0x21] = BDL + HU + HR + LD,
-	[0x22] = BDL + HD + HR + LU,
-	[0x23] = BDL + HV + HR,
-	[0x25] = BDL + HL + LV,
-	[0x26] = BDL + HU + LD + LL,
-	[0x27] = BDL + HD + LU + LL,
-	[0x28] = BDL + HV + LL,
-	[0x29] = BDL + HU + HL + LD,
-	[0x2a] = BDL + HD + HL + LU,
-	[0x2b] = BDL + HV + HL,
-	[0x2d] = BDL + HL + LD + LR,
-	[0x2e] = BDL + HR + LL + LD,
-	[0x2f] = BDL + HH + LD,
-	[0x30] = BDL + HD + LH,
-	[0x31] = BDL + HD + HL + LR,
-	[0x32] = BDL + HR + HD + LL,
-	[0x33] = BDL + HH + HD,
-	[0x35] = BDL + HL + LU + LR,
-	[0x36] = BDL + HR + LU + LL,
-	[0x37] = BDL + HH + LU,
-	[0x38] = BDL + HU + LH,
-	[0x39] = BDL + HU + HL + LR,
-	[0x3a] = BDL + HU + HR + LL,
-	[0x3b] = BDL + HH + HU,
-	[0x3d] = BDL + HL + LV + LR,
-	[0x3e] = BDL + HR + LV + LL,
-	[0x3f] = BDL + HH + LV,
-	[0x40] = BDL + HU + LH + LD,
-	[0x41] = BDL + HD + LH + LU,
-	[0x42] = BDL + HV + LH,
-	[0x43] = BDL + HU + HL + LD + LR,
-	[0x44] = BDL + HU + HR + LD + LL,
-	[0x45] = BDL + HD + HL + LU + LR,
-	[0x46] = BDL + HD + HR + LU + LL,
-	[0x47] = BDL + HH + HU + LD,
-	[0x48] = BDL + HH + HD + LU,
-	[0x49] = BDL + HV + HL + LR,
-	[0x4a] = BDL + HV + HR + LL,
-	[0x4b] = BDL + HV + HH,
-	[0x78] = BDL + HL,
-	[0x79] = BDL + HU,
-	[0x7a] = BDL + HR,
-	[0x7b] = BDL + HD,
-	[0x7c] = BDL + HR + LL,
-	[0x7d] = BDL + HD + LU,
-	[0x7e] = BDL + HL + LR,
-	[0x7f] = BDL + HU + LD,
-
-	/* double [+light] lines */
-	[0x50] = BDL + DH,
-	[0x51] = BDL + DV,
-	[0x52] = BDL + DR + LD,
-	[0x53] = BDL + DD + LR,
-	[0x54] = BDL + DR + DD,
-	[0x55] = BDL + DL + LD,
-	[0x56] = BDL + DD + LL,
-	[0x57] = BDL + DL + DD,
-	[0x58] = BDL + DR + LU,
-	[0x59] = BDL + DU + LR,
-	[0x5a] = BDL + DU + DR,
-	[0x5b] = BDL + DL + LU,
-	[0x5c] = BDL + DU + LL,
-	[0x5d] = BDL + DL + DU,
-	[0x5e] = BDL + DR + LV,
-	[0x5f] = BDL + DV + LR,
-	[0x60] = BDL + DV + DR,
-	[0x61] = BDL + DL + LV,
-	[0x62] = BDL + DV + LL,
-	[0x63] = BDL + DV + DL,
-	[0x64] = BDL + DH + LD,
-	[0x65] = BDL + DD + LH,
-	[0x66] = BDL + DD + DH,
-	[0x67] = BDL + DH + LU,
-	[0x68] = BDL + DU + LH,
-	[0x69] = BDL + DH + DU,
-	[0x6a] = BDL + DH + LV,
-	[0x6b] = BDL + DV + LH,
-	[0x6c] = BDL + DH + DV,
-
-	/* (light) arcs */
-	[0x6d] = BDA + LD + LR,
-	[0x6e] = BDA + LD + LL,
-	[0x6f] = BDA + LU + LL,
-	[0x70] = BDA + LU + LR,
-
-	/* Lower (Down) X/8 block (data is 8 - X) */
-	[0x81] = BBD + 7, [0x82] = BBD + 6, [0x83] = BBD + 5, [0x84] = BBD + 4,
-	[0x85] = BBD + 3, [0x86] = BBD + 2, [0x87] = BBD + 1, [0x88] = BBD + 0,
-
-	/* Left X/8 block (data is X) */
-	[0x89] = BBL + 7, [0x8a] = BBL + 6, [0x8b] = BBL + 5, [0x8c] = BBL + 4,
-	[0x8d] = BBL + 3, [0x8e] = BBL + 2, [0x8f] = BBL + 1,
-
-	/* upper 1/2 (4/8), 1/8 block (X), right 1/2, 1/8 block (8-X) */
-	[0x80] = BBU + 4, [0x94] = BBU + 1,
-	[0x90] = BBR + 4, [0x95] = BBR + 7,
-
-	/* Quadrants */
-	[0x96] = BBQ + BL,
-	[0x97] = BBQ + BR,
-	[0x98] = BBQ + TL,
-	[0x99] = BBQ + TL + BL + BR,
-	[0x9a] = BBQ + TL + BR,
-	[0x9b] = BBQ + TL + TR + BL,
-	[0x9c] = BBQ + TL + TR + BR,
-	[0x9d] = BBQ + TR,
-	[0x9e] = BBQ + BL + TR,
-	[0x9f] = BBQ + BL + TR + BR,
-
-	/* Shades, data is an alpha value in 25% units (1/4, 1/2, 3/4) */
-	[0x91] = BBS + 1, [0x92] = BBS + 2, [0x93] = BBS + 3,
-
-	/* U+2504 - U+250B, U+254C - U+254F: unsupported (dashes) */
-	/* U+2571 - U+2573: unsupported (diagonals) */
-};
--- a/desktop/.st/patch/copyurl.c
+++ b/desktop/.st/patch/copyurl.c
@@ -1,180 +0,0 @@
-#if COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH
-void
-tsetcolor( int row, int start, int end, uint32_t fg, uint32_t bg )
-{
-	int i = start;
-	for( ; i < end; ++i )
-	{
-		term.line[row][i].fg = fg;
-		term.line[row][i].bg = bg;
-	}
-}
-
-char *
-findlastany(char *str, const char** find, size_t len)
-{
-	char* found = NULL;
-	int i = 0;
-	for(found = str + strlen(str) - 1; found >= str; --found) {
-		for(i = 0; i < len; i++) {
-			if(strncmp(found, find[i], strlen(find[i])) == 0) {
-				return found;
-			}
-		}
-	}
-
-	return NULL;
-}
-
-/*
-** Select and copy the previous url on screen (do nothing if there's no url).
-**
-** FIXME: doesn't handle urls that span multiple lines; will need to add support
-**        for multiline "getsel()" first
-*/
-void
-copyurl(const Arg *arg) {
-	/* () and [] can appear in urls, but excluding them here will reduce false
-	 * positives when figuring out where a given url ends.
-	 */
-	static char URLCHARS[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-		"abcdefghijklmnopqrstuvwxyz"
-		"0123456789-._~:/?#@!$&'*+,;=%";
-
-	static const char* URLSTRINGS[] = {"http://", "https://"};
-
-	/* remove highlighting from previous selection if any */
-	if(sel.ob.x >= 0 && sel.oe.x >= 0)
-		tsetcolor(sel.nb.y, sel.ob.x, sel.oe.x + 1, defaultfg, defaultbg);
-
-	int i = 0,
-		row = 0, /* row of current URL */
-		col = 0, /* column of current URL start */
-		startrow = 0, /* row of last occurrence */
-		colend = 0, /* column of last occurrence */
-		passes = 0; /* how many rows have been scanned */
-
-	char *linestr = calloc(term.col+1, sizeof(Rune));
-	char *c = NULL,
-		 *match = NULL;
-
-	row = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.y : term.bot;
-	LIMIT(row, term.top, term.bot);
-	startrow = row;
-
-	colend = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.x : term.col;
-	LIMIT(colend, 0, term.col);
-
-	/*
- 	** Scan from (term.bot,term.col) to (0,0) and find
-	** next occurrance of a URL
-	*/
-	while (passes !=term.bot + 2) {
-		/* Read in each column of every row until
- 		** we hit previous occurrence of URL
-		*/
-		for (col = 0, i = 0; col < colend; ++col,++i) {
-			linestr[i] = term.line[row][col].u;
-		}
-		linestr[term.col] = '\0';
-
-		if ((match = findlastany(linestr, URLSTRINGS,
-						sizeof(URLSTRINGS)/sizeof(URLSTRINGS[0]))))
-			break;
-
-		if (--row < term.top)
-			row = term.bot;
-
-		colend = term.col;
-		passes++;
-	};
-
-	if (match) {
-		/* must happen before trim */
-		selclear();
-		sel.ob.x = strlen(linestr) - strlen(match);
-
-		/* trim the rest of the line from the url match */
-		for (c = match; *c != '\0'; ++c)
-			if (!strchr(URLCHARS, *c)) {
-				*c = '\0';
-				break;
-			}
-
-		/* highlight selection by inverting terminal colors */
-		tsetcolor(row, sel.ob.x, sel.ob.x + strlen( match ), defaultbg, defaultfg);
-
-		/* select and copy */
-		sel.mode = 1;
-		sel.type = SEL_REGULAR;
-		sel.oe.x = sel.ob.x + strlen(match)-1;
-		sel.ob.y = sel.oe.y = row;
-		selnormalize();
-		tsetdirt(sel.nb.y, sel.ne.y);
-		xsetsel(getsel());
-		xclipcopy();
-	}
-
-	free(linestr);
-}
-#else
-/* select and copy the previous url on screen (do nothing if there's no url).
- * known bug: doesn't handle urls that span multiple lines (wontfix), depends on multiline "getsel()"
- * known bug: only finds first url on line (mightfix)
- */
-void
-copyurl(const Arg *arg) {
-	/* () and [] can appear in urls, but excluding them here will reduce false
-	 * positives when figuring out where a given url ends.
-	 */
-	static char URLCHARS[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-		"abcdefghijklmnopqrstuvwxyz"
-		"0123456789-._~:/?#@!$&'*+,;=%";
-
-	int i, row, startrow;
-	char *linestr = calloc(term.col+1, sizeof(Rune));
-	char *c, *match = NULL;
-
-	row = (sel.ob.x >= 0 && sel.nb.y > 0) ? sel.nb.y-1 : term.bot;
-	LIMIT(row, term.top, term.bot);
-	startrow = row;
-
-	/* find the start of the last url before selection */
-	do {
-		for (i = 0; i < term.col; ++i) {
-			linestr[i] = term.line[row][i].u;
-		}
-		linestr[term.col] = '\0';
-		if ((match = strstr(linestr, "http://"))
-				|| (match = strstr(linestr, "https://")))
-			break;
-		if (--row < term.top)
-			row = term.bot;
-	} while (row != startrow);
-
-	if (match) {
-		/* must happen before trim */
-		selclear();
-		sel.ob.x = strlen(linestr) - strlen(match);
-
-		/* trim the rest of the line from the url match */
-		for (c = match; *c != '\0'; ++c)
-			if (!strchr(URLCHARS, *c)) {
-				*c = '\0';
-				break;
-			}
-
-		/* select and copy */
-		sel.mode = 1;
-		sel.type = SEL_REGULAR;
-		sel.oe.x = sel.ob.x + strlen(match)-1;
-		sel.ob.y = sel.oe.y = row;
-		selnormalize();
-		tsetdirt(sel.nb.y, sel.ne.y);
-		xsetsel(getsel());
-		xclipcopy();
-	}
-
-	free(linestr);
-}
-#endif // COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH
--- a/desktop/.st/patch/copyurl.h
+++ b/desktop/.st/patch/copyurl.h
@@ -1,5 +0,0 @@
-void copyurl(const Arg *);
-#if COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH
-static void tsetcolor(int, int, int, uint32_t, uint32_t);
-static char * findlastany(char *, const char**, size_t);
-#endif // COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH
--- a/desktop/.st/patch/externalpipe.c
+++ b/desktop/.st/patch/externalpipe.c
@@ -1,76 +0,0 @@
-int extpipeactive = 0;
-
-void
-#if EXTERNALPIPEIN_PATCH
-extpipe(const Arg *arg, int in)
-#else
-externalpipe(const Arg *arg)
-#endif // EXTERNALPIPEIN_PATCH
-{
-	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]);
-		#if EXTERNALPIPEIN_PATCH
-		if (in)
-			dup2(csdfd, STDOUT_FILENO);
-		close(csdfd);
-		#endif // EXTERNALPIPEIN_PATCH
-		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);
-	extpipeactive = 1;
-}
-
-#if EXTERNALPIPEIN_PATCH
-void
-externalpipe(const Arg *arg) {
-	extpipe(arg, 0);
-}
-
-void
-externalpipein(const Arg *arg) {
-	extpipe(arg, 1);
-}
-#endif // EXTERNALPIPEIN_PATCH
--- a/desktop/.st/patch/externalpipe.h
+++ b/desktop/.st/patch/externalpipe.h
@@ -1,4 +0,0 @@
-void externalpipe(const Arg *);
-#if EXTERNALPIPEIN_PATCH
-void externalpipein(const Arg *);
-#endif // EXTERNALPIPEIN_PATCH
--- a/desktop/.st/patch/fixkeyboardinput.c
+++ b/desktop/.st/patch/fixkeyboardinput.c
@@ -1,811 +0,0 @@
-/*
- * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
- * to be mapped below, add them to this array.
- */
-static KeySym mappedkeys[] = {
-	XK_space,
-	XK_m,
-	XK_i,
-	XK_A,
-	XK_B,
-	XK_C,
-	XK_D,
-	XK_E,
-	XK_F,
-	XK_G,
-	XK_H,
-	XK_I,
-	XK_K,
-	XK_J,
-	XK_L,
-	XK_M,
-	XK_N,
-	XK_O,
-	XK_P,
-	XK_Q,
-	XK_R,
-	XK_S,
-	XK_T,
-	XK_U,
-	XK_V,
-	XK_W,
-	XK_X,
-	XK_Y,
-	XK_Z,
-	XK_0,
-	XK_1,
-	XK_2,
-	XK_3,
-	XK_4,
-	XK_5,
-	XK_6,
-	XK_7,
-	XK_8,
-	XK_9,
-	XK_exclam,
-	XK_quotedbl,
-	XK_numbersign,
-	XK_dollar,
-	XK_percent,
-	XK_ampersand,
-	XK_apostrophe,
-	XK_parenleft,
-	XK_parenright,
-	XK_asterisk,
-	XK_plus,
-	XK_comma,
-	XK_minus,
-	XK_period,
-	XK_slash,
-	XK_colon,
-	XK_semicolon,
-	XK_less,
-	XK_equal,
-	XK_greater,
-	XK_question,
-	XK_at,
-	XK_bracketleft,
-	XK_backslash,
-	XK_bracketright,
-	XK_asciicircum,
-	XK_underscore,
-	XK_grave,
-	XK_braceleft,
-	XK_bar,
-	XK_braceright,
-	XK_asciitilde,
-};
-
-/*
- * 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_Prior,      ShiftMask,      "\033[5;2~",     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_Next,       ShiftMask,      "\033[6;2~",     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_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_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_NO_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_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_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_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_Prior,         ControlMask,    "\033[5;5~",     0,    0},
-	{ XK_Prior,         ShiftMask,      "\033[5;2~",     0,    0},
-	{ XK_Next,          ControlMask,    "\033[6;5~",     0,    0},
-	{ XK_Next,          ShiftMask,      "\033[6;2~",     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},
-
-	// libtermkey compatible keyboard input
-	{ XK_KP_Home,      XK_NO_MOD,                      "\033[H",      0, -1},
-	{ XK_KP_Home,      XK_NO_MOD,                      "\033[1~",     0, +1},
-	{ XK_KP_Home,      ControlMask,                    "\033[149;5u", 0,  0},
-	{ XK_KP_Home,      ControlMask|ShiftMask,          "\033[149;6u", 0,  0},
-	{ XK_KP_Home,      Mod1Mask,                       "\033[149;3u", 0,  0},
-	{ XK_KP_Home,      Mod1Mask|ControlMask,           "\033[149;7u", 0,  0},
-	{ XK_KP_Home,      Mod1Mask|ControlMask|ShiftMask, "\033[149;8u", 0,  0},
-	{ XK_KP_Home,      Mod1Mask|ShiftMask,             "\033[149;4u", 0,  0},
-	{ XK_KP_Home,      ShiftMask,                      "\033[149;2u", 0,  0},
-	{ XK_KP_Up,        XK_NO_MOD,                      "\033Ox",     +1,  0},
-	{ XK_KP_Up,        XK_NO_MOD,                      "\033[A",      0, -1},
-	{ XK_KP_Up,        XK_NO_MOD,                      "\033OA",      0, +1},
-	{ XK_KP_Up,        ControlMask,                    "\033[151;5u", 0,  0},
-	{ XK_KP_Up,        ControlMask|ShiftMask,          "\033[151;6u", 0,  0},
-	{ XK_KP_Up,        Mod1Mask,                       "\033[151;3u", 0,  0},
-	{ XK_KP_Up,        Mod1Mask|ControlMask,           "\033[151;7u", 0,  0},
-	{ XK_KP_Up,        Mod1Mask|ControlMask|ShiftMask, "\033[151;8u", 0,  0},
-	{ XK_KP_Up,        Mod1Mask|ShiftMask,             "\033[151;4u", 0,  0},
-	{ XK_KP_Up,        ShiftMask,                      "\033[151;2u", 0,  0},
-	{ XK_KP_Down,      XK_NO_MOD,                      "\033Or",     +1,  0},
-	{ XK_KP_Down,      XK_NO_MOD,                      "\033[B",      0, -1},
-	{ XK_KP_Down,      XK_NO_MOD,                      "\033OB",      0, +1},
-	{ XK_KP_Down,      ControlMask,                    "\033[153;5u", 0,  0},
-	{ XK_KP_Down,      ControlMask|ShiftMask,          "\033[153;6u", 0,  0},
-	{ XK_KP_Down,      Mod1Mask,                       "\033[153;3u", 0,  0},
-	{ XK_KP_Down,      Mod1Mask|ControlMask,           "\033[153;7u", 0,  0},
-	{ XK_KP_Down,      Mod1Mask|ControlMask|ShiftMask, "\033[153;8u", 0,  0},
-	{ XK_KP_Down,      Mod1Mask|ShiftMask,             "\033[153;4u", 0,  0},
-	{ XK_KP_Down,      ShiftMask,                      "\033[153;2u", 0,  0},
-	{ XK_KP_Left,      XK_NO_MOD,                      "\033Ot",     +1,  0},
-	{ XK_KP_Left,      XK_NO_MOD,                      "\033[D",      0, -1},
-	{ XK_KP_Left,      XK_NO_MOD,                      "\033OD",      0, +1},
-	{ XK_KP_Left,      ControlMask,                    "\033[150;5u", 0,  0},
-	{ XK_KP_Left,      ControlMask|ShiftMask,          "\033[150;6u", 0,  0},
-	{ XK_KP_Left,      Mod1Mask,                       "\033[150;3u", 0,  0},
-	{ XK_KP_Left,      Mod1Mask|ControlMask,           "\033[150;7u", 0,  0},
-	{ XK_KP_Left,      Mod1Mask|ControlMask|ShiftMask, "\033[150;8u", 0,  0},
-	{ XK_KP_Left,      Mod1Mask|ShiftMask,             "\033[150;4u", 0,  0},
-	{ XK_KP_Left,      ShiftMask,                      "\033[150;2u", 0,  0},
-	{ XK_KP_Right,     XK_NO_MOD,                      "\033Ov",     +1,  0},
-	{ XK_KP_Right,     XK_NO_MOD,                      "\033[C",      0, -1},
-	{ XK_KP_Right,     XK_NO_MOD,                      "\033OC",      0, +1},
-	{ XK_KP_Right,     ControlMask,                    "\033[152;5u", 0,  0},
-	{ XK_KP_Right,     ControlMask|ShiftMask,          "\033[152;6u", 0,  0},
-	{ XK_KP_Right,     Mod1Mask,                       "\033[152;3u", 0,  0},
-	{ XK_KP_Right,     Mod1Mask|ControlMask,           "\033[152;7u", 0,  0},
-	{ XK_KP_Right,     Mod1Mask|ControlMask|ShiftMask, "\033[152;8u", 0,  0},
-	{ XK_KP_Right,     Mod1Mask|ShiftMask,             "\033[152;4u", 0,  0},
-	{ XK_KP_Right,     ShiftMask,                      "\033[152;2u", 0,  0},
-	{ XK_KP_Prior,     XK_NO_MOD,                      "\033[5~",     0,  0},
-	{ XK_KP_Prior,     ControlMask,                    "\033[154;5u", 0,  0},
-	{ XK_KP_Prior,     ControlMask|ShiftMask,          "\033[154;6u", 0,  0},
-	{ XK_KP_Prior,     Mod1Mask,                       "\033[154;3u", 0,  0},
-	{ XK_KP_Prior,     Mod1Mask|ControlMask,           "\033[154;7u", 0,  0},
-	{ XK_KP_Prior,     Mod1Mask|ControlMask|ShiftMask, "\033[154;8u", 0,  0},
-	{ XK_KP_Prior,     Mod1Mask|ShiftMask,             "\033[154;4u", 0,  0},
-	{ XK_KP_Begin,     XK_NO_MOD,                      "\033[E",      0,  0},
-	{ XK_KP_Begin,     ControlMask,                    "\033[157;5u", 0,  0},
-	{ XK_KP_Begin,     ControlMask|ShiftMask,          "\033[157;6u", 0,  0},
-	{ XK_KP_Begin,     Mod1Mask,                       "\033[157;3u", 0,  0},
-	{ XK_KP_Begin,     Mod1Mask|ControlMask,           "\033[157;7u", 0,  0},
-	{ XK_KP_Begin,     Mod1Mask|ControlMask|ShiftMask, "\033[157;8u", 0,  0},
-	{ XK_KP_Begin,     Mod1Mask|ShiftMask,             "\033[157;4u", 0,  0},
-	{ XK_KP_Begin,     ShiftMask,                      "\033[157;2u", 0,  0},
-	{ XK_KP_End,       XK_NO_MOD,                      "\033[4~",     0,  0},
-	{ XK_KP_End,       ControlMask|ShiftMask,          "\033[156;6u", 0,  0},
-	{ XK_KP_End,       Mod1Mask,                       "\033[156;3u", 0,  0},
-	{ XK_KP_End,       Mod1Mask|ControlMask,           "\033[156;7u", 0,  0},
-	{ XK_KP_End,       Mod1Mask|ControlMask|ShiftMask, "\033[156;8u", 0,  0},
-	{ XK_KP_End,       Mod1Mask|ShiftMask,             "\033[156;4u", 0,  0},
-	{ XK_KP_Next,      XK_NO_MOD,                      "\033[6~",     0,  0},
-	{ XK_KP_Next,      ControlMask,                    "\033[155;5u", 0,  0},
-	{ XK_KP_Next,      ControlMask|ShiftMask,          "\033[155;6u", 0,  0},
-	{ XK_KP_Next,      Mod1Mask,                       "\033[155;3u", 0,  0},
-	{ XK_KP_Next,      Mod1Mask|ControlMask,           "\033[155;7u", 0,  0},
-	{ XK_KP_Next,      Mod1Mask|ControlMask|ShiftMask, "\033[155;8u", 0,  0},
-	{ XK_KP_Next,      Mod1Mask|ShiftMask,             "\033[155;4u", 0,  0},
-	{ XK_KP_Insert,    XK_NO_MOD,                      "\033[4h",    -1,  0},
-	{ XK_KP_Insert,    XK_NO_MOD,                      "\033[2~",    +1,  0},
-	{ XK_KP_Insert,    ControlMask|ShiftMask,          "\033[158;6u", 0,  0},
-	{ XK_KP_Insert,    Mod1Mask,                       "\033[158;3u", 0,  0},
-	{ XK_KP_Insert,    Mod1Mask|ControlMask,           "\033[158;7u", 0,  0},
-	{ XK_KP_Insert,    Mod1Mask|ControlMask|ShiftMask, "\033[158;8u", 0,  0},
-	{ XK_KP_Insert,    Mod1Mask|ShiftMask,             "\033[158;4u", 0,  0},
-	{ XK_KP_Delete,    XK_NO_MOD,                      "\033[P",     -1,  0},
-	{ XK_KP_Delete,    XK_NO_MOD,                      "\033[3~",    +1,  0},
-	{ XK_KP_Delete,    ControlMask|ShiftMask,          "\033[159;6u", 0,  0},
-	{ XK_KP_Delete,    Mod1Mask,                       "\033[159;3u", 0,  0},
-	{ XK_KP_Delete,    Mod1Mask|ControlMask,           "\033[159;7u", 0,  0},
-	{ XK_KP_Delete,    Mod1Mask|ControlMask|ShiftMask, "\033[159;8u", 0,  0},
-	{ XK_KP_Delete,    Mod1Mask|ShiftMask,             "\033[159;4u", 0,  0},
-	{ XK_KP_Multiply,  XK_NO_MOD,                      "\033Oj",     +2,  0},
-	{ XK_KP_Multiply,  ControlMask,                    "\033[170;5u", 0,  0},
-	{ XK_KP_Multiply,  ControlMask|ShiftMask,          "\033[170;6u", 0,  0},
-	{ XK_KP_Multiply,  Mod1Mask,                       "\033[170;3u", 0,  0},
-	{ XK_KP_Multiply,  Mod1Mask|ControlMask,           "\033[170;7u", 0,  0},
-	{ XK_KP_Multiply,  Mod1Mask|ControlMask|ShiftMask, "\033[170;8u", 0,  0},
-	{ XK_KP_Multiply,  Mod1Mask|ShiftMask,             "\033[170;4u", 0,  0},
-	{ XK_KP_Multiply,  ShiftMask,                      "\033[170;2u", 0,  0},
-	{ XK_KP_Add,       XK_NO_MOD,                      "\033Ok",     +2,  0},
-	{ XK_KP_Add,       ControlMask,                    "\033[171;5u", 0,  0},
-	{ XK_KP_Add,       ControlMask|ShiftMask,          "\033[171;6u", 0,  0},
-	{ XK_KP_Add,       Mod1Mask,                       "\033[171;3u", 0,  0},
-	{ XK_KP_Add,       Mod1Mask|ControlMask,           "\033[171;7u", 0,  0},
-	{ XK_KP_Add,       Mod1Mask|ControlMask|ShiftMask, "\033[171;8u", 0,  0},
-	{ XK_KP_Add,       Mod1Mask|ShiftMask,             "\033[171;4u", 0,  0},
-	{ XK_KP_Add,       ShiftMask,                      "\033[171;2u", 0,  0},
-	{ XK_KP_Enter,     XK_NO_MOD,                      "\033OM",     +2,  0},
-	{ XK_KP_Enter,     XK_NO_MOD,                      "\r",         -1,  0},
-	{ XK_KP_Enter,     XK_NO_MOD,                      "\r\n",       -1,  0},
-	{ XK_KP_Enter,     ControlMask,                    "\033[141;5u", 0,  0},
-	{ XK_KP_Enter,     ControlMask|ShiftMask,          "\033[141;6u", 0,  0},
-	{ XK_KP_Enter,     Mod1Mask,                       "\033[141;3u", 0,  0},
-	{ XK_KP_Enter,     Mod1Mask|ControlMask,           "\033[141;7u", 0,  0},
-	{ XK_KP_Enter,     Mod1Mask|ControlMask|ShiftMask, "\033[141;8u", 0,  0},
-	{ XK_KP_Enter,     Mod1Mask|ShiftMask,             "\033[141;4u", 0,  0},
-	{ XK_KP_Enter,     ShiftMask,                      "\033[141;2u", 0,  0},
-	{ XK_KP_Subtract,  XK_NO_MOD,                      "\033Om",     +2,  0},
-	{ XK_KP_Subtract,  ControlMask,                    "\033[173;5u", 0,  0},
-	{ XK_KP_Subtract,  ControlMask|ShiftMask,          "\033[173;6u", 0,  0},
-	{ XK_KP_Subtract,  Mod1Mask,                       "\033[173;3u", 0,  0},
-	{ XK_KP_Subtract,  Mod1Mask|ControlMask,           "\033[173;7u", 0,  0},
-	{ XK_KP_Subtract,  Mod1Mask|ControlMask|ShiftMask, "\033[173;8u", 0,  0},
-	{ XK_KP_Subtract,  Mod1Mask|ShiftMask,             "\033[173;4u", 0,  0},
-	{ XK_KP_Subtract,  ShiftMask,                      "\033[173;2u", 0,  0},
-	{ XK_KP_Decimal,   XK_NO_MOD,                      "\033On",     +2,  0},
-	{ XK_KP_Decimal,   ControlMask,                    "\033[174;5u", 0,  0},
-	{ XK_KP_Decimal,   ControlMask|ShiftMask,          "\033[174;6u", 0,  0},
-	{ XK_KP_Decimal,   Mod1Mask,                       "\033[174;3u", 0,  0},
-	{ XK_KP_Decimal,   Mod1Mask|ControlMask,           "\033[174;7u", 0,  0},
-	{ XK_KP_Decimal,   Mod1Mask|ControlMask|ShiftMask, "\033[174;8u", 0,  0},
-	{ XK_KP_Decimal,   Mod1Mask|ShiftMask,             "\033[174;4u", 0,  0},
-	{ XK_KP_Decimal,   ShiftMask,                      "\033[174;2u", 0,  0},
-	{ XK_KP_Divide,    XK_NO_MOD,                      "\033Oo",     +2,  0},
-	{ XK_KP_Divide,    ControlMask,                    "\033[175;5u", 0,  0},
-	{ XK_KP_Divide,    ControlMask|ShiftMask,          "\033[175;6u", 0,  0},
-	{ XK_KP_Divide,    Mod1Mask,                       "\033[175;3u", 0,  0},
-	{ XK_KP_Divide,    Mod1Mask|ControlMask,           "\033[175;7u", 0,  0},
-	{ XK_KP_Divide,    Mod1Mask|ControlMask|ShiftMask, "\033[175;8u", 0,  0},
-	{ XK_KP_Divide,    Mod1Mask|ShiftMask,             "\033[175;4u", 0,  0},
-	{ XK_KP_Divide,    ShiftMask,                      "\033[175;2u", 0,  0},
-	{ XK_KP_0,         XK_NO_MOD,                      "\033Op",     +2,  0},
-	{ XK_KP_0,         ControlMask,                    "\033[176;5u", 0,  0},
-	{ XK_KP_0,         ControlMask|ShiftMask,          "\033[176;6u", 0,  0},
-	{ XK_KP_0,         Mod1Mask,                       "\033[176;3u", 0,  0},
-	{ XK_KP_0,         Mod1Mask|ControlMask,           "\033[176;7u", 0,  0},
-	{ XK_KP_0,         Mod1Mask|ControlMask|ShiftMask, "\033[176;8u", 0,  0},
-	{ XK_KP_0,         Mod1Mask|ShiftMask,             "\033[176;4u", 0,  0},
-	{ XK_KP_0,         ShiftMask,                      "\033[176;2u", 0,  0},
-	{ XK_KP_1,         XK_NO_MOD,                      "\033Oq",     +2,  0},
-	{ XK_KP_0,         ControlMask,                    "\033[177;5u", 0,  0},
-	{ XK_KP_0,         ControlMask|ShiftMask,          "\033[177;6u", 0,  0},
-	{ XK_KP_0,         Mod1Mask,                       "\033[177;3u", 0,  0},
-	{ XK_KP_0,         Mod1Mask|ControlMask,           "\033[177;7u", 0,  0},
-	{ XK_KP_0,         Mod1Mask|ControlMask|ShiftMask, "\033[177;8u", 0,  0},
-	{ XK_KP_0,         Mod1Mask|ShiftMask,             "\033[177;4u", 0,  0},
-	{ XK_KP_0,         ShiftMask,                      "\033[177;2u", 0,  0},
-	{ XK_KP_2,         XK_NO_MOD,                      "\033Or",     +2,  0},
-	{ XK_KP_2,         ControlMask,                    "\033[178;5u", 0,  0},
-	{ XK_KP_2,         ControlMask|ShiftMask,          "\033[178;6u", 0,  0},
-	{ XK_KP_2,         Mod1Mask,                       "\033[178;3u", 0,  0},
-	{ XK_KP_2,         Mod1Mask|ControlMask,           "\033[178;7u", 0,  0},
-	{ XK_KP_2,         Mod1Mask|ControlMask|ShiftMask, "\033[178;8u", 0,  0},
-	{ XK_KP_2,         Mod1Mask|ShiftMask,             "\033[178;4u", 0,  0},
-	{ XK_KP_2,         ShiftMask,                      "\033[178;2u", 0,  0},
-	{ XK_KP_3,         XK_NO_MOD,                      "\033Os",     +2,  0},
-	{ XK_KP_3,         ControlMask,                    "\033[179;5u", 0,  0},
-	{ XK_KP_3,         ControlMask|ShiftMask,          "\033[179;6u", 0,  0},
-	{ XK_KP_3,         Mod1Mask,                       "\033[179;3u", 0,  0},
-	{ XK_KP_3,         Mod1Mask|ControlMask,           "\033[179;7u", 0,  0},
-	{ XK_KP_3,         Mod1Mask|ControlMask|ShiftMask, "\033[179;8u", 0,  0},
-	{ XK_KP_3,         Mod1Mask|ShiftMask,             "\033[179;4u", 0,  0},
-	{ XK_KP_3,         ShiftMask,                      "\033[179;2u", 0,  0},
-	{ XK_KP_4,         XK_NO_MOD,                      "\033Ot",     +2,  0},
-	{ XK_KP_4,         ControlMask,                    "\033[180;5u", 0,  0},
-	{ XK_KP_4,         ControlMask|ShiftMask,          "\033[180;6u", 0,  0},
-	{ XK_KP_4,         Mod1Mask,                       "\033[180;3u", 0,  0},
-	{ XK_KP_4,         Mod1Mask|ControlMask,           "\033[180;7u", 0,  0},
-	{ XK_KP_4,         Mod1Mask|ControlMask|ShiftMask, "\033[180;8u", 0,  0},
-	{ XK_KP_4,         Mod1Mask|ShiftMask,             "\033[180;4u", 0,  0},
-	{ XK_KP_4,         ShiftMask,                      "\033[180;2u", 0,  0},
-	{ XK_KP_5,         XK_NO_MOD,                      "\033Ou",     +2,  0},
-	{ XK_KP_5,         ControlMask,                    "\033[181;5u", 0,  0},
-	{ XK_KP_5,         ControlMask|ShiftMask,          "\033[181;6u", 0,  0},
-	{ XK_KP_5,         Mod1Mask,                       "\033[181;3u", 0,  0},
-	{ XK_KP_5,         Mod1Mask|ControlMask,           "\033[181;7u", 0,  0},
-	{ XK_KP_5,         Mod1Mask|ControlMask|ShiftMask, "\033[181;8u", 0,  0},
-	{ XK_KP_5,         Mod1Mask|ShiftMask,             "\033[181;4u", 0,  0},
-	{ XK_KP_5,         ShiftMask,                      "\033[181;2u", 0,  0},
-	{ XK_KP_6,         XK_NO_MOD,                      "\033Ov",     +2,  0},
-	{ XK_KP_6,         ControlMask,                    "\033[182;5u", 0,  0},
-	{ XK_KP_6,         ControlMask|ShiftMask,          "\033[182;6u", 0,  0},
-	{ XK_KP_6,         Mod1Mask,                       "\033[182;3u", 0,  0},
-	{ XK_KP_6,         Mod1Mask|ControlMask,           "\033[182;7u", 0,  0},
-	{ XK_KP_6,         Mod1Mask|ControlMask|ShiftMask, "\033[182;8u", 0,  0},
-	{ XK_KP_6,         Mod1Mask|ShiftMask,             "\033[182;4u", 0,  0},
-	{ XK_KP_6,         ShiftMask,                      "\033[182;2u", 0,  0},
-	{ XK_KP_7,         XK_NO_MOD,                      "\033Ow",     +2,  0},
-	{ XK_KP_7,         ControlMask,                    "\033[183;5u", 0,  0},
-	{ XK_KP_7,         ControlMask|ShiftMask,          "\033[183;6u", 0,  0},
-	{ XK_KP_7,         Mod1Mask,                       "\033[183;3u", 0,  0},
-	{ XK_KP_7,         Mod1Mask|ControlMask,           "\033[183;7u", 0,  0},
-	{ XK_KP_7,         Mod1Mask|ControlMask|ShiftMask, "\033[183;8u", 0,  0},
-	{ XK_KP_7,         Mod1Mask|ShiftMask,             "\033[183;4u", 0,  0},
-	{ XK_KP_7,         ShiftMask,                      "\033[183;2u", 0,  0},
-	{ XK_KP_8,         XK_NO_MOD,                      "\033Ox",     +2,  0},
-	{ XK_KP_8,         ControlMask,                    "\033[184;5u", 0,  0},
-	{ XK_KP_8,         ControlMask|ShiftMask,          "\033[184;6u", 0,  0},
-	{ XK_KP_8,         Mod1Mask,                       "\033[184;3u", 0,  0},
-	{ XK_KP_8,         Mod1Mask|ControlMask,           "\033[184;7u", 0,  0},
-	{ XK_KP_8,         Mod1Mask|ControlMask|ShiftMask, "\033[184;8u", 0,  0},
-	{ XK_KP_8,         Mod1Mask|ShiftMask,             "\033[184;4u", 0,  0},
-	{ XK_KP_8,         ShiftMask,                      "\033[184;2u", 0,  0},
-	{ XK_KP_9,         XK_NO_MOD,                      "\033Oy",     +2,  0},
-	{ XK_KP_9,         ControlMask,                    "\033[185;5u", 0,  0},
-	{ XK_KP_9,         ControlMask|ShiftMask,          "\033[185;6u", 0,  0},
-	{ XK_KP_9,         Mod1Mask,                       "\033[185;3u", 0,  0},
-	{ XK_KP_9,         Mod1Mask|ControlMask,           "\033[185;7u", 0,  0},
-	{ XK_KP_9,         Mod1Mask|ControlMask|ShiftMask, "\033[185;8u", 0,  0},
-	{ XK_KP_9,         Mod1Mask|ShiftMask,             "\033[185;4u", 0,  0},
-	{ XK_KP_9,         ShiftMask,                      "\033[185;2u", 0,  0},
-	{ XK_BackSpace,    ControlMask,                    "\033[127;5u", 0,  0},
-	{ XK_BackSpace,    ControlMask|ShiftMask,          "\033[127;6u", 0,  0},
-	{ XK_BackSpace,    Mod1Mask,                       "\033[127;3u", 0,  0},
-	{ XK_BackSpace,    Mod1Mask|ControlMask,           "\033[127;7u", 0,  0},
-	{ XK_BackSpace,    Mod1Mask|ControlMask|ShiftMask, "\033[127;8u", 0,  0},
-	{ XK_BackSpace,    Mod1Mask|ShiftMask,             "\033[127;4u", 0,  0},
-	{ XK_BackSpace,    ShiftMask,                      "\033[127;2u", 0,  0},
-	{ XK_Tab,          ControlMask,                    "\033[9;5u",   0,  0},
-	{ XK_Tab,          ControlMask|ShiftMask,          "\033[1;5Z",   0,  0},
-	{ XK_Tab,          Mod1Mask,                       "\033[1;3Z",   0,  0},
-	{ XK_Tab,          Mod1Mask|ControlMask,           "\033[1;7Z",   0,  0},
-	{ XK_Tab,          Mod1Mask|ControlMask|ShiftMask, "\033[1;8Z",   0,  0},
-	{ XK_Tab,          Mod1Mask|ShiftMask,             "\033[1;4Z",   0,  0},
-	{ XK_Return,       ControlMask,                    "\033[13;5u",  0,  0},
-	{ XK_Return,       ControlMask|ShiftMask,          "\033[13;6u",  0,  0},
-	{ XK_Return,       Mod1Mask,                       "\033[13;3u",  0,  0},
-	{ XK_Return,       Mod1Mask|ControlMask,           "\033[13;7u",  0,  0},
-	{ XK_Return,       Mod1Mask|ControlMask|ShiftMask, "\033[13;8u",  0,  0},
-	{ XK_Return,       Mod1Mask|ShiftMask,             "\033[13;4u",  0,  0},
-	{ XK_Return,       ShiftMask,                      "\033[13;2u",  0,  0},
-	{ XK_Pause,        ControlMask,                    "\033[18;5u",  0,  0},
-	{ XK_Pause,        ControlMask|ShiftMask,          "\033[18;6u",  0,  0},
-	{ XK_Pause,        Mod1Mask,                       "\033[18;3u",  0,  0},
-	{ XK_Pause,        Mod1Mask|ControlMask,           "\033[18;7u",  0,  0},
-	{ XK_Pause,        Mod1Mask|ControlMask|ShiftMask, "\033[18;8u",  0,  0},
-	{ XK_Pause,        Mod1Mask|ShiftMask,             "\033[18;4u",  0,  0},
-	{ XK_Pause,        ShiftMask,                      "\033[18;2u",  0,  0},
-	{ XK_Scroll_Lock,  ControlMask,                    "\033[20;5u",  0,  0},
-	{ XK_Scroll_Lock,  ControlMask|ShiftMask,          "\033[20;6u",  0,  0},
-	{ XK_Scroll_Lock,  Mod1Mask,                       "\033[20;3u",  0,  0},
-	{ XK_Scroll_Lock,  Mod1Mask|ControlMask,           "\033[20;7u",  0,  0},
-	{ XK_Scroll_Lock,  Mod1Mask|ControlMask|ShiftMask, "\033[20;8u",  0,  0},
-	{ XK_Scroll_Lock,  Mod1Mask|ShiftMask,             "\033[20;4u",  0,  0},
-	{ XK_Scroll_Lock,  ShiftMask,                      "\033[20;2u",  0,  0},
-	{ XK_Escape,       ControlMask,                    "\033[27;5u",  0,  0},
-	{ XK_Escape,       ControlMask|ShiftMask,          "\033[27;6u",  0,  0},
-	{ XK_Escape,       Mod1Mask,                       "\033[27;3u",  0,  0},
-	{ XK_Escape,       Mod1Mask|ControlMask,           "\033[27;7u",  0,  0},
-	{ XK_Escape,       Mod1Mask|ControlMask|ShiftMask, "\033[27;8u",  0,  0},
-	{ XK_Escape,       Mod1Mask|ShiftMask,             "\033[27;4u",  0,  0},
-	{ XK_Escape,       ShiftMask,                      "\033[27;2u",  0,  0},
-	{ XK_Home,         XK_NO_MOD,                      "\033[H",      0, -1},
-	{ XK_Home,         XK_NO_MOD,                      "\033[1~",     0, +1},
-	{ XK_Home,         ControlMask|ShiftMask,          "\033[80;6u",  0,  0},
-	{ XK_Home,         Mod1Mask,                       "\033[80;3u",  0,  0},
-	{ XK_Home,         Mod1Mask|ControlMask,           "\033[80;7u",  0,  0},
-	{ XK_Home,         Mod1Mask|ControlMask|ShiftMask, "\033[80;8u",  0,  0},
-	{ XK_Home,         Mod1Mask|ShiftMask,             "\033[80;4u",  0,  0},
-	{ XK_End,          XK_NO_MOD,                      "\033[4~",     0,  0},
-	{ XK_End,          ControlMask|ShiftMask,          "\033[87;6u",  0,  0},
-	{ XK_End,          Mod1Mask,                       "\033[87;3u",  0,  0},
-	{ XK_End,          Mod1Mask|ControlMask,           "\033[87;7u",  0,  0},
-	{ XK_End,          Mod1Mask|ControlMask|ShiftMask, "\033[87;8u",  0,  0},
-	{ XK_End,          Mod1Mask|ShiftMask,             "\033[87;4u",  0,  0},
-	{ XK_Prior,        XK_NO_MOD,                      "\033[5~",     0,  0},
-	{ XK_Prior,        ControlMask|ShiftMask,          "\033[85;6u",  0,  0},
-	{ XK_Prior,        Mod1Mask,                       "\033[85;3u",  0,  0},
-	{ XK_Prior,        Mod1Mask|ControlMask,           "\033[85;7u",  0,  0},
-	{ XK_Prior,        Mod1Mask|ControlMask|ShiftMask, "\033[85;8u",  0,  0},
-	{ XK_Prior,        Mod1Mask|ShiftMask,             "\033[85;4u",  0,  0},
-	{ XK_Next,         XK_NO_MOD,                      "\033[6~",     0,  0},
-	{ XK_Next,         ControlMask|ShiftMask,          "\033[86;6u",  0,  0},
-	{ XK_Next,         Mod1Mask,                       "\033[86;3u",  0,  0},
-	{ XK_Next,         Mod1Mask|ControlMask,           "\033[86;7u",  0,  0},
-	{ XK_Next,         Mod1Mask|ControlMask|ShiftMask, "\033[86;8u",  0,  0},
-	{ XK_Next,         Mod1Mask|ShiftMask,             "\033[86;4u",  0,  0},
-	{ XK_Print,        ControlMask,                    "\033[97;5u",  0,  0},
-	{ XK_Print,        ControlMask|ShiftMask,          "\033[97;6u",  0,  0},
-	{ XK_Print,        Mod1Mask,                       "\033[97;3u",  0,  0},
-	{ XK_Print,        Mod1Mask|ControlMask,           "\033[97;7u",  0,  0},
-	{ XK_Print,        Mod1Mask|ControlMask|ShiftMask, "\033[97;8u",  0,  0},
-	{ XK_Print,        Mod1Mask|ShiftMask,             "\033[97;4u",  0,  0},
-	{ XK_Print,        ShiftMask,                      "\033[97;2u",  0,  0},
-	{ XK_Insert,       XK_NO_MOD,                      "\033[4h",    -1,  0},
-	{ XK_Insert,       XK_NO_MOD,                      "\033[2~",    +1,  0},
-	{ XK_Insert,       ControlMask|ShiftMask,          "\033[99;6u",  0,  0},
-	{ XK_Insert,       Mod1Mask,                       "\033[99;3u",  0,  0},
-	{ XK_Insert,       Mod1Mask|ControlMask,           "\033[99;7u",  0,  0},
-	{ XK_Insert,       Mod1Mask|ControlMask|ShiftMask, "\033[99;8u",  0,  0},
-	{ XK_Insert,       Mod1Mask|ShiftMask,             "\033[99;4u",  0,  0},
-	{ XK_Menu,         ControlMask,                    "\033[103;5u", 0,  0},
-	{ XK_Menu,         ControlMask|ShiftMask,          "\033[103;6u", 0,  0},
-	{ XK_Menu,         Mod1Mask,                       "\033[103;3u", 0,  0},
-	{ XK_Menu,         Mod1Mask|ControlMask,           "\033[103;7u", 0,  0},
-	{ XK_Menu,         Mod1Mask|ControlMask|ShiftMask, "\033[103;8u", 0,  0},
-	{ XK_Menu,         Mod1Mask|ShiftMask,             "\033[103;4u", 0,  0},
-	{ XK_Menu,         ShiftMask,                      "\033[103;2u", 0,  0},
-	{ XK_Delete,       XK_NO_MOD,                      "\033[P",     -1,  0},
-	{ XK_Delete,       XK_NO_MOD,                      "\033[3~",    +1,  0},
-	{ XK_Delete,       ControlMask|ShiftMask,          "\033[255;6u", 0,  0},
-	{ XK_Delete,       Mod1Mask,                       "\033[255;3u", 0,  0},
-	{ XK_Delete,       Mod1Mask|ControlMask,           "\033[255;7u", 0,  0},
-	{ XK_Delete,       Mod1Mask|ControlMask|ShiftMask, "\033[255;8u", 0,  0},
-	{ XK_Delete,       Mod1Mask|ShiftMask,             "\033[255;4u", 0,  0},
-	{ XK_i,            ControlMask,                    "\033[105;5u", 0,  0},
-	{ XK_i,            Mod1Mask|ControlMask,           "\033[105;7u", 0,  0},
-	{ XK_m,            ControlMask,                    "\033[109;5u", 0,  0},
-	{ XK_m,            Mod1Mask|ControlMask,           "\033[109;7u", 0,  0},
-	{ XK_space,        ControlMask|ShiftMask,          "\033[32;6u",  0,  0},
-	{ XK_space,        Mod1Mask,                       "\033[32;3u",  0,  0},
-	{ XK_space,        Mod1Mask|ControlMask,           "\033[32;7u",  0,  0},
-	{ XK_space,        Mod1Mask|ControlMask|ShiftMask, "\033[32;8u",  0,  0},
-	{ XK_space,        Mod1Mask|ShiftMask,             "\033[32;4u",  0,  0},
-	{ XK_space,        ShiftMask,                      "\033[32;2u",  0,  0},
-	{ XK_0,            ControlMask,                    "\033[48;5u",  0,  0},
-	{ XK_A,            ControlMask|ShiftMask,          "\033[65;6u",  0,  0},
-	{ XK_B,            ControlMask|ShiftMask,          "\033[66;6u",  0,  0},
-	{ XK_C,            ControlMask|ShiftMask,          "\033[67;6u",  0,  0},
-	{ XK_D,            ControlMask|ShiftMask,          "\033[68;6u",  0,  0},
-	{ XK_E,            ControlMask|ShiftMask,          "\033[69;6u",  0,  0},
-	{ XK_F,            ControlMask|ShiftMask,          "\033[70;6u",  0,  0},
-	{ XK_G,            ControlMask|ShiftMask,          "\033[71;6u",  0,  0},
-	{ XK_H,            ControlMask|ShiftMask,          "\033[72;6u",  0,  0},
-	{ XK_I,            ControlMask|ShiftMask,          "\033[73;6u",  0,  0},
-	{ XK_I,            Mod1Mask|ControlMask|ShiftMask, "\033[73;8u",  0,  0},
-	{ XK_J,            ControlMask|ShiftMask,          "\033[75;6u",  0,  0},
-	{ XK_K,            ControlMask|ShiftMask,          "\033[74;6u",  0,  0},
-	{ XK_L,            ControlMask|ShiftMask,          "\033[76;6u",  0,  0},
-	{ XK_M,            ControlMask|ShiftMask,          "\033[77;6u",  0,  0},
-	{ XK_M,            Mod1Mask|ControlMask|ShiftMask, "\033[77;8u",  0,  0},
-	{ XK_N,            ControlMask|ShiftMask,          "\033[78;6u",  0,  0},
-	{ XK_O,            ControlMask|ShiftMask,          "\033[79;6u",  0,  0},
-	{ XK_P,            ControlMask|ShiftMask,          "\033[80;6u",  0,  0},
-	{ XK_Q,            ControlMask|ShiftMask,          "\033[81;6u",  0,  0},
-	{ XK_R,            ControlMask|ShiftMask,          "\033[82;6u",  0,  0},
-	{ XK_S,            ControlMask|ShiftMask,          "\033[83;6u",  0,  0},
-	{ XK_T,            ControlMask|ShiftMask,          "\033[84;6u",  0,  0},
-	{ XK_U,            ControlMask|ShiftMask,          "\033[85;6u",  0,  0},
-	{ XK_V,            ControlMask|ShiftMask,          "\033[86;6u",  0,  0},
-	{ XK_W,            ControlMask|ShiftMask,          "\033[87;6u",  0,  0},
-	{ XK_X,            ControlMask|ShiftMask,          "\033[88;6u",  0,  0},
-	{ XK_Y,            ControlMask|ShiftMask,          "\033[89;6u",  0,  0},
-	{ XK_Z,            ControlMask|ShiftMask,          "\033[90;6u",  0,  0},
-	{ XK_0,            Mod1Mask|ControlMask,           "\033[48;7u",  0,  0},
-	{ XK_1,            ControlMask,                    "\033[49;5u",  0,  0},
-	{ XK_1,            Mod1Mask|ControlMask,           "\033[49;7u",  0,  0},
-	{ XK_2,            ControlMask,                    "\033[50;5u",  0,  0},
-	{ XK_2,            Mod1Mask|ControlMask,           "\033[50;7u",  0,  0},
-	{ XK_3,            ControlMask,                    "\033[51;5u",  0,  0},
-	{ XK_3,            Mod1Mask|ControlMask,           "\033[51;7u",  0,  0},
-	{ XK_4,            ControlMask,                    "\033[52;5u",  0,  0},
-	{ XK_4,            Mod1Mask|ControlMask,           "\033[52;7u",  0,  0},
-	{ XK_5,            ControlMask,                    "\033[53;5u",  0,  0},
-	{ XK_5,            Mod1Mask|ControlMask,           "\033[53;7u",  0,  0},
-	{ XK_6,            ControlMask,                    "\033[54;5u",  0,  0},
-	{ XK_6,            Mod1Mask|ControlMask,           "\033[54;7u",  0,  0},
-	{ XK_7,            ControlMask,                    "\033[55;5u",  0,  0},
-	{ XK_7,            Mod1Mask|ControlMask,           "\033[55;7u",  0,  0},
-	{ XK_8,            ControlMask,                    "\033[56;5u",  0,  0},
-	{ XK_8,            Mod1Mask|ControlMask,           "\033[56;7u",  0,  0},
-	{ XK_9,            ControlMask,                    "\033[57;5u",  0,  0},
-	{ XK_9,            Mod1Mask|ControlMask,           "\033[57;7u",  0,  0},
-	{ XK_ampersand,    ControlMask,                    "\033[38;5u",  0,  0},
-	{ XK_ampersand,    ControlMask|ShiftMask,          "\033[38;6u",  0,  0},
-	{ XK_ampersand,    Mod1Mask,                       "\033[38;3u",  0,  0},
-	{ XK_ampersand,    Mod1Mask|ControlMask,           "\033[38;7u",  0,  0},
-	{ XK_ampersand,    Mod1Mask|ControlMask|ShiftMask, "\033[38;8u",  0,  0},
-	{ XK_ampersand,    Mod1Mask|ShiftMask,             "\033[38;4u",  0,  0},
-	{ XK_apostrophe,   ControlMask,                    "\033[39;5u",  0,  0},
-	{ XK_apostrophe,   ControlMask|ShiftMask,          "\033[39;6u",  0,  0},
-	{ XK_apostrophe,   Mod1Mask,                       "\033[39;3u",  0,  0},
-	{ XK_apostrophe,   Mod1Mask|ControlMask,           "\033[39;7u",  0,  0},
-	{ XK_apostrophe,   Mod1Mask|ControlMask|ShiftMask, "\033[39;8u",  0,  0},
-	{ XK_apostrophe,   Mod1Mask|ShiftMask,             "\033[39;4u",  0,  0},
-	{ XK_asciicircum,  ControlMask,                    "\033[94;5u",  0,  0},
-	{ XK_asciicircum,  ControlMask|ShiftMask,          "\033[94;6u",  0,  0},
-	{ XK_asciicircum,  Mod1Mask,                       "\033[94;3u",  0,  0},
-	{ XK_asciicircum,  Mod1Mask|ControlMask,           "\033[94;7u",  0,  0},
-	{ XK_asciicircum,  Mod1Mask|ControlMask|ShiftMask, "\033[94;8u",  0,  0},
-	{ XK_asciicircum,  Mod1Mask|ShiftMask,             "\033[94;4u",  0,  0},
-	{ XK_asciitilde,   ControlMask,                    "\033[126;5u", 0,  0},
-	{ XK_asciitilde,   ControlMask|ShiftMask,          "\033[126;6u", 0,  0},
-	{ XK_asciitilde,   Mod1Mask,                       "\033[126;3u", 0,  0},
-	{ XK_asciitilde,   Mod1Mask|ControlMask,           "\033[126;7u", 0,  0},
-	{ XK_asciitilde,   Mod1Mask|ControlMask|ShiftMask, "\033[126;8u", 0,  0},
-	{ XK_asciitilde,   Mod1Mask|ShiftMask,             "\033[126;4u", 0,  0},
-	{ XK_asterisk,     ControlMask,                    "\033[42;5u",  0,  0},
-	{ XK_asterisk,     ControlMask|ShiftMask,          "\033[42;6u",  0,  0},
-	{ XK_asterisk,     Mod1Mask,                       "\033[42;3u",  0,  0},
-	{ XK_asterisk,     Mod1Mask|ControlMask,           "\033[42;7u",  0,  0},
-	{ XK_asterisk,     Mod1Mask|ControlMask|ShiftMask, "\033[42;8u",  0,  0},
-	{ XK_asterisk,     Mod1Mask|ShiftMask,             "\033[42;4u",  0,  0},
-	{ XK_at,           ControlMask,                    "\033[64;5u",  0,  0},
-	{ XK_at,           ControlMask|ShiftMask,          "\033[64;6u",  0,  0},
-	{ XK_at,           Mod1Mask,                       "\033[64;3u",  0,  0},
-	{ XK_at,           Mod1Mask|ControlMask,           "\033[64;7u",  0,  0},
-	{ XK_at,           Mod1Mask|ControlMask|ShiftMask, "\033[64;8u",  0,  0},
-	{ XK_at,           Mod1Mask|ShiftMask,             "\033[64;4u",  0,  0},
-	{ XK_backslash,    ControlMask,                    "\033[92;5u",  0,  0},
-	{ XK_backslash,    ControlMask|ShiftMask,          "\033[92;6u",  0,  0},
-	{ XK_backslash,    Mod1Mask,                       "\033[92;3u",  0,  0},
-	{ XK_backslash,    Mod1Mask|ControlMask,           "\033[92;7u",  0,  0},
-	{ XK_backslash,    Mod1Mask|ControlMask|ShiftMask, "\033[92;8u",  0,  0},
-	{ XK_backslash,    Mod1Mask|ShiftMask,             "\033[92;4u",  0,  0},
-	{ XK_bar,          ControlMask,                    "\033[124;5u", 0,  0},
-	{ XK_bar,          ControlMask|ShiftMask,          "\033[124;6u", 0,  0},
-	{ XK_bar,          Mod1Mask,                       "\033[124;3u", 0,  0},
-	{ XK_bar,          Mod1Mask|ControlMask,           "\033[124;7u", 0,  0},
-	{ XK_bar,          Mod1Mask|ControlMask|ShiftMask, "\033[124;8u", 0,  0},
-	{ XK_bar,          Mod1Mask|ShiftMask,             "\033[124;4u", 0,  0},
-	{ XK_braceleft,    ControlMask,                    "\033[123;5u", 0,  0},
-	{ XK_braceleft,    ControlMask|ShiftMask,          "\033[123;6u", 0,  0},
-	{ XK_braceleft,    Mod1Mask,                       "\033[123;3u", 0,  0},
-	{ XK_braceleft,    Mod1Mask|ControlMask,           "\033[123;7u", 0,  0},
-	{ XK_braceleft,    Mod1Mask|ControlMask|ShiftMask, "\033[123;8u", 0,  0},
-	{ XK_braceleft,    Mod1Mask|ShiftMask,             "\033[123;4u", 0,  0},
-	{ XK_braceright,   ControlMask,                    "\033[125;5u", 0,  0},
-	{ XK_braceright,   ControlMask|ShiftMask,          "\033[125;6u", 0,  0},
-	{ XK_braceright,   Mod1Mask,                       "\033[125;3u", 0,  0},
-	{ XK_braceright,   Mod1Mask|ControlMask,           "\033[125;7u", 0,  0},
-	{ XK_braceright,   Mod1Mask|ControlMask|ShiftMask, "\033[125;8u", 0,  0},
-	{ XK_braceright,   Mod1Mask|ShiftMask,             "\033[125;4u", 0,  0},
-	{ XK_bracketleft,  ControlMask,                    "\033[91;5u",  0,  0},
-	{ XK_bracketleft,  ControlMask|ShiftMask,          "\033[91;6u",  0,  0},
-	{ XK_bracketleft,  Mod1Mask,                       "\033[91;3u",  0,  0},
-	{ XK_bracketleft,  Mod1Mask|ControlMask,           "\033[91;7u",  0,  0},
-	{ XK_bracketleft,  Mod1Mask|ControlMask|ShiftMask, "\033[91;8u",  0,  0},
-	{ XK_bracketleft,  Mod1Mask|ShiftMask,             "\033[91;4u",  0,  0},
-	{ XK_bracketright, ControlMask,                    "\033[93;5u",  0,  0},
-	{ XK_bracketright, ControlMask|ShiftMask,          "\033[93;6u",  0,  0},
-	{ XK_bracketright, Mod1Mask,                       "\033[93;3u",  0,  0},
-	{ XK_bracketright, Mod1Mask|ControlMask,           "\033[93;7u",  0,  0},
-	{ XK_bracketright, Mod1Mask|ControlMask|ShiftMask, "\033[93;8u",  0,  0},
-	{ XK_bracketright, Mod1Mask|ShiftMask,             "\033[93;4u",  0,  0},
-	{ XK_colon,        ControlMask,                    "\033[58;5u",  0,  0},
-	{ XK_colon,        ControlMask|ShiftMask,          "\033[58;6u",  0,  0},
-	{ XK_colon,        Mod1Mask,                       "\033[58;3u",  0,  0},
-	{ XK_colon,        Mod1Mask|ControlMask,           "\033[58;7u",  0,  0},
-	{ XK_colon,        Mod1Mask|ControlMask|ShiftMask, "\033[58;8u",  0,  0},
-	{ XK_colon,        Mod1Mask|ShiftMask,             "\033[58;4u",  0,  0},
-	{ XK_comma,        ControlMask,                    "\033[44;5u",  0,  0},
-	{ XK_comma,        ControlMask|ShiftMask,          "\033[44;6u",  0,  0},
-	{ XK_comma,        Mod1Mask,                       "\033[44;3u",  0,  0},
-	{ XK_comma,        Mod1Mask|ControlMask,           "\033[44;7u",  0,  0},
-	{ XK_comma,        Mod1Mask|ControlMask|ShiftMask, "\033[44;8u",  0,  0},
-	{ XK_comma,        Mod1Mask|ShiftMask,             "\033[44;4u",  0,  0},
-	{ XK_dollar,       ControlMask,                    "\033[36;5u",  0,  0},
-	{ XK_dollar,       ControlMask|ShiftMask,          "\033[36;6u",  0,  0},
-	{ XK_dollar,       Mod1Mask,                       "\033[36;3u",  0,  0},
-	{ XK_dollar,       Mod1Mask|ControlMask,           "\033[36;7u",  0,  0},
-	{ XK_dollar,       Mod1Mask|ControlMask|ShiftMask, "\033[36;8u",  0,  0},
-	{ XK_dollar,       Mod1Mask|ShiftMask,             "\033[36;4u",  0,  0},
-	{ XK_equal,        ControlMask,                    "\033[61;5u",  0,  0},
-	{ XK_equal,        ControlMask|ShiftMask,          "\033[61;6u",  0,  0},
-	{ XK_equal,        Mod1Mask,                       "\033[61;3u",  0,  0},
-	{ XK_equal,        Mod1Mask|ControlMask,           "\033[61;7u",  0,  0},
-	{ XK_equal,        Mod1Mask|ControlMask|ShiftMask, "\033[61;8u",  0,  0},
-	{ XK_equal,        Mod1Mask|ShiftMask,             "\033[61;4u",  0,  0},
-	{ XK_exclam,       ControlMask,                    "\033[33;5u",  0,  0},
-	{ XK_exclam,       ControlMask|ShiftMask,          "\033[33;6u",  0,  0},
-	{ XK_exclam,       Mod1Mask,                       "\033[33;3u",  0,  0},
-	{ XK_exclam,       Mod1Mask|ControlMask,           "\033[33;7u",  0,  0},
-	{ XK_exclam,       Mod1Mask|ControlMask|ShiftMask, "\033[33;8u",  0,  0},
-	{ XK_exclam,       Mod1Mask|ShiftMask,             "\033[33;4u",  0,  0},
-	{ XK_grave,        ControlMask,                    "\033[96;5u",  0,  0},
-	{ XK_grave,        ControlMask|ShiftMask,          "\033[96;6u",  0,  0},
-	{ XK_grave,        Mod1Mask,                       "\033[96;3u",  0,  0},
-	{ XK_grave,        Mod1Mask|ControlMask,           "\033[96;7u",  0,  0},
-	{ XK_grave,        Mod1Mask|ControlMask|ShiftMask, "\033[96;8u",  0,  0},
-	{ XK_grave,        Mod1Mask|ShiftMask,             "\033[96;4u",  0,  0},
-	{ XK_greater,      ControlMask,                    "\033[62;5u",  0,  0},
-	{ XK_greater,      ControlMask|ShiftMask,          "\033[62;6u",  0,  0},
-	{ XK_greater,      Mod1Mask,                       "\033[62;3u",  0,  0},
-	{ XK_greater,      Mod1Mask|ControlMask,           "\033[62;7u",  0,  0},
-	{ XK_greater,      Mod1Mask|ControlMask|ShiftMask, "\033[62;8u",  0,  0},
-	{ XK_greater,      Mod1Mask|ShiftMask,             "\033[62;4u",  0,  0},
-	{ XK_less,         ControlMask,                    "\033[60;5u",  0,  0},
-	{ XK_less,         ControlMask|ShiftMask,          "\033[60;6u",  0,  0},
-	{ XK_less,         Mod1Mask,                       "\033[60;3u",  0,  0},
-	{ XK_less,         Mod1Mask|ControlMask,           "\033[60;7u",  0,  0},
-	{ XK_less,         Mod1Mask|ControlMask|ShiftMask, "\033[60;8u",  0,  0},
-	{ XK_less,         Mod1Mask|ShiftMask,             "\033[60;4u",  0,  0},
-	{ XK_minus,        ControlMask,                    "\033[45;5u",  0,  0},
-	{ XK_minus,        ControlMask|ShiftMask,          "\033[45;6u",  0,  0},
-	{ XK_minus,        Mod1Mask,                       "\033[45;3u",  0,  0},
-	{ XK_minus,        Mod1Mask|ControlMask,           "\033[45;7u",  0,  0},
-	{ XK_minus,        Mod1Mask|ControlMask|ShiftMask, "\033[45;8u",  0,  0},
-	{ XK_minus,        Mod1Mask|ShiftMask,             "\033[45;4u",  0,  0},
-	{ XK_numbersign,   ControlMask,                    "\033[35;5u",  0,  0},
-	{ XK_numbersign,   ControlMask|ShiftMask,          "\033[35;6u",  0,  0},
-	{ XK_numbersign,   Mod1Mask,                       "\033[35;3u",  0,  0},
-	{ XK_numbersign,   Mod1Mask|ControlMask,           "\033[35;7u",  0,  0},
-	{ XK_numbersign,   Mod1Mask|ControlMask|ShiftMask, "\033[35;8u",  0,  0},
-	{ XK_numbersign,   Mod1Mask|ShiftMask,             "\033[35;4u",  0,  0},
-	{ XK_parenleft,    ControlMask,                    "\033[40;5u",  0,  0},
-	{ XK_parenleft,    ControlMask|ShiftMask,          "\033[40;6u",  0,  0},
-	{ XK_parenleft,    Mod1Mask,                       "\033[40;3u",  0,  0},
-	{ XK_parenleft,    Mod1Mask|ControlMask,           "\033[40;7u",  0,  0},
-	{ XK_parenleft,    Mod1Mask|ControlMask|ShiftMask, "\033[40;8u",  0,  0},
-	{ XK_parenleft,    Mod1Mask|ShiftMask,             "\033[40;4u",  0,  0},
-	{ XK_parenright,   ControlMask,                    "\033[41;5u",  0,  0},
-	{ XK_parenright,   ControlMask|ShiftMask,          "\033[41;6u",  0,  0},
-	{ XK_parenright,   Mod1Mask,                       "\033[41;3u",  0,  0},
-	{ XK_parenright,   Mod1Mask|ControlMask,           "\033[41;7u",  0,  0},
-	{ XK_parenright,   Mod1Mask|ControlMask|ShiftMask, "\033[41;8u",  0,  0},
-	{ XK_parenright,   Mod1Mask|ShiftMask,             "\033[41;4u",  0,  0},
-	{ XK_percent,      ControlMask,                    "\033[37;5u",  0,  0},
-	{ XK_percent,      ControlMask|ShiftMask,          "\033[37;6u",  0,  0},
-	{ XK_percent,      Mod1Mask,                       "\033[37;3u",  0,  0},
-	{ XK_percent,      Mod1Mask|ControlMask,           "\033[37;7u",  0,  0},
-	{ XK_percent,      Mod1Mask|ControlMask|ShiftMask, "\033[37;8u",  0,  0},
-	{ XK_percent,      Mod1Mask|ShiftMask,             "\033[37;4u",  0,  0},
-	{ XK_period,       ControlMask,                    "\033[46;5u",  0,  0},
-	{ XK_period,       ControlMask|ShiftMask,          "\033[46;6u",  0,  0},
-	{ XK_period,       Mod1Mask|ControlMask,           "\033[46;7u",  0,  0},
-	{ XK_period,       Mod1Mask|ControlMask|ShiftMask, "\033[46;8u",  0,  0},
-	{ XK_period,       Mod1Mask|ShiftMask,             "\033[46;4u",  0,  0},
-	{ XK_plus,         ControlMask,                    "\033[43;5u",  0,  0},
-	{ XK_plus,         ControlMask|ShiftMask,          "\033[43;6u",  0,  0},
-	{ XK_plus,         Mod1Mask,                       "\033[43;3u",  0,  0},
-	{ XK_plus,         Mod1Mask|ControlMask,           "\033[43;7u",  0,  0},
-	{ XK_plus,         Mod1Mask|ControlMask|ShiftMask, "\033[43;8u",  0,  0},
-	{ XK_plus,         Mod1Mask|ShiftMask,             "\033[43;4u",  0,  0},
-	{ XK_question,     ControlMask,                    "\033[63;5u",  0,  0},
-	{ XK_question,     ControlMask|ShiftMask,          "\033[63;6u",  0,  0},
-	{ XK_question,     Mod1Mask,                       "\033[63;3u",  0,  0},
-	{ XK_question,     Mod1Mask|ControlMask,           "\033[63;7u",  0,  0},
-	{ XK_question,     Mod1Mask|ControlMask|ShiftMask, "\033[63;8u",  0,  0},
-	{ XK_question,     Mod1Mask|ShiftMask,             "\033[63;4u",  0,  0},
-	{ XK_quotedbl,     ControlMask,                    "\033[34;5u",  0,  0},
-	{ XK_quotedbl,     ControlMask|ShiftMask,          "\033[34;6u",  0,  0},
-	{ XK_quotedbl,     Mod1Mask,                       "\033[34;3u",  0,  0},
-	{ XK_quotedbl,     Mod1Mask|ControlMask,           "\033[34;7u",  0,  0},
-	{ XK_quotedbl,     Mod1Mask|ControlMask|ShiftMask, "\033[34;8u",  0,  0},
-	{ XK_quotedbl,     Mod1Mask|ShiftMask,             "\033[34;4u",  0,  0},
-	{ XK_semicolon,    ControlMask,                    "\033[59;5u",  0,  0},
-	{ XK_semicolon,    ControlMask|ShiftMask,          "\033[59;6u",  0,  0},
-	{ XK_semicolon,    Mod1Mask,                       "\033[59;3u",  0,  0},
-	{ XK_semicolon,    Mod1Mask|ControlMask,           "\033[59;7u",  0,  0},
-	{ XK_semicolon,    Mod1Mask|ControlMask|ShiftMask, "\033[59;8u",  0,  0},
-	{ XK_semicolon,    Mod1Mask|ShiftMask,             "\033[59;4u",  0,  0},
-	{ XK_slash,        ControlMask|ShiftMask,          "\033[47;6u",  0,  0},
-	{ XK_slash,        Mod1Mask,                       "\033[47;3u",  0,  0},
-	{ XK_slash,        Mod1Mask|ControlMask,           "\033[47;7u",  0,  0},
-	{ XK_slash,        Mod1Mask|ControlMask|ShiftMask, "\033[47;8u",  0,  0},
-	{ XK_slash,        Mod1Mask|ShiftMask,             "\033[47;4u",  0,  0},
-	{ XK_underscore,   ControlMask,                    "\033[95;5u",  0,  0},
-	{ XK_underscore,   ControlMask|ShiftMask,          "\033[95;6u",  0,  0},
-	{ XK_underscore,   Mod1Mask,                       "\033[95;3u",  0,  0},
-	{ XK_underscore,   Mod1Mask|ControlMask,           "\033[95;7u",  0,  0},
-	{ XK_underscore,   Mod1Mask|ControlMask|ShiftMask, "\033[95;8u",  0,  0},
-	{ XK_underscore,   Mod1Mask|ShiftMask,             "\033[95;4u",  0,  0},
-};
--- a/desktop/.st/patch/font2.c
+++ b/desktop/.st/patch/font2.c
@@ -1,104 +0,0 @@
-int
-xloadsparefont(FcPattern *pattern, int flags)
-{
-	FcPattern *match;
-	FcResult result;
-
-	#if USE_XFTFONTMATCH_PATCH
-	match = XftFontMatch(xw.dpy, xw.scr, pattern, &result);
-	#else
-	match = FcFontMatch(NULL, pattern, &result);
-	#endif // USE_XFTFONTMATCH_PATCH
-	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 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 && defaultfontsize != usedfontsize) {
-			if (FcPatternGetDouble(pattern, FC_PIXEL_SIZE, 0, &fontval) ==
-					FcResultMatch) {
-				fontval *= usedfontsize / defaultfontsize;
-				FcPatternDel(pattern, FC_PIXEL_SIZE);
-				FcPatternDel(pattern, FC_SIZE);
-				FcPatternAddDouble(pattern, FC_PIXEL_SIZE, fontval);
-			} else if (FcPatternGetDouble(pattern, FC_SIZE, 0, &fontval) ==
-					FcResultMatch) {
-				fontval *= usedfontsize / defaultfontsize;
-				FcPatternDel(pattern, FC_PIXEL_SIZE);
-				FcPatternDel(pattern, FC_SIZE);
-				FcPatternAddDouble(pattern, FC_SIZE, fontval);
-			}
-		}
-
-		FcPatternAddBool(pattern, FC_SCALABLE, 1);
-
-		#if !USE_XFTFONTMATCH_PATCH
-		FcConfigSubstitute(NULL, pattern, FcMatchPattern);
-		XftDefaultSubstitute(xw.dpy, xw.scr, pattern);
-		#endif // USE_XFTFONTMATCH_PATCH
-
-		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);
-	}
-}
--- a/desktop/.st/patch/font2.h
+++ b/desktop/.st/patch/font2.h
@@ -1,2 +0,0 @@
-static int xloadsparefont(FcPattern *, int);
-static void xloadsparefonts(void);
--- a/desktop/.st/patch/fullscreen_x.c
+++ b/desktop/.st/patch/fullscreen_x.c
@@ -1,17 +0,0 @@
-void
-fullscreen(const Arg *arg)
-{
-	XEvent ev;
-
-	memset(&ev, 0, sizeof(ev));
-
-	ev.xclient.type = ClientMessage;
-	ev.xclient.message_type = xw.netwmstate;
-	ev.xclient.display = xw.dpy;
-	ev.xclient.window = xw.win;
-	ev.xclient.format = 32;
-	ev.xclient.data.l[0] = 2; /* _NET_WM_STATE_TOGGLE */
-	ev.xclient.data.l[1] = xw.netwmfullscreen;
-
-	XSendEvent(xw.dpy, DefaultRootWindow(xw.dpy), False, SubstructureNotifyMask|SubstructureRedirectMask, &ev);
-}
--- a/desktop/.st/patch/fullscreen_x.h
+++ b/desktop/.st/patch/fullscreen_x.h
@@ -1 +0,0 @@
-static void fullscreen(const Arg *arg);
--- a/desktop/.st/patch/invert.c
+++ b/desktop/.st/patch/invert.c
@@ -1,21 +0,0 @@
-static int invertcolors = 0;
-
-void
-invert(const Arg *dummy)
-{
-	invertcolors = !invertcolors;
-	redraw();
-}
-
-Color
-invertedcolor(Color *clr)
-{
-	XRenderColor rc;
-	Color inverted;
-	rc.red = ~clr->color.red;
-	rc.green = ~clr->color.green;
-	rc.blue = ~clr->color.blue;
-	rc.alpha = clr->color.alpha;
-	XftColorAllocValue(xw.dpy, xw.vis, xw.cmap, &rc, &inverted);
-	return inverted;
-}
--- a/desktop/.st/patch/invert.h
+++ b/desktop/.st/patch/invert.h
@@ -1 +0,0 @@
-static void invert(const Arg *);
--- a/desktop/.st/patch/iso14755.c
+++ b/desktop/.st/patch/iso14755.c
@@ -1,21 +0,0 @@
-void
-iso14755(const Arg *arg)
-{
-	FILE *p;
-	char *us, *e, codepoint[9], uc[UTF_SIZ];
-	unsigned long utf32;
-
-	if (!(p = popen(ISO14755CMD, "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);
-}
--- a/desktop/.st/patch/iso14755.h
+++ b/desktop/.st/patch/iso14755.h
@@ -1,6 +0,0 @@
-#define NUMMAXLEN(x)		((int)(sizeof(x) * 2.56 + 0.5) + 1)
-
-/* constants */
-#define ISO14755CMD		"dmenu -w \"$WINDOWID\" -p codepoint: </dev/null"
-
-void iso14755(const Arg *);
--- a/desktop/.st/patch/keyboardselect_st.c
+++ b/desktop/.st/patch/keyboardselect_st.c
@@ -1,240 +0,0 @@
-void set_notifmode(int type, KeySym ksym)
-{
-	static char *lib[] = { " MOVE ", " SEL  "};
-	static Glyph *g, *deb, *fin;
-	static int col, bot;
-
-	if (ksym == -1) {
-		free(g);
-		col = term.col, bot = term.bot;
-		g = xmalloc(col * sizeof(Glyph));
-		memcpy(g, term.line[bot], col * sizeof(Glyph));
-
-	} else if (ksym == -2)
-		memcpy(term.line[bot], g, col * sizeof(Glyph));
-
-	if ( type < 2 ) {
-		char *z = lib[type];
-		for (deb = &term.line[bot][col - 6], fin = &term.line[bot][col]; deb < fin; z++, deb++)
-			deb->mode = ATTR_REVERSE,
-			deb->u = *z,
-			deb->fg = defaultfg, deb->bg = defaultbg;
-	} else if (type < 5)
-		memcpy(term.line[bot], g, col * sizeof(Glyph));
-	else {
-		for (deb = &term.line[bot][0], fin = &term.line[bot][col]; deb < fin; deb++)
-			deb->mode = ATTR_REVERSE,
-			deb->u = ' ',
-			deb->fg = defaultfg, deb->bg = defaultbg;
-		term.line[bot][0].u = ksym;
-	}
-
-	term.dirty[bot] = 1;
-	drawregion(0, bot, col, bot + 1);
-}
-
-#if SCROLLBACK_PATCH && KEYBOARDSELECT_PATCH
-Glyph getglyph(Term term, int y, int x)
-{
-	Glyph g;
-	int realy = y - term.scr;
-	if(realy >= 0) {
-		g = term.line[realy][x];
-	} else {
-		realy = term.histi - term.scr + y + 1;
-		g = term.hist[realy][x];
-	}
-	return g;
-}
-#endif
-
-void select_or_drawcursor(int selectsearch_mode, int type)
-{
-	int done = 0;
-
-	if (selectsearch_mode & 1) {
-		selextend(term.c.x, term.c.y, type, done);
-		xsetsel(getsel());
-	} else {
-		#if LIGATURES_PATCH
-		xdrawcursor(term.c.x, term.c.y, term.line[term.c.y][term.c.x],
-					term.ocx, term.ocy, term.line[term.ocy][term.ocx],
-					term.line[term.ocy], term.col);
-		#elif SCROLLBACK_PATCH && KEYBOARDSELECT_PATCH
-		xdrawcursor(term.c.x, term.c.y, getglyph(term, term.c.y, term.c.x),
-		            term.ocx, term.ocy, getglyph(term, term.ocy, term.ocx));
-		#else
-		xdrawcursor(term.c.x, term.c.y, term.line[term.c.y][term.c.x],
-					term.ocx, term.ocy, term.line[term.ocy][term.ocx]);
-		#endif // LIGATURES_PATCH
-	}
-}
-
-void search(int selectsearch_mode, Rune *target, int ptarget, int incr, int type, TCursor *cu)
-{
-	Rune *r;
-	int i, bound = (term.col * cu->y + cu->x) * (incr > 0) + incr;
-
-	for (i = term.col * term.c.y + term.c.x + incr; i != bound; i += incr) {
-		for (r = target; r - target < ptarget; r++) {
-			if (*r == term.line[(i + r - target) / term.col][(i + r - target) % term.col].u) {
-				if (r - target == ptarget - 1)
-					break;
-			} else {
-				r = NULL;
-				break;
-			}
-		}
-		if (r != NULL)
-			break;
-	}
-
-	if (i != bound) {
-		term.c.y = i / term.col, term.c.x = i % term.col;
-		select_or_drawcursor(selectsearch_mode, type);
-	}
-}
-
-int trt_kbdselect(KeySym ksym, char *buf, int len)
-{
-	static TCursor cu;
-	static Rune target[64];
-	static int type = 1, ptarget, in_use;
-	static int sens, quant;
-	static char selectsearch_mode;
-	int i, bound, *xy;
-
-	if (selectsearch_mode & 2) {
-		if (ksym == XK_Return) {
-			selectsearch_mode ^= 2;
-			set_notifmode(selectsearch_mode, -2);
-			if (ksym == XK_Escape)
-				ptarget = 0;
-			return 0;
-		} else if (ksym == XK_BackSpace) {
-			if (!ptarget)
-				return 0;
-			term.line[term.bot][ptarget--].u = ' ';
-		} else if (len < 1) {
-			return 0;
-		} else if (ptarget == term.col || ksym == XK_Escape) {
-			return 0;
-		} else {
-			utf8decode(buf, &target[ptarget++], len);
-			term.line[term.bot][ptarget].u = target[ptarget - 1];
-		}
-
-		if (ksym != XK_BackSpace)
-			search(selectsearch_mode, &target[0], ptarget, sens, type, &cu);
-
-		term.dirty[term.bot] = 1;
-		drawregion(0, term.bot, term.col, term.bot + 1);
-		return 0;
-	}
-
-	switch (ksym) {
-	case -1:
-		in_use = 1;
-		cu.x = term.c.x, cu.y = term.c.y;
-		set_notifmode(0, ksym);
-		return MODE_KBDSELECT;
-	case XK_s:
-		if (selectsearch_mode & 1)
-			selclear();
-		else
-			selstart(term.c.x, term.c.y, 0);
-		set_notifmode(selectsearch_mode ^= 1, ksym);
-		break;
-	case XK_t:
-		selextend(term.c.x, term.c.y, type ^= 3, i = 0);  /* 2 fois */
-		selextend(term.c.x, term.c.y, type, i = 0);
-		break;
-	case XK_slash:
-	case XK_KP_Divide:
-	case XK_question:
-		ksym &= XK_question;                /* Divide to slash */
-		sens = (ksym == XK_slash) ? -1 : 1;
-		ptarget = 0;
-		set_notifmode(15, ksym);
-		selectsearch_mode ^= 2;
-		break;
-	case XK_Escape:
-		if (!in_use)
-			break;
-		selclear();
-	case XK_Return:
-		set_notifmode(4, ksym);
-		term.c.x = cu.x, term.c.y = cu.y;
-		select_or_drawcursor(selectsearch_mode = 0, type);
-		in_use = quant = 0;
-		return MODE_KBDSELECT;
-	case XK_n:
-	case XK_N:
-		if (ptarget)
-			search(selectsearch_mode, &target[0], ptarget, (ksym == XK_n) ? -1 : 1, type, &cu);
-		break;
-	case XK_BackSpace:
-		term.c.x = 0;
-		select_or_drawcursor(selectsearch_mode, type);
-		break;
-	case XK_dollar:
-		term.c.x = term.col - 1;
-		select_or_drawcursor(selectsearch_mode, type);
-		break;
-	case XK_Home:
-		term.c.x = 0, term.c.y = 0;
-		select_or_drawcursor(selectsearch_mode, type);
-		break;
-	case XK_End:
-		term.c.x = cu.x, term.c.y = cu.y;
-		select_or_drawcursor(selectsearch_mode, type);
-		break;
-	case XK_Page_Up:
-	case XK_Page_Down:
-		term.c.y = (ksym == XK_Prior ) ? 0 : cu.y;
-		select_or_drawcursor(selectsearch_mode, type);
-		break;
-	case XK_exclam:
-		term.c.x = term.col >> 1;
-		select_or_drawcursor(selectsearch_mode, type);
-		break;
-	case XK_asterisk:
-	case XK_KP_Multiply:
-		term.c.x = term.col >> 1;
-	case XK_underscore:
-		term.c.y = cu.y >> 1;
-		select_or_drawcursor(selectsearch_mode, type);
-		break;
-	default:
-		if (ksym >= XK_0 && ksym <= XK_9) {                 /* 0-9 keyboard */
-			quant = (quant * 10) + (ksym ^ XK_0);
-			return 0;
-		} else if (ksym >= XK_KP_0 && ksym <= XK_KP_9) {    /* 0-9 numpad */
-			quant = (quant * 10) + (ksym ^ XK_KP_0);
-			return 0;
-		} else if (ksym == XK_k || ksym == XK_h)
-			i = ksym & 1;
-		else if (ksym == XK_l || ksym == XK_j)
-			i = ((ksym & 6) | 4) >> 1;
-		else if ((XK_Home & ksym) != XK_Home || (i = (ksym ^ XK_Home) - 1) > 3)
-			break;
-
-		xy = (i & 1) ? &term.c.y : &term.c.x;
-		sens = (i & 2) ? 1 : -1;
-		bound = (i >> 1 ^ 1) ? 0 : (i ^ 3) ? term.col - 1 : term.bot;
-
-		if (quant == 0)
-			quant++;
-
-		if (*xy == bound && ((sens < 0 && bound == 0) || (sens > 0 && bound > 0)))
-			break;
-
-		*xy += quant * sens;
-		if (*xy < 0 || ( bound > 0 && *xy > bound))
-			*xy = bound;
-
-		select_or_drawcursor(selectsearch_mode, type);
-	}
-	quant = 0;
-	return 0;
-}
--- a/desktop/.st/patch/keyboardselect_st.h
+++ b/desktop/.st/patch/keyboardselect_st.h
@@ -1,2 +0,0 @@
-void toggle_winmode(int);
-int trt_kbdselect(KeySym, char *, int);
--- a/desktop/.st/patch/keyboardselect_x.c
+++ b/desktop/.st/patch/keyboardselect_x.c
@@ -1,7 +0,0 @@
-void toggle_winmode(int flag) {
-        win.mode ^= flag;
-}
-
-void keyboard_select(const Arg *dummy) {
-    win.mode ^= trt_kbdselect(-1, NULL, 0);
-}
--- a/desktop/.st/patch/keyboardselect_x.h
+++ b/desktop/.st/patch/keyboardselect_x.h
@@ -1,2 +0,0 @@
-void toggle_winmode(int);
-void keyboard_select(const Arg *);
--- a/desktop/.st/patch/netwmicon.h
+++ b/desktop/.st/patch/netwmicon.h
@@ -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,
-};
--- a/desktop/.st/patch/newterm.c
+++ b/desktop/.st/patch/newterm.c
@@ -1,30 +0,0 @@
-void
-newterm(const Arg* a)
-{
-	int res;
-	switch (fork()) {
-	case -1:
-		die("fork failed: %s\n", strerror(errno));
-		break;
-	case 0:
-		switch (fork()) {
-		case -1:
-			die("fork failed: %s\n", strerror(errno));
-			break;
-		case 0:
-			res = chdir(getcwd_by_pid(pid));
-			execlp("st", "./st", NULL);
-			break;
-		default:
-			exit(0);
-		}
-	default:
-		wait(NULL);
-	}
-}
-
-static char *getcwd_by_pid(pid_t pid) {
-	char buf[32];
-	snprintf(buf, sizeof buf, "/proc/%d/cwd", pid);
-	return realpath(buf, NULL);
-}
--- a/desktop/.st/patch/newterm.h
+++ b/desktop/.st/patch/newterm.h
@@ -1,2 +0,0 @@
-void newterm(const Arg *);
-static char *getcwd_by_pid(pid_t pid);
--- a/desktop/.st/patch/normalMode.c
+++ b/desktop/.st/patch/normalMode.c
@@ -1,284 +0,0 @@
-#include <X11/keysym.h>
-#include <X11/XKBlib.h>
-
-#include "normalMode.h"
-#include "utils.h"
-
-extern Glyph const styleSearch, style[];
-extern char const wDelS[], wDelL[], *nmKeys[];
-extern unsigned int bg[], fg, currentBg, highlightBg, highlightFg, amountNmKeys;
-
-typedef struct { int p[3]; } Pos;
-
-typedef enum {visual='v', visualLine='V', yank = 'y'} Op;
-typedef enum {infix_none=0, infix_i='i', infix_a='a'} Infix;
-typedef enum {fw='/', bw='?'} Search;
-struct NormalModeState {
-	struct OperationState { Op op; Infix infix; } cmd;
-	struct MotionState { uint32_t c; int active; Pos searchPos; Search search; } m;
-} defaultNormalMode, state;
-
-DynamicArray searchStr=UTF8_ARRAY, cCmd=UTF8_ARRAY, lCmd=UTF8_ARRAY;
-Glyph styleCmd;
-char posBuffer[10], braces[6][3] = { {"()"}, {"<>"}, {"{}"}, {"[]"}, {"\"\""}, {"''"}};
-int exited=1, overlay=1;
-static inline Rune cChar() { return term.line[term.c.y][term.c.x].u; }
-static inline int pos(int p, int h) {return IS_SET(MODE_ALTSCREEN)?p:rangeY(p+h*histOff-insertOff);}
-static inline int contains(Rune l, char const * values, size_t const memSize) {
-	for (uint32_t i = 0; i < memSize; ++i) if (l == values[i]) return 1;
-	return 0;
-}
-static inline void decodeTo(char const *cs, size_t len, DynamicArray *arr) {
-	char *var = expand(arr);
-	if (!var) empty(arr); else utf8decode(cs, (Rune*)(var), len);
-}
-static inline void applyPos(Pos p) {
-	term.c.x = p.p[0], term.c.y = p.p[1];
-	if (!IS_SET(MODE_ALTSCREEN) && histOp) term.line = &buf[histOff = p.p[2]];
-}
-/// Find string in history buffer, and provide string-match-lookup for highlighting matches
-static int highlighted(int x, int y) {
-	int const s=term.row*term.col, i=y*term.col+x, sz=size(&searchStr);
-	return sz && i<s && mark[i]!=sz && i+mark[i]<s && !mark[i+mark[i]];
-}
-static void markSearchMatches(int all) {
-	int sz = size(&searchStr), ox = 0, oy = 0, oi=0;
-	for (int y=0; sz && all && y<term.row; ++y)
-		for (int x=0; x<term.col; ++x) term.dirty[y] |= highlighted(x, y);
-	for (int y = 0, wi=0, owi=0, i=0; sz && y < term.row; ++y)
-		for (int x=0; x<term.col; ++x, wi%=sz, ++i, owi=wi)
-			if (all || term.dirty[y]) {
-				mark[i]=sz-(wi=(getU32(&searchStr,wi,1)==term.line[y][x].u?wi+1:0));
-				if (wi==1) ox=x, oy=y, oi=i; else if (!wi && owi) x=ox, y=oy, i=oi;
-			}
-	for (int y=0; sz &&all &&y<term.row; ++y)
-		for (int x=0; x<term.col; ++x) term.dirty[y] |= highlighted(x, y);
-}
-static int findString(int s, int all) {
-	Pos p = (Pos) {.p={term.c.x, term.c.y, IS_SET(MODE_ALTSCREEN) ? 0 : histOff}};
-	historyMove(s, 0, 0);
-	uint32_t strSz=size(&searchStr), maxIter=rows()*term.col+strSz, wIdx=0;
-	for (uint32_t i=0, wi = 0; wIdx<strSz && ++i<=maxIter; historyMove(s, 0, 0), wi=wIdx) {
-		wIdx = (getU32(&searchStr, wIdx, s>0)==cChar())?wIdx+1:0;
-		if (wi && !wIdx) historyMove(-(int)(s*wi), 0, 0);
-	}
-	if (wIdx == strSz && wIdx) historyMove(-(int)(s*strSz), 0, 0);
-	else applyPos(p);
-	markSearchMatches(all);
-	return wIdx == strSz;
-}
-/// Execute series of normal-mode commands from char array / decoded from dynamic array
-ExitState pressKeys(char const* s, size_t e) {
-	ExitState x=success;
-	for (size_t i=0; i<e && (x=(!s[i] ? x : kPressHist(&s[i], 1, 0, NULL))); ++i);
-	return x;
-}
-static ExitState executeCommand(uint32_t *cs, size_t z) {
-	ExitState x=success;
-	char dc [32];
-	for (size_t i=0; i<z && (x=kPressHist(dc, utf8encode(cs[i],dc),0,NULL));++i);
-	return x;
-}
-/// Get character for overlay, if the overlay (st) has something to show, else normal char.
-static void getChar(DynamicArray *st, Glyph *glyphChange, int y, int xEnd, int width, int x) {
-	if (x < xEnd - min(min(width,xEnd), size(st))) *glyphChange = term.line[y][x];
-	else if (x<xEnd) glyphChange->u = *((Rune*)(st->content + (size(st)+x-xEnd)*st->elSize));
-}
-/// Expand "infix" expression: for instance (w =>)       l     b     |   | v     e    |   | y
-static ExitState expandExpression(char l) { //    ({ =>)       l  ?  {  \n | l | v  /  } \n | h | y
-	int a=state.cmd.infix==infix_a, yank=state.cmd.op=='y', lc=tolower(l), found=1;
-	state.cmd.infix = infix_none;
-	if(!yank && state.cmd.op!=visual && state.cmd.op!=visualLine) return failed;
-	char mot[11] = {'l', 0, 'b', 0, 0, 'v', 0, 'e', 0, 0, (char)(yank ? 'y' : 0)};
-	if (lc == 'w') mot[2] = (char) ('b' - lc + l), mot[7] = (char) ((a ? 'w' : 'e') - lc + l), mot[9]=(char)(a?'h':0);
-	else {
-		mot[1]='?', mot[3]=mot[8]='\n', mot[6]='/', mot[4]=(char)(a?0:'l'), mot[9]=(char)(a?0:'h');
-		for (int i=found=0; !found && i < 6; ++i)
-			if ((found=contains(l,braces[i],2))) mot[2]=braces[i][0], mot[7]=braces[i][1];
-	}
-	if (!found) return failed;
-	assign(&lCmd, &cCmd);
-	empty(&cCmd);
-	state.cmd = defaultNormalMode.cmd;
-	return pressKeys(mot, 11);
-}
-
-ExitState executeMotion(char const cs, KeySym const *const ks) {
-	state.m.c = state.m.c < 1u ? 1u : state.m.c;
-	if      (ks && *ks == XK_d) historyMove(0, 0, term.row / 2);
-	else if (ks && *ks == XK_u) historyMove(0, 0, -term.row / 2);
-	else if (ks && *ks == XK_f) historyMove(0, 0, term.row-1+(term.c.y=0));
-	else if (ks && *ks == XK_b) historyMove(0, 0, -(term.c.y=term.row-1));
-	else if (ks && *ks == XK_h) overlay = !overlay;
-	else if (cs == 'K') historyMove(0, 0, -(int)state.m.c);
-	else if (cs == 'J') historyMove(0, 0,  (int)state.m.c);
-	else if (cs == 'k') historyMove(0, -(int)state.m.c, 0);
-	else if (cs == 'j') historyMove(0,  (int)state.m.c, 0);
-	else if (cs == 'h') historyMove(-(int)state.m.c, 0, 0);
-	else if (cs == 'l') historyMove( (int)state.m.c, 0, 0);
-	else if (cs == 'H') term.c.y = 0;
-	else if (cs == 'M') term.c.y = term.bot / 2;
-	else if (cs == 'L') term.c.y = term.bot;
-	else if (cs == 's' || cs == 'S') altToggle = cs == 's' ? !altToggle : 1;
-	else if (cs == 'G' || cs == 'g') {
-		if (cs == 'G') term.c = c[0] = c[IS_SET(MODE_ALTSCREEN)+1];
-		if (!IS_SET(MODE_ALTSCREEN)) term.line = &buf[histOff=insertOff];
-	} else if (cs == '0') term.c.x = 0;
-	else if (cs == '$') term.c.x = term.col-1;
-	else if (cs == 't') sel.type = sel.type==SEL_REGULAR ? SEL_RECTANGULAR : SEL_REGULAR;
-	else if (cs == 'n' || cs == 'N') {
-		int const d = ((cs=='N')!=(state.m.search==bw))?-1:1;
-		for (uint32_t i = state.m.c; i && findString(d, 0); --i);
-	} else if (contains(cs, "wWeEbB", 6)) {
-		int const low=cs<=90, off=tolower(cs)!='w', sgn=(tolower(cs)=='b')?-1:1;
-		size_t const l=strlen(wDelL), s=strlen(wDelS), maxIt=rows()*term.col;
-		for (int it=0, on=0; state.m.c > 0 && it < maxIt; ++it) {
-		    // If an offset is to be performed in beginning or not in beginning, move in history.
-			if ((off || it) && historyMove(sgn, 0, 0)) break;
-			// Determine if the category of the current letter changed since last iteration.
-			int n = 1<<(contains(cChar(),wDelS,s) ?(2-low) :!contains(cChar(),wDelL,l)),
-			    found = (on|=n)^n && ((off ?on^n :n)!=1);
-			// If a reverse offset is to be performed and this is the last letter:
-			if (found && off) historyMove(-sgn, 0, 0);
-			// Terminate iteration: reset #it and old n value #on and decrease operation count:
-			if (found) it=-1, on=0, --state.m.c;
-		}
-	} else return failed;
-	state.m.c = 0;
-	return state.cmd.op == yank ? exitMotion : success;
-}
-
-ExitState kPressHist(char const *cs, size_t len, int ctrl, KeySym const *kSym) {
-	historyOpToggle(1, 1);
-	int const prevYOff=IS_SET(MODE_ALTSCREEN)?0:histOff, search=state.m.search&&state.m.active,
-	          prevAltToggle=altToggle, prevOverlay=overlay;
-	int const noOp=!state.cmd.op&&!state.cmd.infix, num=len==1&&BETWEEN(cs[0],48,57),
-	          esc=kSym&&*kSym==XK_Escape, ret=(kSym&&*kSym==XK_Return)||(len==1&&cs[0]=='\n'),
-	          quantifier=num&&(cs[0]!='0'||state.m.c), ins=!search &&noOp &&len &&cs[0]=='i';
-	exited = 0;
-	ExitState result = success;
-	if (esc || ret || ins) { result = exitMotion, len = 0;
-	} else if (kSym && *kSym == XK_BackSpace) {
-		if ((search || state.m.c) && size(&cCmd)) pop(&cCmd);
-		if (search) {
-			if (size(&searchStr)) pop(&searchStr);
-			else result = exitMotion;
-			if (!size(&searchStr)) tfulldirt();
-			applyPos(state.m.searchPos);
-			findString(state.m.search==fw ? 1 : -1, 1);
-		} else if (state.m.c) state.m.c /= 10;
-		len = 0;
-	} else if (search) {
-		if (len >= 1) decodeTo(cs, len, &searchStr);
-		applyPos(state.m.searchPos);
-		findString(state.m.search==fw ? 1 : -1, 1);
-	} else if (len == 0) { result = failed;
-	} else if (quantifier) { state.m.c = min(SHRT_MAX, (int)state.m.c*10+cs[0]-48);
-	} else if (state.cmd.infix && state.cmd.op && (result = expandExpression(cs[0]), len=0)) {
-    } else if (cs[0] == 'd') { state = defaultNormalMode; result = exitMotion; state.m.active = 1;
-	} else if (cs[0] == '.') {
-		if (size(&cCmd)) assign(&lCmd, &cCmd);
-		empty(&cCmd);
-		executeCommand((uint32_t*) lCmd.content, size(&lCmd));
-		empty(&cCmd);
-		len = 0;
-	} else if (cs[0] == 'r') { tfulldirt();
-	} else if (cs[0] == 'c') {
-		empty(&lCmd);
-		empty(&cCmd);
-		empty(&searchStr);
-		tfulldirt();
-		len = 0;
-	} else if (cs[0] == fw || cs[0] == bw) {
-		empty(&searchStr);
-		state.m.search = (Search) cs[0];
-		state.m.searchPos = (Pos){.p={term.c.x, term.c.y, prevYOff}};
-		state.m.active = 1;
-	} else if (cs[0]==infix_i || cs[0]==infix_a) { state.cmd.infix=(Infix) cs[0];
-	} else if (cs[0] == 'y') {
-		if (state.cmd.op) {
-			result = (state.cmd.op == yank || state.cmd.op == visualLine) ? exitOp : exitMotion;
-			if (state.cmd.op == yank) selstart(0, term.c.y, 0);
-		} else selstart(term.c.x, term.c.y, 0);
-		state.cmd.op = yank;
-	} else if (cs[0] == visual || cs[0] == visualLine) {
-		if (state.cmd.op != (Op) cs[0]) {
-			state.cmd = defaultNormalMode.cmd;
-			state.cmd.op = (Op) cs[0];
-			selstart(cs[0] == visualLine ?0 :term.c.x, term.c.y, 0);
-		} else result = exitOp;
-	} else if (!(result =executeMotion((char) (len?cs[0]:0), ctrl?kSym:NULL))) {
-		result=failed;
-		for (size_t i = 0; !ctrl && i < amountNmKeys; ++i)
-			if (cs[0]==nmKeys[i][0] &&
-			   failed!=(result=pressKeys(&nmKeys[i][1], strlen(nmKeys[i])-1))) goto end;
-	} // Operation/Motion finished if valid: update cmd string, extend selection, update search
-	if (result != failed) {
-		if (len == 1 && !ctrl) decodeTo(cs, len, &cCmd);
-		if ((state.cmd.op == visualLine) || ((state.cmd.op == yank) && (result == exitOp))) {
-			int const off = term.c.y + (IS_SET(MODE_ALTSCREEN) ? 0 : histOff) < sel.ob.y; //< Selection start below end.
-			sel.ob.x = off ? term.col - 1 : 0;
-			selextend(off ? 0 : term.col-1, term.c.y, sel.type, 0);
-		} else if (sel.oe.x != -1) {
-			selextend(term.c.x, term.c.y, sel.type, 0);
-		}
-	} // Set repaint for motion or status bar
-	if (!IS_SET(MODE_ALTSCREEN) && prevYOff != histOff) tfulldirt();
-	// Terminate Motion / operation if thus indicated
-	if (result == exitMotion) {
-		if (!state.m.active) result = (exited=noOp) ? finish : exitOp;
-		 state.m.active = (int) (state.m.c = 0u);
-	}
-	if (result == exitOp || result == finish) {
-		if (state.cmd.op == yank) {
-			xsetsel(getsel());
-			xclipcopy();
-		}
-		state = defaultNormalMode;
-		selclear();
-		if (!esc) assign(&lCmd, &cCmd);
-		empty(&cCmd);
-	} // Update the content displayed in the history overlay
-	styleCmd = style[state.cmd.op==yank ? 1 : (state.cmd.op==visual ? 2 :
-	                (state.cmd.op==visualLine ? 3 :0))];
-	int const posLin = !IS_SET(MODE_ALTSCREEN) ? rangeY(insertOff-histOff):0, h=rows()-term.row;
-	if (!posLin || posLin==h || !h) strcpy(posBuffer, posLin ? " [BOT] " : " [TOP] ");
-	else sprintf(posBuffer, " % 3d%c  ", min(100, max(0, (int)(.5 + posLin * 100. / h))),'%');
-	if ((overlay || overlay!=prevOverlay) && term.col>9 && term.row>4) {
-		if (!term.dirty[term.row-1]) xdrawline(term.line[term.row-1], term.col*2/3, term.row-1, term.col-1);
-		if (!term.dirty[term.row-2]) xdrawline(term.line[term.row-2], term.col*2/3, term.row-2, term.col-1);
-	}
-	if (result==finish) altToggle = 0;
-	if (altToggle != prevAltToggle) tswapscreen();
-end:
-	historyOpToggle(-1, 1);
-	return result;
-}
-
-void historyOverlay(int x, int y, Glyph* g) {
-	if (!histMode) return;
-	TCursor const *cHist = histOp ? &term.c : &c[0];
-	if(overlay && term.col > 9 && term.row > 4 && (x > (2*term.col/3)) && (y >= (term.row-2))) {
-		*g = (y == term.row - 2) ? styleSearch : styleCmd;
-		if (y == term.row-2) getChar(&searchStr, g, term.row-2, term.col-2, term.col/3, x);
-		else if (x > term.col - 7) g->u = (Rune)(posBuffer[x - term.col + 7]);
-		else getChar(size(&cCmd) ?&cCmd :&lCmd, g, term.row-1, term.col-7, term.col/3-6, x);
-	} else if (highlighted(x, y)) g->bg = highlightBg, g->fg = highlightFg;
-	else if ((x==cHist->x) ^ (y==cHist->y)) g->bg = currentBg;
-	else if (x==cHist->x) g->mode^=ATTR_REVERSE;
-}
-void historyPreDraw() {
-	static Pos op = {.p={0, 0, 0}};
-	historyOpToggle(1, 0);
-	// Draw the cursor cross if changed
-	if (term.c.y >= term.row || op.p[1] >= term.row) tfulldirt();
-	else if (exited || (op.p[1] != term.c.y)) term.dirty[term.c.y] = term.dirty[op.p[1]] = 1;
-	for (int i=0; (exited || term.c.x != op.p[0]) && i<term.row; ++i) if (!term.dirty[i]) {
-		xdrawline(term.line[i], term.c.x, i, term.c.x + 1);
-		xdrawline(term.line[i], op.p[0], i, op.p[0] + 1);
-	}
-	// Update search results either only for lines with new content or all results if exiting
-	markSearchMatches(exited);
-	op = (Pos){.p = {term.c.x, term.c.y, 0}};
-	historyOpToggle(-1, 0);
-}
--- a/desktop/.st/patch/normalMode.h
+++ b/desktop/.st/patch/normalMode.h
@@ -1,8 +0,0 @@
-void normalMode();
-void historyPreDraw();
-void historyOverlay(int x, int y, Glyph* g);
-void historyModeToggle(int start);
-void historyOpToggle(int, int);
-typedef enum {failed=0, success=1, exitMotion=2, exitOp=3, finish=4} ExitState;
-ExitState kPressHist(char const *txt, size_t len, int ctrl, KeySym const *kSym);
-ExitState pressKeys(char const* s, size_t e);
--- a/desktop/.st/patch/opencopied.c
+++ b/desktop/.st/patch/opencopied.c
@@ -1,19 +0,0 @@
-void
-opencopied(const Arg *arg)
-{
-	int res;
-	size_t const max_cmd = 2048;
-	char * const clip = xsel.clipboard;
-	if (!clip) {
-		fprintf(stderr, "Warning: nothing copied to clipboard\n");
-		return;
-	}
-
-	/* account for space/quote (3) and \0 (1) and & (1) */
-	/* e.g.: xdg-open "https://st.suckless.org"& */
-	size_t const cmd_size = max_cmd + strlen(clip) + 5;
-	char cmd[cmd_size];
-
-	snprintf(cmd, cmd_size, "%s \"%s\"&", (char *)arg->v, clip);
-	res = system(cmd);
-}
--- a/desktop/.st/patch/opencopied.h
+++ b/desktop/.st/patch/opencopied.h
@@ -1 +0,0 @@
-void opencopied(const Arg *);
--- a/desktop/.st/patch/openurlonclick.c
+++ b/desktop/.st/patch/openurlonclick.c
@@ -1,141 +0,0 @@
-#if SCROLLBACK_PATCH && !VIM_BROWSE_PATCH
-#define TLINEURL(y) TLINE(y)
-#else
-#define TLINEURL(y) term.line[y]
-#endif // SCROLLBACK_PATCH
-
-#if VIM_BROWSE_PATCH
-extern int buffCols;
-#endif // VIM_BROWSE_PATCH
-
-int url_x1, url_y1, url_x2, url_y2 = -1;
-int url_draw, url_click, url_maxcol;
-
-static int
-isvalidurlchar(Rune u)
-{
-	/* () and [] can appear in urls, but excluding them here will reduce false
-	 * positives when figuring out where a given url ends. See copyurl patch.
-	 */
-	static char urlchars[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-		"abcdefghijklmnopqrstuvwxyz"
-		"0123456789-._~:/?#@!$&'*+,;=%";
-	return u < 128 && strchr(urlchars, (int)u) != NULL;
-}
-
-/* find the end of the wrapped line */
-static int
-findeowl(int row)
-{
-	#if VIM_BROWSE_PATCH
-	int col = buffCols - 1;
-	#elif COLUMNS_PATCH
-	int col = term.maxcol - 1;
-	#else
-	int col = term.col - 1;
-	#endif // VIM_BROWSE_PATCH
-
-	do {
-		if (TLINEURL(row)[col].mode & ATTR_WRAP)
-			return col;
-	} while (TLINEURL(row)[col].u == ' ' && --col >= 0);
-	return -1;
-}
-
-void
-clearurl(void)
-{
-	while (url_y1 <= url_y2 && url_y1 < term.row)
-		term.dirty[url_y1++] = 1;
-	url_y2 = -1;
-}
-
-char *
-detecturl(int col, int row, int draw)
-{
-	static char url[2048];
-	int x1, y1, x2, y2, wrapped;
-	int row_start = row;
-	int col_start = col;
-	int i = sizeof(url)/2+1, j = sizeof(url)/2;
-	#if SCROLLBACK_PATCH && !VIM_BROWSE_PATCH
-	int minrow = term.scr - term.histn, maxrow = term.scr + term.row - 1;
-	/* Fixme: MODE_ALTSCREEN is not defined here, I had to use the magic number 1<<2 */
-	if ((term.mode & (1 << 2)) != 0)
-		minrow = 0, maxrow = term.row - 1;
-	#else
-	int minrow = 0, maxrow = term.row - 1;
-	#endif // scrollback_patch
-	url_maxcol = 0;
-
-	/* clear previously underlined url */
-	if (draw)
-		clearurl();
-
-	if (!isvalidurlchar(TLINEURL(row)[col].u))
-		return NULL;
-
-	/* find the first character of url */
-	do {
-		x1 = col_start, y1 = row_start;
-		url_maxcol = MAX(url_maxcol, x1);
-		url[--i] = TLINEURL(row_start)[col_start].u;
-		if (--col_start < 0) {
-			if (--row_start < minrow || (col_start = findeowl(row_start)) < 0)
-				break;
-		}
-	} while (i > 0 && isvalidurlchar(TLINEURL(row_start)[col_start].u));
-
-	/* early detection */
-	if (url[i] != 'h')
-		return NULL;
-
-	/* find the last character of url */
-	do {
-		x2 = col, y2 = row;
-		url_maxcol = MAX(url_maxcol, x2);
-		url[j++] = TLINEURL(row)[col].u;
-		wrapped = TLINEURL(row)[col].mode & ATTR_WRAP;
-		#if VIM_BROWSE_PATCH
-		if (++col >= buffCols || wrapped) {
-		#elif COLUMNS_PATCH
-		if (++col >= term.maxcol || wrapped) {
-		#else
-		if (++col >= term.col || wrapped) {
-		#endif // VIM_BROWSE_PATCH
-			col = 0;
-			if (++row > maxrow || !wrapped)
-				break;
-		}
-	} while (j < sizeof(url)-1 && isvalidurlchar(TLINEURL(row)[col].u));
-
-	url[j] = 0;
-
-	if (strncmp("https://", &url[i], 8) && strncmp("http://", &url[i], 7))
-		return NULL;
-
-	/* underline url (see xdrawglyphfontspecs() in x.c) */
-	if (draw) {
-		url_x1 = (y1 >= 0) ? x1 : 0;
-		url_x2 = (y2 < term.row) ? x2 : url_maxcol;
-		url_y1 = MAX(y1, 0);
-		url_y2 = MIN(y2, term.row-1);
-		url_draw = 1;
-		for (y1 = url_y1; y1 <= url_y2; y1++)
-			term.dirty[y1] = 1;
-	}
-
-	return &url[i];
-}
-
-void
-openUrlOnClick(int col, int row, char* url_opener)
-{
-	char *url = detecturl(col, row, 1);
-	if (url) {
-		extern char **environ;
-		pid_t junk;
-		char *argv[] = { url_opener, url, NULL };
-		posix_spawnp(&junk, argv[0], NULL, NULL, argv, environ);
-	}
-}
--- a/desktop/.st/patch/openurlonclick.h
+++ b/desktop/.st/patch/openurlonclick.h
@@ -1,8 +0,0 @@
-#include <spawn.h>
-
-static inline void restoremousecursor(void) {
-	if (!(win.mode & MODE_MOUSE) && xw.pointerisvisible)
-		XDefineCursor(xw.dpy, xw.win, xw.vpointer);
-}
-static void clearurl(void);
-static void openUrlOnClick(int col, int row, char* url_opener);
--- a/desktop/.st/patch/rightclicktoplumb_st.c
+++ b/desktop/.st/patch/rightclicktoplumb_st.c
@@ -1,19 +0,0 @@
-#if defined(__OpenBSD__)
- #include <sys/sysctl.h>
-#endif
-
-int
-subprocwd(char *path)
-{
-#if   defined(__linux)
-	if (snprintf(path, PATH_MAX, "/proc/%d/cwd", pid) < 0)
-		return -1;
-	return 0;
-#elif defined(__OpenBSD__)
-	size_t sz = PATH_MAX;
-	int name[3] = {CTL_KERN, KERN_PROC_CWD, pid};
-	if (sysctl(name, 3, path, &sz, 0, 0) == -1)
-		return -1;
-	return 0;
-#endif
-}
--- a/desktop/.st/patch/rightclicktoplumb_st.h
+++ b/desktop/.st/patch/rightclicktoplumb_st.h
@@ -1 +0,0 @@
-int subprocwd(char *);
--- a/desktop/.st/patch/rightclicktoplumb_x.c
+++ b/desktop/.st/patch/rightclicktoplumb_x.c
@@ -1,24 +0,0 @@
-#include <sys/wait.h>
-
-void
-plumb(char *sel) {
-	if (sel == NULL)
-		return;
-	char cwd[PATH_MAX];
-	pid_t child;
-	if (subprocwd(cwd) != 0)
-		return;
-
-	switch(child = fork()) {
-		case -1:
-			return;
-		case 0:
-			if (chdir(cwd) != 0)
-				exit(1);
-			if (execvp(plumb_cmd, (char *const []){plumb_cmd, sel, 0}) == -1)
-				exit(1);
-			exit(0);
-		default:
-			waitpid(child, NULL, 0);
-	}
-}
--- a/desktop/.st/patch/rightclicktoplumb_x.h
+++ b/desktop/.st/patch/rightclicktoplumb_x.h
@@ -1 +0,0 @@
-void plumb(char *);
--- a/desktop/.st/patch/scrollback.c
+++ b/desktop/.st/patch/scrollback.c
@@ -1,55 +0,0 @@
-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();
-	}
-
-	#if SIXEL_PATCH
-	scroll_images(-1*n);
-	#endif // SIXEL_PATCH
-
-	#if OPENURLONCLICK_PATCH
-	if (n > 0)
-		restoremousecursor();
-	#endif // OPENURLONCLICK_PATCH
-}
-
-void
-kscrollup(const Arg* a)
-{
-	int n = a->i;
-	if (n < 0)
-		n = term.row + n;
-
-	if (term.scr + n > term.histn)
-		n = term.histn - term.scr;
-
-	if (!n)
-		return;
-
-	if (term.scr <= HISTSIZE-n) {
-		term.scr += n;
-		selscroll(0, n);
-		tfulldirt();
-	}
-
-	#if SIXEL_PATCH
-	scroll_images(n);
-	#endif // SIXEL_PATCH
-
-	#if OPENURLONCLICK_PATCH
-	if (n > 0)
-		restoremousecursor();
-	#endif // OPENURLONCLICK_PATCH
-}
--- a/desktop/.st/patch/scrollback.h
+++ b/desktop/.st/patch/scrollback.h
@@ -1,17 +0,0 @@
-#define TLINE(y) ((y) < term.scr ? term.hist[((y) + term.histi - \
-                     term.scr + HISTSIZE + 1) % HISTSIZE] : \
-                     term.line[(y) - term.scr])
-
-void kscrolldown(const Arg *);
-void kscrollup(const Arg *);
-
-#if SCROLLBACK_MOUSE_PATCH || SCROLLBACK_MOUSE_ALTSCREEN_PATCH
-typedef struct {
-	 uint b;
-	 uint mask;
-	 void (*func)(const Arg *);
-	 const Arg arg;
-} MouseKey;
-
-extern MouseKey mkeys[];
-#endif // SCROLLBACK_MOUSE_PATCH / SCROLLBACK_MOUSE_ALTSCREEN_PATCH
--- a/desktop/.st/patch/sixel_st.c
+++ b/desktop/.st/patch/sixel_st.c
@@ -1,42 +0,0 @@
-sixel_state_t sixel_st;
-
-void
-dcshandle(void)
-{
-	switch (csiescseq.mode[0]) {
-	default:
-		fprintf(stderr, "erresc: unknown csi ");
-		csidump();
-		/* die(""); */
-		break;
-	case 'q': /* DECSIXEL */
-		if (sixel_parser_init(&sixel_st, 0, 0 << 16 | 0 << 8 | 0, 1, win.cw, win.ch) != 0)
-			perror("sixel_parser_init() failed");
-		term.mode |= MODE_SIXEL;
-		break;
-	}
-}
-
-void
-scroll_images(int n) {
-	ImageList *im;
-	int tmp;
-
-	/* maximum sixel distance in lines from current view before
-	 * deallocation
-	 * TODO: should be in config.h */
-	int max_sixel_distance = 10000;
-
-	for (im = term.images; im; im = im->next) {
-		im->y += n;
-
-		/* check if the current sixel has exceeded the maximum
-		 * draw distance, and should therefore be deleted */
-		tmp = im->y;
-		if (tmp < 0) { tmp = tmp * -1; }
-		if (tmp > max_sixel_distance) {
-			fprintf(stderr, "im@0x%08x exceeded maximum distance\n");
-			im->should_delete = 1;
-		}
-	}
-}
--- a/desktop/.st/patch/sixel_st.h
+++ b/desktop/.st/patch/sixel_st.h
@@ -1,2 +0,0 @@
-static void dcshandle(void);
-static void scroll_images(int n);
--- a/desktop/.st/patch/sixel_x.c
+++ b/desktop/.st/patch/sixel_x.c
@@ -1,14 +0,0 @@
-void
-delete_image(ImageList *im)
-{
-	if (im->prev)
-		im->prev->next = im->next;
-	else
-		term.images = im->next;
-	if (im->next)
-		im->next->prev = im->prev;
-	if (im->pixmap)
-		XFreePixmap(xw.dpy, (Drawable)im->pixmap);
-	free(im->pixels);
-	free(im);
-}
--- a/desktop/.st/patch/st_embedder_x.c
+++ b/desktop/.st/patch/st_embedder_x.c
@@ -1,50 +0,0 @@
-static Window embed;
-
-void
-createnotify(XEvent *e)
-{
-	XWindowChanges wc;
-
-	if (embed || e->xcreatewindow.override_redirect)
-		return;
-
-	embed = e->xcreatewindow.window;
-
-	XReparentWindow(xw.dpy, embed, xw.win, 0, 0);
-	XSelectInput(xw.dpy, embed, PropertyChangeMask | StructureNotifyMask | EnterWindowMask);
-
-	XMapWindow(xw.dpy, embed);
-	sendxembed(XEMBED_EMBEDDED_NOTIFY, 0, xw.win, 0);
-
-	wc.width = win.w;
-	wc.height = win.h;
-	XConfigureWindow(xw.dpy, embed, CWWidth | CWHeight, &wc);
-
-	XSetInputFocus(xw.dpy, embed, RevertToParent, CurrentTime);
-}
-
-void
-destroynotify(XEvent *e)
-{
-	visibility(e);
-	if (embed == e->xdestroywindow.window) {
-		focus(e);
-	}
-}
-
-void
-sendxembed(long msg, long detail, long d1, long d2)
-{
-	XEvent e = { 0 };
-
-	e.xclient.window = embed;
-	e.xclient.type = ClientMessage;
-	e.xclient.message_type = xw.xembed;
-	e.xclient.format = 32;
-	e.xclient.data.l[0] = CurrentTime;
-	e.xclient.data.l[1] = msg;
-	e.xclient.data.l[2] = detail;
-	e.xclient.data.l[3] = d1;
-	e.xclient.data.l[4] = d2;
-	XSendEvent(xw.dpy, embed, False, NoEventMask, &e);
-}
--- a/desktop/.st/patch/st_embedder_x.h
+++ b/desktop/.st/patch/st_embedder_x.h
@@ -1,7 +0,0 @@
-#define XEMBED_EMBEDDED_NOTIFY 0
-#define XEMBED_WINDOW_ACTIVATE 1
-#define XEMBED_FOCUS_CURRENT   0
-
-static void createnotify(XEvent *e);
-static void destroynotify(XEvent *e);
-static void sendxembed(long msg, long detail, long d1, long d2);
--- a/desktop/.st/patch/st_include.c
+++ b/desktop/.st/patch/st_include.c
@@ -1,31 +0,0 @@
-/* Patches */
-#if COPYURL_PATCH || COPYURL_HIGHLIGHT_SELECTED_URLS_PATCH
-#include "copyurl.c"
-#endif
-#if EXTERNALPIPE_PATCH
-#include "externalpipe.c"
-#endif
-#if ISO14755_PATCH
-#include "iso14755.c"
-#endif
-#if KEYBOARDSELECT_PATCH
-#include "keyboardselect_st.c"
-#endif
-#if RIGHTCLICKTOPLUMB_PATCH
-#include "rightclicktoplumb_st.c"
-#endif
-#if NEWTERM_PATCH
-#include "newterm.c"
-#endif
-#if SCROLLBACK_PATCH || SCROLLBACK_MOUSE_PATCH || SCROLLBACK_MOUSE_ALTSCREEN_PATCH
-#include "scrollback.c"
-#endif
-#if SIXEL_PATCH
-#include "sixel_st.c"
-#endif
-#if SYNC_PATCH
-#include "sync.c"
-#endif
-#if VIM_BROWSE_PATCH
-#include "normalMode.c"
-#endif
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`static void expect(char expect, XKeyEvent ev);`
				`@@ -1,2 +0,0 @@`
				`static int arrayhas(char *list, int length, char item);`