diff --git a/config.h b/config.h
index c0213c6..91eed3f 100644
--- a/config.h
+++ b/config.h
@@ -5,7 +5,7 @@
  *
  * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
  */
-static char *font = "Iosevka Term:style=Regular:pixelsize=14:antialias=true:autohint=true";
+static char *font = "Iosevka Term:pixelsize=14:antialias=true:autohint=true";
 static int borderpx = 5;
 
 /*
@@ -16,7 +16,7 @@ static int borderpx = 5;
  * 4: value of shell in /etc/passwd
  * 5: value of shell in config.h
  */
-static char *shell = "/usr/intel/bin/tcsh";
+static char *shell = "/usr/bin/sh";
 char *utmp = NULL;
 char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
 
@@ -137,29 +137,32 @@ static const char *colorname[] = {
     // [257] = "#4D0D0C", /* foreground */
 
     /* Theme: Day After Tomorrow */
+    /*         Light        Dark  */
     /* 8 normal colors */
-    [0]  = "#000000", /* black   */
-    [1]  = "#AF2323", /* red     */
-    [2]  = "#069A02", /* green   */
-    [3]  = "#B9C901", /* yellow  */
-    [4]  = "#013C9B", /* blue    */
-    [5]  = "#74069C", /* magenta */
-    [6]  = "#04666C", /* cyan    */
-    [7]  = "#BBBBBB", /* gray    */
+    [0]  =  /* "#000000" */ "#000000"   , /* black   */
+    [1]  =  /* "#AF2323" */ "#CF3333"   , /* red     */
+    [2]  =  /* "#069A02" */ "#26BA22"   , /* green   */
+    [3]  =  /* "#B9C901" */ "#B9E921"   , /* yellow  */
+    [4]  =  /* "#013C9B" */ "#215CBB"   , /* blue    */
+    [5]  =  /* "#74069C" */ "#B446DC"   , /* magenta */
+    [6]  =  /* "#04666C" */ "#24868C"   , /* cyan    */
+    [7]  =  /* "#BBBBBB" */ "#DBDBDB"   , /* gray    */
 
     /* 8 bright colors */
-    [8]  = "#000000", /* black   */
-    [9]  = "#DE0707", /* red     */
-    [10] = "#05C90F", /* green   */
-    [11] = "#DDDF04", /* yellow  */
-    [12] = "#0656DA", /* blue    */
-    [13] = "#8407D1", /* magenta */
-    [14] = "#05959E", /* cyan    */
-    [15] = "#CCCCCC", /* gray    */
+    [8]  =  /* "#000000" */ "#000000"   , /* black   */
+    [9]  =  /* "#DE0707" */ "#DE0707"   , /* red     */
+    [10] =  /* "#05C90F" */ "#05C90F"   , /* green   */
+    [11] =  /* "#DDDF04" */ "#DDDF04"   , /* yellow  */
+    [12] =  /* "#0656DA" */ "#0656DA"   , /* blue    */
+    [13] =  /* "#8407D1" */ "#8407D1"   , /* magenta */
+    [14] =  /* "#05959E" */ "#05959E"   , /* cyan    */
+    [15] =  /* "#CCCCCC" */ "#EEEEEE"   , /* gray    */
 
     /* special colors */
-    [256] = "#111111", /* foreground */
-    [257] = "#FFFFFF", /* background */
+    /* Dark */
+    [256] = /* "#111111" */ "#FFFFFF"   , /* foreground */
+    [257] = /* "#FFFFFF" */ "#111111"   , /* background */
+
     [258] = "#4D0D0C", /* cursor */
 };
 
diff --git a/config.mk b/config.mk
index 4027463..7aba6e9 100644
--- a/config.mk
+++ b/config.mk
@@ -4,21 +4,21 @@ VERSION = 0.8.2
 # Customize below to fit your system
 
 # paths
-PREFIX = /p/acd/proj/work/fe/masolkar/apps
+PREFIX = /home/mahesh/apps/install
 MANPREFIX = $(PREFIX)/share/man
 
-X11INC = /usr/intel/pkgs/X11/R7.6/include
-X11LIB = /usr/intel/pkgs/X11/R7.6/lib
+X11INC = /usr/X11R6/include
+X11LIB = /usr/X11R6/lib
 
 PKG_CONFIG = pkg-config
 
-# freetype
-FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC = /usr/include/freetype2
-
 # includes and libs
-INCS = -I$(X11INC) -I${FREETYPEINC}
-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil ${FREETYPELIBS}
+INCS = -I$(X11INC) \
+       `$(PKG_CONFIG) --cflags fontconfig` \
+       `$(PKG_CONFIG) --cflags freetype2`
+LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
+       `$(PKG_CONFIG) --libs fontconfig` \
+       `$(PKG_CONFIG) --libs freetype2`
 
 # flags
 STCPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600