diff --git a/CHANGELOG.md b/CHANGELOG.md
index 444a863c..445308d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,61 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 2.7.0
+
+### Known issues
+We got some reports related to emoji picker performance, this hopefully will be fixed in 2.7.1.
+
+### Notes
+This release overhauls how themes work, themes now need to be "compiled", which can cause some delay when loading for the first time and temporarily look "wrong" in some places (popups, menus, dialogs). Please do report any issues, especially if your theme looks wrong or breaks interface when loading. Also report issues if you're experiencing constant performance issues.
+
+To admins: remember that you can update PleromaFE to recent `master` or `develop` in admin dashboard in "Front-ends" tab, scroll down to find PleromaFE box and click "Reinstall `master`" or dropdown and then "Reinstall `develop`". Currently there is no mechanism to check if there is an update or not.
+
+### Changed
+- Overhauled the way themes work, migrating to new Pleroma Interface Style Sheets system aka "Themes 3".
+- Notifications are no longer sorted by "seen" status since interacting with them can change their read status and makes UI jumpy. Old behavior can be restored in settings.
+- Notifications are now shown through a ServiceWorker (since mobile chrome does not allow them otherwise), it's always enabled, even if previously we only enabled it for WebPush notifications only. If you don't like websites "running" while closed, check how to disable them in your browser. Old way to show notifications will be used as a fallback but might not have all the new features.
+- Reorganized Settings modal to move out visual stuff into Appearance tab
+
+### Added
+- Emoji pack management to the admin panel
+- Support `status` notification type (subscriptions/bell, fixes PleromaFE on newer PleromaBE versions)
+- Poll end notifications.
+- Added option to not mark all notifications when closing notifications drawer on mobile, this creates a new button to mark all as seen.
+- Option to always "show" notifications when using web push for better compatibility with some browsers (chrome, edge, safari)
+- Option to toggle what notification types appear in native notifications, by default less important ones (likes, repeats, etc) will no longer show up in native notifications.
+- Option to treat non-interactive notifications (likes, repeats et all) as seen for visual purposes (no read mark, ignored in counters, still can show in native notifications)
+- Ability to resize UI (and certain components) scale independent of browser/text scale
+- Ability to override certain aspects of UI style independent of theme used (UI roundness, fonts, underlay)
+- Theme selector with visual previews of the theme
+- Display loading and error indicator for conversation page
+- Option to only show scrobbles that are recent enough
+- Interacting (opening reply box etc) or simply clicking on non-interactive notifications now marks them as read. Clicking on native notifications for non-interactive ones also marks them as seen.
+- Support group actors
+- Focusing into a tab clears all current desktop notifications
+- Ability to change size of emoji
+- Ability to view APNG (Animated PNG) attachments.
+- Support showing extra notifications in the notifications column
+- Create a link to the URL of the scrobble when it's present
+- Allow hiding custom emojis in picker.
+- Ability to mute sensitive posts (ported from eintei).
+- Native notifications now also have "badge" property that matches instance's favicon (visible in Android Chromium at least)
+- Display public favorites on user profiles
+- Display quotes count on posts and add quotes list page
+- Show a dedicated registration notice page when further action is required after registering
+
+### Fixed
+- Synchronized requested notification types with backend, hopefully should fix missing notifications for polls and follow requests
+- Error that appeared on mobile Chromium (and derivatives) when native notifications are allowed
+- Being unable to set notification visibility for reports and follow requests
+- Native notifications appearing as many times as there are open tabs. Clicking on notification will focus last focused tab.
+- The expiry date indication won't be shown if the poll never expires
+- Profile mentions causing a 422 error on newer PleromaBE versions.
+- Color inputs are less ugly now
+- Unread notifications should now properly catch up between sessions (eventually) in polling mode
+- Video posters on Safari
+
+
 ## 2.6.1
 ### Fixed
 - fix admin dashboard not having any feedback on frontend installation
diff --git a/changelog.d/add-apng.add b/changelog.d/add-apng.add
deleted file mode 100644
index cdec58af..00000000
--- a/changelog.d/add-apng.add
+++ /dev/null
@@ -1 +0,0 @@
-Make Pleroma FE to also view apng (Animated PNG) attachment.
diff --git a/changelog.d/admin-emoji-packs.add b/changelog.d/admin-emoji-packs.add
deleted file mode 100644
index 243163e8..00000000
--- a/changelog.d/admin-emoji-packs.add
+++ /dev/null
@@ -1 +0,0 @@
-Added emoji pack management to the admin panel
diff --git a/changelog.d/appearance-tab.change b/changelog.d/appearance-tab.change
deleted file mode 100644
index 7fe1b45e..00000000
--- a/changelog.d/appearance-tab.change
+++ /dev/null
@@ -1 +0,0 @@
-Reorganized Settings modal to move out visual stuff into Appearance tab
diff --git a/changelog.d/ci-runner.skip b/changelog.d/ci-runner.skip
deleted file mode 100644
index ad4b79d5..00000000
--- a/changelog.d/ci-runner.skip
+++ /dev/null
@@ -1 +0,0 @@
-stop using that one runner for intensive tasks
\ No newline at end of file
diff --git a/changelog.d/create-link-when-url-present.add b/changelog.d/create-link-when-url-present.add
deleted file mode 100644
index 11aa3758..00000000
--- a/changelog.d/create-link-when-url-present.add
+++ /dev/null
@@ -1 +0,0 @@
-Create a link to the URL of the scrobble when it's present
diff --git a/changelog.d/double-notifications.fix b/changelog.d/double-notifications.fix
deleted file mode 100644
index 24e08c0f..00000000
--- a/changelog.d/double-notifications.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix native notifications appearing as many times as there are open tabs. Clicking on notification will focus last focused tab.
diff --git a/changelog.d/emoji-scale.add b/changelog.d/emoji-scale.add
deleted file mode 100644
index 791d80d9..00000000
--- a/changelog.d/emoji-scale.add
+++ /dev/null
@@ -1 +0,0 @@
-Ability to change size of emoji
diff --git a/changelog.d/extra-notifications.add b/changelog.d/extra-notifications.add
deleted file mode 100644
index 90f21f54..00000000
--- a/changelog.d/extra-notifications.add
+++ /dev/null
@@ -1 +0,0 @@
-Support showing extra notifications in the notifications column
diff --git a/changelog.d/firefox-redmon.fix b/changelog.d/firefox-redmon.fix
deleted file mode 100644
index 64ab9b14..00000000
--- a/changelog.d/firefox-redmon.fix
+++ /dev/null
@@ -1 +0,0 @@
-Bug with firefox and redmond themes
diff --git a/changelog.d/fixes-themes.skip b/changelog.d/fixes-themes.skip
deleted file mode 100644
index af691507..00000000
--- a/changelog.d/fixes-themes.skip
+++ /dev/null
@@ -1 +0,0 @@
-fixed themes for spw and kazvmoew
diff --git a/changelog.d/fixes.skip b/changelog.d/fixes.skip
deleted file mode 100644
index cc40793e..00000000
--- a/changelog.d/fixes.skip
+++ /dev/null
@@ -1 +0,0 @@
-fix post appearance tab bugs part I
diff --git a/changelog.d/focus-clear.add b/changelog.d/focus-clear.add
deleted file mode 100644
index 70f54ab6..00000000
--- a/changelog.d/focus-clear.add
+++ /dev/null
@@ -1 +0,0 @@
-Focusing into a tab clears all current desktop notifications
diff --git a/changelog.d/group-actor.add b/changelog.d/group-actor.add
deleted file mode 100644
index 7b62676a..00000000
--- a/changelog.d/group-actor.add
+++ /dev/null
@@ -1 +0,0 @@
-Support group actors
diff --git a/changelog.d/hide-custom-emojis-in-picker.add b/changelog.d/hide-custom-emojis-in-picker.add
deleted file mode 100644
index 4cfd2ca8..00000000
--- a/changelog.d/hide-custom-emojis-in-picker.add
+++ /dev/null
@@ -1 +0,0 @@
-Allow hiding custom emojis in picker.
diff --git a/changelog.d/mobile-chrome-notifs.fix b/changelog.d/mobile-chrome-notifs.fix
deleted file mode 100644
index 7db10c56..00000000
--- a/changelog.d/mobile-chrome-notifs.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed error that appeared on mobile Chrome(ium) (and derivatives) when native notifications are allowed
diff --git a/changelog.d/mobile-drawer-notifications.change b/changelog.d/mobile-drawer-notifications.change
deleted file mode 100644
index 9353c709..00000000
--- a/changelog.d/mobile-drawer-notifications.change
+++ /dev/null
@@ -1 +0,0 @@
-Added option to not mark all notifications when closing notifications drawer on mobile, this creates a new button to mark all as seen.
diff --git a/changelog.d/more-notification-types-setting.fix b/changelog.d/more-notification-types-setting.fix
deleted file mode 100644
index 2d71b599..00000000
--- a/changelog.d/more-notification-types-setting.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fixed being unable to set notification visibility for reports and follow requests
diff --git a/changelog.d/mute-nsfw.add b/changelog.d/mute-nsfw.add
deleted file mode 100644
index b1794a0c..00000000
--- a/changelog.d/mute-nsfw.add
+++ /dev/null
@@ -1 +0,0 @@
-Added ability to mute sensitive posts (ported from eintei)
diff --git a/changelog.d/native-filtering.add b/changelog.d/native-filtering.add
deleted file mode 100644
index 82ab9a23..00000000
--- a/changelog.d/native-filtering.add
+++ /dev/null
@@ -1 +0,0 @@
-Added option to toggle what notification types appear in native notifications, by default less important ones (likes, repeats, etc) will no longer show up in native notifications.
diff --git a/changelog.d/native-notifications.add b/changelog.d/native-notifications.add
deleted file mode 100644
index d896e7c0..00000000
--- a/changelog.d/native-notifications.add
+++ /dev/null
@@ -1 +0,0 @@
-Native notifications now also have "badge" property that matches instance's favicon (visible in Android Chromium at least)
diff --git a/changelog.d/no-preserve-selection-color.fix b/changelog.d/no-preserve-selection-color.fix
deleted file mode 100644
index 669e744c..00000000
--- a/changelog.d/no-preserve-selection-color.fix
+++ /dev/null
@@ -1 +0,0 @@
-Ensure selection text color has enough contrast
diff --git a/changelog.d/non-expiring-polls-indication.fix b/changelog.d/non-expiring-polls-indication.fix
deleted file mode 100644
index 7979cc13..00000000
--- a/changelog.d/non-expiring-polls-indication.fix
+++ /dev/null
@@ -1 +0,0 @@
-The expiry date indication won't be shown if the poll never expires
diff --git a/changelog.d/noninteractive-ignore-read.add b/changelog.d/noninteractive-ignore-read.add
deleted file mode 100644
index 5e8710cf..00000000
--- a/changelog.d/noninteractive-ignore-read.add
+++ /dev/null
@@ -1 +0,0 @@
-Added option to treat non-interactive notifications (likes, repeats et all) as seen for visual purposes (no read mark, ignored in counters, still can show in native notifications)
diff --git a/changelog.d/notif-types.fix b/changelog.d/notif-types.fix
deleted file mode 100644
index fb0e5046..00000000
--- a/changelog.d/notif-types.fix
+++ /dev/null
@@ -1 +0,0 @@
-Synchronized requested notification types with backend, hopefully should fix missing notifications for polls and follow requests
diff --git a/changelog.d/notification-read.add b/changelog.d/notification-read.add
deleted file mode 100644
index e5027a95..00000000
--- a/changelog.d/notification-read.add
+++ /dev/null
@@ -1 +0,0 @@
-Interacting (opening reply box etc) or simply clicking on non-interactive notifications now marks them as read. Clicking on native notifications for non-interactive ones also marks them as seen.
diff --git a/changelog.d/notifications-sorting.change b/changelog.d/notifications-sorting.change
deleted file mode 100644
index 3a616244..00000000
--- a/changelog.d/notifications-sorting.change
+++ /dev/null
@@ -1 +0,0 @@
-Notifications are no longer sorted by "seen" status since interacting with them can change their read status and makes UI jumpy. Old behavior can be restored in settings.
diff --git a/changelog.d/poll-ended-notifications.fix b/changelog.d/poll-ended-notifications.fix
deleted file mode 100644
index d04b8cb0..00000000
--- a/changelog.d/poll-ended-notifications.fix
+++ /dev/null
@@ -1 +0,0 @@
-Add poll end notifications to fetched types.
diff --git a/changelog.d/preview-interference.skip b/changelog.d/preview-interference.skip
deleted file mode 100644
index e32e76dd..00000000
--- a/changelog.d/preview-interference.skip
+++ /dev/null
@@ -1 +0,0 @@
-skip
diff --git a/changelog.d/profile-mentions.fix b/changelog.d/profile-mentions.fix
deleted file mode 100644
index 3f38ab0c..00000000
--- a/changelog.d/profile-mentions.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix profile mentions causing a 422 error
diff --git a/changelog.d/public-favorites.add b/changelog.d/public-favorites.add
deleted file mode 100644
index 183fcc85..00000000
--- a/changelog.d/public-favorites.add
+++ /dev/null
@@ -1 +0,0 @@
-Display public favorites on user profiles
\ No newline at end of file
diff --git a/changelog.d/public-favorites.skip b/changelog.d/public-favorites.skip
deleted file mode 100644
index e69de29b..00000000
diff --git a/changelog.d/quotes-count.add b/changelog.d/quotes-count.add
deleted file mode 100644
index 86779b96..00000000
--- a/changelog.d/quotes-count.add
+++ /dev/null
@@ -1 +0,0 @@
-Display quotes count on posts and add quotes list page
\ No newline at end of file
diff --git a/changelog.d/registration-notice.add b/changelog.d/registration-notice.add
deleted file mode 100644
index b2777ba2..00000000
--- a/changelog.d/registration-notice.add
+++ /dev/null
@@ -1 +0,0 @@
-Show a dedicated registration notice page when further action is required after registering
diff --git a/changelog.d/scrobbles-age-filter.add b/changelog.d/scrobbles-age-filter.add
deleted file mode 100644
index ecd3c7d8..00000000
--- a/changelog.d/scrobbles-age-filter.add
+++ /dev/null
@@ -1 +0,0 @@
-Option to only show scrobbles that are recent enough
diff --git a/changelog.d/serviceworkers.change b/changelog.d/serviceworkers.change
deleted file mode 100644
index b3b64f6d..00000000
--- a/changelog.d/serviceworkers.change
+++ /dev/null
@@ -1 +0,0 @@
-Notifications are now shown through a serviceworker (since mobile chrome does not allow them otherwise), it's always enabled, even if previously we only enabled it for WebPush notifications only. If you don't like websites "running" while closed, check how to disable them in your browser. Old way to show notifications will be used as a fallback but might not have all the new features.
diff --git a/changelog.d/show-recent-scrobble.skip b/changelog.d/show-recent-scrobble.skip
deleted file mode 100644
index 9227de06..00000000
--- a/changelog.d/show-recent-scrobble.skip
+++ /dev/null
@@ -1 +0,0 @@
-Shows the most recent scrobble under each post when available
diff --git a/changelog.d/status-loading-indicator.add b/changelog.d/status-loading-indicator.add
deleted file mode 100644
index d0725677..00000000
--- a/changelog.d/status-loading-indicator.add
+++ /dev/null
@@ -1 +0,0 @@
-Display loading and error indicator for conversation page
diff --git a/changelog.d/status-notification-type.add b/changelog.d/status-notification-type.add
deleted file mode 100644
index 0917dad4..00000000
--- a/changelog.d/status-notification-type.add
+++ /dev/null
@@ -1 +0,0 @@
-Support `status` notification type
\ No newline at end of file
diff --git a/changelog.d/theme-selector.add b/changelog.d/theme-selector.add
deleted file mode 100644
index c303f97c..00000000
--- a/changelog.d/theme-selector.add
+++ /dev/null
@@ -1 +0,0 @@
-Theme selector with visual previews of the theme
diff --git a/changelog.d/themes3-cache.add b/changelog.d/themes3-cache.add
deleted file mode 100644
index a275e44c..00000000
--- a/changelog.d/themes3-cache.add
+++ /dev/null
@@ -1 +0,0 @@
-Add caching system for themes3
diff --git a/changelog.d/themes3-fixes.fix b/changelog.d/themes3-fixes.fix
deleted file mode 100644
index 15c31e82..00000000
--- a/changelog.d/themes3-fixes.fix
+++ /dev/null
@@ -1 +0,0 @@
-fix color inputs and some in-development themes3 issues
diff --git a/changelog.d/themes3.change b/changelog.d/themes3.change
deleted file mode 100644
index 5255f9b1..00000000
--- a/changelog.d/themes3.change
+++ /dev/null
@@ -1 +0,0 @@
-Overhauled the way themes work, migrating to new Pleroma Interface Style Sheets system.
diff --git a/changelog.d/themesv3-on-safari.fix b/changelog.d/themesv3-on-safari.fix
deleted file mode 100644
index af767b3a..00000000
--- a/changelog.d/themesv3-on-safari.fix
+++ /dev/null
@@ -1 +0,0 @@
-Fix Themes v3 on Safari not working
diff --git a/changelog.d/ui-scale.add b/changelog.d/ui-scale.add
deleted file mode 100644
index 594a9aa5..00000000
--- a/changelog.d/ui-scale.add
+++ /dev/null
@@ -1 +0,0 @@
-Ability to resize UI (and certain components) scale independent of browser/text scale
diff --git a/changelog.d/unreads-sync.fix b/changelog.d/unreads-sync.fix
deleted file mode 100644
index 1eac3364..00000000
--- a/changelog.d/unreads-sync.fix
+++ /dev/null
@@ -1 +0,0 @@
-unread notifications should now properly catch up (eventually) in polling mode
diff --git a/changelog.d/user-overrides.add b/changelog.d/user-overrides.add
deleted file mode 100644
index c0cb839a..00000000
--- a/changelog.d/user-overrides.add
+++ /dev/null
@@ -1 +0,0 @@
-Ability to override certain aspects of UI style independent of theme used (UI roundness, fonts, underlay)
diff --git a/changelog.d/video-poster.fix b/changelog.d/video-poster.fix
deleted file mode 100644
index 43e95f6e..00000000
--- a/changelog.d/video-poster.fix
+++ /dev/null
@@ -1 +0,0 @@
-Video posters on Safari
diff --git a/changelog.d/video-poster.update.skip b/changelog.d/video-poster.update.skip
deleted file mode 100644
index 9dafe9be..00000000
--- a/changelog.d/video-poster.update.skip
+++ /dev/null
@@ -1 +0,0 @@
-nothing
diff --git a/changelog.d/web-push-always.add b/changelog.d/web-push-always.add
deleted file mode 100644
index f8b8888a..00000000
--- a/changelog.d/web-push-always.add
+++ /dev/null
@@ -1 +0,0 @@
-Added option to always "show" notifications when using web push for better compatibility with some browsers (chrome, edge, safari)