diff --git a/hosts/ace/default.nix b/hosts/ace/default.nix
index fce23af..a252449 100644
--- a/hosts/ace/default.nix
+++ b/hosts/ace/default.nix
@@ -15,20 +15,10 @@
   variables.swayScale = "0.75";
 
   roles = {
-    citrix.enable = false;
-    zoom.enable = false;
     gui.enable = true;
     kmscon.enable = true;
-    kvm.enable = false;
-    games.enable = false;
-    wine.enable = false;
-    tlp.enable = false;
-    gnome-calendar.enable = false;
   };
-  primary.enable = false;
   wm = {
     sway.enable = true;
-    kde.enable = false;
-    # cosmic.enable = false;
   };
 }
diff --git a/hosts/book/default.nix b/hosts/book/default.nix
index 7d38840..f4d9b5e 100644
--- a/hosts/book/default.nix
+++ b/hosts/book/default.nix
@@ -21,16 +21,10 @@
     zoom.enable = true;
     gui.enable = true;
     kmscon.enable = true;
-    kvm.enable = false;
-    games.enable = false;
-    wine.enable = false;
-    tlp.enable = true;
+    auto-cpufreq.enable = true;
     gnome-calendar.enable = true;
   };
-  primary.enable = false;
   wm = {
     sway.enable = true;
-    kde.enable = false;
-    # cosmic.enable = false;
   };
 }
diff --git a/hosts/dragon/default.nix b/hosts/dragon/default.nix
index 26bdaee..b773f20 100644
--- a/hosts/dragon/default.nix
+++ b/hosts/dragon/default.nix
@@ -16,20 +16,11 @@
   variables.swayScale = "1.0";
 
   roles = {
-    citrix.enable = false;
-    zoom.enable = false;
     gui.enable = true;
     kmscon.enable = true;
-    kvm.enable = true;
-    games.enable = true;
-    wine.enable = false;
-    tlp.enable = true;
-    gnome-calendar.enable = false;
+    auto-cpufreq.enable = true;
   };
-  primary.enable = false;
   wm = {
     sway.enable = true;
-    kde.enable = false;
-    # cosmic.enable = false;
   };
 }
diff --git a/hosts/eve/default.nix b/hosts/eve/default.nix
index aca66cd..5a91227 100644
--- a/hosts/eve/default.nix
+++ b/hosts/eve/default.nix
@@ -16,20 +16,12 @@
   variables.swayScale = "1.5";
 
   roles = {
-    citrix.enable = false;
     zoom.enable = true;
     gui.enable = true;
     kmscon.enable = true;
-    kvm.enable = false;
-    games.enable = false;
-    wine.enable = false;
-    tlp.enable = true;
-    gnome-calendar.enable = false;
+    auto-cpufreq.enable = true;
   };
-  primary.enable = false;
   wm = {
     sway.enable = true;
-    kde.enable = false;
-    # cosmic.enable = false;
   };
 }
diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix
index 4b41cf7..8a13674 100644
--- a/hosts/loki/default.nix
+++ b/hosts/loki/default.nix
@@ -15,24 +15,19 @@
   networking.hostName = "loki";
   boot.binfmt.emulatedSystems = ["aarch64-linux"];
   variables.address = "100.72.0.1";
-  variables.swayScale = "1.1";
+  variables.swayScale = "1.2";
 
   roles = {
     citrix.enable = true;
     zoom.enable = true;
     gui.enable = true;
     kmscon.enable = true;
-    kvm.enable = false;
     games.enable = true;
-    wine.enable = false;
-    tlp.enable = false;
     auto-cpufreq.enable = true;
     gnome-calendar.enable = true;
   };
   primary.enable = true;
   wm = {
     sway.enable = true;
-    kde.enable = false;
-    # cosmic.enable = false;
   };
 }
diff --git a/hosts/pocket2/default.nix b/hosts/pocket2/default.nix
index fc8b8bc..ec9622a 100644
--- a/hosts/pocket2/default.nix
+++ b/hosts/pocket2/default.nix
@@ -11,15 +11,9 @@
   variables.swayScale = "1.7";
 
   roles = {
-    citrix.enable = false;
-    zoom.enable = false;
     gui.enable = true;
-    kvm.enable = false;
-    games.enable = false;
   };
   wm = {
     sway.enable = true;
-    kde.enable = false;
-    # cosmic.enable = false;
   };
 }
diff --git a/hosts/smaug/default.nix b/hosts/smaug/default.nix
index 90ac422..a764d20 100644
--- a/hosts/smaug/default.nix
+++ b/hosts/smaug/default.nix
@@ -19,21 +19,12 @@
   variables.swayScale = "0.75";
 
   roles = {
-    citrix.enable = false;
-    zoom.enable = true;
     gui.enable = true;
     kmscon.enable = true;
-    kvm.enable = true;
-    games.enable = true;
-    wine.enable = false;
-    tlp.enable = false;
     auto-cpufreq.enable = true;
     gnome-calendar.enable = true;
   };
-  primary.enable = false;
   wm = {
     sway.enable = true;
-    kde.enable = false;
-    # cosmic.enable = false;
   };
 }