diff --git a/modules/extras/variables/displays/default.nix b/modules/extras/variables/displays/default.nix
index 2e8dda5..fc6ede3 100644
--- a/modules/extras/variables/displays/default.nix
+++ b/modules/extras/variables/displays/default.nix
@@ -6,9 +6,9 @@
   };
 
   config.displays = {
-    d1 = "DP-2";
-    d2 = "DP-3";
-    d3 = "DP-1";
+    d1 = "DP-1";
+    d2 = "DP-2";
+    d3 = "DP-3";
     d4 = "HDMI-A-1";
     dI = "eDP-1";
   };
diff --git a/modules/home/programs/gui/pcmanfm/default.nix b/modules/home/programs/gui/pcmanfm/default.nix
index 3bfe2ef..b95997a 100644
--- a/modules/home/programs/gui/pcmanfm/default.nix
+++ b/modules/home/programs/gui/pcmanfm/default.nix
@@ -67,7 +67,7 @@
         pane_icon_size=16
         thumbnail_size=128
         show_thumbnail=1
-        shadow_hidden=1
+        shadow_hidden=0
         
         [places]
         places_home=1
diff --git a/modules/home/programs/gui/rofi/default.nix b/modules/home/programs/gui/rofi/default.nix
index 87887eb..4cda37a 100644
--- a/modules/home/programs/gui/rofi/default.nix
+++ b/modules/home/programs/gui/rofi/default.nix
@@ -128,9 +128,9 @@
     (pkgs.writeScriptBin "rofiscripts" ''
       # Scratchpad function
       scratchpads() {
-        SCRATCHPADS=$(echo -e "Gotop\nMusic\nSound\nEasyEffects" | rofi -dmenu -i -p "Scratchpads")
+        SCRATCHPADS=$(echo -e "Btop\nMusic\nSound\nEasyEffects" | rofi -dmenu -i -p "Scratchpads")
         case $SCRATCHPADS in
-          Gotop) foot -a gotop -T Gotop gotop;;
+          Btop) foot -a btop -T Btop btop;;
           Music) foot -a music -T Music ncmpcpp;;
           Sound) foot -a sound -T Sound pulsemixer;;
           EasyEffects) easyeffects;;
diff --git a/modules/home/programs/misc/chat/default.nix b/modules/home/programs/misc/chat/default.nix
deleted file mode 100644
index 654634a..0000000
--- a/modules/home/programs/misc/chat/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    vesktop
-    fractal
-    telegram-desktop
-  ];
-}
diff --git a/modules/home/programs/misc/default.nix b/modules/home/programs/misc/default.nix
index 75be3b4..a6e5a77 100644
--- a/modules/home/programs/misc/default.nix
+++ b/modules/home/programs/misc/default.nix
@@ -2,7 +2,6 @@
 {
   imports = [
     ./avtools
-    ./chat
     ./gaming
     ./general
     ./headless
diff --git a/modules/home/programs/misc/general/default.nix b/modules/home/programs/misc/general/default.nix
index 70762d8..a8f1484 100644
--- a/modules/home/programs/misc/general/default.nix
+++ b/modules/home/programs/misc/general/default.nix
@@ -1,6 +1,9 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
+    vesktop
+    fractal
+    telegram-desktop
     libreoffice
     bc
   ];
diff --git a/modules/home/wms/programs/waybar/default.nix b/modules/home/wms/programs/waybar/default.nix
index aa8b1ac..b34838d 100644
--- a/modules/home/wms/programs/waybar/default.nix
+++ b/modules/home/wms/programs/waybar/default.nix
@@ -142,7 +142,6 @@
       icon-size = 19;
       icon-spacing = 3;
       tooltip = true;
-      tooltip-format = "Gamemode On";
     };
 
     privacyModule = {
@@ -410,11 +409,17 @@
         background: #${config.look.colors.light};
       }
       #scratchpad {
-        margin-left: 2px;
+        margin-left: 4px;
       }
-      #cpu, #memory, #custom-vram, #mpd, #custom-clock-long, #custom-clock-short, #backlight, #battery, #custom-weather, #custom-weather2, #custom-notifs {
+      #privacy {
+        margin-left: 4px;
+      }
+      #cpu, #memory, #custom-vram, #mpd, #backlight, #battery, #custom-weather, #custom-weather2, #custom-notifs {
         margin: 0 5px 0 2px;
       }
+      #custom-clock-long, #custom-clock-short {
+        margin: 0 2px 0 2px;
+      }
       #cpu {
         border-bottom: 3px solid #f90000;
       }
diff --git a/modules/home/wms/sway/default.nix b/modules/home/wms/sway/default.nix
index 4931b9f..b83ba9a 100644
--- a/modules/home/wms/sway/default.nix
+++ b/modules/home/wms/sway/default.nix
@@ -20,6 +20,7 @@
       hide_edge_borders --i3 smart
       titlebar_padding 10 1
       primary_selection disabled
+      mouse_warping container
 
       # Include extra window icons
       include ${pkgs.fetchurl {
diff --git a/modules/system/programs/security/default.nix b/modules/system/programs/security/default.nix
index a5c9b78..1504339 100644
--- a/modules/system/programs/security/default.nix
+++ b/modules/system/programs/security/default.nix
@@ -4,5 +4,6 @@
     ./apparmor
     ./doas
     ./polkit
+    ./rtprio
   ];
 }
diff --git a/modules/system/programs/security/rtprio/default.nix b/modules/system/programs/security/rtprio/default.nix
new file mode 100644
index 0000000..8b71080
--- /dev/null
+++ b/modules/system/programs/security/rtprio/default.nix
@@ -0,0 +1,11 @@
+{ ... }:
+{
+  security.pam.loginLimits = [
+    {
+      domain = "@users";
+      item = "rtprio";
+      type = "-";
+      value = 1;
+    }
+  ];
+}
diff --git a/modules/system/services/general/displaymanager/default.nix b/modules/system/services/general/displaymanager/default.nix
index d4d5232..d53f9f4 100644
--- a/modules/system/services/general/displaymanager/default.nix
+++ b/modules/system/services/general/displaymanager/default.nix
@@ -8,7 +8,22 @@
         vt = 2;
         switch = true;
       };
-      default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet";
+      default_session.command = ''
+        ${pkgs.greetd.tuigreet}/bin/tuigreet --remember --remember-user-session --user-menu --asterisks --sessions /etc/greetd/environments
+      '';
     };
   };
+
+  environment.etc = {
+    "greetd/environments/sway.desktop".text = ''
+      [Desktop Entry]
+      Name=Sway
+      Exec=sway --unsupported-gpu
+    '';
+    "greetd/environments/niri.desktop".text = ''
+      [Desktop Entry]
+      Name=Niri
+      Exec=niri-session
+    '';
+  };
 }