diff --git a/files/.config/configstore/update-notifier-npm.json b/files/.config/configstore/update-notifier-npm.json
index f796644..f2bade8 100644
--- a/files/.config/configstore/update-notifier-npm.json
+++ b/files/.config/configstore/update-notifier-npm.json
@@ -1,4 +1,10 @@
 {
 	"optOut": false,
-	"lastUpdateCheck": 1607799387166
+	"lastUpdateCheck": 1609704527220,
+	"update": {
+		"latest": "6.14.10",
+		"current": "6.14.9",
+		"type": "patch",
+		"name": "npm"
+	}
 }
\ No newline at end of file
diff --git a/files/.config/eww/eww.scss b/files/.config/eww/eww.scss
index fc7ee59..1bdbc37 100644
--- a/files/.config/eww/eww.scss
+++ b/files/.config/eww/eww.scss
@@ -85,3 +85,11 @@ scale trough {
 .fuck {
   border-radius: 100px;
 }
+
+.whatever {
+  border: 2px solid green;
+}
+
+.lol {
+  color: red;
+}
diff --git a/files/.config/eww/eww.xml b/files/.config/eww/eww.xml
index a2987cd..5fcfa69 100644
--- a/files/.config/eww/eww.xml
+++ b/files/.config/eww/eww.xml
@@ -1,7 +1,7 @@
 <eww>
   <definitions>
 
-    <def name="test">
+   <def name="test">
       <box class="{{some_var}}"  space-evenly="false" spacing="10">
         testing {{shit}}
         <scale value="50" orientation="v" min="0" max="100" flipped="true" />
@@ -11,18 +11,19 @@
         <calendar show-heading="false" show-day-names="false" day="2" onclick="notify-send 'asdf' '{}'" />
         notify-send 'ree' 'this is {{shit}}'
         <multiple text="{{shit}}" />
+
       </box>
     </def>
 
     <def name="multiple">
       <box orientation="v" space-evenly="false">
-        <box>{{text}}</box>
-        <box>{{text}}</box>
-        <box>{{text}}</box>
+        <box>{{text}}test</box>
+        <box class="whatever lol">{{text}}</box>
+        <box style="color: blue;">{{text}}</box>
         <box>{{text}}</box>
         <box>{{text}}</box>
 
-        <label text="reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" limit-width="5" wrap="true" />
+        <label onscroll="notify-send '{{shit}}' {}" text="reeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee" limit-width="5" wrap="true" />
         <input onchange="notify-send 'ree' '{}'" />
         {{date}}
       </box>
@@ -76,6 +77,7 @@
     </var>
     <var name="some_var"></var>
 
+
     <var name="song-image"></var>
     <var name="song-image-visible">true</var>
     <var name="song-name"></var>
@@ -93,6 +95,7 @@
       date
       done
     </script-var>
+
     <!--<script-var name="xyz">-->
     <!--tail -F /home/leon/test | while read -r _; do notify-send "Hi"; done-->
     <!--</script-var>-->
@@ -104,14 +107,14 @@
 
 
   <windows>
-    <window screen="0" name="main_window" stacking="fg">
+    <window screen="DisplayPort-0" name="mw" stacking="fg" focusable="false">
       <!--<struts top="250" top_end_x="1920"/>-->
-      <geometry anchor="top center"/>
+      <geometry anchor="center" width="200px" height="200px" x="0px" y="0px"/>
       <widget>
         <test ree="test" />
       </widget>
     </window>
-    <window screen="0" name="main_window2" stacking="fg">
+    <window screen="0" name="mw2" stacking="fg">
       <geometry anchor="bottom right"/>
       <widget>
         <test ree="test" />
diff --git a/files/.config/polybar/launch.sh b/files/.config/polybar/launch.sh
index 4310a0c..9d2948c 100755
--- a/files/.config/polybar/launch.sh
+++ b/files/.config/polybar/launch.sh
@@ -7,7 +7,7 @@ echo "---" | tee -a /tmp/polybar1.log /tmp/polybar2.log
 outputs=$(xrandr --query | grep " connected" | cut -d" " -f1)
 tray_output=HDMI-A-0
 for m in $outputs; do
-  if [[ $m != "DisplayPort-1" ]]; then
+  if [[ $m != "DP-1" ]]; then
     tray_output=$m
   fi
 done
diff --git a/files/.xmonad/lib/Config.hs b/files/.xmonad/lib/Config.hs
index fd1d455..9600531 100644
--- a/files/.xmonad/lib/Config.hs
+++ b/files/.xmonad/lib/Config.hs
@@ -601,16 +601,23 @@ activateWindowEventHook (ClientMessageEvent { ev_message_type = messageType, ev_
   activateWindowAtom <- getAtom "_NET_ACTIVE_WINDOW"
 
   when (messageType == activateWindowAtom) $
-    if window `elem` W.allWindows ws
+    if window `elem` (W.integrate' $ W.stack $ W.workspace $ W.current ws)
       then windows (W.focusWindow window)
       else do
         shouldRaise <- runQuery (className =? "discord" <||> className =? "web.whatsapp.com") window
         if shouldRaise
            then windows (W.shiftWin (W.currentTag ws) window)
-           else windows (IS.focusWindow' window)
+           else windows (focusWindow' window)
   return $ All True
 activateWindowEventHook _ = return $ All True
 
+-- | Focus a window, switching workspace on the correct Xinerama screen if neccessary.
+focusWindow' :: Window -> WindowSet -> WindowSet
+focusWindow' window ws
+  | Just window == W.peek ws = ws
+  | otherwise = case W.findTag window ws of
+      Just tag ->  IS.focusScreen (IS.unmarshallS tag) ws
+      Nothing -> ws
 
 
 -- | Fixes fullscreen behaviour of chromium based apps by quickly applying and undoing a resize.
diff --git a/files/nix-stuff/nixpkgs/modules/base.nix b/files/nix-stuff/nixpkgs/modules/base.nix
index a76c186..da206a5 100644
--- a/files/nix-stuff/nixpkgs/modules/base.nix
+++ b/files/nix-stuff/nixpkgs/modules/base.nix
@@ -38,6 +38,8 @@ in
       gc = "git commit -m ";
       gp = "git push";
       gst = "git status";
+      g = "git fuzzy";
+      cr = "cargo run --";
     };
 
     home.packages = with pkgs; lib.mkMerge [
diff --git a/files/nix-stuff/nixpkgs/modules/desktop.nix b/files/nix-stuff/nixpkgs/modules/desktop.nix
index f5b5800..2df45f4 100644
--- a/files/nix-stuff/nixpkgs/modules/desktop.nix
+++ b/files/nix-stuff/nixpkgs/modules/desktop.nix
@@ -26,6 +26,7 @@ in
       espanso
       barrier
       #hyper-haskell
+      font-manager
     ];
 
 
diff --git a/files/nix-stuff/nixpkgs/modules/term/zsh/prompt.zsh b/files/nix-stuff/nixpkgs/modules/term/zsh/prompt.zsh
index ffd7afe..c8cb11d 100644
--- a/files/nix-stuff/nixpkgs/modules/term/zsh/prompt.zsh
+++ b/files/nix-stuff/nixpkgs/modules/term/zsh/prompt.zsh
@@ -20,9 +20,9 @@ git_status() {
   local BRANCH=$(git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/*\s*\(.*\)/\1/')
 
   if [ ! -z $BRANCH ]; then
-    echo -n "(%F{$__bright_cyan}$BRANCH"
-    [ ! -z "$(git status --short)" ] && echo -n "%F{$__bright_white}*%f"
-    echo -n ")"
+    echo -n "(%F{$__bright_cyan}$BRANCH%F{$__bright_white}"
+    [ ! -z "$(git status --short)" ] && echo -n "*"
+    echo -n ")%f"
   fi
 }