diff --git a/dwm-gaps/config.h b/dwm-gaps/config.h
index bc04eec..65c9d55 100644
--- a/dwm-gaps/config.h
+++ b/dwm-gaps/config.h
@@ -35,7 +35,18 @@ static const char *colors[][3]      = {
 };
 
 /* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+//static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+static const char *tags[] = {
+  TAGN1 ,
+  TAGN2 ,
+  TAGN3 ,
+  TAGN4 ,
+  TAGN5 ,
+  TAGN6 ,
+  TAGN7 ,
+  TAGN8 ,
+  TAGN9 ,
+};
 
 static const Rule rules[] = {
 	/* xprop(1):
diff --git a/style.h b/style.h
index 0968ed7..f4ae152 100644
--- a/style.h
+++ b/style.h
@@ -2,8 +2,8 @@
 #define GAP_PX       14
 #define TOPBAR       1
 //#define FONT         "Overpass Mono"
-//#define FONT         "Envy Code R"
-#define FONT         "DejaVu Sans Mono"
+#define FONT         "Envy Code R"
+//#define FONT         "DejaVu Sans Mono"
 //#define FONTSIZE     "12"
 #define FONTSIZE     "12"
 #define FONTAWSMSIZE "14"
@@ -12,7 +12,17 @@
 #define ST_ALPHA     180
 #define TERMINAL     "st-82"
 
-#define CLSCHM       1
+#define CLSCHM       0
+
+#define TAGN1        "1"
+#define TAGN2        "2"
+#define TAGN3        "3"
+#define TAGN4        "4"
+#define TAGN5        "5"
+#define TAGN6        "6"
+#define TAGN7        "7"
+#define TAGN8        "8"
+#define TAGN9        "9"
 
 #if CLSCHM == 0
   #define SC0          "#2d332d"//background
@@ -25,15 +35,15 @@
   #define SC7          "#cbe6cb"//foreground
   #define SC8          "#5ca77e"//mediumground
 #elif CLSCHM == 1
-  #define SC0          "#2c2828"//background
-  #define SC1          "#cc0814"//red
-  #define SC2          "#cca070"//green
-  #define SC3          "#f1ef49"//yellow
-  #define SC4          "#7088a0"//blue
-  #define SC5          "#f67fd8"//pink
-  #define SC6          "#a4b0c0"//cyan
-  #define SC7          "#cdbbbb"//foreground
-  #define SC8          "#5e5555"//mediumground
+  #define SC0          "#403b36"//background
+  #define SC1          "#f23d0c"//red
+  #define SC2          "#59b285"//green
+  #define SC3          "#ebb200"//yellow
+  #define SC4          "#5f9fbf"//blue
+  #define SC5          "#eba782"//pink
+  #define SC6          "#0accb7"//cyan
+  #define SC7          "#ccbfad"//foreground
+  #define SC8          "#a59b8c"//mediumground
 #elif CLSCHM == 2
   #define SC0          "#2c2828"//background
   #define SC1          "#cc0814"//red