diff --git a/flake.lock b/flake.lock
index 15a394d..4702b8c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -923,22 +923,6 @@
         "type": "github"
       }
     },
-    "rofi-themes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732392475,
-        "narHash": "sha256-TIYEpag5B2HloMnkOvZG283T8cBur5PRx0OdPi9h+Dw=",
-        "ref": "refs/heads/main",
-        "rev": "d44933c182b168c4959c3e4e41d28ecd37e36e05",
-        "revCount": 114,
-        "type": "git",
-        "url": "https://codewith.babesonthe.net/punkfairie/rofi-themes"
-      },
-      "original": {
-        "type": "git",
-        "url": "https://codewith.babesonthe.net/punkfairie/rofi-themes"
-      }
-    },
     "root": {
       "inputs": {
         "darwin": "darwin",
@@ -949,7 +933,6 @@
         "nixgl": "nixgl",
         "nixpkgs": "nixpkgs_4",
         "nur": "nur",
-        "rofi-themes": "rofi-themes",
         "snowfall-lib": "snowfall-lib",
         "stylix": "stylix",
         "unstable": "unstable",
diff --git a/flake.nix b/flake.nix
index a31d4db..723b3f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,10 +82,5 @@
     };
 
     marleyvim.url = "git+https://codewith.babesonthe.net/punkfairie/marleyvim";
-
-    rofi-themes = {
-      url = "git+https://codewith.babesonthe.net/punkfairie/rofi-themes";
-      flake = false;
-    };
   };
 }
diff --git a/modules/home/options/apps/default.nix b/modules/home/options/apps/default.nix
index 504d2d7..dc56b81 100644
--- a/modules/home/options/apps/default.nix
+++ b/modules/home/options/apps/default.nix
@@ -17,13 +17,7 @@ in {
     };
 
     clipboard = let
-      isXorg = config.marleyos.xorg.xsession.enable;
-      defaultXorg = {
-        package = pkgs.clipboard-jh;
-        copy-command = "${lib.getExe pkgs.clipboard-jh} copy";
-        paste-command = "${lib.getExe pkgs.clipboard-jh} paste";
-      };
-      defaultWayland = {
+      default = {
         package = pkgs.wl-clipboard;
         copy-command = lib.getExe' pkgs.wl-clipboard "wl-copy";
         paste-command = lib.getExe' pkgs.wl-clipboard "wl-paste";
@@ -34,37 +28,25 @@ in {
           options = {
             package = lib.mkOption {
               type = lib.types.package;
-              default =
-                if isXorg
-                then defaultXorg.package
-                else defaultWayland.package;
+              default = default.package;
               description = "The clipboard manager to use.";
             };
 
             copy-command = lib.mkOption {
               type = lib.types.str;
-              default =
-                if isXorg
-                then defaultXorg.copy-command
-                else defaultWayland.copy-command;
+              default = default.copy-command;
               description = "The command, including binary, to use for copying.";
             };
 
             paste-command = lib.mkOption {
               type = lib.types.str;
-              default =
-                if isXorg
-                then defaultXorg.paste-command
-                else defaultWayland.paste-command;
+              default = default.paste-command;
               description = "The command, including binary, to use for pasting.";
             };
           };
         };
 
-        default =
-          if isXorg
-          then defaultXorg
-          else defaultWayland;
+        default = default;
       };
 
     terminal = lib.mkOption {
diff --git a/modules/home/programs/gui/default.nix b/modules/home/programs/gui/default.nix
index 292f93f..c29de9d 100644
--- a/modules/home/programs/gui/default.nix
+++ b/modules/home/programs/gui/default.nix
@@ -16,7 +16,6 @@ in {
       pidgin = enabled;
       thunderbird = enabled;
       phpstorm = enabled;
-      rofi = enabled;
       vesktop = enabled;
       wezterm = enabled;
       zathura = enabled;
diff --git a/modules/home/programs/wayland/wofi/default.nix b/modules/home/programs/wayland/wofi/default.nix
deleted file mode 100644
index a1585fc..0000000
--- a/modules/home/programs/wayland/wofi/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.programs.wofi;
-in {
-  options.marleyos.programs.wofi.enable = lib.mkEnableOption "wofi";
-
-  config = lib.mkIf cfg.enable {
-    marleyos.apps.launcher = {
-      inherit (config.programs.wofi) package;
-      command = "--show drun";
-    };
-
-    programs.wofi = {
-      enable = true;
-    };
-  };
-}
diff --git a/modules/home/programs/xorg/rofi/default.nix b/modules/home/programs/xorg/rofi/default.nix
deleted file mode 100644
index 816ed0f..0000000
--- a/modules/home/programs/xorg/rofi/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  inputs,
-  ...
-}: let
-  cfg = config.marleyos.programs.rofi;
-  hasXorg = config.xsession.enable;
-in {
-  options.marleyos.programs.rofi.enable = lib.mkEnableOption "rofi";
-
-  config = lib.mkIf (cfg.enable && hasXorg) {
-    home.packages = with pkgs; [
-      rofi
-    ];
-
-    marleyos.apps.launcher = {
-      package = pkgs.rofi;
-      command = "--show drun";
-    };
-
-    xdg.configFile."rofi".source = "${inputs.rofi-themes}/files";
-  };
-}
diff --git a/modules/home/services/clipboard/default.nix b/modules/home/services/clipboard/default.nix
deleted file mode 100644
index b456701..0000000
--- a/modules/home/services/clipboard/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.marleyos.services.clipboard;
-in {
-  options.marleyos.services.clipboard.enable = lib.mkEnableOption "clipboard";
-
-  config = lib.mkIf cfg.enable {
-    home.packages = with pkgs; [
-      clipboard-jh
-    ];
-
-    home.sessionVariables = {
-      CLIPBOARD_THEME = "ansi";
-    };
-  };
-}
diff --git a/modules/home/services/dunst/default.nix b/modules/home/services/dunst/default.nix
deleted file mode 100644
index 4d51271..0000000
--- a/modules/home/services/dunst/default.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.services.dunst;
-in {
-  options.marleyos.services.dunst.enable = lib.mkEnableOption "dunst";
-
-  config = lib.mkIf cfg.enable {
-    services.dunst = {
-      enable = true;
-
-      iconTheme = with config.stylix.iconTheme; {
-        name =
-          if config.lib.stylix.colors.variant == "dark"
-          then dark
-          else light;
-        inherit package;
-      };
-
-      settings = {
-        global = with config.stylix.fonts; {
-          monitor = 0;
-          sort = "yes";
-          idle_threshold = 120;
-          font = "${monospace.name} ${toString sizes.popup}";
-          markup = "full";
-          show_age_threshold = 60;
-          word_wrap = "yes";
-          ignore_newline = "no";
-          stack_duplicates = true;
-          hide_duplicate_count = false;
-          show_indicators = "yes";
-          sticky_history = "yes";
-          history_length = 20;
-          browser = "${lib.getExe config.marleyos.apps.browser} --new-tab";
-          always_run_script = true;
-          title = "Dunst";
-          class = "Dunst";
-          mouse_left_click = "do_action";
-          mouse_middle_click = "close_current";
-          mouse_right_click = "close_all";
-        };
-
-        signed_on = {
-          appname = "Pidgin";
-          summary = "*signed on*";
-          urgency = "low";
-        };
-
-        signed_off = {
-          appname = "Pidgin";
-          summary = "*signed off*";
-          urgency = "low";
-        };
-
-        says = {
-          appname = "Pidgin";
-          summary = "*says*";
-          urgency = "critical";
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/services/picom/default.nix b/modules/home/services/picom/default.nix
deleted file mode 100644
index 65c58f9..0000000
--- a/modules/home/services/picom/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.marleyos.services.picom;
-  hasXorg = config.xsession.enable;
-in {
-  options.marleyos.services.picom.enable = lib.mkEnableOption "picom";
-
-  config = lib.mkIf (cfg.enable && hasXorg) {
-    services.picom = {
-      enable = true;
-      package = lib.mkIf config.marleyos.nixGL.enable (config.lib.nixGL.wrap pkgs.picom);
-    };
-
-    # The module config options are a nightmare.
-    xdg.configFile."picom/picom.conf".text =
-      # conf
-      ''
-        # Shadows - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        shadow = true;
-        shadow-radius = 20;
-        shadow-opacity = .30;
-        shadow-offset-x = -7;
-        shadow-offset-y = 7;
-        shadow-exclude = [
-          "name = 'Notification'",
-          "class_g = 'Conky'",
-          "class_g ?= 'Notify-osd'",
-          "class_g = 'Cairo-clock'"
-        ];
-
-        # Fading - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        fading = true;
-        fade-in-step = 0.03;
-        fade-out-step = 0.03;
-
-        # Transparency / Opacity - - - - - - - - - - - - - - - - - - - - - - -
-        inactive-opacity = 0.9;
-        active-opacity = 0.9;
-        frame-opacity = 0.7;
-        inactive-opacity-override = false;
-        focus-exclude = [ "class_g = 'Cairo-clock'" ];
-        opacity-rule = [
-          "60:class_g = 'dolphin'",
-          "50:class_g = 'cava'"
-        ];
-
-        # Corners - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        corner-radius = 20;
-        rounded-corners-exclude = [
-          "window_type = 'dock'",
-          "window_type = 'desktop'",
-          "class_g = 'Dunst'"
-        ];
-
-        # Background Blurring - - - - - - - - - - - - - - - - - - - - - - - - -
-        blur-method = "dual_kawase";
-        blur-size = 12;
-        blur-strength = 10;
-        blur-background = false;
-        blur-kern = "3x3box";
-        blur-background-exclude = [
-          "window_type = 'desktop'",
-          "name = '${lib.getName config.marleyos.apps.browser}'",
-          "class_g = 'slop'"
-        ];
-
-        # General - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        backend = "glx";
-        dithered-present = false;
-        vsync = true;
-        mark-wmwin-focused = true;
-        detect-rounded-corners = true;
-        detect-client-opacity = true;
-        detect-transient = true;
-        use-damage = false;
-        log-level = "warn";
-
-        wintypes:
-        {
-          tooltip = { fade = true; shadow = true; opacity = 0.75; focus = true; full-shadow = false; };
-          dock = { shadow = false; clip-shadow-above = true; }
-          dnd = { shadow = false; }
-          popup_menu = { opacity = 0.8; }
-          dropdown_menu = { opacity = 0.8; }
-        };
-      '';
-  };
-}
diff --git a/modules/home/services/polybar/default.nix b/modules/home/services/polybar/default.nix
deleted file mode 100644
index 77a19c8..0000000
--- a/modules/home/services/polybar/default.nix
+++ /dev/null
@@ -1,430 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.marleyos.services.polybar;
-  hasXorg = config.xsession.enable;
-  xrandr = lib.getExe pkgs.xorg.xrandr;
-  grep = lib.getExe pkgs.gnugrep;
-  cut = "${pkgs.coreutils}/bin/cut";
-in {
-  options.marleyos.services.polybar.enable = lib.mkEnableOption "polybar";
-
-  config = lib.mkIf (cfg.enable && hasXorg) {
-    services.polybar = {
-      enable = true;
-      package = lib.mkIf config.marleyos.nixGL.enable (config.lib.nixGL.wrap pkgs.polybar);
-
-      script =
-        # bash
-        ''
-          for m in $(${xrandr} --query | ${grep} " connected" | ${cut} -d" " -f1); do
-            bar="main"
-
-            if [[ "$m" == "DP-0" ]]; then
-              bar="tray"
-            fi
-
-            MONITOR="$m" polybar -q "$bar" &
-          done
-        '';
-
-      # colorblock theme from
-      # https://github.com/adi1090x/polybar-themes
-      settings = let
-        color = rec {
-          background = "#26232f";
-          foreground = background;
-          foreground-alt = "#c8c8cb";
-          alpha = "#00000000";
-          shade1 = "#d6adb5";
-          shade2 = "#d7bdc3";
-          dark = "#0a0a0a";
-        };
-
-        fmt = {
-          prefix.font = 2;
-          padding = 2;
-        };
-        pref = {
-          font = 2;
-          padding = 2;
-        };
-
-        hasRofi = config.marleyos.programs.rofi.enable;
-        cfgHome = config.xdg.configHome;
-      in {
-        # Global Settings - - - - - - - - - - - - - - - - - - - - - - - - - -
-        "settings" = {
-          screenchange.reload = true;
-          compositing = {
-            background = "source";
-            foreground = "over";
-            overline = "over";
-            underline = "over";
-            border = "over";
-          };
-          pseudo.transparency = false;
-        };
-        "global/wm" = {
-          margin.bottom = 0;
-        };
-
-        # Bars - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        "bar/main" = {
-          monitor.text = "\${env:MONITOR:}";
-          monitor.strict = false;
-          override.redirect = true;
-          bottom = false;
-          fixed.center = true;
-          width = "99%";
-          height = 40;
-          offset.x = "0.5%";
-          offset.y = "1%";
-          background = color.alpha;
-          inherit (color) foreground;
-          radius.top = 0.0;
-          radius.bottom = 0.0;
-          underline.size = 2;
-          underline.color = color.foreground;
-          border.size = 0;
-          border.color = color.background;
-          padding = 0;
-          module.margin.left = 0;
-          module.margin.right = 0;
-          font = let
-            mkFt = s: "Maple Mono NF:pixelsize=${toString s};4";
-          in [
-            (mkFt 10)
-            (mkFt 15)
-          ];
-          modules.left = "launcher sep workspaces sep title sep mpd";
-          modules.right = "filesystem sep cpu memory pulseaudio network date sep sysmenu";
-          dim.value = 1.0;
-          wm.restack = "i3";
-          enable.ipc = true;
-          scroll.up = "i3-msg workspace next_on_output";
-          scroll.down = "i3-msg workspace prev_on_output";
-        };
-
-        "bar/tray" = {
-          "inherit" = "bar/main";
-          modules.right = "tray sep filesystem sep cpu memory pulseaudio network date sep sysmenu";
-        };
-
-        # Modules - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        "module/sep" = {
-          type = "custom/text";
-          format = "  ";
-          content.background = color.alpha;
-          content-foreground = color.alpha;
-        };
-
-        "module/launcher" = {
-          type = "custom/text";
-          content = {
-            text = "";
-            inherit (color) background;
-            foreground = color.shade2;
-            padding = 2;
-          };
-          click.left = lib.mkIf hasRofi "${cfgHome}/rofi/launchers/type-1/launcher.sh &";
-          click.right = lib.mkIf hasRofi "${cfgHome}/rofi/applets/bin/screenshot.sh &";
-        };
-
-        "module/workspaces" = {
-          type = "internal/xworkspaces";
-          pin.workspaces = true;
-          enable.click = true;
-          enable.scroll = true;
-          icon.text = [
-            "1;1"
-            "2;2"
-            "3;3"
-            "4;4"
-            "5;5"
-            "6;6"
-            "7;7"
-            "8;8"
-            "9;9"
-            "10;10"
-          ];
-          icon.default = 0;
-          format = {
-            text = "<label-state>";
-            inherit (color) background;
-            inherit (color) foreground;
-          };
-          label = {
-            monitor = "%name%";
-            active = {
-              text = "%icon%";
-              background = color.shade2;
-              foreground = color.dark;
-              padding = 2;
-            };
-            occupied = {
-              text = "%icon%";
-              inherit (color) background;
-              foreground = color.shade2;
-              padding = 2;
-            };
-            urgent = {
-              text = "%icon%";
-              inherit (color) background;
-              foreground = "#cc6666";
-              padding = 2;
-            };
-            empty = {
-              text = "%icon%";
-              inherit (color) background;
-              foreground = color.foreground-alt;
-              padding = 2;
-            };
-          };
-        };
-
-        "module/title" = {
-          type = "internal/xwindow";
-          format.text = "<label>";
-          format.prefix =
-            pref
-            // {
-              text = "﯑";
-              background = color.shade2;
-              foreground = color.dark;
-            };
-          label = {
-            text = "%title%";
-            maxlen = 30;
-            inherit (color) background;
-            foreground = "${color.foreground-alt}";
-            padding = 2;
-            empty = {
-              text = "Desktop";
-              inherit (color) background;
-              foreground = "${color.foreground-alt}";
-              padding = 2;
-            };
-          };
-        };
-
-        "module/mpd" = {
-          type = "internal/mpd";
-          interval = 1;
-          format.online = "<icon-prev><toggle><icon-next><label-song>";
-          format.offline = {
-            text = "<label-offline>";
-            prefix =
-              pref
-              // {
-                text = "";
-                background = color.shade1;
-                inherit (color) foreground;
-              };
-          };
-          label = {
-            song = {
-              text = "%artist% - %title%";
-              maxlen = 25;
-              ellipsis = true;
-              inherit (color) background;
-              foreground = color.foreground-alt;
-              padding = 2;
-            };
-            time = "%elapsed / %total%";
-            offline = {
-              text = "Offline";
-              inherit (color) background;
-              foreground = color.foreground-alt;
-              padding = 2;
-            };
-          };
-          icon = let
-            mkIcon = i:
-              pref
-              // {
-                text = i;
-                foreground = color.dark;
-                background = color.shade1;
-              };
-          in {
-            play = mkIcon "契";
-            pause = mkIcon "";
-            stop = "";
-            prev = mkIcon " 玲";
-            next = mkIcon "怜 ";
-            seekb = "";
-            seekf = "";
-            random = "";
-            repeat = "";
-            repeatone = "";
-            single = "";
-            consume = "";
-          };
-          toggle = {
-            on.foreground = color.foreground;
-            off.foreground = color.background;
-          };
-        };
-
-        "module/filesystem" = {
-          type = "internal/fs";
-          mount = [
-            "/"
-            "/mnt/babeshare/marley"
-            "/mnt/babeshare/babez"
-          ];
-          interval = 30;
-          fixed.values = true;
-          format = {
-            mounted =
-              fmt
-              // {
-                text = "<label-mounted>";
-                prefix.text = "";
-                background = color.shade2;
-              };
-            unmounted =
-              fmt
-              // {
-                text = "<label-unmounted>";
-                prefix.text = "";
-                background = color.shade2;
-              };
-          };
-          label = {
-            mounted = " %free%";
-            unmounted = " %mountpoint: not mounted";
-          };
-        };
-
-        "module/cpu" = {
-          type = "internal/cpu";
-          interval = 1;
-          format =
-            fmt
-            // {
-              text = "<label>";
-              prefix.text = "";
-              background = color.shade2;
-              inherit (color) foreground;
-            };
-          label = " %percentage%%";
-        };
-
-        "module/memory" = {
-          type = "internal/memory";
-          interval = 1;
-          format =
-            fmt
-            // {
-              text = "<label>";
-              prefix.text = "";
-              background = color.shade1;
-            };
-          label = " %mb_used%";
-        };
-
-        "module/pulseaudio" = {
-          type = "internal/pulseaudio";
-          sink = "alsa_output.pci-0000_03_00.6.analog-stereo";
-          use.ui.max = false;
-          interval = 5;
-          format = {
-            volume = {
-              text = "<ramp-volume> <label-volume>";
-              background = color.shade2;
-              padding = 2;
-            };
-            muted =
-              fmt
-              // {
-                text = "<label-muted>";
-                prefix.text = "";
-                background = color.shade2;
-              };
-          };
-          ramp.volume = {
-            text = [
-              ""
-              ""
-              ""
-            ];
-            font = 2;
-          };
-        };
-
-        "module/network" = {
-          type = "internal/network";
-          interface = "enp4s0";
-          interval = 1.0;
-          accumulate.stats = true;
-          unknown.as.up = true;
-          format = {
-            connected =
-              fmt
-              // {
-                text = "<label-connected>";
-                prefix.text = "直";
-                background = color.shade2;
-              };
-            disconnected =
-              fmt
-              // {
-                text = "<label-disconnected>";
-                prefix.text = "睊";
-                background = color.shade2;
-              };
-          };
-          label = {
-            connected = "%{A1:networkmanager_dmenu &:} %netspeed%%{A}";
-            disconnected = "%{A1:networkmanager_dmenu &:} Offline%{A}";
-          };
-        };
-
-        "module/date" = {
-          type = "internal/date";
-          interval = 1.0;
-          time.text = " %I:%M %p";
-          time.alt = " %a, %d %b %Y";
-          format =
-            fmt
-            // {
-              text = "<label>";
-              prefix.text = "";
-              background = color.shade1;
-              inherit (color) foreground;
-            };
-          label = "%time%";
-        };
-
-        "module/sysmenu" = {
-          type = "custom/text";
-          format = {
-            text = "";
-            inherit (color) background;
-            foreground = color.shade2;
-            padding = 2;
-          };
-          click.left = lib.mkIf hasRofi "${cfgHome}/rofi/powermenu/type-1/powermenu.sh &";
-        };
-
-        "module/tray" = {
-          type = "internal/tray";
-          tray = {
-            size = 16;
-            background = color.shade2;
-            spacing = "5px";
-          };
-          format = {
-            background = color.shade2;
-            padding = 2;
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/modules/home/services/screen-locker/default.nix b/modules/home/services/screen-locker/default.nix
deleted file mode 100644
index eff0e3d..0000000
--- a/modules/home/services/screen-locker/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.marleyos.services.screen-locker;
-  hasXorg = config.xsession.enable;
-in {
-  options.marleyos.services.screen-locker.enable = lib.mkEnableOption "screen-locker";
-
-  config = lib.mkIf (cfg.enable && hasXorg) {
-    home.packages = with pkgs; [
-      betterlockscreen
-    ];
-
-    services.screen-locker = {
-      enable = true;
-      inactiveInterval = 20;
-
-      # exec xss-lock {xss-lock.extraOptions} -- {lockCmd}
-      xss-lock.extraOptions = ["--transfer-sleep-lock"];
-      lockCmd = "${lib.getExe pkgs.betterlockscreen} -l";
-    };
-  };
-}
diff --git a/modules/home/wayland/hyprland/default.nix b/modules/home/wayland/hyprland/default.nix
deleted file mode 100644
index 718baca..0000000
--- a/modules/home/wayland/hyprland/default.nix
+++ /dev/null
@@ -1,269 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.wayland.hyprland;
-in {
-  options.marleyos.wayland.hyprland = {
-    enable = lib.mkEnableOption "hyprland";
-
-    monitors = lib.mkOption {
-      description = "Monitor configuration.";
-      type = with lib.types; attrsOf str;
-    };
-
-    mainMonitor = lib.mkOption {
-      description = "Which monitor to treat as the main for workspace assignment";
-      type = with lib.types; str;
-    };
-  };
-
-  config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        assertion =
-          if cfg ? monitors
-          then cfg ? mainMonitor
-          else true;
-        message = ''
-          You have defined monitors but not selected the main monitor. Please
-          define marleyos.wayland.hyprland.mainMonitor.
-        '';
-      }
-    ];
-
-    marleyos = {
-      wayland.enable = true;
-
-      programs = {
-        hyprlock.enable = true;
-        waybar.enable = true;
-        wlogout.enable = true;
-        wofi.enable = true;
-      };
-      services = {
-        swaync.enable = true;
-      };
-    };
-
-    home.sessionVariables = let
-      cfg = config.stylix.cursor;
-    in {
-      HYPRCURSOR_THEME = cfg.name;
-      HYPRCURSOR_SIZE = cfg.size;
-    };
-
-    services.hyprpaper = {
-      enable = true;
-    };
-
-    wayland.windowManager.hyprland = {
-      enable = true;
-
-      systemd.enable = true;
-      xwayland.enable = true;
-
-      settings = let
-        numMonitors = lib.length (lib.attrNames (cfg.monitors or {}));
-        workspaces = lib.range 1 10;
-        wsPerMonitor = 10 / numMonitors;
-
-        mainMonWs = lib.range 1 wsPerMonitor;
-        secondaryWs = lib.subtractLists mainMonWs workspaces;
-
-        monitors = lib.mapAttrs (mon: _:
-          if (mon == (cfg.mainMonitor or ""))
-          then ""
-          else lib.replicate wsPerMonitor "${mon}")
-        (cfg.monitors or {});
-
-        secondaryMons = removeAttrs monitors [(cfg.mainMonitor or "")];
-        monList = lib.concatLists (lib.attrValues secondaryMons);
-
-        firstWsToMons =
-          lib.zipListsWith (mon: ws: {
-            name = toString ws;
-            value = mon;
-          })
-          monList
-          secondaryWs;
-
-        leftover =
-          lib.sublist (lib.length monList) (10 - (wsPerMonitor * numMonitors)) secondaryWs;
-
-        wsToMons =
-          firstWsToMons
-          ++ (map (ws: {
-              name = toString ws;
-              value = lib.last monList;
-            })
-            leftover)
-          ++ (map (ws: {
-              name = toString ws;
-              value = cfg.mainMonitor or "";
-            })
-            mainMonWs);
-
-        wsMons = lib.listToAttrs wsToMons;
-      in {
-        monitor = lib.attrValues cfg.monitors;
-
-        "$terminal" = lib.getExe config.marleyos.apps.terminal;
-        "$launcher" = let
-          inherit (config.marleyos.apps) launcher;
-        in "${lib.getExe launcher.package} ${launcher.command}";
-        "$browser" = lib.getExe config.marleyos.apps.browser;
-
-        exec-once = let
-          browserWs =
-            if (cfg ? monitors)
-            then wsPerMonitor + 1
-            else 2;
-        in [
-          (lib.getExe config.programs.waybar.package)
-          "[workspace 1 silent] $terminal -e tmux new -s main -A"
-          "[workspace ${toString browserWs} silent] $browser"
-        ];
-
-        workspace =
-          lib.mkIf (cfg ? monitors)
-          (map
-            (ws: "${toString ws}, monitor:${wsMons."${toString ws}"}")
-            workspaces);
-
-        general = let
-          inherit (config.lib.stylix) colors;
-
-          rgb = color: "rgb(${color})";
-        in {
-          gaps_in = 5;
-          gaps_out = 20;
-          border_size = 2;
-
-          "col.active_border" = with colors; "${rgb base0A} ${rgb base0B} ${rgb base08} ${rgb base0D} 90deg";
-
-          resize_on_border = false;
-
-          layout = "dwindle";
-        };
-
-        decoration = {
-          rounding = 10;
-
-          shadow = {
-            enabled = true;
-            range = 4;
-            render_power = 3;
-          };
-
-          blur = {
-            enabled = true;
-            size = 3;
-            passes = 1;
-
-            vibrancy = 0.1696;
-          };
-        };
-
-        animations = {
-          enabled = true;
-
-          bezier = [
-            "easeOutQuint,0.23,1,0.32,1"
-            "easeInOutCubic,0.65,0.05,0.36,1"
-            "linear,0,0,1,1"
-            "almostLinear,0.5,0.5,0.75,1.0"
-            "quick,0.15,0,0.1,1"
-          ];
-
-          animation = [
-            "global, 1, 10, default"
-            "border, 1, 5.39, easeOutQuint"
-            "windows, 1, 4.79, easeOutQuint"
-            "windowsIn, 1, 4.1, easeOutQuint, popin 87%"
-            "windowsOut, 1, 1.49, linear, popin 87%"
-            "fadeIn, 1, 1.73, almostLinear"
-            "fadeOut, 1, 1.46, almostLinear"
-            "fade, 1, 3.03, quick"
-            "layers, 1, 3.81, easeOutQuint"
-            "layersIn, 1, 4, easeOutQuint, fade"
-            "layersOut, 1, 1.5, linear, fade"
-            "fadeLayersIn, 1, 1.79, almostLinear"
-            "fadeLayersOut, 1, 1.39, almostLinear"
-            "workspaces, 1, 1.94, almostLinear, fade"
-            "workspacesIn, 1, 1.21, almostLinear, fade"
-            "workspacesOut, 1, 1.94, almostLinear, fade"
-          ];
-        };
-
-        dwindle = {
-          pseudotile = true;
-          preserve_split = true;
-        };
-
-        input = {
-          kb_layout = "us";
-          numlock_by_default = true;
-          follow_mouse = 2;
-        };
-
-        "$mod" = "SUPER";
-
-        bind = [
-          "$mod, Q, killactive,"
-          "$mod SHIFT, E, exit,"
-
-          "$mod SHIFT, SPACE, togglefloating"
-          "$mod, E, togglesplit"
-
-          "$mod, RETURN, exec, $terminal"
-          "$mod, R, exec, $launcher"
-
-          "$mod, h, movefocus, l"
-          "$mod, j, movefocus, d"
-          "$mod, k, movefocus, u"
-          "$mod, l, movefocus, r"
-
-          "$mod, 1, workspace, 1"
-          "$mod, 2, workspace, 2"
-          "$mod, 3, workspace, 3"
-          "$mod, 4, workspace, 4"
-          "$mod, 5, workspace, 5"
-          "$mod, 6, workspace, 6"
-          "$mod, 7, workspace, 7"
-          "$mod, 8, workspace, 8"
-          "$mod, 9, workspace, 9"
-          "$mod, 0, workspace, 10"
-
-          "$mod SHIFT, 1, movetoworkspace, 1"
-          "$mod SHIFT, 2, movetoworkspace, 2"
-          "$mod SHIFT, 3, movetoworkspace, 3"
-          "$mod SHIFT, 4, movetoworkspace, 4"
-          "$mod SHIFT, 5, movetoworkspace, 5"
-          "$mod SHIFT, 6, movetoworkspace, 6"
-          "$mod SHIFT, 7, movetoworkspace, 7"
-          "$mod SHIFT, 8, movetoworkspace, 8"
-          "$mod SHIFT, 9, movetoworkspace, 9"
-          "$mod SHIFT, 0, movetoworkspace, 10"
-
-          "$mod, mouse_down, workspace, e+1"
-          "$mod, mouse_up, workspace, e-1"
-        ];
-
-        bindm = [
-          "$mod, mouse:272, movewindow"
-          "$mod, mouse:273, resizewindow"
-        ];
-
-        windowrulev2 = [
-          # Ignore maximize requests from apps.
-          "suppressevent maximize, class:.*"
-
-          # Fix some dragging issues with XWayland.
-          "nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0"
-        ];
-      };
-    };
-  };
-}
diff --git a/modules/home/wayland/hyprland/wallpaper.png b/modules/home/wayland/hyprland/wallpaper.png
deleted file mode 100644
index 730d721..0000000
Binary files a/modules/home/wayland/hyprland/wallpaper.png and /dev/null differ
diff --git a/modules/home/xorg/i3/bg.jpg b/modules/home/xorg/i3/bg.jpg
deleted file mode 100644
index 2cd8b70..0000000
Binary files a/modules/home/xorg/i3/bg.jpg and /dev/null differ
diff --git a/modules/home/xorg/i3/default.nix b/modules/home/xorg/i3/default.nix
deleted file mode 100644
index 58c1650..0000000
--- a/modules/home/xorg/i3/default.nix
+++ /dev/null
@@ -1,166 +0,0 @@
-{
-  lib,
-  config,
-  pkgs,
-  ...
-}: let
-  cfg = config.marleyos.xorg.i3;
-  isGenericLinux = config.targets.genericLinux.enable;
-in {
-  options.marleyos.xorg.i3.enable = lib.mkEnableOption "i3";
-
-  config = lib.mkIf cfg.enable {
-    marleyos = {
-      xorg.enable = true;
-      programs.rofi.enable = true;
-      services = {
-        dunst.enable = true;
-        picom.enable = true;
-        polybar.enable = true;
-        # broken on non-nixOS
-        screen-locker.enable =
-          if isGenericLinux
-          then false
-          else true;
-      };
-    };
-
-    home.packages = with pkgs; [
-      networkmanagerapplet
-      feh
-    ];
-
-    xsession.windowManager.i3 = {
-      enable = true;
-      package = lib.mkIf config.marleyos.nixGL.enable (config.lib.nixGL.wrap pkgs.i3);
-
-      extraConfig = "tiling_drag modifier titlebar";
-
-      config = let
-        directions = {
-          left = "h";
-          down = "j";
-          up = "k";
-          right = "l";
-        };
-      in {
-        focus.followMouse = false;
-        window.border = 0;
-        floating.border = 0;
-
-        window.titlebar = false;
-        floating.titlebar = false;
-
-        gaps = {
-          smartBorders = "no_gaps";
-          inner = 10;
-          top = 50;
-        };
-
-        bars = [];
-
-        # Startup - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-        startup = with pkgs; [
-          {command = "${getExe feh} --no-fehbg --bg-fill ${./bg.jpg}";}
-          {command = "${getExe networkmanagerapplet}";}
-        ];
-
-        # Keybindings - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-        modifier = "Mod4";
-
-        keybindings = let
-          mod = config.xsession.windowManager.i3.config.modifier;
-          workspaces = lib.range 1 10;
-          getI = i:
-            if i == 10
-            then "0"
-            else toString i;
-          inherit (config.xdg) configHome;
-        in
-          {
-            "${mod}+Shift+c" = "reload";
-            "${mod}+Shift+r" = "restart";
-            "${mod}+Shift+e" = "exec i3-nagbar -t warning -m 'Do you want to exit i3?' -b 'Yes' 'i3-msg exit'";
-
-            "${mod}+e" = "layout toggle split";
-            "${mod}+Control+h" = "split -";
-            "${mod}+Control+v" = "split |";
-
-            "${mod}+f" = "fullscreen toggle";
-
-            "${mod}+Shift+space" = "floating toggle";
-
-            "${mod}+Control+r" = "mode resize";
-
-            "${mod}+q" = "kill";
-
-            "${mod}+r" = "exec ${configHome}/rofi/launchers/type-1/launcher.sh";
-            "${mod}+Return" = "exec ${lib.getExe config.marleyos.apps.terminal}";
-          }
-          # PulseAudio Volume - - - - - - - - - - - - - - - - - - - - - - - -
-          // (
-            lib.concatMapAttrs
-            (key: cmd: {
-              "${key}" = "exec --no-startup-id pactl ${cmd} && killall -SIGUSR1 i3status";
-            })
-            {
-              XF86AudioRaiseVolume = "set-sink-volume @DEFAULT_SINK@ +10%";
-              XF86AudioLowerVolume = "set-sink-volume @DEFAULT_SINK@ -10%";
-              XF86AudioMute = "set-sink-mute @DEFAULT_SINK@ toggle";
-              XF86AudioMicMute = "set-source-mute @DEFAULT_SOURCE@ toggle";
-            }
-          )
-          # Focus & Movement - - - - - - - - - - - - - - - - - - - - - - - - -
-          // (lib.concatMapAttrs (direction: key: {
-              "${mod}+${key}" = "focus ${direction}";
-              "${mod}+Shift+${key}" = "move ${direction}";
-            })
-            directions)
-          # Switch Workspaces - - - - - - - - - - - - - - - - - - - - - - - - -
-          // (lib.listToAttrs (
-            (map (i: {
-              name = "${mod}+${getI i}";
-              value = "workspace number ${toString i}";
-            }))
-            workspaces
-          ))
-          # Move Windows Between Workspaces - - - - - - - - - - - - - - - - - -
-          // (lib.listToAttrs (
-            (map (i: {
-              name = "${mod}+Shift+${getI i}";
-              value = "move container to workspace number ${toString i}";
-            }))
-            workspaces
-          ));
-
-        # Resize Windows - - - - - - - - - - - - - - - - - - - - - - - - - - -
-        modes.resize = let
-          mod = config.xsession.windowManager.i3.config.modifier;
-        in
-          {
-            Return = "mode default";
-            Escape = "mode default";
-            "${mod}+Control+r" = "mode default";
-          }
-          // (
-            lib.concatMapAttrs
-            (key: action: {
-              "${key}" = "resize ${action} 10 px or 10 ppt";
-            })
-            rec {
-              Left = "shrink width";
-              Down = "shrink height";
-              Up = "grow height";
-              Right = "grow width";
-              "${directions.left}" = Left;
-              "${directions.down}" = Down;
-              "${directions.up}" = Up;
-              "${directions.right}" = Right;
-            }
-          );
-      };
-    };
-  };
-}
diff --git a/modules/nixos/services/sddm/default.nix b/modules/nixos/services/sddm/default.nix
deleted file mode 100644
index e28f3ec..0000000
--- a/modules/nixos/services/sddm/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.services.sddm;
-in {
-  options.marleyos.services.sddm.enable = lib.mkEnableOption "sddm";
-
-  config = lib.mkIf cfg.enable {
-    services.displayManager.sddm = {
-      enable = true;
-    };
-  };
-}
diff --git a/modules/nixos/wayland/hyprland/default.nix b/modules/nixos/wayland/hyprland/default.nix
deleted file mode 100644
index 137ac19..0000000
--- a/modules/nixos/wayland/hyprland/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.wayland.hyprland;
-in {
-  options.marleyos.wayland.hyprland.enable = lib.mkEnableOption "hyprland";
-
-  config = lib.mkIf cfg.enable {
-    marleyos.programs.hyprlock.enable = true;
-
-    programs.hyprland = {
-      enable = true;
-      withUWSM = false;
-    };
-  };
-}
diff --git a/modules/nixos/xorg/xfce/default.nix b/modules/nixos/xorg/xfce/default.nix
deleted file mode 100644
index c2a5e6b..0000000
--- a/modules/nixos/xorg/xfce/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.marleyos.xorg.xfce;
-in {
-  options.marleyos.xorg.xfce.enable = lib.mkEnableOption "xfce";
-
-  config = lib.mkIf cfg.enable {
-    services.xserver = {
-      enable = true;
-
-      desktopManager.xfce = {
-        enable = true;
-      };
-    };
-  };
-}
diff --git a/overlays/polybar/default.nix b/overlays/polybar/default.nix
deleted file mode 100644
index e74bc74..0000000
--- a/overlays/polybar/default.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-_: final: prev: {
-  polybar = prev.polybar.override {
-    mpdSupport = true;
-    pulseSupport = true;
-  };
-}