diff --git a/nix/configuration/hosts/neelix/default.nix b/nix/configuration/hosts/neelix/default.nix
index bdcd7dd..34713d2 100644
--- a/nix/configuration/hosts/neelix/default.nix
+++ b/nix/configuration/hosts/neelix/default.nix
@@ -27,4 +27,6 @@
 
   me.graphical = true;
   me.graphicsCardType = "intel";
+
+  me.kodi.enable = true;
 }
diff --git a/nix/configuration/hosts/odo/default.nix b/nix/configuration/hosts/odo/default.nix
index 52c4081..2ff3b72 100644
--- a/nix/configuration/hosts/odo/default.nix
+++ b/nix/configuration/hosts/odo/default.nix
@@ -31,4 +31,6 @@
 
   me.graphical = true;
   me.graphicsCardType = "amd";
+
+  me.sway.enable = true;
 }
diff --git a/nix/configuration/roles/blank/default.nix b/nix/configuration/roles/blank/default.nix
index 0b9310b..d38650e 100644
--- a/nix/configuration/roles/blank/default.nix
+++ b/nix/configuration/roles/blank/default.nix
@@ -9,7 +9,7 @@
   imports = [ ];
 
   options.me = {
-    blank.enabled = lib.mkOption {
+    blank.enable = lib.mkOption {
       type = lib.types.bool;
       default = false;
       example = true;
@@ -17,7 +17,7 @@
     };
   };
 
-  config = lib.mkIf config.me.blank.enabled (
+  config = lib.mkIf config.me.blank.enable (
     lib.mkMerge [
       {
         environment.systemPackages = with pkgs; [
diff --git a/nix/configuration/roles/kodi/default.nix b/nix/configuration/roles/kodi/default.nix
index e2e227f..2a7fac5 100644
--- a/nix/configuration/roles/kodi/default.nix
+++ b/nix/configuration/roles/kodi/default.nix
@@ -9,7 +9,7 @@
   imports = [ ];
 
   options.me = {
-    kodi.enabled = lib.mkOption {
+    kodi.enable = lib.mkOption {
       type = lib.types.bool;
       default = false;
       example = true;
@@ -17,13 +17,17 @@
     };
   };
 
-  config = lib.mkIf config.me.kodi.enabled (
+  config = lib.mkIf config.me.kodi.enable (
     lib.mkMerge [
       {
         environment.systemPackages = with pkgs; [
         ];
       }
       (lib.mkIf config.me.graphical {
+        users.extraUsers.kodi.isNormalUser = true;
+        services.cage.user = "kodi";
+        services.cage.program = "${pkgs.kodi-wayland}/bin/kodi-standalone";
+        services.cage.enable = true;
       })
     ]
   );
diff --git a/nix/configuration/roles/sway/default.nix b/nix/configuration/roles/sway/default.nix
index 634d0a9..e0acb25 100644
--- a/nix/configuration/roles/sway/default.nix
+++ b/nix/configuration/roles/sway/default.nix
@@ -267,7 +267,7 @@ in
   ];
 
   options.me = {
-    sway.enabled = lib.mkOption {
+    sway.enable = lib.mkOption {
       type = lib.types.bool;
       default = false;
       example = true;
@@ -286,7 +286,7 @@ in
     description = "List of packages to import as sway configs.";
   };
 
-  config = {
+  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
     environment.systemPackages = with pkgs; [
       alacritty
       pcmanfm
diff --git a/nix/configuration/roles/sway/force_focus.nix b/nix/configuration/roles/sway/force_focus.nix
index 28bf8c8..d276cbf 100644
--- a/nix/configuration/roles/sway/force_focus.nix
+++ b/nix/configuration/roles/sway/force_focus.nix
@@ -19,7 +19,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf config.me.graphical {
+  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
     me.swayIncludes = [
       force_focus_sway_config
     ];
diff --git a/nix/configuration/roles/sway/iso.nix b/nix/configuration/roles/sway/iso.nix
index 6882e71..66bbb1f 100644
--- a/nix/configuration/roles/sway/iso.nix
+++ b/nix/configuration/roles/sway/iso.nix
@@ -16,7 +16,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf (config.me.buildingIso) {
+  config = lib.mkIf (config.me.buildingIso && config.me.graphical && config.me.sway.enable) {
     # Launch a terminal at boot in the live ISO for when hotkeys don't work.
     me.swayIncludes = [
       launch_terminal
diff --git a/nix/configuration/roles/sway/lockscreen.nix b/nix/configuration/roles/sway/lockscreen.nix
index 79a81c2..7870852 100644
--- a/nix/configuration/roles/sway/lockscreen.nix
+++ b/nix/configuration/roles/sway/lockscreen.nix
@@ -25,7 +25,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf config.me.graphical {
+  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
     me.swayIncludes = [
       lockscreen_sway_config
     ];
diff --git a/nix/configuration/roles/sway/notification.nix b/nix/configuration/roles/sway/notification.nix
index ae2f40c..2e3a790 100644
--- a/nix/configuration/roles/sway/notification.nix
+++ b/nix/configuration/roles/sway/notification.nix
@@ -24,7 +24,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf config.me.graphical {
+  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
     me.swayIncludes = [
       notification_sway_config
     ];
diff --git a/nix/configuration/roles/sway/rofimoji.nix b/nix/configuration/roles/sway/rofimoji.nix
index 52929b5..b220e3f 100644
--- a/nix/configuration/roles/sway/rofimoji.nix
+++ b/nix/configuration/roles/sway/rofimoji.nix
@@ -17,7 +17,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf config.me.graphical {
+  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
     me.swayIncludes = [
       rofimoji_sway_config
     ];
@@ -49,14 +49,14 @@ in
       })
       (final: prev: {
         tofi = pkgs.symlinkJoin {
-            name = "tofi";
-            paths = [ prev.tofi ];
-            buildInputs = [ pkgs.makeWrapper ];
-            postBuild = ''
-              wrapProgram $out/bin/tofi-drun --add-flags --font=${pkgs.source-sans-pro}/share/fonts/opentype/SourceSansPro-Regular.otf --add-flags --config=${./files/tofi-config}
-              wrapProgram $out/bin/tofi --add-flags --config=${./files/tofi-config}
-            '';
-          };
+          name = "tofi";
+          paths = [ prev.tofi ];
+          buildInputs = [ pkgs.makeWrapper ];
+          postBuild = ''
+            wrapProgram $out/bin/tofi-drun --add-flags --font=${pkgs.source-sans-pro}/share/fonts/opentype/SourceSansPro-Regular.otf --add-flags --config=${./files/tofi-config}
+            wrapProgram $out/bin/tofi --add-flags --config=${./files/tofi-config}
+          '';
+        };
       })
     ];
   };
diff --git a/nix/configuration/roles/sway/screenshot.nix b/nix/configuration/roles/sway/screenshot.nix
index c1e55c8..0db8383 100644
--- a/nix/configuration/roles/sway/screenshot.nix
+++ b/nix/configuration/roles/sway/screenshot.nix
@@ -34,7 +34,7 @@ in
 {
   imports = [ ];
 
-  config = lib.mkIf config.me.graphical {
+  config = lib.mkIf (config.me.graphical && config.me.sway.enable) {
     me.swayIncludes = [
       screenshot_sway_config
     ];