diff --git a/configs/xmonad/build b/configs/xmonad/build
index a7351da..682f56d 100755
--- a/configs/xmonad/build
+++ b/configs/xmonad/build
@@ -1,7 +1,8 @@
 #!/bin/sh
 
+PATH="$HOME"/.ghcup/bin:"$PATH"
 # Recompile
-cd "$XMONAD_CONFIG_DIR" && stack-bin install || exit
+cd "$XMONAD_CONFIG_DIR" && stack install || exit
 
 # Create a hard link at the requested destination, replacing any existing one.
-ln -f -T "$(stack-bin exec -- which xmonad)" "$1"
+ln -f -T "$(stack exec -- which xmonad)" "$1"
diff --git a/configs/xmonad/icons/floating.xpm b/configs/xmonad/icons/floating.xpm
index 581a0f2..173154a 100644
--- a/configs/xmonad/icons/floating.xpm
+++ b/configs/xmonad/icons/floating.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char * floating_xpm[] = {
 "20 20 3 1",
-" 	c #113844",
+" 	c #292552",
 ".	c #B6BDCA",
 "+	c #ABB2BF",
 "                    ",
diff --git a/configs/xmonad/icons/full.xpm b/configs/xmonad/icons/full.xpm
index 5de9075..355108b 100644
--- a/configs/xmonad/icons/full.xpm
+++ b/configs/xmonad/icons/full.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char * full_xpm[] = {
 "20 20 2 1",
-" 	c #113844",
+" 	c #292552",
 ".	c #ABB2BF",
 "                    ",
 "                    ",
diff --git a/configs/xmonad/icons/mirrortiled.xpm b/configs/xmonad/icons/mirrortiled.xpm
index 8fb810f..6961ed7 100644
--- a/configs/xmonad/icons/mirrortiled.xpm
+++ b/configs/xmonad/icons/mirrortiled.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char * mirrortiled_xpm[] = {
 "20 20 2 1",
-" 	c #113844",
+" 	c #292552",
 ".	c #ABB2BF",
 "                    ",
 "                    ",
diff --git a/configs/xmonad/icons/tiled.xpm b/configs/xmonad/icons/tiled.xpm
index 4a50038..aa04519 100644
--- a/configs/xmonad/icons/tiled.xpm
+++ b/configs/xmonad/icons/tiled.xpm
@@ -1,7 +1,7 @@
 /* XPM */
 static char * tiled_xpm[] = {
 "20 20 2 1",
-" 	c #113844",
+" 	c #292552",
 ".	c #ABB2BF",
 "                    ",
 "                    ",
diff --git a/configs/xmonad/scripts/volume.sh b/configs/xmonad/scripts/volume.sh
index c32d404..eb45e92 100755
--- a/configs/xmonad/scripts/volume.sh
+++ b/configs/xmonad/scripts/volume.sh
@@ -6,7 +6,7 @@ VOLUME=${VOLUME:-$(pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}' | sed
 if [[ "${MUTE}" = "yes" ]] ; then 
     echo "<fc=#6B7089,#31353F:5></fc>"
 elif [[ "${MUTE}" = "no" ]] && [[ "${VOLUME}" -eq 0 ]] ; then
-    echo "<fc=#6B7089,#31353F:5>${VOLUME}%</fc>"
+    echo "<fc=#6B7089,#31353F:5>${VOLUME}</fc>"
 elif [[ "${MUTE}" = "no" ]] && [[ "${VOLUME}" -gt 0 ]] ; then
-    echo "${VOLUME}%"
+    echo "${VOLUME}"
 fi
diff --git a/configs/xmonad/src/main.hs b/configs/xmonad/src/main.hs
index ea31163..92f6658 100644
--- a/configs/xmonad/src/main.hs
+++ b/configs/xmonad/src/main.hs
@@ -55,7 +55,6 @@ main =
       . fullscreenSupport
       . ewmh
       . Hacks.javaHack
-      -- . withEasySB xmobar2 toggleSB
       . withEasySB xmobar toggleSB
       . withSB xmobar2
     $ myConfig
@@ -75,12 +74,12 @@ myLauncher :: String
 myLauncher = myHomeDir ++ "/.config/rofi/launchers/type-6/launcher.sh"
 
 -- Default Launcher
-myWinSwitch :: String
-myWinSwitch = myHomeDir ++ "/.config/rofi/launchers/type-6/tab.sh"
+-- myWinSwitch :: String
+-- myWinSwitch = myHomeDir ++ "/.config/rofi/launchers/type-6/tab.sh"
 
 -- Default Launcher
 myFileManager :: String
-myFileManager = "thunar"
+myFileManager = "kitty -e ranger"
 
 -- Default Browser
 myBrowser :: String
@@ -158,7 +157,7 @@ myAdditionalKeys =
         ("M-<Space>", sendMessage NextLayout),
         ("M-n", refresh),
         ("M-S-q", io exitSuccess),
-        ("C-S-r", spawn "xmonad --recompile && pkill xmobar2 && pkill xmobar && xmonad --restart"),
+        ("C-S-r", spawn "xmonad --recompile && killall xmobar2 ; killall xmobar ; xmonad --restart"),
         ("C-S-q", spawn "pkill -KILL -u $USER")
       ]
     -- Window management keybinds.
@@ -192,7 +191,7 @@ myAdditionalKeys =
         ("C-<Print>", unGrab *> spawn screenShotApp),
         ("<Print>", spawn screenShotFullscreen),
         ("M-S-<Return>", spawn myLauncher),
-        ("M1-<Tab>", spawn myWinSwitch),
+        -- ("M1-<Tab>", spawn myWinSwitch),
         ("M-e", spawn myFileManager)
       ]
     -- Multimedia keybinds.
@@ -227,19 +226,19 @@ myStartupHook = do
       spawnOnce
       [ "sh ~/scripts/screenlayout.sh",
         "nitrogen --restore &",
+        -- "sh ~/scripts/wallpaper.sh",
         "touch ~/tmp/touchy && rm -rf ~/tmp/*",
-        myHomeDir ++ "/.local/bin/picom-jonaburg -b --experimental-backends &",
+        myHomeDir ++ "/.local/bin/picom-pijulius -b --experimental-backends &",
         "nm-applet &",
         -- "picom",
-        "xinput --set-prop 'pointer:''Gaming Mouse' 'libinput Accel Profile Enabled' 0, 1 && xinput --set-prop 'pointer:''Gaming Mouse' 'libinput Accel Speed' 0.1",
+        "xinput --set-prop 'pointer:''Gaming Mouse' 'libinput Accel Profile Enabled' 0, 1 && xinput --set-prop 'pointer:''Gaming Mouse' 'libinput Accel Speed' 0.5",
         "setxkbmap -option ctrl:nocaps br abnt2",
         "nm-applet",
-        "trayer-srg -l --edge top --align right --SetDockType true --SetPartialStrut true --expand true --widthtype request --tint 0x002b36 --height 30 --distance 15 --margin 10 --alpha 0 --monitor 0 --transparent true",
-        "mpd &",
+        "trayer-srg --edge top --align right --SetDockType true --SetPartialStrut true --expand true --widthtype request --tint 0x2F2F2F --height 25 --distance 0 --margin 0 --alpha 0 --monitor 0 --transparent true",
         "dunst &",
         "lxqt-policykit-agent &",
         "xrdb -load ~/.Xresources",
-        "redshift -t 5700:3600 -l -23.5475:-46.63611 -b 0.9:0.7"
+        "redshift -t 4500:2500 -l -23.5475:-46.63611 -b 0.9:0.6"
       ]
   setDefaultCursor xC_left_ptr
   setWMName "zmonad"
@@ -361,6 +360,7 @@ myManageHook = manageRules
             className =? "steam_app_1551360" <&&> title /=? "Forza Horizon 5" --> doHide, -- Prevents black screen when fullscreening.
             className =?? "league" --> doShift "gfx" <> doCenterFloat <> hasBorder False,
             className =?? "riot" --> doShift "gfx" <> doCenterFloat <> hasBorder False,
+            className =?? "csgo" --> doShift "gfx" <> doCenterFloat <> hasBorder False,
             className =? "gamescope" --> doShift "gfx" <> doCenterFloat <> hasBorder False,
             title =? "Wine System Tray" --> doHide, -- Prevents Wine System Trays from taking input focus.
             className =?? "steam_" --> doShift "gfx" <> hasBorder False
@@ -391,17 +391,18 @@ myXmobarPP =
   clickablePP $
     filterOutWsPP ["NSP"] $
       def
-        { ppCurrent = xmobarColor "#d5d5d5" "" . xmobarFont 5 . wrap "[" "]",
-          ppVisibleNoWindows = Just (xmobarColor "#71bec0" ""),
-          ppHidden = xmobarColor "#558c8e" "",
-          ppHiddenNoWindows = xmobarColor "#595959" "",
-          ppUrgent = xmobarColor "#F7768E" "" . wrap "!" "!",
-          ppTitle = xmobarColor "#d5d5d5" "" . shorten 49,
+        { ppCurrent = xmobarColor "#ece1d7" "" . xmobarBorder "Bottom" "#89b3b6" 2,
+          ppVisible = xmobarColor "#A0A0A0" "" . xmobarBorder "Bottom" "#78997a" 2,
+          ppVisibleNoWindows = Just (xmobarBorder "Bottom" "#78997a" 2 . xmobarColor "#A0A0A0" ""),
+          ppHidden = xmobarColor "#c1a78e" "" . xmobarBorder "Top" "#f0c674" 2,
+          ppHiddenNoWindows = xmobarColor "#c1a78e" "",
+          ppUrgent = xmobarColor "#D47786" "" . wrap "!" "!",
+          ppTitle = xmobarColor "#ece1d7" "" . shorten 40,
           ppSep = wrapSep " ",
           ppTitleSanitize = xmobarStrip,
-          ppWsSep = xmobarColor "" "#002b36" "  ",
+          ppWsSep = "  ",
           ppLayout =
-            xmobarColor "#002b36" ""
+            xmobarColor "#292522" ""
               . ( \case
                     "Spacing Tall" -> "<icon=tiled.xpm/>"
                     "Spacing Mirror Tall" -> "<icon=mirrortiled.xpm/>"
@@ -414,8 +415,8 @@ myXmobarPP =
     wrapSep :: String -> String
     wrapSep =
       wrap
-        (xmobarColor "#002b36" "#002b36:7" (xmobarFont 2 "\xe0b4"))
-        (xmobarColor "#002b36" "#002b36:7" (xmobarFont 2 "\xe0b6"))
+        (xmobarColor "#292522" "#292522" (xmobarFont 2 "\xe0b4"))
+        (xmobarColor "#292522" "#292522" (xmobarFont 2 "\xe0b6"))
 
 myXmobar :: String
 myXmobar = (myHomeDir ++ "/.local/bin/xmobar " ++ myHomeDir ++ "/.config/xmonad/src/xmobar.hs")
diff --git a/configs/xmonad/src/pretty-good-xmobar.hs b/configs/xmonad/src/pretty-good-xmobar.hs
new file mode 100644
index 0000000..c303cb5
--- /dev/null
+++ b/configs/xmonad/src/pretty-good-xmobar.hs
@@ -0,0 +1,102 @@
+import System.Environment
+import System.IO.Unsafe (unsafeDupablePerformIO)
+import Xmobar
+
+main :: IO ()
+main = xmobar =<< configFromArgs =<< myConfig
+
+-- main = xmobar =<< myConfig
+
+myHomeDir :: String
+myHomeDir = unsafeDupablePerformIO (getEnv "HOME")
+
+myConfig :: IO Config
+myConfig =
+  do
+    pure
+      baseConfig
+        { template =
+            concat $
+              [ " <fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
+                \<fn=4><fc=#558c8e,#002b36:5>\xf30d </fc></fn>\
+                \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+              ]
+                <> ["<fn=5>@UnsafeXMonadLog@</fn>}"]
+                   <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#E06C75,#002b36:5>\xf001 </fc></fn>\
+                     \<fn=5><fc=#E06C75,#002b36:5>@music@</fc></fn>\
+                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn>{"
+                   ]
+                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#56B6C2,#002b36:5>\xf2db </fc></fn>\
+                     \<fn=5><fc=#56B6C2,#002b36:5>CPU: @cpu@%</fc></fn>\
+                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                   ]
+                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#C678DD,#002b36:5>\xf538 </fc></fn>\
+                     \<fn=5><fc=#C678DD,#002b36:5>Mem: @memory@% </fc></fn>\
+                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                   ]
+                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#98C379,#002b36:5>@volicon@</fc></fn>\
+                     \<fn=5><fc=#98C379,#002b36:5>@vol@</fc></fn>\
+                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                   ]
+                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#61AFEF,#002b36:5>\xf017 </fc></fn>\
+                     \<fn=5><fc=#61AFEF,#002b36:5>@date@</fc></fn>\
+                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                   ]
+                <> ["@_XMONAD_TRAYPAD@"],
+          commands = myCommands
+        }
+
+myCommands :: [Runnable]
+myCommands =
+  [ Run UnsafeXMonadLog,
+    Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volume.sh") ["vol"] "vol" 100,
+    Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volumeicon.sh") ["volicon"] "volicon" 100,
+    Run $ Date "%-l:%M %p" "date" 600,
+    Run $ Cpu ["-t", "<fc=#8c7f80><total></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#56B6C2", "-n", "#4797a1", "-l", "#3a7b83"] 100,
+    Run $ Memory ["-t", "<fc=#8c7f80><usedratio></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#c678dd", "-n", "#9f60b1", "-l", "#855094"] 100,
+    -- , Run $ Com (myHomeDir <> "/.config/xmonad/scripts/gputemp.sh") ["gpu"] "gpu" 5
+    Run $ XPropertyLog "_XMONAD_TRAYPAD",
+    Run $ Com (myHomeDir <> "/.config/xmonad/scripts/mpd.sh") ["music"] "music" 100
+    -- , Run $ Com (myHomeDir <> "/.config/xmonad/src/trayer-padding.sh") ["trayer"] "trayer" 50
+    -- , Run $ MPD ["-h", "127.0.0.1", "-p", "6600", "-t", "<composer> <title> <track>/<plength> <statei>", "--", "-P", ">>", "-Z", "|", "-S", "><"] 10
+  ]
+
+baseConfig :: Config
+baseConfig =
+  defaultConfig
+    { font = "xft:Sugar Snow:pixelsize=14:antialias=true:hinting=true",
+      additionalFonts =
+        [ "xft:Sugar Snow:pixelsize=12:antialias=true:hinting=true",
+          "xft:Sugar Snow:size=15:antialias=true:hinting=true",
+          "xft:Sugar Snow:size=13:antialias=true:hinting=true",
+          "xft:JetBrainsMono Nerd Font:size=12:antialias=true:hinting=true",
+          "xft:Sugar Snow:pixelsize=14:antialias=true:hinting=true"
+        ],
+      textOffsets = [20, 22, 21, 21, 20],
+      bgColor = "#002b36",
+      fgColor = "#c8b6b8",
+      borderColor = "#272727",
+      border = FullB,
+      borderWidth = 0,
+      {-
+      , position         = Static { xpos = 13, ypos = 1034, width = 1893, height = 32 } Bottom Padded
+      , position         = Static { xpos = 0, ypos = 1048, width = 1920, height = 32 } Bottom Flat
+      , position         = Static { xpos = 0, ypos = 0, width = 1920, height = 32 } Top Flat
+      -}
+      position = Static {xpos = 20, ypos = 15, width = 1880, height = 34},
+      alpha = 255,
+      overrideRedirect = True,
+      lowerOnStart = True,
+      hideOnStart = False,
+      allDesktops = True,
+      persistent = True,
+      iconRoot = myHomeDir ++ "/.config/xmonad/icons",
+      iconOffset = -1,
+      sepChar = "@",
+      alignSep = "}{"
+    }
diff --git a/configs/xmonad/src/xmobar.hs b/configs/xmonad/src/xmobar.hs
index c303cb5..eb76d1a 100644
--- a/configs/xmonad/src/xmobar.hs
+++ b/configs/xmonad/src/xmobar.hs
@@ -17,37 +17,33 @@ myConfig =
       baseConfig
         { template =
             concat $
-              [ " <fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                \<fn=4><fc=#558c8e,#002b36:5>\xf30d </fc></fn>\
-                \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+              [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                \<fn=6><fc=#E49B5D,#292522:5>\xf30d </fc></fn>\
+                \<fn=2><fc=#292522,#292522:7>\xe0b4</fc></fn>"
               ]
-                <> ["<fn=5>@UnsafeXMonadLog@</fn>}"]
-                   <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                     \<fn=4><fc=#E06C75,#002b36:5>\xf001 </fc></fn>\
-                     \<fn=5><fc=#E06C75,#002b36:5>@music@</fc></fn>\
-                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn>{"
+                <> ["<fn=2>@UnsafeXMonadLog@</fn>}"]
+                <> [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#ebc06d,#292522:5>\xf017 </fc></fn>\
+                     \<fn=5>@date@</fn>{"
                    ]
-                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                     \<fn=4><fc=#56B6C2,#002b36:5>\xf2db </fc></fn>\
-                     \<fn=5><fc=#56B6C2,#002b36:5>CPU: @cpu@%</fc></fn>\
-                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                <> [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#89b3b6,#292522:5>\xf2db </fc></fn>\
+                     \<fn=5>CPU: @cpu@% |</fn>"
                    ]
-                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                     \<fn=4><fc=#C678DD,#002b36:5>\xf538 </fc></fn>\
-                     \<fn=5><fc=#C678DD,#002b36:5>Mem: @memory@% </fc></fn>\
-                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                <> [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#b380b0,#292522:5>\xf538 </fc></fn>\
+                     \<fn=5>Mem: @memory@% |</fn>"
                    ]
-                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                     \<fn=4><fc=#98C379,#002b36:5>@volicon@</fc></fn>\
-                     \<fn=5><fc=#98C379,#002b36:5>@vol@</fc></fn>\
-                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                <> [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#78997a,#292522:5>@volicon@</fc></fn>\
+                     \<fn=5>@vol@<fc=#78997a,#292522:5>%</fc> |</fn>"
                    ]
-                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                     \<fn=4><fc=#61AFEF,#002b36:5>\xf017 </fc></fn>\
-                     \<fn=5><fc=#61AFEF,#002b36:5>@date@</fc></fn>\
-                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                <> [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#d47766,#292522:5>\xf001 </fc></fn>\
+                     \<fn=5><fc=#d47766,#292522:5>@music@</fc></fn>\
+                     \<fn=2><fc=#292522,#292522:7>\xe0b4</fc></fn>"
                    ]
-                <> ["@_XMONAD_TRAYPAD@"],
+                <> ["| @_XMONAD_TRAYPAD@"],
           commands = myCommands
         }
 
@@ -56,9 +52,9 @@ myCommands =
   [ Run UnsafeXMonadLog,
     Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volume.sh") ["vol"] "vol" 100,
     Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volumeicon.sh") ["volicon"] "volicon" 100,
-    Run $ Date "%-l:%M %p" "date" 600,
-    Run $ Cpu ["-t", "<fc=#8c7f80><total></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#56B6C2", "-n", "#4797a1", "-l", "#3a7b83"] 100,
-    Run $ Memory ["-t", "<fc=#8c7f80><usedratio></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#c678dd", "-n", "#9f60b1", "-l", "#855094"] 100,
+    Run $ Date "%A, %d/%m/%Y. <fc=#ebc06d,#292522:5>%H:%M</fc>" "date" 600,
+    Run $ Cpu ["-t", "<fc=#8c7f80><total></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#89b3b6", "-n", "#4797a1", "-l", "#3a7b83"] 100,
+    Run $ Memory ["-t", "<fc=#8c7f80><usedratio></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#b380b0", "-n", "#9f60b1", "-l", "#855094"] 100,
     -- , Run $ Com (myHomeDir <> "/.config/xmonad/scripts/gputemp.sh") ["gpu"] "gpu" 5
     Run $ XPropertyLog "_XMONAD_TRAYPAD",
     Run $ Com (myHomeDir <> "/.config/xmonad/scripts/mpd.sh") ["music"] "music" 100
@@ -69,26 +65,27 @@ myCommands =
 baseConfig :: Config
 baseConfig =
   defaultConfig
-    { font = "xft:Sugar Snow:pixelsize=14:antialias=true:hinting=true",
+    { font = "Cartograph CF Italic 11",
       additionalFonts =
-        [ "xft:Sugar Snow:pixelsize=12:antialias=true:hinting=true",
-          "xft:Sugar Snow:size=15:antialias=true:hinting=true",
-          "xft:Sugar Snow:size=13:antialias=true:hinting=true",
-          "xft:JetBrainsMono Nerd Font:size=12:antialias=true:hinting=true",
-          "xft:Sugar Snow:pixelsize=14:antialias=true:hinting=true"
+        [ "Cartograph CF Italic 10",
+          "Cartograph CF Italic 11",
+          "Cartograph CF Italic 11",
+          "JetBrainsMono Nerd Font 10",
+          "Cartograph CF Italic 11",
+          "JetBrainsMono Nerd Font 13"
         ],
-      textOffsets = [20, 22, 21, 21, 20],
-      bgColor = "#002b36",
-      fgColor = "#c8b6b8",
+      -- textOffsets = [20, 22, 21, 21, 20],
+      bgColor = "#292522",
+      fgColor = "#ECE1d7",
       borderColor = "#272727",
       border = FullB,
-      borderWidth = 0,
+      borderWidth = 1,
       {-
       , position         = Static { xpos = 13, ypos = 1034, width = 1893, height = 32 } Bottom Padded
       , position         = Static { xpos = 0, ypos = 1048, width = 1920, height = 32 } Bottom Flat
       , position         = Static { xpos = 0, ypos = 0, width = 1920, height = 32 } Top Flat
       -}
-      position = Static {xpos = 20, ypos = 15, width = 1880, height = 34},
+      position = Static {xpos = 0, ypos = 0, width = 1920, height = 25},
       alpha = 255,
       overrideRedirect = True,
       lowerOnStart = True,
diff --git a/configs/xmonad/src/xmobar2.hs b/configs/xmonad/src/xmobar2.hs
index c572a64..c74049f 100644
--- a/configs/xmonad/src/xmobar2.hs
+++ b/configs/xmonad/src/xmobar2.hs
@@ -17,35 +17,31 @@ myConfig =
       baseConfig
         { template =
             concat $
-              [ " <fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                \<fn=4><fc=#558c8e,#002b36:5>\xf30d </fc></fn>\
-                \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+              [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                \<fn=6><fc=#E49B5D,#292522:5>\xf30d </fc></fn>\
+                \<fn=2><fc=#292522,#292522:7>\xe0b4</fc></fn>"
               ]
-                <> ["<fn=5>@UnsafeXMonadLog@</fn>}"]
-                   <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                     \<fn=4><fc=#E06C75,#002b36:5>\xf001 </fc></fn>\
-                     \<fn=5><fc=#E06C75,#002b36:5>@music@</fc></fn>\
-                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn>{"
+                <> ["<fn=2>@UnsafeXMonadLog@</fn>}"]
+                <> [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#ebc06d,#292522:5>\xf017 </fc></fn>\
+                     \<fn=5>@date@</fn>{"
                    ]
-                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                     \<fn=4><fc=#56B6C2,#002b36:5>\xf2db </fc></fn>\
-                     \<fn=5><fc=#56B6C2,#002b36:5>CPU: @cpu@%</fc></fn>\
-                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                <> [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#89b3b6,#292522:5>\xf2db </fc></fn>\
+                     \<fn=5>CPU: @cpu@% |</fn>"
                    ]
-                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                     \<fn=4><fc=#C678DD,#002b36:5>\xf538 </fc></fn>\
-                     \<fn=5><fc=#C678DD,#002b36:5>Mem: @memory@% </fc></fn>\
-                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                <> [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#b380b0,#292522:5>\xf538 </fc></fn>\
+                     \<fn=5>Mem: @memory@% |</fn>"
                    ]
-                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                     \<fn=4><fc=#98C379,#002b36:5>@volicon@</fc></fn>\
-                     \<fn=5><fc=#98C379,#002b36:5>@vol@</fc></fn>\
-                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                <> [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#78997a,#292522:5>@volicon@</fc></fn>\
+                     \<fn=5>@vol@<fc=#78997a,#292522:5>%</fc> |</fn>"
                    ]
-                <> [ "<fn=2><fc=#002b36,#002b36:7>\xe0b6</fc></fn>\
-                     \<fn=4><fc=#61AFEF,#002b36:5>\xf017 </fc></fn>\
-                     \<fn=5><fc=#61AFEF,#002b36:5>@date@</fc></fn>\
-                     \<fn=2><fc=#002b36,#002b36:7>\xe0b4</fc></fn> "
+                <> [ "<fn=2><fc=#292522,#292522:7>\xe0b6</fc></fn>\
+                     \<fn=4><fc=#d47766,#292522:5>\xf001 </fc></fn>\
+                     \<fn=5><fc=#d47766,#292522:5>@music@</fc></fn>\
+                     \<fn=2><fc=#292522,#292522:7>\xe0b4</fc></fn>"
                    ],
           commands = myCommands
         }
@@ -55,11 +51,11 @@ myCommands =
   [ Run UnsafeXMonadLog,
     Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volume.sh") ["vol"] "vol" 100,
     Run $ Com (myHomeDir <> "/.config/xmonad/scripts/volumeicon.sh") ["volicon"] "volicon" 100,
-    Run $ Date "%-l:%M %p" "date" 600,
-    Run $ Cpu ["-t", "<fc=#8c7f80><total></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#56B6C2", "-n", "#4797a1", "-l", "#3a7b83"] 100,
-    Run $ Memory ["-t", "<fc=#8c7f80><usedratio></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#c678dd", "-n", "#9f60b1", "-l", "#855094"] 100,
+    Run $ Date "%A, %d/%m/%Y. <fc=#ebc06d,#292522:5>%H:%M</fc>" "date" 600,
+    Run $ Cpu ["-t", "<fc=#8c7f80><total></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#89b3b6", "-n", "#4797a1", "-l", "#3a7b83"] 100,
+    Run $ Memory ["-t", "<fc=#8c7f80><usedratio></fc>", "-f", ":", "-H", "75", "-L", "25", "-h", "#b380b0", "-n", "#9f60b1", "-l", "#855094"] 100,
     -- , Run $ Com (myHomeDir <> "/.config/xmonad/scripts/gputemp.sh") ["gpu"] "gpu" 5
-    Run $ Com (myHomeDir <> "/.config/xmonad/scripts/trayer-padding.sh") ["trayer"] "trayer" 1000,
+    Run $ XPropertyLog "_XMONAD_TRAYPAD",
     Run $ Com (myHomeDir <> "/.config/xmonad/scripts/mpd.sh") ["music"] "music" 100
     -- , Run $ Com (myHomeDir <> "/.config/xmonad/src/trayer-padding.sh") ["trayer"] "trayer" 50
     -- , Run $ MPD ["-h", "127.0.0.1", "-p", "6600", "-t", "<composer> <title> <track>/<plength> <statei>", "--", "-P", ">>", "-Z", "|", "-S", "><"] 10
@@ -68,26 +64,27 @@ myCommands =
 baseConfig :: Config
 baseConfig =
   defaultConfig
-    { font = "xft:Sugar Snow:pixelsize=14:antialias=true:hinting=true",
+    { font = "Cartograph CF Italic 11",
       additionalFonts =
-        [ "xft:Sugar Snow:pixelsize=12:antialias=true:hinting=true",
-          "xft:Sugar Snow:size=15:antialias=true:hinting=true",
-          "xft:Sugar Snow:size=13:antialias=true:hinting=true",
-          "xft:JetBrainsMono Nerd Font:size=12:antialias=true:hinting=true",
-          "xft:Sugar Snow:pixelsize=14:antialias=true:hinting=true"
+        [ "Cartograph CF Italic 10",
+          "Cartograph CF Italic 11",
+          "Cartograph CF Italic 11",
+          "JetBrainsMono Nerd Font 10",
+          "Cartograph CF Italic 11",
+          "JetBrainsMono Nerd Font 13"
         ],
-      textOffsets = [20, 22, 21, 21, 20],
-      bgColor = "#002b36",
-      fgColor = "#c8b6b8",
+      -- textOffsets = [20, 22, 21, 21, 20],
+      bgColor = "#292522",
+      fgColor = "#ECE1d7",
       borderColor = "#272727",
       border = FullB,
-      borderWidth = 0,
+      borderWidth = 1,
       {-
       , position         = Static { xpos = 13, ypos = 1034, width = 1893, height = 32 } Bottom Padded
       , position         = Static { xpos = 0, ypos = 1048, width = 1920, height = 32 } Bottom Flat
       , position         = Static { xpos = 0, ypos = 0, width = 1920, height = 32 } Top Flat
       -}
-      position = Static {xpos = 1940, ypos = 163, width = 1880, height = 34},
+      position = Static {xpos = 1920, ypos = 148, width = 1920, height = 25},
       alpha = 255,
       overrideRedirect = True,
       lowerOnStart = True,
diff --git a/configs/xmonad/stack.yaml b/configs/xmonad/stack.yaml
index b792b43..5045df1 100644
--- a/configs/xmonad/stack.yaml
+++ b/configs/xmonad/stack.yaml
@@ -10,13 +10,17 @@ extra-deps:
     commit: 5ecdf7591d4f4bc3e44571326e66dfe895393a20						
   - github: xmonad/xmonad-contrib
     commit: 6fba80168df60d8a151515601f046a22cf9efbf5						
-  - xmobar-0.44.2
+  - xmobar-0.46
+  - cairo-0.13.8.2@sha256:ef1709c3c4d2c6d68a9a51d9f220dccc0745f6468d2d0868c15a7ecdf8f325a1,4078
+  - pango-0.13.8.2@sha256:d4057ebddade4cde3e25d7755b5e030e7a7e56fe7365afd37916a7bba46d3fd9,3917
+  - glib-0.13.8.2@sha256:f44b829e741b3c3244d523f60b058701dfc067ff64c2ba61d43be4cccfc2663d,3156
+
 
 flags:
   xmobar:
     with_xpm: true
     with_threaded: true
-    with_xft: true
+    # with_xft: true
     with_rtsopts: true
     with_mpd: true
 
diff --git a/configs/xmonad/stack.yaml.lock b/configs/xmonad/stack.yaml.lock
index 89e4c39..3b7fc7b 100644
--- a/configs/xmonad/stack.yaml.lock
+++ b/configs/xmonad/stack.yaml.lock
@@ -38,12 +38,33 @@ packages:
   original:
     url: https://github.com/xmonad/xmonad-contrib/archive/6fba80168df60d8a151515601f046a22cf9efbf5.tar.gz
 - completed:
-    hackage: xmobar-0.44.2@sha256:a2eed5f8833194babd60e45520023cd5698ccb8d40976d1f41a9b53b350297d0,14895
+    hackage: xmobar-0.46@sha256:65e8683aec86e5dc23041959dc2b0803f1be4a3cacab1ed29159c0732212c273,14911
     pantry-tree:
-      size: 9498
-      sha256: c7714be550d267369496c484ba727847f50e941d66009d2f8a8268629fe953f8
+      size: 9769
+      sha256: 0c97230f9b521b2af6237214a4ca14536a5df936835153b9768d7108ba5eb368
   original:
-    hackage: xmobar-0.44.2
+    hackage: xmobar-0.46
+- completed:
+    hackage: cairo-0.13.8.2@sha256:ef1709c3c4d2c6d68a9a51d9f220dccc0745f6468d2d0868c15a7ecdf8f325a1,4078
+    pantry-tree:
+      size: 2830
+      sha256: d6a9b3a15bc2e7b53fda331279cfdbc299fbf0c4be2ee8c1b6b79b924b6fdeb4
+  original:
+    hackage: cairo-0.13.8.2@sha256:ef1709c3c4d2c6d68a9a51d9f220dccc0745f6468d2d0868c15a7ecdf8f325a1,4078
+- completed:
+    hackage: pango-0.13.8.2@sha256:d4057ebddade4cde3e25d7755b5e030e7a7e56fe7365afd37916a7bba46d3fd9,3917
+    pantry-tree:
+      size: 1506
+      sha256: 10c335853e1d43e0b7426b33e8ddbdb90b3e318ebec4d58f0726a2f4cfb2e1c9
+  original:
+    hackage: pango-0.13.8.2@sha256:d4057ebddade4cde3e25d7755b5e030e7a7e56fe7365afd37916a7bba46d3fd9,3917
+- completed:
+    hackage: glib-0.13.8.2@sha256:f44b829e741b3c3244d523f60b058701dfc067ff64c2ba61d43be4cccfc2663d,3156
+    pantry-tree:
+      size: 1625
+      sha256: 2442a22152231a94e2f1ecfe7ddc0f4e5fb2d5ae116b371508a448bd3312ef06
+  original:
+    hackage: glib-0.13.8.2@sha256:f44b829e741b3c3244d523f60b058701dfc067ff64c2ba61d43be4cccfc2663d,3156
 snapshots:
 - completed:
     size: 619204
diff --git a/configs/xmonad/zmonad.cabal b/configs/xmonad/zmonad.cabal
index 53612dd..11563da 100644
--- a/configs/xmonad/zmonad.cabal
+++ b/configs/xmonad/zmonad.cabal
@@ -21,6 +21,8 @@ executable xmobar
       base
     , xmobar
     , xmonad-contrib >=0.16
+    , cairo >=0.13
+    , pango >=0.13
   default-language: Haskell2010
 
 executable xmobar2
@@ -34,6 +36,8 @@ executable xmobar2
       base
     , xmobar
     , xmonad-contrib >=0.16
+    , cairo >=0.13
+    , pango >=0.13
   default-language: Haskell2010
 
 executable xmonad