diff --git a/home/default.nix b/home/default.nix
index 3c807c7e..c350271a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -1,4 +1,4 @@
-{...}: {
+{pkgs, ...}: {
   imports = [
     # Programs
     ./desktop/default.nix
@@ -11,4 +11,22 @@
     # Additional Scripts
     ./scripts/default.nix
   ];
+  packages = with pkgs; [
+    libreoffice-fresh
+    inkscape
+    webcord
+    whatsapp-for-linux
+    teams-for-linux
+  ];
+  xdg.configFile = {
+    "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
+    "teams-for-linux/config.json".text = builtins.toJSON {
+      awayOnSystemIdle = true;
+      closeAppOnCross = true;
+      followSystemTheme = true;
+      notificationMethod = "electron";
+      optInTeamsV2 = true;
+      spellCheckerLanguages = ["en_GB"];
+    };
+  };
 }
diff --git a/home/desktop/default.nix b/home/desktop/default.nix
index 6fcbc3a2..09bca80c 100644
--- a/home/desktop/default.nix
+++ b/home/desktop/default.nix
@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }: {
@@ -20,13 +19,6 @@
         defaultCursor = name;
       };
     };
-    packages = with pkgs; [
-      libreoffice-fresh
-      inkscape
-      webcord
-      whatsapp-for-linux
-      teams-for-linux
-    ];
   };
   services.syncthing.enable = true;
   programs.mpv.enable = true;
@@ -51,18 +43,6 @@
         XDG_PROJECTS_DIR = "${config.home.homeDirectory}/Projects";
       };
     };
-    configFile = {
-      "autostart/com.github.eneshecan.WhatsAppForLinux.desktop".source = "${pkgs.whatsapp-for-linux}/share/applications/com.github.eneshecan.WhatsAppForLinux.desktop";
-      "teams-for-linux/config.json".text = builtins.toJSON {
-        awayOnSystemIdle = true;
-        closeAppOnCross = true;
-        followSystemTheme = true;
-        electronCLIFlags = lib.mkIf config.wayland.windowManager.sway.enable [["ozone-platform" "wayland"]];
-        notificationMethod = "electron";
-        optInTeamsV2 = true;
-        spellCheckerLanguages = ["en_GB"];
-      };
-    };
   };
   xresources.properties = with config.scheme.withHashtag; {
     "*background" = base00;
diff --git a/home/personal.nix b/home/personal.nix
index dd45682c..f1c002ef 100644
--- a/home/personal.nix
+++ b/home/personal.nix
@@ -7,4 +7,7 @@
     openscad
     kicad-small
   ];
+  xdg.configFile = {
+    "autostart/webcord.desktop".source = "${pkgs.webcord}/share/applications/webcord.desktop";
+  };
 }