diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix
index 37932f8..9147c00 100644
--- a/hosts/kim/default.nix
+++ b/hosts/kim/default.nix
@@ -66,6 +66,7 @@ inputs.nixpkgs.lib.nixosSystem {
       openrgb.enable = true;
       prusa-slicer.enable = true;
       spotifyd.enable = true;
+      thunderbird.enable = true;
       # Gaming
       steam.enable = true;
       # Programming Stuff
diff --git a/modules/common/applications/default.nix b/modules/common/applications/default.nix
index c53173c..0f1fbf2 100644
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@@ -8,5 +8,6 @@
     ./openrgb.nix
     ./prusa-slicer.nix
     ./spotifyd.nix
+    ./thunderbird.nix
   ];
 }
diff --git a/modules/common/applications/openrgb.nix b/modules/common/applications/openrgb.nix
index 85b619a..785b5fe 100644
--- a/modules/common/applications/openrgb.nix
+++ b/modules/common/applications/openrgb.nix
@@ -9,10 +9,12 @@
     };
   };
   config = lib.mkIf (config.gui.enable && config.openrgb.enable) {
-    home-manager.users.${config.user} = {
-      home.packages = [
-        pkgs.openrgb-with-all-plugins
-      ];
+    services.hardware.openrgb = {
+      enable = true;
+      motherboard = "amd";
+      package = pkgs.openrgb-with-all-plugins;
     };
+    # environment.systemPackages = [ pkgs.i2c-tools ];
+    users.groups.i2c.members = [ config.user ];
   };
 }
diff --git a/modules/common/applications/thunderbird.nix b/modules/common/applications/thunderbird.nix
new file mode 100644
index 0000000..f7d26eb
--- /dev/null
+++ b/modules/common/applications/thunderbird.nix
@@ -0,0 +1,18 @@
+{ config, pkgs, lib, ... }:
+{
+  options = {
+    thunderbird = {
+      enable = lib.mkEnableOption {
+        description = "Enable Thunderbird";
+        default = false;
+      };
+    };
+  };
+  config = lib.mkIf (config.gui.enable && config.thunderbird.enable) {
+    home-manager.users.${config.user} = {
+      programs.thunderbird = {
+        enable = true;
+      };
+    };
+  };
+}