diff --git a/configuration.nix b/configuration.nix
index 558a2b4..f744dfa 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -18,6 +18,7 @@ in
     ./system-modules/health_reminder.nix
     ./system-modules/ollama.nix
     ./system-modules/nx2site.nix
+    ./system-modules/kodi.nix
   ];
 
 
diff --git a/system-modules/dm.nix b/system-modules/dm.nix
index 2b5ba1f..a2df82e 100755
--- a/system-modules/dm.nix
+++ b/system-modules/dm.nix
@@ -1,17 +1,16 @@
-{ config, pkgs, ... }:
+{ lib, pkgs, host, ... }:
 
 {
   environment.systemPackages = with  pkgs; [
     sddm
-    where-is-my-sddm-theme
+    # where-is-my-sddm-theme
   ];
-
   services.xserver = {
     displayManager = {
       defaultSession = "hyprland";
       sddm = {
         enable = true;
-        theme = "where_is_my_sddm_theme";
+        # theme = "where_is_my_sddm_theme";
         settings = {
           theme = {
             # background = /home/nx2/Pictures/
@@ -20,6 +19,10 @@
           };
         };
       };
+      autoLogin = lib.mkIf (host == "NxACE") {
+        enable = true;
+        user = "tv";
+      };
     };
   };
 }
diff --git a/system-modules/kodi.nix b/system-modules/kodi.nix
new file mode 100644
index 0000000..165ec6a
--- /dev/null
+++ b/system-modules/kodi.nix
@@ -0,0 +1,12 @@
+{ pkgs, lib, host, ... }:
+lib.mkIf (host == "NxACE")
+{
+  services.xserver.desktopManager.kodi = {
+    enable = true;
+  };
+  services.cage = {
+    user = "kodi";
+    program = "${pkgs.kodi-wayland}/bin/kodi-standalone";
+    enable = true;
+  };
+}