From eb6ba359cbcb3ef83ccfa2f3370db3aa11dbab79 Mon Sep 17 00:00:00 2001
From: Doug Torrance <dtorrance@piedmont.edu>
Date: Mon, 27 Feb 2017 20:50:41 -0500
Subject: [PATCH] cnslock: Complete rewrite using libdockapp.

No longer functioned as a dockapp using modern GDK 2.0, which is what cnslock
previously used.
---
 cnslock/Makefile                          |  13 +-
 cnslock/applet.c                          |  83 -----
 cnslock/cnslock.c                         | 386 ++++++++---------------
 cnslock/graphics/caps.h                   | 488 ------------------------------
 cnslock/graphics/caps_num.h               | 488 ------------------------------
 cnslock/graphics/caps_num_scroll.h        | 488 ------------------------------
 cnslock/graphics/caps_num_scroll.xpm      | 221 ++++++++++++++
 cnslock/graphics/caps_scroll.h            | 488 ------------------------------
 cnslock/graphics/master.xpm               |  71 -----
 cnslock/graphics/none.h                   | 488 ------------------------------
 cnslock/graphics/num.h                    | 488 ------------------------------
 cnslock/graphics/num_scroll.h             | 488 ------------------------------
 cnslock/graphics/pngs/caps.png            | Bin 898 -> 0 bytes
 cnslock/graphics/pngs/caps_num.png        | Bin 1081 -> 0 bytes
 cnslock/graphics/pngs/caps_num_scroll.png | Bin 1138 -> 0 bytes
 cnslock/graphics/pngs/caps_scroll.png     | Bin 955 -> 0 bytes
 cnslock/graphics/pngs/none.png            | Bin 142 -> 0 bytes
 cnslock/graphics/pngs/num.png             | Bin 827 -> 0 bytes
 cnslock/graphics/pngs/num_scroll.png      | Bin 889 -> 0 bytes
 cnslock/graphics/pngs/scroll.png          | Bin 696 -> 0 bytes
 cnslock/graphics/scroll.h                 | 488 ------------------------------
 cnslock/include/applet.h                  |   2 -
 cnslock/include/cnslock.h                 |  35 ---
 cnslock/include/defines.h                 |  20 --
 cnslock/include/kleds.h                   |   3 +-
 cnslock/kleds.c                           |  11 +-
 26 files changed, 350 insertions(+), 4399 deletions(-)
 delete mode 100644 cnslock/applet.c
 rewrite cnslock/cnslock.c (80%)
 delete mode 100644 cnslock/graphics/caps.h
 delete mode 100644 cnslock/graphics/caps_num.h
 delete mode 100644 cnslock/graphics/caps_num_scroll.h
 create mode 100644 cnslock/graphics/caps_num_scroll.xpm
 delete mode 100644 cnslock/graphics/caps_scroll.h
 delete mode 100644 cnslock/graphics/master.xpm
 delete mode 100644 cnslock/graphics/none.h
 delete mode 100644 cnslock/graphics/num.h
 delete mode 100644 cnslock/graphics/num_scroll.h
 delete mode 100644 cnslock/graphics/pngs/caps.png
 delete mode 100644 cnslock/graphics/pngs/caps_num.png
 delete mode 100644 cnslock/graphics/pngs/caps_num_scroll.png
 delete mode 100644 cnslock/graphics/pngs/caps_scroll.png
 delete mode 100644 cnslock/graphics/pngs/none.png
 delete mode 100644 cnslock/graphics/pngs/num.png
 delete mode 100644 cnslock/graphics/pngs/num_scroll.png
 delete mode 100644 cnslock/graphics/pngs/scroll.png
 delete mode 100644 cnslock/graphics/scroll.h
 delete mode 100644 cnslock/include/applet.h
 delete mode 100644 cnslock/include/cnslock.h
 delete mode 100644 cnslock/include/defines.h

diff --git a/cnslock/Makefile b/cnslock/Makefile
index 96bc22b..5827d5f 100644
--- a/cnslock/Makefile
+++ b/cnslock/Makefile
@@ -2,21 +2,18 @@ INSTALL = /usr/bin/install -m 755
 PREFIX = /usr/local
 
 VERSION = 1.02
-CFLAGS = -O3 -Wall `gtk-config --cflags` -DVERSION=$(VERSION) ${EXTRA}
+CFLAGS = -O3 -Wall -DVERSION=\"$(VERSION)\" ${EXTRA}
 CC = gcc
-OBJS = cnslock.o kleds.o applet.o
+OBJS = cnslock.o kleds.o
 
-LIBS = `gtk-config --libs | sed "s/-lgtk//g"`
+LIBS = -lX11 -ldockapp
 
 all: cnslock
 
-cnslock.o: cnslock.c include/cnslock.h include/defines.h
+cnslock.o: cnslock.c
 	$(CC) $(CFLAGS) -c cnslock.c -o cnslock.o
 
-applet.o: applet.c include/applet.h include/defines.h
-	gcc $(CFLAGS) -c applet.c -o applet.o
-
-kleds.o: kleds.c include/kleds.h include/defines.h
+kleds.o: kleds.c include/kleds.h
 	$(CC) -Wall -I/usr/X11R6/include -c kleds.c -o kleds.o
 
 cnslock: $(OBJS)
diff --git a/cnslock/applet.c b/cnslock/applet.c
deleted file mode 100644
index cec8c27..0000000
--- a/cnslock/applet.c
+++ /dev/null
@@ -1,83 +0,0 @@
-#include <stdio.h>
-
-#include "include/defines.h"
-#include "include/cnslock.h"
-#include "include/applet.h"
-
-#include "graphics/master.xpm"
-
-/* This function makes the dockapp window */
-void make_new_cnslock_dockapp(int manager_style)
-{
-#define MASK GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK
-
-    GdkWindowAttr attr;
-    GdkWindowAttr attri;
-
-    Window win;
-    Window iconwin;
-    XWMHints wmhints;
-    XSizeHints sizehints;
-
-    memset(&attr, 0, sizeof(GdkWindowAttr));
-
-    attr.width = WINDOWSIZE_X;
-    attr.height = WINDOWSIZE_Y;
-    attr.x = 100;
-    attr.y = 100;
-    attr.title = "cnslockapplet";
-    attr.event_mask = MASK;
-    attr.wclass = GDK_INPUT_OUTPUT;
-    attr.visual = gdk_visual_get_system();
-    attr.colormap = gdk_colormap_get_system();
-    attr.wmclass_name = "cnslockapplet";
-    attr.wmclass_class = "cnslockapplet";
-    attr.window_type = GDK_WINDOW_TOPLEVEL;
-
-    /* make a copy for the iconwin - parameters are the same */
-    memcpy(&attri, &attr, sizeof(GdkWindowAttr));
-
-    ad.win = gdk_window_new(NULL, &attr, GDK_WA_TITLE | GDK_WA_WMCLASS | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_X |GDK_WA_Y);
-    if (!ad.win)
-	{
-		fprintf(stderr, "FATAL: cannot make toplevel window\n");
-		exit(1);
-    }
-
-    ad.iconwin = gdk_window_new(ad.win, &attri, GDK_WA_TITLE | GDK_WA_WMCLASS | GDK_WA_VISUAL | GDK_WA_COLORMAP | GDK_WA_X |GDK_WA_Y);
-    if (!ad.iconwin)
-	{
-		fprintf(stderr, "FATAL: cannot make icon window\n");
-		exit(1);
-    }
-
-	if(manager_style==0)
-	{
-	    win = GDK_WINDOW_XWINDOW(ad.win);
-    	iconwin = GDK_WINDOW_XWINDOW(ad.iconwin);
-		sizehints.flags = USSize;
-		sizehints.width = WINDOWSIZE_X;
-		sizehints.height = WINDOWSIZE_Y;
-		XSetWMNormalHints(GDK_WINDOW_XDISPLAY(ad.win), win, &sizehints);
-		wmhints.initial_state = WithdrawnState;
-		wmhints.icon_window = iconwin;
-		wmhints.icon_x = 0;
-		wmhints.icon_y = 0;
-		wmhints.window_group = win;
-		wmhints.flags =	StateHint | IconWindowHint | IconPositionHint | WindowGroupHint;
-		XSetWMHints(GDK_WINDOW_XDISPLAY(ad.win), win, &wmhints);
-	}
-
-    ad.gc = gdk_gc_new(ad.win);
-    ad.pixmap =	gdk_pixmap_create_from_xpm_d(ad.win, &(ad.mask), NULL, master_xpm);
-    gdk_window_shape_combine_mask(ad.win, ad.mask, 0, 0);
-    gdk_window_shape_combine_mask(ad.iconwin, ad.mask, 0, 0);
-    gdk_window_set_back_pixmap(ad.win, ad.pixmap, False);
-    gdk_window_set_back_pixmap(ad.iconwin, ad.pixmap, False);
-    gdk_window_show(ad.win);
-
-    if(posx!=-1 && posy!=-1)
-		gdk_window_move(ad.win, posx, posy);
-
-#undef MASK
-}
diff --git a/cnslock/cnslock.c b/cnslock/cnslock.c
dissimilarity index 80%
index 75f348c..6c2b951 100644
--- a/cnslock/cnslock.c
+++ b/cnslock/cnslock.c
@@ -1,265 +1,121 @@
-/* csnlock v1.02
- * Copyright (C) 2002 Simon Hunter (lists@sprig.dyn.dhs.org)
- *
- * cnslock is a dock application that displays the current state of the
- * three lock keys (caps, num, and scroll)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have receive a copy of the GNU General Public License along with
- * this program; if you still want it, write to the Free Software Foundation, Inc.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Hacked from various wm applets.
- *
- */
-
-/* general includes */
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <time.h>
-#include <math.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#define _GNU_SOURCE
-#include <getopt.h>
-#include <ctype.h>
-
-/* gdk includes */
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-
-/* x11 includes */
-#include <X11/xpm.h>
-#include <X11/Xlib.h>
-#include <X11/extensions/shape.h>
-
-/* header includes */
-#include "include/defines.h"
-#include "include/applet.h"
-#include "include/cnslock.h"
-#include "include/kleds.h"
-
-/* graphic includes */
-#include "graphics/none.h"
-#include "graphics/caps.h"
-#include "graphics/num.h"
-#include "graphics/scroll.h"
-#include "graphics/caps_num.h"
-#include "graphics/caps_scroll.h"
-#include "graphics/num_scroll.h"
-#include "graphics/caps_num_scroll.h"
-
-/* stuff */
-void cnslock_update(void);
-
-/* misc support functions */
-void prepare_backbuffer(int solid);
-void parse_options(int argc, char **argv);
-void do_help(void);
-void do_version(void);
-void make_rgb_buffer256(unsigned char *target, unsigned char *source,int width, int height, int frames, char *cmap);
-
-/* globals */
-AppletData ad;
-
-/* keeps track of mouse focus */
-int proximity;
-
-/* background style (n/a) */
-int selected_background=1;
-
-/* initial positional data (n/a) */
-int posx=-1, posy=-1;
-
-/* window manager style (0=wm, 1=other) */
-int manager_style=0;
-
-/* the main routine */
-int main(int argc, char **argv)
-{
-    GdkEvent *event;
-
-    srand(time(NULL));
-
-    /* initialize GDK */
-    if (!gdk_init_check(&argc, &argv))
-	{
-		fprintf(stderr, "GDK init failed, bye bye.  Check \"DISPLAY\" variable.\n");
-		exit(-1);
-    }
-    gdk_rgb_init();
-
-    /* parse command line options */
-    parse_options(argc, argv);
-
-    /* zero main data structure */
-    memset(&ad, 0, sizeof(ad));
-
-	/* intialise keyboard leds */
-    init_kleds();
-
-    /* create dockapp window. creates windows, allocates memory, etc */
-    make_new_cnslock_dockapp(manager_style);
-
-    /* draw initial background */
-    prepare_backbuffer(selected_background);
-
-    while(1)
-	{
-		while(gdk_events_pending())
-		{
-	    	event = gdk_event_get();
-		    if(event)
-			{
-				switch (event->type)
-				{
-					case GDK_DESTROY:
-					    gdk_exit(0);
-					    exit(0);
-					    break;
-					case GDK_BUTTON_PRESS:
-					    /* printf("button press\n"); */
-					    break;
-					case GDK_ENTER_NOTIFY:
-					    proximity = 1;
-					    break;
-					case GDK_LEAVE_NOTIFY:
-					    proximity = 0;
-					    break;
-					default:
-					    break;
-				}
-		    }
-		}
-
-		usleep(20000);
-		cnslock_update();
-
-		/* actually draw the rgb buffer to screen */
-
-		if (manager_style==0)
-			gdk_draw_rgb_image(ad.iconwin, ad.gc, XMIN, YMIN, XMAX, YMAX, GDK_RGB_DITHER_NONE, ad.rgb, XMAX * 3);
-		else
-			gdk_draw_rgb_image(ad.win, ad.gc, XMIN, YMIN, XMAX, YMAX, GDK_RGB_DITHER_NONE, ad.rgb, XMAX * 3);
-	}
-    return 0;
-}				/* main */
-
-/* update caps, num, scroll lock */
-void cnslock_update(void)
-{
-    int status;
-
-    memcpy(&ad.rgb, &ad.bgr, RGBSIZE);
-
-	status = check_kleds();
-	if ((status & 0) == 0)
-		make_rgb_buffer256(ad.rgb,none_data,none_width,none_height,1, *none_cmap);
-	if ((status & 1) == 1)
-		make_rgb_buffer256(ad.rgb,c_data,c_width,c_height,1, *c_cmap);
-    if ((status & 2) == 2)
-		make_rgb_buffer256(ad.rgb,n_data,n_width,n_height,1, *n_cmap);
-    if ((status & 3) == 3)
-		make_rgb_buffer256(ad.rgb,cn_data,cn_width,cn_height,1, *cn_cmap);
-    if ((status & 4) == 4)
-		make_rgb_buffer256(ad.rgb,s_data,s_width,s_height,1, *s_cmap);
-    if ((status & 5) == 5)
-		make_rgb_buffer256(ad.rgb,cs_data,cs_width,cs_height,1, *cs_cmap);
-    if ((status & 6) == 6)
-		make_rgb_buffer256(ad.rgb,ns_data,ns_width,ns_height,1, *ns_cmap);
-    if ((status & 7) == 7)
-		make_rgb_buffer256(ad.rgb,cns_data,cns_width,cns_height,1, *cns_cmap);
-
-	memcpy(&ad.bgr, &ad.rgb, RGBSIZE);
-}
-
-void prepare_backbuffer(int solid)
-{
-	make_rgb_buffer256(ad.rgb,none_data,none_width,none_height,1, *none_cmap);
-
-	/* copy it to the "frequent use" buffer */
-	memcpy(&ad.bgr, &ad.rgb, RGBSIZE);
-
-}				/* prepare_backbuffer */
-
-void make_rgb_buffer256(unsigned char *target, unsigned char *source, int width, int height, int frames, char *cmap)
-{
-    int i, j = 0;
-
-    for (i = 0; i < (width * height * frames); i++)
-	{
-    	target[j] = cmap[3*source[i]];
-		target[j+1] = cmap[3*source[i]+1];
-    	target[j+2] = cmap[3*source[i]+2];
-    	j += 3;
-    }
-}
-
-void parse_options(int argc, char *argv[])
-{
-    int c = 0;
-
-    struct option long_options[] = {
-      {"help",         no_argument,       NULL,          1},
-      {"h",            no_argument,       NULL,          1},
-      {"version",      no_argument,       NULL,          2},
-      {"v",            no_argument,       NULL,          2},
-	  {"window",       no_argument,       NULL,          3},
-	  {"w",            no_argument,       NULL,          3},
-
-      {0,              0,                 0,             0}
-    };
-
-    while ((c = getopt_long_only(argc, argv, "", long_options, NULL)) != -1)
-	{
-		switch(c)
-	  	{
-      		case 1:
-				do_help();
-				exit(0);
-				break;
-			case 2:
-				do_version();
-				exit(0);
-				break;
-			case 3:
-				manager_style = 1;
-				break;
-		}
-    }
-}
-
-void do_version(void)
-{
-    printf("\ncnslock applet v%.2f\n\n", VERSION);
-}
-
-/*
--h,--help		Display help
--v,--version	Display version
--w,--window		Alternative window system
-*/
-
-void do_help(void)
-{
-    do_version();
-    printf("This is an applet that displays the various states of the CAPS, NUM and SCROLL LOCK keys.\n"
-		"\nUsage: cnslock [options]\n\n"
-		" -h\t--help\t\tShow this message and exit.\n"
-		" -v\t--version\tShow version and exit.\n"
-		" -w\t--window\tUse alternative windowing system.\n\n"
-    );
-}
-
+/* csnlock v1.02
+ * Copyright (C) 2002 Simon Hunter (lists@sprig.dyn.dhs.org)
+ *
+ * cnslock is a dock application that displays the current state of the
+ * three lock keys (caps, num, and scroll)
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have receive a copy of the GNU General Public License along with
+ * this program; if you still want it, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Hacked from various wm applets.
+ *
+ */
+
+/* general includes */
+#include <X11/Xlib.h>
+#include <libdockapp/dockapp.h>
+
+#include "include/kleds.h"
+#include "graphics/caps_num_scroll.xpm"
+
+/* stuff */
+void cnslock_init(void);
+void cnslock_update(void);
+
+/* globals */
+Pixmap led_pix;
+Pixmap win_pix;
+
+/* the main routine */
+int main(int argc, char **argv)
+{
+	DACallbacks eventCallbacks = {NULL, NULL, NULL, NULL, NULL, NULL,
+				      cnslock_update};
+
+	DAParseArguments(argc, argv, NULL, 0,
+			 "This is an applet that displays the various states of"
+			 "the CAPS, NUM and SCROLL\nLOCK keys.",
+			 "cnslock applet v" VERSION);
+	DAInitialize(NULL, "cnslock", 56, 56, argc, argv);
+	DASetCallbacks(&eventCallbacks);
+	DASetTimeout(20);
+	cnslock_init();
+	DAShow();
+	DAEventLoop();
+
+	return 0;
+}
+
+void cnslock_init(void)
+{
+	int status;
+	short unsigned int w, h;
+
+	win_pix = DAMakePixmap();
+	XFillRectangle(DADisplay, win_pix, DAGC, 0, 0, 56, 56);
+	DAMakePixmapFromData(caps_num_scroll_xpm, &led_pix, NULL, &w, &h);
+
+	status = check_kleds();
+
+	if (status & 1)
+		XCopyArea(DADisplay, led_pix, win_pix, DAGC,
+			  9, 9, 20, 26, 9, 9);
+	if (status & 2)
+		XCopyArea(DADisplay, led_pix, win_pix, DAGC,
+			  32, 13, 15, 20, 32, 13);
+	if (status & 3)
+		XCopyArea(DADisplay, led_pix, win_pix, DAGC,
+			  8, 38, 40, 10, 8, 38);
+	DASetPixmap(win_pix);
+}
+
+/* update caps, num, scroll lock */
+void cnslock_update(void)
+{
+	static int status;
+	int new_status;
+	int new_pix = 0;
+
+	new_status = check_kleds();
+
+	if ((status & 1) != (new_status & 1)) {
+		if ((new_status & 1) == 1)
+			XCopyArea(DADisplay, led_pix, win_pix, DAGC,
+				  9, 9, 20, 26, 9, 9);
+		else
+			XFillRectangle(DADisplay, win_pix, DAGC, 9, 9, 20, 26);
+		new_pix = 1;
+	}
+	if ((status & 2) != (new_status & 2)) {
+		if ((new_status & 2) == 2)
+			XCopyArea(DADisplay, led_pix, win_pix, DAGC,
+				  32, 13, 15, 20, 32, 13);
+		else
+			XFillRectangle(DADisplay, win_pix, DAGC,
+				       32, 13, 15, 20);
+		new_pix = 1;
+	}
+	if ((status & 4) != (new_status & 4)) {
+		if ((new_status & 4) == 4)
+			XCopyArea(DADisplay, led_pix, win_pix, DAGC,
+				  8, 38, 40, 10, 8, 38);
+		else
+			XFillRectangle(DADisplay, win_pix, DAGC, 8, 38, 40, 10);
+		new_pix = 1;
+	}
+
+	if (new_pix)
+		DASetPixmap(win_pix);
+	status = new_status;
+}
diff --git a/cnslock/graphics/caps.h b/cnslock/graphics/caps.h
deleted file mode 100644
index 63b4e35..0000000
--- a/cnslock/graphics/caps.h
+++ /dev/null
@@ -1,488 +0,0 @@
-int c_width = 56;
-int c_height = 56;
-
-char c_cmap[256][3] = {
-	{  0,  0,  0},
-	{ 54, 37,  3},
-	{ 56, 39,  3},
-	{218,150, 13},
-	{  6,  4,  0},
-	{177,122, 10},
-	{ 97, 67,  6},
-	{  9,  6,  0},
-	{ 29, 20,  2},
-	{ 26, 18,  2},
-	{ 89, 61,  5},
-	{186,127, 11},
-	{196,134, 11},
-	{123, 85,  7},
-	{236,162, 14},
-	{ 66, 45,  4},
-	{210,144, 12},
-	{ 65, 44,  4},
-	{112, 77,  6},
-	{162,111,  9},
-	{ 49, 34,  3},
-	{ 88, 60,  5},
-	{  4, 55, 29},
-	{108, 74,  6},
-	{ 50, 34,  3},
-	{ 24, 16,  1},
-	{233,160, 13},
-	{ 41, 28,  2},
-	{136, 93,  8},
-	{138, 95,  8},
-	{  6, 79, 41},
-	{ 15,195,102},
-	{ 18,232,121},
-	{  2, 31, 16},
-	{ 90, 62,  5},
-	{225,154, 13},
-	{118, 81,  7},
-	{120, 83,  7},
-	{ 47, 33,  3},
-	{227,156, 13},
-	{ 17, 12,  1},
-	{  4, 48, 25},
-	{ 13,164, 85},
-	{ 14,184, 96},
-	{ 13,172, 90},
-	{  3, 43, 23},
-	{ 67, 46,  4},
-	{113, 78,  7},
-	{106, 73,  6},
-	{ 12,  8,  1},
-	{  1,  0,  0},
-	{168,116, 10},
-	{  1, 17,  9},
-	{ 10,133, 69},
-	{ 17,215,112},
-	{  8, 99, 52},
-	{ 10,128, 67},
-	{195,133, 11},
-	{ 74, 50,  4},
-	{ 56, 38,  3},
-	{  8,102, 53},
-	{ 17,218,113},
-	{ 10,130, 68},
-	{  1, 14,  8},
-	{ 13,167, 87},
-	{  1,  7,  4},
-	{ 80, 55,  5},
-	{201,138, 12},
-	{  7,  5,  0},
-	{ 24, 17,  1},
-	{  1, 13,  7},
-	{ 12,151, 79},
-	{  4, 46, 24},
-	{  5, 70, 37},
-	{ 12,149, 78},
-	{ 14,186, 97},
-	{  5, 65, 34},
-	{  0,  6,  3},
-	{ 14,178, 93},
-	{  6, 77, 40},
-	{  3, 39, 21},
-	{ 12,155, 81},
-	{ 15,193,100},
-	{  5,  4,  0},
-	{131, 90,  8},
-	{ 37, 25,  2},
-	{ 10,124, 65},
-	{ 11,142, 74},
-	{ 17,224,117},
-	{  8,108, 56},
-	{  1,  8,  4},
-	{  3, 33, 17},
-	{ 35, 24,  2},
-	{145, 99,  8},
-	{130, 89,  8},
-	{  3, 36, 19},
-	{ 11,139, 72},
-	{  2, 23, 12},
-	{  7, 93, 49},
-	{ 16,209,109},
-	{  8,107, 56},
-	{241,165, 14},
-	{153,105,  9},
-	{ 32, 22,  2},
-	{ 81, 56,  5},
-	{  9,  6,  1},
-	{  9,119, 62},
-	{ 13,170, 89},
-	{  4, 54, 28},
-	{  5, 62, 32},
-	{121, 83,  7},
-	{242,166, 14},
-	{170,116, 10},
-	{  0,  1,  1},
-	{ 16,201,105},
-	{  7, 85, 44},
-	{  9,116, 60},
-	{ 25, 17,  1},
-	{193,133, 11},
-	{124, 85,  7},
-	{  2, 25, 13},
-	{ 15, 10,  1},
-	{  4, 47, 24},
-	{ 38, 26,  2},
-	{ 48, 33,  3},
-	{104, 72,  6},
-	{ 31, 21,  2},
-	{  6, 72, 37},
-	{ 14,185, 97},
-	{ 18,228,119},
-	{203,139, 12},
-	{ 69, 48,  4},
-	{  2, 29, 15},
-	{ 17,225,117},
-	{  6, 82, 43},
-	{  8,100, 52},
-	{115, 79,  7},
-	{160,110,  9},
-	{142, 98,  8},
-	{ 64, 44,  4},
-	{  8,101, 52},
-	{  7, 84, 44},
-	{103, 71,  6},
-	{  8,  6,  0},
-	{123, 84,  7},
-	{  3,  2,  0},
-	{  2, 22, 11},
-	{ 13,162, 84},
-	{  6, 73, 38},
-	{  5, 66, 34},
-	{148,102,  9},
-	{  4, 50, 26},
-	{  3, 44, 23},
-	{169,116, 10},
-	{ 71, 49,  4},
-	{ 45, 31,  3},
-	{ 82, 56,  5},
-	{ 39, 27,  2},
-	{111, 76,  6},
-	{ 23, 16,  1},
-	{  4, 58, 30},
-	{ 20,171,226},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255}
-	};
-
-char c_data[] = {
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,2,3,4,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,5,6,0,7,8,9,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,10,11,0,0,12,13,14,15,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,16,17,0,18,19,0,20,21,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,23,24,25,26,27,0,28,29,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,34,35,36,37,0,38,39,40,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,46,47,48,49,0,50,0,51,48,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,17,16,38,51,57,58,0,59,57,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,11,10,0,0,66,67,19,68,69,0,0,0,0,70,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,6,5,0,0,0,0,0,37,4,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	83,3,84,0,0,0,0,25,26,85,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	92,2,5,11,17,0,0,93,94,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,
-	101,102,103,10,16,102,104,3,105,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
-	18,110,111,110,0,110,111,112,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,67,
-	0,0,103,102,16,10,103,102,16,10,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,66,
-	0,0,0,117,111,118,38,0,17,119,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,25,
-	0,0,0,0,110,121,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,123,124,125,0,125,26,
-	18,0,0,103,111,126,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,130,21,131,0,0,27,
-	19,67,66,102,110,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,136,137,0,0,0,0,0,
-	0,58,138,139,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,142,20,0,0,0,0,0,
-	143,144,145,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,15,150,0,0,0,0,0,
-	105,119,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,153,154,0,0,0,0,
-	105,3,155,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,156,130,137,157,0,9,
-	94,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,136,14,13,12,
-	158,159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,9,8,7,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0
-	};
diff --git a/cnslock/graphics/caps_num.h b/cnslock/graphics/caps_num.h
deleted file mode 100644
index 238ccb4..0000000
--- a/cnslock/graphics/caps_num.h
+++ /dev/null
@@ -1,488 +0,0 @@
-int cn_width = 56;
-int cn_height = 56;
-
-char cn_cmap[256][3] = {
-	{  0,  0,  0},
-	{ 54, 37,  3},
-	{ 56, 39,  3},
-	{218,150, 13},
-	{  6,  4,  0},
-	{177,122, 10},
-	{ 97, 67,  6},
-	{  9,  6,  0},
-	{ 29, 20,  2},
-	{ 26, 18,  2},
-	{ 89, 61,  5},
-	{186,127, 11},
-	{196,134, 11},
-	{123, 85,  7},
-	{236,162, 14},
-	{ 66, 45,  4},
-	{210,144, 12},
-	{ 65, 44,  4},
-	{112, 77,  6},
-	{162,111,  9},
-	{ 49, 34,  3},
-	{ 88, 60,  5},
-	{  4, 55, 29},
-	{108, 74,  6},
-	{ 50, 34,  3},
-	{ 24, 16,  1},
-	{233,160, 13},
-	{ 41, 28,  2},
-	{136, 93,  8},
-	{138, 95,  8},
-	{  6, 79, 41},
-	{ 15,195,102},
-	{ 18,232,121},
-	{  2, 31, 16},
-	{ 90, 62,  5},
-	{225,154, 13},
-	{118, 81,  7},
-	{120, 83,  7},
-	{ 47, 33,  3},
-	{227,156, 13},
-	{ 17, 12,  1},
-	{  4, 48, 25},
-	{ 13,164, 85},
-	{ 14,184, 96},
-	{ 13,172, 90},
-	{  3, 43, 23},
-	{ 67, 46,  4},
-	{113, 78,  7},
-	{106, 73,  6},
-	{ 12,  8,  1},
-	{  1,  0,  0},
-	{168,116, 10},
-	{  1, 17,  9},
-	{ 10,133, 69},
-	{ 17,215,112},
-	{  8, 99, 52},
-	{ 10,128, 67},
-	{195,133, 11},
-	{ 74, 50,  4},
-	{ 56, 38,  3},
-	{  8,102, 53},
-	{ 17,218,113},
-	{ 10,130, 68},
-	{  1, 14,  8},
-	{ 13,167, 87},
-	{  1,  7,  4},
-	{ 80, 55,  5},
-	{201,138, 12},
-	{  7,  5,  0},
-	{ 24, 17,  1},
-	{  1, 13,  7},
-	{ 12,151, 79},
-	{  4, 46, 24},
-	{  5, 70, 37},
-	{ 12,149, 78},
-	{ 14,186, 97},
-	{  5, 65, 34},
-	{  0,  6,  3},
-	{ 14,178, 93},
-	{  6, 77, 40},
-	{  3, 39, 21},
-	{ 12,155, 81},
-	{ 15,193,100},
-	{  5,  4,  0},
-	{131, 90,  8},
-	{ 37, 25,  2},
-	{ 10,124, 65},
-	{ 11,142, 74},
-	{ 17,224,117},
-	{  8,108, 56},
-	{  1,  8,  4},
-	{  3, 33, 17},
-	{ 35, 24,  2},
-	{145, 99,  8},
-	{130, 89,  8},
-	{  3, 36, 19},
-	{ 11,139, 72},
-	{  2, 23, 12},
-	{  7, 93, 49},
-	{ 16,209,109},
-	{  8,107, 56},
-	{241,165, 14},
-	{153,105,  9},
-	{ 32, 22,  2},
-	{ 81, 56,  5},
-	{  9,  6,  1},
-	{  9,119, 62},
-	{ 13,170, 89},
-	{  4, 54, 28},
-	{  5, 62, 32},
-	{121, 83,  7},
-	{242,166, 14},
-	{170,116, 10},
-	{  0,  1,  1},
-	{ 16,201,105},
-	{  7, 85, 44},
-	{  9,116, 60},
-	{ 25, 17,  1},
-	{193,133, 11},
-	{124, 85,  7},
-	{  2, 25, 13},
-	{ 15, 10,  1},
-	{  4, 47, 24},
-	{ 38, 26,  2},
-	{ 48, 33,  3},
-	{104, 72,  6},
-	{ 31, 21,  2},
-	{  6, 72, 37},
-	{ 14,185, 97},
-	{ 18,228,119},
-	{203,139, 12},
-	{ 69, 48,  4},
-	{  2, 29, 15},
-	{ 17,225,117},
-	{  6, 82, 43},
-	{  8,100, 52},
-	{115, 79,  7},
-	{160,110,  9},
-	{142, 98,  8},
-	{ 64, 44,  4},
-	{  8,101, 52},
-	{  7, 84, 44},
-	{103, 71,  6},
-	{  8,  6,  0},
-	{123, 84,  7},
-	{  3,  2,  0},
-	{  2, 22, 11},
-	{ 13,162, 84},
-	{  6, 73, 38},
-	{  5, 66, 34},
-	{148,102,  9},
-	{  4, 50, 26},
-	{  3, 44, 23},
-	{169,116, 10},
-	{ 71, 49,  4},
-	{ 45, 31,  3},
-	{ 82, 56,  5},
-	{ 39, 27,  2},
-	{111, 76,  6},
-	{ 23, 16,  1},
-	{  4, 58, 30},
-	{ 20,171,226},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255}
-	};
-
-char cn_data[] = {
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,2,3,4,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,5,6,0,7,8,9,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,10,11,0,0,12,13,14,15,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,16,17,0,18,19,0,20,21,0,0,0,
-	0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,23,24,25,26,27,0,28,29,0,0,0,
-	0,0,0,0,0,30,31,32,33,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,34,35,36,37,0,38,39,40,0,0,0,
-	0,0,0,41,42,43,44,43,45,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,46,47,48,49,0,50,0,51,48,0,0,0,0,
-	0,52,53,54,55,52,56,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,17,16,38,51,57,58,0,59,57,0,0,0,0,0,
-	60,61,62,63,0,64,62,65,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,11,10,0,0,66,67,19,68,69,0,0,0,0,70,
-	71,72,0,0,73,74,0,0,73,75,76,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,6,5,0,0,0,0,0,37,4,0,0,0,0,0,0,
-	0,0,0,77,78,79,80,81,82,79,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	83,3,84,0,0,0,0,25,26,85,0,0,0,0,0,0,
-	0,0,77,86,87,86,88,89,90,91,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	92,2,5,11,17,0,0,93,94,0,0,0,0,0,0,0,
-	0,0,95,32,32,96,97,98,99,100,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,
-	101,102,103,10,16,102,104,3,105,0,0,0,0,0,0,0,
-	0,0,106,107,108,109,78,107,108,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
-	18,110,111,110,0,110,111,112,0,0,0,0,0,0,0,0,
-	0,0,63,113,53,114,115,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,67,
-	0,0,103,102,16,10,103,102,16,10,0,0,0,0,0,0,
-	0,0,0,0,116,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,66,
-	0,0,0,117,111,118,38,0,17,119,0,0,0,0,0,0,
-	0,0,0,65,99,108,0,0,0,0,115,114,120,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,25,
-	0,0,0,0,110,121,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,98,107,122,0,108,107,78,109,95,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,123,124,125,0,125,26,
-	18,0,0,103,111,126,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,127,81,128,99,98,97,96,129,73,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,130,21,131,0,0,27,
-	19,67,66,102,110,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,132,133,86,90,89,88,86,134,135,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,136,137,0,0,0,0,0,
-	0,58,138,139,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,120,79,82,81,80,79,82,140,141,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,142,20,0,0,0,0,0,
-	143,144,145,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,146,75,73,91,147,75,73,148,149,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,15,150,0,0,0,0,0,
-	105,119,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,151,60,63,62,61,152,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,153,154,0,0,0,0,
-	105,3,155,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,55,54,53,52,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,156,130,137,157,0,9,
-	94,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,120,43,42,41,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,136,14,13,12,
-	158,159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,160,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,9,8,7,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0
-	};
diff --git a/cnslock/graphics/caps_num_scroll.h b/cnslock/graphics/caps_num_scroll.h
deleted file mode 100644
index 3846b03..0000000
--- a/cnslock/graphics/caps_num_scroll.h
+++ /dev/null
@@ -1,488 +0,0 @@
-int cns_width = 56;
-int cns_height = 56;
-
-char cns_cmap[256][3] = {
-	{  0,  0,  0},
-	{ 54, 37,  3},
-	{ 56, 39,  3},
-	{218,150, 13},
-	{  6,  4,  0},
-	{177,122, 10},
-	{ 97, 67,  6},
-	{  9,  6,  0},
-	{ 29, 20,  2},
-	{ 26, 18,  2},
-	{ 89, 61,  5},
-	{186,127, 11},
-	{196,134, 11},
-	{123, 85,  7},
-	{236,162, 14},
-	{ 66, 45,  4},
-	{210,144, 12},
-	{ 65, 44,  4},
-	{112, 77,  6},
-	{162,111,  9},
-	{ 49, 34,  3},
-	{ 88, 60,  5},
-	{  4, 55, 29},
-	{108, 74,  6},
-	{ 50, 34,  3},
-	{ 24, 16,  1},
-	{233,160, 13},
-	{ 41, 28,  2},
-	{136, 93,  8},
-	{138, 95,  8},
-	{  6, 79, 41},
-	{ 15,195,102},
-	{ 18,232,121},
-	{  2, 31, 16},
-	{ 90, 62,  5},
-	{225,154, 13},
-	{118, 81,  7},
-	{120, 83,  7},
-	{ 47, 33,  3},
-	{227,156, 13},
-	{ 17, 12,  1},
-	{  4, 48, 25},
-	{ 13,164, 85},
-	{ 14,184, 96},
-	{ 13,172, 90},
-	{  3, 43, 23},
-	{ 67, 46,  4},
-	{113, 78,  7},
-	{106, 73,  6},
-	{ 12,  8,  1},
-	{  1,  0,  0},
-	{168,116, 10},
-	{  1, 17,  9},
-	{ 10,133, 69},
-	{ 17,215,112},
-	{  8, 99, 52},
-	{ 10,128, 67},
-	{195,133, 11},
-	{ 74, 50,  4},
-	{ 56, 38,  3},
-	{  8,102, 53},
-	{ 17,218,113},
-	{ 10,130, 68},
-	{  1, 14,  8},
-	{ 13,167, 87},
-	{  1,  7,  4},
-	{ 80, 55,  5},
-	{201,138, 12},
-	{  7,  5,  0},
-	{ 24, 17,  1},
-	{  1, 13,  7},
-	{ 12,151, 79},
-	{  4, 46, 24},
-	{  5, 70, 37},
-	{ 12,149, 78},
-	{ 14,186, 97},
-	{  5, 65, 34},
-	{  0,  6,  3},
-	{ 14,178, 93},
-	{  6, 77, 40},
-	{  3, 39, 21},
-	{ 12,155, 81},
-	{ 15,193,100},
-	{  5,  4,  0},
-	{131, 90,  8},
-	{ 37, 25,  2},
-	{ 10,124, 65},
-	{ 11,142, 74},
-	{ 17,224,117},
-	{  8,108, 56},
-	{  1,  8,  4},
-	{  3, 33, 17},
-	{ 35, 24,  2},
-	{145, 99,  8},
-	{130, 89,  8},
-	{  3, 36, 19},
-	{ 11,139, 72},
-	{  2, 23, 12},
-	{  7, 93, 49},
-	{ 16,209,109},
-	{  8,107, 56},
-	{241,165, 14},
-	{153,105,  9},
-	{ 32, 22,  2},
-	{ 81, 56,  5},
-	{  9,  6,  1},
-	{  9,119, 62},
-	{ 13,170, 89},
-	{  4, 54, 28},
-	{  5, 62, 32},
-	{121, 83,  7},
-	{242,166, 14},
-	{170,116, 10},
-	{  0,  1,  1},
-	{ 16,201,105},
-	{  7, 85, 44},
-	{  9,116, 60},
-	{ 25, 17,  1},
-	{193,133, 11},
-	{124, 85,  7},
-	{  2, 25, 13},
-	{ 15, 10,  1},
-	{  4, 47, 24},
-	{ 38, 26,  2},
-	{ 48, 33,  3},
-	{104, 72,  6},
-	{ 31, 21,  2},
-	{  6, 72, 37},
-	{ 14,185, 97},
-	{ 18,228,119},
-	{203,139, 12},
-	{ 69, 48,  4},
-	{  2, 29, 15},
-	{ 17,225,117},
-	{  6, 82, 43},
-	{  8,100, 52},
-	{115, 79,  7},
-	{160,110,  9},
-	{142, 98,  8},
-	{ 64, 44,  4},
-	{  8,101, 52},
-	{  7, 84, 44},
-	{103, 71,  6},
-	{  8,  6,  0},
-	{123, 84,  7},
-	{  3,  2,  0},
-	{  2, 22, 11},
-	{ 13,162, 84},
-	{  6, 73, 38},
-	{  5, 66, 34},
-	{148,102,  9},
-	{  4, 50, 26},
-	{  3, 44, 23},
-	{169,116, 10},
-	{ 71, 49,  4},
-	{ 45, 31,  3},
-	{ 82, 56,  5},
-	{ 39, 27,  2},
-	{111, 76,  6},
-	{ 23, 16,  1},
-	{  4, 58, 30},
-	{ 20,171,226},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255}
-	};
-
-char cns_data[] = {
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,2,3,4,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,5,6,0,7,8,9,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,10,11,0,0,12,13,14,15,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,16,17,0,18,19,0,20,21,0,0,0,
-	0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,23,24,25,26,27,0,28,29,0,0,0,
-	0,0,0,0,0,30,31,32,33,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,34,35,36,37,0,38,39,40,0,0,0,
-	0,0,0,41,42,43,44,43,45,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,46,47,48,49,0,50,0,51,48,0,0,0,0,
-	0,52,53,54,55,52,56,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,17,16,38,51,57,58,0,59,57,0,0,0,0,0,
-	60,61,62,63,0,64,62,65,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,11,10,0,0,66,67,19,68,69,0,0,0,0,70,
-	71,72,0,0,73,74,0,0,73,75,76,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,6,5,0,0,0,0,0,37,4,0,0,0,0,0,0,
-	0,0,0,77,78,79,80,81,82,79,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	83,3,84,0,0,0,0,25,26,85,0,0,0,0,0,0,
-	0,0,77,86,87,86,88,89,90,91,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	92,2,5,11,17,0,0,93,94,0,0,0,0,0,0,0,
-	0,0,95,32,32,96,97,98,99,100,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,
-	101,102,103,10,16,102,104,3,105,0,0,0,0,0,0,0,
-	0,0,106,107,108,109,78,107,108,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
-	18,110,111,110,0,110,111,112,0,0,0,0,0,0,0,0,
-	0,0,63,113,53,114,115,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,67,
-	0,0,103,102,16,10,103,102,16,10,0,0,0,0,0,0,
-	0,0,0,0,116,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,66,
-	0,0,0,117,111,118,38,0,17,119,0,0,0,0,0,0,
-	0,0,0,65,99,108,0,0,0,0,115,114,120,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,25,
-	0,0,0,0,110,121,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,98,107,122,0,108,107,78,109,95,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,123,124,125,0,125,26,
-	18,0,0,103,111,126,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,127,81,128,99,98,97,96,129,73,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,130,21,131,0,0,27,
-	19,67,66,102,110,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,132,133,86,90,89,88,86,134,135,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,136,137,0,0,0,0,0,
-	0,58,138,139,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,120,79,82,81,80,79,82,140,141,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,142,20,0,0,0,0,0,
-	143,144,145,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,146,75,73,91,147,75,73,148,149,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,15,150,0,0,0,0,0,
-	105,119,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,151,60,63,62,61,152,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,153,154,0,0,0,0,
-	105,3,155,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,55,54,53,52,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,156,130,137,157,0,9,
-	94,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,120,43,42,41,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,136,14,13,12,
-	158,159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,160,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,9,8,7,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,161,161,161,0,0,0,0,161,161,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,0,0,0,
-	161,161,161,161,0,0,161,0,161,161,161,0,0,0,161,161,
-	161,161,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,0,0,161,
-	0,0,0,0,0,0,161,161,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,0,
-	161,161,161,161,0,0,161,0,0,0,0,0,0,0,161,161,
-	161,161,0,0,161,161,161,161,161,0,0,161,161,161,161,161,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0
-	};
diff --git a/cnslock/graphics/caps_num_scroll.xpm b/cnslock/graphics/caps_num_scroll.xpm
new file mode 100644
index 0000000..5c2c3cd
--- /dev/null
+++ b/cnslock/graphics/caps_num_scroll.xpm
@@ -0,0 +1,221 @@
+/* XPM */
+static char * caps_num_scroll_xpm[] = {
+"56 56 162 2",
+"  	c #000000",
+". 	c #362503",
+"+ 	c #382703",
+"@ 	c #DA960D",
+"# 	c #060400",
+"$ 	c #B17A0A",
+"% 	c #614306",
+"& 	c #090600",
+"* 	c #1D1402",
+"= 	c #1A1202",
+"- 	c #593D05",
+"; 	c #BA7F0B",
+"> 	c #C4860B",
+", 	c #7B5507",
+"' 	c #ECA20E",
+") 	c #422D04",
+"! 	c #D2900C",
+"~ 	c #412C04",
+"{ 	c #704D06",
+"] 	c #A26F09",
+"^ 	c #312203",
+"/ 	c #583C05",
+"( 	c #04371D",
+"_ 	c #6C4A06",
+": 	c #322203",
+"< 	c #181001",
+"[ 	c #E9A00D",
+"} 	c #291C02",
+"| 	c #885D08",
+"1 	c #8A5F08",
+"2 	c #064F29",
+"3 	c #0FC366",
+"4 	c #12E879",
+"5 	c #021F10",
+"6 	c #5A3E05",
+"7 	c #E19A0D",
+"8 	c #765107",
+"9 	c #785307",
+"0 	c #2F2103",
+"a 	c #E39C0D",
+"b 	c #110C01",
+"c 	c #043019",
+"d 	c #0DA455",
+"e 	c #0EB860",
+"f 	c #0DAC5A",
+"g 	c #032B17",
+"h 	c #432E04",
+"i 	c #714E07",
+"j 	c #6A4906",
+"k 	c #0C0801",
+"l 	c #010000",
+"m 	c #A8740A",
+"n 	c #011109",
+"o 	c #0A8545",
+"p 	c #11D770",
+"q 	c #086334",
+"r 	c #0A8043",
+"s 	c #C3850B",
+"t 	c #4A3204",
+"u 	c #382603",
+"v 	c #086635",
+"w 	c #11DA71",
+"x 	c #0A8244",
+"y 	c #010E08",
+"z 	c #0DA757",
+"A 	c #010704",
+"B 	c #503705",
+"C 	c #C98A0C",
+"D 	c #070500",
+"E 	c #181101",
+"F 	c #010D07",
+"G 	c #0C974F",
+"H 	c #042E18",
+"I 	c #054625",
+"J 	c #0C954E",
+"K 	c #0EBA61",
+"L 	c #054122",
+"M 	c #000603",
+"N 	c #0EB25D",
+"O 	c #064D28",
+"P 	c #032715",
+"Q 	c #0C9B51",
+"R 	c #0FC164",
+"S 	c #050400",
+"T 	c #835A08",
+"U 	c #251902",
+"V 	c #0A7C41",
+"W 	c #0B8E4A",
+"X 	c #11E075",
+"Y 	c #086C38",
+"Z 	c #010804",
+"` 	c #032111",
+" .	c #231802",
+"..	c #916308",
+"+.	c #825908",
+"@.	c #032413",
+"#.	c #0B8B48",
+"$.	c #02170C",
+"%.	c #075D31",
+"&.	c #10D16D",
+"*.	c #086B38",
+"=.	c #F1A50E",
+"-.	c #996909",
+";.	c #201602",
+">.	c #513805",
+",.	c #090601",
+"'.	c #09773E",
+").	c #0DAA59",
+"!.	c #04361C",
+"~.	c #053E20",
+"{.	c #795307",
+"].	c #F2A60E",
+"^.	c #AA740A",
+"/.	c #000101",
+"(.	c #10C969",
+"_.	c #07552C",
+":.	c #09743C",
+"<.	c #191101",
+"[.	c #C1850B",
+"}.	c #7C5507",
+"|.	c #02190D",
+"1.	c #0F0A01",
+"2.	c #042F18",
+"3.	c #261A02",
+"4.	c #302103",
+"5.	c #684806",
+"6.	c #1F1502",
+"7.	c #064825",
+"8.	c #0EB961",
+"9.	c #12E477",
+"0.	c #CB8B0C",
+"a.	c #453004",
+"b.	c #021D0F",
+"c.	c #11E175",
+"d.	c #06522B",
+"e.	c #086434",
+"f.	c #734F07",
+"g.	c #A06E09",
+"h.	c #8E6208",
+"i.	c #402C04",
+"j.	c #086534",
+"k.	c #07542C",
+"l.	c #674706",
+"m.	c #080600",
+"n.	c #7B5407",
+"o.	c #030200",
+"p.	c #02160B",
+"q.	c #0DA254",
+"r.	c #064926",
+"s.	c #054222",
+"t.	c #946609",
+"u.	c #04321A",
+"v.	c #032C17",
+"w.	c #A9740A",
+"x.	c #473104",
+"y.	c #2D1F03",
+"z.	c #523805",
+"A.	c #271B02",
+"B.	c #6F4C06",
+"C.	c #171001",
+"D.	c #043A1E",
+"E.	c #14ABE2",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                              .                                                                 ",
+"                                            + @ #                                                               ",
+"                                            $ %   & * =                                                         ",
+"                                          - ;     > , ' )                                                       ",
+"                                          ! ~   { ]   ^ /                     (                                 ",
+"                                          _ : < [ }   | 1                 2 3 4 5                               ",
+"                                          6 7 8 9   0 a b             c d e f e g                               ",
+"                                      h i j k   l   m j           n o p q n r                                   ",
+"                                    ~ ! 0 m s t   u s           v w x y   z x A                                 ",
+"                                    ; -     B C ] D E         F G H     I J     I K L                           ",
+"                                  % $           9 #                   M N O P Q R O                             ",
+"                                S @ T         < [ U                 M V W V X Y Z `                             ",
+"                                 .+ $ ; ~     ..+.                  @.4 4 #.$.%.&.*.                            ",
+"                              } =.-.;.- ! -.>.@ ,.                  '.).!.~.N ).!.                              ",
+"                              ] { {.].{.  {.].^.                    y /.o (._.                                  ",
+"                            t C     ;.-.! - ;.-.! -                     :.                                      ",
+"                            s B       <.].[.0   ~ }.                  A &.!.        _.(.|.                      ",
+"                            { <         {.1.                            %.).2.  !.).N ~.@.                      ",
+"                    3.4.5.  5.[ {     ;.].6.                              7.Q 8.&.%.$.#.9.I                     ",
+"                    0./ a.    } ] C B -.{.                                b.c.V Z Y X V d.e.                    ",
+"                  f.g.            t h.i.                                    |.O R Q P O R j.k.                  ",
+"                  l.^           m.n.o.                                      p.K I ` q.K I r.s.                  ",
+"                  ) t.          ,.}.                                              u.v y x w v.                  ",
+"                    w.x.        ,.@ y.                                              q p o n                     ",
+"                    z.0.g.A.  = +...                                            |.e d c                         ",
+"                        f.' , > B.C.                                              D.                            ",
+"                          = * &                                                                                 ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                        E.E.E.        E.E.E.                    ",
+"                  E.E.E.E.                                                  E.            E.                    ",
+"                E.        E.                                                E.            E.                    ",
+"                E.              E.E.E.E.    E.  E.E.E.      E.E.E.E.        E.            E.                    ",
+"                E.            E.            E.E.          E.        E.      E.            E.                    ",
+"                  E.E.E.E.    E.            E.            E.        E.      E.            E.                    ",
+"                          E.  E.            E.            E.        E.      E.            E.                    ",
+"                          E.  E.            E.            E.        E.      E.            E.                    ",
+"                E.        E.  E.            E.            E.        E.      E.            E.                    ",
+"                  E.E.E.E.      E.E.E.E.    E.              E.E.E.E.    E.E.E.E.E.    E.E.E.E.E.                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                ",
+"                                                                                                                "};
diff --git a/cnslock/graphics/caps_scroll.h b/cnslock/graphics/caps_scroll.h
deleted file mode 100644
index bf3332b..0000000
--- a/cnslock/graphics/caps_scroll.h
+++ /dev/null
@@ -1,488 +0,0 @@
-int cs_width = 56;
-int cs_height = 56;
-
-char cs_cmap[256][3] = {
-	{  0,  0,  0},
-	{ 54, 37,  3},
-	{ 56, 39,  3},
-	{218,150, 13},
-	{  6,  4,  0},
-	{177,122, 10},
-	{ 97, 67,  6},
-	{  9,  6,  0},
-	{ 29, 20,  2},
-	{ 26, 18,  2},
-	{ 89, 61,  5},
-	{186,127, 11},
-	{196,134, 11},
-	{123, 85,  7},
-	{236,162, 14},
-	{ 66, 45,  4},
-	{210,144, 12},
-	{ 65, 44,  4},
-	{112, 77,  6},
-	{162,111,  9},
-	{ 49, 34,  3},
-	{ 88, 60,  5},
-	{  4, 55, 29},
-	{108, 74,  6},
-	{ 50, 34,  3},
-	{ 24, 16,  1},
-	{233,160, 13},
-	{ 41, 28,  2},
-	{136, 93,  8},
-	{138, 95,  8},
-	{  6, 79, 41},
-	{ 15,195,102},
-	{ 18,232,121},
-	{  2, 31, 16},
-	{ 90, 62,  5},
-	{225,154, 13},
-	{118, 81,  7},
-	{120, 83,  7},
-	{ 47, 33,  3},
-	{227,156, 13},
-	{ 17, 12,  1},
-	{  4, 48, 25},
-	{ 13,164, 85},
-	{ 14,184, 96},
-	{ 13,172, 90},
-	{  3, 43, 23},
-	{ 67, 46,  4},
-	{113, 78,  7},
-	{106, 73,  6},
-	{ 12,  8,  1},
-	{  1,  0,  0},
-	{168,116, 10},
-	{  1, 17,  9},
-	{ 10,133, 69},
-	{ 17,215,112},
-	{  8, 99, 52},
-	{ 10,128, 67},
-	{195,133, 11},
-	{ 74, 50,  4},
-	{ 56, 38,  3},
-	{  8,102, 53},
-	{ 17,218,113},
-	{ 10,130, 68},
-	{  1, 14,  8},
-	{ 13,167, 87},
-	{  1,  7,  4},
-	{ 80, 55,  5},
-	{201,138, 12},
-	{  7,  5,  0},
-	{ 24, 17,  1},
-	{  1, 13,  7},
-	{ 12,151, 79},
-	{  4, 46, 24},
-	{  5, 70, 37},
-	{ 12,149, 78},
-	{ 14,186, 97},
-	{  5, 65, 34},
-	{  0,  6,  3},
-	{ 14,178, 93},
-	{  6, 77, 40},
-	{  3, 39, 21},
-	{ 12,155, 81},
-	{ 15,193,100},
-	{  5,  4,  0},
-	{131, 90,  8},
-	{ 37, 25,  2},
-	{ 10,124, 65},
-	{ 11,142, 74},
-	{ 17,224,117},
-	{  8,108, 56},
-	{  1,  8,  4},
-	{  3, 33, 17},
-	{ 35, 24,  2},
-	{145, 99,  8},
-	{130, 89,  8},
-	{  3, 36, 19},
-	{ 11,139, 72},
-	{  2, 23, 12},
-	{  7, 93, 49},
-	{ 16,209,109},
-	{  8,107, 56},
-	{241,165, 14},
-	{153,105,  9},
-	{ 32, 22,  2},
-	{ 81, 56,  5},
-	{  9,  6,  1},
-	{  9,119, 62},
-	{ 13,170, 89},
-	{  4, 54, 28},
-	{  5, 62, 32},
-	{121, 83,  7},
-	{242,166, 14},
-	{170,116, 10},
-	{  0,  1,  1},
-	{ 16,201,105},
-	{  7, 85, 44},
-	{  9,116, 60},
-	{ 25, 17,  1},
-	{193,133, 11},
-	{124, 85,  7},
-	{  2, 25, 13},
-	{ 15, 10,  1},
-	{  4, 47, 24},
-	{ 38, 26,  2},
-	{ 48, 33,  3},
-	{104, 72,  6},
-	{ 31, 21,  2},
-	{  6, 72, 37},
-	{ 14,185, 97},
-	{ 18,228,119},
-	{203,139, 12},
-	{ 69, 48,  4},
-	{  2, 29, 15},
-	{ 17,225,117},
-	{  6, 82, 43},
-	{  8,100, 52},
-	{115, 79,  7},
-	{160,110,  9},
-	{142, 98,  8},
-	{ 64, 44,  4},
-	{  8,101, 52},
-	{  7, 84, 44},
-	{103, 71,  6},
-	{  8,  6,  0},
-	{123, 84,  7},
-	{  3,  2,  0},
-	{  2, 22, 11},
-	{ 13,162, 84},
-	{  6, 73, 38},
-	{  5, 66, 34},
-	{148,102,  9},
-	{  4, 50, 26},
-	{  3, 44, 23},
-	{169,116, 10},
-	{ 71, 49,  4},
-	{ 45, 31,  3},
-	{ 82, 56,  5},
-	{ 39, 27,  2},
-	{111, 76,  6},
-	{ 23, 16,  1},
-	{  4, 58, 30},
-	{ 20,171,226},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255}
-	};
-
-char cs_data[] = {
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,2,3,4,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,5,6,0,7,8,9,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,10,11,0,0,12,13,14,15,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,16,17,0,18,19,0,20,21,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,23,24,25,26,27,0,28,29,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,34,35,36,37,0,38,39,40,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,46,47,48,49,0,50,0,51,48,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,17,16,38,51,57,58,0,59,57,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,11,10,0,0,66,67,19,68,69,0,0,0,0,70,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,6,5,0,0,0,0,0,37,4,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	83,3,84,0,0,0,0,25,26,85,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	92,2,5,11,17,0,0,93,94,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,
-	101,102,103,10,16,102,104,3,105,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
-	18,110,111,110,0,110,111,112,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,58,67,
-	0,0,103,102,16,10,103,102,16,10,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,57,66,
-	0,0,0,117,111,118,38,0,17,119,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,25,
-	0,0,0,0,110,121,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,123,124,125,0,125,26,
-	18,0,0,103,111,126,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,130,21,131,0,0,27,
-	19,67,66,102,110,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,136,137,0,0,0,0,0,
-	0,58,138,139,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,142,20,0,0,0,0,0,
-	143,144,145,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,15,150,0,0,0,0,0,
-	105,119,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,153,154,0,0,0,0,
-	105,3,155,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,156,130,137,157,0,9,
-	94,93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,136,14,13,12,
-	158,159,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,9,8,7,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,161,161,161,0,0,0,0,161,161,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,0,0,0,
-	161,161,161,161,0,0,161,0,161,161,161,0,0,0,161,161,
-	161,161,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,0,0,161,
-	0,0,0,0,0,0,161,161,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,0,
-	161,161,161,161,0,0,161,0,0,0,0,0,0,0,161,161,
-	161,161,0,0,161,161,161,161,161,0,0,161,161,161,161,161,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0
-	};
diff --git a/cnslock/graphics/master.xpm b/cnslock/graphics/master.xpm
deleted file mode 100644
index a582311..0000000
--- a/cnslock/graphics/master.xpm
+++ /dev/null
@@ -1,71 +0,0 @@
-/* XPM */
-static char * master_xpm[] = {
-"64 64 4 1",
-" 	c None",
-".	c #000000",
-"+	c #375F87",
-"@	c #ABBAC6",
-"                                                                ",
-"                                                                ",
-"                                                                ",
-"   ..........................................................   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   .++++++++++++++++++++++++++++++++++++++++++++++++++++++++@   ",
-"   @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@   ",
-"                                                                ",
-"                                                                ",
-"                                                                "};
diff --git a/cnslock/graphics/none.h b/cnslock/graphics/none.h
deleted file mode 100644
index e45fddf..0000000
--- a/cnslock/graphics/none.h
+++ /dev/null
@@ -1,488 +0,0 @@
-int none_width = 56;
-int none_height = 56;
-
-char none_cmap[256][3] = {
-	{  0,  0,  0},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255}
-	};
-
-char none_data[] = {
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0
-	};
diff --git a/cnslock/graphics/num.h b/cnslock/graphics/num.h
deleted file mode 100644
index 0e24841..0000000
--- a/cnslock/graphics/num.h
+++ /dev/null
@@ -1,488 +0,0 @@
-int n_width = 56;
-int n_height = 56;
-
-char n_cmap[256][3] = {
-	{  0,  0,  0},
-	{ 54, 37,  3},
-	{ 56, 39,  3},
-	{218,150, 13},
-	{  6,  4,  0},
-	{177,122, 10},
-	{ 97, 67,  6},
-	{  9,  6,  0},
-	{ 29, 20,  2},
-	{ 26, 18,  2},
-	{ 89, 61,  5},
-	{186,127, 11},
-	{196,134, 11},
-	{123, 85,  7},
-	{236,162, 14},
-	{ 66, 45,  4},
-	{210,144, 12},
-	{ 65, 44,  4},
-	{112, 77,  6},
-	{162,111,  9},
-	{ 49, 34,  3},
-	{ 88, 60,  5},
-	{  4, 55, 29},
-	{108, 74,  6},
-	{ 50, 34,  3},
-	{ 24, 16,  1},
-	{233,160, 13},
-	{ 41, 28,  2},
-	{136, 93,  8},
-	{138, 95,  8},
-	{  6, 79, 41},
-	{ 15,195,102},
-	{ 18,232,121},
-	{  2, 31, 16},
-	{ 90, 62,  5},
-	{225,154, 13},
-	{118, 81,  7},
-	{120, 83,  7},
-	{ 47, 33,  3},
-	{227,156, 13},
-	{ 17, 12,  1},
-	{  4, 48, 25},
-	{ 13,164, 85},
-	{ 14,184, 96},
-	{ 13,172, 90},
-	{  3, 43, 23},
-	{ 67, 46,  4},
-	{113, 78,  7},
-	{106, 73,  6},
-	{ 12,  8,  1},
-	{  1,  0,  0},
-	{168,116, 10},
-	{  1, 17,  9},
-	{ 10,133, 69},
-	{ 17,215,112},
-	{  8, 99, 52},
-	{ 10,128, 67},
-	{195,133, 11},
-	{ 74, 50,  4},
-	{ 56, 38,  3},
-	{  8,102, 53},
-	{ 17,218,113},
-	{ 10,130, 68},
-	{  1, 14,  8},
-	{ 13,167, 87},
-	{  1,  7,  4},
-	{ 80, 55,  5},
-	{201,138, 12},
-	{  7,  5,  0},
-	{ 24, 17,  1},
-	{  1, 13,  7},
-	{ 12,151, 79},
-	{  4, 46, 24},
-	{  5, 70, 37},
-	{ 12,149, 78},
-	{ 14,186, 97},
-	{  5, 65, 34},
-	{  0,  6,  3},
-	{ 14,178, 93},
-	{  6, 77, 40},
-	{  3, 39, 21},
-	{ 12,155, 81},
-	{ 15,193,100},
-	{  5,  4,  0},
-	{131, 90,  8},
-	{ 37, 25,  2},
-	{ 10,124, 65},
-	{ 11,142, 74},
-	{ 17,224,117},
-	{  8,108, 56},
-	{  1,  8,  4},
-	{  3, 33, 17},
-	{ 35, 24,  2},
-	{145, 99,  8},
-	{130, 89,  8},
-	{  3, 36, 19},
-	{ 11,139, 72},
-	{  2, 23, 12},
-	{  7, 93, 49},
-	{ 16,209,109},
-	{  8,107, 56},
-	{241,165, 14},
-	{153,105,  9},
-	{ 32, 22,  2},
-	{ 81, 56,  5},
-	{  9,  6,  1},
-	{  9,119, 62},
-	{ 13,170, 89},
-	{  4, 54, 28},
-	{  5, 62, 32},
-	{121, 83,  7},
-	{242,166, 14},
-	{170,116, 10},
-	{  0,  1,  1},
-	{ 16,201,105},
-	{  7, 85, 44},
-	{  9,116, 60},
-	{ 25, 17,  1},
-	{193,133, 11},
-	{124, 85,  7},
-	{  2, 25, 13},
-	{ 15, 10,  1},
-	{  4, 47, 24},
-	{ 38, 26,  2},
-	{ 48, 33,  3},
-	{104, 72,  6},
-	{ 31, 21,  2},
-	{  6, 72, 37},
-	{ 14,185, 97},
-	{ 18,228,119},
-	{203,139, 12},
-	{ 69, 48,  4},
-	{  2, 29, 15},
-	{ 17,225,117},
-	{  6, 82, 43},
-	{  8,100, 52},
-	{115, 79,  7},
-	{160,110,  9},
-	{142, 98,  8},
-	{ 64, 44,  4},
-	{  8,101, 52},
-	{  7, 84, 44},
-	{103, 71,  6},
-	{  8,  6,  0},
-	{123, 84,  7},
-	{  3,  2,  0},
-	{  2, 22, 11},
-	{ 13,162, 84},
-	{  6, 73, 38},
-	{  5, 66, 34},
-	{148,102,  9},
-	{  4, 50, 26},
-	{  3, 44, 23},
-	{169,116, 10},
-	{ 71, 49,  4},
-	{ 45, 31,  3},
-	{ 82, 56,  5},
-	{ 39, 27,  2},
-	{111, 76,  6},
-	{ 23, 16,  1},
-	{  4, 58, 30},
-	{ 20,171,226},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255}
-	};
-
-char n_data[] = {
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,30,31,32,33,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,41,42,43,44,43,45,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,52,53,54,55,52,56,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	60,61,62,63,0,64,62,65,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,70,
-	71,72,0,0,73,74,0,0,73,75,76,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,77,78,79,80,81,82,79,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,77,86,87,86,88,89,90,91,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,95,32,32,96,97,98,99,100,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,106,107,108,109,78,107,108,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,63,113,53,114,115,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,116,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,65,99,108,0,0,0,0,115,114,120,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,98,107,122,0,108,107,78,109,95,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,127,81,128,99,98,97,96,129,73,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,132,133,86,90,89,88,86,134,135,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,120,79,82,81,80,79,82,140,141,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,146,75,73,91,147,75,73,148,149,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,151,60,63,62,61,152,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,55,54,53,52,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,120,43,42,41,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,160,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0
-	};
diff --git a/cnslock/graphics/num_scroll.h b/cnslock/graphics/num_scroll.h
deleted file mode 100644
index 3c236ef..0000000
--- a/cnslock/graphics/num_scroll.h
+++ /dev/null
@@ -1,488 +0,0 @@
-int ns_width = 56;
-int ns_height = 56;
-
-char ns_cmap[256][3] = {
-	{  0,  0,  0},
-	{ 54, 37,  3},
-	{ 56, 39,  3},
-	{218,150, 13},
-	{  6,  4,  0},
-	{177,122, 10},
-	{ 97, 67,  6},
-	{  9,  6,  0},
-	{ 29, 20,  2},
-	{ 26, 18,  2},
-	{ 89, 61,  5},
-	{186,127, 11},
-	{196,134, 11},
-	{123, 85,  7},
-	{236,162, 14},
-	{ 66, 45,  4},
-	{210,144, 12},
-	{ 65, 44,  4},
-	{112, 77,  6},
-	{162,111,  9},
-	{ 49, 34,  3},
-	{ 88, 60,  5},
-	{  4, 55, 29},
-	{108, 74,  6},
-	{ 50, 34,  3},
-	{ 24, 16,  1},
-	{233,160, 13},
-	{ 41, 28,  2},
-	{136, 93,  8},
-	{138, 95,  8},
-	{  6, 79, 41},
-	{ 15,195,102},
-	{ 18,232,121},
-	{  2, 31, 16},
-	{ 90, 62,  5},
-	{225,154, 13},
-	{118, 81,  7},
-	{120, 83,  7},
-	{ 47, 33,  3},
-	{227,156, 13},
-	{ 17, 12,  1},
-	{  4, 48, 25},
-	{ 13,164, 85},
-	{ 14,184, 96},
-	{ 13,172, 90},
-	{  3, 43, 23},
-	{ 67, 46,  4},
-	{113, 78,  7},
-	{106, 73,  6},
-	{ 12,  8,  1},
-	{  1,  0,  0},
-	{168,116, 10},
-	{  1, 17,  9},
-	{ 10,133, 69},
-	{ 17,215,112},
-	{  8, 99, 52},
-	{ 10,128, 67},
-	{195,133, 11},
-	{ 74, 50,  4},
-	{ 56, 38,  3},
-	{  8,102, 53},
-	{ 17,218,113},
-	{ 10,130, 68},
-	{  1, 14,  8},
-	{ 13,167, 87},
-	{  1,  7,  4},
-	{ 80, 55,  5},
-	{201,138, 12},
-	{  7,  5,  0},
-	{ 24, 17,  1},
-	{  1, 13,  7},
-	{ 12,151, 79},
-	{  4, 46, 24},
-	{  5, 70, 37},
-	{ 12,149, 78},
-	{ 14,186, 97},
-	{  5, 65, 34},
-	{  0,  6,  3},
-	{ 14,178, 93},
-	{  6, 77, 40},
-	{  3, 39, 21},
-	{ 12,155, 81},
-	{ 15,193,100},
-	{  5,  4,  0},
-	{131, 90,  8},
-	{ 37, 25,  2},
-	{ 10,124, 65},
-	{ 11,142, 74},
-	{ 17,224,117},
-	{  8,108, 56},
-	{  1,  8,  4},
-	{  3, 33, 17},
-	{ 35, 24,  2},
-	{145, 99,  8},
-	{130, 89,  8},
-	{  3, 36, 19},
-	{ 11,139, 72},
-	{  2, 23, 12},
-	{  7, 93, 49},
-	{ 16,209,109},
-	{  8,107, 56},
-	{241,165, 14},
-	{153,105,  9},
-	{ 32, 22,  2},
-	{ 81, 56,  5},
-	{  9,  6,  1},
-	{  9,119, 62},
-	{ 13,170, 89},
-	{  4, 54, 28},
-	{  5, 62, 32},
-	{121, 83,  7},
-	{242,166, 14},
-	{170,116, 10},
-	{  0,  1,  1},
-	{ 16,201,105},
-	{  7, 85, 44},
-	{  9,116, 60},
-	{ 25, 17,  1},
-	{193,133, 11},
-	{124, 85,  7},
-	{  2, 25, 13},
-	{ 15, 10,  1},
-	{  4, 47, 24},
-	{ 38, 26,  2},
-	{ 48, 33,  3},
-	{104, 72,  6},
-	{ 31, 21,  2},
-	{  6, 72, 37},
-	{ 14,185, 97},
-	{ 18,228,119},
-	{203,139, 12},
-	{ 69, 48,  4},
-	{  2, 29, 15},
-	{ 17,225,117},
-	{  6, 82, 43},
-	{  8,100, 52},
-	{115, 79,  7},
-	{160,110,  9},
-	{142, 98,  8},
-	{ 64, 44,  4},
-	{  8,101, 52},
-	{  7, 84, 44},
-	{103, 71,  6},
-	{  8,  6,  0},
-	{123, 84,  7},
-	{  3,  2,  0},
-	{  2, 22, 11},
-	{ 13,162, 84},
-	{  6, 73, 38},
-	{  5, 66, 34},
-	{148,102,  9},
-	{  4, 50, 26},
-	{  3, 44, 23},
-	{169,116, 10},
-	{ 71, 49,  4},
-	{ 45, 31,  3},
-	{ 82, 56,  5},
-	{ 39, 27,  2},
-	{111, 76,  6},
-	{ 23, 16,  1},
-	{  4, 58, 30},
-	{ 20,171,226},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255}
-	};
-
-char ns_data[] = {
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,22,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,30,31,32,33,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,41,42,43,44,43,45,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,52,53,54,55,52,56,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	60,61,62,63,0,64,62,65,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,70,
-	71,72,0,0,73,74,0,0,73,75,76,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,77,78,79,80,81,82,79,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,77,86,87,86,88,89,90,91,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,95,32,32,96,97,98,99,100,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,106,107,108,109,78,107,108,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,63,113,53,114,115,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,116,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,65,99,108,0,0,0,0,115,114,120,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,98,107,122,0,108,107,78,109,95,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,127,81,128,99,98,97,96,129,73,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,132,133,86,90,89,88,86,134,135,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,120,79,82,81,80,79,82,140,141,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,146,75,73,91,147,75,73,148,149,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,151,60,63,62,61,152,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,55,54,53,52,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,120,43,42,41,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,160,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,161,161,161,0,0,0,0,161,161,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,0,0,0,
-	161,161,161,161,0,0,161,0,161,161,161,0,0,0,161,161,
-	161,161,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,0,0,161,
-	0,0,0,0,0,0,161,161,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,0,
-	161,161,161,161,0,0,161,0,0,0,0,0,0,0,161,161,
-	161,161,0,0,161,161,161,161,161,0,0,161,161,161,161,161,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0
-	};
diff --git a/cnslock/graphics/pngs/caps.png b/cnslock/graphics/pngs/caps.png
deleted file mode 100644
index bb6c9799de6686e6d9286b293412d4c13d7c736c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 898
zcwPa51AY97P)<h;3K|Lk000e1NJLTq001}u001}$0{{R3pIFN*0005zP)t-s0000s
zB?CAo1KO4i1_S`HdJ17f1_=fL9TWl@5&~I01-gF=#D)udRR`>%4ni#i(vS>6ECg^(
z2BL2XF(Lz4JOu<d9c)SlG9m*Q5CQ3+4JjM~h+PPZUkC<IDG$SD66kpX9}rqT1>u?v
zc2Ng-QwJ|01LK?x5exwYFc}S`RSvjd4Xj!ND;Gm91aVFWYDoqR2mt{A0H|~d0TBrb
zg+&q9a0p{G3V=hyg$qhD1UM!G2xc`A+HnekL;(&64X0ND2Lw<z1<8sG2L%8a5di@W
z2Mm`_1TGi_MkNfDP7b<Z1wkSJ1_KVVT?S1k11A*>n^6zJWCa8OgIWkB83GD?K?{yb
z5#V(QY&Zc31Op)vBNzgaV+ev-2m>S&3yVks7YqkoF%Z#h2x~a;r4E^C2_O~%Q8)z&
z1_23oJ`Ji_1U4K6J|KBh2lA#4s&onf0Ra%nX$Ms-33NOe5dp!43w%`v0vQbt3IPN!
z7$zD5Fd+kINCqDj0tQGW4!L0x<af)93`H;m0v!(#;dKU5D+pvXb594LZV8TJ2tX_Z
z2xT+}R4ivl1_%ZKdsGJl0ssOQ3k{-F21zCbLL!uA2?R1411uM*bP7i?1T7x}QaA-C
z8v<`k1{V+k1UeoRtK#XZm+b%m00Cl4M??UK1szBL000SaNLh0L01FTR01FTSts}j4
z00007bV*G`2hs`)3@|wG&HpU`00AONL_t(|obA#(PlHe#1@L2$wm=^|+9*^PwdkbP
zPT&UW7f?6bO==f#QDd|Yb+MZGSWJ9>RRO<%hshXDa_`9<ez`aQTp-VX&QwNM5T>(1
zv4~Px;+?Djm1?a{Lsf%rpwXn^%&cj(FgH)bg~g>d?Bx}bt*&*}v4L)fbed{+9T%Gp
z>7dAf=Nntw$zkXBt|+F}W`Dr0u$Po+?UV4JASxQr>yxf^7z|`JI1+{=H1seE5k|+P
zbA4bCsB*F>=y>sV5}n%6&M2sx$sV3l=;CsOk)_9Pjjkv-ZeGVzHGD4!DR(pZY4`Sy
za=34#_3-$_In<xi8gkQ2^75KO;f;mw<H-l4eviH}o=>e>`TWWNA(cy6Se`t2^8DF+
Y1JRl&J{nCg>Hq)$07*qoM6N<$f>-z)b^rhX

diff --git a/cnslock/graphics/pngs/caps_num.png b/cnslock/graphics/pngs/caps_num.png
deleted file mode 100644
index 2e790a2d7266074f30f9b732834a5b35c152352d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 1081
zcwPZH1jhS`P)<h;3K|Lk000e1NJLTq001}u001}$0{{R3pIFN*0005zP)t-s0000s
zB?CAo1KO4i1_S`HdJ17f1_=fL9TWl@5&~I01-gF=#D)udRR`>%4ni#i(vS>6ECg^(
z2BL2XF(Lz4JOu<d9c)SlG9m*Q5CQ3+4JjM~h+PPZUkC<IDG$SD66kpX9}rqT1>u?v
zc2Ng-QwJ|01LK?x5exwYFc}S`RSvjd4Xj!ND;Gm91aVFWYDoqR2mt{A0H|~d0TBrb
zg+&q9a0p{G3V=hyg$qhD1UM!G2xc`A+HnekL;(&64X0ND2Lw<z1<8sG2L%8a5di@W
z2Mm`_1TGi_MkNfDP7b<Z1wkSJ1_KVVT?S1k11A*>n^6zJWCa8OgIWkB83GD?K?{yb
z5#V(QY&Zc31Op)vBNzgaV+ev-2m>S&3yVks7YqkoF%Z#h2x~a;r4E^C2_O~%Q8)z&
z1_23oJ`Ji_1U4K6J|KBh2lA#4s&onf0Ra%nX$Ms-33NOe5dp!43w%`v0vQbt3IPN!
z7$zD5Fd+kINCqDj0tQGW4!L0x<af)93`H;m0v!(#;dKU5D+pvXb594LZV8TJ2tX_Z
z2xT+}R4ivl1_%ZKdsGJl0ssOQ3k{-F21zCbLL!uA2?R1411uM*bP7i?1T7x}QaA-C
z8v<`k1{V+k1UeoRtK#XZm+b%m00Cl4M??UK1szBL000SaNLh0L01FTR01FTSts}j4
z00007bV*G`2hs`)3@{&6$4W*300G%aL_t(|oMT`Z1;ZIIlBti0nT0%!tZWSI9Gs-<
z<Kkvu;Nj)tCt0I_AcK%FgNP_XM2t9%;u4Zl(hM@PFut6;f+A5Gm6TOf8PwD@AUsVi
zZ5?f0BDCr08yGSeF&G<wc_yZ2<|Y=zSSKi;W^8H2U~LKJ+1T3IGdS2e5}}csi-Ez(
zS=hxD#Bp=?U|{g{0%C6;0{Ylk!IUZ@1^D{;2LuNB6VMmT90H;wr9$EQ!otHMBBP=S
zXpCWE<rZXMh>e4b#49KyBqk-N;MXUenwHKbke0!m2^Y%B&dK%5&LLo-uuxup9z$M!
z0Yb>W(6p$SfHnpzX9kA!GyyIUMu?UW(#F7G=>#N7^UKs21k2%qj>%wm78h0E)+i(i
zBJ(OyMU%3t7;>`xa^taUs;;SJsFe}|x;4KJO{zYyAvq~Aq0tko#wO8bV5kZ^JEi5J
zOSQCyMMXx0wY6i@*U<@~t-87~B`f@c0t5VmdU~;F>=OY~{Szi)k(}i189mwCbIMdK
za{SZ4RAxCAIS`m`V{d0W1DnjuSzwLKvvKG&H#0TCDlw<2b1nmCTr75N71~;wI7|eF
z4<9ejy!kjJ7vR(e1e_e~_@qa{C>RB!V8{Ug5<gTi?dLGh00000NkvXXu0mjf4TxZY

diff --git a/cnslock/graphics/pngs/caps_num_scroll.png b/cnslock/graphics/pngs/caps_num_scroll.png
deleted file mode 100644
index 42c1d537ffff5e4cc367c9c30ac63001f92b959e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 1138
zcwPZ=1daQNP)<h;3K|Lk000e1NJLTq001}u001}$0{{R3pIFN*0005zP)t-s0000s
zB?CAo1KO4i1_S`HdJ17f1_=fL9TWl@5&~I01-gF=#D)udRR`>%4ni#i(vS>6ECg^(
z2BL2XF(Lz4JOu<d9c)SlG9m*Q5CQ3+4JjM~h+PPZUkC<IDG$SD66kpX9}rqT1>u?v
zc2Ng-QwJ|01LK?x5exwYFc}S`RSvjd4Xj!ND;Gm91aVFWYDoqR2mt{A0H|~d0TBrb
zg+&q9a0p{G3V=hyg$qhD1UM!G2xc`A+HnekL;(&64X0ND2Lw<z1<8sG2L%8a5di@W
z2Mm`_1TGi_MkNfDP7b<Z1wkSJ1_KVVT?S1k11A*>n^6zJWCa8OgIWkB83GD?K?{yb
z5#V(QY&Zc31Op)vBNzgaV+ev-2m>S&3yVks7YqkoF%Z#h2x~a;r4E^C2_O~%Q8)z&
z1_23oJ`Ji_1U4K6J|KBh2lA#4s&onf0Ra%nX$Ms-33NOe5dp!43w%`v0vQbt3IPN!
z7$zD5Fd+kINCqDj0tQGW4!L0x<af)93`H;m0v!(#;dKU5D+pvXb594LZV8TJ2tX_Z
z2xT+}R4ivl1_%ZKdsGJl0ssOQ3k{-F21zCbLL!uA2?R1411uM*bP7i?1T7x}QaA-C
z8v<`k1{V+k1UeoRtK#XZm+b%m00Cl4M??UK1szBL000SaNLh0L01FTR01FTSts}j4
z00007bV*G`2hs`)3@;=pmaY5%00I(8L_t(|oMT`Z1;ZIIlBti0nT0%!tZWSI9Gs-<
z<Kkvu;Nj)tCt0I_AcK%FgNP_XM2t9%;u4Zl(hM@PFut6;f+A5Gm6TOf8PwD@AUsVi
zZ5?f0BDCr08yGSeF&G<wc_yZ2<|Y=zSSKi;W^8H2U~LKJ+1T3IGdS2e5}}csi-Ez(
zS=hxD#Bp=?U|{g{0%C6;0{Ylk!IUZ@1^D{;2LuNB6VMmT90H;wr9$EQ!otHMBBP=S
zXpCWE<rZXMh>e4b#49KyBqk-N;MXUenwHKbke0!m2^Y%B&dK%5&LLo-uuxup9z$M!
z0Yb>W(6p$SfHnpzX9kA!GyyIUMu?UW(#F7G=>#N7^UKs21k2%qj>%wm78h0E)+i(i
zBJ(OyMU%3t7;>`xa^taUs;;SJsFe}|x;4KJO{zYyAvq~Aq0tko#wO8bV5kZ^JEi5J
zOSQCyMMXx0wY6i@*U<@~t-87~B`f@c0t5VmdU~;F>=OY~{Szi)k(}i189mwCbIMdK
za{SZ4RAxCAIS`m`V{d0W1DnjuSzwLKvvKG&H#0TCDlw<2b1nmCTr75N71~;wI7|eF
z4<9ejy!kjJ7vR(e1e_e~_@sw3Sh#Q@5`{$;t2jgwg~F7=sgsaKxWx;h?t(dkutpfQ
z5Y-uYG{UXIFouvuhy)!qE+pH=g~;KE7RD&lC>Txv01=pvPp_FL#{d8T07*qoM6N<$
Ef+>A^7XSbN

diff --git a/cnslock/graphics/pngs/caps_scroll.png b/cnslock/graphics/pngs/caps_scroll.png
deleted file mode 100644
index 7628405955b58dd3e70fa8bbc87aeb79d51546d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 955
zcwPa!14R6ZP)<h;3K|Lk000e1NJLTq001}u001}$0{{R3pIFN*0005zP)t-s0000s
zB?CAo1KO4i1_S`HdJ17f1_=fL9TWl@5&~I01-gF=#D)udRR`>%4ni#i(vS>6ECg^(
z2BL2XF(Lz4JOu<d9c)SlG9m*Q5CQ3+4JjM~h+PPZUkC<IDG$SD66kpX9}rqT1>u?v
zc2Ng-QwJ|01LK?x5exwYFc}S`RSvjd4Xj!ND;Gm91aVFWYDoqR2mt{A0H|~d0TBrb
zg+&q9a0p{G3V=hyg$qhD1UM!G2xc`A+HnekL;(&64X0ND2Lw<z1<8sG2L%8a5di@W
z2Mm`_1TGi_MkNfDP7b<Z1wkSJ1_KVVT?S1k11A*>n^6zJWCa8OgIWkB83GD?K?{yb
z5#V(QY&Zc31Op)vBNzgaV+ev-2m>S&3yVks7YqkoF%Z#h2x~a;r4E^C2_O~%Q8)z&
z1_23oJ`Ji_1U4K6J|KBh2lA#4s&onf0Ra%nX$Ms-33NOe5dp!43w%`v0vQbt3IPN!
z7$zD5Fd+kINCqDj0tQGW4!L0x<af)93`H;m0v!(#;dKU5D+pvXb594LZV8TJ2tX_Z
z2xT+}R4ivl1_%ZKdsGJl0ssOQ3k{-F21zCbLL!uA2?R1411uM*bP7i?1T7x}QaA-C
z8v<`k1{V+k1UeoRtK#XZm+b%m00Cl4M??UK1szBL000SaNLh0L01FTR01FTSts}j4
z00007bV*G`2hs`)3^EY+PBm2k00CP`L_t(|obA#(Pr_gn2H;mJmzG;E5H0AUQk@iK
z0yj|qfVv5rMV8h@jZqwM5ly@-Cf@V?Q+p8tg5v4m&~TFWO?&e6d^ssFE<e|VM;G8G
zy}@7z;RsK6LKKL_6G<`@CCCa=X)>IeRx?@5%#z{U{6Y@e;u4W9ujE&;hC-g`BvC6A
zOIR-w9ijqIt|%Lu_QTfST`1^8j`{~|b31mZnO!2>3k0JQP^}SNc3-axqJF?Nh)|IY
z(|}<f5?!eR)OAs?FA^-4t=o}#tU)><L0Pr$#wiJ%oj1|U$ktiS3leOlFRiUAm9lP-
z+*RAn()A6=;Wp*O-Ted2A^GS;gSJh(o}L}Zy-?w6tNjMPRwYlg_LGRm-akA*@R6_=
z=7(a8^~8|w(D!b$F9usb%2BX8n0=kAbBxij6RiIjzrgOOfzOPBZsQ*z^E{FD?(y4>
d`(j*vs!!1KV_cU3B!vI~002ovPDHLkV1nE!GAjT8

diff --git a/cnslock/graphics/pngs/none.png b/cnslock/graphics/pngs/none.png
deleted file mode 100644
index 60b3dfea196be0dce71e80e5981e4220b655a0f8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 142
zcwXxa@N?(olHy`uVBq!ia0vp^79h;X3?wIctc(RxYymzYu0Z<#|Nl#G&c6#}F(!Gt
zyD)UH%6b4foCO|{#S9GG0wBz|R(WqJP>{XE)7O>#5*Ig*qQzp7JGMX}K2I0Nkcv6U
e2@<T%l0Y*KFfcBvf4Utg!{F)a=d#Wzp$PzF5+J_-

diff --git a/cnslock/graphics/pngs/num.png b/cnslock/graphics/pngs/num.png
deleted file mode 100644
index 808f84809f5c27ee007d4a87c7b0958a2e8d8444..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 827
zcwPZJ1H}A^P)<h;3K|Lk000e1NJLTq001}u001}$0{{R3pIFN*0005zP)t-s0000s
zB?CAo1KO4i1_S`HdJ17f1_=fL9TWl@5&~I01-gF=#D)udRR`>%4ni#i(vS>6ECg^(
z2BL2XF(Lz4JOu<d9c)SlG9m*Q5CQ3+4JjM~h+PPZUkC<IDG$SD66kpX9}rqT1>u?v
zc2Ng-QwJ|01LK?x5exwYFc}S`RSvjd4Xj!ND;Gm91aVFWYDoqR2mt{A0H|~d0TBrb
zg+&q9a0p{G3V=hyg$qhD1UM!G2xc`A+HnekL;(&64X0ND2Lw<z1<8sG2L%8a5di@W
z2Mm`_1TGi_MkNfDP7b<Z1wkSJ1_KVVT?S1k11A*>n^6zJWCa8OgIWkB83GD?K?{yb
z5#V(QY&Zc31Op)vBNzgaV+ev-2m>S&3yVks7YqkoF%Z#h2x~a;r4E^C2_O~%Q8)z&
z1_23oJ`Ji_1U4K6J|KBh2lA#4s&onf0Ra%nX$Ms-33NOe5dp!43w%`v0vQbt3IPN!
z7$zD5Fd+kINCqDj0tQGW4!L0x<af)93`H;m0v!(#;dKU5D+pvXb594LZV8TJ2tX_Z
z2xT+}R4ivl1_%ZKdsGJl0ssOQ3k{-F21zCbLL!uA2?R1411uM*bP7i?1T7x}QaA-C
z8v<`k1{V+k1UeoRtK#XZm+b%m00Cl4M??UK1szBL000SaNLh0L01FTR01FTSts}j4
z00007bV*G`2hs`)3^5ej4x*0$007%bL_t(|obArJ62V{;hT(G+N}?om2?|MQ5FuL;
zB1JZpL_ri84Q4D2jb$iZs^t#O-!cC?bINDF13;twR~a&v%`tfbRw%M1wv1*RU#W66
z{9IiSC1{9EtZTJ90CM+zN)J8SS2f)*HN3M1*3cd~Xy`JG=Lg{!4JT1NRihZ~K$`LM
z1kXM#$QU%k@1My$#mXRBLL8}67rnVM)?wg#8yO3?J8NVQt^EN#nQEq?Yv%EUg=a-}
zE{c4;p(g?Ebx9N+1Q4nfo+Dr>TP%>w0X)eVjYgyWW-p{hEINb+;4%OJ002ovPDHLk
FV1l`|;=lj^

diff --git a/cnslock/graphics/pngs/num_scroll.png b/cnslock/graphics/pngs/num_scroll.png
deleted file mode 100644
index b1150e19ccbce39c93920d4b25f8b373ed3b20a6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 889
zcwPZ{1BU#GP)<h;3K|Lk000e1NJLTq001}u001}$0{{R3pIFN*0005zP)t-s0000s
zB?CAo1KO4i1_S`HdJ17f1_=fL9TWl@5&~I01-gF=#D)udRR`>%4ni#i(vS>6ECg^(
z2BL2XF(Lz4JOu<d9c)SlG9m*Q5CQ3+4JjM~h+PPZUkC<IDG$SD66kpX9}rqT1>u?v
zc2Ng-QwJ|01LK?x5exwYFc}S`RSvjd4Xj!ND;Gm91aVFWYDoqR2mt{A0H|~d0TBrb
zg+&q9a0p{G3V=hyg$qhD1UM!G2xc`A+HnekL;(&64X0ND2Lw<z1<8sG2L%8a5di@W
z2Mm`_1TGi_MkNfDP7b<Z1wkSJ1_KVVT?S1k11A*>n^6zJWCa8OgIWkB83GD?K?{yb
z5#V(QY&Zc31Op)vBNzgaV+ev-2m>S&3yVks7YqkoF%Z#h2x~a;r4E^C2_O~%Q8)z&
z1_23oJ`Ji_1U4K6J|KBh2lA#4s&onf0Ra%nX$Ms-33NOe5dp!43w%`v0vQbt3IPN!
z7$zD5Fd+kINCqDj0tQGW4!L0x<af)93`H;m0v!(#;dKU5D+pvXb594LZV8TJ2tX_Z
z2xT+}R4ivl1_%ZKdsGJl0ssOQ3k{-F21zCbLL!uA2?R1411uM*bP7i?1T7x}QaA-C
z8v<`k1{V+k1UeoRtK#XZm+b%m00Cl4M??UK1szBL000SaNLh0L01FTR01FTSts}j4
z00007bV*G`2hs`)3^N8Afw4sZ009|EL_t(|oMT`Z1*2ei0WtEl$;m4ylA%pgOIt@<
zmt<`wre@|Q7NlEeV{2#6;9%!Ssy;V&4+aKLFCg~zA=y%2KmUNhAb-;Jg@uPjL`FrE
ztTA3eAt5m-IfZ16S=l+ce%U!B>tnDlG%YG7T^k6Lkf)8oF&XU6;-U&tbtYw3G2~?X
z<;Ih2XMJEpa#CVKqbI2vTUx`SA|t}u+DW#u!apc5z(1&`msE|Dygj2QdwWiqO0ty<
z4AX7w?QCa|p^?Gd%+!PoZ57&Dn&eo=z_5TkZNnZcT(}U4!Xk@R93qKAVM^iDNk}8y
z;)PIm!JI)@BaB*z>I^&@;Z|W7Lr5b;f{q#&l5OKc<Zwg_V-#u>3?~2pqn~G36Nn6q
P00000NkvXXu0mjf;UNK{

diff --git a/cnslock/graphics/pngs/scroll.png b/cnslock/graphics/pngs/scroll.png
deleted file mode 100644
index 8d672c3c1407e9362e405027be4bad2c40aa1ead..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcwPel00001

literal 696
zcwQA!Sx8h-0KNCU`|i7Mn|aUFnK8$GG;v%p9ZJQ~nVd0oT*ev&$-OK~#c@kPu{6^X
zg;Xj<k+QS}TRuvt5dBDmD1QP$%8E!xq6okGX#6<maL&*9IOl49UY5lB@c;nHZnG46
z)U*#mdwANlZUg{+&(CpMJvPZen<D7VaS0>v<RV{@i8&1P-jtsgRg%gqbqlNgLT54i
zb5@lRjW$L^vk^7s;@Ji+K7@9qFeq7HpN$hjXsrx)W~4}eYM_h^o+8*0sa~n|`q4oJ
z%B5+{_ARNkfNd{gV}t3hlaeAr6sME!6sum8OAkxwC{1PzYRY5J+ObF=1mM1#hYH8{
zS(T5Cq$-i`$z16ZvJ;RgoF=u0mCYu;*8){Ux_1(?C_kB58x&avXcY)0R-AC47%g+m
zAdcm!mMR!?2*9-JX&KHvL`V3Dw+qzE)eHicN{K;7@m*$NI9vJLLh4PBAUaqH)l#EX
zq_>37VF!dE8>JE1vUvH!d2-J5`>yI{9T((F6_^+fL#{1NS|~wD{!Cg>M-lsHPPO3X
z0fh2e9b0VV+$lN*F82vt#Vn<h)I3D7+HgNAE|@-J!+|~&wi#3}E4;q7tq+OTI7I2y
z%61Dbj3U*E%?@_v0ykVq(v67JB(hH9=`2hz=yb9)1t?!Znss7(IFk`_qn1MnezZ|D
z@8+}OQFI_(XksD`QVls+BSUl~!27|MorQ^A&(g5+c$NhWFnXKEaE-Q-W&i|vAMjD=
zs}@hly6w4Ec7qqhgaCO@yZ;-P-C}mOPwtMab0A2}oO+k~Z2roEtJ_D-8-97ktzPa=
zCryrjsXcPWFns@Zb?WudeD(8jdz5Qvv~5h+x=8+B%UwJneR7%O18~#Uz~1oI^)cBI
WR>d8ynVWvIUkmKkJj>&Z^4|aD>a9)y

diff --git a/cnslock/graphics/scroll.h b/cnslock/graphics/scroll.h
deleted file mode 100644
index 3a7282f..0000000
--- a/cnslock/graphics/scroll.h
+++ /dev/null
@@ -1,488 +0,0 @@
-int s_width = 56;
-int s_height = 56;
-
-char s_cmap[256][3] = {
-	{  0,  0,  0},
-	{ 54, 37,  3},
-	{ 56, 39,  3},
-	{218,150, 13},
-	{  6,  4,  0},
-	{177,122, 10},
-	{ 97, 67,  6},
-	{  9,  6,  0},
-	{ 29, 20,  2},
-	{ 26, 18,  2},
-	{ 89, 61,  5},
-	{186,127, 11},
-	{196,134, 11},
-	{123, 85,  7},
-	{236,162, 14},
-	{ 66, 45,  4},
-	{210,144, 12},
-	{ 65, 44,  4},
-	{112, 77,  6},
-	{162,111,  9},
-	{ 49, 34,  3},
-	{ 88, 60,  5},
-	{  4, 55, 29},
-	{108, 74,  6},
-	{ 50, 34,  3},
-	{ 24, 16,  1},
-	{233,160, 13},
-	{ 41, 28,  2},
-	{136, 93,  8},
-	{138, 95,  8},
-	{  6, 79, 41},
-	{ 15,195,102},
-	{ 18,232,121},
-	{  2, 31, 16},
-	{ 90, 62,  5},
-	{225,154, 13},
-	{118, 81,  7},
-	{120, 83,  7},
-	{ 47, 33,  3},
-	{227,156, 13},
-	{ 17, 12,  1},
-	{  4, 48, 25},
-	{ 13,164, 85},
-	{ 14,184, 96},
-	{ 13,172, 90},
-	{  3, 43, 23},
-	{ 67, 46,  4},
-	{113, 78,  7},
-	{106, 73,  6},
-	{ 12,  8,  1},
-	{  1,  0,  0},
-	{168,116, 10},
-	{  1, 17,  9},
-	{ 10,133, 69},
-	{ 17,215,112},
-	{  8, 99, 52},
-	{ 10,128, 67},
-	{195,133, 11},
-	{ 74, 50,  4},
-	{ 56, 38,  3},
-	{  8,102, 53},
-	{ 17,218,113},
-	{ 10,130, 68},
-	{  1, 14,  8},
-	{ 13,167, 87},
-	{  1,  7,  4},
-	{ 80, 55,  5},
-	{201,138, 12},
-	{  7,  5,  0},
-	{ 24, 17,  1},
-	{  1, 13,  7},
-	{ 12,151, 79},
-	{  4, 46, 24},
-	{  5, 70, 37},
-	{ 12,149, 78},
-	{ 14,186, 97},
-	{  5, 65, 34},
-	{  0,  6,  3},
-	{ 14,178, 93},
-	{  6, 77, 40},
-	{  3, 39, 21},
-	{ 12,155, 81},
-	{ 15,193,100},
-	{  5,  4,  0},
-	{131, 90,  8},
-	{ 37, 25,  2},
-	{ 10,124, 65},
-	{ 11,142, 74},
-	{ 17,224,117},
-	{  8,108, 56},
-	{  1,  8,  4},
-	{  3, 33, 17},
-	{ 35, 24,  2},
-	{145, 99,  8},
-	{130, 89,  8},
-	{  3, 36, 19},
-	{ 11,139, 72},
-	{  2, 23, 12},
-	{  7, 93, 49},
-	{ 16,209,109},
-	{  8,107, 56},
-	{241,165, 14},
-	{153,105,  9},
-	{ 32, 22,  2},
-	{ 81, 56,  5},
-	{  9,  6,  1},
-	{  9,119, 62},
-	{ 13,170, 89},
-	{  4, 54, 28},
-	{  5, 62, 32},
-	{121, 83,  7},
-	{242,166, 14},
-	{170,116, 10},
-	{  0,  1,  1},
-	{ 16,201,105},
-	{  7, 85, 44},
-	{  9,116, 60},
-	{ 25, 17,  1},
-	{193,133, 11},
-	{124, 85,  7},
-	{  2, 25, 13},
-	{ 15, 10,  1},
-	{  4, 47, 24},
-	{ 38, 26,  2},
-	{ 48, 33,  3},
-	{104, 72,  6},
-	{ 31, 21,  2},
-	{  6, 72, 37},
-	{ 14,185, 97},
-	{ 18,228,119},
-	{203,139, 12},
-	{ 69, 48,  4},
-	{  2, 29, 15},
-	{ 17,225,117},
-	{  6, 82, 43},
-	{  8,100, 52},
-	{115, 79,  7},
-	{160,110,  9},
-	{142, 98,  8},
-	{ 64, 44,  4},
-	{  8,101, 52},
-	{  7, 84, 44},
-	{103, 71,  6},
-	{  8,  6,  0},
-	{123, 84,  7},
-	{  3,  2,  0},
-	{  2, 22, 11},
-	{ 13,162, 84},
-	{  6, 73, 38},
-	{  5, 66, 34},
-	{148,102,  9},
-	{  4, 50, 26},
-	{  3, 44, 23},
-	{169,116, 10},
-	{ 71, 49,  4},
-	{ 45, 31,  3},
-	{ 82, 56,  5},
-	{ 39, 27,  2},
-	{111, 76,  6},
-	{ 23, 16,  1},
-	{  4, 58, 30},
-	{ 20,171,226},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255},
-	{255,255,255}
-	};
-
-char s_data[] = {
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,70,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,161,161,161,0,0,0,0,161,161,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,0,0,0,
-	161,161,161,161,0,0,161,0,161,161,161,0,0,0,161,161,
-	161,161,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,0,0,161,
-	0,0,0,0,0,0,161,161,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,161,0,0,0,0,161,0,161,
-	0,0,0,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,161,0,0,0,161,0,0,0,0,0,0,161,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,161,161,161,161,0,0,0,
-	161,161,161,161,0,0,161,0,0,0,0,0,0,0,161,161,
-	161,161,0,0,161,161,161,161,161,0,0,161,161,161,161,161,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-	0,0,0,0,0,0,0,0
-	};
diff --git a/cnslock/include/applet.h b/cnslock/include/applet.h
deleted file mode 100644
index 4744a03..0000000
--- a/cnslock/include/applet.h
+++ /dev/null
@@ -1,2 +0,0 @@
-
-void make_new_cnslock_dockapp(int);
diff --git a/cnslock/include/cnslock.h b/cnslock/include/cnslock.h
deleted file mode 100644
index d0103bb..0000000
--- a/cnslock/include/cnslock.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef CNSLOCK_H_
-#define CNSLOCK_H_
-
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include "defines.h"
-
-/* this is the max size of the RGB buffer: 56 * 56 * 3
- * used for memcpy, memset, etc operations */
-#define RGBSIZE (XMAX * YMAX * 3)
-
-/* main dockapp info structure.  windows, buffers, etc */
-typedef struct {
-    Display *display;		/* X11 display */
-    GdkWindow *win;			/* main window */
-    GdkWindow *iconwin;		/* icon window */
-    GdkGC *gc;				/* drawing GC */
-    GdkPixmap *pixmap;		/* main dockapp pixmap */
-    GdkBitmap *mask;		/* dockapp mask */
-
-    /* main image buffer */
-    unsigned char rgb[RGBSIZE];
-
-    /* back buffer - stores things we dont want to redraw all the time */
-    unsigned char bgr[RGBSIZE];
-
-} AppletData;
-
-extern AppletData ad;
-extern int posx;
-extern int posy;
-#endif
-
-
-
diff --git a/cnslock/include/defines.h b/cnslock/include/defines.h
deleted file mode 100644
index 3fe00ae..0000000
--- a/cnslock/include/defines.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef DEFINES_H
-#define DEFINES_H
-
-/* Below this line, there are only defines that users don't have to
-   care about normally.
------------------------------------------------------------------------------*/
-
-/* perform clipping outside this range, also this is the size of the
- * drawing area */
-
-#define XMIN 4
-#define XMAX 56
-#define YMIN 4
-#define YMAX 56
-
-#define WINDOWSIZE_X 64
-#define WINDOWSIZE_Y 64
-
-#endif
-
diff --git a/cnslock/include/kleds.h b/cnslock/include/kleds.h
index 3001054..8e1443c 100644
--- a/cnslock/include/kleds.h
+++ b/cnslock/include/kleds.h
@@ -1,2 +1 @@
-void init_kleds(void);
-int check_kleds(void);
\ No newline at end of file
+int check_kleds(void);
diff --git a/cnslock/kleds.c b/cnslock/kleds.c
index faf2740..da23533 100644
--- a/cnslock/kleds.c
+++ b/cnslock/kleds.c
@@ -6,12 +6,10 @@
 
 #include <stdio.h>
 #include <X11/XKBlib.h>
+#include <libdockapp/dockapp.h>
 
-#include "include/defines.h"
 #include "include/kleds.h"
 
-Display *display;
-
 /*
   Returns the turned on leds:
    Bit 0 is Capslock
@@ -23,15 +21,10 @@ int check_kleds()
 {
     unsigned int states;
 
-    if (XkbGetIndicatorState(display, XkbUseCoreKbd, &states) != Success)
+    if (XkbGetIndicatorState(DADisplay, XkbUseCoreKbd, &states) != Success)
 	{
 		perror("Error while reading Indicator status\n");
 		return -1;
     }
     return (states & 0x7);
 }
-
-void init_kleds()
-{
-    display = XOpenDisplay(NULL);
-}
-- 
2.11.4.GIT