diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5bf8cc34a..68fc3a983 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,9 +25,8 @@ set(CMAKE_VERBOSE_MAKEFILE OFF CACHE BOOL "Show verbose compiler output" FORCE)
 set(LINUX_CPACK_GENERATOR "DEB" CACHE STRING "CPack generator, DEB or RPM")
 
 # Add local find modules to the CMake path.
-list(APPEND CMAKE_MODULE_PATH
-        ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Utils
-        ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Packages)
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Utils
+                              ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Packages)
 
 # Define the options.
 option(GLES "Set to ON if targeting Embedded OpenGL" ${GLES})
@@ -39,14 +38,20 @@ option(CLANG_TIDY "Set to ON to build using the clang-tidy static analyzer" ${CL
 
 if(CLANG_TIDY)
     find_program(CLANG_TIDY_BINARY NAMES clang-tidy)
-    if("${CLANG_TIDY_BINARY}" STREQUAL "CLANG_TIDY_BINARY-NOTFOUND")
+    if(CLANG_TIDY_BINARY STREQUAL "CLANG_TIDY_BINARY-NOTFOUND")
         message("-- CLANG_TIDY was set but the clang-tidy binary was not found")
     else()
         message("-- Building with the clang-tidy static analyzer")
-        set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-checks=*,-fuchsia-*,-hicpp-*,-llvm-*, \
-                -readability-braces-*,-google-readability-braces-*, \
-                -readability-uppercase-literal-suffix,-modernize-use-trailing-return-type, \
-                -cppcoreguidelines-avoid-magic-numbers,-readability-magic-numbers")
+        set(CMAKE_CXX_CLANG_TIDY "clang-tidy;-checks=*,\
+                                  -fuchsia-*,\
+                                  -hicpp-*,\
+                                  -llvm-*,\
+                                  -readability-braces-*,\
+                                  -google-readability-braces-*,\
+                                  -readability-uppercase-literal-suffix,\
+                                  -modernize-use-trailing-return-type,\
+                                  -cppcoreguidelines-avoid-magic-numbers,\
+                                  -readability-magic-numbers")
     endif()
 endif()
 
@@ -59,19 +64,19 @@ if(EXISTS "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/bcm_host.h")
     # Setting BCMHOST seems to break OpenGL ES on the RPi 4 so set RPI instead.
     #set(BCMHOST found)
     set(RPI ON)
-    set(GLSystem "Embedded OpenGL" CACHE STRING "The OpenGL system to be used")
+    set(GLSYSTEM "Embedded OpenGL" CACHE STRING "The OpenGL system to be used")
 elseif(GLES OR RPI)
-    set(GLSystem "Embedded OpenGL" CACHE STRING "The OpenGL system to be used")
+    set(GLSYSTEM "Embedded OpenGL" CACHE STRING "The OpenGL system to be used")
 else()
-    set(GLSystem "Desktop OpenGL" CACHE STRING "The OpenGL system to be used")
+    set(GLSYSTEM "Desktop OpenGL" CACHE STRING "The OpenGL system to be used")
 endif()
 
-set_property(CACHE GLSystem PROPERTY STRINGS "Desktop OpenGL" "Embedded OpenGL")
+set_property(CACHE GLSYSTEM PROPERTY STRINGS "Desktop OpenGL" "Embedded OpenGL")
 
 #---------------------------------------------------------------------------------------------------
 # Package dependencies.
 
-if(${GLSystem} MATCHES "Desktop OpenGL")
+if(GLSYSTEM MATCHES "Desktop OpenGL")
     set(OpenGL_GL_PREFERENCE "GLVND")
     find_package(OpenGL REQUIRED)
 else()
@@ -98,27 +103,27 @@ if(CEC)
 endif()
 
 # Add ALSA for Linux.
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
     find_package(ALSA REQUIRED)
 endif()
 
 #---------------------------------------------------------------------------------------------------
 # Compiler and linker settings.
 
-if("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
     message("-- Compiler is Clang/LLVM")
-    if(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 5.0.0)
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0.0)
         message(SEND_ERROR "You need at least Clang 5.0.0 to compile EmulationStation-DE")
     endif()
-elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
     message("-- Compiler is GNU/GCC")
-    if(${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 7.1)
+    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.1)
         message(SEND_ERROR "You need at least GCC 7.1 to compile EmulationStation-DE")
     endif()
     if(WIN32)
         set(CMAKE_CXX_FLAGS "-mwindows ${CMAKE_CXX_FLAGS}")
     endif()
-elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
     message("-- Compiler is MSVC")
     # If using the MSVC compiler on Windows, disable the built-in min() and max() macros.
     add_definitions(-DNOMINMAX)
@@ -131,7 +136,7 @@ endif()
 # Set up compiler and linker flags for debug, profiling or release builds.
 if(CMAKE_BUILD_TYPE MATCHES Debug)
     # Enable the C++17 standard and disable optimizations as it's a debug build.
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Od /DEBUG:FULL")
     else()
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O0 -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers")
@@ -141,12 +146,12 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
     # Comment this out if you're using LLDB for debugging as this flag makes the binary
     # much larger and the application much slower. On macOS this setting is never enabled
     # as LLDB is the default debugger on this OS.
-    if(NOT APPLE AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+    if(NOT APPLE AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_GLIBCXX_DEBUG")
     endif()
 elseif(CMAKE_BUILD_TYPE MATCHES Profiling)
     # For the profiling build, we enable optimizations and supply the required profiler flags.
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /O2 /DEBUG:FULL")
     else()
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O2 -pg -g -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers")
@@ -155,7 +160,7 @@ elseif(CMAKE_BUILD_TYPE MATCHES Profiling)
 else()
     # Enable the C++17 standard and enable optimizations as it's a release build.
     # This will also disable all assert() macros. Strip the binary too.
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG /std:c++17 /O2 /DEBUG:NONE")
     else()
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O2 -DNDEBUG -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers")
@@ -178,7 +183,7 @@ if(APPLE)
     if(MACOS_CODESIGN_IDENTITY)
         message("-- Code signing certificate identity: " ${MACOS_CODESIGN_IDENTITY})
     endif()
-    if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_LESS 10.14)
+    if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.14)
         message("-- macOS version 10.13 or lower has been set, so if code signing is enabled, Hardened Runtime will not be used")
     endif()
 endif()
@@ -186,7 +191,7 @@ endif()
 #---------------------------------------------------------------------------------------------------
 # Preprocessor directives.
 
-if(${GLSystem} MATCHES "Desktop OpenGL")
+if(GLSYSTEM MATCHES "Desktop OpenGL")
     add_definitions(-DUSE_OPENGL_21)
 else()
     add_definitions(-DUSE_OPENGLES_10)
@@ -212,9 +217,9 @@ add_definitions(-DGLM_FORCE_XYZW_ONLY)
 # we use /usr on Linux, /usr/pkg on NetBSD and /usr/local on FreeBSD and OpenBSD.
 if(NOT WIN32 AND NOT APPLE)
     if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-        if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+        if(CMAKE_SYSTEM_NAME MATCHES "Linux")
             set(CMAKE_INSTALL_PREFIX "/usr" CACHE INTERNAL "CMAKE_INSTALL_PREFIX")
-        elseif(${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+        elseif(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
             set(CMAKE_INSTALL_PREFIX "/usr/pkg" CACHE INTERNAL "CMAKE_INSTALL_PREFIX")
         else()
             set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE INTERNAL "CMAKE_INSTALL_PREFIX")
@@ -233,18 +238,17 @@ endif()
 #---------------------------------------------------------------------------------------------------
 # Include files.
 
-set(COMMON_INCLUDE_DIRS
-        ${CURL_INCLUDE_DIR}
-        ${FFMPEG_INCLUDE_DIRS}
-        ${FreeImage_INCLUDE_DIRS}
-        ${FREETYPE_INCLUDE_DIRS}
-        ${PUGIXML_INCLUDE_DIRS}
-        ${RAPIDJSON_INCLUDE_DIRS}
-        ${SDL2_INCLUDE_DIR}
-        ${CMAKE_CURRENT_SOURCE_DIR}/external/CImg
-        ${CMAKE_CURRENT_SOURCE_DIR}/external/glm
-        ${CMAKE_CURRENT_SOURCE_DIR}/external/nanosvg/src
-        ${CMAKE_CURRENT_SOURCE_DIR}/es-core/src)
+set(COMMON_INCLUDE_DIRS ${CURL_INCLUDE_DIR}
+                        ${FFMPEG_INCLUDE_DIRS}
+                        ${FreeImage_INCLUDE_DIRS}
+                        ${FREETYPE_INCLUDE_DIRS}
+                        ${PUGIXML_INCLUDE_DIRS}
+                        ${RAPIDJSON_INCLUDE_DIRS}
+                        ${SDL2_INCLUDE_DIR}
+                        ${CMAKE_CURRENT_SOURCE_DIR}/external/CImg
+                        ${CMAKE_CURRENT_SOURCE_DIR}/external/glm
+                        ${CMAKE_CURRENT_SOURCE_DIR}/external/nanosvg/src
+                        ${CMAKE_CURRENT_SOURCE_DIR}/es-core/src)
 if(VLC_PLAYER)
     set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} ${VLC_INCLUDE_DIR})
 endif()
@@ -272,69 +276,65 @@ if(DEFINED libCEC_FOUND)
 endif()
 
 # For Linux, add the ALSA include directory.
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
     list(APPEND COMMON_INCLUDE_DIRS ${ALSA_INCLUDE_DIRS})
 endif()
 
 if(DEFINED BCMHOST OR RPI)
-    list(APPEND COMMON_INCLUDE_DIRS
-            "${CMAKE_FIND_ROOT_PATH}/opt/vc/include"
-            "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos"
-            "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vmcs_host/linux"
-            "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos/pthreads")
+    list(APPEND COMMON_INCLUDE_DIRS "${CMAKE_FIND_ROOT_PATH}/opt/vc/include"
+                                    "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos"
+                                    "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vmcs_host/linux"
+                                    "${CMAKE_FIND_ROOT_PATH}/opt/vc/include/interface/vcos/pthreads")
 endif()
 
 #---------------------------------------------------------------------------------------------------
 # Dependency libraries.
 
 if(NOT WIN32)
-    set(COMMON_LIBRARIES
-            ${CURL_LIBRARIES}
-            ${FFMPEG_LIBRARIES}
-            ${FreeImage_LIBRARIES}
-            ${FREETYPE_LIBRARIES}
-            ${PUGIXML_LIBRARIES}
-            ${SDL2_LIBRARY})
+    set(COMMON_LIBRARIES ${CURL_LIBRARIES}
+                         ${FFMPEG_LIBRARIES}
+                         ${FreeImage_LIBRARIES}
+                         ${FREETYPE_LIBRARIES}
+                         ${PUGIXML_LIBRARIES}
+                         ${SDL2_LIBRARY})
     if(VLC_PLAYER)
         set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${VLC_LIBRARIES})
     endif()
 elseif(WIN32)
     if(DEFINED MSVC)
-        set(COMMON_LIBRARIES
-                "${PROJECT_SOURCE_DIR}/avcodec.lib"
-                "${PROJECT_SOURCE_DIR}/avfilter.lib"
-                "${PROJECT_SOURCE_DIR}/avformat.lib"
-                "${PROJECT_SOURCE_DIR}/avutil.lib"
-                "${PROJECT_SOURCE_DIR}/swresample.lib"
-                "${PROJECT_SOURCE_DIR}/swscale.lib"
-                "${PROJECT_SOURCE_DIR}/FreeImage.lib"
-                "${PROJECT_SOURCE_DIR}/glew32.lib"
-                "${PROJECT_SOURCE_DIR}/libcurl-x64.lib"
-                "${PROJECT_SOURCE_DIR}/freetype.lib"
-                "${PROJECT_SOURCE_DIR}/pugixml.lib"
-                "${PROJECT_SOURCE_DIR}/SDL2main.lib"
-                "${PROJECT_SOURCE_DIR}/SDL2.lib"
-                "Winmm.dll")
+        set(COMMON_LIBRARIES "${PROJECT_SOURCE_DIR}/avcodec.lib"
+                             "${PROJECT_SOURCE_DIR}/avfilter.lib"
+                             "${PROJECT_SOURCE_DIR}/avformat.lib"
+                             "${PROJECT_SOURCE_DIR}/avutil.lib"
+                             "${PROJECT_SOURCE_DIR}/swresample.lib"
+                             "${PROJECT_SOURCE_DIR}/swscale.lib"
+                             "${PROJECT_SOURCE_DIR}/FreeImage.lib"
+                             "${PROJECT_SOURCE_DIR}/glew32.lib"
+                             "${PROJECT_SOURCE_DIR}/libcurl-x64.lib"
+                             "${PROJECT_SOURCE_DIR}/freetype.lib"
+                             "${PROJECT_SOURCE_DIR}/pugixml.lib"
+                             "${PROJECT_SOURCE_DIR}/SDL2main.lib"
+                             "${PROJECT_SOURCE_DIR}/SDL2.lib"
+                             "Winmm.dll")
         if(VLC_PLAYER)
             set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "${PROJECT_SOURCE_DIR}/libvlc.lib")
         endif()
     else()
-        set(COMMON_LIBRARIES
-                "${PROJECT_SOURCE_DIR}/avcodec-58.dll"
-                "${PROJECT_SOURCE_DIR}/avfilter-7.dll"
-                "${PROJECT_SOURCE_DIR}/avformat-58.dll"
-                "${PROJECT_SOURCE_DIR}/avutil-56.dll"
-                "${PROJECT_SOURCE_DIR}/swresample-3.dll"
-                "${PROJECT_SOURCE_DIR}/swscale-5.dll"
-                "${PROJECT_SOURCE_DIR}/FreeImage.dll"
-                "${PROJECT_SOURCE_DIR}/glew32.dll"
-                "${PROJECT_SOURCE_DIR}/libcurl-x64.dll"
-                "${PROJECT_SOURCE_DIR}/libfreetype.dll"
-                "${PROJECT_SOURCE_DIR}/libpugixml.dll"
-                "${PROJECT_SOURCE_DIR}/libSDL2main.a"
-                "${PROJECT_SOURCE_DIR}/SDL2.dll"
-                "mingw32"
-                "Winmm.dll")
+        set(COMMON_LIBRARIES "${PROJECT_SOURCE_DIR}/avcodec-58.dll"
+                             "${PROJECT_SOURCE_DIR}/avfilter-7.dll"
+                             "${PROJECT_SOURCE_DIR}/avformat-58.dll"
+                             "${PROJECT_SOURCE_DIR}/avutil-56.dll"
+                             "${PROJECT_SOURCE_DIR}/swresample-3.dll"
+                             "${PROJECT_SOURCE_DIR}/swscale-5.dll"
+                             "${PROJECT_SOURCE_DIR}/FreeImage.dll"
+                             "${PROJECT_SOURCE_DIR}/glew32.dll"
+                             "${PROJECT_SOURCE_DIR}/libcurl-x64.dll"
+                             "${PROJECT_SOURCE_DIR}/libfreetype.dll"
+                             "${PROJECT_SOURCE_DIR}/libpugixml.dll"
+                             "${PROJECT_SOURCE_DIR}/libSDL2main.a"
+                             "${PROJECT_SOURCE_DIR}/SDL2.dll"
+                             "mingw32"
+                             "Winmm.dll")
         if(VLC_PLAYER)
             set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "${PROJECT_SOURCE_DIR}/libvlc.dll")
         endif()
@@ -342,15 +342,13 @@ elseif(WIN32)
 endif()
 
 if(APPLE)
-    # See es-app/CMakeLists.txt for an explation for why an extra 'Resources' directory
+    # See es-app/CMakeLists.txt for an explation for why an extra "Resources" directory
     # has been added to the install prefix.
-    set(CMAKE_INSTALL_PREFIX
-            "/Applications/EmulationStation Desktop Edition.app/Contents/Resources")
+    set(CMAKE_INSTALL_PREFIX "/Applications/EmulationStation Desktop Edition.app/Contents/Resources")
 
     if(VLC_PLAYER)
         # Required as the VLC find module doesn't work properly on macOS.
-        set(COMMON_LIBRARIES ${COMMON_LIBRARIES}
-                "/Applications/VLC.app/Contents/MacOS/lib/libvlc.dylib")
+        set(COMMON_LIBRARIES ${COMMON_LIBRARIES} "/Applications/VLC.app/Contents/MacOS/lib/libvlc.dylib")
     endif()
 
     # Set the same rpath links for the install executable as for the build executable.
@@ -368,7 +366,7 @@ if(DEFINED libCEC_FOUND)
 endif()
 
 # Add ALSA for Linux libraries.
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
     list(APPEND COMMON_LIBRARIES ${ALSA_LIBRARY})
 endif()
 
@@ -380,7 +378,7 @@ elseif(RPI)
     list(APPEND COMMON_LIBRARIES ${OPENGLES_LIBRARIES})
 endif()
 
-if(${GLSystem} MATCHES "Desktop OpenGL")
+if(GLSYSTEM MATCHES "Desktop OpenGL")
     list(APPEND COMMON_LIBRARIES ${OPENGL_LIBRARIES})
 else()
     list(APPEND COMMON_LIBRARIES EGL ${OPENGLES_LIBRARIES})
diff --git a/es-app/CMakeLists.txt b/es-app/CMakeLists.txt
index 80eb81d58..9f4dbe7e1 100644
--- a/es-app/CMakeLists.txt
+++ b/es-app/CMakeLists.txt
@@ -10,105 +10,105 @@
 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/MediaViewer.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/MiximageGenerator.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreensaver.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.h
+    ${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/MediaViewer.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/MiximageGenerator.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreensaver.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.h
 
-        # GUIs
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiAlternativeEmulators.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/GuiGameScraper.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiLaunchScreen.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMediaViewerOptions.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiOfflineGenerator.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/GuiScreensaverOptions.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.h
+    # GUIs
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiAlternativeEmulators.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/GuiGameScraper.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiLaunchScreen.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMediaViewerOptions.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiOfflineGenerator.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/GuiScreensaverOptions.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.h
 
-        # Scrapers
-        ${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
+    # Scrapers
+    ${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/VideoGameListView.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.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/VideoGameListView.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.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/MediaViewer.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/MiximageGenerator.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreensaver.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.cpp
+    ${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/MediaViewer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/MetaData.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/MiximageGenerator.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/PlatformId.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemData.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/SystemScreensaver.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/VolumeControl.cpp
 
-        # GUIs
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiAlternativeEmulators.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/GuiGameScraper.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiLaunchScreen.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMediaViewerOptions.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiOfflineGenerator.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/GuiScreensaverOptions.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.cpp
+    # GUIs
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiAlternativeEmulators.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/GuiGameScraper.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiInfoPopup.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiLaunchScreen.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMenu.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMediaViewerOptions.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiMetaDataEd.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiOfflineGenerator.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/GuiScreensaverOptions.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiSettings.cpp
 
-        # Scrapers
-        ${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
+    # Scrapers
+    ${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/VideoGameListView.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.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/VideoGameListView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/views/SystemView.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/views/UIModeController.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/views/ViewController.cpp
 )
 
 if(WIN32)
@@ -134,20 +134,48 @@ endif()
 # Setup for installation and package generation.
 if(WIN32)
     install(TARGETS EmulationStation RUNTIME DESTINATION .)
-    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
-        install(FILES ../avcodec-58.dll ../avfilter-7.dll ../avformat-58.dll ../avutil-56.dll
-                ../postproc-55.dll ../swresample-3.dll ../swscale-5.dll ../FreeImage.dll
-                ../glew32.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll ../freetype.dll
-                ../pugixml.dll ../libssl-1_1-x64.dll ../SDL2.dll ../MSVCP140.dll ../VCOMP140.DLL
-                ../VCRUNTIME140.dll ../VCRUNTIME140_1.dll DESTINATION .)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+        install(FILES ../avcodec-58.dll
+                      ../avfilter-7.dll
+                      ../avformat-58.dll
+                      ../avutil-56.dll
+                      ../postproc-55.dll
+                      ../swresample-3.dll
+                      ../swscale-5.dll
+                      ../FreeImage.dll
+                      ../freetype.dll
+                      ../glew32.dll
+                      ../libcrypto-1_1-x64.dll
+                      ../libcurl-x64.dll
+                      ../libssl-1_1-x64.dll
+                      ../MSVCP140.dll
+                      ../pugixml.dll
+                      ../SDL2.dll
+                      ../VCOMP140.DLL
+                      ../VCRUNTIME140.dll
+                      ../VCRUNTIME140_1.dll
+                      DESTINATION .)
         if(VLC_PLAYER)
             install(FILES ../libvlc.dll ../libvlccore.dll DESTINATION .)
         endif()
     else()
-        install(FILES ../avcodec-58.dll ../avfilter-7.dll ../avformat-58.dll ../avutil-56.dll
-                ../postproc-55.dll ../swresample-3.dll ../swscale-5.dll ../FreeImage.dll
-                ../glew32.dll ../libcrypto-1_1-x64.dll ../libcurl-x64.dll ../libfreetype.dll
-                ../libpugixml.dll ../libssl-1_1-x64.dll ../SDL2.dll ../vcomp140.dll DESTINATION .)
+        install(FILES ../avcodec-58.dll
+                      ../avfilter-7.dll
+                      ../avformat-58.dll
+                      ../avutil-56.dll
+                      ../postproc-55.dll
+                      ../swresample-3.dll
+                      ../swscale-5.dll
+                      ../FreeImage.dll
+                      ../glew32.dll
+                      ../libcrypto-1_1-x64.dll
+                      ../libcurl-x64.dll
+                      ../libfreetype.dll
+                      ../libpugixml.dll
+                      ../libssl-1_1-x64.dll
+                      ../SDL2.dll
+                      ../vcomp140.dll
+                      DESTINATION .)
         if(VLC_PLAYER)
             install(FILES ../libvlc.dll ../libvlccore.dll DESTINATION .)
         endif()
@@ -166,12 +194,9 @@ elseif(APPLE)
     # So an extra 'Resources' directory was added to the CMAKE_INSTALL_PREFIX variable as well
     # to compensate for this. It's a bad solution to the problem and there must surely be a
     # better way to fix this.
-    install(TARGETS EmulationStation RUNTIME
-            DESTINATION ../MacOS)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE.icns
-            DESTINATION ../Resources)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_Info.plist
-            DESTINATION .. RENAME Info.plist)
+    install(TARGETS EmulationStation RUNTIME DESTINATION ../MacOS)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE.icns DESTINATION ../Resources)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_Info.plist DESTINATION .. RENAME Info.plist)
 
     # Another hack/workaround. I have not been able to find any way whatsover to force the
     # linker to use rpaths for all shared libraries instead of absolute paths. So instead
@@ -181,84 +206,81 @@ elseif(APPLE)
     # on your system (e.g. if using libSDL2-2.1.0.dylib instead of libSDL2-2.0.0.dylib).
     # This problem definitely needs to be resolved properly at a later date.
     add_custom_command(TARGET EmulationStation POST_BUILD COMMAND ${CMAKE_INSTALL_NAME_TOOL}
-            -change /usr/local/lib/libavcodec.58.dylib @rpath/libavcodec.58.dylib
-            -change /usr/local/lib/libavfilter.7.dylib @rpath/libavfilter.7.dylib
-            -change /usr/local/lib/libavformat.58.dylib @rpath/libavformat.58.dylib
-            -change /usr/local/lib/libavutil.56.dylib @rpath/libavutil.56.dylib
-            -change /usr/local/lib/libswresample.3.dylib @rpath/libswresample.3.dylib
-            -change /usr/local/lib/libswscale.5.dylib @rpath/libswscale.5.dylib
-            -change /usr/local/opt/freeimage/lib/libfreeimage.dylib @rpath/libfreeimage.dylib
-            -change /usr/local/opt/freetype/lib/libfreetype.6.dylib @rpath/libfreetype.6.dylib
-            -change /usr/local/opt/libpng/lib/libpng16.16.dylib @rpath/libpng16.16.dylib
-            -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @rpath/libSDL2-2.0.0.dylib
-            $<TARGET_FILE:EmulationStation>)
-    set(APPLE_DYLIB_PERMISSIONS
-            OWNER_WRITE OWNER_READ OWNER_EXECUTE
-            GROUP_READ GROUP_EXECUTE
-            WORLD_READ WORLD_EXECUTE)
+                       -change /usr/local/lib/libavcodec.58.dylib @rpath/libavcodec.58.dylib
+                       -change /usr/local/lib/libavfilter.7.dylib @rpath/libavfilter.7.dylib
+                       -change /usr/local/lib/libavformat.58.dylib @rpath/libavformat.58.dylib
+                       -change /usr/local/lib/libavutil.56.dylib @rpath/libavutil.56.dylib
+                       -change /usr/local/lib/libswresample.3.dylib @rpath/libswresample.3.dylib
+                       -change /usr/local/lib/libswscale.5.dylib @rpath/libswscale.5.dylib
+                       -change /usr/local/opt/freeimage/lib/libfreeimage.dylib @rpath/libfreeimage.dylib
+                       -change /usr/local/opt/freetype/lib/libfreetype.6.dylib @rpath/libfreetype.6.dylib
+                       -change /usr/local/opt/libpng/lib/libpng16.16.dylib @rpath/libpng16.16.dylib
+                       -change /usr/local/opt/sdl2/lib/libSDL2-2.0.0.dylib @rpath/libSDL2-2.0.0.dylib
+                       $<TARGET_FILE:EmulationStation>)
+
+    set(APPLE_DYLIB_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE
+                                GROUP_READ GROUP_EXECUTE
+                                WORLD_READ WORLD_EXECUTE)
 
     install(FILES ${CMAKE_SOURCE_DIR}/libavcodec.58.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libavfilter.7.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libavformat.58.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libavutil.56.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libpostproc.55.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libswresample.3.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libswscale.5.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libfdk-aac.2.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libfreeimage.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libfreetype.6.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libpng16.16.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
     install(FILES ${CMAKE_SOURCE_DIR}/libSDL2-2.0.0.dylib
-            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+        PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+
     if(VLC_PLAYER)
         install(FILES ${CMAKE_SOURCE_DIR}/libvlc.dylib
-                PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
         install(FILES ${CMAKE_SOURCE_DIR}/libvlccore.dylib
-                PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
+            PERMISSIONS ${APPLE_DYLIB_PERMISSIONS} DESTINATION ../MacOS)
         install(DIRECTORY ${CMAKE_SOURCE_DIR}/plugins
-                DESTINATION ../MacOS)
+            DESTINATION ../MacOS)
     endif()
-    install(FILES ${CMAKE_SOURCE_DIR}/LICENSE
-            DESTINATION ../Resources)
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources
-            DESTINATION ../Resources)
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes
-                   DESTINATION ../Resources)
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses
-            DESTINATION ../Resources)
+
+    install(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION ../Resources)
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources DESTINATION ../Resources)
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION ../Resources)
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses DESTINATION ../Resources)
 else()
-    install(TARGETS emulationstation RUNTIME
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-    if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    install(TARGETS emulationstation RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+    if(CMAKE_SYSTEM_NAME MATCHES "Linux")
         install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.6.gz
-                DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man6)
     else()
         install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.6.gz
-                DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6)
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man6)
     endif()
     install(FILES ${CMAKE_SOURCE_DIR}/LICENSE
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.desktop
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications)
     install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/emulationstation.svg
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/pixmaps)
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/licenses
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
     install(DIRECTORY ${CMAKE_SOURCE_DIR}/resources
-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/emulationstation)
 endif()
 
 include(InstallRequiredSystemLibraries)
@@ -295,7 +317,7 @@ endif()
 # Settings per operating system and generator type.
 if(APPLE)
     set(CPACK_GENERATOR "Bundle")
-    if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_LESS 10.14)
+    if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS 10.14)
         set(CPACK_PACKAGE_FILE_NAME "EmulationStation-DE-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}_legacy")
         set(CPACK_DMG_VOLUME_NAME "EmulationStation Desktop Edition ${CPACK_PACKAGE_VERSION}_legacy")
     else()
@@ -309,7 +331,7 @@ if(APPLE)
     set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/assets/EmulationStation-DE_Info.plist")
     if(MACOS_CODESIGN_IDENTITY)
         set(CPACK_BUNDLE_APPLE_CERT_APP "Developer ID Application: ${MACOS_CODESIGN_IDENTITY}")
-        if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_GREATER 10.13)
+        if(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_GREATER 10.13)
             set(CPACK_BUNDLE_APPLE_CODESIGN_PARAMETER "--deep --force --options runtime")
         endif()
     endif()
@@ -332,7 +354,7 @@ elseif(WIN32)
 else()
     set(CPACK_PACKAGE_INSTALL_DIRECTORY "emulationstation_${CMAKE_PACKAGE_VERSION}")
     set(CPACK_PACKAGE_EXECUTABLES "emulationstation" "emulationstation")
-    if("${LINUX_CPACK_GENERATOR}" STREQUAL "DEB")
+    if(LINUX_CPACK_GENERATOR STREQUAL "DEB")
         set(CPACK_GENERATOR "DEB")
     endif()
     set(CPACK_DEBIAN_FILE_NAME "emulationstation-de-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}.deb")
@@ -344,7 +366,7 @@ else()
         set(CPACK_DEBIAN_PACKAGE_DEPENDS "vlc")
     endif()
     set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-    if("${LINUX_CPACK_GENERATOR}" STREQUAL "RPM")
+    if(LINUX_CPACK_GENERATOR STREQUAL "RPM")
         set(CPACK_GENERATOR "RPM")
     endif()
     set(CPACK_RPM_FILE_NAME "emulationstation-de-${CPACK_PACKAGE_VERSION}-${CPU_ARCHITECTURE}.rpm")
diff --git a/es-core/CMakeLists.txt b/es-core/CMakeLists.txt
index 43260823d..8bb6500ed 100644
--- a/es-core/CMakeLists.txt
+++ b/es-core/CMakeLists.txt
@@ -9,152 +9,152 @@
 project("core")
 
 set(CORE_HEADERS
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/AsyncHandle.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/AudioManager.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/CECInput.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/GuiComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/HelpStyle.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/HttpReq.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/ImageIO.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/InputConfig.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/InputManager.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Log.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/MameNames.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Platform.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Settings.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Sound.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/ThemeData.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Window.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/AsyncHandle.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/AudioManager.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/CECInput.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/GuiComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/HelpStyle.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/HttpReq.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/ImageIO.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/InputConfig.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/InputManager.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Log.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/MameNames.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Platform.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Settings.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Sound.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/ThemeData.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Window.h
 
-        # Animations
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/Animation.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/AnimationController.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/LambdaAnimation.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/MoveCameraAnimation.h
+    # Animations
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/Animation.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/AnimationController.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/LambdaAnimation.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/MoveCameraAnimation.h
 
-        # GUI components
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/AnimatedImageComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/BusyComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ButtonComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ComponentGrid.h
-        ${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/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
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/MenuComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/NinePatchComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/OptionListComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/RatingComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ScrollableContainer.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/SliderComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/SwitchComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextEditComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextListComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoFFmpegComponent.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoVlcComponent.h
+    # GUI components
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/AnimatedImageComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/BusyComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ButtonComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ComponentGrid.h
+    ${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/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
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/MenuComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/NinePatchComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/OptionListComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/RatingComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ScrollableContainer.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/SliderComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/SwitchComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextEditComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextListComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoFFmpegComponent.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoVlcComponent.h
 
-        # GUIs
-        ${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/GuiTextEditKeyboardPopup.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiTextEditPopup.h
+    # GUIs
+    ${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/GuiTextEditKeyboardPopup.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiTextEditPopup.h
 
-        # Renderers
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Renderer.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Shader_GL21.h
+    # Renderers
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Renderer.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Shader_GL21.h
 
-        # Resources
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/Font.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/ResourceManager.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
+    # Resources
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/Font.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/ResourceManager.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/CImgUtil.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/FileSystemUtil.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/MathUtil.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/StringUtil.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/TimeUtil.h
+    # Utils
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/CImgUtil.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/FileSystemUtil.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/MathUtil.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/StringUtil.h
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/TimeUtil.h
 )
 
 set(CORE_SOURCES
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/AudioManager.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/CECInput.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/GuiComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/HelpStyle.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/HttpReq.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/ImageIO.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/InputConfig.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/InputManager.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Log.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/MameNames.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Platform.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Scripting.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Settings.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Sound.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/ThemeData.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/Window.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/AudioManager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/CECInput.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/GuiComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/HelpStyle.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/HttpReq.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/ImageIO.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/InputConfig.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/InputManager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Log.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/MameNames.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Platform.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Scripting.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Settings.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Sound.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/ThemeData.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/Window.cpp
 
-        # Animations
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/AnimationController.cpp
+    # Animations
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/animations/AnimationController.cpp
 
-        # GUI components
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/AnimatedImageComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/BusyComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ButtonComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ComponentGrid.cpp
-        ${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/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
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/RatingComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ScrollableContainer.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/SliderComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/SwitchComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextEditComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoFFmpegComponent.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoVlcComponent.cpp
+    # GUI components
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/AnimatedImageComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/BusyComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ButtonComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ComponentGrid.cpp
+    ${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/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
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/RatingComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/ScrollableContainer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/SliderComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/SwitchComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/TextEditComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoFFmpegComponent.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/components/VideoVlcComponent.cpp
 
-        # GUIs
-        ${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/GuiTextEditKeyboardPopup.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiTextEditPopup.cpp
+    # GUIs
+    ${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/GuiTextEditKeyboardPopup.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/guis/GuiTextEditPopup.cpp
 
-        # Renderer
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Renderer.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Renderer_GL21.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Renderer_GLES10.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Shader_GL21.cpp
+    # Renderer
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Renderer.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Renderer_GL21.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Renderer_GLES10.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/renderers/Shader_GL21.cpp
 
-        # Resources
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/Font.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/ResourceManager.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureResource.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureData.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureDataManager.cpp
+    # Resources
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/Font.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/ResourceManager.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureResource.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureData.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/resources/TextureDataManager.cpp
 
-        # Utils
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/CImgUtil.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/FileSystemUtil.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/MathUtil.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/StringUtil.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/TimeUtil.cpp
+    # Utils
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/CImgUtil.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/FileSystemUtil.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/MathUtil.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/StringUtil.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/TimeUtil.cpp
 )
 
 include_directories(${COMMON_INCLUDE_DIRS})