diff --git a/.config/xmobar/xmobar-laptop.config b/.config/xmobar/xmobar-laptop.config
index 2a68f85..f745f3e 100644
--- a/.config/xmobar/xmobar-laptop.config
+++ b/.config/xmobar/xmobar-laptop.config
@@ -16,14 +16,16 @@ Config { font = "xft:monospace"
        , allDesktops = True
        , overrideRedirect = True
        , commands = [
-              Run Cpu ["-L","3","-H","50", "--normal","green","--high","red"] 10
+              Run Cpu ["-L","3","-H","50"] 5
             , Run Memory ["-t","Mem: <usedratio>%"] 10
             , Run Swap [] 10
             , Run Com "uname" ["-s","-r"] "" 36000
+            , Run Weather "EDDN" [ "-t","<station>: <tempC> °C, <skyCondition>" ] 900
             , Run Date "%H:%M - %d.%m.%Y" "date" 10
-            , Run Wireless "wlp1s0" [ "-t", "<essid>" ] 10
+            , Run DynNetwork [ "-S","True","-t", "<dev>: <rx>, <tx>" ] 15
+            , Run Volume "default" "Master" [] 2
             , Run Battery [
-                "-t", "<acstatus>: <left>% <timeleft>",
+                "-t", "<acstatus>: <left>% - <timeleft>",
 	            "--",
                 --"-c", "charge_full",
 	            "-O", "AC",
@@ -34,6 +36,6 @@ Config { font = "xft:monospace"
          ]
        , sepChar = "%"
        , alignSep = "}{"
-       , template = " %cpu% | %memory% * %swap% }\
-                    \{ <fc=#ff55cc>%wlp1s0wi%</fc> | <fc=#9999ff>%battery%</fc> | <fc=#ffd700>%date%</fc> | <fc=#0fb471>%uname%</fc> "
+       , template = " <fc=#ffff0a>%cpu%</fc> | <fc=#ffaf30>%memory%</fc> | <fc=#1fffb4>%swap%</fc> | <fc=#9999ff>%battery%</fc> | %default:Master% }\
+                    \{ <fc=#ff55cc>%dynnetwork%</fc> | <fc=#ff711f>%EDDN%</fc> | <fc=#ffd700>%date%</fc> | <fc=#0fb471>%uname%</fc> "
 }
diff --git a/.xmonad/xmonad-laptop.hs b/.xmonad/xmonad-laptop.hs
index c8110e6..6283ab2 100644
--- a/.xmonad/xmonad-laptop.hs
+++ b/.xmonad/xmonad-laptop.hs
@@ -32,15 +32,17 @@ myFocusFollowsMouse = True
 myClickJustFocuses :: Bool
 myClickJustFocuses = False
 
-myBorderWidth = 5
-
 myModMask = mod4Mask
 
 myWorkspaces = ["1", "2", "3", "4", "5", "6", "7", "8", "9"]
 
+myBorderWidth = 5
 myNormalBorderColor = "#dddddd"
 myFocusedBorderColor = "#ff8700"
 
+-- screen spacing, then window spacing
+mySpacing x y = spacingRaw False (Border x x x x) True (Border y y y y) True
+
 myKeys :: [(String, X ())]
 myKeys = [
     -- spawning keybindings
@@ -63,6 +65,12 @@ myKeys = [
     ("M-<Tab>"      , windows W.focusDown),
     ("M-S-<Tab>"    , windows W.focusMaster),
 
+    -- spacing keybindings
+    ("M4-S-<Up>"    , incWindowSpacing 1),
+    ("M4-S-<Down>"  , decWindowSpacing 1),
+    ("M1-S-<Up>"    , incScreenSpacing 1),
+    ("M1-S-<Down>"  , decScreenSpacing 1),
+
     -- brightness keybindings
     ("<XF86MonBrightnessUp>"    , spawn "light -A 2"),
     ("<XF86MonBrightnessDown>"  , spawn "light -U 2"),
@@ -100,9 +108,11 @@ myMouseBindings (XConfig {XMonad.modMask = modm}) =
       -- you may also bind events to the mouse scroll wheel (button4 and button5)
     ]
 
-myLayout = spacing 12 $ avoidStruts (tiled ||| Mirror tiled ||| Full)
+
+
+myLayoutHook = avoidStruts (tiled ||| Mirror tiled ||| Full)
   where
-     tiled   = Tall nmaster delta ratio
+     tiled   = mySpacing 32 8 $ Tall nmaster delta ratio
      nmaster = 1
      ratio   = 1/2
      delta   = 3/100
@@ -115,7 +125,8 @@ myEventHook = mempty
 
 myLogHook = return ()
 
-myStartupHook = return ()
+myStartupHook = do
+    spawnOnce "xsetroot -cursor_name left_ptr"
 
 main = do
   xmproc0 <- spawnPipe "nitrogen --restore"
@@ -137,7 +148,7 @@ defaults = def {
     mouseBindings = myMouseBindings,
     
     -- hooks
-    layoutHook = myLayout,
+    layoutHook = myLayoutHook,
     manageHook = myManageHook,
     handleEventHook = myEventHook,
     logHook = myLogHook,
diff --git a/scripts/basic-setup b/scripts/basic-setup
index 4869d26..3aa2ecf 100755
--- a/scripts/basic-setup
+++ b/scripts/basic-setup
@@ -34,6 +34,7 @@ ipkg yay
 # setup git
 ipkg git
 ipkg libsecret
+ipkg gnome-keyring
 
 git config --global credential.helper /usr/lib/git-core/git-credential-libsecret