diff --git a/home/features/README.md b/home/features/README.md
index 2e469b4..edfe3c5 100644
--- a/home/features/README.md
+++ b/home/features/README.md
@@ -8,7 +8,6 @@ Check out [tethys](../tethys.nix) for example imports
 | -------------------------------- | -------------------------------------------- |
 | [cli](./cli)                     | Configuration for terminal stuff             |
 | [desktop](./desktop)             | Desktop apps usable on both wayland and xorg |
-| [xorg](./xorg)                   | Xorg only stuff                              |
 | [wayland](./wayland)             | Wayland only stuff                           |
 | [neovim](./neovim)               | Neovim                                       |
 | [persistence](./persistence.nix) | For impermanence settings                    |
diff --git a/home/features/cli/eza.nix b/home/features/cli/eza.nix
index 8764d1a..96dbac2 100644
--- a/home/features/cli/eza.nix
+++ b/home/features/cli/eza.nix
@@ -1,11 +1,12 @@
 { pkgs, lib, ... }:
-let package = pkgs.eza;
+let
+  package = pkgs.eza;
 in
 {
   home.packages = [ package ];
-
   home.shellAliases =
-    let eza = lib.getExe package;
+    let
+      eza = lib.getExe package;
     in
     rec {
       ls = "${eza} --icons --long";
diff --git a/home/features/cli/fish/default.nix b/home/features/cli/fish/default.nix
index c0b6230..a588962 100644
--- a/home/features/cli/fish/default.nix
+++ b/home/features/cli/fish/default.nix
@@ -71,7 +71,6 @@ in
           done # Trigger a notification when long commands finish execution
           puffer # Text expansion (i.e. expanding .... to ../../../)
           sponge # Remove failed commands and whatnot from history
-          colored-man-pages
         ];
       in
       # For some reason home-manager expects a slightly different format 🤔
diff --git a/home/features/cli/productivity/default.nix b/home/features/cli/productivity/default.nix
index 6db123a..ca06157 100644
--- a/home/features/cli/productivity/default.nix
+++ b/home/features/cli/productivity/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
-    ./smos
-    # ./intray.nix
+    ./smos.nix
     ./mail.nix
   ];
 }
diff --git a/home/features/cli/productivity/intray.nix b/home/features/cli/productivity/intray.nix
deleted file mode 100644
index c3229e8..0000000
--- a/home/features/cli/productivity/intray.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ config, inputs, pkgs, ... }: {
-  sops.secrets.intray_password.sopsFile = ./secrets.yaml;
-
-  programs.intray = {
-    enable = true;
-
-    # We don't want to use the statically-linked binary, as it requires pulling-in ghc-musl.
-    intray-cli = inputs.intray.packages.${pkgs.system}.default.intray-cli;
-
-    data-dir = "${config.satellite.persistence.at.state.home}/intray";
-    cache-dir = "${config.satellite.persistence.at.cache.home}/intray";
-    config.sync = "AlwaysSync";
-    sync = {
-      enable = true;
-      username = "prescientmoon";
-      password-file = config.sops.secrets.intray_password.path;
-      url = "https://api.intray.moonythm.dev";
-    };
-  };
-}
diff --git a/home/features/cli/productivity/smos/default.nix b/home/features/cli/productivity/smos.nix
similarity index 96%
rename from home/features/cli/productivity/smos/default.nix
rename to home/features/cli/productivity/smos.nix
index 8e94f08..8724291 100644
--- a/home/features/cli/productivity/smos/default.nix
+++ b/home/features/cli/productivity/smos.nix
@@ -8,7 +8,7 @@ let
   workflowDir = "${config.xdg.userDirs.extraConfig.XDG_PROJECTS_DIR}/stellar-sanctum/smos";
 in
 {
-  sops.secrets.smos_password.sopsFile = ../secrets.yaml;
+  sops.secrets.smos_password.sopsFile = ./secrets.yaml;
 
   # {{{ Smos config
   programs.smos = {
diff --git a/home/features/cli/ssh.nix b/home/features/cli/ssh.nix
index 0210be3..54d6931 100644
--- a/home/features/cli/ssh.nix
+++ b/home/features/cli/ssh.nix
@@ -1,4 +1,3 @@
-{ pkgs, lib, ... }:
 {
   programs.ssh.enable = true;
   satellite.persistence.at.state.apps.ssh.directories = [ ".ssh" ];
diff --git a/home/features/xorg/feh.nix b/home/features/xorg/feh.nix
deleted file mode 100644
index a0a753a..0000000
--- a/home/features/xorg/feh.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, pkgs, ... }:
-{
-  xsession.initExtra =
-    "${pkgs.feh}/bin/feh --no-fehbg --bg-fill ${config.stylix.image}";
-}
diff --git a/home/features/xorg/global.nix b/home/features/xorg/global.nix
deleted file mode 100644
index 201d187..0000000
--- a/home/features/xorg/global.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, ... }: {
-  imports = [
-    ../desktop
-    ./rofi
-    ./polybar
-    ./feh.nix
-  ];
-
-  # Other packages I want to install:
-  home.packages = with pkgs; [
-    xclip # Clipboard stuff
-    spectacle # Take screenshots
-  ];
-}
diff --git a/home/features/xorg/polybar/default.nix b/home/features/xorg/polybar/default.nix
deleted file mode 100644
index cc5a812..0000000
--- a/home/features/xorg/polybar/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ pkgs, lib, paths, config, ... }:
-let
-  base16-polybar = config.lib.stylix.colors {
-    template = builtins.readFile ./template.mustache;
-  };
-
-  script = ''
-    polybar main &
-  '';
-in
-{
-  services.polybar = {
-    enable = true;
-    script = ""; # Otherwise this tries starting on wayland
-    extraConfig = ''
-      ; Generated theme
-      include-file = ${base16-polybar}
-
-      ; Consistent fonts
-      [fonts]
-      regular = "${config.stylix.fonts.sansSerif.name}"
-      monospace = "${config.stylix.fonts.monospace.name}"
-
-      ; Actual config
-      ${builtins.readFile ./polybar.ini}
-    '';
-  };
-
-  xsession = {
-    enable = true;
-    initExtra = script;
-  };
-}
diff --git a/home/features/xorg/polybar/polybar.ini b/home/features/xorg/polybar/polybar.ini
deleted file mode 100644
index be85b68..0000000
--- a/home/features/xorg/polybar/polybar.ini
+++ /dev/null
@@ -1,113 +0,0 @@
-[module/battery]
-type = internal/battery
-
-; Use the following command to list batteries and adapters:
-; $ ls -1 /sys/class/power_supply/
-battery = BAT0
-adapter = AC
-
-format-charging = <animation-charging>  <label-charging>
-format-discharging = <animation-discharging>  <label-discharging>
-format-low = <animation-low>    <label-low>
-
-; Only applies if <animation-charging> is used
-animation-charging-0 = 
-animation-charging-1 = 
-animation-charging-2 = 
-animation-charging-3 = 
-animation-charging-4 = 
-; Framerate in milliseconds
-animation-charging-framerate = 750
-
-; Only applies if <animation-discharging> is used
-animation-discharging-0 = 
-animation-discharging-1 = 
-animation-discharging-2 = 
-animation-discharging-3 = 
-animation-discharging-4 = 
-; Framerate in milliseconds
-animation-discharging-framerate = 500
-
-; Only applies if <animation-low> is used
-; New in version 3.6.0
-animation-low-0 = !
-animation-low-1 = 
-animation-low-framerate = 200
-
-[module/cpu]
-type = internal/cpu
-
-[module/date]
-type = internal/date
-date = %d-%m-%Y%
-time = %H:%M
-label =  %date%    %time%
-
-[module/wireless-network]
-type = internal/network
-interface = wlp0s20f3
-
-format-connected = <label-connected>
-format-packetloss = <animation-packetloss> <label-connected>
-format-disconnected = <label-disconnected>
-
-label-connected =    %essid%    %downspeed%    %upspeed%
-label-disconnected = 睊
-label-packetloss = %essid%
-
-animation-packetloss-0 = ⚠
-
-animation-packetloss-0-foreground = ${colors.base08}
-animation-packetloss-1 = 📶
-animation-packetloss-1-foreground = ${colors.base00}
-animation-packetloss-framerate = 500
-
-[module/ewmh]
-type = internal/xworkspaces
-icon-0 = 1:dev;
-icon-1 = 2:browser;
-icon-2 = 3:chat;ﭮ
-icon-3 = 4:terminal;
-icon-4 = 5:reading;
-icon-5 = 6:music;
-icon-6 = 7:gaming;
-icon-default = 
-
-format = <label-state>
-
-label-active = %icon%
-label-active-background = ${colors.base05}
-label-active-foreground = ${colors.base00}
-label-active-padding = 2
-
-label-urgent = %icon%
-label-urgent-background = ${colors.base09}
-label-urgent-foreground = ${colors.base00}
-label-urgent-padding = 2
-
-label-occupied = %icon%
-label-occupied-padding = 2
-
-label-empty = 
-
-[bar/main]
-font-0 = ${fonts.monospace}
-
-modules-left =  date battery
-modules-center =  ewmh 
-modules-right = wireless-network 
-
-padding-right = 2
-padding-left = 2
-padding-top = 4
-module-margin = 2
-
-height=4%
-
-border-top-size = 1
-border-top-color= ${colors.base05}
-
-background = ${colors.base00}
-foreground = ${colors.base05}
-
-bottom = true
diff --git a/home/features/xorg/polybar/template.mustache b/home/features/xorg/polybar/template.mustache
deleted file mode 100644
index 8df9d67..0000000
--- a/home/features/xorg/polybar/template.mustache
+++ /dev/null
@@ -1,17 +0,0 @@
-[colors]
-base00 = {{base00-hex}}
-base01 = {{base01-hex}}
-base02 = {{base02-hex}}
-base03 = {{base03-hex}}
-base04 = {{base04-hex}}
-base05 = {{base05-hex}}
-base06 = {{base06-hex}}
-base07 = {{base07-hex}}
-base08 = {{base08-hex}}
-base09 = {{base09-hex}}
-base0A = {{base0A-hex}}
-base0B = {{base0B-hex}}
-base0C = {{base0C-hex}}
-base0D = {{base0D-hex}}
-base0E = {{base0E-hex}}
-base0F = {{base0F-hex}}
diff --git a/home/features/xorg/rofi/config.rasi b/home/features/xorg/rofi/config.rasi
deleted file mode 100644
index 71998d1..0000000
--- a/home/features/xorg/rofi/config.rasi
+++ /dev/null
@@ -1,21 +0,0 @@
-configuration {
-  location: 0;
-  cycle: true;
-  modi: "run,drun,window";
-  icon-theme: "Oranchelo";
-  show-icons: true;
-  terminal: "alacritty";
-  drun-display-format: "{icon} {name}";
-  disable-history: false;
-  hide-scrollbar: true;
-  display-drun: "   Apps ";
-  display-run: "   Run ";
-  display-window: " 﩯  Window";
-  display-Network: " 󰤨  Network";
-}
-
-window {
-  border: 3px;
-  height: 50%;
-  width: 50%;
-}
diff --git a/home/features/xorg/rofi/default.nix b/home/features/xorg/rofi/default.nix
deleted file mode 100644
index a0aa9dd..0000000
--- a/home/features/xorg/rofi/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ pkgs, config, ... }:
-let
-  base16-rofi = config.lib.stylix.colors {
-    templateRepo = pkgs.fetchFromGitHub {
-      owner = "tinted-theming";
-      repo = "base16-rofi";
-      sha256 = "03y4ydnd6sijscrrp4qdvckrckscd39r8gyhpzffs60a1w4n76j5";
-      rev = "3f64a9f8d8cb7db796557b516682b255172c4ab4";
-    };
-  };
-in
-{
-  home.packages = with pkgs; [ rofi ];
-
-  xdg.configFile."rofi/base16.rasi".source = base16-rofi;
-  xdg.configFile."rofi/config.rasi".text = ''
-    // Manual config
-    ${builtins.readFile ./config.rasi}
-
-    // Inject font
-    configuration {
-      font: "${config.stylix.fonts.monospace.name}";
-    }
-
-    // Theme
-    @import "base16"
-  '';
-}
diff --git a/home/features/xorg/xmonad.nix b/home/features/xorg/xmonad.nix
deleted file mode 100644
index 3198671..0000000
--- a/home/features/xorg/xmonad.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }: {
-  imports = [ ./global.nix ];
-
-  # Command required to get the xdg stuff to work. Suggested by @lily on discord.
-  xsession.initExtra = "${pkgs.dbus}/bin/dbus-update-activation-environment --systemd --all";
-}