diff --git a/README.md b/README.md
index 380ceba..e59cffe 100644
--- a/README.md
+++ b/README.md
@@ -11,26 +11,26 @@ JMK RB RaceController is an RC timing and race-control system with support for s
 
 ## Screenshots
 
-### Overview
-![Overview](docs/screenshots/overview.jpg)
+Current layouts for race operation, live presentation, training and system configuration. Click an image to open the full-resolution version.
 
-### Timing
-![Timing](docs/screenshots/timing.jpg)
-
-### Overlay
-![Overlay](docs/screenshots/overlay.jpg)
-
-### Event
-![Event](docs/screenshots/event.jpg)
-
-### Race Setup
-![Race Setup](docs/screenshots/race-setup.jpg)
-
-### Team Overlay
-![Team Overlay](docs/screenshots/team-overlay.jpg)
-
-### Judging
-![Team Overlay](docs/screenshots/judging.jpg)
+<table>
+  <tr>
+    <td width="50%"><a href="docs/screenshots/overview-active-session.jpg"><img src="docs/screenshots/overview-active-session.jpg" alt="Dashboard with active session" /></a><br><strong>Dashboard with active session</strong></td>
+    <td width="50%"><a href="docs/screenshots/race-setup-wizard.jpg"><img src="docs/screenshots/race-setup-wizard.jpg" alt="Race Setup wizard" /></a><br><strong>Race Setup wizard</strong></td>
+  </tr>
+  <tr>
+    <td width="50%"><a href="docs/screenshots/overlay.jpg"><img src="docs/screenshots/overlay.jpg" alt="Full live overlay" /></a><br><strong>Full live overlay</strong></td>
+    <td width="50%"><a href="docs/screenshots/leaderboard-overlay.jpg"><img src="docs/screenshots/leaderboard-overlay.jpg" alt="Leaderboard overlay" /></a><br><strong>Leaderboard overlay</strong></td>
+  </tr>
+  <tr>
+    <td width="50%"><a href="docs/screenshots/training-overview.jpg"><img src="docs/screenshots/training-overview.jpg" alt="Practice statistics overview" /></a><br><strong>Practice statistics overview</strong></td>
+    <td width="50%"><a href="docs/screenshots/judging-current.jpg"><img src="docs/screenshots/judging-current.jpg" alt="Judging and race corrections" /></a><br><strong>Judging and race corrections</strong></td>
+  </tr>
+  <tr>
+    <td width="50%"><a href="docs/screenshots/race-audio-settings.jpg"><img src="docs/screenshots/race-audio-settings.jpg" alt="Race sounds and announcements" /></a><br><strong>Race sounds and announcements</strong></td>
+    <td width="50%"><a href="docs/screenshots/decoder-settings.jpg"><img src="docs/screenshots/decoder-settings.jpg" alt="Decoder configuration" /></a><br><strong>Decoder configuration</strong></td>
+  </tr>
+</table>
 
 ## Public Overlay And OBS
 
diff --git a/README.sv.md b/README.sv.md
index 19568d1..5e56ed8 100644
--- a/README.sv.md
+++ b/README.sv.md
@@ -9,26 +9,26 @@ RC timing app med sponsor-eventflöde (delade bilar/transpondrar mellan olika he
 
 ## Skärmbilder
 
-### Översikt
-![Översikt](docs/screenshots/overview.jpg)
+Aktuella layouter för racedrift, livevisning, träning och systemkonfiguration. Klicka på en bild för att öppna den i full upplösning.
 
-### Tidtagning
-![Tidtagning](docs/screenshots/timing.jpg)
-
-### Overlay
-![Overlay](docs/screenshots/overlay.jpg)
-
-### Event
-![Event](docs/screenshots/event.jpg)
-
-### Race Setup
-![Race Setup](docs/screenshots/race-setup.jpg)
-
-### Team Overlay
-![Team Overlay](docs/screenshots/team-overlay.jpg)
-
-### Domare
-![Team Overlay](docs/screenshots/judging.jpg)
+<table>
+  <tr>
+    <td width="50%"><a href="docs/screenshots/overview-active-session.jpg"><img src="docs/screenshots/overview-active-session.jpg" alt="Översikt med aktiv session" /></a><br><strong>Översikt med aktiv session</strong></td>
+    <td width="50%"><a href="docs/screenshots/race-setup-wizard.jpg"><img src="docs/screenshots/race-setup-wizard.jpg" alt="Race Setup-wizard" /></a><br><strong>Race Setup-wizard</strong></td>
+  </tr>
+  <tr>
+    <td width="50%"><a href="docs/screenshots/overlay.jpg"><img src="docs/screenshots/overlay.jpg" alt="Komplett live-overlay" /></a><br><strong>Komplett live-overlay</strong></td>
+    <td width="50%"><a href="docs/screenshots/leaderboard-overlay.jpg"><img src="docs/screenshots/leaderboard-overlay.jpg" alt="Leaderboard-overlay" /></a><br><strong>Leaderboard-overlay</strong></td>
+  </tr>
+  <tr>
+    <td width="50%"><a href="docs/screenshots/training-overview.jpg"><img src="docs/screenshots/training-overview.jpg" alt="Träningsöversikt" /></a><br><strong>Träningsöversikt</strong></td>
+    <td width="50%"><a href="docs/screenshots/judging-current.jpg"><img src="docs/screenshots/judging-current.jpg" alt="Domare och racekorrigeringar" /></a><br><strong>Domare och racekorrigeringar</strong></td>
+  </tr>
+  <tr>
+    <td width="50%"><a href="docs/screenshots/race-audio-settings.jpg"><img src="docs/screenshots/race-audio-settings.jpg" alt="Raceljud och utrop" /></a><br><strong>Raceljud och utrop</strong></td>
+    <td width="50%"><a href="docs/screenshots/decoder-settings.jpg"><img src="docs/screenshots/decoder-settings.jpg" alt="Decoderinställningar" /></a><br><strong>Decoderinställningar</strong></td>
+  </tr>
+</table>
 
 ## Publik Overlay Och OBS
 
diff --git a/docs/screenshots/decoder-settings.jpg b/docs/screenshots/decoder-settings.jpg
new file mode 100644
index 0000000..a40a941
Binary files /dev/null and b/docs/screenshots/decoder-settings.jpg differ
diff --git a/docs/screenshots/judging-current.jpg b/docs/screenshots/judging-current.jpg
new file mode 100644
index 0000000..ee6d3df
Binary files /dev/null and b/docs/screenshots/judging-current.jpg differ
diff --git a/docs/screenshots/leaderboard-overlay.jpg b/docs/screenshots/leaderboard-overlay.jpg
new file mode 100644
index 0000000..361845e
Binary files /dev/null and b/docs/screenshots/leaderboard-overlay.jpg differ
diff --git a/docs/screenshots/overlay.jpg b/docs/screenshots/overlay.jpg
index ffdb648..2263804 100644
Binary files a/docs/screenshots/overlay.jpg and b/docs/screenshots/overlay.jpg differ
diff --git a/docs/screenshots/overview-active-session.jpg b/docs/screenshots/overview-active-session.jpg
new file mode 100644
index 0000000..d459bf1
Binary files /dev/null and b/docs/screenshots/overview-active-session.jpg differ
diff --git a/docs/screenshots/race-audio-settings.jpg b/docs/screenshots/race-audio-settings.jpg
new file mode 100644
index 0000000..ad8506d
Binary files /dev/null and b/docs/screenshots/race-audio-settings.jpg differ
diff --git a/docs/screenshots/race-setup-wizard.jpg b/docs/screenshots/race-setup-wizard.jpg
new file mode 100644
index 0000000..ed18538
Binary files /dev/null and b/docs/screenshots/race-setup-wizard.jpg differ
diff --git a/docs/screenshots/training-overview.jpg b/docs/screenshots/training-overview.jpg
new file mode 100644
index 0000000..3312955
Binary files /dev/null and b/docs/screenshots/training-overview.jpg differ