diff --git a/README.md b/README.md
index 57ec086..980b777 100644
--- a/README.md
+++ b/README.md
@@ -7,10 +7,10 @@
 
 
 <a href="https://play.google.com/store/apps/details?id=app.cogwheel.conduit">
-<img src="store-badges/google.webp" alt="Get it on Google Play" style="height:56px;"/>
+<img src="docs/store-badges/google.webp" alt="Get it on Google Play" style="height:56px;"/>
 </a>
 <a href="https://apps.apple.com/us/app/conduit-open-webui-client/id6749840287">
-<img src="store-badges/apple.webp" alt="Download on the App Store" style="height:56px;"/>
+<img src="docs/store-badges/apple.webp" alt="Download on the App Store" style="height:56px;"/>
 </a>
 
 </div>
@@ -18,7 +18,7 @@
 <br>
 
 <div align="center">
-<img src="docs/conduit-demo.gif" alt="Conduit Demo" style="height:600px;"/>
+<img src="docs/screenshots/conduit-demo.gif" alt="Conduit Demo" style="height:600px;"/>
 </div>
 
 <br>
@@ -49,7 +49,7 @@ Conduit is an open-source, cross-platform mobile application for Open-WebUI, pro
 ```bash
 git clone https://github.com/cogwheel0/conduit && cd conduit
 flutter pub get
-flutter pub run build_runner build --delete-conflicting-outputs
+dart run build_runner build --delete-conflicting-outputs
 flutter run -d ios   # or: -d android
 ```
 
@@ -80,7 +80,7 @@ Conduit supports multiple authentication flows when connecting to your Open‑We
 
 | | | | |
 | --- | --- | --- | --- |
-| <img src="android/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png" alt="Screenshot 2" width="200" /> | <img src="android/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png" alt="Screenshot 3" width="200" /> | <img src="android/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png" alt="Screenshot 4" width="200" /> | <img src="android/fastlane/metadata/android/en-US/images/phoneScreenshots/5_en-US.png" alt="Screenshot 5" width="200" /> |
+| <img src="docs/screenshots/1.png" alt="Chat" width="200" /> | <img src="docs/screenshots/2.png" alt="Model Selector" width="200" /> | <img src="docs/screenshots/3.png" alt="Chat Drawer" width="200" /> | <img src="docs/screenshots/4.png" alt="Settings" width="200" /> |
 
 ## Requirements
 
@@ -104,7 +104,7 @@ flutter pub get
 
 3. Generate code:
 ```bash
-flutter pub run build_runner build --delete-conflicting-outputs
+dart run build_runner build --delete-conflicting-outputs
 ```
 
 4. Run the app:
diff --git a/android/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..345888d
--- /dev/null
+++ b/android/app/src/debug/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/debug/res/mipmap-hdpi/ic_launcher.png b/android/app/src/debug/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..b2cce1e
Binary files /dev/null and b/android/app/src/debug/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/android/app/src/debug/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/debug/res/mipmap-hdpi/ic_launcher_background.png
new file mode 100644
index 0000000..97f3a8e
Binary files /dev/null and b/android/app/src/debug/res/mipmap-hdpi/ic_launcher_background.png differ
diff --git a/android/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..ff19512
Binary files /dev/null and b/android/app/src/debug/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome.png b/android/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..ca305f0
Binary files /dev/null and b/android/app/src/debug/res/mipmap-hdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/debug/res/mipmap-mdpi/ic_launcher.png b/android/app/src/debug/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..518056d
Binary files /dev/null and b/android/app/src/debug/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/android/app/src/debug/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/debug/res/mipmap-mdpi/ic_launcher_background.png
new file mode 100644
index 0000000..a289dc8
Binary files /dev/null and b/android/app/src/debug/res/mipmap-mdpi/ic_launcher_background.png differ
diff --git a/android/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..33e8a21
Binary files /dev/null and b/android/app/src/debug/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome.png b/android/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..5b54e2e
Binary files /dev/null and b/android/app/src/debug/res/mipmap-mdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/debug/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..a415a7f
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..ba39a80
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..034c69c
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome.png b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..d5e29d9
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..f27a4ec
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..3553f58
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..790cb88
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..298fb65
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..4b85222
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_background.png
new file mode 100644
index 0000000..2ff2b2d
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_background.png differ
diff --git a/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..c756a41
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome.png
new file mode 100644
index 0000000..7eece3b
Binary files /dev/null and b/android/app/src/debug/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ
diff --git a/android/fastlane/metadata/android/en-US/changelogs/33.txt b/android/fastlane/metadata/android/en-US/changelogs/33.txt
new file mode 100644
index 0000000..d31d7cb
--- /dev/null
+++ b/android/fastlane/metadata/android/en-US/changelogs/33.txt
@@ -0,0 +1 @@
+https://github.com/cogwheel0/conduit/releases/tag/v2.1.8
diff --git a/docs/screenshots/1.png b/docs/screenshots/1.png
new file mode 100644
index 0000000..96e5413
Binary files /dev/null and b/docs/screenshots/1.png differ
diff --git a/docs/screenshots/2.png b/docs/screenshots/2.png
new file mode 100644
index 0000000..ee4def7
Binary files /dev/null and b/docs/screenshots/2.png differ
diff --git a/docs/screenshots/3.png b/docs/screenshots/3.png
new file mode 100644
index 0000000..6ba62fc
Binary files /dev/null and b/docs/screenshots/3.png differ
diff --git a/docs/screenshots/4.png b/docs/screenshots/4.png
new file mode 100644
index 0000000..7c2a938
Binary files /dev/null and b/docs/screenshots/4.png differ
diff --git a/docs/conduit-demo.gif b/docs/screenshots/conduit-demo.gif
similarity index 51%
rename from docs/conduit-demo.gif
rename to docs/screenshots/conduit-demo.gif
index 1877310..a65cd14 100644
Binary files a/docs/conduit-demo.gif and b/docs/screenshots/conduit-demo.gif differ
diff --git a/store-badges/apple.webp b/docs/store-badges/apple.webp
similarity index 100%
rename from store-badges/apple.webp
rename to docs/store-badges/apple.webp
diff --git a/store-badges/google.webp b/docs/store-badges/google.webp
similarity index 100%
rename from store-badges/google.webp
rename to docs/store-badges/google.webp