diff --git a/es-app/src/FileFilterIndex.cpp b/es-app/src/FileFilterIndex.cpp
index 3c63f03bf..760fb6ef6 100644
--- a/es-app/src/FileFilterIndex.cpp
+++ b/es-app/src/FileFilterIndex.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  FileFilterIndex.cpp
 //
 //  Gamelist filters.
diff --git a/es-app/src/FileFilterIndex.h b/es-app/src/FileFilterIndex.h
index a034a361e..10dc6e98f 100644
--- a/es-app/src/FileFilterIndex.h
+++ b/es-app/src/FileFilterIndex.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  FileFilterIndex.h
 //
 //  Gamelist filters.
diff --git a/es-app/src/FileSorts.cpp b/es-app/src/FileSorts.cpp
index 7db7f2e64..48b8b057e 100644
--- a/es-app/src/FileSorts.cpp
+++ b/es-app/src/FileSorts.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  FileSorts.cpp
 //
 //  Gamelist sorting functions.
diff --git a/es-app/src/FileSorts.h b/es-app/src/FileSorts.h
index e7f84346d..d12725d57 100644
--- a/es-app/src/FileSorts.h
+++ b/es-app/src/FileSorts.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  FileSorts.h
 //
 //  Gamelist sorting functions.
diff --git a/es-app/src/GamelistFileParser.cpp b/es-app/src/GamelistFileParser.cpp
index 35563cf6e..7958637ba 100644
--- a/es-app/src/GamelistFileParser.cpp
+++ b/es-app/src/GamelistFileParser.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GamelistFileParser.cpp
 //
 //  Parses and updates the gamelist.xml files.
diff --git a/es-app/src/GamelistFileParser.h b/es-app/src/GamelistFileParser.h
index 465c3e462..b53670711 100644
--- a/es-app/src/GamelistFileParser.h
+++ b/es-app/src/GamelistFileParser.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GamelistFileParser.h
 //
 //  Parses and updates the gamelist.xml files.
diff --git a/es-app/src/MediaViewer.cpp b/es-app/src/MediaViewer.cpp
index a975f7516..a682ce637 100644
--- a/es-app/src/MediaViewer.cpp
+++ b/es-app/src/MediaViewer.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MediaViewer.cpp
 //
 //  Fullscreen game media viewer.
diff --git a/es-app/src/MediaViewer.h b/es-app/src/MediaViewer.h
index d1a8789ec..fb36559cc 100644
--- a/es-app/src/MediaViewer.h
+++ b/es-app/src/MediaViewer.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MediaViewer.h
 //
 //  Fullscreen game media viewer.
diff --git a/es-app/src/MetaData.cpp b/es-app/src/MetaData.cpp
index 79d8a9efd..15072160a 100644
--- a/es-app/src/MetaData.cpp
+++ b/es-app/src/MetaData.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MetaData.cpp
 //
 //  Static data for default metadata values as well as functions
diff --git a/es-app/src/MetaData.h b/es-app/src/MetaData.h
index 4ae9fabe6..2384e165f 100644
--- a/es-app/src/MetaData.h
+++ b/es-app/src/MetaData.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MetaData.h
 //
 //  Static data for default metadata values as well as functions
diff --git a/es-app/src/MiximageGenerator.cpp b/es-app/src/MiximageGenerator.cpp
index 73a39ea0c..75bb65a4b 100644
--- a/es-app/src/MiximageGenerator.cpp
+++ b/es-app/src/MiximageGenerator.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MiximageGenerator.cpp
 //
 //  Generates miximages from screenshots, marquees, 3D boxes/covers and physical media images.
diff --git a/es-app/src/MiximageGenerator.h b/es-app/src/MiximageGenerator.h
index ffc7a7cfa..a1f501bcc 100644
--- a/es-app/src/MiximageGenerator.h
+++ b/es-app/src/MiximageGenerator.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MiximageGenerator.h
 //
 //  Generates miximages from screenshots, marquees, 3D boxes/covers and physical media images.
diff --git a/es-app/src/PDFViewer.cpp b/es-app/src/PDFViewer.cpp
index 67ef2b28d..a7f539656 100644
--- a/es-app/src/PDFViewer.cpp
+++ b/es-app/src/PDFViewer.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  PDFViewer.cpp
 //
 //  Parses and renders pages using the Poppler library via the external es-pdf-convert binary.
diff --git a/es-app/src/PDFViewer.h b/es-app/src/PDFViewer.h
index 8a1d82eba..735009a17 100644
--- a/es-app/src/PDFViewer.h
+++ b/es-app/src/PDFViewer.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  PDFViewer.h
 //
 //  Parses and renders pages using the Poppler library via the external es-pdf-convert binary.
diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 9b76d08e5..b427bbd78 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  PlatformId.cpp
 //
 //  Index of all supported systems/platforms.
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index dccaf987f..3520a090c 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  PlatformId.h
 //
 //  Index of all supported systems/platforms.
diff --git a/es-app/src/Screensaver.cpp b/es-app/src/Screensaver.cpp
index 3319922a7..85cc301b7 100644
--- a/es-app/src/Screensaver.cpp
+++ b/es-app/src/Screensaver.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  Screensaver.cpp
 //
 //  Screensaver, supporting the following types:
diff --git a/es-app/src/Screensaver.h b/es-app/src/Screensaver.h
index 30d123ba9..62b8134a8 100644
--- a/es-app/src/Screensaver.h
+++ b/es-app/src/Screensaver.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  Screensaver.h
 //
 //  Screensaver, supporting the following types:
diff --git a/es-app/src/UIModeController.cpp b/es-app/src/UIModeController.cpp
index 38af8c110..d7e62fa74 100644
--- a/es-app/src/UIModeController.cpp
+++ b/es-app/src/UIModeController.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  UIModeController.cpp
 //
 //  Handling of application user interface modes (full, kiosk and kid).
diff --git a/es-app/src/UIModeController.h b/es-app/src/UIModeController.h
index ccb7e78db..22d22133e 100644
--- a/es-app/src/UIModeController.h
+++ b/es-app/src/UIModeController.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  UIModeController.h
 //
 //  Handling of application user interface modes (full, kiosk and kid).
diff --git a/es-app/src/VolumeControl.cpp b/es-app/src/VolumeControl.cpp
index 0d240b9cd..3bf54b914 100644
--- a/es-app/src/VolumeControl.cpp
+++ b/es-app/src/VolumeControl.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  VolumeControl.cpp
 //
 //  Controls system audio volume.
diff --git a/es-app/src/VolumeControl.h b/es-app/src/VolumeControl.h
index 5b031afbb..e0526c34b 100644
--- a/es-app/src/VolumeControl.h
+++ b/es-app/src/VolumeControl.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  VolumeControl.h
 //
 //  Controls system audio volume.
diff --git a/es-app/src/guis/GuiAlternativeEmulators.cpp b/es-app/src/guis/GuiAlternativeEmulators.cpp
index ff504845c..264fd8622 100644
--- a/es-app/src/guis/GuiAlternativeEmulators.cpp
+++ b/es-app/src/guis/GuiAlternativeEmulators.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiAlternativeEmulators.cpp
 //
 //  User interface to select between alternative emulators per system
diff --git a/es-app/src/guis/GuiAlternativeEmulators.h b/es-app/src/guis/GuiAlternativeEmulators.h
index 9ac0bed92..c4b5c68f0 100644
--- a/es-app/src/guis/GuiAlternativeEmulators.h
+++ b/es-app/src/guis/GuiAlternativeEmulators.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiAlternativeEmulators.h
 //
 //  User interface to select between alternative emulators per system
diff --git a/es-app/src/guis/GuiCollectionSystemsOptions.cpp b/es-app/src/guis/GuiCollectionSystemsOptions.cpp
index 675ebe266..9c356c97a 100644
--- a/es-app/src/guis/GuiCollectionSystemsOptions.cpp
+++ b/es-app/src/guis/GuiCollectionSystemsOptions.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiCollectionSystemsOptions.cpp
 //
 //  User interface for the game collection settings.
diff --git a/es-app/src/guis/GuiCollectionSystemsOptions.h b/es-app/src/guis/GuiCollectionSystemsOptions.h
index 25317ddbf..2cf478989 100644
--- a/es-app/src/guis/GuiCollectionSystemsOptions.h
+++ b/es-app/src/guis/GuiCollectionSystemsOptions.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiCollectionSystemsOptions.h
 //
 //  User interface for the game collection settings.
diff --git a/es-app/src/guis/GuiGamelistFilter.cpp b/es-app/src/guis/GuiGamelistFilter.cpp
index fad712ec7..3964c36a0 100644
--- a/es-app/src/guis/GuiGamelistFilter.cpp
+++ b/es-app/src/guis/GuiGamelistFilter.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiGamelistFilter.cpp
 //
 //  User interface for the gamelist filters.
diff --git a/es-app/src/guis/GuiGamelistFilter.h b/es-app/src/guis/GuiGamelistFilter.h
index 4ba3f92a2..5ed1a1bb9 100644
--- a/es-app/src/guis/GuiGamelistFilter.h
+++ b/es-app/src/guis/GuiGamelistFilter.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiGamelistFilter.h
 //
 //  User interface for the gamelist filters.
diff --git a/es-app/src/guis/GuiGamelistOptions.cpp b/es-app/src/guis/GuiGamelistOptions.cpp
index e901779b4..e7c1e6a1e 100644
--- a/es-app/src/guis/GuiGamelistOptions.cpp
+++ b/es-app/src/guis/GuiGamelistOptions.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiGamelistOptions.cpp
 //
 //  Gamelist options menu for the 'Jump to...' quick selector,
diff --git a/es-app/src/guis/GuiGamelistOptions.h b/es-app/src/guis/GuiGamelistOptions.h
index a8292d91f..6cc01f9ba 100644
--- a/es-app/src/guis/GuiGamelistOptions.h
+++ b/es-app/src/guis/GuiGamelistOptions.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiGamelistOptions.h
 //
 //  Gamelist options menu for the 'Jump to...' quick selector,
diff --git a/es-app/src/guis/GuiLaunchScreen.cpp b/es-app/src/guis/GuiLaunchScreen.cpp
index 3c165b539..d9fc11f68 100644
--- a/es-app/src/guis/GuiLaunchScreen.cpp
+++ b/es-app/src/guis/GuiLaunchScreen.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiLaunchScreen.cpp
 //
 //  Screen shown when launching a game.
diff --git a/es-app/src/guis/GuiLaunchScreen.h b/es-app/src/guis/GuiLaunchScreen.h
index af24f4329..7f6590a50 100644
--- a/es-app/src/guis/GuiLaunchScreen.h
+++ b/es-app/src/guis/GuiLaunchScreen.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiLaunchScreen.h
 //
 //  Screen shown when launching a game.
diff --git a/es-app/src/guis/GuiMediaViewerOptions.cpp b/es-app/src/guis/GuiMediaViewerOptions.cpp
index 299471ed5..c6ba51c5b 100644
--- a/es-app/src/guis/GuiMediaViewerOptions.cpp
+++ b/es-app/src/guis/GuiMediaViewerOptions.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiMediaViewerOptions.cpp
 //
 //  User interface for the media viewer options.
diff --git a/es-app/src/guis/GuiMediaViewerOptions.h b/es-app/src/guis/GuiMediaViewerOptions.h
index 686c6ea12..dda7c362d 100644
--- a/es-app/src/guis/GuiMediaViewerOptions.h
+++ b/es-app/src/guis/GuiMediaViewerOptions.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiMediaViewerOptions.h
 //
 //  User interface for the media viewer options.
diff --git a/es-app/src/guis/GuiMetaDataEd.cpp b/es-app/src/guis/GuiMetaDataEd.cpp
index b302cd9b0..fffbed815 100644
--- a/es-app/src/guis/GuiMetaDataEd.cpp
+++ b/es-app/src/guis/GuiMetaDataEd.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiMetaDataEd.cpp
 //
 //  Game metadata edit user interface.
diff --git a/es-app/src/guis/GuiMetaDataEd.h b/es-app/src/guis/GuiMetaDataEd.h
index ca401ba46..f90410f08 100644
--- a/es-app/src/guis/GuiMetaDataEd.h
+++ b/es-app/src/guis/GuiMetaDataEd.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiMetaDataEd.h
 //
 //  Game metadata edit user interface.
diff --git a/es-app/src/guis/GuiOfflineGenerator.cpp b/es-app/src/guis/GuiOfflineGenerator.cpp
index f90cf8f81..98cde683d 100644
--- a/es-app/src/guis/GuiOfflineGenerator.cpp
+++ b/es-app/src/guis/GuiOfflineGenerator.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiOfflineGenerator.cpp
 //
 //  User interface for the miximage offline generator.
diff --git a/es-app/src/guis/GuiOfflineGenerator.h b/es-app/src/guis/GuiOfflineGenerator.h
index ff65e2dfc..f1dbd4174 100644
--- a/es-app/src/guis/GuiOfflineGenerator.h
+++ b/es-app/src/guis/GuiOfflineGenerator.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiOfflineGenerator.h
 //
 //  User interface for the miximage offline generator.
diff --git a/es-app/src/guis/GuiScraperMenu.cpp b/es-app/src/guis/GuiScraperMenu.cpp
index 2e5dc4036..14d120e4f 100644
--- a/es-app/src/guis/GuiScraperMenu.cpp
+++ b/es-app/src/guis/GuiScraperMenu.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiScraperMenu.cpp
 //
 //  Game media scraper, including settings as well as the scraping start button.
diff --git a/es-app/src/guis/GuiScraperMenu.h b/es-app/src/guis/GuiScraperMenu.h
index 096adffaf..4b2f5d717 100644
--- a/es-app/src/guis/GuiScraperMenu.h
+++ b/es-app/src/guis/GuiScraperMenu.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiScraperMenu.h
 //
 //  Game media scraper, including settings as well as the scraping start button.
diff --git a/es-app/src/guis/GuiScraperMulti.cpp b/es-app/src/guis/GuiScraperMulti.cpp
index db6aa0aa6..72a42e6e7 100644
--- a/es-app/src/guis/GuiScraperMulti.cpp
+++ b/es-app/src/guis/GuiScraperMulti.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiScraperMulti.cpp
 //
 //  Multiple game scraping user interface.
diff --git a/es-app/src/guis/GuiScraperMulti.h b/es-app/src/guis/GuiScraperMulti.h
index 1cb8ac4ad..ae0eadf14 100644
--- a/es-app/src/guis/GuiScraperMulti.h
+++ b/es-app/src/guis/GuiScraperMulti.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiScraperMulti.h
 //
 //  Multiple game scraping user interface.
diff --git a/es-app/src/guis/GuiScraperSearch.cpp b/es-app/src/guis/GuiScraperSearch.cpp
index 694b87f0d..905626eb4 100644
--- a/es-app/src/guis/GuiScraperSearch.cpp
+++ b/es-app/src/guis/GuiScraperSearch.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiScraperSearch.cpp
 //
 //  User interface for the scraper where the user is able to see an overview
diff --git a/es-app/src/guis/GuiScraperSearch.h b/es-app/src/guis/GuiScraperSearch.h
index 62ecc476d..69675ca46 100644
--- a/es-app/src/guis/GuiScraperSearch.h
+++ b/es-app/src/guis/GuiScraperSearch.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiScraperSearch.h
 //
 //  User interface for the scraper where the user is able to see an overview
diff --git a/es-app/src/guis/GuiScraperSingle.cpp b/es-app/src/guis/GuiScraperSingle.cpp
index 3675ee75e..00edf0cb6 100644
--- a/es-app/src/guis/GuiScraperSingle.cpp
+++ b/es-app/src/guis/GuiScraperSingle.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiScraperSingle.cpp
 //
 //  Single game scraping user interface.
diff --git a/es-app/src/guis/GuiScraperSingle.h b/es-app/src/guis/GuiScraperSingle.h
index 293b808e1..6f9b5093c 100644
--- a/es-app/src/guis/GuiScraperSingle.h
+++ b/es-app/src/guis/GuiScraperSingle.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiScraperSingle.h
 //
 //  Single game scraping user interface.
diff --git a/es-app/src/guis/GuiScreensaverOptions.cpp b/es-app/src/guis/GuiScreensaverOptions.cpp
index 30b4b8ead..ae061db14 100644
--- a/es-app/src/guis/GuiScreensaverOptions.cpp
+++ b/es-app/src/guis/GuiScreensaverOptions.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiScreensaverOptions.cpp
 //
 //  User interface for the screensaver options.
diff --git a/es-app/src/guis/GuiScreensaverOptions.h b/es-app/src/guis/GuiScreensaverOptions.h
index 74f47112f..a14be386e 100644
--- a/es-app/src/guis/GuiScreensaverOptions.h
+++ b/es-app/src/guis/GuiScreensaverOptions.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiScreensaverOptions.h
 //
 //  User interface for the screensaver options.
diff --git a/es-app/src/guis/GuiSettings.cpp b/es-app/src/guis/GuiSettings.cpp
index f2ae13079..013042cdb 100644
--- a/es-app/src/guis/GuiSettings.cpp
+++ b/es-app/src/guis/GuiSettings.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiSettings.cpp
 //
 //  User interface template for a settings GUI.
diff --git a/es-app/src/guis/GuiSettings.h b/es-app/src/guis/GuiSettings.h
index f8a24bf84..b27b85a28 100644
--- a/es-app/src/guis/GuiSettings.h
+++ b/es-app/src/guis/GuiSettings.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiSettings.h
 //
 //  User interface template for a settings GUI.
diff --git a/es-app/src/main.cpp b/es-app/src/main.cpp
index 840849b02..3cf0e370a 100644
--- a/es-app/src/main.cpp
+++ b/es-app/src/main.cpp
@@ -393,7 +393,7 @@ bool parseArguments(const std::vector<std::string>& arguments)
             std::cout <<
                 // clang-format off
 "Usage: es-de [options]\n"
-"ES-DE (EmulationStation Desktop Edition), Emulator Frontend\n\n"
+"ES-DE (ES-DE), Emulator Frontend\n\n"
 "Options:\n"
 "  --display [1 to 4]                    Display/monitor to use\n"
 "  --resolution [width] [height]         Application resolution\n"
diff --git a/es-app/src/scrapers/Scraper.cpp b/es-app/src/scrapers/Scraper.cpp
index c9c6c20ba..eb796c141 100644
--- a/es-app/src/scrapers/Scraper.cpp
+++ b/es-app/src/scrapers/Scraper.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  Scraper.cpp
 //
 //  Main scraper logic.
diff --git a/es-app/src/scrapers/Scraper.h b/es-app/src/scrapers/Scraper.h
index 660f4bd9b..7bbaff637 100644
--- a/es-app/src/scrapers/Scraper.h
+++ b/es-app/src/scrapers/Scraper.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  Scraper.h
 //
 //  Main scraper logic.
diff --git a/es-app/src/views/GamelistBase.cpp b/es-app/src/views/GamelistBase.cpp
index 980a252f1..caf575399 100644
--- a/es-app/src/views/GamelistBase.cpp
+++ b/es-app/src/views/GamelistBase.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GamelistBase.cpp
 //
 //  Gamelist base class with utility functions and other low-level logic.
diff --git a/es-app/src/views/GamelistBase.h b/es-app/src/views/GamelistBase.h
index 7453f89fa..be559f6ae 100644
--- a/es-app/src/views/GamelistBase.h
+++ b/es-app/src/views/GamelistBase.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GamelistBase.h
 //
 //  Gamelist base class with utility functions and other low-level logic.
diff --git a/es-app/src/views/GamelistView.cpp b/es-app/src/views/GamelistView.cpp
index fe7d22ae7..c1784a376 100644
--- a/es-app/src/views/GamelistView.cpp
+++ b/es-app/src/views/GamelistView.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GamelistView.cpp
 //
 //  Main gamelist logic.
diff --git a/es-app/src/views/GamelistView.h b/es-app/src/views/GamelistView.h
index 44f28a68d..fc6b14c02 100644
--- a/es-app/src/views/GamelistView.h
+++ b/es-app/src/views/GamelistView.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GamelistView.h
 //
 //  Main gamelist logic.
diff --git a/es-app/src/views/SystemView.cpp b/es-app/src/views/SystemView.cpp
index dee557371..d6a55df72 100644
--- a/es-app/src/views/SystemView.cpp
+++ b/es-app/src/views/SystemView.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  SystemView.cpp
 //
 //  Main system view.
diff --git a/es-app/src/views/SystemView.h b/es-app/src/views/SystemView.h
index e6331cdbc..9c044b40f 100644
--- a/es-app/src/views/SystemView.h
+++ b/es-app/src/views/SystemView.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  SystemView.h
 //
 //  Main system view.
diff --git a/es-core/src/AsyncHandle.h b/es-core/src/AsyncHandle.h
index 1b4c57349..e17aa1ce7 100644
--- a/es-core/src/AsyncHandle.h
+++ b/es-core/src/AsyncHandle.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  AsyncHandle.h
 //
 //  Asynchronous operations used by GuiScraperSearch and Scraper.
diff --git a/es-core/src/AudioManager.cpp b/es-core/src/AudioManager.cpp
index bfe69108e..0cf5d023e 100644
--- a/es-core/src/AudioManager.cpp
+++ b/es-core/src/AudioManager.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  AudioManager.cpp
 //
 //  Low-level audio functions (using SDL2).
diff --git a/es-core/src/AudioManager.h b/es-core/src/AudioManager.h
index d14b3b2a7..d274eb095 100644
--- a/es-core/src/AudioManager.h
+++ b/es-core/src/AudioManager.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  AudioManager.h
 //
 //  Low-level audio functions (using SDL2).
diff --git a/es-core/src/CECInput.cpp b/es-core/src/CECInput.cpp
index 8a2e2d50a..03d9bc5ad 100644
--- a/es-core/src/CECInput.cpp
+++ b/es-core/src/CECInput.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  CECInput.cpp
 //
 //  CEC (Consumer Electronics Control) input.
diff --git a/es-core/src/CECInput.h b/es-core/src/CECInput.h
index fbfaf3e3e..ab9643990 100644
--- a/es-core/src/CECInput.h
+++ b/es-core/src/CECInput.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  CECInput.h
 //
 //  CEC (Consumer Electronics Control) input.
diff --git a/es-core/src/GuiComponent.cpp b/es-core/src/GuiComponent.cpp
index d21707f15..9673ab874 100644
--- a/es-core/src/GuiComponent.cpp
+++ b/es-core/src/GuiComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiComponent.cpp
 //
 //  Basic GUI component handling such as placement, rotation, Z-order, rendering and animation.
diff --git a/es-core/src/GuiComponent.h b/es-core/src/GuiComponent.h
index 758229c49..bf83c26b0 100644
--- a/es-core/src/GuiComponent.h
+++ b/es-core/src/GuiComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiComponent.h
 //
 //  Basic GUI component handling such as placement, rotation, Z-order, rendering and animation.
diff --git a/es-core/src/HelpPrompt.h b/es-core/src/HelpPrompt.h
index d7f3c60b2..8188da2cc 100644
--- a/es-core/src/HelpPrompt.h
+++ b/es-core/src/HelpPrompt.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  HelpPrompt.h
 //
 //  Definition of the pair used by help prompts to display an icon and its mapped function.
diff --git a/es-core/src/HelpStyle.cpp b/es-core/src/HelpStyle.cpp
index 018ada998..eb0cba977 100644
--- a/es-core/src/HelpStyle.cpp
+++ b/es-core/src/HelpStyle.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  HelpStyle.cpp
 //
 //  Style (colors, position, icons etc.) for the help system.
diff --git a/es-core/src/HelpStyle.h b/es-core/src/HelpStyle.h
index 54b8f34b7..39f37a5ee 100644
--- a/es-core/src/HelpStyle.h
+++ b/es-core/src/HelpStyle.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  HelpStyle.h
 //
 //  Style (colors, position, icons etc.) for the help system.
diff --git a/es-core/src/HttpReq.cpp b/es-core/src/HttpReq.cpp
index 53d553f9a..bd82b7263 100644
--- a/es-core/src/HttpReq.cpp
+++ b/es-core/src/HttpReq.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  HttpReq.cpp
 //
 //  HTTP requests using libcurl.
diff --git a/es-core/src/HttpReq.h b/es-core/src/HttpReq.h
index 30adad51c..5aae2270c 100644
--- a/es-core/src/HttpReq.h
+++ b/es-core/src/HttpReq.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  HttpReq.h
 //
 //  HTTP requests using libcurl.
diff --git a/es-core/src/ImageIO.cpp b/es-core/src/ImageIO.cpp
index aa9ae36f5..6be6e60ca 100644
--- a/es-core/src/ImageIO.cpp
+++ b/es-core/src/ImageIO.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ImageIO.cpp
 //
 //  Image I/O functions.
diff --git a/es-core/src/ImageIO.h b/es-core/src/ImageIO.h
index 3fd62e267..dc83de247 100644
--- a/es-core/src/ImageIO.h
+++ b/es-core/src/ImageIO.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ImageIO.h
 //
 //  Image I/O functions.
diff --git a/es-core/src/InputConfig.cpp b/es-core/src/InputConfig.cpp
index 5959162a6..2cbfced0b 100644
--- a/es-core/src/InputConfig.cpp
+++ b/es-core/src/InputConfig.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  InputConfig.cpp
 //
 //  Input device configuration functions.
diff --git a/es-core/src/InputConfig.h b/es-core/src/InputConfig.h
index df34b11dd..d458b5ca0 100644
--- a/es-core/src/InputConfig.h
+++ b/es-core/src/InputConfig.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  InputConfig.h
 //
 //  Input device configuration functions.
diff --git a/es-core/src/Sound.cpp b/es-core/src/Sound.cpp
index 1c0484ee4..23bdad436 100644
--- a/es-core/src/Sound.cpp
+++ b/es-core/src/Sound.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  Sound.cpp
 //
 //  Higher-level audio functions.
diff --git a/es-core/src/Sound.h b/es-core/src/Sound.h
index eefa46ad7..22bae66a3 100644
--- a/es-core/src/Sound.h
+++ b/es-core/src/Sound.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  Sound.h
 //
 //  Higher-level audio functions.
diff --git a/es-core/src/animations/Animation.h b/es-core/src/animations/Animation.h
index 62c5a15f8..ac23926f0 100644
--- a/es-core/src/animations/Animation.h
+++ b/es-core/src/animations/Animation.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  Animation.h
 //
 //  Animation base class.
diff --git a/es-core/src/animations/AnimationController.cpp b/es-core/src/animations/AnimationController.cpp
index f951802ca..7c8533aa0 100644
--- a/es-core/src/animations/AnimationController.cpp
+++ b/es-core/src/animations/AnimationController.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  AnimationController.cpp
 //
 //  Basic animation controls.
diff --git a/es-core/src/animations/AnimationController.h b/es-core/src/animations/AnimationController.h
index a44d23072..ff64c6209 100644
--- a/es-core/src/animations/AnimationController.h
+++ b/es-core/src/animations/AnimationController.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  AnimationController.h
 //
 //  Basic animation controls.
diff --git a/es-core/src/animations/LambdaAnimation.h b/es-core/src/animations/LambdaAnimation.h
index a6dea3ec1..c4fddfcbf 100644
--- a/es-core/src/animations/LambdaAnimation.h
+++ b/es-core/src/animations/LambdaAnimation.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  LambdaAnimation.h
 //
 //  Custom animations, expressed as lambdas.
diff --git a/es-core/src/animations/MoveCameraAnimation.h b/es-core/src/animations/MoveCameraAnimation.h
index ca3e47e3d..728cd2a6c 100644
--- a/es-core/src/animations/MoveCameraAnimation.h
+++ b/es-core/src/animations/MoveCameraAnimation.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MoveCameraAnimation.h
 //
 //  Animation to play when moving the camera, used by the slide transition style.
diff --git a/es-core/src/components/AnimatedImageComponent.cpp b/es-core/src/components/AnimatedImageComponent.cpp
index 169be0e63..8e640ca32 100644
--- a/es-core/src/components/AnimatedImageComponent.cpp
+++ b/es-core/src/components/AnimatedImageComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  AnimatedImageComponent.cpp
 //
 //  Creates animation from multiple images files.
diff --git a/es-core/src/components/AnimatedImageComponent.h b/es-core/src/components/AnimatedImageComponent.h
index 396101afb..81622fcbd 100644
--- a/es-core/src/components/AnimatedImageComponent.h
+++ b/es-core/src/components/AnimatedImageComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  AnimatedImageComponent.h
 //
 //  Creates animation from multiple images files.
diff --git a/es-core/src/components/BadgeComponent.cpp b/es-core/src/components/BadgeComponent.cpp
index fa5fc95df..6673a7e8b 100644
--- a/es-core/src/components/BadgeComponent.cpp
+++ b/es-core/src/components/BadgeComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  BadgeComponent.cpp
 //
 //  Game badges icons.
diff --git a/es-core/src/components/BadgeComponent.h b/es-core/src/components/BadgeComponent.h
index e85dd0013..db26bf980 100644
--- a/es-core/src/components/BadgeComponent.h
+++ b/es-core/src/components/BadgeComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  BadgeComponent.h
 //
 //  Game badges icons.
diff --git a/es-core/src/components/BusyComponent.cpp b/es-core/src/components/BusyComponent.cpp
index 98e761198..56f915526 100644
--- a/es-core/src/components/BusyComponent.cpp
+++ b/es-core/src/components/BusyComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  BusyComponent.cpp
 //
 //  Animated busy indicator.
diff --git a/es-core/src/components/BusyComponent.h b/es-core/src/components/BusyComponent.h
index 4b7c54b8c..1a3cb5dcb 100644
--- a/es-core/src/components/BusyComponent.h
+++ b/es-core/src/components/BusyComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  BusyComponent.h
 //
 //  Animated busy indicator.
diff --git a/es-core/src/components/ButtonComponent.cpp b/es-core/src/components/ButtonComponent.cpp
index f7cbad97f..1fc36ff29 100644
--- a/es-core/src/components/ButtonComponent.cpp
+++ b/es-core/src/components/ButtonComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ButtonComponent.cpp
 //
 //  Basic on/off button.
diff --git a/es-core/src/components/ButtonComponent.h b/es-core/src/components/ButtonComponent.h
index afcbc1e21..af17cc3fc 100644
--- a/es-core/src/components/ButtonComponent.h
+++ b/es-core/src/components/ButtonComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ButtonComponent.h
 //
 //  Basic on/off button.
diff --git a/es-core/src/components/ComponentGrid.cpp b/es-core/src/components/ComponentGrid.cpp
index 1c6eb508c..507560eee 100644
--- a/es-core/src/components/ComponentGrid.cpp
+++ b/es-core/src/components/ComponentGrid.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ComponentGrid.cpp
 //
 //  Provides basic layout of components in an X*Y grid.
diff --git a/es-core/src/components/ComponentGrid.h b/es-core/src/components/ComponentGrid.h
index 0de281bee..41a471a4f 100644
--- a/es-core/src/components/ComponentGrid.h
+++ b/es-core/src/components/ComponentGrid.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ComponentGrid.h
 //
 //  Provides basic layout of components in an X*Y grid.
diff --git a/es-core/src/components/ComponentList.cpp b/es-core/src/components/ComponentList.cpp
index 5648ff6e5..f9debc3f1 100644
--- a/es-core/src/components/ComponentList.cpp
+++ b/es-core/src/components/ComponentList.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ComponentList.cpp
 //
 //  Used to lay out and navigate lists in GUI menus.
diff --git a/es-core/src/components/ComponentList.h b/es-core/src/components/ComponentList.h
index 489f7143d..c416f0452 100644
--- a/es-core/src/components/ComponentList.h
+++ b/es-core/src/components/ComponentList.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ComponentList.h
 //
 //  Used to lay out and navigate lists in GUI menus.
diff --git a/es-core/src/components/DateTimeComponent.cpp b/es-core/src/components/DateTimeComponent.cpp
index 72872ca63..6e99ae444 100644
--- a/es-core/src/components/DateTimeComponent.cpp
+++ b/es-core/src/components/DateTimeComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  DateTimeComponent.cpp
 //
 //  Provides the date and time, in absolute (actual date) or relative
diff --git a/es-core/src/components/DateTimeComponent.h b/es-core/src/components/DateTimeComponent.h
index c6d20a36c..a952e7b34 100644
--- a/es-core/src/components/DateTimeComponent.h
+++ b/es-core/src/components/DateTimeComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  DateTimeComponent.h
 //
 //  Provides the date and time, in absolute (actual date) or relative
diff --git a/es-core/src/components/DateTimeEditComponent.cpp b/es-core/src/components/DateTimeEditComponent.cpp
index 01d964a51..ca01cf237 100644
--- a/es-core/src/components/DateTimeEditComponent.cpp
+++ b/es-core/src/components/DateTimeEditComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  DateTimeEditComponent.cpp
 //
 //  Date and time edit component.
diff --git a/es-core/src/components/DateTimeEditComponent.h b/es-core/src/components/DateTimeEditComponent.h
index 4dbf33391..cfb58b7e3 100644
--- a/es-core/src/components/DateTimeEditComponent.h
+++ b/es-core/src/components/DateTimeEditComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  DateTimeEditComponent.h
 //
 //  Date and time edit component.
diff --git a/es-core/src/components/FlexboxComponent.cpp b/es-core/src/components/FlexboxComponent.cpp
index f086dca14..b7f666bee 100644
--- a/es-core/src/components/FlexboxComponent.cpp
+++ b/es-core/src/components/FlexboxComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  FlexboxComponent.cpp
 //
 //  Flexbox layout component.
diff --git a/es-core/src/components/FlexboxComponent.h b/es-core/src/components/FlexboxComponent.h
index 19deffe43..549f8a348 100644
--- a/es-core/src/components/FlexboxComponent.h
+++ b/es-core/src/components/FlexboxComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  FlexboxComponent.h
 //
 //  Flexbox layout component.
diff --git a/es-core/src/components/GIFAnimComponent.cpp b/es-core/src/components/GIFAnimComponent.cpp
index 3d3d3d2b6..bcfbd026e 100644
--- a/es-core/src/components/GIFAnimComponent.cpp
+++ b/es-core/src/components/GIFAnimComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GIFAnimComponent.cpp
 //
 //  Component to play GIF animations.
diff --git a/es-core/src/components/GIFAnimComponent.h b/es-core/src/components/GIFAnimComponent.h
index bf9fdacaf..d43efdb9e 100644
--- a/es-core/src/components/GIFAnimComponent.h
+++ b/es-core/src/components/GIFAnimComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GIFAnimComponent.h
 //
 //  Component to play GIF animations.
diff --git a/es-core/src/components/GameSelectorComponent.h b/es-core/src/components/GameSelectorComponent.h
index 2d957dc8a..d856943bc 100644
--- a/es-core/src/components/GameSelectorComponent.h
+++ b/es-core/src/components/GameSelectorComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GameSelectorComponent.h
 //
 //  Makes a selection of games based on theme-controlled criteria.
diff --git a/es-core/src/components/HelpComponent.cpp b/es-core/src/components/HelpComponent.cpp
index a766c5ebd..3bb36c882 100644
--- a/es-core/src/components/HelpComponent.cpp
+++ b/es-core/src/components/HelpComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  HelpComponent.cpp
 //
 //  Help information in icon and text pairs.
diff --git a/es-core/src/components/HelpComponent.h b/es-core/src/components/HelpComponent.h
index dfdc36abc..f55acadb8 100644
--- a/es-core/src/components/HelpComponent.h
+++ b/es-core/src/components/HelpComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  HelpComponent.h
 //
 //  Help information in icon and text pairs.
diff --git a/es-core/src/components/IList.h b/es-core/src/components/IList.h
index 1f85a5bab..fc5145223 100644
--- a/es-core/src/components/IList.h
+++ b/es-core/src/components/IList.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  IList.h
 //
 //  List base class, used by the system view, gamelist view and menu system.
diff --git a/es-core/src/components/ImageComponent.cpp b/es-core/src/components/ImageComponent.cpp
index 1b34f37c7..c48f5de10 100644
--- a/es-core/src/components/ImageComponent.cpp
+++ b/es-core/src/components/ImageComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ImageComponent.cpp
 //
 //  Handles images: loading, resizing, cropping, color shifting etc.
diff --git a/es-core/src/components/ImageComponent.h b/es-core/src/components/ImageComponent.h
index ed2747fc4..90c7a385b 100644
--- a/es-core/src/components/ImageComponent.h
+++ b/es-core/src/components/ImageComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ImageComponent.h
 //
 //  Handles images: loading, resizing, cropping, color shifting etc.
diff --git a/es-core/src/components/LottieAnimComponent.cpp b/es-core/src/components/LottieAnimComponent.cpp
index ce2b57490..8c92e0915 100644
--- a/es-core/src/components/LottieAnimComponent.cpp
+++ b/es-core/src/components/LottieAnimComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  LottieAnimComponent.cpp
 //
 //  Component to play Lottie animations using the rlottie library.
diff --git a/es-core/src/components/LottieAnimComponent.h b/es-core/src/components/LottieAnimComponent.h
index bae80e309..d96829941 100644
--- a/es-core/src/components/LottieAnimComponent.h
+++ b/es-core/src/components/LottieAnimComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  LottieAnimComponent.h
 //
 //  Component to play Lottie animations using the rlottie library.
diff --git a/es-core/src/components/MenuComponent.cpp b/es-core/src/components/MenuComponent.cpp
index bda94fced..8b40de4ae 100644
--- a/es-core/src/components/MenuComponent.cpp
+++ b/es-core/src/components/MenuComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MenuComponent.cpp
 //
 //  Basic component for building a menu.
diff --git a/es-core/src/components/MenuComponent.h b/es-core/src/components/MenuComponent.h
index 31f1dfbfe..cb6100e5f 100644
--- a/es-core/src/components/MenuComponent.h
+++ b/es-core/src/components/MenuComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MenuComponent.h
 //
 //  Basic component for building a menu.
diff --git a/es-core/src/components/NinePatchComponent.cpp b/es-core/src/components/NinePatchComponent.cpp
index 6a3b2ad6d..321422b61 100644
--- a/es-core/src/components/NinePatchComponent.cpp
+++ b/es-core/src/components/NinePatchComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  NinePatchComponent.cpp
 //
 //  Breaks up an image into 3x3 patches to accomodate resizing without distortions.
diff --git a/es-core/src/components/NinePatchComponent.h b/es-core/src/components/NinePatchComponent.h
index 010c231e5..d7473b5cc 100644
--- a/es-core/src/components/NinePatchComponent.h
+++ b/es-core/src/components/NinePatchComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  NinePatchComponent.h
 //
 //  Breaks up an image into 3x3 patches to accomodate resizing without distortions.
diff --git a/es-core/src/components/OptionListComponent.h b/es-core/src/components/OptionListComponent.h
index e8a38a908..14106ac6f 100644
--- a/es-core/src/components/OptionListComponent.h
+++ b/es-core/src/components/OptionListComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  OptionListComponent.h
 //
 //  Provides a list of option components.
diff --git a/es-core/src/components/RatingComponent.cpp b/es-core/src/components/RatingComponent.cpp
index 6523d85a6..6e1b39b21 100644
--- a/es-core/src/components/RatingComponent.cpp
+++ b/es-core/src/components/RatingComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  RatingComponent.cpp
 //
 //  Game rating icons.
diff --git a/es-core/src/components/RatingComponent.h b/es-core/src/components/RatingComponent.h
index e036e9b31..220f58458 100644
--- a/es-core/src/components/RatingComponent.h
+++ b/es-core/src/components/RatingComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  RatingComponent.h
 //
 //  Game rating icons.
diff --git a/es-core/src/components/ScrollIndicatorComponent.h b/es-core/src/components/ScrollIndicatorComponent.h
index f9913351b..efc55bb85 100644
--- a/es-core/src/components/ScrollIndicatorComponent.h
+++ b/es-core/src/components/ScrollIndicatorComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ScrollIndicatorComponent.h
 //
 //  Visually indicates whether a menu can be scrolled (up, up/down or down).
diff --git a/es-core/src/components/ScrollableContainer.cpp b/es-core/src/components/ScrollableContainer.cpp
index f64a1c8b4..14bd609e7 100644
--- a/es-core/src/components/ScrollableContainer.cpp
+++ b/es-core/src/components/ScrollableContainer.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ScrollableContainer.cpp
 //
 //  Component containing scrollable information, used for the game
diff --git a/es-core/src/components/ScrollableContainer.h b/es-core/src/components/ScrollableContainer.h
index 966b691c3..8b1e14844 100644
--- a/es-core/src/components/ScrollableContainer.h
+++ b/es-core/src/components/ScrollableContainer.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ScrollableContainer.h
 //
 //  Component containing scrollable information, used for the game
diff --git a/es-core/src/components/SliderComponent.cpp b/es-core/src/components/SliderComponent.cpp
index 00de12644..cbeef8e59 100644
--- a/es-core/src/components/SliderComponent.cpp
+++ b/es-core/src/components/SliderComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  SliderComponent.cpp
 //
 //  Slider to set value in a predefined range.
diff --git a/es-core/src/components/SliderComponent.h b/es-core/src/components/SliderComponent.h
index b83cb10e1..2f2188d6a 100644
--- a/es-core/src/components/SliderComponent.h
+++ b/es-core/src/components/SliderComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  SliderComponent.h
 //
 //  Slider to set value in a predefined range.
diff --git a/es-core/src/components/SwitchComponent.cpp b/es-core/src/components/SwitchComponent.cpp
index a7fc3031a..506533370 100644
--- a/es-core/src/components/SwitchComponent.cpp
+++ b/es-core/src/components/SwitchComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  SwitchComponent.cpp
 //
 //  Basic on/off switch used in menus.
diff --git a/es-core/src/components/SwitchComponent.h b/es-core/src/components/SwitchComponent.h
index 25a2dc8f0..6e02ec0be 100644
--- a/es-core/src/components/SwitchComponent.h
+++ b/es-core/src/components/SwitchComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  SwitchComponent.h
 //
 //  Basic on/off switch used in menus.
diff --git a/es-core/src/components/TextComponent.cpp b/es-core/src/components/TextComponent.cpp
index 0f4dc1f95..0ef5bb94a 100644
--- a/es-core/src/components/TextComponent.cpp
+++ b/es-core/src/components/TextComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextComponent.cpp
 //
 //  Displays text.
diff --git a/es-core/src/components/TextComponent.h b/es-core/src/components/TextComponent.h
index 7e180746b..d21d16a31 100644
--- a/es-core/src/components/TextComponent.h
+++ b/es-core/src/components/TextComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextComponent.h
 //
 //  Displays text.
diff --git a/es-core/src/components/TextEditComponent.cpp b/es-core/src/components/TextEditComponent.cpp
index a895f01e3..d58ee8499 100644
--- a/es-core/src/components/TextEditComponent.cpp
+++ b/es-core/src/components/TextEditComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextEditComponent.cpp
 //
 //  Component for editing text fields in menus.
diff --git a/es-core/src/components/TextEditComponent.h b/es-core/src/components/TextEditComponent.h
index a9e35fa06..a4c1fcb58 100644
--- a/es-core/src/components/TextEditComponent.h
+++ b/es-core/src/components/TextEditComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextEditComponent.h
 //
 //  Component for editing text fields in menus.
diff --git a/es-core/src/components/VideoComponent.cpp b/es-core/src/components/VideoComponent.cpp
index 8e8b2f9a5..d05e628a6 100644
--- a/es-core/src/components/VideoComponent.cpp
+++ b/es-core/src/components/VideoComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  VideoComponent.cpp
 //
 //  Base class for playing videos.
diff --git a/es-core/src/components/VideoComponent.h b/es-core/src/components/VideoComponent.h
index ccc4afe12..6095623bc 100644
--- a/es-core/src/components/VideoComponent.h
+++ b/es-core/src/components/VideoComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  VideoComponent.h
 //
 //  Base class for playing videos.
diff --git a/es-core/src/components/VideoFFmpegComponent.cpp b/es-core/src/components/VideoFFmpegComponent.cpp
index 0d255b373..b4f68bcd0 100644
--- a/es-core/src/components/VideoFFmpegComponent.cpp
+++ b/es-core/src/components/VideoFFmpegComponent.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  VideoFFmpegComponent.cpp
 //
 //  Video player based on FFmpeg.
diff --git a/es-core/src/components/VideoFFmpegComponent.h b/es-core/src/components/VideoFFmpegComponent.h
index e2294ce69..85ccdcf39 100644
--- a/es-core/src/components/VideoFFmpegComponent.h
+++ b/es-core/src/components/VideoFFmpegComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  VideoFFmpegComponent.h
 //
 //  Video player based on FFmpeg.
diff --git a/es-core/src/components/primary/CarouselComponent.h b/es-core/src/components/primary/CarouselComponent.h
index 9b57fce1f..76ba383de 100644
--- a/es-core/src/components/primary/CarouselComponent.h
+++ b/es-core/src/components/primary/CarouselComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  CarouselComponent.h
 //
 //  Carousel, usable in both the system and gamelist views.
diff --git a/es-core/src/components/primary/GridComponent.h b/es-core/src/components/primary/GridComponent.h
index f2bbd4214..40447e317 100644
--- a/es-core/src/components/primary/GridComponent.h
+++ b/es-core/src/components/primary/GridComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GridComponent.h
 //
 //  Grid, usable in both the system and gamelist views.
diff --git a/es-core/src/components/primary/PrimaryComponent.h b/es-core/src/components/primary/PrimaryComponent.h
index 5af99735c..613c3821e 100644
--- a/es-core/src/components/primary/PrimaryComponent.h
+++ b/es-core/src/components/primary/PrimaryComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  PrimaryComponent.h
 //
 //  Base class for the primary components (carousel, grid and textlist).
diff --git a/es-core/src/components/primary/TextListComponent.h b/es-core/src/components/primary/TextListComponent.h
index 204d4014b..bf2eadd4d 100644
--- a/es-core/src/components/primary/TextListComponent.h
+++ b/es-core/src/components/primary/TextListComponent.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextListComponent.h
 //
 //  Text list, usable in both the system and gamelist views.
diff --git a/es-core/src/guis/GuiDetectDevice.cpp b/es-core/src/guis/GuiDetectDevice.cpp
index 86762de32..f7056c90d 100644
--- a/es-core/src/guis/GuiDetectDevice.cpp
+++ b/es-core/src/guis/GuiDetectDevice.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiDetectDevice.cpp
 //
 //  Detect input devices (keyboards, joysticks and gamepads).
diff --git a/es-core/src/guis/GuiDetectDevice.h b/es-core/src/guis/GuiDetectDevice.h
index df8980cd2..d040e0ad4 100644
--- a/es-core/src/guis/GuiDetectDevice.h
+++ b/es-core/src/guis/GuiDetectDevice.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiDetectDevice.h
 //
 //  Detect input devices (keyboards, joysticks and gamepads).
diff --git a/es-core/src/guis/GuiInfoPopup.cpp b/es-core/src/guis/GuiInfoPopup.cpp
index c242e75b5..b07767f5b 100644
--- a/es-core/src/guis/GuiInfoPopup.cpp
+++ b/es-core/src/guis/GuiInfoPopup.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiInfoPopup.cpp
 //
 //  Popup window used for user notifications.
diff --git a/es-core/src/guis/GuiInfoPopup.h b/es-core/src/guis/GuiInfoPopup.h
index 8be3daa98..3f8dc120f 100644
--- a/es-core/src/guis/GuiInfoPopup.h
+++ b/es-core/src/guis/GuiInfoPopup.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiInfoPopup.h
 //
 //  Popup window used for user notifications.
diff --git a/es-core/src/guis/GuiInputConfig.cpp b/es-core/src/guis/GuiInputConfig.cpp
index ea45fe2fb..66a22d9c4 100644
--- a/es-core/src/guis/GuiInputConfig.cpp
+++ b/es-core/src/guis/GuiInputConfig.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiInputConfig.cpp
 //
 //  Input device configuration GUI (for keyboards, joysticks and gamepads).
diff --git a/es-core/src/guis/GuiInputConfig.h b/es-core/src/guis/GuiInputConfig.h
index f526c747d..5410cd6da 100644
--- a/es-core/src/guis/GuiInputConfig.h
+++ b/es-core/src/guis/GuiInputConfig.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiInputConfig.h
 //
 //  Input device configuration GUI (for keyboards, joysticks and gamepads).
diff --git a/es-core/src/guis/GuiMsgBox.cpp b/es-core/src/guis/GuiMsgBox.cpp
index 12ef4a155..eeed306db 100644
--- a/es-core/src/guis/GuiMsgBox.cpp
+++ b/es-core/src/guis/GuiMsgBox.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiMsgBox.cpp
 //
 //  Popup message dialog with a notification text and a choice of one,
diff --git a/es-core/src/guis/GuiMsgBox.h b/es-core/src/guis/GuiMsgBox.h
index c751eda65..ae60deeac 100644
--- a/es-core/src/guis/GuiMsgBox.h
+++ b/es-core/src/guis/GuiMsgBox.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiMsgBox.h
 //
 //  Popup message dialog with a notification text and a choice of one,
diff --git a/es-core/src/guis/GuiTextEditKeyboardPopup.cpp b/es-core/src/guis/GuiTextEditKeyboardPopup.cpp
index 43a5dfeed..fec7081fd 100644
--- a/es-core/src/guis/GuiTextEditKeyboardPopup.cpp
+++ b/es-core/src/guis/GuiTextEditKeyboardPopup.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiTextEditKeyboardPopup.cpp
 //
 //  Text edit popup with a virtual keyboard.
diff --git a/es-core/src/guis/GuiTextEditKeyboardPopup.h b/es-core/src/guis/GuiTextEditKeyboardPopup.h
index 5f6e4e208..b7708b353 100644
--- a/es-core/src/guis/GuiTextEditKeyboardPopup.h
+++ b/es-core/src/guis/GuiTextEditKeyboardPopup.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiTextEditKeyboardPopup.h
 //
 //  Text edit popup with a virtual keyboard.
diff --git a/es-core/src/guis/GuiTextEditPopup.cpp b/es-core/src/guis/GuiTextEditPopup.cpp
index 1565d23f1..7f975f3c9 100644
--- a/es-core/src/guis/GuiTextEditPopup.cpp
+++ b/es-core/src/guis/GuiTextEditPopup.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiTextEditPopup.cpp
 //
 //  Text edit popup.
diff --git a/es-core/src/guis/GuiTextEditPopup.h b/es-core/src/guis/GuiTextEditPopup.h
index f215b74b2..d1f29ca8c 100644
--- a/es-core/src/guis/GuiTextEditPopup.h
+++ b/es-core/src/guis/GuiTextEditPopup.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  GuiTextEditPopup.h
 //
 //  Text edit popup.
diff --git a/es-core/src/renderers/ShaderOpenGL.cpp b/es-core/src/renderers/ShaderOpenGL.cpp
index ffa4fe519..e2f7df5d4 100644
--- a/es-core/src/renderers/ShaderOpenGL.cpp
+++ b/es-core/src/renderers/ShaderOpenGL.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ShaderOpenGL.cpp
 //
 //  OpenGL / OpenGL ES shader functions.
diff --git a/es-core/src/renderers/ShaderOpenGL.h b/es-core/src/renderers/ShaderOpenGL.h
index 5216b9c9f..d94e3ab79 100644
--- a/es-core/src/renderers/ShaderOpenGL.h
+++ b/es-core/src/renderers/ShaderOpenGL.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  ShaderOpenGL.h
 //
 //  OpenGL / OpenGL ES shader functions.
diff --git a/es-core/src/resources/Font.cpp b/es-core/src/resources/Font.cpp
index 76e1ac960..5e6c3e00c 100644
--- a/es-core/src/resources/Font.cpp
+++ b/es-core/src/resources/Font.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  Font.h
 //
 //  Loading, unloading, caching and rendering of fonts.
diff --git a/es-core/src/resources/Font.h b/es-core/src/resources/Font.h
index 6e2b3a573..b46d37290 100644
--- a/es-core/src/resources/Font.h
+++ b/es-core/src/resources/Font.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  Font.h
 //
 //  Loading, unloading, caching and rendering of fonts.
diff --git a/es-core/src/resources/TextureData.cpp b/es-core/src/resources/TextureData.cpp
index b0caf0559..2ae4bd0b8 100644
--- a/es-core/src/resources/TextureData.cpp
+++ b/es-core/src/resources/TextureData.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextureData.cpp
 //
 //  Low-level texture data functions.
diff --git a/es-core/src/resources/TextureData.h b/es-core/src/resources/TextureData.h
index 1443c999c..e86f7a692 100644
--- a/es-core/src/resources/TextureData.h
+++ b/es-core/src/resources/TextureData.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextureData.h
 //
 //  Low-level texture data functions.
diff --git a/es-core/src/resources/TextureDataManager.cpp b/es-core/src/resources/TextureDataManager.cpp
index 321159321..4848d99c1 100644
--- a/es-core/src/resources/TextureDataManager.cpp
+++ b/es-core/src/resources/TextureDataManager.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextureDataManager.cpp
 //
 //  Loading and unloading of texture data.
diff --git a/es-core/src/resources/TextureDataManager.h b/es-core/src/resources/TextureDataManager.h
index 2a26de6ba..4b62e2a19 100644
--- a/es-core/src/resources/TextureDataManager.h
+++ b/es-core/src/resources/TextureDataManager.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextureDataManager.h
 //
 //  Loading and unloading of texture data.
diff --git a/es-core/src/resources/TextureResource.cpp b/es-core/src/resources/TextureResource.cpp
index dd9e1d5e4..dfc36f1b1 100644
--- a/es-core/src/resources/TextureResource.cpp
+++ b/es-core/src/resources/TextureResource.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextureResource.cpp
 //
 //  Handles textures including loading, unloading and cache management.
diff --git a/es-core/src/resources/TextureResource.h b/es-core/src/resources/TextureResource.h
index 2a23cbf6b..76ce69e5c 100644
--- a/es-core/src/resources/TextureResource.h
+++ b/es-core/src/resources/TextureResource.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TextureResource.h
 //
 //  Handles textures including loading, unloading and cache management.
diff --git a/es-core/src/utils/CImgUtil.cpp b/es-core/src/utils/CImgUtil.cpp
index b46106abe..80c0bd0e3 100644
--- a/es-core/src/utils/CImgUtil.cpp
+++ b/es-core/src/utils/CImgUtil.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  CImgUtil.cpp
 //
 //  Utility functions using the CImg image processing library.
diff --git a/es-core/src/utils/CImgUtil.h b/es-core/src/utils/CImgUtil.h
index 50b975958..29c36ea1e 100644
--- a/es-core/src/utils/CImgUtil.h
+++ b/es-core/src/utils/CImgUtil.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  CImgUtil.h
 //
 //  Utility functions using the CImg image processing library.
diff --git a/es-core/src/utils/MathUtil.cpp b/es-core/src/utils/MathUtil.cpp
index 9749f2c68..e7f65fe3b 100644
--- a/es-core/src/utils/MathUtil.cpp
+++ b/es-core/src/utils/MathUtil.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MathUtil.cpp
 //
 //  Math utility functions.
diff --git a/es-core/src/utils/MathUtil.h b/es-core/src/utils/MathUtil.h
index 9a18e046a..f4d70c973 100644
--- a/es-core/src/utils/MathUtil.h
+++ b/es-core/src/utils/MathUtil.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  MathUtil.h
 //
 //  Math utility functions.
diff --git a/es-core/src/utils/StringUtil.cpp b/es-core/src/utils/StringUtil.cpp
index 543ac26da..eb4707200 100644
--- a/es-core/src/utils/StringUtil.cpp
+++ b/es-core/src/utils/StringUtil.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  StringUtil.cpp
 //
 //  Low-level string functions.
diff --git a/es-core/src/utils/StringUtil.h b/es-core/src/utils/StringUtil.h
index 00aa3e5f1..67ef426cb 100644
--- a/es-core/src/utils/StringUtil.h
+++ b/es-core/src/utils/StringUtil.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  StringUtil.h
 //
 //  Low-level string functions.
diff --git a/es-core/src/utils/TimeUtil.cpp b/es-core/src/utils/TimeUtil.cpp
index 291e0c7dc..57600a48c 100644
--- a/es-core/src/utils/TimeUtil.cpp
+++ b/es-core/src/utils/TimeUtil.cpp
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TimeUtil.cpp
 //
 //  Low-level date and time functions.
diff --git a/es-core/src/utils/TimeUtil.h b/es-core/src/utils/TimeUtil.h
index 644bdf49f..01089718b 100644
--- a/es-core/src/utils/TimeUtil.h
+++ b/es-core/src/utils/TimeUtil.h
@@ -1,6 +1,6 @@
 //  SPDX-License-Identifier: MIT
 //
-//  EmulationStation Desktop Edition
+//  ES-DE
 //  TimeUtil.h
 //
 //  Low-level date and time functions.