diff --git a/.github/workflows/screenshots.yml b/.github/workflows/screenshots.yml
index c600df0a6c86746d47aeb04c9f50c02b4473f738..308da58cf1c7814f9f4c9a5f499a68686e680d28 100644
--- a/.github/workflows/screenshots.yml
+++ b/.github/workflows/screenshots.yml
@@ -105,7 +105,7 @@ jobs:
         env:
           CLICOLOR_FORCE: "1"
         run: |
-          mkdir -p docs/docs/assets/
+          mkdir -p docs/docs/assets/features/
           for tape in screenshots/*.tape; do
             [ "$tape" = "screenshots/common.tape" ] && continue
             name=$(basename "$tape" .tape)
@@ -113,9 +113,9 @@ jobs:
             TERM=xterm-256color vhs "$tape" || echo "Warning: $name failed"
           done
           # Move generated screenshots to public assets, clean up intermediate gifs
-          mv screenshots/*.png docs/docs/assets/ 2>/dev/null || true
+          mv screenshots/*.png docs/docs/assets/features/ 2>/dev/null || true
           rm -f screenshots/*.gif 2>/dev/null || true
-          ls -la docs/docs/assets/
+          ls -la docs/docs/assets/features/
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v8
@@ -138,4 +138,4 @@ jobs:
             - `drafts.png` - Draft management view
           branch: "update-screenshots"
           base: "master"
-          add-paths: docs/docs/assets/
+          add-paths: docs/docs/assets/features/
diff --git a/Makefile b/Makefile
index ae508cb060ef11d7ff70457f3e0a6b99dcbbde83..dc632fc8a0f5e43e8f958b531dbe28c3c15deea3 100644
--- a/Makefile
+++ b/Makefile
@@ -9,16 +9,16 @@ generate_gif:
 	mv demo.gif public/assets/demo.gif
 
 generate_screenshots:
-	@mkdir -p docs/docs/assets/
+	@mkdir -p docs/docs/assets/features/
 	@for tape in screenshots/*.tape; do \
 		[ "$$(basename $$tape)" = "common.tape" ] && continue; \
 		name=$$(basename "$$tape" .tape); \
 		echo "==> Generating screenshot: $$name"; \
 		vhs "$$tape" || echo "Warning: $$name failed"; \
 	done
-	@mv screenshots/*.png docs/docs/assets/ 2>/dev/null || true
+	@mv screenshots/*.png docs/docs/assets/features/ 2>/dev/null || true
 	@rm -f screenshots/*.gif 2>/dev/null || true
-	@echo "Screenshots saved to public/assets/screenshots/"
+	@echo "Screenshots saved to docs/docs/assets/features/"
 
 build:
 	go build -o $(BUILD_DIR)/$(BINARY_NAME) .
diff --git a/docs/docs/Configuration.md b/docs/docs/Configuration.md
index 2ef6f109850ae8299884c19001363896c8d458e1..c8cda7c01f0d5ff2729dfa357e043fe9d3fa9603 100644
--- a/docs/docs/Configuration.md
+++ b/docs/docs/Configuration.md
@@ -1,3 +1,8 @@
+---
+title: Configuration
+sidebar_position: 5
+---
+
 # Configuration
 
 Configuration is stored in `~/.config/matcha/config.json`.
diff --git a/docs/docs/Features/COMPOSING.md b/docs/docs/Features/COMPOSING.md
index d851f44f67a1b840cfb3d592d7a2846b37694ac3..07053c2491f0798ee253ab8f2397e4037164f6e4 100644
--- a/docs/docs/Features/COMPOSING.md
+++ b/docs/docs/Features/COMPOSING.md
@@ -1,6 +1,6 @@
 # Composing Emails
 
-![composer](../assets/compose_email.png) ![Empty Composer](../assets/compose_empty.png)
+![composer](../assets/features/compose_email.png) ![Empty Composer](../assets/features/compose_empty.png)
 
 Matcha provides a clean, intuitive interface for writing emails.
 
diff --git a/docs/docs/Features/DRAFTS.md b/docs/docs/Features/DRAFTS.md
index 4fa71f353fae1fe9e96a830a3bc1b958ea1c42f3..04b2992550d99aef397f4f767ac2118017a28f2c 100644
--- a/docs/docs/Features/DRAFTS.md
+++ b/docs/docs/Features/DRAFTS.md
@@ -1,6 +1,6 @@
 # Draft Management
 
-![Drafts](../assets/drafts.png)
+![Drafts](../assets/features/drafts.png)
 
 Manage your unfinished emails with ease.
 
diff --git a/docs/docs/Features/EMAIL_MANAGEMENT.md b/docs/docs/Features/EMAIL_MANAGEMENT.md
index 1ae99402f3c38121b887dd4833f3192c1111df40..8c2e0548fd6c0f977c77cb443ac3d414ea6f756b 100644
--- a/docs/docs/Features/EMAIL_MANAGEMENT.md
+++ b/docs/docs/Features/EMAIL_MANAGEMENT.md
@@ -1,6 +1,6 @@
 # Email Management
 
-![settings](../assets/settings.png)
+![settings](../assets/features/settings.png)
 
 Matcha provides comprehensive tools for managing your emails directly from the terminal.
 
@@ -16,6 +16,7 @@ Matcha provides comprehensive tools for managing your emails directly from the t
 ## Rich Email Viewing
 
 Matcha supports rendering various email formats:
+
 - HTML email rendering with proper formatting.
 - Markdown support for plain-text emails.
 - Styled headers and body text.
diff --git a/docs/docs/Features/Themes.md b/docs/docs/Features/Themes.md
index df89fc245a8bf3de8e275bb0411126f04175587e..c4f5caf5fe5f775fb703c699d6820fe1dd584d4e 100644
--- a/docs/docs/Features/Themes.md
+++ b/docs/docs/Features/Themes.md
@@ -8,17 +8,17 @@ Go to **Settings > Theme** to browse available themes. A live preview panel on t
 
 Your selection is saved to `config.json` and persists across sessions.
 
-![Theme Settings](../assets/theme_settings.png)
+![Theme Settings](../assets/features/theme_settings.png)
 
 ## Built-in Themes
 
-| Theme | Description |
-|-------|-------------|
-| **Matcha** | The default green theme |
-| **Rose** | Soft pink and rose accents |
-| **Lavender** | Purple and violet tones |
-| **Ocean** | Cool blue palette |
-| **Peach** | Warm orange and peach tones |
+| Theme                | Description                                                             |
+| -------------------- | ----------------------------------------------------------------------- |
+| **Matcha**           | The default green theme                                                 |
+| **Rose**             | Soft pink and rose accents                                              |
+| **Lavender**         | Purple and violet tones                                                 |
+| **Ocean**            | Cool blue palette                                                       |
+| **Peach**            | Warm orange and peach tones                                             |
 | **Catppuccin Mocha** | Based on the popular [Catppuccin](https://catppuccin.com/) color scheme |
 
 ## Custom Themes
@@ -50,20 +50,20 @@ Create a file like `~/.config/matcha/themes/dracula.json`:
 
 ### Color Properties
 
-| Property | Used For |
-|----------|----------|
-| `accent` | Selected items, focused elements, primary highlights |
-| `accent_dark` | Borders, title backgrounds |
-| `accent_text` | Text on accent-colored backgrounds |
-| `secondary` | Help text, blurred/unfocused elements |
-| `subtle_text` | List headers, hints |
-| `muted_text` | Dates, timestamps |
-| `dim_text` | Sender names, secondary info |
-| `danger` | Delete confirmations, errors |
-| `warning` | Update notifications |
-| `tip` | Contextual tips |
-| `link` | Hyperlinks in email content |
-| `directory` | Directory names in the file picker |
-| `contrast` | Text on accent-colored backgrounds (e.g. active folder) |
+| Property      | Used For                                                |
+| ------------- | ------------------------------------------------------- |
+| `accent`      | Selected items, focused elements, primary highlights    |
+| `accent_dark` | Borders, title backgrounds                              |
+| `accent_text` | Text on accent-colored backgrounds                      |
+| `secondary`   | Help text, blurred/unfocused elements                   |
+| `subtle_text` | List headers, hints                                     |
+| `muted_text`  | Dates, timestamps                                       |
+| `dim_text`    | Sender names, secondary info                            |
+| `danger`      | Delete confirmations, errors                            |
+| `warning`     | Update notifications                                    |
+| `tip`         | Contextual tips                                         |
+| `link`        | Hyperlinks in email content                             |
+| `directory`   | Directory names in the file picker                      |
+| `contrast`    | Text on accent-colored backgrounds (e.g. active folder) |
 
 Colors can be specified as hex values (`#BD93F9`) or ANSI 256-color codes (`42`).
diff --git a/docs/docs/Features/_category_.json b/docs/docs/Features/_category_.json
new file mode 100644
index 0000000000000000000000000000000000000000..ccf287f4af9e5756fcbe4226508f052e2e5875e2
--- /dev/null
+++ b/docs/docs/Features/_category_.json
@@ -0,0 +1,8 @@
+{
+    "label": "Features",
+    "position": 6,
+    "link": {
+        "type": "generated-index",
+        "title": "Features"
+    }
+}
\ No newline at end of file
diff --git a/docs/docs/assets/compose_email.png b/docs/docs/assets/features/compose_email.png
similarity index 100%
rename from docs/docs/assets/compose_email.png
rename to docs/docs/assets/features/compose_email.png
diff --git a/docs/docs/assets/compose_empty.png b/docs/docs/assets/features/compose_empty.png
similarity index 100%
rename from docs/docs/assets/compose_empty.png
rename to docs/docs/assets/features/compose_empty.png
diff --git a/docs/docs/assets/drafts.png b/docs/docs/assets/features/drafts.png
similarity index 100%
rename from docs/docs/assets/drafts.png
rename to docs/docs/assets/features/drafts.png
diff --git a/docs/docs/assets/email_view.png b/docs/docs/assets/features/email_view.png
similarity index 100%
rename from docs/docs/assets/email_view.png
rename to docs/docs/assets/features/email_view.png
diff --git a/docs/docs/assets/inbox_view.png b/docs/docs/assets/features/inbox_view.png
similarity index 100%
rename from docs/docs/assets/inbox_view.png
rename to docs/docs/assets/features/inbox_view.png
diff --git a/docs/docs/assets/main_menu.png b/docs/docs/assets/features/main_menu.png
similarity index 100%
rename from docs/docs/assets/main_menu.png
rename to docs/docs/assets/features/main_menu.png
diff --git a/docs/docs/assets/settings.png b/docs/docs/assets/features/settings.png
similarity index 100%
rename from docs/docs/assets/settings.png
rename to docs/docs/assets/features/settings.png
diff --git a/docs/docs/assets/theme_settings.png b/docs/docs/assets/features/theme_settings.png
similarity index 100%
rename from docs/docs/assets/theme_settings.png
rename to docs/docs/assets/features/theme_settings.png
diff --git a/docs/docs/assets/matchaui.png b/docs/docs/assets/overview/matchaui.png
similarity index 100%
rename from docs/docs/assets/matchaui.png
rename to docs/docs/assets/overview/matchaui.png
diff --git a/docs/docs/assets/setup-guides/gmail/App-password.jpg b/docs/docs/assets/setup-guides/gmail/App-password.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6105a58b425f119b9d41af8f67037200f6b535f1
Binary files /dev/null and b/docs/docs/assets/setup-guides/gmail/App-password.jpg differ
diff --git a/docs/docs/assets/setup-guides/gmail/generate-app-password.jpg b/docs/docs/assets/setup-guides/gmail/generate-app-password.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e5bfeadeb1e8ea0bae8ed21b319098b73089d16c
Binary files /dev/null and b/docs/docs/assets/setup-guides/gmail/generate-app-password.jpg differ
diff --git a/docs/docs/assets/setup-guides/gmail/google-2fa.jpg b/docs/docs/assets/setup-guides/gmail/google-2fa.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..03578bd40a21277440d49f8bf276a3124dd3d54c
Binary files /dev/null and b/docs/docs/assets/setup-guides/gmail/google-2fa.jpg differ
diff --git a/docs/docs/assets/setup-guides/gmail/google-add-account.png b/docs/docs/assets/setup-guides/gmail/google-add-account.png
new file mode 100644
index 0000000000000000000000000000000000000000..d20dd65b90cb870632d2ae0a643b1051b10d2118
Binary files /dev/null and b/docs/docs/assets/setup-guides/gmail/google-add-account.png differ
diff --git a/docs/docs/assets/setup-guides/gmail/two-step-verification.jpg b/docs/docs/assets/setup-guides/gmail/two-step-verification.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..57bb075eb0167f72ec51a66a40cbcfe2c7f355cf
Binary files /dev/null and b/docs/docs/assets/setup-guides/gmail/two-step-verification.jpg differ
diff --git a/docs/docs/index.md b/docs/docs/index.md
index 77927d2f7bda8b113fc090578171ceef7106e1e8..86166b92ed9721e716a759cdff6cf3d2f9409589 100644
--- a/docs/docs/index.md
+++ b/docs/docs/index.md
@@ -3,13 +3,14 @@ slug: /
 title: Matcha Documentation
 description: A modern, beautiful, and feature-rich email client for the terminal.
 hide_table_of_contents: true
+sidebar_position: 1
 ---
 
 # 🍵 Welcome to Matcha
 
 **Matcha** is a modern, beautiful, and feature-rich email client for the terminal, designed for speed and efficiency.
 
-![Matcha UI](assets/matchaui.png)
+![Matcha UI](assets/overview/matchaui.png)
 
 ## Getting Started
 
@@ -32,6 +33,7 @@ Matcha is packed with features to make email management in the terminal a breeze
 - [**Advanced**](./Features/ADVANCED.md) - Automatic updates, smart image rendering, and performance optimization.
 
 ### Image & Hyperlink Support
+
 - [Image Protocol Compatibility](./Features/Images.md)
 - [Hyperlink Compatibility](./Features/Hyperlinks.md)
 
diff --git a/docs/docs/installation.md b/docs/docs/installation.md
index abd1d1490e88f2a66243b6cc549caa4e114924f1..076f20bbccdd57c9171c4fa93081c516c91266a3 100644
--- a/docs/docs/installation.md
+++ b/docs/docs/installation.md
@@ -1,3 +1,8 @@
+---
+title: Installation Guide
+sidebar_position: 2
+---
+
 # Installation Guide
 
 Welcome to the installation guide for Matcha.
@@ -20,7 +25,7 @@ matcha
 ```
 
 > [!WARNING]
-> If you have the [*"other"* Matcha](https://github.com/piqoni/matcha) already installed, you will have to rename the executable to avoid conflicts.
+> If you have the [_"other"_ Matcha](https://github.com/piqoni/matcha) already installed, you will have to rename the executable to avoid conflicts.
 
 ### Manual Binary Download
 
diff --git a/docs/docs/setup-guides/_category_.json b/docs/docs/setup-guides/_category_.json
new file mode 100644
index 0000000000000000000000000000000000000000..16ee1ee9297845ae8e86be1e0bd1336334d77bbe
--- /dev/null
+++ b/docs/docs/setup-guides/_category_.json
@@ -0,0 +1,8 @@
+{
+    "label": "Setup Guides",
+    "position": 4,
+    "link": {
+        "type": "generated-index",
+        "title": "Setup Guides"
+    }
+}
\ No newline at end of file
diff --git a/docs/docs/setup-guides/gmail.md b/docs/docs/setup-guides/gmail.md
new file mode 100644
index 0000000000000000000000000000000000000000..80c225e82717aabf1b103a4e0088147f771ff8c2
--- /dev/null
+++ b/docs/docs/setup-guides/gmail.md
@@ -0,0 +1,54 @@
+---
+title: Gmail
+sidebar_position: 1
+---
+
+# Gmail setup
+
+Matcha requires using app passwords to access your gmail account. App Passwords are available only after 2-Step Verification is turned on.
+
+## 1. Open Google account security settings
+
+1. Go to [https://myaccount.google.com](https://myaccount.google.com).
+2. In the left menu, click **Security**.
+
+## 2. Enable 2-Step Verification (if not enabled)
+
+1. In **How you sign in to Google**, click **2-Step Verification**.
+2. Follow the setup flow (phone prompt, SMS, authenticator app, or security key).
+
+## 3. Create an App Password
+
+1. Go to [https://myaccount.google.com/u/2/apppasswords](https://myaccount.google.com/u/2/apppasswords).
+2. Sign in again if prompted.
+3. Choose a name for your app password (e.g., "Matcha").
+4. Click **Generate**.
+5. Copy the 16-character app password shown by Google.
+
+> **⚠️ Important:** Treat this app password as you would your primary password. Never share it, or expose it publicly. This credential grants full access to your Gmail account. The app password sits locally in your device and is never shared with us.
+
+![Generate Google App Password](../assets/setup-guides/gmail/generate-app-password.jpg)
+
+## 4. Open account setup in Matcha
+
+From Matcha, open settings and choose to add a new account.
+
+## 5. Enter Gmail credentials in Matcha
+
+In Matcha account setup:
+
+- Provider: gmail
+- Display name: The name that will appear on the emails you send
+- Username: Your Gmail address
+- Email Address: The Gmail address used to fetch messages from(most likely the same as the Username)
+- Password: the generated 16-character app password (not your normal Google password)
+
+![Enter Gmail and app password in Matcha](../assets/setup-guides/gmail/google-add-account.png)
+
+## Troubleshooting
+
+| Issue                              | Solution                                                                                                                          |
+| ---------------------------------- | --------------------------------------------------------------------------------------------------------------------------------- |
+| **Invalid credentials**            | Verify you're using the 16-character app password, not your regular Google account password.                                      |
+| **"App passwords" option missing** | Confirm 2-Step Verification is enabled in your account settings. Some organizations restrict app passwords via security policies. |
+| **Connection still fails**         | In Google Account, revoke the current app password and generate a new one. Then update your credentials in Matcha.                |
diff --git a/docs/docs/usage.md b/docs/docs/usage.md
index 892e962233c4aae8ef7a52bc9568740282025d6f..f79049222fcafc98132a3ee3656a5f24ec3c861b 100644
--- a/docs/docs/usage.md
+++ b/docs/docs/usage.md
@@ -1,3 +1,8 @@
+---
+title: Usage
+sidebar_position: 3
+---
+
 # Usage
 
 ## First Launch
@@ -11,12 +16,14 @@ On first launch, Matcha will prompt you to configure an email account. You'll ne
 ## Keyboard Shortcuts
 
 ### Main Menu
+
 - `↑/↓` or `j/k` - Navigate menu items
 - `Enter` - Select option
 - `Esc` - Go back / Exit
 - `Ctrl+C` - Quit application
 
 ### Inbox View
+
 - `↑/↓` or `j/k` - Navigate emails
 - `←/→` or `h/l` - Switch between account tabs
 - `Enter` - Open selected email
@@ -27,6 +34,7 @@ On first launch, Matcha will prompt you to configure an email account. You'll ne
 - `Esc` - Back to main menu
 
 ### Email View
+
 - `↑/↓` or `j/k` - Scroll email content
 - `r` - Reply to email
 - `d` - Delete email
@@ -36,11 +44,13 @@ On first launch, Matcha will prompt you to configure an email account. You'll ne
 - `i` - Toggle images
 
 ### Attachment View (when focused)
+
 - `↑/↓` or `j/k` - Navigate attachments
 - `Enter` - Download and open attachment
 - `Tab` or `Esc` - Back to email body
 
 ### Composer
+
 - `Tab` / `Shift+Tab` - Navigate fields
 - `Enter` -
   - On "From" field: Select account (if multiple)
@@ -58,6 +68,7 @@ matcha update
 ```
 
 This command will:
+
 1. Check for the latest release on GitHub
 2. Detect your installation method (Homebrew, Snap, or binary)
 3. Update using the appropriate method