diff --git a/Vanguard.nix b/Vanguard.nix
index 92252262..4e4f0152 100644
--- a/Vanguard.nix
+++ b/Vanguard.nix
@@ -6,6 +6,8 @@
     ./hardware/audio.nix
     ./hardware/bluetooth.nix
     ./locales/en_GB.nix
+    ./desktop/xserver.nix
+    ./desktop/sddm.nix
     ./desktop/hyprland.nix
     ./desktop/steam.nix
     ./syncthing/Vanguard.nix
diff --git a/home/Vanguard/xenia.nix b/home/Vanguard/xenia.nix
index e7218043..60b506b6 100644
--- a/home/Vanguard/xenia.nix
+++ b/home/Vanguard/xenia.nix
@@ -16,8 +16,8 @@
     monitor=DP-1,highrr,auto,1
     monitor=HDMI-A-1,highres,auto,2
 
-    exec-once = waybar -c
-    exec-once=hyprpaper -c ~/.config/hypr/hyprpaper-Vanguard.conf
+    exec-once = hyprpaper
+    exec-once = waybar
   '';
   programs.waybar = {
     style = ''
diff --git a/home/desktop/waybar.nix b/home/desktop/waybar.nix
index 43fee618..904ebe3d 100644
--- a/home/desktop/waybar.nix
+++ b/home/desktop/waybar.nix
@@ -8,8 +8,5 @@
     source = ./config/waybar;
     recursive = true;
   };
-  programs.waybar = {
-    enable = true;
-    systemd.enable = true;
-  };
+  programs.waybar.enable = true;
 }