diff --git a/trushell/cli.py b/trushell/cli.py
index e71e225..21c0462 100644
--- a/trushell/cli.py
+++ b/trushell/cli.py
@@ -29,9 +29,6 @@ def app_with_lower() -> None:
     if len(sys.argv) > 1:
         argv_copy = sys.argv.copy()
         if argv_copy[1].lower() not in {"--help", "-h", "version"}:
-            # Normalize the command name to lowercase for case-insensitive
-            # invocation, but preserve the case of subsequent arguments
-            # (e.g., filenames) which may be case-sensitive.
             first = argv_copy[1].lower()
             rest = argv_copy[2:]
             raw = " ".join([first] + rest)
diff --git a/trushell/commands/settings.py b/trushell/commands/settings.py
index 42214df..b7243eb 100644
--- a/trushell/commands/settings.py
+++ b/trushell/commands/settings.py
@@ -167,15 +167,11 @@ def add_field(label_text: str, widget: Static | Input | Select | Switch) -> None
                 Input(value=str(self.dirty_settings.get("prompt_symbol", self.settings.get("prompt_symbol", "➜"))), id="prompt_symbol"),
             )
         elif current_cat == "Appearance":
-            add_field(
-                "Theme:",
-                Select(
-                    options=self.THEME_OPTIONS,
-                    value=str(self.dirty_settings.get("theme", self.settings.get("theme", "dark"))),
-                    id="theme_selector",
-                ),
+            select_widget = Select(
+                options=self.THEME_OPTIONS,
+                value=str(self.dirty_settings.get("theme", self.settings.get("theme", "dark"))),
+                id="theme_selector",
             )
-            select_widget.watch_value(lambda value: self._track_change("theme", value))
             add_field("Theme:", select_widget)
         elif current_cat == "Navigation":
             add_field(