diff --git a/.xmonad/README.org b/.xmonad/README.org
index 977b870..339ef6e 100644
--- a/.xmonad/README.org
+++ b/.xmonad/README.org
@@ -7,7 +7,6 @@
 - [[#about-this-config][About This Config]]
 - [[#imports][Imports]]
 - [[#variables][Variables]]
-- [[#color-scheme][Color Scheme]]
 - [[#autostart-the-startup-hook][Autostart (The Startup Hook)]]
 - [[#gridselect][Gridselect]]
 - [[#scratchpads][Scratchpads]]
@@ -105,6 +104,19 @@ import XMonad.Util.EZConfig (additionalKeysP)
 import XMonad.Util.NamedScratchpad
 import XMonad.Util.Run (runProcessWithInput, safeSpawn, spawnPipe)
 import XMonad.Util.SpawnOnce
+
+   -- ColorScheme module (SET ONLY ONE!)
+      -- Possible choice are:
+      -- DoomOne
+      -- Dracula
+      -- GruvboxDark
+      -- MonokaiPro
+      -- Nord
+      -- OceanicNext
+      -- SolarizedDark
+      -- SolarizedLight
+      -- TomorrowNight
+import Colors.DoomOne
 #+END_SRC
 
 * Variables
@@ -143,32 +155,6 @@ windowCount :: X (Maybe String)
 windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset
 #+END_SRC
 
-* Color Scheme
-Set the color scheme for xmobar.
-#+begin_src haskell
--- Set the color scheme.  The following are valid color schemes:
-   -- doom-one
-   -- dracula
-   -- gruvbox-dark
-   -- monokai-pro
-   -- nord
-   -- oceanic-next
-   -- solarized-dark
-   -- solarized-light
-   -- tomorrow-night
-
-colorScheme :: String
-colorScheme = "doom-one"
-
-colorCurrent01 = "#c792ea"
-colorVisible01 = "#c792ea"
-colorHidden01 = "#82aaff"
-colorHiddenNW01 = "#82aaff"
-colorTitle01 = "#b3afc2"
-colorSep01 = "#b3afc2"
-colorUrgent01 = "#c45500"
-#+end_src
-
 * Autostart (The Startup Hook)
 These are commands we want XMonad to execute on startup, such as running a compositor, setting our wallpaper, starting the emacs daemon, and starting our system tray and the applications that belong in it.
 
@@ -656,21 +642,21 @@ main = do
                               >> hPutStrLn xmproc1 x   -- xmobar on monitor 2
                               >> hPutStrLn xmproc2 x   -- xmobar on monitor 3
                 -- Current workspace
-              , ppCurrent = xmobarColor colorCurrent01 "" . wrap
-                            ("<box type=Bottom width=2 mb=2 color=" ++ colorCurrent01 ++ ">") "</box>"
+              , ppCurrent = xmobarColor color06 "" . wrap
+                            ("<box type=Bottom width=2 mb=2 color=" ++ color06 ++ ">") "</box>"
                 -- Visible but not current workspace
-              , ppVisible = xmobarColor colorVisible01 "" . clickable
+              , ppVisible = xmobarColor color06 "" . clickable
                 -- Hidden workspace
-              , ppHidden = xmobarColor colorHidden01 "" . wrap
-                           ("<box type=Top width=2 mt=2 color=" ++ colorHidden01 ++ ">") "</box>" . clickable
+              , ppHidden = xmobarColor color05 "" . wrap
+                           ("<box type=Top width=2 mt=2 color=" ++ color05 ++ ">") "</box>" . clickable
                 -- Hidden workspaces (no windows)
-              , ppHiddenNoWindows = xmobarColor colorHiddenNW01 ""  . clickable
+              , ppHiddenNoWindows = xmobarColor color05 ""  . clickable
                 -- Title of active window
-              , ppTitle = xmobarColor colorTitle01 "" . shorten 60
+              , ppTitle = xmobarColor color16 "" . shorten 60
                 -- Separator character
-              , ppSep =  "<fc=" ++ colorSep01 ++ "> <fn=1>|</fn> </fc>"
+              , ppSep =  "<fc=" ++ color09 ++ "> <fn=1>|</fn> </fc>"
                 -- Urgent workspace
-              , ppUrgent = xmobarColor colorUrgent01 "" . wrap "!" "!"
+              , ppUrgent = xmobarColor color02 "" . wrap "!" "!"
                 -- Adding # of windows on current workspace to the bar
               , ppExtras  = [windowCount]
                 -- order of things in xmobar
diff --git a/.xmonad/lib/Colors/DoomOne.hs b/.xmonad/lib/Colors/DoomOne.hs
new file mode 100644
index 0000000..9e26946
--- /dev/null
+++ b/.xmonad/lib/Colors/DoomOne.hs
@@ -0,0 +1,21 @@
+module Colors.DoomOne where
+
+import XMonad
+
+colorScheme = "doom-one"
+color01 = "#1c1f24"
+color02 = "#ff6c6b"
+color03 = "#98be65"
+color04 = "#da8548"
+color05 = "#51afef"
+color06 = "#c678dd"
+color07 = "#5699af"
+color08 = "#202328"
+color09 = "#5b6268"
+color10 = "#da8548"
+color11 = "#4db5bd"
+color12 = "#ecbe7b"
+color13 = "#3071db"
+color14 = "#a9a1e1"
+color15 = "#46d9ff"
+color16 = "#dfdfdf"
diff --git a/.xmonad/lib/Colors/Dracula.hs b/.xmonad/lib/Colors/Dracula.hs
new file mode 100644
index 0000000..0c4e661
--- /dev/null
+++ b/.xmonad/lib/Colors/Dracula.hs
@@ -0,0 +1,21 @@
+module Colors.Dracula where
+
+import XMonad
+
+colorScheme = "dracula"
+color01 = "#1c1f24"
+color02 = "#ff6c6b"
+color03 = "#98be65"
+color04 = "#da8548"
+color05 = "#51afef"
+color06 = "#c678dd"
+color07 = "#5699af"
+color08 = "#202328"
+color09 = "#5b6268"
+color10 = "#da8548"
+color11 = "#4db5bd"
+color12 = "#ecbe7b"
+color13 = "#3071db"
+color14 = "#a9a1e1"
+color15 = "#46d9ff"
+color16 = "#dfdfdf"
diff --git a/.xmonad/lib/Colors/GruvboxDark.hs b/.xmonad/lib/Colors/GruvboxDark.hs
new file mode 100644
index 0000000..e0c6fac
--- /dev/null
+++ b/.xmonad/lib/Colors/GruvboxDark.hs
@@ -0,0 +1,21 @@
+module Colors.GruvboxDark where
+
+import XMonad
+
+colorScheme = "gruvbox-dark"
+color01 = "#1c1f24"
+color02 = "#ff6c6b"
+color03 = "#98be65"
+color04 = "#da8548"
+color05 = "#51afef"
+color06 = "#c678dd"
+color07 = "#5699af"
+color08 = "#202328"
+color09 = "#5b6268"
+color10 = "#da8548"
+color11 = "#4db5bd"
+color12 = "#ecbe7b"
+color13 = "#3071db"
+color14 = "#a9a1e1"
+color15 = "#46d9ff"
+color16 = "#dfdfdf"
diff --git a/.xmonad/lib/Colors/MonokaiPro.hs b/.xmonad/lib/Colors/MonokaiPro.hs
new file mode 100644
index 0000000..29a5ef5
--- /dev/null
+++ b/.xmonad/lib/Colors/MonokaiPro.hs
@@ -0,0 +1,21 @@
+module Colors.MonokaiPro where
+
+import XMonad
+
+colorScheme = "monokai-pro"
+color01 = "#1c1f24"
+color02 = "#ff6c6b"
+color03 = "#98be65"
+color04 = "#da8548"
+color05 = "#51afef"
+color06 = "#c678dd"
+color07 = "#5699af"
+color08 = "#202328"
+color09 = "#5b6268"
+color10 = "#da8548"
+color11 = "#4db5bd"
+color12 = "#ecbe7b"
+color13 = "#3071db"
+color14 = "#a9a1e1"
+color15 = "#46d9ff"
+color16 = "#dfdfdf"
diff --git a/.xmonad/lib/Colors/Nord.hs b/.xmonad/lib/Colors/Nord.hs
new file mode 100644
index 0000000..33a4510
--- /dev/null
+++ b/.xmonad/lib/Colors/Nord.hs
@@ -0,0 +1,21 @@
+module Colors.Nord where
+
+import XMonad
+
+colorScheme = "nord"
+color01 = "#1c1f24"
+color02 = "#ff6c6b"
+color03 = "#98be65"
+color04 = "#da8548"
+color05 = "#51afef"
+color06 = "#c678dd"
+color07 = "#5699af"
+color08 = "#202328"
+color09 = "#5b6268"
+color10 = "#da8548"
+color11 = "#4db5bd"
+color12 = "#ecbe7b"
+color13 = "#3071db"
+color14 = "#a9a1e1"
+color15 = "#46d9ff"
+color16 = "#dfdfdf"
diff --git a/.xmonad/lib/Colors/OceanicNext.hs b/.xmonad/lib/Colors/OceanicNext.hs
new file mode 100644
index 0000000..4ae177e
--- /dev/null
+++ b/.xmonad/lib/Colors/OceanicNext.hs
@@ -0,0 +1,21 @@
+module Colors.OceanicNext where
+
+import XMonad
+
+colorScheme = "oceanic-next"
+color01 = "#1c1f24"
+color02 = "#ff6c6b"
+color03 = "#98be65"
+color04 = "#da8548"
+color05 = "#51afef"
+color06 = "#c678dd"
+color07 = "#5699af"
+color08 = "#202328"
+color09 = "#5b6268"
+color10 = "#da8548"
+color11 = "#4db5bd"
+color12 = "#ecbe7b"
+color13 = "#3071db"
+color14 = "#a9a1e1"
+color15 = "#46d9ff"
+color16 = "#dfdfdf"
diff --git a/.xmonad/lib/Colors/SolarizedDark.hs b/.xmonad/lib/Colors/SolarizedDark.hs
new file mode 100644
index 0000000..21e2dbc
--- /dev/null
+++ b/.xmonad/lib/Colors/SolarizedDark.hs
@@ -0,0 +1,21 @@
+module Colors.SolarizedDark where
+
+import XMonad
+
+colorScheme = "solarized-dark"
+color01 = "#1c1f24"
+color02 = "#ff6c6b"
+color03 = "#98be65"
+color04 = "#da8548"
+color05 = "#51afef"
+color06 = "#c678dd"
+color07 = "#5699af"
+color08 = "#202328"
+color09 = "#5b6268"
+color10 = "#da8548"
+color11 = "#4db5bd"
+color12 = "#ecbe7b"
+color13 = "#3071db"
+color14 = "#a9a1e1"
+color15 = "#46d9ff"
+color16 = "#dfdfdf"
diff --git a/.xmonad/lib/Colors/SolarizedLight.hs b/.xmonad/lib/Colors/SolarizedLight.hs
new file mode 100644
index 0000000..a7a54e6
--- /dev/null
+++ b/.xmonad/lib/Colors/SolarizedLight.hs
@@ -0,0 +1,21 @@
+module Colors.SolarizedLight where
+
+import XMonad
+
+colorScheme = "solarized-light"
+color01 = "#1c1f24"
+color02 = "#ff6c6b"
+color03 = "#98be65"
+color04 = "#da8548"
+color05 = "#51afef"
+color06 = "#c678dd"
+color07 = "#5699af"
+color08 = "#202328"
+color09 = "#5b6268"
+color10 = "#da8548"
+color11 = "#4db5bd"
+color12 = "#ecbe7b"
+color13 = "#3071db"
+color14 = "#a9a1e1"
+color15 = "#46d9ff"
+color16 = "#dfdfdf"
diff --git a/.xmonad/lib/Colors/TomorrowNight.hs b/.xmonad/lib/Colors/TomorrowNight.hs
new file mode 100644
index 0000000..65ec832
--- /dev/null
+++ b/.xmonad/lib/Colors/TomorrowNight.hs
@@ -0,0 +1,21 @@
+module Colors.TomorrowNight where
+
+import XMonad
+
+colorScheme = "tomorrow-night"
+color01 = "#1c1f24"
+color02 = "#ff6c6b"
+color03 = "#98be65"
+color04 = "#da8548"
+color05 = "#51afef"
+color06 = "#c678dd"
+color07 = "#5699af"
+color08 = "#202328"
+color09 = "#5b6268"
+color10 = "#da8548"
+color11 = "#4db5bd"
+color12 = "#ecbe7b"
+color13 = "#3071db"
+color14 = "#a9a1e1"
+color15 = "#46d9ff"
+color16 = "#dfdfdf"
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 2914bac..7f4cbad 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -66,6 +66,19 @@ import XMonad.Util.NamedScratchpad
 import XMonad.Util.Run (runProcessWithInput, safeSpawn, spawnPipe)
 import XMonad.Util.SpawnOnce
 
+   -- ColorScheme module (SET ONLY ONE!)
+      -- Possible choice are:
+      -- doom-one
+      -- dracula
+      -- gruvbox-dark
+      -- monokai-pro
+      -- nord
+      -- oceanic-next
+      -- solarized-dark
+      -- solarized-light
+      -- tomorrow-night
+import Colors.DoomOne
+
 myFont :: String
 myFont = "xft:SauceCodePro Nerd Font Mono:regular:size=9:antialias=true:hinting=true"
 
@@ -97,28 +110,6 @@ myFocusColor  = "#46d9ff"   -- Border color of focused windows
 windowCount :: X (Maybe String)
 windowCount = gets $ Just . show . length . W.integrate' . W.stack . W.workspace . W.current . windowset
 
--- Set the color scheme.  The following are valid color schemes:
-   -- doom-one
-   -- dracula
-   -- gruvbox-dark
-   -- monokai-pro
-   -- nord
-   -- oceanic-next
-   -- solarized-dark
-   -- solarized-light
-   -- tomorrow-night
-
-colorScheme :: String
-colorScheme = "doom-one"
-
-colorCurrent01 = "#c792ea"
-colorVisible01 = "#c792ea"
-colorHidden01 = "#82aaff"
-colorHiddenNW01 = "#82aaff"
-colorTitle01 = "#b3afc2"
-colorSep01 = "#b3afc2"
-colorUrgent01 = "#c45500"
-
 myStartupHook :: X ()
 myStartupHook = do
     spawnOnce "lxsession &"
@@ -537,21 +528,21 @@ main = do
                               >> hPutStrLn xmproc1 x   -- xmobar on monitor 2
                               >> hPutStrLn xmproc2 x   -- xmobar on monitor 3
                 -- Current workspace
-              , ppCurrent = xmobarColor colorCurrent01 "" . wrap
-                            ("<box type=Bottom width=2 mb=2 color=" ++ colorCurrent01 ++ ">") "</box>"
+              , ppCurrent = xmobarColor color06 "" . wrap
+                            ("<box type=Bottom width=2 mb=2 color=" ++ color06 ++ ">") "</box>"
                 -- Visible but not current workspace
-              , ppVisible = xmobarColor colorVisible01 "" . clickable
+              , ppVisible = xmobarColor color06 "" . clickable
                 -- Hidden workspace
-              , ppHidden = xmobarColor colorHidden01 "" . wrap
-                           ("<box type=Top width=2 mt=2 color=" ++ colorHidden01 ++ ">") "</box>" . clickable
+              , ppHidden = xmobarColor color05 "" . wrap
+                           ("<box type=Top width=2 mt=2 color=" ++ color05 ++ ">") "</box>" . clickable
                 -- Hidden workspaces (no windows)
-              , ppHiddenNoWindows = xmobarColor colorHiddenNW01 ""  . clickable
+              , ppHiddenNoWindows = xmobarColor color05 ""  . clickable
                 -- Title of active window
-              , ppTitle = xmobarColor colorTitle01 "" . shorten 60
+              , ppTitle = xmobarColor color16 "" . shorten 60
                 -- Separator character
-              , ppSep =  "<fc=" ++ colorSep01 ++ "> <fn=1>|</fn> </fc>"
+              , ppSep =  "<fc=" ++ color09 ++ "> <fn=1>|</fn> </fc>"
                 -- Urgent workspace
-              , ppUrgent = xmobarColor colorUrgent01 "" . wrap "!" "!"
+              , ppUrgent = xmobarColor color02 "" . wrap "!" "!"
                 -- Adding # of windows on current workspace to the bar
               , ppExtras  = [windowCount]
                 -- order of things in xmobar