diff --git a/home/citadel.nix b/home/citadel.nix
index ba5a804..02d798a 100644
--- a/home/citadel.nix
+++ b/home/citadel.nix
@@ -13,6 +13,7 @@
     ./common/optional/desktop/common/themes/standard-dark.nix
     ./common/optional/notes.nix
     ./common/optional/yazi.nix
+    ./common/optional/desktop/common/kodi.nix
   ];
 
   home.packages = [
diff --git a/hosts/citadel/default.nix b/hosts/citadel/default.nix
index 3be691d..9a44843 100644
--- a/hosts/citadel/default.nix
+++ b/hosts/citadel/default.nix
@@ -108,22 +108,6 @@ in {
     XCURSOR_SIZE = "64";
   };
 
-  environment.systemPackages = [
-    pkgs.linuxKernel.packages.linux_zen.cpupower
-    pkgs.lm_sensors
-  ];
-
-  services.tlp = {
-    enable = true;
-    settings = {
-      CPU_SCALING_GOVERNOR_ON_AC = "ondemand";
-      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
-
-      START_CHARGE_THRESH_BAT0 = 60;
-      STOP_CHARGE_THRESH_BAT0 = 85;
-    };
-  };
-
   hardware = {
     bluetooth = {
       enable = true;
diff --git a/hosts/common/optional/powersave.nix b/hosts/common/optional/powersave.nix
new file mode 100644
index 0000000..1c6a681
--- /dev/null
+++ b/hosts/common/optional/powersave.nix
@@ -0,0 +1,16 @@
+{pkgs, ...}: {
+  environment.systemPackages = [
+    pkgs.linuxKernel.packages.linux_zen.cpupower
+    pkgs.lm_sensors
+  ];
+
+  services.tlp = {
+    enable = true;
+    settings = {
+      CPU_SCALING_GOVERNOR_ON_AC = "ondemand";
+      CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+      START_CHARGE_THRESH_BAT0 = 60;
+      STOP_CHARGE_THRESH_BAT0 = 85;
+    };
+  };
+}