diff --git a/flake.lock b/flake.lock
index 355362a..575efba 100644
--- a/flake.lock
+++ b/flake.lock
@@ -56,7 +56,24 @@
       "inputs": {
         "firefox-gnome-theme": "firefox-gnome-theme",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "thunderbird-gnome-theme": "thunderbird-gnome-theme"
+      }
+    },
+    "thunderbird-gnome-theme": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1693936054,
+        "narHash": "sha256-KwjdXFyrorAXiOQnAsqKOatpRaKTuVTnLfs4xOLe3PY=",
+        "owner": "rafaelmardojai",
+        "repo": "thunderbird-gnome-theme",
+        "rev": "3df2e63b4818cf78b4bd8408763638b907df372b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "rafaelmardojai",
+        "repo": "thunderbird-gnome-theme",
+        "type": "github"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 5ceda9a..924a14e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,6 +11,10 @@
       url = "github:rafaelmardojai/firefox-gnome-theme";
       flake = false;
     };
+    thunderbird-gnome-theme = {
+      url = "github:rafaelmardojai/thunderbird-gnome-theme";
+      flake = false;
+    };
   };
 
   outputs = inputs @ { self, nixpkgs, home-manager, ... }:
diff --git a/modules/default.nix b/modules/default.nix
index de49b73..8e832f0 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -5,6 +5,7 @@
     ./desktop/mimeapps.nix
     ./desktop/apps/qbittorrent.nix
     ./desktop/apps/slack.nix
+    ./desktop/apps/thunderbird.nix
     ./desktop/apps/zoom.nix
     ./desktop/browsers/firefox.nix
     ./desktop/gaming/emulators.nix
diff --git a/modules/desktop/apps/thunderbird.nix b/modules/desktop/apps/thunderbird.nix
new file mode 100644
index 0000000..8548287
--- /dev/null
+++ b/modules/desktop/apps/thunderbird.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs, inputs, ... }:
+
+with lib;
+with lib.my;
+let cfg = config.modules.desktop.apps.thunderbird;
+in {
+  options.modules.desktop.apps.thunderbird = {
+    enable = mkBoolOpt false;
+  };
+  
+  config = mkIf cfg.enable {
+    home.file.".mozilla/thunderbird/Default/chrome/thunderbird-gnome-theme".source = inputs.thunderbird-gnome-theme;
+
+    home.programs.thunderbird = {
+      enable = true;
+      profiles.Default = {
+        userChrome = ''
+          @import "thunderbird-gnome-theme/userChrome.css";
+        '';
+        userContent = ''
+          @import "thunderbird-gnome-theme/userContent.css";
+        '';
+        settings = {
+          ## GNOME theme
+          "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
+          "svg.context-properties.content.enabled" = true;
+        };
+      };
+    };
+  };
+}