diff --git a/CHANGELOG.md b/CHANGELOG.md
index 429272db5..a329017cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -46,7 +46,6 @@
 * Added scraper support for displaying the returned platform if it does not match the game platform, or if multiple platforms are defined for the system
 * Added scraping of fan art and updated the media viewer to display these images
 * Added scraping of box back covers when using TheGamesDB
-* Added fallback for high resolution marquee/wheel image for ScreenScraper if no regular wheel image was found
 * Moved the option "Scrape actual folders" higher up in the scraper options menu
 * Added the ability to set a manual sortname specifically for custom collections using the metadata editor
 * When scraping in semi-automatic mode, horizontal scrolling of long game names are no longer reset when automatically selecting the result
@@ -114,6 +113,22 @@
 * The device text flickered in GuiDetectDevice when configuring a controller
 * The selector bar was not aligned correctly during menu scale-up animations
 
+## Version 1.2.2 (in development)
+
+**Release date:** TBD
+
+### Release overview
+
+v1.2 maintenance release.
+
+### Detailed list of changes
+
+* Added fallback for high resolution marquee/wheel image for ScreenScraper if no regular wheel image was found
+
+### Bug fixes
+
+* Fixed a font loading crash caused by an insufficient font texture size
+
 ## Version 1.2.1
 
 **Release date:** 2022-03-30
diff --git a/THEMES-DEV.md b/THEMES-DEV.md
index a83af04ab..0e38f271c 100644
--- a/THEMES-DEV.md
+++ b/THEMES-DEV.md
@@ -2,6 +2,8 @@
 
 **Note:** This document is only relevant for the current ES-DE development version, if you would like to see the documentation for the latest stable release, refer to [THEMES.md](THEMES.md) instead.
 
+If creating theme sets specifically for ES-DE, please add `-DE` to the theme name, as in `rbsimple-DE`. Because ES-DE theme functionality has deviated greatly from the RetroPie EmulationStation fork on which it was originally based, any newer themes will not work on such older forks. It would be confusing and annoying for users that attempt to use ES-DE theme sets in older EmulationStation forks as they would get unthemed systems, crashes, error messages or corrupted graphics. At least the -DE extension is a visual indicator that it's an ES-DE specific theme set.
+
 Table of contents:
 
 [[_TOC_]]