diff --git a/home-manager/shared/default.nix b/home-manager/shared/default.nix
index 2e0fe1d..74e8945 100644
--- a/home-manager/shared/default.nix
+++ b/home-manager/shared/default.nix
@@ -83,6 +83,7 @@
     };
     image = ./background.jpg;
     cursor.package = pkgs.catppuccin-cursors;
-    cursor.name = "macchiatoMauve";
+    cursor.name = "catppuccin-macchiato-mauve-cursors";
+    cursor.size = 16;
   };
 }
diff --git a/home-manager/shared/shell/starship.nix b/home-manager/shared/shell/starship.nix
index 4cbba8e..90dda44 100644
--- a/home-manager/shared/shell/starship.nix
+++ b/home-manager/shared/shell/starship.nix
@@ -35,7 +35,6 @@
         git_branch.style = "bold blue";
         directory.style = "bold blue";
         direnv.disabled = false;
-        palette = "catppuccin_${flavor}";
       }
       // builtins.fromTOML (builtins.readFile
         (pkgs.fetchFromGitHub
diff --git a/nixos/desktop/default.nix b/nixos/desktop/default.nix
index ed67e12..b6ec6ab 100644
--- a/nixos/desktop/default.nix
+++ b/nixos/desktop/default.nix
@@ -141,7 +141,7 @@
       wayland.enable = true;
     };
     displayManager.defaultSession = "plasma";
-    desktopManager.plasma6.enable = true;
+    xserver.desktopManager.plasma5.enable = true;
 
     # Enable flatpak support
     flatpak.enable = true;
@@ -212,6 +212,7 @@
       # Virtual Microphone, built-in
       "snd-aloop"
     ];
+
     # Set initial kernel module settings
     extraModprobeConfig = ''
       # exclusive_caps: Skype, Zoom, Teams etc. will only show device when actually streaming
diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix
index fb86948..e11779c 100644
--- a/nixos/hosts/wheatley/configuration.nix
+++ b/nixos/hosts/wheatley/configuration.nix
@@ -99,7 +99,6 @@
       };
       rpcSecretFile = config.sops.secrets."rpcSecret".path;
     };
-
     dnsmasq = {
       enable = true;
       settings = {
@@ -107,6 +106,7 @@
       };
     };
   };
+
   sops = {
     # users.users = {
     #   ombi.extraGroups = ["radarr" "sonarr" "aria2"];
@@ -312,41 +312,26 @@
       type = "davfs";
     }
   ];
-  users = {
-    users.aria2 = {
-      # #uses port 8096
-      # services.jellyfin.enable = true;
-      # users.groups.jellyfinmediaplayer = {};
-      # users.users.jellyfinmediaplayer.group = "jellyfinmediaplayer";
-      # users.users.jellyfin.extraGroups = ["jellyfinmediaplayer"];
-
-      # # Add stremio kiosk on wayland :)
-      # users.extraUsers.jellyfinmediaplayer.isNormalUser = true;
-      # services.cage.user = "jellyfinmediaplayer";
-      # services.cage.program = "${pkgs.jellyfin-media-player}/bin/jellyfinmediaplayer";
-      # services.cage.enable = true;
-      # services.cage.extraArguments = ["-f"];
-
-      group = "aria2";
-      isSystemUser = true;
-    };
-    groups.aria2 = {};
-  };
 
   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
+      ]))
     pkgs.iptables
   ];
 
+  users.extraUsers.kodi.isNormalUser = true;
+  services.cage.user = "kodi";
+  services.cage.program = "${pkgs.kodi-wayland}/bin/kodi-standalone";
+  services.cage.enable = true;
+
   system.stateVersion = "25.05";
   nixpkgs.hostPlatform = lib.mkForce "aarch64-linux";
 }
diff --git a/nixos/server/package-configs/mail-server/default.nix b/nixos/server/package-configs/mail-server/default.nix
index 59caf66..eabc625 100644
--- a/nixos/server/package-configs/mail-server/default.nix
+++ b/nixos/server/package-configs/mail-server/default.nix
@@ -3,7 +3,7 @@
   sops.secrets."mailpass".owner = config.users.users.virtualMail.name;
 
   #Fix for the dovecot update
-  services.dovecot2.sieve.extensions = ["fileinto"];
+  # services.dovecot2.sieve.extensions = ["fileinto"];
 
   mailserver = {
     enable = true;
diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix
index 39f64b5..de2531d 100644
--- a/nixos/shared/default.nix
+++ b/nixos/shared/default.nix
@@ -70,8 +70,8 @@
   catppuccin = {
     flavor = "macchiato";
     tty.enable = true;
-    sddm.enable = true;
-    sddm.flavor = "macchiato";
+    # sddm.enable = true;
+    # sddm.flavor = "macchiato";
     forgejo.enable = true;
     forgejo.flavor = "macchiato";
     # plymouth.enable = false;
@@ -89,6 +89,7 @@
 
   stylix = {
     enable = true;
+    # targets.qt.platform = "kde6";
     autoEnable = true;
     base16Scheme = {
       scheme = "Catppuccin Macchiato";
@@ -113,6 +114,7 @@
     image = ./background.jpg;
     cursor.package = pkgs.catppuccin-cursors.macchiatoMauve;
     cursor.name = "catppuccin-macchiato-mauve-cursors";
+    cursor.size = 16;
     homeManagerIntegration.followSystem = true;
     fonts = {
       serif = {