diff --git a/nixos/desktop/systemd.nix b/nixos/desktop/systemd.nix
new file mode 100644
index 00000000..6a99948c
--- /dev/null
+++ b/nixos/desktop/systemd.nix
@@ -0,0 +1,7 @@
+{ ... }:
+{
+  systemd.user.targets.tray = {
+    enable = true;
+    wantedBy = ["graphical-session.target"];
+  };
+}
diff --git a/nixos/desktop/xfce.nix b/nixos/desktop/xfce.nix
index 27475b24..f5d68353 100644
--- a/nixos/desktop/xfce.nix
+++ b/nixos/desktop/xfce.nix
@@ -5,6 +5,9 @@
     ./xserver.nix
     ./sddm.nix
   ];
+  environment.systemPackages = with pkgs; [
+    xwallpaper
+  ];
   services.xserver = {
     enable = true;
     desktopManager.xterm.enable = false;
@@ -17,7 +20,7 @@
     displayManager = {
       defaultSession = "xfce+bspwm";
       sessionCommands = ''
-        xwallpaper --daemon --center $HOME/.dotfiles/wallpaper/images_dark/1920x1080.png
+        ${pkgs.xwallpaper}/bin/xwallpaper --daemon --center $HOME/.dotfiles/wallpaper/images_dark/1920x1080.png
         ${pkgs.xorg.xinput}/bin/xinput set-button-map "Logitech USB Receiver Mouse" 3 2 1
       '';
     };
diff --git a/nixos/desktop/xserver.nix b/nixos/desktop/xserver.nix
index 6bb7c47d..ee2777d4 100644
--- a/nixos/desktop/xserver.nix
+++ b/nixos/desktop/xserver.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./common.nix
+    ./systemd.nix
   ];
   services.xserver = {
     enable = true;
diff --git a/nixos/home-manager/env/bspwm.nix b/nixos/home-manager/env/bspwm.nix
index a9c3f205..5412b8db 100644
--- a/nixos/home-manager/env/bspwm.nix
+++ b/nixos/home-manager/env/bspwm.nix
@@ -14,10 +14,18 @@
       pointer_action3 = "resize_corner";
     };
     monitors = {
-      "primary" = ["I" "II" "III" "IV" "V"];
+      "primary" = ["I" "II" "III" "IV"];
     };
     rules = {
       "Xfce4-terminal".state = "floating";
+      "kitty" = {
+        desktop = "^1";
+        focus = true;
+      };
+      "firefox" = {
+        desktop = "^2";
+        focus = false;
+      };
     };
   };
 }
diff --git a/polybar/polybar.ini b/nixos/home-manager/env/config/polybar/polybar.ini
similarity index 84%
rename from polybar/polybar.ini
rename to nixos/home-manager/env/config/polybar/polybar.ini
index 4ffd733b..da1577a9 100644
--- a/polybar/polybar.ini
+++ b/nixos/home-manager/env/config/polybar/polybar.ini
@@ -16,15 +16,55 @@
 ;
 ;==========================================================
 
-[global/wm]
-include-file = ~/.dotfiles/polybar/macchiato.ini
+[colors]
+ base = #24273a
+ mantle = #1e2030
+ crust = #181926
+
+ text = #cad3f5
+ subtext0 = #a5adcb
+ subtext1 = #b8c0e0
+
+ surface0 = #363a4f
+ surface1 = #494d64
+ surface2 = #5b6078
+ 
+ overlay0 = #6e738d
+ overlay1 = #8087a2
+ overlay2 = #939ab7
+ 
+
+ blue = #8aadf4
+ lavender = #b7bdf8
+ sapphire = #7dc4e4
+ sky = #91d7e3
+ teal = #8bd5ca
+ green = #a6da95
+ yellow = #eed49f
+ peach = #f5a97f
+ maroon = #ee99a0
+ red = #ed8796
+ mauve = #c6a0f6
+ pink = #f5bde6
+ flamingo = #f0c6c6
+ rosewater = #f4dbd6
+
+ transparent = #00000000
+
+ background = ${colors.base}
+ background-alt = ${colors.crust}
+ foreground = ${colors.text}
+ primary = ${colors.lavender}
+ secondary = ${colors.mauve}
+ alert = ${colors.red}
+ disabled = ${colors.surface0}
 
 [bar/example]
 width = 100%
 height = 24pt
 radius = 6
 
-; dpi = 96
+dpi = 96
 
 background = ${colors.background}
 foreground = ${colors.foreground}
diff --git a/nixos/home-manager/env/polybar.nix b/nixos/home-manager/env/polybar.nix
index effc67c0..07e8d010 100644
--- a/nixos/home-manager/env/polybar.nix
+++ b/nixos/home-manager/env/polybar.nix
@@ -1,7 +1,8 @@
-{ ... }:
+{ pkgs, ... }:
 {
   services.polybar = {
     enable = true;
-    script = "polybar -c $HOME/.dotfiles/polybar/polybar.ini &";
+    config = ./config/polybar/polybar.ini;
+    script = "${pkgs.polybar}/bin/polybar &";
   };
 }
diff --git a/nixos/home-manager/env/sxhkd.nix b/nixos/home-manager/env/sxhkd.nix
index dd9421a8..dbba2329 100644
--- a/nixos/home-manager/env/sxhkd.nix
+++ b/nixos/home-manager/env/sxhkd.nix
@@ -18,7 +18,7 @@
       "super + g" = "bspc node -s biggest";
 
       # Custom scripts
-      "super + p" = "$HOME/.dotfiles/scripts/powermenu";
+      "super + p" = "xfce4-session-logout";  # "$HOME/.dotfiles/scripts/powermenu";
       "super + e" = "$HOME/.dotfiles/scripts/power-profiles";
 
       # State/Flags
diff --git a/nixos/home-manager/packages/gui/cloud.nix b/nixos/home-manager/packages/gui/cloud.nix
index c666b381..684bb07e 100644
--- a/nixos/home-manager/packages/gui/cloud.nix
+++ b/nixos/home-manager/packages/gui/cloud.nix
@@ -1,10 +1,10 @@
 { pkgs, ... }:
 
 {
-  services.nextcloud-client = {
-    enable = true;
-    startInBackground = true;
-  };
+  #services.nextcloud-client = {
+  #  enable = true;
+  #  startInBackground = true;
+  #};
   home.packages = with pkgs; [
     zotero
   ];
diff --git a/polybar/macchiato.ini b/polybar/macchiato.ini
deleted file mode 100644
index 718dac3b..00000000
--- a/polybar/macchiato.ini
+++ /dev/null
@@ -1,47 +0,0 @@
-;-------------------------
-; Catppuccin Macchiato Palette
-; Maintainer: justTOBBI
-;--------------------------
-
-[colors]
- base = #24273a
- mantle = #1e2030
- crust = #181926
-
- text = #cad3f5
- subtext0 = #a5adcb
- subtext1 = #b8c0e0
-
- surface0 = #363a4f
- surface1 = #494d64
- surface2 = #5b6078
- 
- overlay0 = #6e738d
- overlay1 = #8087a2
- overlay2 = #939ab7
- 
-
- blue = #8aadf4
- lavender = #b7bdf8
- sapphire = #7dc4e4
- sky = #91d7e3
- teal = #8bd5ca
- green = #a6da95
- yellow = #eed49f
- peach = #f5a97f
- maroon = #ee99a0
- red = #ed8796
- mauve = #c6a0f6
- pink = #f5bde6
- flamingo = #f0c6c6
- rosewater = #f4dbd6
-
- transparent = #00000000
-
- background = ${colors.base}
- background-alt = ${colors.crust}
- foreground = ${colors.text}
- primary = ${colors.lavender}
- secondary = ${colors.mauve}
- alert = ${colors.red}
- disabled = ${colors.surface0}
diff --git a/polybar/startup.sh b/polybar/startup.sh
deleted file mode 100755
index 632c99e4..00000000
--- a/polybar/startup.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-POLYBAR_CONFIG_DIR="$HOME/.dotfiles/polybar"
-polybar -c "$POLYBAR_CONFIG_DIR/polybar.ini" & disown
-#polybar -c "$POLYBAR_CONFIG_DIR/config" pam1 & disown
-#polybar -c "$POLYBAR_CONFIG_DIR/config" pam2 & disown
-#polybar -c "$POLYBAR_CONFIG_DIR/config" pam3 & disown
-#polybar -c "$POLYBAR_CONFIG_DIR/config" pam4 & disown
-#polybar -c "$POLYBAR_CONFIG_DIR/config" pam5 & disown
-#polybar -c "$POLYBAR_CONFIG_DIR/config" pam6 & disown