diff --git a/home/Northstar.nix b/home/Northstar.nix
index fc30fd9..68d2dab 100644
--- a/home/Northstar.nix
+++ b/home/Northstar.nix
@@ -1,45 +1 @@
-{...}: {
-  imports = [./default.nix];
-  wayland.windowManager.sway.config = {
-    output."eDP-1".scale = "1.25";
-    workspaceOutputAssign = [
-      {
-        output = "eDP-1";
-        workspace = "1";
-      }
-    ];
-  };
-  services.kanshi = {
-    enable = true;
-    settings = let
-      laptopScreen = {
-        criteria = "eDP-1";
-        scale = 1.25;
-        position = "3000,636";
-      };
-      monitor1 = {
-        criteria = "Acer Technologies ED270R TJMEE0043W01";
-        mode = "1920x1080@165Hz";
-        position = "1080,420";
-      };
-      monitor2 = {
-        criteria = "Ancor Communications Inc VS278 FALMQS032358";
-        position = "0,0";
-        transform = "270";
-      };
-    in [
-      {
-        profile = {
-          name = "undocked";
-          outputs = [laptopScreen];
-        };
-      }
-      {
-        profile = {
-          name = "docked";
-          outputs = [laptopScreen monitor1 monitor2];
-        };
-      }
-    ];
-  };
-}
+{...}: {imports = [./default.nix];}
diff --git a/home/default.nix b/home/default.nix
index a39d4cb..a6c6479 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -4,9 +4,7 @@
     ../programs/desktop/default.nix
     ../programs/shell/default.nix
     ../programs/emacs/default.nix
-    ../programs/nyxt/default.nix
     ../programs/firefox/default.nix
-    ../programs/cava/default.nix
     ../programs/obs/default.nix
     # Services
     ../services/email/work.nix # TODO combine again at some point
diff --git a/programs/desktop/default.nix b/programs/desktop/default.nix
index 321bcdd..a618695 100644
--- a/programs/desktop/default.nix
+++ b/programs/desktop/default.nix
@@ -2,111 +2,87 @@
   config,
   pkgs,
   ...
-}: {
+}: let
+  protonmail-setup-bridge = with pkgs; (writeShellScriptBin "protonmail-setup-bridge" ''
+    pkill -9 -f protonmail-bridge
+    ${protonmail-bridge}/bin/protonmail-bridge -c
+    swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n"
+  '');
+  davmail-setup = with pkgs; (writeShellScriptBin "davmail-setup" ''
+    systemctl --user restart davmail # Ensure config file is present
+    systemctl --user stop davmail
+    ${davmail}/bin/davmail -n ~/.davmail.properties
+    systemctl --user restart davmail
+  '');
+in {
   imports = [
     ./plasma6/default.nix
-    # ./sway/default.nix
-    # ./niri/default.nix
-    # ./foot/default.nix
     ./alacritty/default.nix
-    # ./avizo/default.nix
-    # ./fuzzel/default.nix
-    # ./swaylock/default.nix
-    # ./swayidle/default.nix
-    # ./mako/default.nix
-    # ./waybar/default.nix
-    # ./wlogout/default.nix
   ];
   home.packages = with pkgs; [
-    pinentry
-    ffmpeg
-    evince
     libreoffice-fresh
     inkscape
     webcord
-    swayimg
-    swaybg
-    (writeShellScriptBin "set-background" ''
-      ${swaybg}/bin/swaybg -m fill -i ${./wallpapers/landscapes/tropic_island_day.jpg}
-    '')
-    (writeShellScriptBin "protonmail-setup-bridge" ''
-      pkill -9 -f protonmail-bridge
-      ${protonmail-bridge}/bin/protonmail-bridge -c
-      swaymsg exec "${protonmail-bridge}/bin/protonmail-bridge -n"
-    '')
-    (writeShellScriptBin "davmail-setup" ''
-      systemctl --user restart davmail # Ensure config file is present
-      systemctl --user stop davmail
-      ${davmail}/bin/davmail -n ~/.davmail.properties
-      systemctl --user restart davmail
-    '')
+    protonmail-setup-bridge
+    davmail-setup
   ];
   services = {
-    avizo.enable = true;
-    gpg-agent.pinentryPackage = pkgs.pinentry-gtk2;
-    remmina.enable = true;
     syncthing.enable = true;
     kdeconnect = {
       enable = true;
       indicator = true;
     };
-    udiskie = {
-      enable = true;
-      notify = true;
-      automount = true;
-      tray = "never";
-    };
-  };
-  programs.mpv.enable = true;
-  gtk = {
-    enable = true;
-    iconTheme = {
-      package = pkgs.papirus-icon-theme.override {color = "violet";};
-      name =
-        if config.scheme.variant == "light"
-        then "Papirus-Light"
-        else "Papirus-Dark";
-    };
-    cursorTheme = {
-      package = pkgs.volantes-cursors;
-      name =
-        if config.scheme.variant == "light"
-        then "volantes_cursors"
-        else "volantes_light_cursors";
-      size = 32;
-    };
-    theme = {
-      package = pkgs.gnome.gnome-themes-extra;
-      name =
-        if config.scheme.variant == "light"
-        then "Adwaita"
-        else "Adwaita-dark";
-    };
-  };
-  qt = {
-    enable = true;
-    style = {
-      package = pkgs.adwaita-qt;
-      name =
-        if config.scheme.variant == "light"
-        then "adwaita"
-        else "adwaita-dark";
-    };
   };
+  # programs.mpv.enable = true;
+  # gtk = {
+  #   enable = true;
+  #   iconTheme = {
+  #     package = pkgs.papirus-icon-theme.override {color = "violet";};
+  #     name =
+  #       if config.scheme.variant == "light"
+  #       then "Papirus-Light"
+  #       else "Papirus-Dark";
+  #   };
+  #   cursorTheme = {
+  #     package = pkgs.volantes-cursors;
+  #     name =
+  #       if config.scheme.variant == "light"
+  #       then "volantes_cursors"
+  #       else "volantes_light_cursors";
+  #     size = 32;
+  #   };
+  #   theme = {
+  #     package = pkgs.gnome.gnome-themes-extra;
+  #     name =
+  #       if config.scheme.variant == "light"
+  #       then "Adwaita"
+  #       else "Adwaita-dark";
+  #   };
+  # };
+  # qt = {
+  #   enable = true;
+  #   style = {
+  #     package = pkgs.adwaita-qt;
+  #     name =
+  #       if config.scheme.variant == "light"
+  #       then "adwaita"
+  #       else "adwaita-dark";
+  #   };
+  # };
   xdg = {
-    mime.enable = true;
-    mimeApps = let
-      defaultApplications = import ./mimeapps.nix;
-    in {
-      enable = true;
-      inherit defaultApplications;
-      associations = {
-        added = defaultApplications;
-        removed = {
-          "x-scheme-handler/zoomus" = config.xdg.mimeApps.defaultApplications."x-scheme-handler/http";
-        };
-      };
-    };
+    # mime.enable = true;
+    # mimeApps = let
+    #   defaultApplications = import ./mimeapps.nix;
+    # in {
+    #   enable = true;
+    #   inherit defaultApplications;
+    #   associations = {
+    #     added = defaultApplications;
+    #     removed = {
+    #       "x-scheme-handler/zoomus" = config.xdg.mimeApps.defaultApplications."x-scheme-handler/http";
+    #     };
+    #   };
+    # };
     userDirs = {
       enable = true;
       createDirectories = true;
@@ -115,24 +91,24 @@
       };
     };
   };
-  xresources.properties = with config.scheme.withHashtag; {
-    "*background" = base00;
-    "*foreground" = base05;
-    "*color0" = base00;
-    "*color1" = red;
-    "*color2" = green;
-    "*color3" = yellow;
-    "*color4" = blue;
-    "*color5" = magenta;
-    "*color6" = cyan;
-    "*color7" = base04;
-    "*color8" = base01;
-    "*color9" = red;
-    "*color10" = green;
-    "*color11" = yellow;
-    "*color12" = blue;
-    "*color13" = magenta;
-    "*color14" = cyan;
-    "*color15" = base05;
-  };
+  # xresources.properties = with config.scheme.withHashtag; {
+  #   "*background" = base00;
+  #   "*foreground" = base05;
+  #   "*color0" = base00;
+  #   "*color1" = red;
+  #   "*color2" = green;
+  #   "*color3" = yellow;
+  #   "*color4" = blue;
+  #   "*color5" = magenta;
+  #   "*color6" = cyan;
+  #   "*color7" = base04;
+  #   "*color8" = base01;
+  #   "*color9" = red;
+  #   "*color10" = green;
+  #   "*color11" = yellow;
+  #   "*color12" = blue;
+  #   "*color13" = magenta;
+  #   "*color14" = cyan;
+  #   "*color15" = base05;
+  # };
 }