diff --git a/flake.nix b/flake.nix
index b68fcbf4..99d1d6ca 100644
--- a/flake.nix
+++ b/flake.nix
@@ -116,7 +116,7 @@
                 users = let
                   authorizedKeys.keys = [
                     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINI1dWlS16Keil0MGPWmMsBzx8F9ylfz+fRwxUr8/tZ/ ion"
-                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIANfkqd5lPTsSPU3SRYnAa1UjCYDmDeBTyzq5McmWlm6 xenia@Vanguard"
+                    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC4M1zV3yLMMI1tYwdY9QDXJDlOBugm7UXKC+Xk89yHq pixelifytica@Vanguard"
                     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN3fRij9Tm6davrSQOPYEZP7CdZdZ0D9ogWXWjpTs40e pixelifytica@Northstar"
                   ];
                 in {
diff --git a/home/sway/default.nix b/home/sway/default.nix
index 1de21047..975bc7f4 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -85,7 +85,7 @@
       };
       startup = [
         {command = "${pkgs.swaynotificationcenter}/bin/swaync";}
-        {command = "${pkgs.swaybg}/bin/swaybg -i ${../../wallpapers/waves/cat-waves.png}";}
+        {command = "${pkgs.swaybg}/bin/swaybg -m fill -i ${../../wallpapers/waves/cat-waves.png}";}
         {command = "${pkgs.libsForQt5.polkit-kde-agent}/libexec/polkit-kde-authentication-agent-1";}
         {command = "${pkgs.protonmail-bridge}/bin/protonmail-bridge -n";}
       ];
@@ -93,24 +93,28 @@
         border = 1;
         commands = [
           {
-            command = "floating enable";
             criteria = {app_id = "org.kde.polkit-kde-authentication-agent-1";};
+            command = "floating enable";
           }
           {
-            command = "floating enable";
             criteria = {app_id = "Pinentry";};
+            command = "floating enable";
           }
           {
-            command = "floating enable";
             criteria = {app_id = "pavucontrol";};
+            command = "floating enable";
           }
           {
-            command = "floating enable";
             criteria = {app_id = ".blueman-manager-wrapped";};
+            command = "floating enable";
           }
           {
-            command = "floating enable";
             criteria = {app_id = "nm-connection-editor";};
+            command = "floating enable";
+          }
+          {
+            criteria = {class = "steam";};
+            command = "layout tabbed";
           }
         ];
       };
diff --git a/hosts/Vanguard/hardware-configuration.nix b/hosts/Vanguard/hardware-configuration.nix
index d21982c9..6593a4e9 100644
--- a/hosts/Vanguard/hardware-configuration.nix
+++ b/hosts/Vanguard/hardware-configuration.nix
@@ -8,24 +8,22 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ "dm-snapshot" ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/5b198ee6-6361-4158-a582-7935da965473";
+    { device = "/dev/disk/by-uuid/379a999a-0753-4cbf-b868-e275902f0f73";
       fsType = "ext4";
     };
 
-  fileSystems."/mnt/primary" =
-    { device = "/dev/disk/by-uuid/d952e779-0219-405f-b136-bd2c39f7965c";
-      fsType = "ext4";
-    };
+  boot.initrd.luks.devices."luks-0d50df5f-9456-4296-9156-f5b818e11552".device = "/dev/disk/by-uuid/0d50df5f-9456-4296-9156-f5b818e11552";
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/4A44-73B5";
+    { device = "/dev/disk/by-uuid/3297-A70D";
       fsType = "vfat";
+      options = [ "fmask=0022" "dmask=0022" ];
     };
 
   fileSystems."/mnt/secondary" =
@@ -34,7 +32,7 @@
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/1f77203e-a031-4c4a-857e-c2b237ba59ce"; }
+    [ { device = "/dev/disk/by-uuid/2f753439-695c-45c3-b717-f257f7c49405"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/hosts/Vanguard/home.nix b/hosts/Vanguard/home.nix
index 148e9f1b..df0bbeae 100644
--- a/hosts/Vanguard/home.nix
+++ b/hosts/Vanguard/home.nix
@@ -3,12 +3,14 @@
     output = {
       "Acer Technologies ED270R TJMEE0043W01" = {
         mode = "1920x1080@165Hz";
-        pos = "1920 0";
+        pos = "1080 420";
         adaptive_sync = "off";
       };
       "Ancor Communications Inc VS278 FALMQS032358" = {
         pos = "0 0";
+        transform = "270";
       };
     };
   };
+  programs.waybar.settings.main.output = ["DP-2"];
 }
diff --git a/services/syncthing.nix b/services/syncthing.nix
index 57ef699d..71410c47 100644
--- a/services/syncthing.nix
+++ b/services/syncthing.nix
@@ -11,9 +11,9 @@ in {
     settings = {
       devices = {
         "Ion".id = "7DD4NPH-6T2ET5A-4FCLFWW-CS6UR2W-IO5XQXC-DM5B2Q4-6X7DGU2-UKKVEAB";
-        "Legion".id = "3SSNCLP-ZZKNS65-7CKKGFY-KJYQU6S-P5BM7SB-MMW5ZLM-TMND6IV-ZMUO4AQ";
+        "Legion".id = "XIJ4CPX-3USDOFM-JLKWEPP-J7MEVKX-LJ6HCCS-YZNHGGC-GDSMZPD-TTVYNAZ";
         "Northstar".id = "MXF5AXH-AOOVOSC-OYZP7O3-L4SN3RI-BWX3J4X-YJDY5GS-3TM7SPF-MDORAAW";
-        "Vanguard".id = "NCJBYBK-JRVFAAN-XO4I5AS-B5L7QD2-5PAMWX7-PHD5FQH-Q2EI32H-U3GF5AA";
+        "Vanguard".id = "YELFAIP-4VBWPRX-CB7RNJD-RPBQ6KN-CGTMIBO-FK7EPTH-ZXYS6AF-C6WKOQT";
       };
       folders = {
         "Music" = {