diff --git a/home/firefox/default.nix b/home/firefox/default.nix
index 1de8b88..3ebb416 100644
--- a/home/firefox/default.nix
+++ b/home/firefox/default.nix
@@ -33,7 +33,7 @@
               urls = [
                 { template = "https://wiki.archlinux.org/index.php?title=Special:Search&search={searchTerms}"; }
               ];
-              iconUpdateURL = "https://nixos.wiki/favicon.ico";
+              iconUpdateURL = "https://wiki.archlinux.org/favicon.ico";
               updateInterval = iconUpdateInterval;
               definedAliases = [ "@archwiki" ];
             };
@@ -61,6 +61,15 @@
               updateInterval = iconUpdateInterval;
               definedAliases = [ "@stackoverflow" ];
             };
+
+            Noogle = {
+              urls = [ { template = "https://noogle.dev/q?term={searchTerms}"; } ];
+              icon = nixicon;
+              definedAliases = [
+                "@noogle"
+                "@ngl"
+              ];
+            };
           };
       };
     };
diff --git a/home/thunderbird/default.nix b/home/thunderbird/default.nix
index dc12299..a93e9bd 100644
--- a/home/thunderbird/default.nix
+++ b/home/thunderbird/default.nix
@@ -1,7 +1,6 @@
 { ... }:
 {
   programs.thunderbird = {
-    enable = true;
     settings = {
       "mailnews.wraplength" = 80;
       "mail.pane_config.dynamic" = 2;
diff --git a/hosts/marr/configuration.nix b/hosts/marr/configuration.nix
index 6cdd30a..b2fd1c2 100644
--- a/hosts/marr/configuration.nix
+++ b/hosts/marr/configuration.nix
@@ -72,9 +72,13 @@ in
       };
   };
 
-  programs.dconf.enable = true;
-  programs.steam.enable = true;
-  programs.fish.enable = true;
+  programs = {
+    dconf.enable = true;
+    steam.enable = true;
+    fish.enable = true;
+    firefox.enable = true;
+    thunderbird.enable = true;
+  };
 
   home-manager.users.${username} = import ../../home {
     inherit
@@ -84,6 +88,7 @@ in
       inputs
       stateVersion
       username
+      lib
       homeDirectory
       ;
   };
diff --git a/modules/programs/firefox.nix b/modules/programs/firefox.nix
index 0c1b2a5..d84d3b2 100644
--- a/modules/programs/firefox.nix
+++ b/modules/programs/firefox.nix
@@ -1,8 +1,7 @@
 # Reference https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265
-{ ... }:
+{ lib, config, ... }:
 {
-  programs.firefox = {
-    enable = true;
+  programs.firefox = lib.mkIf config.programs.firefox.enable {
     preferencesStatus = "locked";
     preferences = {
       "browser.bookmarks.restore_default_bookmarks" = false;
diff --git a/modules/programs/thunderbird.nix b/modules/programs/thunderbird.nix
index e0ff56d..4917a76 100644
--- a/modules/programs/thunderbird.nix
+++ b/modules/programs/thunderbird.nix
@@ -1,7 +1,6 @@
-{ ... }:
+{ lib, config, ... }:
 {
-  programs.thunderbird = {
-    enable = true;
+  programs.thunderbird = lib.mkIf config.programs.thunderbird.enable {
     preferencesStatus = "locked";
     preferences = {
       "mail.biff.play_sound" = false;