diff --git a/.github/screenshots/add-record-search.png b/.github/screenshots/add-record-search.png
new file mode 100644
index 00000000..ccbc7f28
Binary files /dev/null and b/.github/screenshots/add-record-search.png differ
diff --git a/.github/screenshots/artist-details.png b/.github/screenshots/artist-details.png
deleted file mode 100644
index c6091650..00000000
Binary files a/.github/screenshots/artist-details.png and /dev/null differ
diff --git a/.github/screenshots/artist-page.png b/.github/screenshots/artist-page.png
new file mode 100644
index 00000000..a70978dc
Binary files /dev/null and b/.github/screenshots/artist-page.png differ
diff --git a/.github/screenshots/collection-edit-record.png b/.github/screenshots/collection-edit-record.png
deleted file mode 100644
index 17d7c68c..00000000
Binary files a/.github/screenshots/collection-edit-record.png and /dev/null differ
diff --git a/.github/screenshots/collection-grid.png b/.github/screenshots/collection-grid.png
new file mode 100644
index 00000000..4e6cd2d0
Binary files /dev/null and b/.github/screenshots/collection-grid.png differ
diff --git a/.github/screenshots/collection-record-details.png b/.github/screenshots/collection-record-details.png
deleted file mode 100644
index f8cb81c8..00000000
Binary files a/.github/screenshots/collection-record-details.png and /dev/null differ
diff --git a/.github/screenshots/collection.png b/.github/screenshots/collection.png
deleted file mode 100644
index 9eb43f89..00000000
Binary files a/.github/screenshots/collection.png and /dev/null differ
diff --git a/.github/screenshots/record-chat.png b/.github/screenshots/record-chat.png
new file mode 100644
index 00000000..9c01a6dd
Binary files /dev/null and b/.github/screenshots/record-chat.png differ
diff --git a/.github/screenshots/record-details.png b/.github/screenshots/record-details.png
new file mode 100644
index 00000000..96f5514a
Binary files /dev/null and b/.github/screenshots/record-details.png differ
diff --git a/.github/screenshots/record-releases.png b/.github/screenshots/record-releases.png
new file mode 100644
index 00000000..82a46ee9
Binary files /dev/null and b/.github/screenshots/record-releases.png differ
diff --git a/.github/screenshots/record-search.png b/.github/screenshots/record-search.png
deleted file mode 100644
index a27d10d7..00000000
Binary files a/.github/screenshots/record-search.png and /dev/null differ
diff --git a/.github/screenshots/record-sets.png b/.github/screenshots/record-sets.png
new file mode 100644
index 00000000..16eae2e2
Binary files /dev/null and b/.github/screenshots/record-sets.png differ
diff --git a/.github/screenshots/record-tracklist.png b/.github/screenshots/record-tracklist.png
deleted file mode 100644
index 161788e8..00000000
Binary files a/.github/screenshots/record-tracklist.png and /dev/null differ
diff --git a/.github/screenshots/scrobble-activity.png b/.github/screenshots/scrobble-activity.png
deleted file mode 100644
index 2628e8b1..00000000
Binary files a/.github/screenshots/scrobble-activity.png and /dev/null differ
diff --git a/.github/screenshots/scrobble-rule-form.png b/.github/screenshots/scrobble-rule-form.png
new file mode 100644
index 00000000..f62e1a1a
Binary files /dev/null and b/.github/screenshots/scrobble-rule-form.png differ
diff --git a/.github/screenshots/scrobble-rules.png b/.github/screenshots/scrobble-rules.png
new file mode 100644
index 00000000..11cbf791
Binary files /dev/null and b/.github/screenshots/scrobble-rules.png differ
diff --git a/.github/screenshots/stats-dashboard.png b/.github/screenshots/stats-dashboard.png
new file mode 100644
index 00000000..c8b94f1c
Binary files /dev/null and b/.github/screenshots/stats-dashboard.png differ
diff --git a/.github/screenshots/stats.png b/.github/screenshots/stats.png
deleted file mode 100644
index 9ef0d306..00000000
Binary files a/.github/screenshots/stats.png and /dev/null differ
diff --git a/.github/screenshots/universal-search.png b/.github/screenshots/universal-search.png
new file mode 100644
index 00000000..86413200
Binary files /dev/null and b/.github/screenshots/universal-search.png differ
diff --git a/.github/screenshots/wishlist-import-record.png b/.github/screenshots/wishlist-import-record.png
deleted file mode 100644
index b62cf958..00000000
Binary files a/.github/screenshots/wishlist-import-record.png and /dev/null differ
diff --git a/.github/screenshots/wishlist-record-details.png b/.github/screenshots/wishlist-record-details.png
new file mode 100644
index 00000000..b74b7afb
Binary files /dev/null and b/.github/screenshots/wishlist-record-details.png differ
diff --git a/README.md b/README.md
index b7aea37a..7d69f16c 100644
--- a/README.md
+++ b/README.md
@@ -5,15 +5,18 @@
 - [Music Library](#music-library)
   - [Features](#features)
   - [Screenshots](#screenshots)
-    - [Stats](#stats)
+    - [Stats dashboard](#stats-dashboard)
     - [Collection](#collection)
     - [Searching for a record to add](#searching-for-a-record-to-add)
-    - [Edit a record in the collection](#edit-a-record-in-the-collection)
-    - [View a record's details in the collection](#view-a-records-details-in-the-collection)
-    - [View a record's tracklist](#view-a-records-tracklist)
-    - [Adding a record in the wishlist](#adding-a-record-in-the-wishlist)
-    - [View an artist's details](#view-an-artists-details)
-    - [View the scrobble activity](#view-the-scrobble-activity)
+    - [Record details](#record-details)
+    - [Record releases](#record-releases)
+    - [Record chat](#record-chat)
+    - [Artist details](#artist-details)
+    - [Wishlist record details](#wishlist-record-details)
+    - [Record sets](#record-sets)
+    - [Scrobble rules](#scrobble-rules)
+    - [New scrobble rule](#new-scrobble-rule)
+    - [Universal search](#universal-search)
   - [Setup](#setup)
   - [Environment configuration](#environment-configuration)
   - [Running the application](#running-the-application)
@@ -40,41 +43,53 @@
 
 ## Screenshots
 
-### Stats
+### Stats dashboard
 
-![Stats](.github/screenshots/stats.png)
+![Stats dashboard](.github/screenshots/stats-dashboard.png)
 
 ### Collection
 
-![Collection](.github/screenshots/collection.png)
+![Collection](.github/screenshots/collection-grid.png)
 
 ### Searching for a record to add
 
-![Searching for a Record to add](.github/screenshots/record-search.png)
+![Searching for a record to add](.github/screenshots/add-record-search.png)
 
-### Edit a record in the collection
+### Record details
 
-![Edit a record in the collection](.github/screenshots/collection-edit-record.png)
+![Record details](.github/screenshots/record-details.png)
 
-### View a record's details in the collection
+### Record releases
 
-![View a record's details in the collection](.github/screenshots/collection-record-details.png)
+![Record releases](.github/screenshots/record-releases.png)
 
-### View a record's tracklist
+### Record chat
 
-![View a record's tracklist](.github/screenshots/record-tracklist.png)
+![Record chat](.github/screenshots/record-chat.png)
 
-### Adding a record in the wishlist
+### Artist details
 
-![Adding a record in the wishlist](.github/screenshots/wishlist-import-record.png)
+![Artist details](.github/screenshots/artist-page.png)
 
-### View an artist's details
+### Wishlist record details
 
-![View an artist's details](.github/screenshots/artist-details.png)
+![Wishlist record details](.github/screenshots/wishlist-record-details.png)
 
-### View the scrobble activity
+### Record sets
 
-![View the scrobble activity](.github/screenshots/scrobble-activity.png)
+![Record sets](.github/screenshots/record-sets.png)
+
+### Scrobble rules
+
+![Scrobble rules](.github/screenshots/scrobble-rules.png)
+
+### New scrobble rule
+
+![New scrobble rule](.github/screenshots/scrobble-rule-form.png)
+
+### Universal search
+
+![Universal search](.github/screenshots/universal-search.png)
 
 ## Setup