diff --git a/screenshots/1.png b/screenshots/1.png
deleted file mode 100644
index 1c9d7a0a0..000000000
Binary files a/screenshots/1.png and /dev/null differ
diff --git a/screenshots/COPYING b/screenshots/2.0/COPYING
similarity index 100%
rename from screenshots/COPYING
rename to screenshots/2.0/COPYING
diff --git a/screenshots/2.0/change-view.png b/screenshots/2.0/change-view.png
new file mode 100644
index 000000000..22a15e773
Binary files /dev/null and b/screenshots/2.0/change-view.png differ
diff --git a/screenshots/2.0/date-picker.png b/screenshots/2.0/date-picker.png
new file mode 100644
index 000000000..3dfa06369
Binary files /dev/null and b/screenshots/2.0/date-picker.png differ
diff --git a/screenshots/2.0/edit-calendar-properties.png b/screenshots/2.0/edit-calendar-properties.png
new file mode 100644
index 000000000..b7ce10018
Binary files /dev/null and b/screenshots/2.0/edit-calendar-properties.png differ
diff --git a/screenshots/2.0/event-editor-attendees.png b/screenshots/2.0/event-editor-attendees.png
new file mode 100644
index 000000000..27df16591
Binary files /dev/null and b/screenshots/2.0/event-editor-attendees.png differ
diff --git a/screenshots/2.0/event-editor-details-categories.jpg b/screenshots/2.0/event-editor-details-categories.jpg
new file mode 100644
index 000000000..12c7400bb
Binary files /dev/null and b/screenshots/2.0/event-editor-details-categories.jpg differ
diff --git a/screenshots/2.0/event-editor-details.png b/screenshots/2.0/event-editor-details.png
new file mode 100644
index 000000000..f22b03270
Binary files /dev/null and b/screenshots/2.0/event-editor-details.png differ
diff --git a/screenshots/2.0/event-editor-reminders.png b/screenshots/2.0/event-editor-reminders.png
new file mode 100644
index 000000000..f8a17b18b
Binary files /dev/null and b/screenshots/2.0/event-editor-reminders.png differ
diff --git a/screenshots/2.0/event-editor-repeat-day-of-month.png b/screenshots/2.0/event-editor-repeat-day-of-month.png
new file mode 100644
index 000000000..27d9c23cf
Binary files /dev/null and b/screenshots/2.0/event-editor-repeat-day-of-month.png differ
diff --git a/screenshots/2.0/event-editor-repeat-last-thursday.png b/screenshots/2.0/event-editor-repeat-last-thursday.png
new file mode 100644
index 000000000..2aad3daf5
Binary files /dev/null and b/screenshots/2.0/event-editor-repeat-last-thursday.png differ
diff --git a/screenshots/2.0/freebusy.png b/screenshots/2.0/freebusy.png
new file mode 100644
index 000000000..86a391950
Binary files /dev/null and b/screenshots/2.0/freebusy.png differ
diff --git a/screenshots/2.0/month-view.png b/screenshots/2.0/month-view.png
new file mode 100644
index 000000000..cb926ce87
Binary files /dev/null and b/screenshots/2.0/month-view.png differ
diff --git a/screenshots/2.0/new-calendar-selector.png b/screenshots/2.0/new-calendar-selector.png
new file mode 100644
index 000000000..0df0e7408
Binary files /dev/null and b/screenshots/2.0/new-calendar-selector.png differ
diff --git a/screenshots/2.0/public-sharing-embed.png b/screenshots/2.0/public-sharing-embed.png
new file mode 100644
index 000000000..e35a755e8
Binary files /dev/null and b/screenshots/2.0/public-sharing-embed.png differ
diff --git a/screenshots/2.0/public-sharing.png b/screenshots/2.0/public-sharing.png
new file mode 100644
index 000000000..3abfa51d7
Binary files /dev/null and b/screenshots/2.0/public-sharing.png differ
diff --git a/screenshots/2.0/share-calendar-publicly-embed-link.png b/screenshots/2.0/share-calendar-publicly-embed-link.png
new file mode 100644
index 000000000..f49d35f2e
Binary files /dev/null and b/screenshots/2.0/share-calendar-publicly-embed-link.png differ
diff --git a/screenshots/2.0/share-calendar-user.png b/screenshots/2.0/share-calendar-user.png
new file mode 100644
index 000000000..3ce1ccb0e
Binary files /dev/null and b/screenshots/2.0/share-calendar-user.png differ
diff --git a/screenshots/2.0/simple-event-popover.png b/screenshots/2.0/simple-event-popover.png
new file mode 100644
index 000000000..180b0f10a
Binary files /dev/null and b/screenshots/2.0/simple-event-popover.png differ
diff --git a/screenshots/2.0/week-view.png b/screenshots/2.0/week-view.png
new file mode 100644
index 000000000..9516ee179
Binary files /dev/null and b/screenshots/2.0/week-view.png differ
diff --git a/screenshots/2.png b/screenshots/2.png
deleted file mode 100644
index cb6e772fd..000000000
Binary files a/screenshots/2.png and /dev/null differ
diff --git a/screenshots/3.png b/screenshots/3.png
deleted file mode 100644
index 22c7e50a1..000000000
Binary files a/screenshots/3.png and /dev/null differ
diff --git a/screenshots/4.png b/screenshots/4.png
deleted file mode 100644
index 5f38ffe4a..000000000
Binary files a/screenshots/4.png and /dev/null differ
diff --git a/screenshots/README.md b/screenshots/README.md
deleted file mode 100644
index e10bf3528..000000000
--- a/screenshots/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Nextcloud Calendar Screenshots
-
-This folder contains screenshots of the Nextcloud calendar app.
-
-All screenshots are licensed under the Creative Commons By-Attribution 4.0 license. For more details see the [COPYING](https://github.com/nextcloud/calendar/blob/master/screenshots/COPYING) file.
diff --git a/screenshots/calendar_dropdown.png b/screenshots/calendar_dropdown.png
deleted file mode 100644
index 06bcb82e2..000000000
Binary files a/screenshots/calendar_dropdown.png and /dev/null differ
diff --git a/screenshots/calendar_editing.png b/screenshots/calendar_editing.png
deleted file mode 100644
index 1da6f6cb4..000000000
Binary files a/screenshots/calendar_editing.png and /dev/null differ
diff --git a/screenshots/calendar_sharing.png b/screenshots/calendar_sharing.png
deleted file mode 100644
index fa921dd3b..000000000
Binary files a/screenshots/calendar_sharing.png and /dev/null differ
diff --git a/screenshots/calendarlist_datepicker.png b/screenshots/calendarlist_datepicker.png
deleted file mode 100644
index 9a12d3eac..000000000
Binary files a/screenshots/calendarlist_datepicker.png and /dev/null differ
diff --git a/screenshots/drag_create_event.png b/screenshots/drag_create_event.png
deleted file mode 100644
index 080e1a1eb..000000000
Binary files a/screenshots/drag_create_event.png and /dev/null differ
diff --git a/screenshots/editor_attendee.png b/screenshots/editor_attendee.png
deleted file mode 100644
index b1091c8dc..000000000
Binary files a/screenshots/editor_attendee.png and /dev/null differ
diff --git a/screenshots/editor_details.png b/screenshots/editor_details.png
deleted file mode 100644
index 5c9eabff5..000000000
Binary files a/screenshots/editor_details.png and /dev/null differ
diff --git a/screenshots/editor_reminder.png b/screenshots/editor_reminder.png
deleted file mode 100644
index 5a048a81b..000000000
Binary files a/screenshots/editor_reminder.png and /dev/null differ
diff --git a/screenshots/editor_repeating.png b/screenshots/editor_repeating.png
deleted file mode 100644
index 69e64bcdb..000000000
Binary files a/screenshots/editor_repeating.png and /dev/null differ
diff --git a/screenshots/import.png b/screenshots/import.png
deleted file mode 100644
index 757a9097b..000000000
Binary files a/screenshots/import.png and /dev/null differ
diff --git a/screenshots/import_in_progress.png b/screenshots/import_in_progress.png
deleted file mode 100644
index 2f25c538e..000000000
Binary files a/screenshots/import_in_progress.png and /dev/null differ
diff --git a/screenshots/popover.png b/screenshots/popover.png
deleted file mode 100644
index 3423bdd56..000000000
Binary files a/screenshots/popover.png and /dev/null differ
diff --git a/screenshots/public_sharing.png b/screenshots/public_sharing.png
index 22c7e50a1..f49d35f2e 100644
Binary files a/screenshots/public_sharing.png and b/screenshots/public_sharing.png differ
diff --git a/screenshots/public_sharing_embed.png b/screenshots/public_sharing_embed.png
deleted file mode 100644
index 3130e0626..000000000
Binary files a/screenshots/public_sharing_embed.png and /dev/null differ
diff --git a/screenshots/settings.png b/screenshots/settings.png
deleted file mode 100644
index 6ef9b5273..000000000
Binary files a/screenshots/settings.png and /dev/null differ
diff --git a/screenshots/sidebar.png b/screenshots/sidebar.png
index cb6e772fd..86a391950 100644
Binary files a/screenshots/sidebar.png and b/screenshots/sidebar.png differ
diff --git a/screenshots/sidebar_attendees.png b/screenshots/sidebar_attendees.png
index 5f38ffe4a..27d9c23cf 100644
Binary files a/screenshots/sidebar_attendees.png and b/screenshots/sidebar_attendees.png differ
diff --git a/screenshots/sidebar_reminders.png b/screenshots/sidebar_reminders.png
index e83b810bc..2aad3daf5 100644
Binary files a/screenshots/sidebar_reminders.png and b/screenshots/sidebar_reminders.png differ
diff --git a/screenshots/view_day.png b/screenshots/view_day.png
deleted file mode 100644
index 0385ffdb7..000000000
Binary files a/screenshots/view_day.png and /dev/null differ
diff --git a/screenshots/view_month.png b/screenshots/view_month.png
deleted file mode 100644
index f4c2c1250..000000000
Binary files a/screenshots/view_month.png and /dev/null differ
diff --git a/screenshots/view_week.png b/screenshots/view_week.png
index 1c9d7a0a0..9516ee179 100644
Binary files a/screenshots/view_week.png and b/screenshots/view_week.png differ