diff --git a/.spacemacs b/.spacemacs
index 68fc632..957b671 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -1337,7 +1337,7 @@ This function is called at the very end of Spacemacs initialization."
                                       :filter
                                       "date:1/1/2026.. and (tag:important or tag:action)"
                                       :show-empty-searches t)
-       (notmuch-hello-insert-searches "Solaris"
+       (notmuch-hello-insert-searches "Solaris Focused"
                                       (("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"
@@ -1364,20 +1364,61 @@ This function is called at the very end of Spacemacs initialization."
                                         . "tag:s11u4-sru and tag:userland and (tag:logs or tag:pushlog)")
                                        ("Solaris/S11.4-SRU/Userland/WebRTI"
                                         . "tag:s11u4-sru and tag:userland and tag:webrti")
-                                       ("Solaris/Trunk" . "tag:trunk and not (tag:logs or tag:webrti or tag:pushlog or tag:jenkins)")
-                                       ("Solaris/Trunk/Logs" . "tag:trunk and (tag:logs or tag:pushlog or tag:jenkins)")
-                                       ("Solaris/Trunk/WebRTI/ON" . "tag:trunk and tag:on and tag:webrti")
-                                       ("Solaris/Trunk/WebRTI/Userland" . "tag:trunk and tag:userland and tag:webrti")
-                                       ("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)))
+                                       ("Solaris/Trunk"
+                                        . "tag:trunk and not (tag:logs or tag:webrti or tag:pushlog or tag:jenkins)")
+                                       ("Solaris/Trunk/Logs"
+                                        . "tag:trunk and (tag:logs or tag:pushlog or tag:jenkins)")
+                                       ("Solaris/Trunk/WebRTI/ON"
+                                        . "tag:trunk and tag:on and tag:webrti")
+                                       ("Solaris/Trunk/WebRTI/Userland"
+                                        . "tag:trunk and tag:userland and tag:webrti")
+                                       ("Solaris/S11.3-SRU" . "tag:s11u3-sru")
+                                       ("Solaris/GKAP" . "tag:gkap")
+                                       ("Solaris/IPS" . "tag:IPS"))
+                                      :filter
+                                      "date:1/1/2026.. and (is:unread or is:important or is:action) "
+                                      :filter-count
+                                      "date:1/1/2026.. and (is:unread or is:important or is:action)")
+       (notmuch-hello-insert-searches "Solaris All"
+                                      (("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 or tag:webrti)")
+                                       ("Solaris/S11.4-SRU/ON/logs"
+                                        . "tag:s11u4-sru and tag:on and (tag:logs or tag:pushlog) and not tag:webrti")
+                                       ("Solaris/S11.4-SRU/ON/WebRTI"
+                                        . "tag:s11u4-sru and tag:on and tag:webrti")
+                                       ("Solaris/S11.4-SRU/Userland"
+                                        . "tag:s11u4-sru and tag:userland and not (tag:logs or tag:pushlog) and not tag:webrti")
+                                       ("Solaris/S11.4-SRU/Userland/logs"
+                                        . "tag:s11u4-sru and tag:userland and (tag:logs or tag:pushlog)")
+                                       ("Solaris/S11.4-SRU/Userland/WebRTI"
+                                        . "tag:s11u4-sru and tag:userland and tag:webrti")
+                                       ("Solaris/Trunk"
+                                        . "tag:trunk and not (tag:logs or tag:webrti or tag:pushlog or tag:jenkins)")
+                                       ("Solaris/Trunk/Logs"
+                                        . "tag:trunk and (tag:logs or tag:pushlog or tag:jenkins)")
+                                       ("Solaris/Trunk/WebRTI/ON"
+                                        . "tag:trunk and tag:on and tag:webrti")
+                                       ("Solaris/Trunk/WebRTI/Userland"
+                                        . "tag:trunk and tag:userland and tag:webrti")
+                                       ("Solaris/S11.3-SRU" . "tag:s11u3-sru")
+                                       ("Solaris/GKAP" . "tag:gkap")
+                                       ("Solaris/IPS" . "tag:IPS"))
+                                      :filter "date:1/1/2026.."
+                                      :show-empty-searches t)))
    '(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])))