diff --git a/modules/home/sway/default.nix b/modules/home/sway/default.nix
index 449b0ea..287cd18 100644
--- a/modules/home/sway/default.nix
+++ b/modules/home/sway/default.nix
@@ -93,31 +93,11 @@ in {
         output = let
           bgdir = ../../../assets;
           bg1080 = bgdir + "/bg1080.png";
-          bg1080vert = bgdir + "/bg1080vert.png";
-          bg4k = bgdir + "/bg4k.png";
         in
           lib.mkIf cfg.laptop {
             eDP-1 = {
               bg = "'${bg1080}' fit";
             };
-            HDMI-A-1 = {
-              bg = "'${bg4k}' fit";
-            };
-            DP-3 = {
-              bg = "'${bg1080}' fit";
-            };
-            DP-4 = {
-              bg = "'${bg1080}' fit";
-            };
-            DP-5 = {
-              bg = "'${bg1080vert}' fit";
-            };
-            DP-6 = {
-              bg = "'${bg1080}' fit";
-            };
-            DP-7 = {
-              bg = "'${bg1080vert}' fit";
-            };
           };
 
         input = {
@@ -185,6 +165,7 @@ in {
             {app_id = "thunderbird";}
             {app_id = "discord";}
             {app_id = "Element";}
+            {class = "Element";}
           ];
           "music" = [{app_id = "org.rncbc.qpwgraph";}];
           "obsidian" = [{app_id = "obsidian";} {class = "obsidian";}];
@@ -228,27 +209,21 @@ in {
         workspaceOutputAssign = lib.mkIf cfg.laptop [
           {
             workspace = "main";
-            output = ["DP-3" "DP-4" "DP-6" "HDMI-A-1" "eDP-1"];
           }
           {
             workspace = "term";
-            output = ["DP-5" "DP-4" "DP-7" "eDP-1"];
           }
           {
             workspace = "msg";
-            output = ["eDP-1"];
           }
           {
             workspace = "music";
-            output = ["eDP-1"];
           }
           {
             workspace = "5";
-            output = ["DP-3" "DP-4" "DP-6" "HDMI-A-1" "eDP-1"];
           }
           {
             workspace = "obsidian";
-            output = ["eDP-1"];
           }
         ];
 
diff --git a/modules/home/sway/kanshi.nix b/modules/home/sway/kanshi.nix
index c697464..18f2ad5 100644
--- a/modules/home/sway/kanshi.nix
+++ b/modules/home/sway/kanshi.nix
@@ -18,32 +18,41 @@ in {
       bg1080vert = bgdir + "/bg1080vert.png";
       bg4k = bgdir + "/bg4k.png";
       luhbots_workstation = settings: {
-          profile.outputs = [
-            {
-              criteria = "eDP-1";
-              position = if settings.vertical.left then "1080,1080" else "0,1080";
-            }
-            {
-              criteria = settings.horizontal.name;
-              position = if settings.vertical.left then "1080,0" else "0,0";
-            }
-            {
-              criteria = settings.vertical.name;
-              transform = settings.vertical.orientation;
-              position = if settings.vertical.left then "0,0" else "1920,0";
-            }
-          ];
-          profile.exec = [
-            "${pkgs.sway}/bin/swaymsg 'workspace \"main\" output \"${settings.horizontal.name}\", workspace --no-auto-back-and-forth main, move workspace to \"${settings.horizontal.name}\", workspace back_and_forth'"
-            "${pkgs.sway}/bin/swaymsg 'workspace \"term\" output \"${settings.vertical.name}\", workspace --no-auto-back-and-forth term, move workspace to \"${settings.vertical.name}\", workspace back_and_forth'"
-            "${pkgs.sway}/bin/swaymsg 'workspace \"msg\" output eDP-1, workspace --no-auto-back-and-forth msg, move workspace to eDP-1, workspace back_and_forth'"
-            "${pkgs.sway}/bin/swaymsg 'workspace \"msg\" output eDP-1, workspace --no-auto-back-and-forth music, move workspace to eDP-1, workspace back_and_forth'"
-            "${pkgs.sway}/bin/swaymsg 'workspace \"5\" output \"${settings.horizontal.name}\", workspace --no-auto-back-and-forth 5, move workspace to \"${settings.horizontal.name}\", workspace back_and_forth'"
-            "${pkgs.sway}/bin/swaymsg 'output \"eDP-1\" bg ${bg1080} fit'"
-            "${pkgs.sway}/bin/swaymsg 'output \"${settings.horizontal.name}\" bg ${bg4k} fit'"
-            "${pkgs.sway}/bin/swaymsg 'output \"${settings.vertical.name}\" bg ${bg1080vert} fit'"
-            "${pkgs.sway}/bin/swaymsg 'workspace --no-auto-back-and-forth msg, workspace --no-auto-back-and-forth term, workspace --no-auto-back-and-forth main'"
-          ];
+        profile.outputs = [
+          {
+            criteria = "eDP-1";
+            position =
+              if settings.vertical.left
+              then "1080,1080"
+              else "0,1080";
+          }
+          {
+            criteria = settings.horizontal.name;
+            position =
+              if settings.vertical.left
+              then "1080,0"
+              else "0,0";
+          }
+          {
+            criteria = settings.vertical.name;
+            transform = settings.vertical.orientation;
+            position =
+              if settings.vertical.left
+              then "0,0"
+              else "1920,0";
+          }
+        ];
+        profile.exec = [
+          "${pkgs.sway}/bin/swaymsg 'workspace \"main\" output \"${settings.horizontal.name}\", workspace --no-auto-back-and-forth main, move workspace to \"${settings.horizontal.name}\", workspace back_and_forth'"
+          "${pkgs.sway}/bin/swaymsg 'workspace \"term\" output \"${settings.vertical.name}\", workspace --no-auto-back-and-forth term, move workspace to \"${settings.vertical.name}\", workspace back_and_forth'"
+          "${pkgs.sway}/bin/swaymsg 'workspace \"msg\" output eDP-1, workspace --no-auto-back-and-forth msg, move workspace to eDP-1, workspace back_and_forth'"
+          "${pkgs.sway}/bin/swaymsg 'workspace \"msg\" output eDP-1, workspace --no-auto-back-and-forth music, move workspace to eDP-1, workspace back_and_forth'"
+          "${pkgs.sway}/bin/swaymsg 'workspace \"5\" output \"${settings.horizontal.name}\", workspace --no-auto-back-and-forth 5, move workspace to \"${settings.horizontal.name}\", workspace back_and_forth'"
+          "${pkgs.sway}/bin/swaymsg 'output \"eDP-1\" bg ${bg1080} fit'"
+          "${pkgs.sway}/bin/swaymsg 'output \"${settings.horizontal.name}\" bg ${bg4k} fit'"
+          "${pkgs.sway}/bin/swaymsg 'output \"${settings.vertical.name}\" bg ${bg1080vert} fit'"
+          "${pkgs.sway}/bin/swaymsg 'workspace --no-auto-back-and-forth msg, workspace --no-auto-back-and-forth term, workspace --no-auto-back-and-forth main'"
+        ];
       };
     in {
       enable = true;