diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix
index 8c74d0d..0bec94a 100644
--- a/nixos/hosts/wheatley/configuration.nix
+++ b/nixos/hosts/wheatley/configuration.nix
@@ -51,62 +51,23 @@
     settings.PermitRootLogin = "no";
   };
 
-  users.users = {
-    ombi.extraGroups = ["radarr" "sonarr" "aria2"];
-  };
-  services.ombi = {
-    enable = true;
-    port = 2368;
-  };
-
-  users.users = {
-    radarr.extraGroups = ["aria2"];
-    sonarr.extraGroups = ["aria2"];
-  };
-
-  services = {
-    #uses port 7878
-    radarr.enable = true;
-    #uses port 8989
-    sonarr.enable = true;
-    prowlarr.enable = true;
-  };
-
-  #uses port 8096
-  services.jellyfin.enable = true;
-
   # Add stremio kiosk on wayland :)
-  services.cage.user = "jellyfin";
-  services.cage.program = "${pkgs.jellyfin-media-player}/bin/jellyfinmediaplayer";
+  users.extraUsers.kodi.isNormalUser = true;
+  services.cage.user = "kodi";
+  services.cage.program = "${pkgs.kodi}/bin/kodi-standalone";
   services.cage.enable = true;
 
-  users.users.aria2.group = "aria2";
-  users.groups.aria2 = {};
-  users.users.aria2.isSystemUser = true;
-
-  sops.secrets."rpcSecret".mode = "0440";
-  sops.secrets."rpcSecret".owner = config.users.users.aria2.name;
-
-  services.aria2 = {
-    enable = true;
-    settings = {
-      dir = "/var/lib/media";
-      rpcListenPort = 6969;
-    };
-    rpcSecretFile = config.sops.secrets."rpcSecret".path;
-  };
-
   environment.systemPackages = [
-    # (pkgs.kodi.withPackages (kodiPkgs:
-    #   with kodiPkgs; [
-    #     steam-controller
-    #     invidious
-    #     netflix
-    #     upnext
-    #     sponsorblock
-    #     sendtokodi
-    #     jellyfin
-    #   ]))
+    (pkgs.kodi.withPackages (kodiPkgs:
+      with kodiPkgs; [
+        steam-controller
+        invidious
+        netflix
+        upnext
+        sponsorblock
+        sendtokodi
+        jellyfin
+      ]))
   ];
 
   sops.secrets."protonvpn-priv-key".mode = "0440";
diff --git a/nixos/hosts/wheatley/secrets/sops.yaml b/nixos/hosts/wheatley/secrets/sops.yaml
index 8892797..4c62416 100644
--- a/nixos/hosts/wheatley/secrets/sops.yaml
+++ b/nixos/hosts/wheatley/secrets/sops.yaml
@@ -1,7 +1,6 @@
 wireless.env: ENC[AES256_GCM,data:a5sUW0Lc4GRd9aUJwHbmQvzvRB8WaRjMSQ==,iv:+3ncL38E3aqbejoCzzeBtMukLk4n/AQBJELlqhXDqSA=,tag:buY9Mp10DAEEEKqSyHwB3g==,type:str]
 lillian-password: ENC[AES256_GCM,data:GY7WyfLRc/q4fecnazWzfoZsruN/F0ar7mJ9RaqTHSb9K6xhEmifmJeqpR5xGIJYW6MYciCsZ9YmRsJbuSHTIlo9PrCTYBGvXg==,iv:bzml3abPox3RdvtKBQiBAcVXHUdGAn0ETMsDpBtT8T0=,tag:2iaBJ4hFFBUbonslTvQH5Q==,type:str]
 protonvpn-priv-key: ENC[AES256_GCM,data:s4LAq1Rqm+jGaK3OKcjIBCQYXPs3oEuTKJMAM+gFxIpZdwcJCIU7uyoCy6c=,iv:zoWv5u0xgJHldwdRGRv3bXI1kasaWQz1YD7wt0J890I=,tag:cFXnayZRq13UqP+XWuHnWw==,type:str]
-rpcSecret: ENC[AES256_GCM,data:3tCZk2csB/ofxPc6,iv:NwT6k1hh73moH6eErT23/Dvwgb1wP/qIuoxXnCgNSao=,tag:nh0mFsh9I4R1baCL1oH+AA==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -17,8 +16,8 @@ sops:
             Vm9mWk5JRGtZNVVhN1JQWTBlb2kySkEKoLI1MzS3uGNUbyn7kI5DylKZiPtc1div
             bKIboWoobTfDt0EURfmZ5+JrX6DlZxRyNQyl9dsKmZT6pLdaIppStA==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-12-04T21:38:42Z"
-    mac: ENC[AES256_GCM,data:Jh3653a7+omGPQl36dbjM/iNjS9/v6oYH55qLchJ0YeqwXFwXPzw0O1AIhDPeFcevYzNaxO6yAN0Zc1dTXO4KFeNXvBp1yoP5rb6P3pZNDtFgKkedZ7KdoTYgdl//pjg2yp5epEejJEGs2pT+GbzlpoN2pZotkjMNq9+knSp/8c=,iv:f8fLJHerF3l/1XVuXH4IuaCowSft+TdfgiyG/AMCMH4=,tag:h61Jtq1Hvpa/EkXQP7MtQQ==,type:str]
+    lastmodified: "2024-12-04T16:49:22Z"
+    mac: ENC[AES256_GCM,data:I+cWQh8NyXBMaciGvwk/oW0VlpV9j3yOwHUTsfd3t6dfY5EwVwVBHv6ZhdN53w5nB/nThhnnDH32fT7rPZ0X9CfgBuS1Sa05ASnZ460kezAqUIYNoNs5Zmbz3OYJTImMj8oFcg6q9dtCBO5BFfQvBj+21iwlNt9bRehqbsN0M/0=,iv:na3ytABXIhmv9Iq+abQQDT43n5q9j9Jc30+7S3lft5w=,tag:aS0HvqIx5H4kN5M9/OqQuA==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.9.1