diff --git a/README.md b/README.md
index 2e0d1ae..7572bc1 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,31 @@ Clinch sits in a sweet spot between two excellent open-source identity solutions
 ## Screenshots
 
 ### User Dashboard
-[![User Dashboard](docs/screenshots/dashboard-thumb.png)](docs/screenshots/dashboard.png)
+[![User Dashboard](docs/screenshots/thumbs/0-dashboard.png)](docs/screenshots/0-dashboard.png)
+
+### Sign In
+[![Sign In](docs/screenshots/thumbs/1-signin.png)](docs/screenshots/1-signin.png)
+
+### Sign In with Error
+[![Sign In with Error](docs/screenshots/thumbs/2-signin.png)](docs/screenshots/2-signin.png)
+
+### Users Management
+[![Users Management](docs/screenshots/thumbs/3-users.png)](docs/screenshots/3-users.png)
+
+### Welcome Screen
+[![Welcome Screen](docs/screenshots/thumbs/4-welcome.png)](docs/screenshots/4-welcome.png)
+
+### Welcome Setup
+[![Welcome Setup](docs/screenshots/thumbs/5-welcome-2.png)](docs/screenshots/5-welcome-2.png)
+
+### Setup 2FA
+[![Setup 2FA](docs/screenshots/thumbs/6-setup-2fa.png)](docs/screenshots/6-setup-2fa.png)
+
+### Forward Auth Example 1
+[![Forward Auth Example 1](docs/screenshots/thumbs/7-forward-auth-1.png)](docs/screenshots/7-forward-auth-1.png)
+
+### Forward Auth Example 2
+[![Forward Auth Example 2](docs/screenshots/thumbs/8-forward-auth-2.png)](docs/screenshots/8-forward-auth-2.png)
 
 ## Features
 
diff --git a/docs/screenshots/dashboard.png b/docs/screenshots/0-dashboard.png
similarity index 100%
rename from docs/screenshots/dashboard.png
rename to docs/screenshots/0-dashboard.png
diff --git a/docs/screenshots/1-signin.png b/docs/screenshots/1-signin.png
new file mode 100644
index 0000000..49816a5
Binary files /dev/null and b/docs/screenshots/1-signin.png differ
diff --git a/docs/screenshots/2-signin.png b/docs/screenshots/2-signin.png
new file mode 100644
index 0000000..5cd83a2
Binary files /dev/null and b/docs/screenshots/2-signin.png differ
diff --git a/docs/screenshots/3-users.png b/docs/screenshots/3-users.png
new file mode 100644
index 0000000..94a6a03
Binary files /dev/null and b/docs/screenshots/3-users.png differ
diff --git a/docs/screenshots/4-welcome.png b/docs/screenshots/4-welcome.png
new file mode 100644
index 0000000..98dbbb4
Binary files /dev/null and b/docs/screenshots/4-welcome.png differ
diff --git a/docs/screenshots/5-welcome-2.png b/docs/screenshots/5-welcome-2.png
new file mode 100644
index 0000000..6b08e90
Binary files /dev/null and b/docs/screenshots/5-welcome-2.png differ
diff --git a/docs/screenshots/6-setup-2fa.png b/docs/screenshots/6-setup-2fa.png
new file mode 100644
index 0000000..f5790a5
Binary files /dev/null and b/docs/screenshots/6-setup-2fa.png differ
diff --git a/docs/screenshots/7-forward-auth-1.png b/docs/screenshots/7-forward-auth-1.png
new file mode 100644
index 0000000..8579c7e
Binary files /dev/null and b/docs/screenshots/7-forward-auth-1.png differ
diff --git a/docs/screenshots/8-forward-auth-2.png b/docs/screenshots/8-forward-auth-2.png
new file mode 100644
index 0000000..c813b89
Binary files /dev/null and b/docs/screenshots/8-forward-auth-2.png differ
diff --git a/docs/screenshots/dashboard-thumb.png b/docs/screenshots/thumbs/0-dashboard.png
similarity index 100%
rename from docs/screenshots/dashboard-thumb.png
rename to docs/screenshots/thumbs/0-dashboard.png
diff --git a/docs/screenshots/thumbs/0-dashboard.png.png b/docs/screenshots/thumbs/0-dashboard.png.png
new file mode 100644
index 0000000..8481c4d
Binary files /dev/null and b/docs/screenshots/thumbs/0-dashboard.png.png differ
diff --git a/docs/screenshots/thumbs/1-signin.png.png b/docs/screenshots/thumbs/1-signin.png.png
new file mode 100644
index 0000000..0627709
Binary files /dev/null and b/docs/screenshots/thumbs/1-signin.png.png differ
diff --git a/docs/screenshots/thumbs/2-signin.png.png b/docs/screenshots/thumbs/2-signin.png.png
new file mode 100644
index 0000000..08fb645
Binary files /dev/null and b/docs/screenshots/thumbs/2-signin.png.png differ
diff --git a/docs/screenshots/thumbs/3-users.png.png b/docs/screenshots/thumbs/3-users.png.png
new file mode 100644
index 0000000..1bd31bf
Binary files /dev/null and b/docs/screenshots/thumbs/3-users.png.png differ
diff --git a/docs/screenshots/thumbs/4-welcome.png.png b/docs/screenshots/thumbs/4-welcome.png.png
new file mode 100644
index 0000000..8c4ea39
Binary files /dev/null and b/docs/screenshots/thumbs/4-welcome.png.png differ
diff --git a/docs/screenshots/thumbs/5-welcome-2.png.png b/docs/screenshots/thumbs/5-welcome-2.png.png
new file mode 100644
index 0000000..9db8bda
Binary files /dev/null and b/docs/screenshots/thumbs/5-welcome-2.png.png differ
diff --git a/docs/screenshots/thumbs/6-setup-2fa.png.png b/docs/screenshots/thumbs/6-setup-2fa.png.png
new file mode 100644
index 0000000..510fc6e
Binary files /dev/null and b/docs/screenshots/thumbs/6-setup-2fa.png.png differ
diff --git a/docs/screenshots/thumbs/7-forward-auth-1.png.png b/docs/screenshots/thumbs/7-forward-auth-1.png.png
new file mode 100644
index 0000000..d603fc1
Binary files /dev/null and b/docs/screenshots/thumbs/7-forward-auth-1.png.png differ
diff --git a/docs/screenshots/thumbs/8-forward-auth-2.png.png b/docs/screenshots/thumbs/8-forward-auth-2.png.png
new file mode 100644
index 0000000..e8ff43c
Binary files /dev/null and b/docs/screenshots/thumbs/8-forward-auth-2.png.png differ