diff --git a/README.md b/README.md
index 06ce0d4..d20b72d 100644
--- a/README.md
+++ b/README.md
@@ -28,6 +28,7 @@
 > **Think of this app as a helpful tool, but make all health decisions independently!**
 
 - [Features](#features)
+- [Screenshots](#screenshots)
 - [Getting Started](#getting-started)
 - [Configuration](#configuration)
 - [Development](#development)
@@ -43,6 +44,11 @@
 - Display remaining days of supply
 - Automatic calculation based on intake schedule
 
+### Medication Refill
+- One-click refill with pack or loose pill options
+- Complete refill history per medication
+- Automatic stock updates after each refill
+
 ### Flexible Schedules
 - Daily, weekly, or custom intervals per medication
 - Independent schedules for each medication
@@ -60,6 +66,11 @@
 - Manage medications for multiple people
 - Share schedules via link. Recipients can mark doses as taken, you see it live
 
+### Data Export & Import
+- Export all your data (medications, dose history, settings) as JSON
+- Import previously exported data with automatic ID remapping
+- Choose whether to include sensitive data in exports
+
 ### Notifications
 - Email via SMTP
 - Push notifications via ntfy, Pushover, Gotify, Telegram, Discord & more ([Shoutrrr](https://containrrr.dev/shoutrrr/))
@@ -71,6 +82,80 @@
 - Non-root containers
 - Dark mode included 😎
 
+# Screenshots
+
+<details>
+<summary><strong>Screenshots</strong></summary>
+
+<details>
+<summary>Dashboard</summary>
+
+Overview with stock status, reorder reminders, and upcoming schedules.
+
+<img src="docs/screenshots/dashboard-desktop.png" alt="Dashboard" width="100%" />
+
+</details>
+
+<details>
+<summary>Medication Detail</summary>
+
+View medication details, stock information, and intake schedule.
+
+<img src="docs/screenshots/medication-detail-modal.png" alt="Medication Detail Modal" width="100%" />
+
+</details>
+
+<details>
+<summary>Medications & Edit Form</summary>
+
+Manage your medications with the edit form and refill feature.
+
+<img src="docs/screenshots/medications-edit-desktop.png" alt="Medications Edit Form" width="100%" />
+
+</details>
+
+<details>
+<summary>Demand Calculator (Planner)</summary>
+
+Calculate how many pills you need for a specific date range.
+
+<img src="docs/screenshots/planner-desktop.png" alt="Planner - Demand Calculator" width="100%" />
+
+</details>
+
+<details>
+<summary>Shared Schedule</summary>
+
+Share your medication schedule with others via a public link.
+
+<img src="docs/screenshots/share-schedule-desktop.png" alt="Shared Schedule" width="100%" />
+
+</details>
+
+<details>
+<summary>Mobile Views</summary>
+
+<table>
+  <tr>
+    <td align="center" width="33%">
+      <strong>Dashboard</strong><br>
+      <img src="docs/screenshots/dashboard-mobile.png" alt="Mobile Dashboard" width="100%" />
+    </td>
+    <td align="center" width="33%">
+      <strong>Medications</strong><br>
+      <img src="docs/screenshots/medications-mobile.png" alt="Mobile Medications" width="100%" />
+    </td>
+    <td align="center" width="33%">
+      <strong>Schedule</strong><br>
+      <img src="docs/screenshots/schedule-mobile.png" alt="Mobile Schedule" width="100%" />
+    </td>
+  </tr>
+</table>
+
+</details>
+
+</details>
+
 # Getting Started
 
 The easiest way to deploy MedAssist-ng is with Docker Compose:
diff --git a/docs/screenshots/dashboard-desktop.png b/docs/screenshots/dashboard-desktop.png
new file mode 100644
index 0000000..de4c424
Binary files /dev/null and b/docs/screenshots/dashboard-desktop.png differ
diff --git a/docs/screenshots/dashboard-mobile.png b/docs/screenshots/dashboard-mobile.png
new file mode 100644
index 0000000..920c400
Binary files /dev/null and b/docs/screenshots/dashboard-mobile.png differ
diff --git a/docs/screenshots/dashboard.png b/docs/screenshots/dashboard.png
deleted file mode 100644
index aa233c9..0000000
Binary files a/docs/screenshots/dashboard.png and /dev/null differ
diff --git a/docs/screenshots/medication-detail-modal.png b/docs/screenshots/medication-detail-modal.png
new file mode 100644
index 0000000..8cb3cf5
Binary files /dev/null and b/docs/screenshots/medication-detail-modal.png differ
diff --git a/docs/screenshots/medications-edit-desktop.png b/docs/screenshots/medications-edit-desktop.png
new file mode 100644
index 0000000..96231f6
Binary files /dev/null and b/docs/screenshots/medications-edit-desktop.png differ
diff --git a/docs/screenshots/medications-mobile.png b/docs/screenshots/medications-mobile.png
new file mode 100644
index 0000000..4eb27d4
Binary files /dev/null and b/docs/screenshots/medications-mobile.png differ
diff --git a/docs/screenshots/planner-desktop.png b/docs/screenshots/planner-desktop.png
new file mode 100644
index 0000000..4c233b0
Binary files /dev/null and b/docs/screenshots/planner-desktop.png differ
diff --git a/docs/screenshots/schedule-mobile.png b/docs/screenshots/schedule-mobile.png
new file mode 100644
index 0000000..13f1ea1
Binary files /dev/null and b/docs/screenshots/schedule-mobile.png differ
diff --git a/docs/screenshots/share-schedule-desktop.png b/docs/screenshots/share-schedule-desktop.png
new file mode 100644
index 0000000..6906c63
Binary files /dev/null and b/docs/screenshots/share-schedule-desktop.png differ