diff --git a/.gitignore b/.gitignore
index b32162f..74f106b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,11 @@ pylint-results.txt
 .pytest_cache
 tests/__pycache__
 subprojects/libportal
-.wraplock
\ No newline at end of file
+.wraplock
+# hyperresearch (per-project research vault)
+.hyperresearch/
+research/temp/
+research/index/
+# Claude Code local config/instructions, not part of upstream project
+CLAUDE.md
+.claude/
diff --git a/data/dev.qwery.AddWater.metainfo.xml.in b/data/dev.qwery.AddWater.metainfo.xml.in
index 948a26e..4a8ba7d 100644
--- a/data/dev.qwery.AddWater.metainfo.xml.in
+++ b/data/dev.qwery.AddWater.metainfo.xml.in
@@ -18,7 +18,7 @@
 			<li>Use an OLED-friendly pitch black for the interface</li>
 			<li>Customize Tab Bar position, position of controls, alignment, and more</li>
 			<li>Hide redundant microphone, webcam, screen share indicators</li>
-			<li>Supports Flatpak, Snap, Librewolf, and Floorp variants of Firefox</li>
+			<li>Supports Flatpak, Snap, Librewolf, Floorp, Waterfox, and CachyOS Browser variants of Firefox</li>
 		</ul>
 		<p>*The Firefox GNOME Theme itself is independently developed and maintained by Rafael Mardojai CM.</p>
 		<p>The Firefox browser is not included and must be downloaded separately. This project is not affiliated or endorsed by the Mozilla Foundation. Firefox is a trademark of the Mozilla Foundation in the U.S. and other countries.</p>
diff --git a/src/gui/pack_selector.py b/src/gui/pack_selector.py
index 20ed281..c62b87b 100644
--- a/src/gui/pack_selector.py
+++ b/src/gui/pack_selector.py
@@ -19,7 +19,7 @@
 
 
 import logging
-from typing import Callable, Optional
+from typing import Optional
 
 from gi.repository import Adw, Gio, GObject, Gtk
 
@@ -38,7 +38,7 @@ class PackSelector(Adw.ComboRow):
     str_model: Gtk.StringList = Gtk.Template.Child()
 
     backend = None
-    package: FirefoxPack
+    package: Optional[FirefoxPack] = None
     inner_valid_path: bool
     autofind_paths: bool = GObject.Property(type=bool, default=True, flags=GObject.ParamFlags.READWRITE)
 
@@ -71,6 +71,7 @@ def set_package(self):
 
         if selected_index == AUTO:
             self.autofind_paths = True
+            self.package = None
             log.info("Autofind paths enabled")
             self.valid_path = True
             self.emit("package-changed")
diff --git a/src/page.py b/src/page.py
index fe6ab73..59edc63 100644
--- a/src/page.py
+++ b/src/page.py
@@ -184,10 +184,13 @@ def init_gui(self, options):
 
         pack = self.backend.get_package()
         self.package_combobox.setup_list(pack, self.backend)
+
+        autofind_paths = self.settings.get_boolean("autofind-paths")
+        filter_pack = None if autofind_paths else pack
         self.profile_combobox.setup_list(
             self.backend.get_profiles(),
             self.settings.get_string("profile-selected"),
-            pack,
+            filter_pack,
         )
 
     def bind_settings(self):
@@ -227,8 +230,7 @@ def init_actions(self):
         self.package_combobox.connect("package-changed", self.package_changed_cb)
 
     def package_changed_cb(self, pack_selector):
-        if (pack := pack_selector.package):
-            self.profile_combobox.update_package_filter(pack)
+        self.profile_combobox.update_package_filter(pack_selector.package)
 
     def update_version_title(self):
         v = self.backend.get_update_version()
diff --git a/src/profile.py b/src/profile.py
index 967bcd9..910d83d 100644
--- a/src/profile.py
+++ b/src/profile.py
@@ -49,6 +49,8 @@ def __init__(self, name, id, path, favorite, package):
     @GObject.Property(type=str)
     def display_name(self) -> str:
         out = self.name
+        if self.package:
+            out += f" ({self.package.pack_name})"
         if self.favorite:
             out += " (Preferred)"