diff --git a/README.md b/README.md
index 6b7c225..37ef406 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Switchyard
 
-**A rules-based URL router for Linux that replaces your default web browser.** When you click a link, Switchyard makes sure it gets sent to the right browser based on your rules, or lets you choose with a quick prompt.
+**A rules-based URL router for Linux.** When you click a link, Switchyard automatically opens it in the right browser based on your rules, or shows a quick picker to let you choose.
 
 <p align="center">
   <img src="docs/images/switchyard-prompt.png" alt="Switchyard Prompt" width="600">
@@ -16,16 +16,16 @@
 
 ## Why Switchyard?
 
-Switchyards are the backbone of modern commerce. Instead of all trains (URLs) going to the same destination (one browser), switchyards direct each one to the right track (browser) based on pre-existing rules. Work links go to your work browser, social sites to another, and you can manually switch tracks when needed.
+Like a railroad switchyard directing trains to different tracks, Switchyard routes URLs to the appropriate browser based on your rules. Work links go to your work browser, personal sites to another, and you can manually choose when needed.
 
 ## Features
 
-- **Rule-based routing**: Automatically send URLs to specific browsers based on powerful text patterns.
-- **Multi-condition rules**: Stack multiple conditions with AND/OR logic for precise routing.
-- **Multiple pattern types**: Exact domain, URL contains, wildcard (glob), and regex.
-- **Quick picker**: When no rule matches, choose from your installed browsers with keyboard or mouse.
-- **Keyboard-first**: Press 1-9 to instantly select a browser, arrow keys to navigate.
-- **Daemonless**: Runs only when needed, no background processes.
+- **Rule-based routing**: Automatically open URLs in specific browsers based on powerful patterns.
+- **Multi-condition rules**: Combine multiple conditions with AND/OR logic for precise control.
+- **Multiple pattern types**: Exact Domain, URL Contains, Wildcard, and Regex matching.
+- **Quick browser picker**: When no rule matches, choose from your installed browsers with keyboard or mouse.
+- **Keyboard shortcuts**: Press Ctrl+1-9 to instantly select a browser.
+- **Lightweight**: Runs only when needed, no background processes.
 - **GTK4 + libadwaita**: Native GNOME look and feel.
 
 ## Installation
@@ -84,10 +84,8 @@ switchyard "https://example.com"
 ### Keyboard Shortcuts
 
 **In the picker:**
-- `1-9` - Select browser by number
-- `↑/↓` - Navigate list
-- `Enter` - Open in selected browser
-- `Escape` - Cancel
+- `Ctrl+1-9` - Select browser by number
+- `Escape` - Close picker
 
 **In settings:**
 - `Ctrl+Q` - Quit
@@ -166,17 +164,17 @@ pattern = "amazon"
 
 | Field | Description |
 |-------|-------------|
-| `type` | One of: `domain`, `keyword`, `glob`, `regex` |
+| `type` | Match type: `domain`, `keyword`, `glob`, or `regex` |
 | `pattern` | The pattern to match against |
 
 ### Condition Types
 
 | Type | Description | Example |
 |------|-------------|---------|
-| `domain` | Exact domain match | `github.com` |
-| `keyword` | URL contains text | `youtube.com/watch` |
-| `glob` | Wildcard pattern | `*.github.com` |
-| `regex` | Regular expression | `^https://.*\.example\.(com\|org)` |
+| `domain` | Exact Domain - matches specific hostname | `github.com` |
+| `keyword` | URL Contains - matches if URL contains text | `youtube.com/watch` |
+| `glob` | Wildcard - pattern with * wildcards | `*.github.com` |
+| `regex` | Regex - regular expression matching | `^https://.*\.example\.(com\|org)` |
 
 ### Logic Modes
 
@@ -190,7 +188,7 @@ Use `all` for precise targeting (e.g., "docs.google.com AND contains 'edit'") an
 | Setting | Description |
 |---------|-------------|
 | `prompt_on_click` | Show picker when no rule matches (default: true) |
-| `fallback_browser` | Fallback browser to use when prompt is disabled and no rule matches |
+| `fallback_browser` | Default browser to use when picker is disabled and no rule matches |
 | `check_default_browser` | Prompt to set Switchyard as system default browser on startup (default: true) |
 
 ## Development
@@ -216,10 +214,10 @@ Tests are automatically run in CI on every push and pull request.
 
 Switchyard draws inspiration from other excellent URL routers and browser pickers:
 
-- **[Choosy](https://choosy.app/)** - The gold standard URL router for macOS. Beautiful UI and powerful rule-based routing, but not available on Linux.
-- **[Junction](https://github.com/sonnyp/Junction)** - Slick browser picker for Linux with a snazzy interface, but without rule-based URL routing.
+- **[Choosy](https://choosy.app/)** - The gold standard URL router for macOS with beautiful UI and powerful rule-based routing.
+- **[Junction](https://github.com/sonnyp/Junction)** - Elegant browser picker for Linux with a modern interface.
 
-Switchyard aims to combine the best of both: Choosy's rule-based routing with a fast, native Linux experience.
+Switchyard combines the best of both: powerful rule-based routing with a fast, native Linux experience built on GTK4 and libadwaita.
 
 ## License
 
diff --git a/data/io.github.alyraffauf.Switchyard.desktop b/data/io.github.alyraffauf.Switchyard.desktop
index b27a5fa..896287a 100644
--- a/data/io.github.alyraffauf.Switchyard.desktop
+++ b/data/io.github.alyraffauf.Switchyard.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Type=Application
 Name=Switchyard
-GenericName=Web Browser
-Comment=Rules-based URL router
+GenericName=Browser Chooser
+Comment=Choose which browser opens each link
 Exec=switchyard %U
 Icon=io.github.alyraffauf.Switchyard
 Terminal=false
 Categories=Network;WebBrowser;
 MimeType=x-scheme-handler/http;x-scheme-handler/https;
 StartupNotify=true
-Keywords=browser;web;url;link;
+Keywords=browser;web;url;link;chooser;picker;router;switch;
diff --git a/data/io.github.alyraffauf.Switchyard.metainfo.xml b/data/io.github.alyraffauf.Switchyard.metainfo.xml
index 129d66f..16174a5 100644
--- a/data/io.github.alyraffauf.Switchyard.metainfo.xml
+++ b/data/io.github.alyraffauf.Switchyard.metainfo.xml
@@ -3,28 +3,28 @@
   <id>io.github.alyraffauf.Switchyard</id>
   <name>Switchyard</name>
   <summary
-    >Rules-based URL router that replaces your default web browser</summary>
+    >Choose which browser opens each link with powerful routing rules</summary>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0-or-later</project_license>
 
   <description>
     <p>
-      Switchyard is a URL router for Linux that makes sure clicked links get sent to the right browser
-      based on your rules. Like a railroad switchyard directing trains to different tracks, it routes
-      URLs to the appropriate browser, or lets you choose with a quick prompt when no rule matches.
+      Switchyard routes clicked links to the right browser based on your rules. Like a railroad
+      switchyard directing trains to different tracks, it automatically opens URLs in the appropriate
+      browser, or shows a quick picker when no rule matches.
     </p>
     <p>Features:</p>
     <ul>
       <li
-            >Rule-based routing: Automatically send URLs to specific browsers based on powerful text patterns</li>
+            >Rule-based routing: Automatically open URLs in specific browsers based on powerful patterns</li>
       <li
-            >Multi-condition rules: Stack multiple conditions with AND/OR logic for precise routing</li>
+            >Multi-condition rules: Combine multiple conditions with AND/OR logic for precise control</li>
       <li
-            >Multiple pattern types: Exact domain, URL contains, wildcard (glob), and regex</li>
+            >Multiple pattern types: Exact Domain, URL Contains, Wildcard, and Regex matching</li>
       <li
-            >Quick prompt with keyboard shortcuts (press 1-9 to instantly select a browser)</li>
-      <li>Daemonless: Runs only when needed, no background processes</li>
-      <li>Simple TOML configuration file for power users</li>
+            >Quick browser picker with keyboard shortcuts (press Ctrl+1-9 to instantly select)</li>
+      <li>Lightweight: Runs only when needed, no background processes</li>
+      <li>Simple TOML configuration file for advanced customization</li>
     </ul>
   </description>
 
@@ -69,11 +69,11 @@
         <p>Initial release</p>
         <ul>
           <li
-                    >Rules-based URL routing with multiple pattern types (domain, keyword, glob, regex)</li>
+                    >Rules-based URL routing with multiple pattern types (Exact Domain, URL Contains, Wildcard, Regex)</li>
           <li>Multi-condition rules with AND/OR logic</li>
-          <li>Quick browser prompt with libadwaita UI</li>
-          <li>Settings window for managing rules</li>
-          <li>Keyboard-first (press 1-9 for instant selection)</li>
+          <li>Quick browser picker with modern libadwaita UI</li>
+          <li>Settings window for managing rules and preferences</li>
+          <li>Keyboard shortcuts (press Ctrl+1-9 for instant selection)</li>
         </ul>
       </description>
     </release>
diff --git a/flatpak/io.github.alyraffauf.Switchyard.yml b/flatpak/io.github.alyraffauf.Switchyard.yml
index cfc8056..e3133d2 100644
--- a/flatpak/io.github.alyraffauf.Switchyard.yml
+++ b/flatpak/io.github.alyraffauf.Switchyard.yml
@@ -14,18 +14,18 @@ finish-args:
   - --device=dri
 
   # Access to Flatpak service for spawning host commands
-  # Required for checking/setting default browser via xdg-settings
+  # Required for checking and setting Switchyard as the default browser via xdg-settings
   - --talk-name=org.freedesktop.Flatpak
 
-  # Read specific directories to detect installed browsers
+  # Read directories to detect all installed browsers (native, Flatpak, and Snap)
   - --filesystem=xdg-data/applications:ro
   - --filesystem=xdg-data/flatpak:ro
   - --filesystem=/var/lib/flatpak:ro
   - --filesystem=/var/lib/snapd:ro
   - --filesystem=host:ro
 
-  # Extend XDG_DATA_DIRS to include host and flatpak paths so GIO can find all .desktop files
-  # This is critical for gio.AppInfoGetRecommendedForType to work correctly
+  # Extend XDG_DATA_DIRS to find all .desktop files from host, Flatpak, and Snap apps
+  # Required for discovering and launching all installed browsers
   - --env=XDG_DATA_DIRS=/app/share:/usr/share:/usr/share/runtime/share:/run/host/user-share:/run/host/share:/run/host/usr/share:/var/lib/flatpak/exports/share:~/.local/share/flatpak/exports/share:/var/lib/snapd/desktop
 modules:
   - name: glib
@@ -51,9 +51,9 @@ modules:
     build-commands:
       - |
         . /usr/lib/sdk/golang/enable.sh
-        # Ensure cache directory exists
+        # Ensure Go cache directory exists
         mkdir -p "$GOCACHE"
-        # Build with vendor mode for reproducibility
+        # Build with vendored dependencies for reproducibility and smaller binary size
         go build -mod=vendor -trimpath -ldflags="-s -w" -o switchyard ./src
       - install -Dm755 switchyard /app/bin/switchyard
       - install -Dm644 data/io.github.alyraffauf.Switchyard.desktop /app/share/applications/io.github.alyraffauf.Switchyard.desktop