diff --git a/.spacemacs b/.spacemacs
index 9acb3bd..3bb5038 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -37,7 +37,7 @@ This function should only modify configuration layer settings."
      shell
      yaml
      notmuch
-     ;; themes-megapack
+     themes-megapack
      nginx
      toml
      html
@@ -508,7 +508,7 @@ It should only modify the values of Spacemacs settings."
    ;; List of search tool executable names. Spacemacs uses the first installed
    ;; tool of the list. Supported tools are `rg', `ag', `pt', `ack' and `grep'.
    ;; (default '("rg" "ag" "pt" "ack" "grep"))
-   dotspacemacs-search-tools '("rg" "ag" "pt" "ack" "grep")
+   dotspacemacs-search-tools '("rg" "ag" "ack" "grep")
 
    ;; The backend used for undo/redo functionality. Possible values are
    ;; `undo-fu', `undo-redo' and `undo-tree' see also `evil-undo-system'.
@@ -1321,7 +1321,8 @@ This function is called at the very end of Spacemacs initialization."
    ;; If there is more than one, they won't work right.
    '(custom-enabled-themes '(spacemacs-dark))
    '(custom-safe-themes
-     '("7fea145741b3ca719ae45e6533ad1f49b2a43bf199d9afaee5b6135fd9e6f9b8"
+     '("21d2bf8d4d1df4859ff94422b5e41f6f2eeff14dd12f01428fa3cb4cb50ea0fb"
+       "7fea145741b3ca719ae45e6533ad1f49b2a43bf199d9afaee5b6135fd9e6f9b8"
        "810691bd221e4639d5ef736b1bd930a7fb32a7c6043a5634e04f86edea973f6d"
        "a0ac98a1bde5d6336295fd350155a4aac1d63c53c1b3773062271074d16ebeb5"
        "bbb13492a15c3258f29c21d251da1e62f1abb8bbd492386a673dcfab474186af"
@@ -1335,16 +1336,41 @@ This function is called at the very end of Spacemacs initialization."
                                        ("OCI" . "tag:oci"))
                                       :filter
                                       "date:1/1/2026.. and (tag:important or tag:action)"
-                                      :hide-if-empty t)
+                                      :show-empty-searches t)
        (notmuch-hello-insert-searches "Solaris"
-                                      (("Solaris" . "tag:solaris")
-                                       ("AK IDRs" . "tag:akidr")
-                                       ("S11.4-SRU" . "tag:s11u4-sru")
-                                       ("S11.4-SRU/ON"
-                                        . "tag:s11u4-sru and tag:on")
-                                       ("S11.4-SRU/Userland"
-                                        . "tag:s11u4-sru and tag:userland"))
-                                      :filter "date:1/1/2026.." nil nil)))
+                                      (("Solaris"
+                                        . "tag:solaris and not (tag:akidr or tag:s11u4-sru or tag:trunk or tag:cluster or tag:s11u3-sru or tag:RE or tag:mrspatmore or tag:IPS)")
+                                       ("Solaris/All Solaris logs"
+                                        . "tag:solaris or tag:pughlog")
+                                       ("Solaris/RE"
+                                        . "tag:RE and not  (tag:logs or tag:pughlog)")
+                                       ("Solaris/Cluster"
+                                        . "tag:cluster and not  (tag:logs or tag:pughlog)")
+                                       ("Solaris/AK IDRs"
+                                        . "tag:akidr and not  (tag:logs or tag:pughlog)")
+                                       ("Solaris/AK IDRs/logs"
+                                        . "tag:akidr and (tag:logs or tag:pushlog")
+                                       ("Solaris/S11.4-SRU"
+                                        . "tag:s11u4-sru and not (tag:on or tag:userland)")
+                                       ("Solaris/S11.4-SRU/ON"
+                                        . "tag:s11u4-sru and tag:on and not (tag:logs or tag:pushlog)")
+                                       ("Solaris/S11.4-SRU/ON/logs"
+                                        . "tag:s11u4-sru and tag:on and (tag:logs or tag:pushlog)")
+                                       ("Solaris/S11.4-SRU/Userland"
+                                        . "tag:s11u4-sru and tag:userland and not (tag:logs or tag:pushlog)")
+                                       ("Solaris/S11.4-SRU/Userland/logs"
+                                        . "tag:s11u4-sru and tag:userland and (tag:logs or tag:pushlog)")
+                                       ("Solaris/Trunk" . "tag:trunk")
+                                       ("Solaris/S11.3-SRU"
+                                        . "tag:s11u3-sru")
+                                       ("Solaris/GKAP"
+                                        . "tag:gkap")
+                                       ("Solaris/IPS"
+                                        . "tag:IPS")
+                                       )
+                                      :filter "date:1/1/2026.." :filter-count
+                                      "date:1/1/2026.. and (is:unread or is:important or is:action)"
+                                      :show-empty-searches t nil nil)))
    '(notmuch-saved-searches
      '((:name "To me Unread" :query "tag:me AND tag:unread" :key [109])
        (:name "📥 Inbox" :query "tag:inbox AND tag:unread" :key [105])))