diff --git a/configuration.nix b/configuration.nix
index 79ed89e..2ac37a0 100755
--- a/configuration.nix
+++ b/configuration.nix
@@ -19,6 +19,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 0e6af07..f990c86 100755
--- a/system-modules/dm.nix
+++ b/system-modules/dm.nix
@@ -1,27 +1,6 @@
-{ pkgs, user, ... }:
-
+{ pkgs, user, host, lib, ... }:
+if (host != "NxACE") then 
 {
-  # environment.systemPackages = with pkgs; [
-  #   sddm
-  #   where-is-my-sddm-theme
-  # ];
-
-  # services.xserver = {
-  #   displayManager = {
-  #     defaultSession = "hyprland";
-  #     sddm = {
-  #       enable = true;
-  #       theme = "where_is_my_sddm_theme";
-  #       settings = {
-  #         theme = {
-  #           # background = /home/nx2/Pictures/
-  #           passwordFontSize = 12;
-  #           passwordInputCursorVisible = true;
-  #         };
-  #       };
-  #     };
-  #   };
-  # };
   services.greetd = {
     enable = true;
     settings = rec {
@@ -31,6 +10,33 @@
       };
       default_session = hyprland;
       vt = 2;
+    };  
+  };
+} 
+else 
+{
+  environment.systemPackages = with  pkgs; [
+    sddm
+    # where-is-my-sddm-theme
+  ];
+  services.xserver = {
+    displayManager = {
+      defaultSession = "hyprland";
+      sddm = {
+        enable = true;
+        # theme = "where_is_my_sddm_theme";
+        settings = {
+          theme = {
+            # background = /home/nx2/Pictures/
+            passwordFontSize = 12;
+            passwordInputCursorVisible = true;
+          };
+        };
+      };
+      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;
+  };
+}