diff --git a/machines/Vanguard/default.nix b/machines/Vanguard/default.nix
index f0b2dbad..4c95c212 100644
--- a/machines/Vanguard/default.nix
+++ b/machines/Vanguard/default.nix
@@ -4,7 +4,7 @@
     ../../hardware/audio.nix
     ../../hardware/bluetooth.nix
     ../../locales/en_GB.nix
-    ../../desktop/hyprland.nix
+    ../../wm/sway.nix
     ../../services/sshd
   ];
   networking = {
@@ -15,14 +15,9 @@
   environment.systemPackages = with pkgs; [mesa];
 
   # Steam
-  programs.gamescope = {
-    enable = true;
-    capSysNice = true;
-  };
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true;
-    gamescopeSession.enable = true;
   };
   hardware.steam-hardware.enable = true;
   hardware.opengl.driSupport32Bit = true;
@@ -40,7 +35,6 @@
     enable = true;
     settings = rec {
       initial_session = {
-        # command = "${pkgs.gamescope}/bin/gamescope --steam  -- steam -tenfoot -pipewire-dmabuf";
         command = "sway";
         user = "xenia";
       };
diff --git a/machines/Vanguard/xenia.nix b/machines/Vanguard/xenia.nix
index ce455af7..ab37b35c 100644
--- a/machines/Vanguard/xenia.nix
+++ b/machines/Vanguard/xenia.nix
@@ -8,29 +8,8 @@
   home.homeDirectory = "/home/xenia";
   home.stateVersion = "22.11";
 
-  # wayland.windowManager.hyprland.extraConfig = ''
-  #   source=./common.conf
-  #   monitor=HDMI-A-2,preferred,auto,2.00
-  # '';
   wayland.windowManager.sway.config = {
     output.HDMI-A-2.scale = "2.0";
     startup = [{command = "steam";}];
   };
-  programs.waybar.settings.main = {
-    "modules-left" = [
-      "sway/workspaces"
-      "cpu"
-      "memory"
-      "temperature"
-    ];
-    "modules-center" = ["clock"];
-    "modules-right" = [
-      "pulseaudio"
-      "bluetooth"
-      "network"
-      "backlight"
-      "battery"
-      "tray"
-    ];
-  };
 }