diff --git a/hosts/cyberspark/system/hardware/default.nix b/hosts/cyberspark/system/hardware/default.nix
index 7d60b9e..ea8cbd0 100644
--- a/hosts/cyberspark/system/hardware/default.nix
+++ b/hosts/cyberspark/system/hardware/default.nix
@@ -24,7 +24,7 @@
     };
     swraid = {
       enable = true;
-      mdadmConf = "MAILADDR jimbo@jimbosfiles.com";
+      mdadmConf = "MAILADDR jimbo@${config.domains.jim2}";
     };
   };
 
diff --git a/hosts/firefly/system/boot/default.nix b/hosts/firefly/system/boot/default.nix
index 45430c9..86a44dc 100644
--- a/hosts/firefly/system/boot/default.nix
+++ b/hosts/firefly/system/boot/default.nix
@@ -19,7 +19,7 @@ let
   ];              
 in {
   boot = {
-    kernelPackages = pkgs.linuxPackages_cachyos;
+    kernelPackages = pkgs.unstable.linuxPackages_zen;
     blacklistedKernelModules = [
       "pcspkr"
     ];               
diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix
index ed6ed67..6cf9e4b 100644
--- a/modules/home/programs/gui/librewolf/default.nix
+++ b/modules/home/programs/gui/librewolf/default.nix
@@ -368,7 +368,7 @@ in {
     enable = true;
     package = pkgs.librewolf;
     profiles = {
-      Jimbo = {
+      Main = {
         id = 0;
         extensions = commonExtensions;
         search = commonSearch;
diff --git a/modules/home/programs/misc/avtools/default.nix b/modules/home/programs/misc/avtools/default.nix
index c4d6f09..e70d63f 100644
--- a/modules/home/programs/misc/avtools/default.nix
+++ b/modules/home/programs/misc/avtools/default.nix
@@ -5,6 +5,7 @@
     spotdl
     playerctl
     ffmpeg
+    puddletag
     pulsemixer
   ];
 }
diff --git a/modules/home/settings/dconf/default.nix b/modules/home/settings/dconf/default.nix
index 54ad39d..0e8a058 100644
--- a/modules/home/settings/dconf/default.nix
+++ b/modules/home/settings/dconf/default.nix
@@ -5,8 +5,8 @@
       color-scheme = "prefer-dark";
     };
     "org/virt-manager/virt-manager/connections" = {
-      autoconnect = ["qemu:///system"];
-      uris = ["qemu:///system"];
+      autoconnect = [ "qemu:///system" ];
+      uris = [ "qemu:///system" ];
     };
   };
 }
diff --git a/modules/home/settings/gtk/default.nix b/modules/home/settings/gtk/default.nix
index 78a4bfc..e7f9888 100644
--- a/modules/home/settings/gtk/default.nix
+++ b/modules/home/settings/gtk/default.nix
@@ -9,10 +9,14 @@
     theme = {
       name = "Colloid-Dark";
       package = pkgs.colloid-gtk-theme.override {
-        themeVariants = ["default"];
-        colorVariants = ["dark"];
-        sizeVariants = ["standard"];
-        tweaks = ["black" "rimless" "normal"];
+        themeVariants = [ "default" ];
+        colorVariants = [ "dark" ];
+        sizeVariants = [ "standard" ];
+        tweaks = [
+          "black"
+          "rimless"
+          "normal"
+        ];
       };
     };
     iconTheme = {
@@ -26,14 +30,10 @@
 
     gtk3 = {
       bookmarks = [
-        # Local
         "file:///home/jimbo/Downloads"
         "file:///home/jimbo/Documents"
         "file:///home/jimbo/Videos"
         "file:///home/jimbo/Pictures/Screenshots"
-        "file:///home/jimbo/VMs"
-
-        # More important stuff
         "file:///etc/nixos"
       ];
 
diff --git a/modules/home/sway/hotkeys/default.nix b/modules/home/sway/hotkeys/default.nix
index 5ed34cd..9c806b5 100644
--- a/modules/home/sway/hotkeys/default.nix
+++ b/modules/home/sway/hotkeys/default.nix
@@ -56,7 +56,7 @@
         ## Launcher keys
 
         # LibreWolf profiles
-        "${primeMod}+F1" = ''exec librewolf -P Jimbo --name=JimBrowser | ${sendNotif} "Main Browser"'';
+        "${primeMod}+F1" = ''exec librewolf -P Main --name=MainBrowser | ${sendNotif} "Main Browser"'';
         "${primeMod}+F2" = ''exec librewolf -P Alt --name=AltBrowser | ${sendNotif} "Alternate Browser"'';
         "${primeMod}+F3" = ''exec librewolf -P Misc --name=MiscBrowser | ${sendNotif} "Miscellaneous Browser"'';
 
diff --git a/modules/home/sway/rules/default.nix b/modules/home/sway/rules/default.nix
index ff080f6..84ff75d 100644
--- a/modules/home/sway/rules/default.nix
+++ b/modules/home/sway/rules/default.nix
@@ -112,7 +112,7 @@
       };
       assigns = {
         # Broconfig.wsers
-        "${config.ws.w1}" = [{app_id = "JimBrowser";}];
+        "${config.ws.w1}" = [{app_id = "MainBrowser";}];
         "${config.ws.w1a}" = [{app_id = "AltBrowser";}];
 
         # Communication
diff --git a/modules/home/sway/swayshot/swappy/default.nix b/modules/home/sway/swayshot/swappy/default.nix
index 3e82852..1249649 100644
--- a/modules/home/sway/swayshot/swappy/default.nix
+++ b/modules/home/sway/swayshot/swappy/default.nix
@@ -1,9 +1,7 @@
 { pkgs, ... }:
 {
   home = {
-    packages = with pkgs; [
-      swappy
-    ];
+    packages = with pkgs; [ swappy ];
     file = {
       ".config/swappy/config".text = ''
         [Default]
diff --git a/variables/secrets/default.nix b/variables/secrets/default.nix
index 0cbd023..7452a13 100644
Binary files a/variables/secrets/default.nix and b/variables/secrets/default.nix differ