diff --git a/flake.lock b/flake.lock
index be07d94..4319e57 100644
--- a/flake.lock
+++ b/flake.lock
@@ -510,22 +510,6 @@
         "type": "github"
       }
     },
-    "openrgb": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1708099263,
-        "narHash": "sha256-XvrmeDyLH6ZZfxi0dHb7fUZYWxRy1aM2QSgCP5O7X2c=",
-        "owner": "CalcProgrammer1",
-        "repo": "OpenRGB",
-        "rev": "4134de5daf77f3e6b87e3014f55f5d81607aeac1",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "CalcProgrammer1",
-        "repo": "OpenRGB",
-        "type": "gitlab"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -636,7 +620,6 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs",
         "nixpkgs-lib": "nixpkgs-lib",
-        "openrgb": "openrgb",
         "pre-commit-hooks": "pre-commit-hooks_2",
         "prismlauncher": "prismlauncher",
         "srvos": "srvos",
diff --git a/flake.nix b/flake.nix
index 5e5b75d..7b28210 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,10 +42,6 @@
       url = "github:vinceliuice/Tela-icon-theme";
       flake = false;
     };
-    openrgb = {
-      url = "gitlab:CalcProgrammer1/OpenRGB";
-      flake = false;
-    };
     nether = {
       url = "github:Lassulus/nether";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/packages/default.nix b/packages/default.nix
index eb30540..73c7a27 100644
--- a/packages/default.nix
+++ b/packages/default.nix
@@ -5,10 +5,6 @@
     src = inputs.tela-icon-theme;
   };
 
-  openrgb-git = pkgs.openrgb.overrideAttrs {
-    src = inputs.openrgb;
-  };
-
   libadwaita-follow-theme = pkgs.libadwaita.overrideAttrs (old: {
     patches = (old.patches or [ ]) ++ [ ./adwaita-theming-support.patch ];
     doCheck = false;
diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix
index b5c8213..1f73722 100644
--- a/systems/kuraokami/default.nix
+++ b/systems/kuraokami/default.nix
@@ -111,15 +111,7 @@
     xwayland.enable = true;
     kdeconnect.enable = true;
     gamemode.enable = true;
-  };
-
-  boot.binfmt.registrations.appimage = {
-    wrapInterpreterInShell = false;
-    interpreter = "${pkgs.appimage-run}/bin/appimage-run";
-    recognitionType = "magic";
-    offset = 0;
-    mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
-    magicOrExtension = ''\x7fELF....AI\x02'';
+    appimage.enable = true; # Not upstream jet
   };
 
   nix.settings.system-features = [ "gccarch-alderlake" "benchmark" "big-parallel" "kvm" "nixos-test" ]
diff --git a/upstream/modules/appimage/default.nix b/upstream/modules/appimage/default.nix
new file mode 100644
index 0000000..442b678
--- /dev/null
+++ b/upstream/modules/appimage/default.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+
+let cfg = config.programs.appimage;
+in {
+  options.programs.appimage = {
+    enable = lib.mkEnableOption "Enable AppImage Support";
+  };
+
+  config = lib.mkIf cfg.enable {
+    boot.binfmt.registrations.appimage = {
+      wrapInterpreterInShell = false;
+      interpreter = "${pkgs.appimage-run}/bin/appimage-run";
+      recognitionType = "magic";
+      offset = 0;
+      mask = ''\xff\xff\xff\xff\x00\x00\x00\x00\xff\xff\xff'';
+      magicOrExtension = ''\x7fELF....AI\x02'';
+    };
+  };
+}
diff --git a/upstream/modules/default.nix b/upstream/modules/default.nix
index be6b5e7..c08a416 100644
--- a/upstream/modules/default.nix
+++ b/upstream/modules/default.nix
@@ -2,6 +2,5 @@
 
 {
   imports = [
-    ./sshfs
   ];
 }
diff --git a/upstream/modules/sshfs/default.nix b/upstream/modules/sshfs/default.nix
deleted file mode 100644
index cd71dda..0000000
--- a/upstream/modules/sshfs/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  config = lib.mkIf (lib.any (fs: fs == "sshfs" || fs == "fuse.sshfs") config.boot.supportedFilesystems) {
-    system.fsPackages = [ pkgs.sshfs ];
-  };
-}