diff --git a/templates/hosts/desktop/default.nix b/templates/hosts/desktop/default.nix
index 40f8f585..571e3947 100644
--- a/templates/hosts/desktop/default.nix
+++ b/templates/hosts/desktop/default.nix
@@ -30,15 +30,24 @@
       };
       browsers = {
         default = "firefox";
-        firefox.enable = true;
+        firefox = {
+          enable = true;
+          privacy.enable = true;
+        };
       };
-      extensions.player = {
-        music.enable = true;
-        video.enable = true;
-      };
-      toolset.docViewer = {
-        enable = true;
-        program = "zathura";
+      toolset = {
+        player = {
+          music.enable = true;
+          video.enable = true;
+        };
+        social = {
+          base.enable = true;
+          matrix.withDaemon.enable = true;
+        };
+        docViewer = {
+          enable = true;
+          program = "zathura";
+        };
       };
     };
   };
diff --git a/templates/hosts/desktop/hardware.nix b/templates/hosts/desktop/hardware.nix
index 773e73c1..757bd4d1 100644
--- a/templates/hosts/desktop/hardware.nix
+++ b/templates/hosts/desktop/hardware.nix
@@ -42,15 +42,15 @@
   nix.settings.max-jobs = lib.mkDefault 16;
   powerManagement.cpuFreqGovernor = "performance";
 
-  # WARNING: DISABLE NON-EXISTANT cpu
+  # :WARN| DISABLE NON-EXISTANT cpu
   hardware.cpu.amd.updateMicrocode = true;
   hardware.cpu.intel.updateMicrocode = true;
 
-  # Here we enable our modules found within modules/
+  # Here we enable our custom modules (snowflake/modules)
   modules.hardware = {
     pipewire.enable = true;
     bluetooth.enable = true;
-    razer.enable = true;
     pointer.enable = true;
+    printer.enable = true;
   };
 }