diff --git a/xmonad.hs b/xmonad.hs
index 13a0d98..0b416a6 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -25,8 +25,9 @@ main = do
       { modMask = mod4Mask,
         terminal = "st",
         startupHook = myStartupHook,
-        normalBorderColor = colors !! 10,
-        focusedBorderColor = colors !! 12,
+        borderWidth = 2,
+        normalBorderColor = "#000000",
+        focusedBorderColor = colors !! 7,
         workspaces = myWorkspaces,
         manageHook = myManageHook,
         layoutHook = myLayout
@@ -46,9 +47,9 @@ main = do
 myXmobarPP :: [String] -> PP
 myXmobarPP colors =
   def
-    { ppSep = magenta " • ",
+    { ppSep = walXmobarColor 1 " • ",
       ppTitleSanitize = xmobarStrip,
-      ppCurrent = wrap " " "" . xmobarBorder "Top" "#8be9fd" 2,
+      ppCurrent = wrap " " "" . xmobarBorder "Top" (colors!!6) 2,
       ppHidden = white . wrap " " "",
       ppHiddenNoWindows = white . wrap " " "",
       ppUrgent = red . wrap (yellow "!") (yellow "!"),
@@ -57,15 +58,13 @@ myXmobarPP colors =
       ppSort = hideWorkspaces
     }
   where
-    formatFocused = wrap (white "[") (white "]") . (xmobarColor (colors !! 7) "") . ppWindow
-    formatUnfocused = wrap (lowWhite "[") (lowWhite "]") . (xmobarColor (colors !! 4) "") . ppWindow
-
+    formatFocused = wrap (white "[") (white "]") . walXmobarColor 7. ppWindow
+    formatUnfocused = wrap (lowWhite "[") (lowWhite "]") .walXmobarColor 4. ppWindow
+    walXmobarColor index = xmobarColor (colors!!index) ""
     ppWindow :: String -> String
     ppWindow = xmobarRaw . (\w -> if null w then "untitled" else w) . shorten 30
 
-    blue, lowWhite, magenta, red, white, yellow :: String -> String
-    magenta = xmobarColor "#ff79c6" ""
-    blue = xmobarColor "#bd93f9" ""
+    lowWhite, red, white, yellow :: String -> String
     white = xmobarColor "#f8f8f2" ""
     yellow = xmobarColor "#f1fa8c" ""
     red = xmobarColor "#ff5555" ""
@@ -96,7 +95,7 @@ getWalColors = do
   return (colors ++ replicate (16 - length colors) "#000000")
 
 mySpacing' :: Integer -> l a -> XMonad.Layout.LayoutModifier.ModifiedLayout Spacing l a
-mySpacing' i = spacingRaw True (Border i i i i) True (Border i i i i) True
+mySpacing' i = spacingRaw True (Border i 0 i i) True (Border i 0 i i) True
 
 --myWorkspaces = [" dev ", " www ", " sys ", " doc ", " vbox ", " chat ", " mus ", " vid ", " gfx "]
 myWorkspaces :: [String]