diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el
index 186da4d..bf02932 100644
--- a/doom/.config/doom/config.el
+++ b/doom/.config/doom/config.el
@@ -76,6 +76,8 @@
 (require 'elcord)
 (elcord-mode)
 
+(doom/set-frame-opacity 90)
+
 (use-package! copilot
   :hook (prog-mode . copilot-mode)
   :bind (("C-TAB" . 'copilot-accept-completion-by-word)
diff --git a/doom/.config/doom/init.el b/doom/.config/doom/init.el
index dd260b4..c4d3451 100644
--- a/doom/.config/doom/init.el
+++ b/doom/.config/doom/init.el
@@ -132,7 +132,7 @@
        ;;fstar             ; (dependent) types and (monadic) effects and Z3
        ;;gdscript          ; the language you waited for
        ;;(go +lsp)         ; the hipster dialect
-       ;;(haskell +lsp)      ; a language that's lazier than I am
+       (haskell +lsp)      ; a language that's lazier than I am
        ;;hy                ; readability of scheme w/ speed of python
        ;;idris             ; a language you can depend on
        ;;json              ; At least it ain't XML
diff --git a/hyprland/.config/hypr/hyprland.conf b/hyprland/.config/hypr/hyprland.conf
new file mode 100644
index 0000000..24d143d
--- /dev/null
+++ b/hyprland/.config/hypr/hyprland.conf
@@ -0,0 +1,156 @@
+# This is an example Hyprland config file.
+# Syntax is the same as in Hypr, but settings might differ.
+#
+# Refer to the wiki for more information.
+
+#
+# Please note not all available settings / options are set here.
+# For a full list, see the wiki (basic and advanced configuring)
+#
+exec-once=hyprctl setcursor Simp1e 16
+exec-once=waybar
+exec-once=systemctl --user restart xdg-desktop-portal
+exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once=~/.config/script/waylock.sh
+exec-once=~/.azotebg
+exec-once=xrdb -merge ~/.Xresources
+
+
+
+monitor=,preferred,auto,1
+#workspace=eDP-1,2
+#workspace=HDMI-A-1,1
+
+
+misc:disable_hyprland_logo=true
+
+input {
+    numlock_by_default=true
+    follow_mouse=1
+
+    touchpad {
+        natural_scroll=no
+    }
+}
+
+
+
+general {
+    sensitivity=1.0 # for mouse cursor
+    main_mod=ALT
+    layout=master
+    gaps_in=5
+    gaps_out=5
+    border_size=2
+    col.active_border=0xff8218c4
+    col.inactive_border=0x66333333
+
+    apply_sens_to_raw=0 # whether to apply the sensitivity to raw input (e.g. used by games where you aim using your mouse)
+
+    damage_tracking=full # leave it on full unless you hate your GPU and want to make it suffer
+}
+
+decoration {
+    rounding=10
+    blur=1
+    blur_size=3 # minimum 1
+    blur_passes=1 # minimum 1, more passes = more resource intensive.
+    # Your blur "amount" is blur_size * blur_passes, but high blur_size (over around 5-ish) will produce artifacts.
+    # if you want heavy blur, you need to up the blur_passes.
+    # the more passes, the more you can up the blur_size without noticing artifacts.
+}
+
+animations {
+    enabled=1
+    animation=windows,1,7,default,popin 80%
+    animation=border,1,7,default
+    animation=fade,1,7,default
+    animation=workspaces,1,6,default
+}
+
+master {
+    new_is_master=false
+}
+
+dwindle {
+    pseudotile=0 # enable pseudotiling on dwindle
+}
+
+
+
+gestures {
+    workspace_swipe=no
+}
+
+# example window rules
+# for windows named/classed as abc and xyz
+#windowrule=move 69 420,abc
+#windowrule=size 420 69,abc
+#windowrule=tile,xyz
+#windowrule=float,abc
+#windowrule=pseudo,abc
+#windowrule=monitor 0,xyz
+windowrule=tile,WebApp-ytmusic4224
+
+# example binds
+bind=ALT,Return,exec,kitty
+bind=ALT,Q,killactive,
+bind=ALT,F,exec,pcmanfm
+bind=ALT,B,exec,qutebrowser
+bind=ALT,E,exec,emacs
+bind=,107,exec,~/.config/script/wayscreenshot.sh
+bind=SHIFT,107,exec,grim -g "$(slurp)" - | wl-copy
+bind=ALTSHIFT,Q,exit,
+bind=ALTSHIFT,F,togglefloating,
+bind=ALTSHIFT,T,fullscreen,0
+bind=ALT,D,exec,wofi --show drun -o DP-3
+
+# toggle waybar
+bind=SUPER,W,exec,~/.config/script/hide_waybar.sh
+
+bind=ALT,H,focusmonitor,eDP-1
+bind=ALT,L,focusmonitor,HDMI-A-1
+bind=ALT,K,cyclenext,prev
+bind=ALT,J,cyclenext,
+
+bind=ALTSHIFT,H,movewindow,l
+bind=ALTSHIFT,L,movewindow,r
+bind=ALTSHIFT,K,movewindow,d
+bind=ALTSHIFT,J,movewindow,u
+
+# resize Mode with Alt + R : Press Escape to quit
+bind=ALT,R,submap,resize # will switch to a submap called resize
+submap=resize # will start a submap called "resize"
+
+bind=,l,resizeactive,30 0
+bind=,h,resizeactive,-30 0
+bind=,k,resizeactive,0 -30
+bind=,j,resizeactive,0 30
+
+bind=,escape,submap,reset # use reset to go back to the global submap
+submap=reset # will reset the submap, meaning end the current one and return to the global one.
+
+bind=ALT,1,workspace,1
+bind=ALT,2,workspace,2
+bind=ALT,3,workspace,3
+bind=ALT,4,workspace,4
+bind=ALT,5,workspace,5
+bind=ALT,6,workspace,6
+bind=ALT,7,workspace,7
+bind=ALT,8,workspace,8
+bind=ALT,9,workspace,9
+bind=ALT,0,workspace,10
+
+bind=ALTSHIFT,1,movetoworkspace,1
+bind=ALTSHIFT,2,movetoworkspace,2
+bind=ALTSHIFT,3,movetoworkspace,3
+bind=ALTSHIFT,4,movetoworkspace,4
+bind=ALTSHIFT,5,movetoworkspace,5
+bind=ALTSHIFT,6,movetoworkspace,6
+bind=ALTSHIFT,7,movetoworkspace,7
+bind=ALTSHIFT,8,movetoworkspace,8
+bind=ALTSHIFT,9,movetoworkspace,9
+bind=ALTSHIFT,0,movetoworkspace,10
+
+bind=SUPER,mouse_down,workspace,e+1
+bind=SUPER,mouse_up,workspace,e-1
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index d61e7bf..48dc6f8 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -23,7 +23,7 @@ background = ${colors.background}
 foreground = ${colors.foreground}
 
 padding-left = 0
-padding-right = 1
+padding-right = 0
 
 module-margin-left = 0
 module-margin-right = 0
diff --git a/xmonad/.config/xmonad/xmonad.hs b/xmonad/.config/xmonad/xmonad.hs
index 163075d..f437d5b 100644
--- a/xmonad/.config/xmonad/xmonad.hs
+++ b/xmonad/.config/xmonad/xmonad.hs
@@ -1,214 +1,220 @@
-import XMonad
-import Data.Monoid
-import Data.List (sortBy)
+import Control.Monad (forM_, join, liftM2)
 import Data.Function (on)
+import Data.List (sortBy)
+import qualified Data.Map as M
+import Data.Monoid
+import System.Exit
+import System.IO
+import XMonad
+import XMonad.Actions.SwapWorkspaces
+import XMonad.Actions.UpdatePointer
 import XMonad.Hooks.DynamicLog
+import XMonad.Hooks.EwmhDesktops
+import XMonad.Hooks.ManageDocks
 import XMonad.Hooks.StatusBar
 import XMonad.Hooks.StatusBar.PP
 import XMonad.Hooks.WindowSwallowing
-import Control.Monad (forM_, join)
-import Control.Monad (liftM2)
-import System.Exit
-import System.IO
-import XMonad.Util.SpawnOnce
-import XMonad.Util.Scratchpad
-import XMonad.Hooks.ManageDocks
-import XMonad.Util.Run
-import XMonad.Hooks.EwmhDesktops
-import XMonad.Hooks.ManageDocks
-import XMonad.Util.NamedWindows (getName)
 import XMonad.Layout.NoBorders
+import XMonad.Layout.Spacing
 import XMonad.Layout.Spiral
 import XMonad.Layout.ThreeColumns
-import XMonad.Util.EZConfig
-import XMonad.Layout.Spacing
-import XMonad.Actions.UpdatePointer
-import XMonad.Actions.SwapWorkspaces
 import qualified XMonad.StackSet as W
-import qualified Data.Map        as M
+import XMonad.Util.EZConfig
+import XMonad.Util.NamedWindows (getName)
+import XMonad.Util.Run
+import XMonad.Util.Scratchpad
+import XMonad.Util.NamedScratchpad
+import XMonad.Util.SpawnOnce
+
+myTerminal = "kitty"
 
-myTerminal      = "kitty"
 myFocusFollowsMouse :: Bool
 myFocusFollowsMouse = True
+
 myClickJustFocuses :: Bool
 myClickJustFocuses = False
-myBorderWidth   = 3
-myModMask       = mod1Mask
-myWorkspaces    = ["1","2","3","4","5","6","7","8","9"]
-myNormalBorderColor  = "#1A1A1A"
+
+myBorderWidth = 3
+
+myModMask = mod1Mask
+
+myWorkspaces = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
+
+myNormalBorderColor = "#1A1A1A"
+
 myFocusedBorderColor = "#8218c4"
 
-toggleFull = withFocused (\windowId -> do
-                              { floats <- gets (W.floating . windowset);
-                                if windowId `M.member` floats
-                                then withFocused $ windows . W.sink
-                                else withFocused $ windows . (flip W.float $ W.RationalRect 0 0 1 1) })
+toggleFull =
+  withFocused
+    ( \windowId -> do
+        floats <- gets (W.floating . windowset)
+        if windowId `M.member` floats
+          then withFocused $ windows . W.sink
+          else withFocused $ windows . (flip W.float $ W.RationalRect 0 0 1 1)
+    )
 
-myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
-    [
-      -- open browser
-    ((modm, xK_b     ), spawn "qutebrowser")
-
-    -- open calculater
-    ,((modm, xK_c      ), spawn "qalculate-gtk")
-
-    -- open PcmanFM
-    , ((modm, xK_f     ), spawn "pcmanfm")
-
-    -- open kde colour picker
-    , ((modm, xK_p     ), spawn "kcolorchooser")
-
-    -- Volume control
-    , ((0,0x1008ff11), spawn "pamixer --allow-boost -d 5") --Folume down
-    , ((0,0x1008ff13), spawn "pamixer --allow-boost -i 5") --Folume up
-    , ((0,0x1008ff12), spawn "pamixer -t") --Mute Toggle
-    , ((0,0x1008ffb2), spawn "pactl set-source-mute @DEFAULT_SOURCE@ toggle") --Mic Toggle
-
-    --Brightness control
-    , ((0,0x1008ff02), spawn "light -A 10") --Brightness Up
-    , ((0,0x1008ff03), spawn "light -U 10") --Brightness Up
-
-    --Media Control
-    , ((0,0x1008ff14), spawn "playerctl play-pause") -- Play/Pause
-    , ((0,0x1008ff16), spawn "playerctl previous") -- Play/Pause
-    , ((0,0x1008ff17), spawn "playerctl next") -- Play/Pause
-
-    -- Take screenshot
-    , ((0,0xff61), spawn "flameshot gui")
-
-    -- Lock screen
-    , ((mod4Mask, xK_l), spawn "betterlockscreen --lock")
-    , ((mod4Mask, xK_F5), spawn "/home/$USER/.config/script/refreshXmonad.sh")
-    , ((mod4Mask, xK_F6), spawn "/home/$USER/.config/script/toggelTuchpad.sh")
-    , ((mod4Mask, xK_F7), spawn "/home/$USER/.config/script/ariplaneMode.sh")
-    , ((mod4Mask, xK_F10), spawn "arandr")
-
-    -- launch a terminal
-    , ((modm, xK_Return), spawn $ XMonad.terminal conf)
-    , ((modm, xK_backslash), scratchpadSpawnActionCustom "kitty --class=scrachpad")
-
-    -- launch rofi
-    , ((modm,               xK_d     ), spawn "rofi -no-lazy-greb -show drun -icon-theme 'Papirus' -show-icons")
-
-    -- launch a scrachpad
-    , ((modm .|. shiftMask, xK_s     ), spawn "kitty --class=scratchpad")
-
-    -- close focused window
-    , ((modm, xK_q     ), kill)
-
-     -- Rotate through the available layout algorithms
-    , ((modm,               xK_space ), sendMessage NextLayout)
-
-    --  Reset the layouts on the current workspace to default
-    , ((modm .|. shiftMask, xK_space ), setLayout $ XMonad.layoutHook conf)
-
-    -- Resize viewed windows to the correct size
-    , ((modm,               xK_n     ), refresh)
-
-    -- Move focus to the next window
-    , ((modm,               xK_Tab   ), windows W.focusDown)
-
-    -- Move focus to the next window
-    , ((modm,               xK_j     ), windows W.focusDown)
-
-    -- Move focus to the previous window
-    , ((modm,               xK_k     ), windows W.focusUp  )
-
-    -- Move focus to the master window
-    , ((mod4Mask,               xK_m     ), windows W.focusMaster  )
-
-    -- Swap the focused window and the master window
-    , ((modm .|. shiftMask, xK_m     ), windows W.swapMaster)
-
-    -- Swap the focused window with the next window
-    , ((modm .|. shiftMask, xK_j     ), windows W.swapDown  )
-
-    -- Swap the focused window with the previous window
-    , ((modm .|. shiftMask, xK_k     ), windows W.swapUp    )
-
-    -- Shrink the master area
-    , ((modm .|. controlMask, xK_h     ), sendMessage Shrink)
-
-    -- Expand the master area
-    , ((modm .|. controlMask, xK_l     ), sendMessage Expand)
-
-    -- toggle between full screen and tieling
-    , ((modm,               xK_t     ), toggleFull)
-
-    -- Increment the number of windows in the master area
-    , ((modm              , xK_comma ), sendMessage (IncMasterN 1))
-
-    -- Deincrement the number of windows in the master area
-    , ((modm              , xK_period), sendMessage (IncMasterN (-1)))
-
-    -- Quit xmonad
-    , ((modm .|. shiftMask, xK_q     ), io (exitWith ExitSuccess))
-
-    -- Restart xmonad
-    , ((modm .|. shiftMask, xK_r     ), spawn "xmonad --recompile; xmonad --restart")
-
-    ]
-    ++
-
-    -- mod-[1..9], Switch to workspace N
-    -- mod-shift-[1..9], Move client to workspace N
-    [((m .|. modm, k), windows $ f i)
-        | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9]
-        , (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]]
-    ++
-
-    -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3
-    -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3
-    [((m .|. modm, key), screenWorkspace sc >>= flip whenJust (windows . f))
-        | (key, sc) <- zip [xK_l, xK_h] [0..]
-        , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
-
-myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $
-
-    -- mod-button1, Set the window to floating mode and move by dragging
-    [ ((modm, button1), (\w -> focus w >> mouseMoveWindow w
-                                       >> windows W.shiftMaster))
-
-    -- mod-button2, Raise the window to the top of the stack
-    , ((modm, button2), (\w -> focus w >> windows W.shiftMaster))
-
-    -- mod-button3, Set the window to floating mode and resize by dragging
-    , ((modm, button3), (\w -> focus w >> mouseResizeWindow w
-                                       >> windows W.shiftMaster))
-    ]
-
-myLayout =  mySpacing $ avoidStruts ( tiled ||| Mirror tiled |||  noBorders Full ||| spiral (6/7) ||| ThreeCol 1 (3/100) (1/2))
+myScratchPads :: [NamedScratchpad]
+myScratchPads = [ NS "terminal" spawnTerm findTerm manageTerm
+                ]
   where
-     -- default tiling algorithm partitions the screen into two panes
-     tiled   = Tall nmaster delta ratio
+    spawnTerm  = myTerminal ++ " -T scratchpad"
+    findTerm   = title =? "scratchpad"
+    manageTerm = customFloating $ W.RationalRect l t w h
+               where
+                 h = 0.7
+                 w = 0.7
+                 t = 0.85 -h
+                 l = 0.85 -w
 
-     -- The default number of windows in the master pane
-     nmaster = 1
+myKeys conf@(XConfig {XMonad.modMask = modm}) =
+  M.fromList $
+    [ -- open browser
+      ((modm, xK_b), spawn "qutebrowser"),
+      -- open calculater
+      ((modm, xK_c), spawn "qalculate-gtk"),
+      -- open PcmanFM
+      ((modm, xK_f), spawn "pcmanfm"),
+      -- open kde colour picker
+      ((modm, xK_p), spawn "kcolorchooser"),
+      -- Volume control
+      ((0, 0x1008ff11), spawn "pamixer --allow-boost -d 5"), --Folume down
+      ((0, 0x1008ff13), spawn "pamixer --allow-boost -i 5"), --Folume up
+      ((0, 0x1008ff12), spawn "pamixer -t"), --Mute Toggle
+      ((0, 0x1008ffb2), spawn "pactl set-source-mute @DEFAULT_SOURCE@ toggle"), --Mic Toggle
 
-     -- Default proportion of screen occupied by master pane
-     ratio   = 1/2
+      --Brightness control
+      ((0, 0x1008ff02), spawn "light -A 10"), --Brightness Up
+      ((0, 0x1008ff03), spawn "light -U 10"), --Brightness Up
 
-     -- Percent of screen to increment by when resizing panes
-     delta   = 3/100
+      --Media Control
+      ((0, 0x1008ff14), spawn "playerctl play-pause"), -- Play/Pause
+      ((0, 0x1008ff16), spawn "playerctl previous"), -- Play/Pause
+      ((0, 0x1008ff17), spawn "playerctl next"), -- Play/Pause
 
-mySpacing = spacingRaw False             -- Only for >1 window
-                       -- The bottom edge seems to look narrower than it is
-                       (Border 30 3 3 3) -- Size of screen edge gaps
-                       True             -- Enable screen edge gaps
-                       (Border 3 3 3 3) -- Size of window gaps
-                       True             -- Enable window gaps
-
-myManageHook = composeAll
-    [className =? "Gimp"           --> doFloat
-    , className =? "Qalculate-gtk"     --> doFloat
-    , className =? "Pavucontrol"    --> doFloat
-    , className =? "Minecraft Launcher"         --> doShift "8"
-    , className =? "YouTube Music"  --> doShift "9"
-    , className =? "Thunar"         --> viewShift "5"
-    , resource  =? "desktop_window" --> doIgnore
-    , resource  =? "kdesktop"       --> doIgnore
+      -- Take screenshot
+      ((0, 0xff61), spawn "flameshot gui"),
+      -- Lock screen
+      ((mod4Mask, xK_l), spawn "betterlockscreen --lock"),
+      ((mod4Mask, xK_F5), spawn "/home/$USER/.config/script/refreshXmonad.sh"),
+      ((mod4Mask, xK_F6), spawn "/home/$USER/.config/script/toggelTuchpad.sh"),
+      ((mod4Mask, xK_F7), spawn "/home/$USER/.config/script/ariplaneMode.sh"),
+      ((mod4Mask, xK_F10), spawn "arandr"),
+      -- launch a terminal
+      ((modm, xK_Return), spawn $ XMonad.terminal conf),
+      ((modm, xK_backslash), namedScratchpadAction myScratchPads "terminal"),
+      -- launch rofi
+      ((modm, xK_d), spawn "rofi -no-lazy-greb -show drun -icon-theme 'Papirus' -show-icons"),
+      -- launch a scrachpad
+      ((modm .|. shiftMask, xK_s), spawn "kitty --class=scratchpad"),
+      -- close focused window
+      ((modm, xK_q), kill),
+      -- Rotate through the available layout algorithms
+      ((modm, xK_space), sendMessage NextLayout),
+      --  Reset the layouts on the current workspace to default
+      ((modm .|. shiftMask, xK_space), setLayout $ XMonad.layoutHook conf),
+      -- Resize viewed windows to the correct size
+      ((modm, xK_n), refresh),
+      -- Move focus to the next window
+      ((modm, xK_Tab), windows W.focusDown),
+      -- Move focus to the next window
+      ((modm, xK_j), windows W.focusDown),
+      -- Move focus to the previous window
+      ((modm, xK_k), windows W.focusUp),
+      -- Move focus to the master window
+      ((mod4Mask, xK_m), windows W.focusMaster),
+      -- Swap the focused window and the master window
+      ((modm .|. shiftMask, xK_m), windows W.swapMaster),
+      -- Swap the focused window with the next window
+      ((modm .|. shiftMask, xK_j), windows W.swapDown),
+      -- Swap the focused window with the previous window
+      ((modm .|. shiftMask, xK_k), windows W.swapUp),
+      -- Shrink the master area
+      ((modm .|. controlMask, xK_h), sendMessage Shrink),
+      -- Expand the master area
+      ((modm .|. controlMask, xK_l), sendMessage Expand),
+      -- toggle between full screen and tieling
+      ((modm, xK_t), toggleFull),
+      -- Increment the number of windows in the master area
+      ((modm, xK_comma), sendMessage (IncMasterN 1)),
+      -- Deincrement the number of windows in the master area
+      ((modm, xK_period), sendMessage (IncMasterN (-1))),
+      -- Quit xmonad
+      ((modm .|. shiftMask, xK_q), io (exitWith ExitSuccess)),
+      -- Restart xmonad
+      ((modm .|. shiftMask, xK_r), spawn "xmonad --recompile; xmonad --restart")
     ]
-    where viewShift = doF . liftM2 (.) W.greedyView W.shift
+      ++
+      -- mod-[1..9], Switch to workspace N
+      -- mod-shift-[1..9], Move client to workspace N
+      [ ((m .|. modm, k), windows $ f i)
+        | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9],
+          (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]
+      ]
+      ++
+      -- mod-{w,e,r}, Switch to physical/Xinerama screens 1, 2, or 3
+      -- mod-shift-{w,e,r}, Move client to screen 1, 2, or 3
+      [ ((m .|. modm, key), screenWorkspace sc >>= flip whenJust (windows . f))
+        | (key, sc) <- zip [xK_l, xK_h] [0 ..],
+          (f, m) <- [(W.view, 0), (W.shift, shiftMask)]
+      ]
+
+myMouseBindings (XConfig {XMonad.modMask = modm}) =
+  M.fromList $
+    -- mod-button1, Set the window to floating mode and move by dragging
+    [ ( (modm, button1),
+        ( \w ->
+            focus w >> mouseMoveWindow w
+              >> windows W.shiftMaster
+        )
+      ),
+      -- mod-button2, Raise the window to the top of the stack
+      ((modm, button2), (\w -> focus w >> windows W.shiftMaster)),
+      -- mod-button3, Set the window to floating mode and resize by dragging
+      ( (modm, button3),
+        ( \w ->
+            focus w >> mouseResizeWindow w
+              >> windows W.shiftMaster
+        )
+      )
+    ]
+
+myLayout = mySpacing $ avoidStruts (tiled ||| Mirror tiled ||| noBorders Full ||| spiral (6 / 7) ||| ThreeCol 1 (3 / 100) (1 / 2))
+  where
+    -- default tiling algorithm partitions the screen into two panes
+    tiled = Tall nmaster delta ratio
+
+    -- The default number of windows in the master pane
+    nmaster = 1
+
+    -- Default proportion of screen occupied by master pane
+    ratio = 1 / 2
+
+    -- Percent of screen to increment by when resizing panes
+    delta = 3 / 100
+
+mySpacing =
+  spacingRaw
+    False -- Only for >1 window
+    -- The bottom edge seems to look narrower than it is
+    (Border 30 3 3 3) -- Size of screen edge gaps
+    True -- Enable screen edge gaps
+    (Border 3 3 3 3) -- Size of window gaps
+    True -- Enable window gaps
+
+myManageHook =
+  composeAll
+    [ className =? "Gimp" --> doFloat,
+      className =? "Qalculate-gtk" --> doFloat,
+      className =? "Pavucontrol" --> doFloat,
+      className =? "Minecraft Launcher" --> doShift "8",
+      className =? "YouTube Music" --> doShift "9",
+      className =? "Thunar" --> viewShift "5",
+      resource =? "desktop_window" --> doIgnore,
+      resource =? "kdesktop" --> doIgnore
+    ]
+  <+> namedScratchpadManageHook myScratchPads
+  where
+    viewShift = doF . liftM2 (.) W.greedyView W.shift
 
 myEventHook = swallowEventHook (className =? "kitty" <||> className =? "Termite") (return True)
 
@@ -221,55 +227,63 @@ myLogHook = do
 
   io $ appendFile "/tmp/.xmonad-title-log" (title ++ "\n")
   io $ appendFile "/tmp/.xmonad-workspace-log" (wsStr ++ "\n")
-
-  where fmt currWs ws
-          | currWs == ws = "[" ++ ws ++ "]"
-          | otherwise    = " " ++ ws ++ " "
-        sort' = sortBy (compare `on` (!! 0))
+  where
+    fmt currWs ws
+      | currWs == ws = "[" ++ ws ++ "]"
+      | otherwise = " " ++ ws ++ " "
+    sort' = sortBy (compare `on` (!! 0))
 
 myHandleEventHook = swallowEventHook (className =? "kitty" <||> className =? "Termite") (return True)
 
 myStartupHook = do
-        spawnOnce "dunst &"
-        spawnOnce "pipewire & /usr/bin/pipewire-pulse & /usr/bin/pipewire-media-session &"
-        spawnOnce "/home/$USER/.config/script/redshift.sh &"
-        spawnOnce "xss-lock /home/$USER/.config/script/betterlockscreen.sh  &"
-        spawnOnce "nextcloud --background &"
-        spawnOnce "fcitx -d &"
-        spawnOnce "copyq --start-server"
-        spawnOnce "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
-        spawnOnce "nm-applet &"
-        spawnOnce "picom --backend glx &"
-        spawnOnce "nitrogen --restore &"
+  spawnOnce "caffeine &"
+  spawnOnce "/home/$USER/.config/script/redshift.sh &"
+  spawnOnce "xss-lock /home/$USER/.config/script/betterlockscreen.sh  &"
+  spawnOnce "nextcloud --background &"
+  spawnOnce "fcitx -d &"
+  spawnOnce "copyq --start-server"
+  spawnOnce "/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1"
+  spawnOnce "nm-applet &"
+  spawnOnce "picom --backend glx &"
+  spawnOnce "nitrogen --restore &"
 
 myPP = def {ppCurrent = xmobarColor "black" "whight"}
-mainBar	= statusBarPropTo "_XMONAD_LOG_1" "polybar MainWithTray" (pure myPP)
-secondBar = statusBarPropTo "_XMONAD_LOG_2" "polybar SeconderyWitNoTray" (pure myPP)
+
+mainBar = statusBarPropTo "_XMONAD_LOG_1" "polybar barbase1" (pure myPP)
+
+secondBar = statusBarPropTo "_XMONAD_LOG_2" "polybar barbase2" (pure myPP)
+
 barSpawner :: ScreenId -> IO StatusBarConfig
 barSpawner 0 = pure $ mainBar
 barSpawner 1 = pure $ secondBar
 barSpawner _ = mempty
-main = do
-  xmonad $ docks $ ewmhFullscreen $ ewmh $ dynamicSBs barSpawner   def {
-      -- simple stuff
-        terminal           = myTerminal,
-        focusFollowsMouse  = myFocusFollowsMouse,
-        clickJustFocuses   = myClickJustFocuses,
-        borderWidth        = myBorderWidth,
-        modMask            = myModMask,
-        workspaces         = myWorkspaces,
-        normalBorderColor  = myNormalBorderColor,
-        focusedBorderColor = myFocusedBorderColor,
-      -- key bindings
-        keys               = myKeys,
-        mouseBindings      = myMouseBindings ,
 
-      -- hooks, layouts
-        layoutHook         = smartBorders $ myLayout,
-        manageHook         = myManageHook <+> scratchpadManageHook (W.RationalRect 0.4 0.3 0.6 0.5),
-        handleEventHook    = myEventHook,
-        logHook            = myLogHook >> updatePointer (0.5, 0.5) (0, 0),
-        startupHook        = myStartupHook  -- dynStatusBarStartup barInScreen (return ())
-    }
+main = do
+  xmonad $
+    docks $
+      ewmhFullscreen $
+        ewmh $
+          dynamicSBs
+            barSpawner
+            def
+              { -- simple stuff
+                terminal = myTerminal,
+                focusFollowsMouse = myFocusFollowsMouse,
+                clickJustFocuses = myClickJustFocuses,
+                borderWidth = myBorderWidth,
+                modMask = myModMask,
+                workspaces = myWorkspaces,
+                normalBorderColor = myNormalBorderColor,
+                focusedBorderColor = myFocusedBorderColor,
+                -- key bindings
+                keys = myKeys,
+                mouseBindings = myMouseBindings,
+                -- hooks, layouts
+                layoutHook = smartBorders $ myLayout,
+                manageHook = myManageHook <+> scratchpadManageHook (W.RationalRect 0.4 0.3 0.6 0.5),
+                handleEventHook = myEventHook,
+                logHook = myLogHook >> updatePointer (0.5, 0.5) (0, 0),
+                startupHook = myStartupHook -- dynStatusBarStartup barInScreen (return ())
+              }
   forM_ [".xmonad-workspace-log", ".xmonad-title-log"] $ \file -> do
     safeSpawn "mkfifo" ["/tmp/" ++ file]
diff --git a/xorg/.Xresources b/xorg/.Xresources
index 135afc5..b97c302 100644
--- a/xorg/.Xresources
+++ b/xorg/.Xresources
@@ -1 +1 @@
-Xcursor.theme: Adwaita
+Xcursor.theme: Simp1e
diff --git a/xorg/.xinitrc b/xorg/.xinitrc
index 75c26d3..aa73040 100755
--- a/xorg/.xinitrc
+++ b/xorg/.xinitrc
@@ -1,13 +1,13 @@
-#!/usr/bin/env bash
+#!/bin/sh
 
 xset +fp /home/mrfluffy/.local/share/fonts
 xset fp rehash
+xrdb ~/.Xresources
 numlockx on
 xsetroot -cursor_name left_ptr
 xrandr --output eDP --mode 1920x1080 --pos 0x0 --rotate normal --output HDMI-A-0 --primary --mode 1920x1080 --pos 1920x0 --rotate normal
 xrandr --output HDMI-A-0 --set TearFree on &
 xrandr --output eDP --set TearFree on &
-#exec /home/mrfluffy/.local/bin/xmonad
 source /etc/X11/xinit/xinitrc.d/50-systemd-user.sh
 eval "$(gnome-keyring-daemon --start)"
 export SSH_AUTH_SOCK
@@ -16,8 +16,8 @@ mkdir -p "$HOME"/.local/share/keyrings
 #exec dbus-launch leftwm
 #polybar barbase &
 
-#exec qtile start
-/home/mrfluffy/.config/hentaiwm/target/release/hentaiwm &> ~/.penrose.log
+exec /home/mrfluffy/.local/bin/xmonad
+#/home/mrfluffy/.config/hentaiwm/target/release/hentaiwm &> ~/.penrose.log
 #-----------------------------------------------------
 #gome session
 #export XDG_SESSION_TYPE=x11
diff --git a/zsh/.config/zsh/.zcompdump b/zsh/.config/zsh/.zcompdump
index 03d08dc..a7245a2 100644
--- a/zsh/.config/zsh/.zcompdump
+++ b/zsh/.config/zsh/.zcompdump
@@ -1,4 +1,4 @@
-#files: 831	version: 5.9
+#files: 811	version: 5.9
 
 _comps=(
 '-' '_precommand'
@@ -24,6 +24,7 @@ _comps=(
 'add-zle-hook-widget' '_add-zle-hook-widget'
 'add-zsh-hook' '_add-zsh-hook'
 'admin' '_sccs'
+'alacritty' '_alacritty'
 'ali' '_mh'
 'alias' '_alias'
 'amaya' '_webbrowser'
@@ -134,7 +135,6 @@ _comps=(
 'cabal' '_cabal'
 'cal' '_cal'
 'calendar' '_calendar'
-'cargo' '_cargo'
 'cat' '_cat'
 'catchsegv' '_precommand'
 'cc' '_gcc'
@@ -152,7 +152,6 @@ _comps=(
 'chattr' '_chattr'
 'chcon' '_chcon'
 'chdir' '_cd'
-'checkupdates' '_checkupdates'
 'chfn' '_users'
 'chgrp' '_chown'
 'chimera' '_webbrowser'
@@ -179,6 +178,7 @@ _comps=(
 'cmp' '_cmp'
 'co' '_rcs'
 'code' '_code'
+'code-oss' '_code-oss'
 'column' '_column'
 'comb' '_sccs'
 'combine' '_imagemagick'
@@ -324,7 +324,6 @@ _comps=(
 'fc' '_fc'
 'fc-list' '_xft_fonts'
 'fc-match' '_xft_fonts'
-'fd' '_fd'
 'feh' '_feh'
 'fetchmail' '_fetchmail'
 'ffmpeg' '_ffmpeg'
@@ -424,6 +423,7 @@ _comps=(
 'ggetopt' '_getopt'
 'ggrep' '_grep'
 'ggv' '_gnome-gv'
+'ghcup' '_ghcup'
 'ghead' '_head'
 'ghostscript' '_ghostscript'
 'ghostview' '_pspdf'
@@ -877,22 +877,14 @@ _comps=(
 'p4' '_perforce'
 'p4d' '_perforce'
 'pacat' '_pulseaudio'
-'paccache' '_paccache'
-'pacdiff' '_pacdiff'
 'pack' '_pack'
 'packf' '_mh'
-'paclist' '_paclist'
-'paclog-pkglist' '_paclog-pkglist'
 'pacman' '_pacman'
 'pacman-conf' '_pacman'
 'pacman-key' '_pacman'
 'pacman.static' '_pacman'
 'pacmd' '_pulseaudio'
-'pacscripts' '_pacscripts'
-'pacsearch' '_pacsearch'
-'pacsort' '_pacsort'
 'pactl' '_pulseaudio'
-'pactree' '_pactree'
 'padsp' '_pulseaudio'
 'pandoc' '_pandoc'
 'paplay' '_pulseaudio'
@@ -952,7 +944,6 @@ _comps=(
 'pkginfo' '_pkginfo'
 'pkgrm' '_pkgrm'
 'pkill' '_pgrep'
-'playerctl' '_playerctl'
 'pldd' '_pids'
 'pmake' '_make'
 'pman' '_perl_modules'
@@ -1025,11 +1016,9 @@ _comps=(
 'pyhtmlizer' '_twisted'
 'qdbus' '_qdbus'
 'qiv' '_qiv'
-'qpdf' '_qpdf'
 'quilt' '_quilt'
 'r' '_fc'
 'rake' '_rake'
-'rankmirrors' '_rankmirrors'
 'ranlib' '_ranlib'
 'rar' '_rar'
 'rc' '_sh'
@@ -1071,7 +1060,6 @@ _comps=(
 'rgview' '_vim'
 'rgvim' '_vim'
 'ri' '_ri'
-'riverctl' '_riverctl'
 'rlogin' '_rlogin'
 'rm' '_rm'
 'rmd160' '_cksum'
@@ -1096,7 +1084,6 @@ _comps=(
 'run-help' '_run-help'
 'rup' '_hosts'
 'rusage' '_precommand'
-'rustup' '_rustup'
 'rview' '_vim'
 'rvim' '_vim'
 'rwho' '_hosts'
@@ -1186,7 +1173,6 @@ _comps=(
 'ssh-keygen' '_ssh'
 'ssh-keyscan' '_ssh'
 'star' '_tar'
-'starship' '_starship'
 'start' '_initctl'
 'stat' '_stat'
 'status' '_initctl'
@@ -1216,8 +1202,6 @@ _comps=(
 'svnliteadmin' '_subversion'
 'swaks' '_swaks'
 'swanctl' '_swanctl'
-'swayidle' '_swayidle'
-'swaylock' '_swaylock'
 'swift' '_swift'
 'swiftc' '_swift'
 'sync' '_nothing'
@@ -1338,7 +1322,6 @@ _comps=(
 'unwrapdiff' '_patchutils'
 'unxz' '_xz'
 'unzip' '_zip'
-'updpkgsums' '_updpkgsums'
 'uptime' '_uptime'
 'urxvt' '_urxvt'
 'urxvt256c' '_urxvt'
@@ -1444,8 +1427,6 @@ _comps=(
 'whom' '_mh'
 'wiggle' '_wiggle'
 'wipefs' '_wipefs'
-'wl-copy' '_wl-copy'
-'wl-paste' '_wl-paste'
 'wodim' '_cdrecord'
 'wpa_cli' '_wpa_cli'
 'write' '_users_on'
@@ -1518,7 +1499,6 @@ _comps=(
 'ypxfr' '_yp'
 'ytalk' '_other_accounts'
 'zargs' '_zargs'
-'zathura' '_zathura'
 'zcalc' '_zcalc'
 '-zcalc-line-' '_zcalc_line'
 'zcat' '_zcat'
@@ -1680,20 +1660,16 @@ bindkey '^[,' _history-complete-newer
 bindkey '^[/' _history-complete-older
 bindkey '^[~' _bash_complete-word
 
-autoload -Uz _bat _bootctl _busctl _bwrap _cargo \
-            _checkupdates _code _coredumpctl _curl _exa \
-            _fd _hostnamectl _journalctl _kernel-install _kitty \
+autoload -Uz _alacritty _bat _bootctl _busctl _bwrap \
+            _code _code-oss _coredumpctl _curl _exa \
+            _ghcup _hostnamectl _journalctl _kernel-install _kitty \
             _libinput _localectl _loginctl _machinectl _mkinitcpio \
-            _mpv _networkctl _oomctl _paccache _pacdiff \
-            _paclist _paclog-pkglist _pacman _pacscripts _pacsearch \
-            _pacsort _pactree _paru _playerctl _polybar \
-            _polybar_msg _pulseaudio _qpdf _rankmirrors _resolvectl \
-            _rg _riverctl _rustup _sd_hosts_or_user_at_host _sd_machines \
-            _sd_outputmodes _sd_unit_files _starship _swayidle _swaylock \
-            _systemctl _systemd _systemd-analyze _systemd-delta _systemd-inhibit \
-            _systemd-nspawn _systemd-path _systemd-run _systemd-tmpfiles _timedatectl \
-            _udevadm _updpkgsums _wl-copy _wl-paste _xss-lock \
-            _zathura _zoxide _cdr _all_labels _all_matches \
+            _mpv _networkctl _oomctl _pacman _paru \
+            _polybar _polybar_msg _pulseaudio _resolvectl _rg \
+            _sd_hosts_or_user_at_host _sd_machines _sd_outputmodes _sd_unit_files _systemctl \
+            _systemd _systemd-analyze _systemd-delta _systemd-inhibit _systemd-nspawn \
+            _systemd-path _systemd-run _systemd-tmpfiles _timedatectl _udevadm \
+            _xss-lock _zoxide _cdr _all_labels _all_matches \
             _alternative _approximate _arg_compile _arguments _bash_completions \
             _cache_invalid _call_function _combination _complete _complete_debug \
             _complete_help _complete_help_generic _complete_tag _comp_locale _correct \
diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
index 3524a2d..c7f0c4d 100644
--- a/zsh/.config/zsh/.zshrc
+++ b/zsh/.config/zsh/.zshrc
@@ -5,7 +5,7 @@ SAVEHIST=3000
 source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
 bindkey -v
 source ~/.zsh/spaceship/spaceship.zsh
-export PATH=$HOME/.local/bin/genymotion:$HOME/bin:/usr/local/bin:$HOME/.emacs.d/bin:$HOME/.local/bin:$HOME/.cargo/bin:$PATH
+export PATH=$HOME/.local/bin/genymotion:$HOME/bin:/usr/local/bin:$HOME/.emacs.d/bin:$HOME/.local/bin:$HOME/.cargo/bin:$HOME/.cabal/bin:$HOME/.ghcup/bin:$HOME/.stack/bin:$PATH
 export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_STATE_HOME="$HOME/.local/state"