diff --git a/i3wm/config b/i3wm/config
index 8a19712..420dc48 100644
--- a/i3wm/config
+++ b/i3wm/config
@@ -13,7 +13,7 @@
 #############################################
 
 # font
-set $font "pango:RobotoMono 10"
+set $font "pango:Droid Sans Mono for Powerline 10"
 font $font
 
 # floating modifier
@@ -23,11 +23,18 @@ set $mod mod4
 floating_modifier $mod
 
 # remove window decorations
-new_window pixel
+#new_window pixel
 
 # focus follows mouse
 focus_follows_mouse yes
 
+#gaps
+gaps inner 13
+gaps outer 5
+#
+##border
+new_window pixel 3
+
 
 #############################################
 #              Script Section               #
@@ -53,9 +60,9 @@ bindym XF86WebCam               exec /bin/cheese
 bindsym XF86Launch1             exec  urxvt -e sh -c "sudo wifi-menu wlp3s0"
 
 # jauth two factor authenticator
-bindsym $mod+F1                 exec ~/.i3/util/Authenticator.sh google
-bindsym $mod+F2                 exec ~/.i3/util/Authenticator.sh facebook
-bindsym $mod+F3                 exec ~/.i3/util/Authenticator.sh dropbox
+bindsym $mod+F1                 exec /opt/JAuth/authenticator.sh google
+bindsym $mod+F2                 exec /opt/JAuth/authenticator.sh facebook
+bindsym $mod+F3                 exec /opt/JAuth/authenticator.sh dropbox
 
 # start dmenu-launcher
 bindsym $mod+d                  exec ~/.i3/util/i3dmenu-wrapper.sh
@@ -135,10 +142,10 @@ bindsym $mod+x                  move scratchpad
 #############################################
 
 # name for the workspaces
-set $tag1 "1 Terminal"
-set $tag2 "2 Internet"
-set $tag3 "3 Coding"
-set $tag4 "4 Music"
+set $tag1 "Terminal"
+set $tag2 "Internet"
+set $tag3 "Coding"
+set $tag4 "Music"
 
 # switch to workspace
 bindsym $mod+1                  workspace $tag1
@@ -184,18 +191,38 @@ mode "resize" {
 #                 Colors                    #
 #############################################
 
-# colorscheme
+# Darkbrown colorscheme
 set $DARKBROWN      #402e2e
 set $LIGHTBROWN     #978965
 set $DARKGREY       #1f1f1f
 set $DARKRED        #9b0e0e
 
-# name                  #top        #border     #text
-client.focused          $DARKBROWN  $LIGHTBROWN $DARKBROWN
-client.unfocused        $DARKBROWN  $DARKBROWN  $LIGHTBROWN
-client.focused_inactive $DARKBROWN  $DARKBROWN  $LIGHTBROWN
-client.urgent           $DARKBROWN  $DARKBROWN  $LIGHTBROWN
+# Solarized colorscheme
+set $BACKGROUND     #002b36
+set $FOREGROUND     #93a1a1
+set $LIGHTGREY      #dc322f
+set $GREEN          #859900
+set $BROWN          #b58900
+set $BLUE           #268bd2
+set $VIOLET         #6c71c4
+set $MAGENTA        #2aa198
+set $WHITE          #fdf6e3
 
+client.background       #ffffff
+
+# Darkbrown colorscheme
+# name                  #border     #background  #text        #indicator   #child_border
+#client.focused          $DARKBROWN  $LIGHTBROWN  $DARKBROWN   $LIGHTBROWN  $DARKBROWN
+#client.unfocused        $DARKBROWN  $DARKBROWN   $LIGHTBROWN  $LIGHTBROWN  $DARKBROWN
+#client.focused_inactive $DARKBROWN  $DARKBROWN   $LIGHTBROWN  $LIGHTBROWN  $DARKBROWN
+#client.urgent           $DARKBROWN  $DARKBROWN   $LIGHTBROWN  $LIGHTBROWN  $DARKBROWN
+
+# Solarized colorscheme
+# name                  #border     #background   #text         #indicator   #child_border
+client.focused          $MAGENTA    $FOREGROUND   $FOREGROUND   $GREEN       $MAGENTA
+client.unfocused        $LIGHTGREY  $BACKGROUND   $BACKGROUND   $GREEN       $BACKGROUND
+client.focused_inactive $LIGHTGREY  $BACKGROUND   $BACKGROUND   $GREEN       $BACKGROUND
+client.urgent           $LIGHTGREY  $BACKGROUND   $BACKGROUND   $GREEN       $BACKGROUND
 
 #############################################
 #                 i3-bar                    #
@@ -207,17 +234,31 @@ bar {
     i3bar_command           /usr/bin/i3bar
     status_command          i3status -c ~/.i3/i3status.conf
     separator_symbol        ".::"
-    
-    colors {
-        statusline  $LIGHTBROWN
-        background  $DARKGREY
-        separator   $DARKRED
 
-        # name             #border      #bg         #text
-        focused_workspace  $LIGHTBROWN  $DARKBROWN  $LIGHTBROWN
-        active_workspace   $DARKBROWN   $DARKBROWN  $LIGHTBROWN
-        inactive_workspace $DARKBROWN   $DARKBROWN  $LIGHTBROWN
-        urgent_workspace   $DARKBROWN   $DARKBROWN  $LIGHTBROWN
+# Darkbrown colorscheme
+#    colors {
+#        statusline  $LIGHTBROWN
+#        background  $DARKGREY
+#        separator   $DARKRED
+#
+#        # name             #border      #bg         #text
+#        focused_workspace  $LIGHTBROWN  $DARKBROWN  $LIGHTBROWN
+#        active_workspace   $DARKBROWN   $DARKBROWN  $LIGHTBROWN
+#        inactive_workspace $DARKBROWN   $DARKBROWN  $LIGHTBROWN
+#        urgent_workspace   $DARKBROWN   $DARKBROWN  $LIGHTBROWN
+#  }
+
+# Solarized colorscheme
+    colors {
+        statusline  $GREEN
+        background  $BACKGROUND
+        separator   $MAGENTA
+
+        # name             #border     #bg         #text
+        focused_workspace  $MAGENTA    $BACKGROUND $GREEN
+        active_workspace   $BACKGROUND $BACKGROUND $GREEN
+        inactive_workspace $BACKGROUND $BACKGROUND $GREEN
+        urgent_workspace   $BACKGROUND $BACKGROUND $GREEN
   }
 }
 
diff --git a/i3wm/util/i3dmenu-wrapper.sh b/i3wm/util/i3dmenu-wrapper.sh
index 9ef8d21..eec3d42 100755
--- a/i3wm/util/i3dmenu-wrapper.sh
+++ b/i3wm/util/i3dmenu-wrapper.sh
@@ -1,18 +1,8 @@
 #!/bin/bash
 
-########################################################
-#      _                         __          _______   #
-#     | |                        \ \        / /  __ \  #
-#   __| |_ __ ___   ___ _ __  _   \ \  /\  / /| |__) | #
-#  / _` | '_ ` _ \ / _ \ '_ \| | | \ \/  \/ / |  _  /  #
-# | (_| | | | | | |  __/ | | | |_| |\  /\  /  | | \ \  #
-#  \__,_|_| |_| |_|\___|_| |_|\__,_| \/  \/   |_|  \_\ #
-#                                                      #
-########################################################
+BG="#002b36"
+FG="#93a1a1"
+SBG="#6c71c4"
+SFG="#93a1a1"
 
-BACKGROUND="#402e2e"
-FOREGOURND="#978965"
-SELECTED_BACKGROUND="#808080"
-SELECTED_FOREGROUND="#ffff00"
-
-i3-dmenu-desktop --dmenu='dmenu -i -nb '#402e2e' -nf '#978965' -sb '#808080' -sf '#ffff00' -l 8'
+i3-dmenu-desktop --dmenu="dmenu -i -nb $BG -nf $FG -sb $SBG -sf $SFG -l 16"
diff --git a/wallpapers/alien2.jpg b/wallpapers/alien2.jpg
deleted file mode 100644
index 1255034..0000000
Binary files a/wallpapers/alien2.jpg and /dev/null differ
diff --git a/wallpapers/city.png b/wallpapers/city.png
deleted file mode 100644
index 14f3364..0000000
Binary files a/wallpapers/city.png and /dev/null differ
diff --git a/wallpapers/dark.jpg b/wallpapers/dark.jpg
deleted file mode 100644
index c82255d..0000000
Binary files a/wallpapers/dark.jpg and /dev/null differ
diff --git a/wallpapers/dark1.jpg b/wallpapers/dark1.jpg
deleted file mode 100644
index f3feb0d..0000000
Binary files a/wallpapers/dark1.jpg and /dev/null differ
diff --git a/wallpapers/dark6.jpg b/wallpapers/dark6.jpg
deleted file mode 100644
index 1ce661e..0000000
Binary files a/wallpapers/dark6.jpg and /dev/null differ
diff --git a/wallpapers/gasmask.jpg b/wallpapers/gasmask.jpg
deleted file mode 100644
index 880f16b..0000000
Binary files a/wallpapers/gasmask.jpg and /dev/null differ
diff --git a/wallpapers/math.jpg b/wallpapers/math.jpg
deleted file mode 100644
index 567aa42..0000000
Binary files a/wallpapers/math.jpg and /dev/null differ
diff --git a/wallpapers/math2.jpg b/wallpapers/math2.jpg
deleted file mode 100644
index f68b2ad..0000000
Binary files a/wallpapers/math2.jpg and /dev/null differ
diff --git a/wallpapers/math3.jpg b/wallpapers/math3.jpg
deleted file mode 100644
index 10bed9f..0000000
Binary files a/wallpapers/math3.jpg and /dev/null differ
diff --git a/wallpapers/motherboard.jpg b/wallpapers/motherboard.jpg
deleted file mode 100644
index f1667e5..0000000
Binary files a/wallpapers/motherboard.jpg and /dev/null differ
diff --git a/wallpapers/nano.jpg b/wallpapers/nano.jpg
deleted file mode 100644
index aac4bf4..0000000
Binary files a/wallpapers/nano.jpg and /dev/null differ
diff --git a/wallpapers/solarized1.jpg b/wallpapers/solarized1.jpg
new file mode 100644
index 0000000..5936a99
Binary files /dev/null and b/wallpapers/solarized1.jpg differ
diff --git a/wallpapers/solarized2.png b/wallpapers/solarized2.png
new file mode 100644
index 0000000..552b6a5
Binary files /dev/null and b/wallpapers/solarized2.png differ
diff --git a/wallpapers/solarized3.png b/wallpapers/solarized3.png
new file mode 100644
index 0000000..f5f340c
Binary files /dev/null and b/wallpapers/solarized3.png differ
diff --git a/wallpapers/solarized4.png b/wallpapers/solarized4.png
new file mode 100644
index 0000000..25397cb
Binary files /dev/null and b/wallpapers/solarized4.png differ
diff --git a/wallpapers/space1.jpg b/wallpapers/space1.jpg
deleted file mode 100644
index 401cf8f..0000000
Binary files a/wallpapers/space1.jpg and /dev/null differ
diff --git a/wallpapers/space2.jpg b/wallpapers/space2.jpg
deleted file mode 100644
index 8e50c82..0000000
Binary files a/wallpapers/space2.jpg and /dev/null differ
diff --git a/wallpapers/space3.jpg b/wallpapers/space3.jpg
deleted file mode 100644
index 089fea4..0000000
Binary files a/wallpapers/space3.jpg and /dev/null differ
diff --git a/wallpapers/tech.jpg b/wallpapers/tech.jpg
deleted file mode 100644
index d8c7a9c..0000000
Binary files a/wallpapers/tech.jpg and /dev/null differ
diff --git a/wallpapers/vinyl.jpg b/wallpapers/vinyl.jpg
deleted file mode 100644
index ee48624..0000000
Binary files a/wallpapers/vinyl.jpg and /dev/null differ
diff --git a/wallpapers/waveform.jpg b/wallpapers/waveform.jpg
deleted file mode 100644
index e677697..0000000
Binary files a/wallpapers/waveform.jpg and /dev/null differ