cicada update

10 files changed, 80 insertions, 450 deletions

diff --git a/dwm/config.def.h b/dwm/config.def.h
index eb81236..39d0368 100755
--- a/dwm/config.def.h
+++ b/dwm/config.def.h
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "themes/connect.h"
+#include "themes/veloren.h"
 
 /* appearance */
 static const unsigned int borderpx  = 1;        /* border pixel of windows */
@@ -51,7 +51,7 @@ static const Layout layouts[] = {
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL };
+static const char *dmenucmd[] = { "dmenu_run", NULL };
 static const char *termcmd[]  = { "st", NULL };
 
 static const Key keys[] = {
diff --git a/dwm/config.h b/dwm/config.h
index 39d0368..c13f153 100755
--- a/dwm/config.h
+++ b/dwm/config.h
@@ -1,15 +1,16 @@
 /* See LICENSE file for copyright and license details. */
-#include "themes/veloren.h"
+#include "themes/cicada.h"
 
 /* appearance */
 static const unsigned int borderpx  = 1;        /* border pixel of windows */
-static const unsigned int gappx     = 24;        /* gap pixel between windows */
+static const unsigned int gappx     = 16;        /* gap pixel between windows */
 static const unsigned int snap      = 32;       /* snap pixel */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
 static const char *fonts[]          = { "monospace:size=10" };
 static const char dmenufont[]       = "monospace:size=10";
-static unsigned int baralpha        = 0xd0;
+static unsigned int baralpha        = 0xff;
+//static unsigned int baralpha        = 0xd0;
 static unsigned int borderalpha     = OPAQUE;
 
 /* tagging */
diff --git a/dwm/dwm b/dwm/dwm
index 8ecfddd..3b9fac7 100755
--- a/dwm/dwm
+++ b/dwm/dwm
diff --git a/dwm/dwm-alpha-6.4.diff b/dwm/dwm-alpha-6.4.diff
deleted file mode 100644
index ad4b2b7..0000000
--- a/dwm/dwm-alpha-6.4.diff
+++ /dev/null
@@ -1,282 +0,0 @@
-From 4ee637701f1144e07338d5990fecb3dc44982223 Mon Sep 17 00:00:00 2001
-From: NekoCWD <nekodevelopper@gmail.com>
-Date: Fri, 27 Jan 2023 21:59:15 +0300
-Subject: [PATCH] [dwm] update 'alpha' path for dwm6.4
-
----
- config.def.h |  2 ++
- config.mk    |  2 +-
- drw.c        | 27 +++++++++++-----------
- drw.h        |  9 +++++---
- dwm.c        | 63 +++++++++++++++++++++++++++++++++++++++++++++++-----
- 5 files changed, 80 insertions(+), 23 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 061ad66..3a4236d 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -7,6 +7,8 @@ static const int showbar            = 1;        /* 0 means no bar */
- static const int topbar             = 1;        /* 0 means bottom bar */
- static const char *fonts[]          = { "monospace:size=10" };
- static const char dmenufont[]       = "monospace:size=10";
-+static unsigned int baralpha        = 0xd0;
-+static unsigned int borderalpha     = OPAQUE;
- static const char col_gray1[]       = "#222222";
- static const char col_gray2[]       = "#444444";
- static const char col_gray3[]       = "#bbbbbb";
-diff --git a/config.mk b/config.mk
-index ef8acf7..6d41560 100644
---- a/config.mk
-+++ b/config.mk
-@@ -23,7 +23,7 @@ FREETYPEINC = /usr/include/freetype2
- 
- # includes and libs
- INCS = -I${X11INC} -I${FREETYPEINC}
--LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender
- 
- # flags
- CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-diff --git a/drw.c b/drw.c
-index a58a2b4..10e39f9 100644
---- a/drw.c
-+++ b/drw.c
-@@ -61,7 +61,7 @@ utf8decode(const char *c, long *u, size_t clen)
- }
- 
- Drw *
--drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
-+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
- {
- 	Drw *drw = ecalloc(1, sizeof(Drw));
- 
-@@ -70,8 +70,11 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
- 	drw->root = root;
- 	drw->w = w;
- 	drw->h = h;
--	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
--	drw->gc = XCreateGC(dpy, root, 0, NULL);
-+	drw->visual = visual;
-+	drw->depth = depth;
-+	drw->cmap = cmap;
-+	drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
-+	drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
- 	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
- 
- 	return drw;
-@@ -87,7 +90,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
- 	drw->h = h;
- 	if (drw->drawable)
- 		XFreePixmap(drw->dpy, drw->drawable);
--	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
-+	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
- }
- 
- void
-@@ -181,21 +184,20 @@ drw_fontset_free(Fnt *font)
- }
- 
- void
--drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
-+drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha)
- {
- 	if (!drw || !dest || !clrname)
- 		return;
--
--	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
--	                       DefaultColormap(drw->dpy, drw->screen),
-+  if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap,
- 	                       clrname, dest))
- 		die("error, cannot allocate color '%s'", clrname);
-+  dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24);
- }
- 
- /* Wrapper to create color schemes. The caller has to call free(3) on the
-  * returned color scheme when done using it. */
- Clr *
--drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
-+drw_scm_create(Drw *drw, const char *clrnames[], unsigned int clralphas[], size_t clrcount)
- {
- 	size_t i;
- 	Clr *ret;
-@@ -205,7 +207,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
- 		return NULL;
- 
- 	for (i = 0; i < clrcount; i++)
--		drw_clr_create(drw, &ret[i], clrnames[i]);
-+		drw_clr_create(drw, &ret[i], clrnames[i], clralphas[i]);
- 	return ret;
- }
- 
-@@ -263,9 +265,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
- 	} else {
- 		XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
- 		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
--		d = XftDrawCreate(drw->dpy, drw->drawable,
--		                  DefaultVisual(drw->dpy, drw->screen),
--		                  DefaultColormap(drw->dpy, drw->screen));
-+    d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
-+
- 		x += lpad;
- 		w -= lpad;
- 	}
-diff --git a/drw.h b/drw.h
-index 6471431..51dc017 100644
---- a/drw.h
-+++ b/drw.h
-@@ -20,6 +20,9 @@ typedef struct {
- 	Display *dpy;
- 	int screen;
- 	Window root;
-+	Visual *visual;
-+	unsigned int depth;
-+	Colormap cmap;
- 	Drawable drawable;
- 	GC gc;
- 	Clr *scheme;
-@@ -27,7 +30,7 @@ typedef struct {
- } Drw;
- 
- /* Drawable abstraction */
--Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
-+Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual*, unsigned int, Colormap);
- void drw_resize(Drw *drw, unsigned int w, unsigned int h);
- void drw_free(Drw *drw);
- 
-@@ -39,8 +42,8 @@ unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int
- void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
- 
- /* Colorscheme abstraction */
--void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
--Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
-+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha);
-+Clr *drw_scm_create(Drw *drw, const char *clrnames[], unsigned int clralphas[], size_t clrcount);
- 
- /* Cursor abstraction */
- Cur *drw_cur_create(Drw *drw, int shape);
-diff --git a/dwm.c b/dwm.c
-index e5efb6a..708ca43 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -57,6 +57,10 @@
- #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
- 
-+#define OPAQUE                  0xffU
-+
-+#define OPAQUE                  0xffU
-+
- /* enums */
- enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
- enum { SchemeNorm, SchemeSel }; /* color schemes */
-@@ -233,6 +237,7 @@ static Monitor *wintomon(Window w);
- static int xerror(Display *dpy, XErrorEvent *ee);
- static int xerrordummy(Display *dpy, XErrorEvent *ee);
- static int xerrorstart(Display *dpy, XErrorEvent *ee);
-+static void xinitvisual();
- static void zoom(const Arg *arg);
- 
- /* variables */
-@@ -269,6 +274,11 @@ static Drw *drw;
- static Monitor *mons, *selmon;
- static Window root, wmcheckwin;
- 
-+static int useargb = 0;
-+static Visual *visual;
-+static int depth;
-+static Colormap cmap;
-+
- /* configuration, allows nested code to access above variables */
- #include "config.h"
- 
-@@ -1542,7 +1552,8 @@ setup(void)
- 	sw = DisplayWidth(dpy, screen);
- 	sh = DisplayHeight(dpy, screen);
- 	root = RootWindow(dpy, screen);
--	drw = drw_create(dpy, screen, root, sw, sh);
-+  xinitvisual();
-+	drw = drw_create(dpy, screen, root, sw, sh, visual, depth, cmap);
- 	if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
- 		die("no fonts could be loaded.");
- 	lrpad = drw->fonts->h;
-@@ -1569,8 +1580,9 @@ setup(void)
- 	cursor[CurMove] = drw_cur_create(drw, XC_fleur);
- 	/* init appearance */
- 	scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
-+  unsigned int alphas[] = {borderalpha, baralpha, OPAQUE};
- 	for (i = 0; i < LENGTH(colors); i++)
--		scheme[i] = drw_scm_create(drw, colors[i], 3);
-+		scheme[i] = drw_scm_create(drw, colors[i], alphas, 3);
- 	/* init bars */
- 	updatebars();
- 	updatestatus();
-@@ -1803,16 +1815,18 @@ updatebars(void)
- 	Monitor *m;
- 	XSetWindowAttributes wa = {
- 		.override_redirect = True,
--		.background_pixmap = ParentRelative,
-+		.background_pixel = 0,
-+		.border_pixel = 0,
-+		.colormap = cmap,
- 		.event_mask = ButtonPressMask|ExposureMask
- 	};
- 	XClassHint ch = {"dwm", "dwm"};
- 	for (m = mons; m; m = m->next) {
- 		if (m->barwin)
- 			continue;
--		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
--				CopyFromParent, DefaultVisual(dpy, screen),
--				CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-+		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, depth,
-+		                          InputOutput, visual,
-+		                          CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
- 		XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
- 		XMapRaised(dpy, m->barwin);
- 		XSetClassHint(dpy, m->barwin, &ch);
-@@ -2110,6 +2124,43 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
- 	return -1;
- }
- 
-+void
-+xinitvisual()
-+{
-+	XVisualInfo *infos;
-+	XRenderPictFormat *fmt;
-+	int nitems;
-+	int i;
-+
-+	XVisualInfo tpl = {
-+		.screen = screen,
-+		.depth = 32,
-+		.class = TrueColor
-+	};
-+	long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
-+
-+	infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
-+	visual = NULL;
-+	for(i = 0; i < nitems; i ++) {
-+		fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
-+		if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
-+			visual = infos[i].visual;
-+			depth = infos[i].depth;
-+			cmap = XCreateColormap(dpy, root, visual, AllocNone);
-+			useargb = 1;
-+			break;
-+		}
-+	}
-+
-+	XFree(infos);
-+
-+	if (! visual) {
-+		visual = DefaultVisual(dpy, screen);
-+		depth = DefaultDepth(dpy, screen);
-+		cmap = DefaultColormap(dpy, screen);
-+	}
-+}
-+
- void
- zoom(const Arg *arg)
- {
--- 
-2.39.1
-
diff --git a/dwm/dwm-gaps-6.0.diff b/dwm/dwm-gaps-6.0.diff
deleted file mode 100755
index 80e1c8d..0000000
--- a/dwm/dwm-gaps-6.0.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/config.def.h b/config.def.h
-index 77ff358..a4e496b 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -9,6 +9,7 @@ static const char selbordercolor[]  = "#005577";
- static const char selbgcolor[]      = "#005577";
- static const char selfgcolor[]      = "#eeeeee";
- static const unsigned int borderpx  = 1;        /* border pixel of windows */
-+static const unsigned int gappx     = 1;        /* gap pixel between windows */
- static const unsigned int snap      = 32;       /* snap pixel */
- static const Bool showbar           = True;     /* False means no bar */
- static const Bool topbar            = True;     /* False means bottom bar */
-diff --git a/dwm.c b/dwm.c
-index 1d78655..6cc96ff 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -1703,7 +1703,7 @@ textnw(const char *text, unsigned int len) {
- 
- void
- tile(Monitor *m) {
--	unsigned int i, n, h, mw, my, ty;
-+	unsigned int i, n, h, r, g = 0, mw, my, ty;
- 	Client *c;
- 
- 	for(n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-@@ -1711,19 +1711,21 @@ tile(Monitor *m) {
- 		return;
- 
- 	if(n > m->nmaster)
--		mw = m->nmaster ? m->ww * m->mfact : 0;
-+		mw = m->nmaster ? (m->ww - (g = gappx)) * m->mfact : 0;
- 	else
- 		mw = m->ww;
- 	for(i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
- 		if(i < m->nmaster) {
--			h = (m->wh - my) / (MIN(n, m->nmaster) - i);
-+			r = MIN(n, m->nmaster) - i;
-+			h = (m->wh - my - gappx * (r - 1)) / r;
- 			resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), False);
--			my += HEIGHT(c);
-+			my += HEIGHT(c) + gappx;
- 		}
- 		else {
--			h = (m->wh - ty) / (n - i);
--			resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), False);
--			ty += HEIGHT(c);
-+			r = n - i;
-+			h = (m->wh - ty - gappx * (r - 1)) / r;
-+			resize(c, m->wx + mw + g, m->wy + ty, m->ww - mw - g - (2*c->bw), h - (2*c->bw), False);
-+			ty += HEIGHT(c) + gappx;
- 		}
- }
- 
diff --git a/dwm/dwm-uselessgap-20211119-58414bee958f2.diff b/dwm/dwm-uselessgap-20211119-58414bee958f2.diff
deleted file mode 100755
index f8a3aec..0000000
--- a/dwm/dwm-uselessgap-20211119-58414bee958f2.diff
+++ /dev/null
@@ -1,101 +0,0 @@
-From 58414bee958f2e7ed91d6fe31f503ec4a406981b Mon Sep 17 00:00:00 2001
-From: cirala <thim@cederlund.de>
-Date: Fri, 19 Nov 2021 18:14:07 +0100
-Subject: [PATCH] Fix for dwm-uselessgap
-Previous versions of the patch doubles the
-gap between the master and slave stacks.
-
----
- config.def.h |  3 ++-
- dwm.c        | 38 +++++++++++++++++++++++++++++++-------
- 2 files changed, 33 insertions(+), 8 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index a2ac963..17a205f 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -2,6 +2,7 @@
-
- /* appearance */
- static const unsigned int borderpx  = 1;        /* border pixel of windows */
-+static const unsigned int gappx     = 6;        /* gaps between windows */
- static const unsigned int snap      = 32;       /* snap pixel */
- static const int showbar            = 1;        /* 0 means no bar */
- static const int topbar             = 1;        /* 0 means bottom bar */
-@@ -34,7 +35,7 @@ static const Rule rules[] = {
- /* layout(s) */
- static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
- static const int nmaster     = 1;    /* number of clients in master area */
--static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
-+static const int resizehints = 0;    /* 1 means respect size hints in tiled resizals */
- static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
-
- static const Layout layouts[] = {
-diff --git a/dwm.c b/dwm.c
-index 5e4d494..b626e89 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -52,8 +52,8 @@
- #define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
- #define LENGTH(X)               (sizeof X / sizeof X[0])
- #define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
--#define WIDTH(X)                ((X)->w + 2 * (X)->bw)
--#define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
-+#define WIDTH(X)                ((X)->w + 2 * (X)->bw + gappx)
-+#define HEIGHT(X)               ((X)->h + 2 * (X)->bw + gappx)
- #define TAGMASK                 ((1 << LENGTH(tags)) - 1)
- #define TEXTW(X)                (drw_fontset_getwidth(drw, (X)) + lrpad)
-
-@@ -1277,12 +1277,36 @@ void
- resizeclient(Client *c, int x, int y, int w, int h)
- {
- 	XWindowChanges wc;
-+	unsigned int n;
-+	unsigned int gapoffset;
-+	unsigned int gapincr;
-+	Client *nbc;
-
--	c->oldx = c->x; c->x = wc.x = x;
--	c->oldy = c->y; c->y = wc.y = y;
--	c->oldw = c->w; c->w = wc.width = w;
--	c->oldh = c->h; c->h = wc.height = h;
- 	wc.border_width = c->bw;
-+
-+	/* Get number of clients for the client's monitor */
-+	for (n = 0, nbc = nexttiled(c->mon->clients); nbc; nbc = nexttiled(nbc->next), n++);
-+
-+	/* Do nothing if layout is floating */
-+	if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
-+		gapincr = gapoffset = 0;
-+	} else {
-+		/* Remove border and gap if layout is monocle or only one client */
-+		if (c->mon->lt[c->mon->sellt]->arrange == monocle || n == 1) {
-+			gapoffset = 0;
-+			gapincr = -2 * borderpx;
-+			wc.border_width = 0;
-+		} else {
-+			gapoffset = gappx;
-+			gapincr = 2 * gappx;
-+		}
-+	}
-+
-+	c->oldx = c->x; c->x = wc.x = x + gapoffset;
-+	c->oldy = c->y; c->y = wc.y = y + gapoffset;
-+	c->oldw = c->w; c->w = wc.width = w - gapincr;
-+	c->oldh = c->h; c->h = wc.height = h - gapincr;
-+
- 	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
- 	configure(c);
- 	XSync(dpy, False);
-@@ -1688,7 +1712,7 @@ tile(Monitor *m)
- 	for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
- 		if (i < m->nmaster) {
- 			h = (m->wh - my) / (MIN(n, m->nmaster) - i);
--			resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
-+			resize(c, m->wx, m->wy + my, mw - (2*c->bw) + (n > 1 ? gappx : 0), h - (2*c->bw), 0);
- 			if (my + HEIGHT(c) < m->wh)
- 				my += HEIGHT(c);
- 		} else {
---
-2.33.1
-
diff --git a/dwm/dwm.o b/dwm/dwm.o
index b29b525..b712e9d 100644
--- a/dwm/dwm.o
+++ b/dwm/dwm.o
diff --git a/dwm/themes/cicada.h b/dwm/themes/cicada.h
new file mode 100644
index 0000000..b26930d
--- /dev/null
+++ b/dwm/themes/cicada.h
@@ -0,0 +1,32 @@
+static const char norm_fg[] = "#fff";
+static const char norm_bg[] = "#222";
+//static const char norm_border[] = "#860";
+static const char norm_border[] = "#444";
+
+static const char sel_fg[] = "#fff";
+static const char sel_bg[] = "#000";
+//static const char sel_border[] = "#862";
+static const char sel_border[] = "#fff";
+
+static const char urg_fg[] = "#dcbdbd";
+static const char urg_bg[] = "#B76779";
+static const char urg_border[] = "#B76779";
+
+static const char *colors[][3]      = {
+    /*               fg           bg         border                         */
+    [SchemeNorm] = { norm_fg,     norm_bg,   norm_border }, // unfocused wins
+    [SchemeSel]  = { sel_fg,      sel_bg,    sel_border },  // the focused win
+//    [SchemeUrg] =  { urg_fg,      urg_bg,    urg_border },
+};
+
+//static const char col_gray1[]		= "#000000";
+//static const char col_gray2[]		= "#9a8484";
+//static const char col_gray3[]		= "#dcbdbd";
+//static const char col_gray4[]		= "#dcbdbd";
+//static const char col_cyan[]		= "#C16A7F";
+//
+static const char col_gray1[]		= "#000";
+static const char col_gray2[]		= "#000";
+static const char col_gray3[]		= "#000";
+static const char col_gray4[]		= "#000";
+static const char col_cyan[]		= "#000";
diff --git a/dwm/themes/veloren.def.h b/dwm/themes/veloren.def.h
new file mode 100644
index 0000000..153aaba
--- /dev/null
+++ b/dwm/themes/veloren.def.h
@@ -0,0 +1,25 @@
+static const char norm_fg[] = "#fff";
+static const char norm_bg[] = "#000000";
+static const char norm_border[] = "#862";
+
+static const char sel_fg[] = "#fff";
+static const char sel_bg[] = "#652";
+//static const char sel_border[] = "#862";
+static const char sel_border[] = "#fff";
+
+static const char urg_fg[] = "#dcbdbd";
+static const char urg_bg[] = "#B76779";
+static const char urg_border[] = "#B76779";
+
+static const char *colors[][3]      = {
+    /*               fg           bg         border                         */
+    [SchemeNorm] = { norm_fg,     norm_bg,   norm_border }, // unfocused wins
+    [SchemeSel]  = { sel_fg,      sel_bg,    sel_border },  // the focused win
+//    [SchemeUrg] =  { urg_fg,      urg_bg,    urg_border },
+};
+
+static const char col_gray1[]		= "#000000";
+static const char col_gray2[]		= "#9a8484";
+static const char col_gray3[]		= "#dcbdbd";
+static const char col_gray4[]		= "#dcbdbd";
+static const char col_cyan[]		= "#C16A7F";
diff --git a/dwm/themes/veloren.h b/dwm/themes/veloren.h
index 4b096e8..b26930d 100644
--- a/dwm/themes/veloren.h
+++ b/dwm/themes/veloren.h
@@ -1,10 +1,12 @@
 static const char norm_fg[] = "#fff";
-static const char norm_bg[] = "#000000";
-static const char norm_border[] = "#862";
+static const char norm_bg[] = "#222";
+//static const char norm_border[] = "#860";
+static const char norm_border[] = "#444";
 
 static const char sel_fg[] = "#fff";
-static const char sel_bg[] = "#652";
-static const char sel_border[] = "#862";
+static const char sel_bg[] = "#000";
+//static const char sel_border[] = "#862";
+static const char sel_border[] = "#fff";
 
 static const char urg_fg[] = "#dcbdbd";
 static const char urg_bg[] = "#B76779";
@@ -17,8 +19,14 @@ static const char *colors[][3]      = {
 //    [SchemeUrg] =  { urg_fg,      urg_bg,    urg_border },
 };
 
-static const char col_gray1[]		= "#000000";
-static const char col_gray2[]		= "#9a8484";
-static const char col_gray3[]		= "#dcbdbd";
-static const char col_gray4[]		= "#dcbdbd";
-static const char col_cyan[]		= "#C16A7F";
+//static const char col_gray1[]		= "#000000";
+//static const char col_gray2[]		= "#9a8484";
+//static const char col_gray3[]		= "#dcbdbd";
+//static const char col_gray4[]		= "#dcbdbd";
+//static const char col_cyan[]		= "#C16A7F";
+//
+static const char col_gray1[]		= "#000";
+static const char col_gray2[]		= "#000";
+static const char col_gray3[]		= "#000";
+static const char col_gray4[]		= "#000";
+static const char col_cyan[]		= "#000";