diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt
index 0f1aecf08..a38b61316 100644
--- a/es-app/CMakeLists.txt
+++ b/es-app/CMakeLists.txt
@@ -1,96 +1,96 @@
 project("emulationstation-de")
 
 set(ES_HEADERS
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemsManager.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/EmulationStation.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreensaver.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemsManager.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.h
 
         # GUIs
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiCollectionSystemsOptions.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistFilter.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScreensaverOptions.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMenu.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMulti.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperSearch.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistFilter.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiCollectionSystemsOptions.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScreensaverOptions.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.h
 
         # Scrapers
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/Scraper.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraper.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraperResources.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/Scraper.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/ScreenScraper.h
 
         # Views
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/BasicGameListView.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/DetailedGameListView.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/GridGameListView.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/IGameListView.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/ISimpleGameListView.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/GridGameListView.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/VideoGameListView.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.h
 
         # Animations
         ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/MoveCameraAnimation.h
 )
 
 set(ES_SOURCES
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemsManager.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/FileData.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/FileSorts.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Gamelist.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/FileFilterIndex.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreensaver.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/CollectionSystemsManager.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.cpp
 
         # GUIs
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiCollectionSystemsOptions.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistFilter.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistOptions.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScreensaverOptions.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGameScraper.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMenu.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperMulti.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScraperSearch.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiGamelistFilter.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiCollectionSystemsOptions.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiScreensaverOptions.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.cpp
 
         # Scrapers
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/Scraper.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraper.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/GamesDBJSONScraperResources.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/Scraper.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/scrapers/ScreenScraper.cpp
 
         # Views
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/BasicGameListView.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/DetailedGameListView.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/GridGameListView.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/IGameListView.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/ISimpleGameListView.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/GridGameListView.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/gamelist/VideoGameListView.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.cpp
 )
 
 if(WIN32)
diff --git a/es-core/CMakeLists.txt b/es-core/CMakeLists.txt
index 0f9f56719..cdca4b917 100644
--- a/es-core/CMakeLists.txt
+++ b/es-core/CMakeLists.txt
@@ -31,8 +31,8 @@ set(CORE_HEADERS
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ComponentList.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/DateTimeComponent.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/DateTimeEditComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/HelpComponent.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/GridTileComponent.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/HelpComponent.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/IList.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ImageComponent.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ImageGridComponent.h
@@ -52,11 +52,11 @@ set(CORE_HEADERS
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoVlcComponent.h
 
         # GUIs
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiComplexTextEditPopup.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiDetectDevice.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInputConfig.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMsgBox.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiTextEditPopup.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiComplexTextEditPopup.h
 
         # Math
         ${CMAKE_CURRENT_SOURCE_DIR}/src/math/Misc.h
@@ -73,9 +73,9 @@ set(CORE_HEADERS
         # Resources
         ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/Font.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/ResourceManager.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureResource.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureData.h
         ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureDataManager.h
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureResource.h
 
         # Utils
         ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/FileSystemUtil.h
@@ -112,8 +112,8 @@ set(CORE_SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ComponentList.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/DateTimeComponent.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/DateTimeEditComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/HelpComponent.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/GridTileComponent.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/HelpComponent.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ImageComponent.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/MenuComponent.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/NinePatchComponent.cpp
@@ -129,11 +129,11 @@ set(CORE_SOURCES
         ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoVlcComponent.cpp
 
         # GUIs
+        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiComplexTextEditPopup.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiDetectDevice.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInputConfig.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMsgBox.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiTextEditPopup.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiComplexTextEditPopup.cpp
 
         # Math
         ${CMAKE_CURRENT_SOURCE_DIR}/src/math/Misc.cpp