diff --git a/README.md b/README.md
index eb76b7da7..ea56c222c 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@
   <a href="#-features">Features</a> •
   <a href="#-screenshots">Screenshots</a> •
   <a href="#-quick-start">Quick Start</a> •
-  <a href="https://github.com/maziggy/bambuddy-wiki">Documentation</a> •
+  <a href="http://wiki.bambuddy.cool">Documentation</a> •
   <a href="#-contributing">Contributing</a>
 </p>
 
@@ -124,7 +124,7 @@
 
 <p align="center">
   <img src="docs/screenshots/archives.png" alt="Archives" width="800">
-  <br><em>Print archive with context menu and project assignment</em>
+  <br><em>Print archive with 3D preview and project assignment</em>
 </p>
 
 <p align="center">
@@ -143,52 +143,52 @@
 </p>
 
 <p align="center">
-  <img src="docs/screenshots/maintenance_status.png" alt="Maintenance Status" width="800">
+  <img src="docs/screenshots/maintenance-1.png" alt="Maintenance" width="800">
   <br><em>Maintenance tracking per printer</em>
 </p>
 
 <p align="center">
-  <img src="docs/screenshots/maintenance_overdue.png" alt="Maintenance Overdue" width="800">
-  <br><em>Overdue maintenance alerts</em>
-</p>
-
-<p align="center">
-  <img src="docs/screenshots/maintenance_settings.png" alt="Maintenance Settings" width="800">
+  <img src="docs/screenshots/maintenance-2.png" alt="Maintenance Settings" width="800">
   <br><em>Configure maintenance types and intervals</em>
 </p>
 
 <p align="center">
-  <img src="docs/screenshots/profiles_create.png" alt="Profiles Create" width="800">
-  <br><em>Create new filament presets</em>
+  <img src="docs/screenshots/cloud_profiles-1.png" alt="Cloud Profiles" width="800">
+  <br><em>Bambu Cloud filament profiles</em>
 </p>
 
 <p align="center">
-  <img src="docs/screenshots/profiles_edit.png" alt="Profiles Edit" width="800">
+  <img src="docs/screenshots/cloud_profiles-2.png" alt="Cloud Profiles Edit" width="800">
   <br><em>Edit filament preset settings</em>
 </p>
 
 <p align="center">
-  <img src="docs/screenshots/profiles_k.png" alt="K-Profiles" width="800">
+  <img src="docs/screenshots/k_profiles-1.png" alt="K-Profiles" width="800">
   <br><em>Pressure advance (K-factor) profiles</em>
 </p>
 
 <p align="center">
-  <img src="docs/screenshots/settings.png" alt="Settings" width="800">
-  <br><em>Configuration and integrations</em>
+  <img src="docs/screenshots/k_profiles-2.png" alt="K-Profiles Edit" width="800">
+  <br><em>Edit K-factor profile settings</em>
 </p>
 
 <p align="center">
-  <img src="docs/screenshots/smart_plugs.png" alt="Smart Plugs" width="800">
-  <br><em>Smart plug control and automation</em>
+  <img src="docs/screenshots/settings_general.png" alt="Settings" width="800">
+  <br><em>General configuration and integrations</em>
 </p>
 
 <p align="center">
-  <img src="docs/screenshots/notifications.png" alt="Notifications" width="800">
+  <img src="docs/screenshots/settings_smart_plugs.png" alt="Smart Plugs" width="800">
+  <br><em>Smart plug control and energy monitoring</em>
+</p>
+
+<p align="center">
+  <img src="docs/screenshots/settings_notifications.png" alt="Notifications" width="800">
   <br><em>Multi-provider notification system</em>
 </p>
 
 <p align="center">
-  <img src="docs/screenshots/api_keys.png" alt="API Keys" width="800">
+  <img src="docs/screenshots/settings_api_keys.png" alt="API Keys" width="800">
   <br><em>API keys and webhook endpoints</em>
 </p>
 
@@ -219,7 +219,7 @@ uvicorn backend.app.main:app --host 0.0.0.0 --port 8000
 
 Open **http://localhost:8000** and add your printer!
 
-> **Need detailed instructions?** See the [Installation Guide](https://github.com/maziggy/bambuddy-wiki/blob/main/Installation.md)
+> **Need detailed instructions?** See the [Installation Guide](http://wiki.bambuddy.cool/getting-started/installation/)
 
 ### Enabling LAN Mode
 
@@ -232,13 +232,13 @@ Open **http://localhost:8000** and add your printer!
 
 ## 📚 Documentation
 
-Full documentation available in the **[Wiki](https://github.com/maziggy/bambuddy-wiki)**:
+Full documentation available at **[wiki.bambuddy.cool](http://wiki.bambuddy.cool)**:
 
-- [Installation](https://github.com/maziggy/bambuddy-wiki/blob/main/Installation.md) — All installation methods
-- [Getting Started](https://github.com/maziggy/bambuddy-wiki/blob/main/Getting-Started.md) — First printer setup
-- [Features](https://github.com/maziggy/bambuddy-wiki#feature-documentation) — Detailed feature guides
-- [Troubleshooting](https://github.com/maziggy/bambuddy-wiki/blob/main/Troubleshooting.md) — Common issues & solutions
-- [API Reference](https://github.com/maziggy/bambuddy-wiki/blob/main/API-Reference.md) — REST API documentation
+- [Installation](http://wiki.bambuddy.cool/getting-started/installation/) — All installation methods
+- [Getting Started](http://wiki.bambuddy.cool/getting-started/) — First printer setup
+- [Features](http://wiki.bambuddy.cool/features/) — Detailed feature guides
+- [Troubleshooting](http://wiki.bambuddy.cool/reference/troubleshooting/) — Common issues & solutions
+- [API Reference](http://wiki.bambuddy.cool/reference/api/) — REST API documentation
 
 ---
 
@@ -311,5 +311,5 @@ MIT License — see [LICENSE](LICENSE) for details.
   <br><br>
   <a href="https://github.com/maziggy/bambuddy/issues">Report Bug</a> •
   <a href="https://github.com/maziggy/bambuddy/issues">Request Feature</a> •
-  <a href="https://github.com/maziggy/bambuddy-wiki">Documentation</a>
+  <a href="http://wiki.bambuddy.cool">Documentation</a>
 </p>
diff --git a/docs/screenshots/api_keys.png b/docs/screenshots/api_keys.png
deleted file mode 100644
index 9281cb5fb..000000000
Binary files a/docs/screenshots/api_keys.png and /dev/null differ
diff --git a/docs/screenshots/archives.png b/docs/screenshots/archives.png
index b9a1fdf82..25adbd61b 100644
Binary files a/docs/screenshots/archives.png and b/docs/screenshots/archives.png differ
diff --git a/docs/screenshots/cloud_profiles-1.png b/docs/screenshots/cloud_profiles-1.png
new file mode 100644
index 000000000..8f0875107
Binary files /dev/null and b/docs/screenshots/cloud_profiles-1.png differ
diff --git a/docs/screenshots/cloud_profiles-2.png b/docs/screenshots/cloud_profiles-2.png
new file mode 100644
index 000000000..7db037f80
Binary files /dev/null and b/docs/screenshots/cloud_profiles-2.png differ
diff --git a/docs/screenshots/cloud_profiles.png b/docs/screenshots/cloud_profiles.png
deleted file mode 100644
index 17c8e4b9d..000000000
Binary files a/docs/screenshots/cloud_profiles.png and /dev/null differ
diff --git a/docs/screenshots/cloud_profiles_2.png b/docs/screenshots/cloud_profiles_2.png
deleted file mode 100644
index 9eaf77535..000000000
Binary files a/docs/screenshots/cloud_profiles_2.png and /dev/null differ
diff --git a/docs/screenshots/k_profiles-1.png b/docs/screenshots/k_profiles-1.png
new file mode 100644
index 000000000..73c1e05f9
Binary files /dev/null and b/docs/screenshots/k_profiles-1.png differ
diff --git a/docs/screenshots/k_profiles-2.png b/docs/screenshots/k_profiles-2.png
new file mode 100644
index 000000000..a77d90f44
Binary files /dev/null and b/docs/screenshots/k_profiles-2.png differ
diff --git a/docs/screenshots/k_profiles.png b/docs/screenshots/k_profiles.png
deleted file mode 100644
index 3cf33dc80..000000000
Binary files a/docs/screenshots/k_profiles.png and /dev/null differ
diff --git a/docs/screenshots/maintenance-1.png b/docs/screenshots/maintenance-1.png
new file mode 100644
index 000000000..fb16420ca
Binary files /dev/null and b/docs/screenshots/maintenance-1.png differ
diff --git a/docs/screenshots/maintenance-2.png b/docs/screenshots/maintenance-2.png
new file mode 100644
index 000000000..41d80573a
Binary files /dev/null and b/docs/screenshots/maintenance-2.png differ
diff --git a/docs/screenshots/maintenance_overdue.png b/docs/screenshots/maintenance_overdue.png
deleted file mode 100644
index 9914b3d5a..000000000
Binary files a/docs/screenshots/maintenance_overdue.png and /dev/null differ
diff --git a/docs/screenshots/maintenance_settings.png b/docs/screenshots/maintenance_settings.png
deleted file mode 100644
index db9d885bf..000000000
Binary files a/docs/screenshots/maintenance_settings.png and /dev/null differ
diff --git a/docs/screenshots/maintenance_status.png b/docs/screenshots/maintenance_status.png
deleted file mode 100644
index 1ce197379..000000000
Binary files a/docs/screenshots/maintenance_status.png and /dev/null differ
diff --git a/docs/screenshots/notifications.png b/docs/screenshots/notifications.png
deleted file mode 100644
index b33f8eb32..000000000
Binary files a/docs/screenshots/notifications.png and /dev/null differ
diff --git a/docs/screenshots/printers.png b/docs/screenshots/printers.png
index 90f0241b4..a67a98440 100644
Binary files a/docs/screenshots/printers.png and b/docs/screenshots/printers.png differ
diff --git a/docs/screenshots/profiles_create.png b/docs/screenshots/profiles_create.png
deleted file mode 100644
index 82e8f006e..000000000
Binary files a/docs/screenshots/profiles_create.png and /dev/null differ
diff --git a/docs/screenshots/profiles_edit.png b/docs/screenshots/profiles_edit.png
deleted file mode 100644
index b86c81436..000000000
Binary files a/docs/screenshots/profiles_edit.png and /dev/null differ
diff --git a/docs/screenshots/profiles_k.png b/docs/screenshots/profiles_k.png
deleted file mode 100644
index b2f3d681b..000000000
Binary files a/docs/screenshots/profiles_k.png and /dev/null differ
diff --git a/docs/screenshots/projects.png b/docs/screenshots/projects.png
index c3ef5b1b7..0f668308d 100644
Binary files a/docs/screenshots/projects.png and b/docs/screenshots/projects.png differ
diff --git a/docs/screenshots/queue.png b/docs/screenshots/queue.png
index 5ef36d1df..3d0db32ff 100644
Binary files a/docs/screenshots/queue.png and b/docs/screenshots/queue.png differ
diff --git a/docs/screenshots/settings.png b/docs/screenshots/settings.png
deleted file mode 100644
index 0dc5434e6..000000000
Binary files a/docs/screenshots/settings.png and /dev/null differ
diff --git a/docs/screenshots/settings_api_keys.png b/docs/screenshots/settings_api_keys.png
new file mode 100644
index 000000000..d28946b6a
Binary files /dev/null and b/docs/screenshots/settings_api_keys.png differ
diff --git a/docs/screenshots/settings_general.png b/docs/screenshots/settings_general.png
new file mode 100644
index 000000000..f0e20c3d0
Binary files /dev/null and b/docs/screenshots/settings_general.png differ
diff --git a/docs/screenshots/settings_notifications.png b/docs/screenshots/settings_notifications.png
new file mode 100644
index 000000000..82ebd94f5
Binary files /dev/null and b/docs/screenshots/settings_notifications.png differ
diff --git a/docs/screenshots/settings_smart_plugs.png b/docs/screenshots/settings_smart_plugs.png
new file mode 100644
index 000000000..df7052e71
Binary files /dev/null and b/docs/screenshots/settings_smart_plugs.png differ
diff --git a/docs/screenshots/smart_plugs.png b/docs/screenshots/smart_plugs.png
deleted file mode 100644
index d036c958f..000000000
Binary files a/docs/screenshots/smart_plugs.png and /dev/null differ
diff --git a/docs/screenshots/statistics.png b/docs/screenshots/statistics.png
index 675e88ae0..25917ed6f 100644
Binary files a/docs/screenshots/statistics.png and b/docs/screenshots/statistics.png differ