diff --git a/.travis.yml b/.travis.yml
index 82072d146a..6cd994d026 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ matrix:
             - clang-3.8
       env: COMPILER_NAME=clang-3.8 CXX=clang++-3.8 CC=clang-3.8
     - os: osx
-      osx_image: xcode7.3
+      osx_image: xcode8
       script:
           - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
     - os: osx
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index 2e6b11d97a..eec6a8bb70 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -29,7 +29,9 @@
             "includePath": [
                 "/usr/include",
                 "/usr/local/include",
-                "${workspaceRoot}"
+                "${workspaceRoot}",
+                "${workspaceFolder}/libretro-common/include",
+                "${workspaceRoot}/libretro-common/include"
             ],
             "defines": [],
             "intelliSenseMode": "clang-x64",
@@ -50,7 +52,8 @@
                 "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/ucrt",
                 "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/shared",
                 "C:/Program Files (x86)/Windows Kits/10/Include/10.0.15063.0/winrt",
-                "${workspaceRoot}"
+                "${workspaceRoot}",
+                "${workspaceFolder}/libretro-common/include"
             ],
             "defines": [
                 "_DEBUG",
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 148f4b83ea..c44832dca4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,6 +7,7 @@
    "terminal.integrated.cursorBlinking": true,
 
    "editor.tabSize": 3,
+   "editor.detectIndentation": false,
    "editor.renderWhitespace": "all",
    "editor.insertSpaces": true,
    "files.associations": {
@@ -22,7 +23,24 @@
       "ios": "c",
       "list": "c",
       "input_driver.h": "c",
-      "video_driver.h": "c"
+      "video_driver.h": "c",
+      "menu_driver.h": "c",
+      "file_path.h": "c",
+      "unordered_map": "c",
+      "unordered_set": "c",
+      "sstream": "cpp",
+      "hash_map": "c",
+      "hash_set": "c",
+      "initializer_list": "c",
+      "string_view": "c",
+      "utility": "c",
+      "menu_input.h": "c",
+      "tasks_internal.h": "c",
+      "ozone.h": "c",
+      "ozone_theme.h": "c",
+      "ozone_texture.h": "c",
+      "string_list.h": "c",
+      "core_info.h": "c"
    },
    "C_Cpp.dimInactiveRegions": false,
 }
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index b271c66e8f..a90e515b1b 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -4,12 +4,49 @@
    "version": "2.0.0",
    "tasks": [
       {
-         "taskName": "msys2-mingw64 build",
+         "label": "linux clean build",
+         "type": "shell",
+         "group": "build",
+         "command": "make clean && ./configure && make -j12"
+      },
+      {
+         "label": "linux clean",
+         "type": "shell",
+         "group": "build",
+         "command": "make clean"
+      },
+      {
+         "label": "linux build with debug symbols",
+         "type": "shell",
+         "group": "build",
+         "command": "DEBUG=1 make -j12"
+      },
+      {
+         "label": "linux build",
+         "type": "shell",
+         "group": "build",
+         "command": "make -j12"
+      },
+      {
+         "label": "linux build and run",
+         "type": "shell",
+         "group": "build",
+         "command": "make -j12 && ./retroarch -v"
+      },
+      {
+         "label": "linux build and run with debug symbols",
+         "type": "shell",
+         "group": "build",
+         "command": "DEBUG=1 make -j12 && ./retroarch -v"
+      },
+      {
+         "label": "msys2-mingw64 build",
          "type": "shell",
 
          "group": {
             "kind": "build",
-            "isDefault": true },
+            "isDefault": true 
+         },
 
          "command": "./configure; make -j2",
          "options": {
@@ -20,9 +57,9 @@
                ]
             }
          }
-      }
+      },
       {
-         "taskName": "msys2-mingw64 build with debug symbols",
+         "label": "msys2-mingw64 build with debug symbols",
          "type": "shell",
 
          "group": "build",
@@ -36,9 +73,9 @@
                ]
             }
          }
-      }
+      },
       {
-         "taskName": "msys2-mingw64 rebuild",
+         "label": "msys2-mingw64 rebuild",
          "type": "shell",
 
          "group": "build",
@@ -52,9 +89,9 @@
                ]
             }
          }
-      }
+      },
       {
-         "taskName": "msys2-mingw64 clean",
+         "label": "msys2-mingw64 clean",
          "type": "shell",
 
          "group": "build",
@@ -68,9 +105,9 @@
                ]
             }
          }
-      }
+      },
       {
-         "taskName": "msys2-mingw64 run",
+         "label": "msys2-mingw64 run",
          "type": "shell",
 
          "group": {
diff --git a/CHANGES.md b/CHANGES.md
index 6aaebd3bde..2621139e06 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,13 +1,21 @@
 # 1.7.6 (future)
+- CPU FILTERS: Add Normal2x filter.
 - DATE: Add Date / Time style options.
 - MIDI: Add a Linux ALSA driver for MIDI.
+- LOCALIZATION: Add Greek translation.
 - LOCALIZATION: Update German translation.
 - LOCALIZATION: Update Italian translation.
 - LOCALIZATION: Update Simplified Chinese translation.
 - LOCALIZATION: Update Japanese translation.
+- MENU: Only show CRT SwitchRes if video display server is implemented (Windows/Linux for now)
+- MENU: User Interface -> Appearance -> 'Menu Font Green/Blue Color' settings now work properly.
 - SCANNER: Fix GDI disc scanning.
 - SWITCH/LIBNX: Improve touch scaling calculation.
 - SWITCH: Proper button labels.
+- VULKAN: Fix RGUI crashing at startup.
+- VULKAN: Fix secondary screens in overlays not working.
+- WINDOWS/WSA: Network Information info is blank until first network operation.
+- WIIU: Initial netplay peer-to-peer support. Network information working.
 
 # 1.7.5
 - CAMERA: Fix Video4Linux2 driver that broke years ago.
diff --git a/Makefile.classic_armv7_a7 b/Makefile.classic_armv7_a7
new file mode 100644
index 0000000000..34dc715cb5
--- /dev/null
+++ b/Makefile.classic_armv7_a7
@@ -0,0 +1,110 @@
+# This build was put together and is maintained by ModMyClassic.com for Libretro.
+# The purpose is to give Libretro a proper "official" build platform for classic consoles.
+# If you need any help in building for the classics or have any questions then please visit
+# https://modmyclassic.com/comp and we will help in any way possible! 
+
+# Building Prerequisites ##############
+# arm-linux-gnueabihf-gcc-8
+# arm-linux-gnueabihf-g++-8
+# arm-linux-gnueabihf-as
+# arm-linux-gnueabihf-strip
+# patchelf
+# bc
+
+# Classic Readme Variables ############
+CLASSIC_MODS_VER := Official_Retroarch_v1_7_5c_COptimised
+CLASSIC_MODS_NAME := RetroArch v1.7.5c (Official Classic Optimised)
+CLASSIC_VERSION := 1.7.5c \(Classic+\)
+MOD_CREATOR := Libretro + ModMyClassic
+MOD_CATEGORY := RetroArch
+GIT_COMMIT := $(shell echo "`git rev-parse --short HEAD``git diff-index --quiet HEAD -- || echo '-dirty'`")
+
+# Platform dependant Variables ########
+HAKCHI_DIR := RA_Platform-Hakchi
+HAKCHI_GIT := https://github.com/Classicmods/RA_Platform-Hakchi
+
+# General Shared Variables ############
+TARGET := retroarch
+CC_V = arm-linux-gnueabihf-gcc-8
+CXX_V = arm-linux-gnueabihf-g++-8
+AS_V = arm-linux-gnueabihf-as
+CC_AS_V = arm-linux-gnueabihf-gcc-8
+
+# Libretro Defines ####################
+#HAVE_CLASSIC = Classic Hook, disable some features
+#HAVE_C_A7A7 = Classic Armv7 Cortex A7 optimisation override
+#HAVE_HAKCHI = Hakchi Hook, change default configurations etc (TODO)
+
+all: $(TARGET)
+
+retroarch:
+	#Backup vanilla version files + ammend version
+	cp version.all version_BACKUP.all && cp version.dtd version_BACKUP.dtd
+	sed -i -e 's/RARCH_VERSION="[^"]*"/RARCH_VERSION="$(CLASSIC_VERSION)"/g' version.all
+	sed -i -e 's/PACKAGE_VERSION "[^"]*"/PACKAGE_VERSION "$(CLASSIC_VERSION)"/g' version.all
+	sed -i -e 's/ENTITY version "[^"]*"/ENTITY version "$(CLASSIC_VERSION)"/g' version.dtd
+	#Build the RetroArch Binary for cross platform classics (ARMv7 Cortex A7)
+	patchelf --version #Check if you have patchelf installed... (sudo apt-get install patchelf)
+	./configure --host=arm-linux-gnueabihf --enable-mali_fbdev --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard --disable-discord
+	make CC=$(CC_V) CXX=$(CXX_V) AS=$(AS_V) CC_AS=$(CC_AS_V) LDFLAGS_SDL=-lSDL2 HAVE_CLASSIC=1 HAVE_C_A7A7=1 HAVE_HAKCHI=1 -j #Cook it
+	arm-linux-gnueabihf-strip -v retroarch
+	patchelf --replace-needed libSDL2-2.0.so.0 libSDL2.so retroarch #libSDL2-2.0.so.0 sym link doesn't exist on native build. Just patch the binary...
+
+	#HAKCHI BUILD (NESC, SNESC)
+	#FYI this build was originally known as RetroArch 'Neo' for Hakchi.
+	@echo "** BUILDING CLASSIC_MODS HAKCHI - $(CLASSIC_MODS_VER) HMOD PACKAGE **"
+	rm -fr /tmp/$(HAKCHI_DIR)
+	cd /tmp/; git clone $(HAKCHI_GIT)
+	cp retroarch /tmp/$(HAKCHI_DIR)/bin/retroarch
+	echo $$(echo "Built by: " $$USER @ $$(date) \\\\\\ Git Commit: $(GIT_COMMIT)) > /tmp/$(HAKCHI_DIR)/etc/libretro/retroarch_version
+	cp /tmp/$(HAKCHI_DIR)/readme.md /tmp/$(HAKCHI_DIR)/readme_COPY.md
+	printf "%s\n" \
+	"---" \
+	"Name: $(CLASSIC_MODS_NAME)" \
+	"Creator: $(MOD_CREATOR)" \
+	"Category: $(MOD_CATEGORY)" \
+	"Version: $(CLASSIC_MODS_VER)" \
+	"Built on: $(shell date)" \
+	"Git commit: $(GIT_COMMIT)" \
+	"---" > /tmp/$(HAKCHI_DIR)/readme.md
+	cat /tmp/$(HAKCHI_DIR)/readme_COPY.md >> /tmp/$(HAKCHI_DIR)/readme.md
+	rm /tmp/$(HAKCHI_DIR)/readme_COPY.md
+	@echo "** COMPRESSING $(CLASSIC_MODS_VER) HMOD PACKAGE **"
+	cd /tmp/$(HAKCHI_DIR)/; tar -czvf "$(CLASSIC_MODS_VER).hmod" *
+	mv /tmp/$(HAKCHI_DIR)/$(CLASSIC_MODS_VER).hmod .
+	@echo "** BUILT CLASSIC_MODS HAKCHI - $(CLASSIC_MODS_VER) HMOD PACKAGE **"
+	rm -fr /tmp/$(HAKCHI_DIR) #clean up tmp
+
+	#COMMODORE 64 MINI BUILD (WIP)
+	
+	#Clean down dirty files
+	rm -f version.all version.dtd
+	mv version_BACKUP.all version.all && mv version_BACKUP.dtd version.dtd
+	@echo "*********************************************************************"
+	@echo "*** Classic ARM7 Cortex A7 build and packages built successfully! ***"
+	@echo "****************** Winner, Winner, Chicken Dinner! ******************"
+	@echo "*********************************************************************"
+clean:
+	rm -rf obj-unix
+	rm -f *.d
+	rm -f *.o
+	rm -f audio/*.o
+	rm -f conf/*.o
+	rm -f gfx/*.o
+	rm -f gfx/drivers_font/*.o
+	rm -f gfx/drivers_font_renderer/*.o
+	rm -f gfx/drivers_context/*.o
+	rm -f gfx/py_state/*.o
+	rm -f compat/*.o
+	rm -f record/*.o
+	rm -f input/*.o
+	rm -f tools/*.o
+	rm -f $(BINDIR)/retroarch
+	rm -f $(BINDIR)/retroarch-joyconfig
+	rm -f $(PNDDIR)/readme.html
+	rm -f retroarch
+	rm -f $(CLASSIC_MODS_VER).hmod
+	rm -f version.all version.dtd
+	mv -f version_BACKUP.all version.all || echo "Backup Doesn't Exist - Ignoring..."
+	mv -f version_BACKUP.dtd version.dtd || echo "Backup Doesn't Exist - Ignoring..."
+	rm -f *_BACKUP*
diff --git a/Makefile.common b/Makefile.common
index bc1ea2b9f9..ae3d10b3e4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -4,11 +4,7 @@ LIBRETRO_COMM_DIR := $(ROOT_DIR)/libretro-common
 WANT_WGL           = 0
 
 ifeq ($(HAVE_STACK_USAGE), 1)
-CFLAGS += -fstack-usage
-endif
-
-ifeq ($(HAVE_HAKCHI), 1)
-CFLAGS += -DHAVE_HAKCHI
+   CFLAGS += -fstack-usage
 endif
 
 ifeq ($(HAVE_GL_CONTEXT),)
@@ -32,16 +28,16 @@ ifeq ($(HAVE_LIBRETRODB),)
 endif
 
 ifeq ($(HAVE_VIDEO_PROCESSOR), 1)
-	DEFINES += -DHAVE_VIDEO_PROCESSOR
+   DEFINES += -DHAVE_VIDEO_PROCESSOR
 endif
 
 ifeq ($(HAVE_MENU), 1)
-	DEFINES += -DHAVE_MENU
-	HAVE_MENU_COMMON = 1
+   DEFINES += -DHAVE_MENU
+   HAVE_MENU_COMMON = 1
 endif
 
 ifeq ($(HAVE_SOCKET_LEGACY), 1)
-	DEFINES += -DHAVE_SOCKET_LEGACY
+   DEFINES += -DHAVE_SOCKET_LEGACY
 endif
 
 ifeq ($(HAVE_HID), 1)
@@ -53,7 +49,7 @@ ifeq ($(HAVE_LIBRETRODB), 1)
 endif
 
 ifeq ($(HAVE_VITA2D), 1)
-	DEFINES += -DHAVE_VITA2D
+   DEFINES += -DHAVE_VITA2D
 endif
 
 ifeq ($(HAVE_DYLIB), 1)
@@ -64,7 +60,6 @@ ifeq ($(SCALER_NO_SIMD), 1)
    DEFINES += -DSCALER_NO_SIMD
 endif
 
-
 ifeq ($(HAVE_PRESERVE_DYLIB),1)
    DEFINES += -DNO_DLCLOSE
 endif
@@ -98,6 +93,10 @@ endif
 CFLAGS += -I$(LIBRETRO_COMM_DIR)/include -I$(DEPS_DIR)
 
 # Switches
+#
+ifeq ($(HAVE_NETPLAYDISCOVERY), 1)
+   CFLAGS += -DHAVE_NETPLAYDISCOVERY
+endif
 
 ifeq ($(HAVE_NETLOGGER), 1)
 	CFLAGS += -DHAVE_LOGGER
@@ -109,7 +108,7 @@ endif
 
 ifneq ($(findstring BSD,$(OS)),)
    BSD_LOCAL_INC += -I/usr/local/include
-	HAVE_UNIX = 1
+   HAVE_UNIX = 1
 endif
 
 ifneq ($(findstring Darwin,$(OS)),)
@@ -121,7 +120,7 @@ endif
 
 ifneq ($(findstring Haiku,$(OS)),)
    LIBS += -lroot -lnetwork
-	HAVE_UNIX = 1
+   HAVE_UNIX = 1
 else
    LIBS += -lm
 endif
@@ -131,15 +130,15 @@ ifneq ($(findstring Linux,$(OS)),)
    OBJ += input/drivers/linuxraw_input.o \
           input/common/linux_common.o \
           input/drivers_joypad/linuxraw_joypad.o
-	HAVE_UNIX = 1
+   HAVE_UNIX = 1
 endif
 
 ifeq ($(HAVE_UNIX), 1)
-	OBJ += frontend/drivers/platform_unix.o
+   OBJ += frontend/drivers/platform_unix.o
 endif
 
 ifeq ($(TARGET), retroarch_3ds)
-	OBJ += frontend/drivers/platform_ctr.o
+   OBJ += frontend/drivers/platform_ctr.o
 endif
 
 # Git
@@ -165,8 +164,8 @@ OBJ += frontend/frontend.o \
        ui/drivers/null/ui_null_application.o \
        core_impl.o \
        retroarch.o \
-		 dirs.o \
-		 paths.o \
+       dirs.o \
+       paths.o \
        command.o \
        msg_hash.o \
        intl/msg_hash_us.o \
@@ -191,7 +190,7 @@ OBJ += frontend/frontend.o \
        $(LIBRETRO_COMM_DIR)/lists/string_list.o \
        $(LIBRETRO_COMM_DIR)/string/stdstring.o \
        $(LIBRETRO_COMM_DIR)/memmap/memalign.o \
-		 setting_list.o \
+       setting_list.o \
        list_special.o \
        $(LIBRETRO_COMM_DIR)/file/nbio/nbio_stdio.o \
        $(LIBRETRO_COMM_DIR)/file/nbio/nbio_linux.o \
@@ -206,13 +205,13 @@ OBJ += frontend/frontend.o \
        $(LIBRETRO_COMM_DIR)/audio/audio_mixer.o \
        input/common/input_common.o \
        input/input_driver.o \
-		 input/input_mapper.o \
+       input/input_mapper.o \
        led/led_driver.o \
        led/drivers/led_null.o \
        gfx/video_coord_array.o \
        gfx/video_display_server.o \
        gfx/video_driver.o \
-	   gfx/video_crt_switch.o \
+       gfx/video_crt_switch.o \
        camera/camera_driver.o \
        wifi/wifi_driver.o \
        location/location_driver.o \
@@ -222,11 +221,11 @@ OBJ += frontend/frontend.o \
        dynamic.o \
        cores/dynamic_dummy.o \
        $(LIBRETRO_COMM_DIR)/queues/message_queue.o \
-		 managers/core_manager.o \
+       managers/core_manager.o \
        managers/state_manager.o \
        gfx/drivers_font_renderer/bitmapfont.o \
        tasks/task_autodetect.o \
-		 input/input_autodetect_builtin.o \
+       input/input_autodetect_builtin.o \
        input/input_keymaps.o \
        input/input_remapping.o \
        $(LIBRETRO_COMM_DIR)/queues/fifo_queue.o \
@@ -252,7 +251,7 @@ OBJ += frontend/frontend.o \
        $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler.o \
        $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/nearest_resampler.o \
        $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/null_resampler.o \
-		 $(LIBRETRO_COMM_DIR)/utils/md5.o \
+       $(LIBRETRO_COMM_DIR)/utils/md5.o \
        location/drivers/nulllocation.o \
        camera/drivers/nullcamera.o \
        wifi/drivers/nullwifi.o \
@@ -273,220 +272,218 @@ OBJ += frontend/frontend.o \
        midi/drivers/null_midi.o
 
 ifeq ($(HAVE_RUNAHEAD), 1)
-DEFINES += -DHAVE_RUNAHEAD
-OBJ += runahead/copy_load_info.o \
-       runahead/dirty_input.o \
-       runahead/mem_util.o \
-       runahead/mylist.o \
-       runahead/run_ahead.o \
-       runahead/secondary_core.o
+   DEFINES += -DHAVE_RUNAHEAD
+   OBJ += runahead/copy_load_info.o \
+          runahead/dirty_input.o \
+          runahead/mem_util.o \
+          runahead/mylist.o \
+          runahead/run_ahead.o \
+          runahead/secondary_core.o
 endif
 
-
-
 ifeq ($(HAVE_CC_RESAMPLER), 1)
-DEFINES += -DHAVE_CC_RESAMPLER
-OBJ += audio/drivers_resampler/cc_resampler.o
+   DEFINES += -DHAVE_CC_RESAMPLER
+   OBJ += audio/drivers_resampler/cc_resampler.o
 endif
 
 ifeq ($(HAVE_LANGEXTRA), 1)
-DEFINES += -DHAVE_LANGEXTRA
-DEFINES += -finput-charset=UTF-8
-
-OBJ += intl/msg_hash_de.o \
-       intl/msg_hash_eo.o \
-       intl/msg_hash_es.o \
-       intl/msg_hash_fr.o \
-       intl/msg_hash_it.o \
-       intl/msg_hash_ja.o \
-       intl/msg_hash_ko.o \
-       intl/msg_hash_nl.o \
-       intl/msg_hash_pl.o \
-       intl/msg_hash_pt_br.o \
-       intl/msg_hash_pt_pt.o \
-       intl/msg_hash_ru.o \
-       intl/msg_hash_vn.o \
-       intl/msg_hash_chs.o \
-       intl/msg_hash_cht.o \
-       intl/msg_hash_ar.o
+   DEFINES += -DHAVE_LANGEXTRA
+   DEFINES += -finput-charset=UTF-8
 
+   OBJ += intl/msg_hash_de.o \
+          intl/msg_hash_eo.o \
+          intl/msg_hash_es.o \
+          intl/msg_hash_fr.o \
+          intl/msg_hash_it.o \
+          intl/msg_hash_ja.o \
+          intl/msg_hash_ko.o \
+          intl/msg_hash_nl.o \
+          intl/msg_hash_pl.o \
+          intl/msg_hash_pt_br.o \
+          intl/msg_hash_pt_pt.o \
+          intl/msg_hash_ru.o \
+          intl/msg_hash_vn.o \
+          intl/msg_hash_chs.o \
+          intl/msg_hash_cht.o \
+          intl/msg_hash_ar.o \
+          intl/msg_hash_el.o
 endif
 
 ifneq ($(HAVE_GETOPT_LONG), 1)
-OBJ += $(LIBRETRO_COMM_DIR)/compat/compat_getopt.o
+   OBJ += $(LIBRETRO_COMM_DIR)/compat/compat_getopt.o
 endif
 
 ifneq ($(HAVE_STRCASESTR), 1)
-OBJ += $(LIBRETRO_COMM_DIR)/compat/compat_strcasestr.o
+   OBJ += $(LIBRETRO_COMM_DIR)/compat/compat_strcasestr.o
 endif
 
 ifneq ($(HAVE_STRL), 1)
-OBJ += $(LIBRETRO_COMM_DIR)/compat/compat_strl.o
+   OBJ += $(LIBRETRO_COMM_DIR)/compat/compat_strl.o
 endif
 
 OBJ += $(LIBRETRO_COMM_DIR)/formats/image_texture.o
 
 ifeq ($(HAVE_IMAGEVIEWER), 1)
-DEFINES += -DHAVE_IMAGEVIEWER
-OBJ += cores/libretro-imageviewer/image_core.o
+   DEFINES += -DHAVE_IMAGEVIEWER
+   OBJ += cores/libretro-imageviewer/image_core.o
 endif
 
 # Qt WIMP GUI
 
 ifeq ($(HAVE_OPENSSL), 1)
-DEFINES += $(OPENSSL_CFLAGS)
-LIBS += $(OPENSSL_LIBS)
+   DEFINES += $(OPENSSL_CFLAGS)
+   LIBS += $(OPENSSL_LIBS)
 endif
 
 ifeq ($(HAVE_QT), 1)
-OBJ += ui/drivers/ui_qt.o \
-       ui/drivers/qt/ui_qt_application.o \
-       ui/drivers/qt/ui_qt_window.o \
-       ui/drivers/qt/ui_qt_browser_window.o \
-       ui/drivers/qt/ui_qt_load_core_window.o \
-       ui/drivers/qt/ui_qt_msg_window.o \
-       ui/drivers/qt/flowlayout.o \
-       ui/drivers/qt/shaderparamsdialog.o \
-       ui/drivers/qt/coreoptionsdialog.o \
-       ui/drivers/qt/filedropwidget.o \
-       ui/drivers/qt/coreinfodialog.o \
-       ui/drivers/qt/playlistentrydialog.o \
-       ui/drivers/qt/viewoptionsdialog.o \
-       ui/drivers/qt/playlist.o \
-       ui/drivers/qt/updateretroarch.o \
-       ui/drivers/qt/thumbnaildownload.o \
-       ui/drivers/qt/thumbnailpackdownload.o \
-       ui/drivers/qt/playlistthumbnaildownload.o
+   OBJ += ui/drivers/ui_qt.o \
+          ui/drivers/qt/ui_qt_application.o \
+          ui/drivers/qt/ui_qt_window.o \
+          ui/drivers/qt/ui_qt_browser_window.o \
+          ui/drivers/qt/ui_qt_load_core_window.o \
+          ui/drivers/qt/ui_qt_msg_window.o \
+          ui/drivers/qt/flowlayout.o \
+          ui/drivers/qt/shaderparamsdialog.o \
+          ui/drivers/qt/coreoptionsdialog.o \
+          ui/drivers/qt/filedropwidget.o \
+          ui/drivers/qt/coreinfodialog.o \
+          ui/drivers/qt/playlistentrydialog.o \
+          ui/drivers/qt/viewoptionsdialog.o \
+          ui/drivers/qt/playlist.o \
+          ui/drivers/qt/updateretroarch.o \
+          ui/drivers/qt/thumbnaildownload.o \
+          ui/drivers/qt/thumbnailpackdownload.o \
+          ui/drivers/qt/playlistthumbnaildownload.o
 
-MOC_HEADERS += ui/drivers/ui_qt.h \
-							 ui/drivers/qt/ui_qt_load_core_window.h \
-							 ui/drivers/qt/flowlayout.h \
-							 ui/drivers/qt/shaderparamsdialog.h \
-							 ui/drivers/qt/coreoptionsdialog.h \
-							 ui/drivers/qt/filedropwidget.h \
-							 ui/drivers/qt/coreinfodialog.h \
-							 ui/drivers/qt/playlistentrydialog.h \
-							 ui/drivers/qt/viewoptionsdialog.h
+   MOC_HEADERS += ui/drivers/ui_qt.h \
+                  ui/drivers/qt/ui_qt_load_core_window.h \
+                  ui/drivers/qt/flowlayout.h \
+                  ui/drivers/qt/shaderparamsdialog.h \
+                  ui/drivers/qt/coreoptionsdialog.h \
+                  ui/drivers/qt/filedropwidget.h \
+                  ui/drivers/qt/coreinfodialog.h \
+                  ui/drivers/qt/playlistentrydialog.h \
+                  ui/drivers/qt/viewoptionsdialog.h
 
-DEFINES += $(QT5CORE_CFLAGS) $(QT5GUI_CFLAGS) $(QT5WIDGETS_CFLAGS) $(QT5CONCURRENT_CFLAGS) $(QT5NETWORK_CFLAGS) -DHAVE_MAIN
-#DEFINES += $(QT5WEBENGINE_CFLAGS)
-LIBS += $(QT5CORE_LIBS) $(QT5GUI_LIBS) $(QT5WIDGETS_LIBS) $(QT5CONCURRENT_LIBS) $(QT5NETWORK_LIBS)
-#LIBS += $(QT5WEBENGINE_LIBS)
-NEED_CXX_LINKER = 1
+   DEFINES += $(QT5CORE_CFLAGS) $(QT5GUI_CFLAGS) $(QT5WIDGETS_CFLAGS) $(QT5CONCURRENT_CFLAGS) $(QT5NETWORK_CFLAGS) -DHAVE_MAIN
+   #DEFINES += $(QT5WEBENGINE_CFLAGS)
+   LIBS += $(QT5CORE_LIBS) $(QT5GUI_LIBS) $(QT5WIDGETS_LIBS) $(QT5CONCURRENT_LIBS) $(QT5NETWORK_LIBS)
+   #LIBS += $(QT5WEBENGINE_LIBS)
+   NEED_CXX_LINKER = 1
 
-ifneq ($(findstring Linux,$(OS)),)
-DEFINES += -fPIC
-endif
+   ifneq ($(findstring Linux,$(OS)),)
+      DEFINES += -fPIC
+   endif
 endif
 
 ifeq ($(HAVE_SSA),1)
-LIBS += $(SSA_LIBS)
+   LIBS += $(SSA_LIBS)
 endif
 
 # LibretroDB
 
 ifeq ($(HAVE_LIBRETRODB), 1)
-OBJ += libretro-db/bintree.o \
-       libretro-db/libretrodb.o \
-       libretro-db/query.o \
-       libretro-db/rmsgpack.o \
-       libretro-db/rmsgpack_dom.o \
-       database_info.o \
-       tasks/task_database.o \
-       tasks/task_database_cue.o
+   OBJ += libretro-db/bintree.o \
+          libretro-db/libretrodb.o \
+          libretro-db/query.o \
+          libretro-db/rmsgpack.o \
+          libretro-db/rmsgpack_dom.o \
+          database_info.o \
+          tasks/task_database.o \
+          tasks/task_database_cue.o
 endif
 
 ifneq ($(C89_BUILD), 1)
-HAVE_GTKPLUS = 0
+   HAVE_GTKPLUS = 0
 
-ifeq ($(HAVE_SSL), 1)
-ifeq ($(HAVE_NETWORKING), 1)
-DEFINES += -DHAVE_SSL
+   ifeq ($(HAVE_SSL), 1)
+      ifeq ($(HAVE_NETWORKING), 1)
+         DEFINES += -DHAVE_SSL
 
-ifeq ($(DEBUG), 1)
-  DEFINES += -DMBEDTLS_SSL_DEBUG_ALL
-endif
+         ifeq ($(DEBUG), 1)
+            DEFINES += -DMBEDTLS_SSL_DEBUG_ALL
+         endif
 
-# MinGW requires this for some reason, even though the include paths are relative to the source
-INCLUDE_DIRS += -Ideps/mbedtls
+         # MinGW requires this for some reason, even though the include paths are relative to the source
+         INCLUDE_DIRS += -Ideps/mbedtls
 
-OBJS_TLS_CRYPTO = deps/mbedtls/aes.o \
-						deps/mbedtls/aesni.o \
-						deps/mbedtls/arc4.o \
-                  deps/mbedtls/asn1parse.o \
-						deps/mbedtls/asn1write.o \
-						deps/mbedtls/base64.o \
-                  deps/mbedtls/bignum.o \
-						deps/mbedtls/blowfish.o \
-						deps/mbedtls/camellia.o \
-                  deps/mbedtls/ccm.o \
-						deps/mbedtls/cipher.o \
-						deps/mbedtls/cipher_wrap.o \
-                  deps/mbedtls/cmac.o \
-						deps/mbedtls/ctr_drbg.o \
-						deps/mbedtls/des.o \
-                  deps/mbedtls/dhm.o \
-						deps/mbedtls/ecdh.o \
-						deps/mbedtls/ecdsa.o \
-                  deps/mbedtls/ecjpake.o \
-						deps/mbedtls/ecp.o \
-                  deps/mbedtls/ecp_curves.o \
-						deps/mbedtls/entropy.o \
-						deps/mbedtls/entropy_poll.o \
-                  deps/mbedtls/error.o \
-						deps/mbedtls/gcm.o \
-						deps/mbedtls/havege.o \
-                  deps/mbedtls/hmac_drbg.o \
-						deps/mbedtls/md.o \
-						deps/mbedtls/md2.o \
-                  deps/mbedtls/md4.o \
-						deps/mbedtls/md5.o \
-						deps/mbedtls/md_wrap.o \
-                  deps/mbedtls/memory_buffer_alloc.o \
-						deps/mbedtls/oid.o \
-                  deps/mbedtls/padlock.o \
-						deps/mbedtls/pem.o \
-						deps/mbedtls/pk.o \
-                  deps/mbedtls/pk_wrap.o \
-						deps/mbedtls/pkcs12.o \
-						deps/mbedtls/pkcs5.o \
-                  deps/mbedtls/pkparse.o \
-						deps/mbedtls/pkwrite.o \
-						deps/mbedtls/platform.o \
-                  deps/mbedtls/ripemd160.o \
-						deps/mbedtls/rsa.o \
-						deps/mbedtls/sha1.o \
-                  deps/mbedtls/sha256.o \
-						deps/mbedtls/sha512.o \
-						deps/mbedtls/threading.o \
-                  deps/mbedtls/timing.o \
-						deps/mbedtls/version.o \
-                  deps/mbedtls/version_features.o \
-						deps/mbedtls/xtea.o
+         OBJS_TLS_CRYPTO = deps/mbedtls/aes.o \
+                           deps/mbedtls/aesni.o \
+                           deps/mbedtls/arc4.o \
+                           deps/mbedtls/asn1parse.o \
+                           deps/mbedtls/asn1write.o \
+                           deps/mbedtls/base64.o \
+                           deps/mbedtls/bignum.o \
+                           deps/mbedtls/blowfish.o \
+                           deps/mbedtls/camellia.o \
+                           deps/mbedtls/ccm.o \
+                           deps/mbedtls/cipher.o \
+                           deps/mbedtls/cipher_wrap.o \
+                           deps/mbedtls/cmac.o \
+                           deps/mbedtls/ctr_drbg.o \
+                           deps/mbedtls/des.o \
+                           deps/mbedtls/dhm.o \
+                           deps/mbedtls/ecdh.o \
+                           deps/mbedtls/ecdsa.o \
+                           deps/mbedtls/ecjpake.o \
+                           deps/mbedtls/ecp.o \
+                           deps/mbedtls/ecp_curves.o \
+                           deps/mbedtls/entropy.o \
+                           deps/mbedtls/entropy_poll.o \
+                           deps/mbedtls/error.o \
+                           deps/mbedtls/gcm.o \
+                           deps/mbedtls/havege.o \
+                           deps/mbedtls/hmac_drbg.o \
+                           deps/mbedtls/md.o \
+                           deps/mbedtls/md2.o \
+                           deps/mbedtls/md4.o \
+                           deps/mbedtls/md5.o \
+                           deps/mbedtls/md_wrap.o \
+                           deps/mbedtls/memory_buffer_alloc.o \
+                           deps/mbedtls/oid.o \
+                           deps/mbedtls/padlock.o \
+                           deps/mbedtls/pem.o \
+                           deps/mbedtls/pk.o \
+                           deps/mbedtls/pk_wrap.o \
+                           deps/mbedtls/pkcs12.o \
+                           deps/mbedtls/pkcs5.o \
+                           deps/mbedtls/pkparse.o \
+                           deps/mbedtls/pkwrite.o \
+                           deps/mbedtls/platform.o \
+                           deps/mbedtls/ripemd160.o \
+                           deps/mbedtls/rsa.o \
+                           deps/mbedtls/sha1.o \
+                           deps/mbedtls/sha256.o \
+                           deps/mbedtls/sha512.o \
+                           deps/mbedtls/threading.o \
+                           deps/mbedtls/timing.o \
+                           deps/mbedtls/version.o \
+                           deps/mbedtls/version_features.o \
+                           deps/mbedtls/xtea.o
 
-OBJS_TLS_X509 = deps/mbedtls/certs.o \
-					 deps/mbedtls/pkcs11.o \
-					 deps/mbedtls/x509.o \
-                deps/mbedtls/x509_create.o \
-					 deps/mbedtls/x509_crl.o \
-					 deps/mbedtls/x509_crt.o \
-                deps/mbedtls/x509_csr.o \
-					 deps/mbedtls/x509write_crt.o \
-					 deps/mbedtls/x509write_csr.o
+         OBJS_TLS_X509 = deps/mbedtls/certs.o \
+                         deps/mbedtls/pkcs11.o \
+                         deps/mbedtls/x509.o \
+                         deps/mbedtls/x509_create.o \
+                         deps/mbedtls/x509_crl.o \
+                         deps/mbedtls/x509_crt.o \
+                         deps/mbedtls/x509_csr.o \
+                         deps/mbedtls/x509write_crt.o \
+                         deps/mbedtls/x509write_csr.o
 
-OBJS_TLS = deps/mbedtls/debug.o \
-			  deps/mbedtls/net_sockets.o \
-           deps/mbedtls/ssl_cache.o \
-			  deps/mbedtls/ssl_ciphersuites.o \
-           deps/mbedtls/ssl_cli.o \
-			  deps/mbedtls/ssl_cookie.o \
-           deps/mbedtls/ssl_srv.o \
-			  deps/mbedtls/ssl_ticket.o \
-           deps/mbedtls/ssl_tls.o
+         OBJS_TLS = deps/mbedtls/debug.o \
+                    deps/mbedtls/net_sockets.o \
+                    deps/mbedtls/ssl_cache.o \
+                    deps/mbedtls/ssl_ciphersuites.o \
+                    deps/mbedtls/ssl_cli.o \
+                    deps/mbedtls/ssl_cookie.o \
+                    deps/mbedtls/ssl_srv.o \
+                    deps/mbedtls/ssl_ticket.o \
+                    deps/mbedtls/ssl_tls.o
 
-OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
-endif
-endif
+         OBJ += $(OBJS_TLS_CRYPTO) $(OBJS_TLS_X509) $(OBJS_TLS)
+      endif
+   endif
 endif
 
 # Miscellaneous
@@ -502,19 +499,19 @@ ifeq ($(HAVE_PYTHON), 1)
 endif
 
 ifeq ($(HAVE_EMSCRIPTEN), 1)
-OBJ += frontend/drivers/platform_emscripten.o \
-       input/drivers/rwebinput_input.o \
-       input/drivers_joypad/rwebpad_joypad.o \
-       audio/drivers/rwebaudio.o \
-       camera/drivers/rwebcam.o
+   OBJ += frontend/drivers/platform_emscripten.o \
+          input/drivers/rwebinput_input.o \
+          input/drivers_joypad/rwebpad_joypad.o \
+          audio/drivers/rwebaudio.o \
+          camera/drivers/rwebcam.o
 endif
 
 ifeq ($(HAVE_LAKKA), 1)
-OBJ += wifi/drivers/connmanctl.o
+   OBJ += wifi/drivers/connmanctl.o
 endif
 
 # Audio
-#
+
 ifeq ($(HAVE_COREAUDIO), 1)
    OBJ += audio/drivers/coreaudio.o
    LIBS += -framework CoreServices -framework CoreAudio -framework AudioUnit
@@ -525,11 +522,11 @@ ifeq ($(HAVE_CORETEXT), 1)
 endif
 
 ifeq ($(TARGET), retroarch_3ds)
-	OBJ += gfx/drivers_font/ctr_font.o
+   OBJ += gfx/drivers_font/ctr_font.o
 endif
 
 ifeq ($(HAVE_LIBNX), 1)
-	OBJ += gfx/drivers_font/switch_font.o
+   OBJ += gfx/drivers_font/switch_font.o
 endif
 
 ifeq ($(HAVE_OSS), 1)
@@ -539,24 +536,25 @@ else ifeq ($(HAVE_OSS_BSD), 1)
 endif
 
 ifeq ($(TARGET), retroarch_3ds)
-	OBJ += audio/drivers/ctr_csnd_audio.o \
-			 audio/drivers/ctr_dsp_audio.o
+   OBJ += audio/drivers/ctr_csnd_audio.o \
+          audio/drivers/ctr_dsp_audio.o
 endif
 
 ifeq ($(HAVE_ALSA), 1)
    OBJ += audio/drivers/alsa.o
    OBJ += midi/drivers/alsa_midi.o
 
-ifeq ($(HAVE_THREADS), 1)
-   OBJ += audio/drivers/alsathread.o
-endif
+   ifeq ($(HAVE_THREADS), 1)
+      OBJ += audio/drivers/alsathread.o
+   endif
+
    LIBS += $(ALSA_LIBS)
    DEFINES += $(ALSA_CFLAGS)
 endif
 
 ifeq ($(HAVE_TINYALSA), 1)
-	OBJ += audio/drivers/tinyalsa.o
-	DEFINES += -DHAVE_TINYALSA
+   OBJ += audio/drivers/tinyalsa.o
+   DEFINES += -DHAVE_TINYALSA
 endif
 
 ifeq ($(HAVE_ROAR), 1)
@@ -603,7 +601,7 @@ endif
 ifeq ($(HAVE_DSOUND), 1)
    OBJ += audio/drivers/dsound.o
    DEFINES += -DHAVE_DSOUND
-	HAVE_DX_COMMON  = 1
+   HAVE_DX_COMMON  = 1
    LIBS += -ldsound
 endif
 
@@ -631,13 +629,13 @@ ifeq ($(HAVE_NEON),1)
    OBJ += $(LIBRETRO_COMM_DIR)/audio/resampler/drivers/sinc_resampler_neon.o \
           audio/drivers_resampler/cc_resampler_neon.o \
           memory/neon/memcpy-neon.o
-	DEFINES += -DHAVE_NEON
+   DEFINES += -DHAVE_NEON
 endif
 
 OBJ += $(LIBRETRO_COMM_DIR)/audio/conversion/s16_to_float.o \
-		 $(LIBRETRO_COMM_DIR)/audio/conversion/float_to_s16.o \
-		 $(LIBRETRO_COMM_DIR)/audio/audio_mix.o \
-		 $(LIBRETRO_COMM_DIR)/formats/wav/rwav.o
+       $(LIBRETRO_COMM_DIR)/audio/conversion/float_to_s16.o \
+       $(LIBRETRO_COMM_DIR)/audio/audio_mix.o \
+       $(LIBRETRO_COMM_DIR)/formats/wav/rwav.o
 
 ifeq ($(HAVE_NEON),1)
    OBJ += $(LIBRETRO_COMM_DIR)/audio/conversion/s16_to_float_neon.o \
@@ -647,19 +645,19 @@ endif
 HW_CONTEXT_MENU_DRIVERS=$(HAVE_RGUI)
 
 ifeq ($(HW_CONTEXT_MENU_DRIVERS),0)
-ifeq ($(HAVE_GL_CONTEXT),1)
-   HW_CONTEXT_MENU_DRIVERS=1
-endif
-ifeq ($(HAVE_VULKAN),1)
-   HW_CONTEXT_MENU_DRIVERS=1
-endif
+   ifeq ($(HAVE_GL_CONTEXT),1)
+      HW_CONTEXT_MENU_DRIVERS=1
+   endif
+   ifeq ($(HAVE_VULKAN),1)
+      HW_CONTEXT_MENU_DRIVERS=1
+   endif
 endif
 
 # XMB and MaterialUI are always enabled if supported and not explicitly disabled
 ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
-   ifeq ($(HAVE_ZARCH),)
-      HAVE_ZARCH = 1
-   endif
+   #ifeq ($(HAVE_ZARCH),)
+      #HAVE_ZARCH = 1
+   #endif
 
    ifeq ($(HAVE_MATERIALUI),)
       HAVE_MATERIALUI = 1
@@ -673,38 +671,42 @@ ifeq ($(HW_CONTEXT_MENU_DRIVERS), 1)
       HAVE_XMB = 1
    endif
    
-   ifeq ($(HAVE_STRIPES),)
-      HAVE_STRIPES = 1
+   #ifeq ($(HAVE_STRIPES),)
+      #HAVE_STRIPES = 1
+   #endif
+
+   ifeq ($(HAVE_OZONE),)
+      HAVE_OZONE = 1
    endif
 else
-   HAVE_ZARCH ?= 0
+   HAVE_ZARCH       ?= 0
    HAVE_MATERIALUI  ?= 0
-   #HAVE_NUKLEAR ?= 0
-   HAVE_XMB   ?= 0
-   HAVE_STRIPES ?= 0
+   HAVE_NUKLEAR     ?= 0
+   HAVE_XMB         ?= 0
+   HAVE_STRIPES     ?= 0
+   HAVE_OZONE       ?= 0
 endif
 
 ifeq ($(HAVE_RGUI), 1)
    OBJ += menu/drivers/rgui.o
    DEFINES += -DHAVE_MENU -DHAVE_RGUI
    HAVE_MENU_COMMON = 1
-ifeq ($(HAVE_MATERIALUI), 1)
-   OBJ += menu/drivers/materialui.o
-   DEFINES += -DHAVE_MATERIALUI
-   HAVE_MENU_COMMON = 1
-endif
-ifeq ($(HAVE_NUKLEAR), 1)
-   OBJ += menu/drivers/nuklear/nk_common.o
-   OBJ += menu/drivers/nuklear/nk_menu.o
-   OBJ += menu/drivers/nuklear/nk_wnd_debug.o
-   OBJ += menu/drivers/nuklear.o
-   DEFINES += -DHAVE_NUKLEAR
-endif
-ifeq ($(HAVE_ZARCH), 1)
-   OBJ += menu/drivers/zarch.o
-   DEFINES += -DHAVE_ZARCH
-endif
-
+   ifeq ($(HAVE_MATERIALUI), 1)
+      OBJ += menu/drivers/materialui.o
+      DEFINES += -DHAVE_MATERIALUI
+      HAVE_MENU_COMMON = 1
+   endif
+   ifeq ($(HAVE_NUKLEAR), 1)
+      OBJ += menu/drivers/nuklear/nk_common.o
+      OBJ += menu/drivers/nuklear/nk_menu.o
+      OBJ += menu/drivers/nuklear/nk_wnd_debug.o
+      OBJ += menu/drivers/nuklear.o
+      DEFINES += -DHAVE_NUKLEAR
+   endif
+   ifeq ($(HAVE_ZARCH), 1)
+      OBJ += menu/drivers/zarch.o
+      DEFINES += -DHAVE_ZARCH
+   endif
 endif
 
 ifeq ($(HAVE_XMB), 1)
@@ -713,6 +715,17 @@ ifeq ($(HAVE_XMB), 1)
    HAVE_MENU_COMMON = 1
 endif
 
+ifeq ($(HAVE_OZONE), 1)
+   OBJ += menu/drivers/ozone/ozone.o
+   OBJ += menu/drivers/ozone/ozone_entries.o
+   OBJ += menu/drivers/ozone/ozone_display.o
+   OBJ += menu/drivers/ozone/ozone_texture.o
+   OBJ += menu/drivers/ozone/ozone_theme.o
+   OBJ += menu/drivers/ozone/ozone_sidebar.o
+   DEFINES += -DHAVE_OZONE
+   HAVE_MENU_COMMON = 1
+endif
+
 ifeq ($(HAVE_STRIPES), 1)
    OBJ += menu/drivers/stripes.o
    DEFINES += -DHAVE_STRIPES
@@ -734,12 +747,12 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/menu_setting.o \
           menu/menu_networking.o \
           menu/menu_shader.o \
-			 menu/widgets/menu_filebrowser.o \
-			 menu/widgets/menu_dialog.o \
-			 menu/widgets/menu_input_dialog.o \
-			 menu/widgets/menu_input_bind_dialog.o \
+          menu/widgets/menu_filebrowser.o \
+          menu/widgets/menu_dialog.o \
+          menu/widgets/menu_input_dialog.o \
+          menu/widgets/menu_input_bind_dialog.o \
           menu/widgets/menu_entry.o \
-			 menu/widgets/menu_osk.o \
+          menu/widgets/menu_osk.o \
           menu/menu_cbs.o \
           menu/cbs/menu_cbs_ok.o \
           menu/cbs/menu_cbs_cancel.o \
@@ -767,8 +780,7 @@ endif
 
 ifeq ($(HAVE_OVERLAY), 1)
    DEFINES += -DHAVE_OVERLAY
-   OBJ += \
-	  tasks/task_overlay.o \
+   OBJ += tasks/task_overlay.o \
 	  input/input_overlay.o \
 	  led/drivers/led_overlay.o
 endif
@@ -800,70 +812,70 @@ ifeq ($(HAVE_THREAD_STORAGE), 1)
 endif
 
 ifeq ($(HAVE_VITA2D), 1)
-	OBJ += $(DEPS_DIR)/libvita2d/source/vita2d.o \
-			 $(DEPS_DIR)/libvita2d/source/vita2d_texture.o \
-			 $(DEPS_DIR)/libvita2d/source/vita2d_draw.o \
-			 $(DEPS_DIR)/libvita2d/source/utils.o
+   OBJ += $(DEPS_DIR)/libvita2d/source/vita2d.o \
+          $(DEPS_DIR)/libvita2d/source/vita2d_texture.o \
+          $(DEPS_DIR)/libvita2d/source/vita2d_draw.o \
+          $(DEPS_DIR)/libvita2d/source/utils.o
 
-	OBJ += $(DEPS_DIR)/libvita2d/shader/clear_v_gxp.o \
-			 $(DEPS_DIR)/libvita2d/shader/clear_f_gxp.o \
-			 $(DEPS_DIR)/libvita2d/shader/color_v_gxp.o \
-			 $(DEPS_DIR)/libvita2d/shader/color_f_gxp.o \
-			 $(DEPS_DIR)/libvita2d/shader/texture_v_gxp.o \
-			 $(DEPS_DIR)/libvita2d/shader/texture_f_gxp.o \
-			 $(DEPS_DIR)/libvita2d/shader/texture_tint_f_gxp.o
+   OBJ += $(DEPS_DIR)/libvita2d/shader/clear_v_gxp.o \
+          $(DEPS_DIR)/libvita2d/shader/clear_f_gxp.o \
+          $(DEPS_DIR)/libvita2d/shader/color_v_gxp.o \
+          $(DEPS_DIR)/libvita2d/shader/color_f_gxp.o \
+          $(DEPS_DIR)/libvita2d/shader/texture_v_gxp.o \
+          $(DEPS_DIR)/libvita2d/shader/texture_f_gxp.o \
+          $(DEPS_DIR)/libvita2d/shader/texture_tint_f_gxp.o
 
-ifeq ($(HAVE_MENU),1)
-	OBJ += menu/drivers_display/menu_display_vita2d.o
-endif
+   ifeq ($(HAVE_MENU),1)
+      OBJ += menu/drivers_display/menu_display_vita2d.o
+   endif
 
-	OBJ += gfx/drivers/vita2d_gfx.o \
-			 gfx/drivers_font/vita2d_font.o
+   OBJ += gfx/drivers/vita2d_gfx.o \
+          gfx/drivers_font/vita2d_font.o
 
-	CFLAGS  += -I$(DEPS_DIR)/libvita2d/include
+   CFLAGS += -I$(DEPS_DIR)/libvita2d/include
 endif
 
 ifeq ($(TARGET), retroarch_3ds)
-	OBJ += gfx/drivers/ctr_gfx.o \
-			 menu/drivers_display/menu_display_ctr.o \
-			 input/drivers/ctr_input.o \
-			 input/drivers_joypad/ctr_joypad.o
+   OBJ += gfx/drivers/ctr_gfx.o \
+          menu/drivers_display/menu_display_ctr.o \
+          input/drivers/ctr_input.o \
+          input/drivers_joypad/ctr_joypad.o
 endif
 
 ifeq ($(TARGET), retroarch_switch)
-    ifeq ($(HAVE_LIBNX), 1)
-     OBJ += menu/drivers_display/menu_display_switch.o \
-            gfx/drivers/switch_nx_gfx.o
+   ifeq ($(HAVE_LIBNX), 1)
+      OBJ += menu/drivers_display/menu_display_switch.o \
+             gfx/drivers/switch_nx_gfx.o
       ifeq ($(HAVE_OPENGL), 1)
-        OBJ += gfx/drivers_context/switch_ctx.o
+         OBJ += gfx/drivers_context/switch_ctx.o
       endif
       ifeq ($(HAVE_THREADS), 1)
-        OBJ += $(LIBRETRO_COMM_DIR)/rthreads/switch_pthread.o
+         OBJ += $(LIBRETRO_COMM_DIR)/rthreads/switch_pthread.o
       endif
-    else
-     OBJ += gfx/drivers/switch_gfx.o
-    endif
-	 OBJ += audio/drivers/switch_audio.o \
-			  audio/drivers/switch_thread_audio.o \
-			  input/drivers/switch_input.o \
-			  input/drivers_joypad/switch_joypad.o \
-			  frontend/drivers/platform_switch.o
+   else
+      OBJ += gfx/drivers/switch_gfx.o
+   endif
+   OBJ += audio/drivers/switch_audio.o \
+          audio/drivers/switch_thread_audio.o \
+          input/drivers/switch_input.o \
+          input/drivers_joypad/switch_joypad.o \
+          frontend/drivers/platform_switch.o
 endif
 
 ifeq ($(HAVE_WAYLAND), 1)
- OBJ += gfx/drivers_context/wayland_ctx.o \
-		  input/drivers/wayland_input.o
- ifeq ($(HAVE_EGL), 1)
-   LIBS += $(EGL_LIBS)
- endif
- DEFINES += $(WAYLAND_CFLAGS) $(WAYLAND_CURSOR_CFLAGS)
- LIBS += $(WAYLAND_LIBS) $(WAYLAND_CURSOR_LIBS)
+   OBJ += gfx/drivers_context/wayland_ctx.o \
+          input/drivers/wayland_input.o
+   ifeq ($(HAVE_EGL), 1)
+      LIBS += $(EGL_LIBS)
+   endif
+   DEFINES += $(WAYLAND_CFLAGS) $(WAYLAND_CURSOR_CFLAGS)
+   LIBS += $(WAYLAND_LIBS) $(WAYLAND_CURSOR_LIBS)
 endif
 
 #Input
 
 ifeq ($(HAVE_DINPUT), 1)
-	HAVE_DX_COMMON  = 1
+   HAVE_DX_COMMON  = 1
    LIBS += -ldinput8 -lole32
    DEFINES += -DHAVE_DINPUT
    OBJ += input/drivers/dinput.o \
@@ -890,12 +902,12 @@ ifeq ($(HAVE_X11), 1)
 
    LIBS += $(X11_LIBS) $(XEXT_LIBS) $(XF86VM_LIBS) $(XINERAMA_LIBS)
    DEFINES += -DHAVE_X11 $(X11_CFLAGS) $(XEXT_CFLAGS) $(XF86VM_CFLAGS) $(XINERAMA_CFLAGS)
-ifeq ($(HAVE_XCB),1)
-   LIBS    += -lX11-xcb
-endif
-ifneq ($(HAVE_OPENGLES), 1)
-   OBJ += gfx/drivers_context/x_ctx.o
-endif
+   ifeq ($(HAVE_XCB),1)
+      LIBS    += -lX11-xcb
+   endif
+   ifneq ($(HAVE_OPENGLES), 1)
+      OBJ += gfx/drivers_context/x_ctx.o
+   endif
 endif
 
 ifeq ($(HAVE_XCB),1)
@@ -910,9 +922,9 @@ ifeq ($(HAVE_XKBCOMMON), 1)
 endif
 
 ifeq ($(HAVE_DBUS), 1)
-	LIBS += $(DBUS_LIBS)
-	CFLAGS += $(DBUS_CFLAGS)
-	OBJ += gfx/common/dbus_common.o
+   LIBS += $(DBUS_LIBS)
+   CFLAGS += $(DBUS_CFLAGS)
+   OBJ += gfx/common/dbus_common.o
 endif
 
 ifeq ($(HAVE_UDEV), 1)
@@ -923,25 +935,25 @@ ifeq ($(HAVE_UDEV), 1)
 endif
 
 ifeq ($(HAVE_LIBUSB), 1)
-ifeq ($(HAVE_THREADS), 1)
-ifeq ($(HAVE_HID), 1)
-   DEFINES += -DHAVE_LIBUSB
-   OBJ += input/drivers_hid/libusb_hid.o
-   ifneq ($(findstring BSD,$(OS)),)
-      LIBS += -lusb
-   else
-      LIBS += -lusb-1.0
+   ifeq ($(HAVE_THREADS), 1)
+      ifeq ($(HAVE_HID), 1)
+         DEFINES += -DHAVE_LIBUSB
+         OBJ += input/drivers_hid/libusb_hid.o
+         ifneq ($(findstring BSD,$(OS)),)
+            LIBS += -lusb
+         else
+            LIBS += -lusb-1.0
+         endif
+      endif
    endif
 endif
-endif
-endif
 
 ifeq ($(HAVE_IOHIDMANAGER), 1)
-ifeq ($(HAVE_HID), 1)
-   DEFINES += -DHAVE_IOHIDMANAGER
-   OBJ += input/drivers_hid/iohidmanager_hid.o
-   LIBS += -framework IOKit
-endif
+   ifeq ($(HAVE_HID), 1)
+      DEFINES += -DHAVE_IOHIDMANAGER
+      OBJ += input/drivers_hid/iohidmanager_hid.o
+      LIBS += -framework IOKit
+   endif
 endif
 
 ifeq ($(HAVE_CORELOCATION), 1)
@@ -951,17 +963,17 @@ endif
 
 ifeq ($(HAVE_HID), 1)
    DEFINES += -DHAVE_HID
-   OBJ +=      input/drivers_joypad/hid_joypad.o \
-               input/connect/joypad_connection.o \
-               input/connect/connect_ps2adapter.o \
-               input/connect/connect_psxadapter.o \
-               input/connect/connect_ps3.o \
-               input/connect/connect_ps4.o \
-               input/connect/connect_wii.o \
-               input/connect/connect_nesusb.o \
-               input/connect/connect_snesusb.o \
-               input/connect/connect_wiiupro.o \
-               input/connect/connect_wiiugca.o
+   OBJ += input/drivers_joypad/hid_joypad.o \
+          input/connect/joypad_connection.o \
+          input/connect/connect_ps2adapter.o \
+          input/connect/connect_psxadapter.o \
+          input/connect/connect_ps3.o \
+          input/connect/connect_ps4.o \
+          input/connect/connect_wii.o \
+          input/connect/connect_nesusb.o \
+          input/connect/connect_snesusb.o \
+          input/connect/connect_wiiupro.o \
+          input/connect/connect_wiiugca.o
 endif
 
 ifeq ($(HAVE_PARPORT), 1)
@@ -975,11 +987,11 @@ endif
 # Companion UI
 
 ifneq ($(findstring Win32,$(OS)),)
-OBJ += ui/drivers/ui_win32.o \
-       ui/drivers/win32/ui_win32_window.o \
-       ui/drivers/win32/ui_win32_browser_window.o \
-       ui/drivers/win32/ui_win32_msg_window.o \
-       ui/drivers/win32/ui_win32_application.o
+   OBJ += ui/drivers/ui_win32.o \
+          ui/drivers/win32/ui_win32_window.o \
+          ui/drivers/win32/ui_win32_browser_window.o \
+          ui/drivers/win32/ui_win32_msg_window.o \
+          ui/drivers/win32/ui_win32_application.o
 endif
 
 # Video
@@ -1025,8 +1037,8 @@ endif
 ifeq ($(HAVE_GL_CONTEXT), 1)
    DEFINES += -DHAVE_OPENGL -DHAVE_GLSL
    OBJ += gfx/drivers/gl.o \
-			 gfx/drivers_renderchain/gl2_renderchain.o \
-			 $(LIBRETRO_COMM_DIR)/gfx/gl_capabilities.o \
+          gfx/drivers_renderchain/gl2_renderchain.o \
+          $(LIBRETRO_COMM_DIR)/gfx/gl_capabilities.o \
           gfx/common/gl_common.o \
           gfx/drivers_font/gl_raster_font.o \
           $(LIBRETRO_COMM_DIR)/glsym/rglgen.o
@@ -1064,38 +1076,40 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
          LIBS += $(EGL_LIBS)
       endif
    endif
+
    ifeq ($(HAVE_OSMESA), 1)
       OBJ += gfx/drivers_context/osmesa_ctx.o
       LIBS += -lOSMesa
    endif
-ifeq ($(HAVE_FFMPEG), 1)
-ifneq ($(C89_BUILD), 1)
-ifneq ($(HAVE_OPENGLES), 1)
-   OBJ += cores/libretro-ffmpeg/ffmpeg_fft.o
-   DEFINES += -I$(DEPS_DIR) -DHAVE_GL_FFT
-endif
-endif
-endif
 
-ifeq ($(HAVE_METAL), 1)
-	DEFINES += -DHAVE_METAL
-	OBJ += gfx/common/metal/Context.o \
-			 gfx/common/metal/Filter.o \
-			 gfx/common/metal/RendererCommon.o \
-			 gfx/common/metal/View.o \
-			 gfx/common/metal/TexturedView.o \
-			 gfx/common/metal/MenuDisplay.o \
-			 gfx/common/metal_common.o \
-			 gfx/drivers/metal.o \
-			 menu/drivers_display/menu_display_metal.o \
-			 gfx/drivers_font/metal_raster_font.o
-endif
+   ifeq ($(HAVE_FFMPEG), 1)
+      ifneq ($(C89_BUILD), 1)
+         ifneq ($(HAVE_OPENGLES), 1)
+            OBJ += cores/libretro-ffmpeg/ffmpeg_fft.o
+            DEFINES += -I$(DEPS_DIR) -DHAVE_GL_FFT
+         endif
+      endif
+   endif
 
-ifeq ($(HAVE_MPV), 1)
-   OBJ += cores/libretro-mpv/mpv-libretro.o
-   DEFINES += -I$(DEPS_DIR) -DHAVE_MPV
-	LIBS += -lmpv
-endif
+   ifeq ($(HAVE_METAL), 1)
+      DEFINES += -DHAVE_METAL
+      OBJ += gfx/common/metal/Context.o \
+             gfx/common/metal/Filter.o \
+             gfx/common/metal/RendererCommon.o \
+             gfx/common/metal/View.o \
+             gfx/common/metal/TexturedView.o \
+             gfx/common/metal/MenuDisplay.o \
+             gfx/common/metal_common.o \
+             gfx/drivers/metal.o \
+             menu/drivers_display/menu_display_metal.o \
+             gfx/drivers_font/metal_raster_font.o
+   endif
+
+   ifeq ($(HAVE_MPV), 1)
+      OBJ += cores/libretro-mpv/mpv-libretro.o
+      DEFINES += -I$(DEPS_DIR) -DHAVE_MPV
+      LIBS += -lmpv
+   endif
 
    ifeq ($(HAVE_OPENGLES), 1)
       LIBS += $(OPENGLES_LIBS)
@@ -1243,19 +1257,19 @@ ifeq ($(HAVE_CG), 1)
 endif
 
 ifeq ($(HAVE_D3D9), 1)
-	HAVE_D3D_COMMON = 1
-	HAVE_D3DX = 1
+   HAVE_D3D_COMMON = 1
+   HAVE_D3DX = 1
    DEFINES += -DHAVE_D3D9
-ifeq ($(HAVE_D3DX), 1)
-   DEFINES += -DHAVE_D3DX
-endif
-ifneq ($(HAVE_DYLIB), 1)
-   LIBS += -ld3d9
-ifeq ($(HAVE_D3DX), 1)
-   LIBS += -ld3dx9
-endif
-endif
-	HAVE_DX_COMMON  = 1
+   ifeq ($(HAVE_D3DX), 1)
+      DEFINES += -DHAVE_D3DX
+   endif
+   ifneq ($(HAVE_DYLIB), 1)
+      LIBS += -ld3d9
+      ifeq ($(HAVE_D3DX), 1)
+         LIBS += -ld3dx9
+      endif
+   endif
+   HAVE_DX_COMMON  = 1
    OBJ  += gfx/drivers_font/d3d_w32_font.o
    ifeq ($(HAVE_CG), 1)
       LIBS += -lcgD3D9
@@ -1269,17 +1283,17 @@ endif
 
 ifeq ($(HAVE_D3D10), 1)
    OBJ += gfx/drivers/d3d10.o \
-			 gfx/common/d3d10_common.o \
-			 gfx/drivers_font/d3d10_font.o \
-			 menu/drivers_display/menu_display_d3d10.o
+          gfx/common/d3d10_common.o \
+          gfx/drivers_font/d3d10_font.o \
+          menu/drivers_display/menu_display_d3d10.o
    DEFINES += -DHAVE_D3D10
 endif
 
 ifeq ($(HAVE_D3D11), 1)
    OBJ += gfx/drivers/d3d11.o \
-			 gfx/common/d3d11_common.o \
-			 gfx/drivers_font/d3d11_font.o \
-			 menu/drivers_display/menu_display_d3d11.o
+          gfx/common/d3d11_common.o \
+          gfx/drivers_font/d3d11_font.o \
+          menu/drivers_display/menu_display_d3d11.o
    DEFINES += -DHAVE_D3D11
    HAVE_SLANG       = 1
    HAVE_GLSLANG     = 1
@@ -1288,9 +1302,9 @@ endif
 
 ifeq ($(HAVE_D3D12), 1)
    OBJ += gfx/drivers/d3d12.o \
-			 gfx/common/d3d12_common.o \
-			 gfx/drivers_font/d3d12_font.o \
-			 menu/drivers_display/menu_display_d3d12.o
+          gfx/common/d3d12_common.o \
+          gfx/drivers_font/d3d12_font.o \
+          menu/drivers_display/menu_display_d3d12.o
    DEFINES += -DHAVE_D3D12
    HAVE_SLANG       = 1
    HAVE_GLSLANG     = 1
@@ -1300,49 +1314,49 @@ endif
 ifneq ($(findstring 1, $(HAVE_D3D10) $(HAVE_D3D11) $(HAVE_D3D12)),)
    INCLUDE_DIRS += -isystemgfx/include/dxsdk
    OBJ += gfx/common/d3dcompiler_common.o \
-			 gfx/common/dxgi_common.o
+          gfx/common/dxgi_common.o
    CFLAGS += -Wno-unknown-pragmas
 endif
 
 ifeq ($(HAVE_D3D8), 1)
-	HAVE_D3D_COMMON = 1
+   HAVE_D3D_COMMON = 1
    HAVE_DX_COMMON  = 1
    DEFINES += -DHAVE_D3D8
-ifneq ($(HAVE_DYLIB), 1)
-   LIBS += -ld3d8
-ifeq ($(HAVE_D3DX), 1)
-   LIBS += -ld3dx8
-endif
-endif
+   ifneq ($(HAVE_DYLIB), 1)
+      LIBS += -ld3d8
+      ifeq ($(HAVE_D3DX), 1)
+         LIBS += -ld3dx8
+      endif
+   endif
 endif
 
 ifeq ($(HAVE_DX_COMMON), 1)
-	LIBS += -ldxguid
+   LIBS += -ldxguid
 endif
 
 ifeq ($(HAVE_D3D8), 1)
-	DEFINES += -DHAVE_D3D8
-	OBJ += gfx/drivers/d3d8.o
-	OBJ += gfx/common/d3d8_common.o
+   DEFINES += -DHAVE_D3D8
+   OBJ += gfx/drivers/d3d8.o
+   OBJ += gfx/common/d3d8_common.o
 
-ifeq ($(HAVE_MENU_COMMON), 1)
-	OBJ += menu/drivers_display/menu_display_d3d8.o
-endif
+   ifeq ($(HAVE_MENU_COMMON), 1)
+      OBJ += menu/drivers_display/menu_display_d3d8.o
+   endif
 endif
 
 ifeq ($(HAVE_D3D9), 1)
-	DEFINES += -DHAVE_D3D9
-	OBJ += gfx/drivers/d3d9.o
-	OBJ += gfx/common/d3d9_common.o
+   DEFINES += -DHAVE_D3D9
+   OBJ += gfx/drivers/d3d9.o
+   OBJ += gfx/common/d3d9_common.o
 
-ifeq ($(HAVE_MENU_COMMON), 1)
-	OBJ += menu/drivers_display/menu_display_d3d9.o
-endif
+   ifeq ($(HAVE_MENU_COMMON), 1)
+      OBJ += menu/drivers_display/menu_display_d3d9.o
+   endif
 endif
 
 ifeq ($(HAVE_D3D_COMMON), 1)
-	DEFINES += -DHAVE_D3D
-	OBJ     += gfx/common/d3d_common.o
+   DEFINES += -DHAVE_D3D
+   OBJ     += gfx/common/d3d_common.o
 endif
 
 ifeq ($(HAVE_SLANG),1)
@@ -1354,7 +1368,7 @@ ifeq ($(HAVE_SLANG),1)
 endif
 
 ifeq ($(HAVE_GLSLANG), 1)
-   DEFINES      += -DHAVE_GLSLANG
+   DEFINES += -DHAVE_GLSLANG
 
    ifneq ($(findstring Win32,$(OS)),)
       GLSLANG_PLATFORM := Windows
@@ -1380,17 +1394,16 @@ ifeq ($(HAVE_GLSLANG), 1)
       $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent/preprocessor/*.cpp) \
       $(wildcard $(DEPS_DIR)/glslang/glslang/glslang/OSDependent/$(GLSLANG_PLATFORM)/*.cpp)
 
-ifneq ($(findstring Win32,$(OS)),)
-DEFINES += -DENABLE_HLSL
-GLSLANG_SOURCES += $(wildcard $(DEPS_DIR)/glslang/glslang/hlsl/*.cpp)
-endif
-
+   ifneq ($(findstring Win32,$(OS)),)
+      DEFINES += -DENABLE_HLSL
+      GLSLANG_SOURCES += $(wildcard $(DEPS_DIR)/glslang/glslang/hlsl/*.cpp)
+   endif
 
    OBJ += $(GLSLANG_SOURCES:.cpp=.o)
 endif
 
 ifeq ($(HAVE_SPIRV_CROSS), 1)
-	DEFINES += -DHAVE_SPIRV_CROSS
+   DEFINES += -DHAVE_SPIRV_CROSS
    INCLUDE_DIRS += -I$(DEPS_DIR)/SPIRV-Cross
    OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cross.o
    OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cfg.o
@@ -1400,7 +1413,7 @@ ifeq ($(HAVE_SPIRV_CROSS), 1)
 endif
 
 ifeq ($(WANT_WGL), 1)
-	OBJ += gfx/drivers_context/wgl_ctx.o
+   OBJ += gfx/drivers_context/wgl_ctx.o
    LIBS += -lcomctl32
 endif
 
@@ -1434,9 +1447,9 @@ ifeq ($(HAVE_7ZIP),1)
            $(DEPS_DIR)/7zip/Bcj2.o \
            $(DEPS_DIR)/7zip/7zCrc.o \
            $(DEPS_DIR)/7zip/Lzma2Dec.o \
-			  $(DEPS_DIR)/7zip/7zBuf.o
+           $(DEPS_DIR)/7zip/7zBuf.o
    OBJ +=  $(LIBRETRO_COMM_DIR)/file/archive_file_7z.o \
-			  $(7ZOBJ)
+           $(7ZOBJ)
 endif
 
 ifeq ($(HAVE_IBXM), 1)
@@ -1446,8 +1459,8 @@ endif
 
 ifeq ($(HAVE_BUILTINFLAC),1)
    HAVE_FLAC = 1
-	DEFINES += -DHAVE_DR_FLAC -I$(DEPS_DIR)
-	CFLAGS  += -DHAVE_DR_FLAC
+   DEFINES += -DHAVE_DR_FLAC -I$(DEPS_DIR)
+   CFLAGS  += -DHAVE_DR_FLAC
    CFLAGS  += -DHAVE_FLAC -I$(DEPS_DIR)/libFLAC/include
    DEFINES += -DHAVE_STDINT_H -DHAVE_LROUND -DFLAC__HAS_OGG=0 \
               -DFLAC_PACKAGE_VERSION="\"retroarch\""
@@ -1507,7 +1520,7 @@ endif
 
 ifeq ($(HAVE_CHD), 1)
    CFLAGS  += -I$(LIBRETRO_COMM_DIR)/formats/libchdr
-	DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR
+   DEFINES += -DHAVE_CHD -DWANT_SUBCODE -DWANT_RAW_DATA_SECTOR
    OBJ     += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_bitstream.o \
               $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_cdrom.o \
               $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_chd.o \
@@ -1516,7 +1529,7 @@ ifeq ($(HAVE_CHD), 1)
 	
    ifeq ($(HAVE_FLAC), 1)
       OBJ += $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac.o \
-				 $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac_codec.o
+             $(LIBRETRO_COMM_DIR)/formats/libchdr/libchdr_flac_codec.o
    endif
 
    ifeq ($(HAVE_7ZIP), 1)
@@ -1562,14 +1575,13 @@ endif
 
 ifeq ($(HAVE_V4L2),1)
    OBJ += camera/drivers/video4linux2.o
-ifeq ($(HAVE_VIDEO_PROCESSOR),1)
-	OBJ += cores/libretro-video-processor/video_processor_v4l2.o
-endif
+   ifeq ($(HAVE_VIDEO_PROCESSOR),1)
+      OBJ += cores/libretro-video-processor/video_processor_v4l2.o
+   endif
    DEFINES += -DHAVE_V4L2
    LIBS += $(V4L2_LIBS)
 endif
 
-
 # Things that depend on network availability
 
 ifeq ($(HAVE_NETWORKING), 1)
@@ -1578,25 +1590,25 @@ ifeq ($(HAVE_NETWORKING), 1)
           $(LIBRETRO_COMM_DIR)/net/net_http.o \
           $(LIBRETRO_COMM_DIR)/net/net_http_parse.o \
           $(LIBRETRO_COMM_DIR)/net/net_socket.o \
-			 $(LIBRETRO_COMM_DIR)/net/net_natt.o \
-			 network/net_http_special.o \
-			 tasks/task_http.o \
-			 tasks/task_netplay_lan_scan.o \
-			 tasks/task_netplay_nat_traversal.o \
-			 tasks/task_wifi.o \
-			 tasks/task_netplay_find_content.o
+          $(LIBRETRO_COMM_DIR)/net/net_natt.o \
+          network/net_http_special.o \
+          tasks/task_http.o \
+          tasks/task_netplay_lan_scan.o \
+          tasks/task_netplay_nat_traversal.o \
+          tasks/task_wifi.o \
+          tasks/task_netplay_find_content.o
 
    ifeq ($(HAVE_SSL), 1)
-   OBJ += $(LIBRETRO_COMM_DIR)/net/net_socket_ssl.o
+      OBJ += $(LIBRETRO_COMM_DIR)/net/net_socket_ssl.o
    endif
 
    ifneq ($(HAVE_SOCKET_LEGACY),1)
-   OBJ += $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
+      OBJ += $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
    endif
 
    ifeq ($(WANT_IFADDRS), 1)
-   DEFINES += -DWANT_IFADDRS
-   OBJ += $(LIBRETRO_COMM_DIR)/compat/compat_ifaddrs.o
+      DEFINES += -DWANT_IFADDRS
+      OBJ += $(LIBRETRO_COMM_DIR)/compat/compat_ifaddrs.o
    endif
 
    ifneq ($(findstring Win32,$(OS)),)
@@ -1606,91 +1618,89 @@ ifeq ($(HAVE_NETWORKING), 1)
    # Netplay
 	DEFINES += -DHAVE_NETWORK_CMD
 	OBJ += network/netplay/netplay_delta.o \
-			network/netplay/netplay_frontend.o \
-			network/netplay/netplay_handshake.o \
-			network/netplay/netplay_init.o \
-			network/netplay/netplay_io.o \
-			network/netplay/netplay_keyboard.o \
-			network/netplay/netplay_sync.o \
-			network/netplay/netplay_discovery.o \
-			network/netplay/netplay_buf.o \
-			network/netplay/netplay_room_parse.o
+               network/netplay/netplay_frontend.o \
+               network/netplay/netplay_handshake.o \
+               network/netplay/netplay_init.o \
+               network/netplay/netplay_io.o \
+               network/netplay/netplay_keyboard.o \
+               network/netplay/netplay_sync.o \
+               network/netplay/netplay_discovery.o \
+               network/netplay/netplay_buf.o \
+               network/netplay/netplay_room_parse.o
 
    # Retro Achievements
    ifeq ($(HAVE_CHEEVOS), 1)
       DEFINES += -DHAVE_CHEEVOS
 		
-		OBJ += cheevos/cheevos.o \
-				 cheevos/badges.o \
-				 cheevos/var.o \
-				 cheevos/cond.o
+      OBJ += cheevos/cheevos.o \
+             cheevos/badges.o \
+             cheevos/var.o \
+             cheevos/cond.o
 
-
-   ifeq ($(HAVE_LUA), 1)
-      DEFINES += -DHAVE_LUA \
-         -DLUA_32BITS \
-         -Ideps/lua/src
-      OBJ += deps/lua/src/lapi.o \
-         deps/lua/src/lcode.o \
-         deps/lua/src/lctype.o \
-         deps/lua/src/ldebug.o \
-         deps/lua/src/ldo.o \
-         deps/lua/src/ldump.o \
-         deps/lua/src/lfunc.o \
-         deps/lua/src/lgc.o \
-         deps/lua/src/llex.o \
-         deps/lua/src/lmem.o \
-         deps/lua/src/lobject.o \
-         deps/lua/src/lopcodes.o \
-         deps/lua/src/lparser.o \
-         deps/lua/src/lstate.o \
-         deps/lua/src/lstring.o \
-         deps/lua/src/ltable.o \
-         deps/lua/src/ltm.o \
-         deps/lua/src/lundump.o \
-         deps/lua/src/lvm.o \
-         deps/lua/src/lzio.o \
-         deps/lua/src/lauxlib.o \
-         deps/lua/src/lbaselib.o \
-         deps/lua/src/lbitlib.o \
-         deps/lua/src/lcorolib.o \
-         deps/lua/src/ldblib.o \
-         deps/lua/src/liolib.o \
-         deps/lua/src/lmathlib.o \
-         deps/lua/src/loslib.o \
-         deps/lua/src/lstrlib.o \
-         deps/lua/src/ltablib.o \
-         deps/lua/src/lutf8lib.o \
-         deps/lua/src/loadlib.o \
-         deps/lua/src/linit.o
-   else
-      DEFINES += -DRC_DISABLE_LUA
+      ifeq ($(HAVE_LUA), 1)
+         DEFINES += -DHAVE_LUA \
+                    -DLUA_32BITS \
+                    -Ideps/lua/src
+         OBJ += deps/lua/src/lapi.o \
+                deps/lua/src/lcode.o \
+                deps/lua/src/lctype.o \
+                deps/lua/src/ldebug.o \
+                deps/lua/src/ldo.o \
+                deps/lua/src/ldump.o \
+                deps/lua/src/lfunc.o \
+                deps/lua/src/lgc.o \
+                deps/lua/src/llex.o \
+                deps/lua/src/lmem.o \
+                deps/lua/src/lobject.o \
+                deps/lua/src/lopcodes.o \
+                deps/lua/src/lparser.o \
+                deps/lua/src/lstate.o \
+                deps/lua/src/lstring.o \
+                deps/lua/src/ltable.o \
+                deps/lua/src/ltm.o \
+                deps/lua/src/lundump.o \
+                deps/lua/src/lvm.o \
+                deps/lua/src/lzio.o \
+                deps/lua/src/lauxlib.o \
+                deps/lua/src/lbaselib.o \
+                deps/lua/src/lbitlib.o \
+                deps/lua/src/lcorolib.o \
+                deps/lua/src/ldblib.o \
+                deps/lua/src/liolib.o \
+                deps/lua/src/lmathlib.o \
+                deps/lua/src/loslib.o \
+                deps/lua/src/lstrlib.o \
+                deps/lua/src/ltablib.o \
+                deps/lua/src/lutf8lib.o \
+                deps/lua/src/loadlib.o \
+                deps/lua/src/linit.o
+      else
+         DEFINES += -DRC_DISABLE_LUA
+      endif
    endif
 
-	endif
-
    ifeq ($(HAVE_DISCORD), 1)
       NEED_CXX_LINKER = 1
       DEFINES += -DHAVE_DISCORD
       DEFINES += -Ideps/discord-rpc/include/ -Ideps/discord-rpc/thirdparty/rapidjson-1.1.0/include/
       OBJ     += deps/discord-rpc/src/discord_rpc.o \
-					  deps/discord-rpc/src/rpc_connection.o \
-					  deps/discord-rpc/src/serialization.o \
-					  discord/discord.o
-ifneq ($(findstring Win32,$(OS)),)
-      OBJ  += deps/discord-rpc/src/discord_register_win.o \
-				  deps/discord-rpc/src/connection_win.o
-      LIBS += -lpsapi -ladvapi32
-endif
-ifneq ($(findstring Linux,$(OS)),)
-		OBJ  += deps/discord-rpc/src/discord_register_linux.o \
-				  deps/discord-rpc/src/connection_unix.o
-endif
-ifneq ($(findstring Darwin,$(OS)),)
-		OBJ  += deps/discord-rpc/src/discord_register_osx.o \
-				  deps/discord-rpc/src/connection_unix.o
-endif
+                 deps/discord-rpc/src/rpc_connection.o \
+                 deps/discord-rpc/src/serialization.o \
+                 discord/discord.o
 
+      ifneq ($(findstring Win32,$(OS)),)
+         OBJ  += deps/discord-rpc/src/discord_register_win.o \
+                 deps/discord-rpc/src/connection_win.o
+         LIBS += -lpsapi -ladvapi32
+      endif
+      ifneq ($(findstring Linux,$(OS)),)
+         OBJ  += deps/discord-rpc/src/discord_register_linux.o \
+                 deps/discord-rpc/src/connection_unix.o
+      endif
+      ifneq ($(findstring Darwin,$(OS)),)
+         OBJ  += deps/discord-rpc/src/discord_register_osx.o \
+                 deps/discord-rpc/src/connection_unix.o
+      endif
    endif
 
    ifeq ($(HAVE_NETWORKGAMEPAD), 1)
@@ -1735,12 +1745,12 @@ ifneq ($(findstring Win32,$(OS)),)
 endif
 
 ifeq ($(HAVE_AVFOUNDATION), 1)
-ifeq ($(HAVE_COCOA), 1)
-   DEFINES += -DHAVE_AVFOUNDATION
-   LIBS += -framework AVFoundation
-   LIBS += -framework CoreVideo
-   LIBS += -framework CoreMedia
-endif
+   ifeq ($(HAVE_COCOA), 1)
+      DEFINES += -DHAVE_AVFOUNDATION
+      LIBS += -framework AVFoundation
+      LIBS += -framework CoreVideo
+      LIBS += -framework CoreMedia
+   endif
 endif
 
 # Record
@@ -1749,13 +1759,11 @@ ifeq ($(HAVE_FFMPEG), 1)
    OBJ += record/drivers/record_ffmpeg.o \
           cores/libretro-ffmpeg/ffmpeg_core.o
 
-
    LIBS += $(AVCODEC_LIBS) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(SWSCALE_LIBS) $(SWRESAMPLE_LIBS) $(FFMPEG_LIBS)
    DEFINES += $(AVCODEC_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS) $(SWSCALE_CFLAGS) $(SWRESAMPLE_CFLAGS)
    DEFINES += -Wno-deprecated-declarations -DHAVE_FFMPEG -Iffmpeg
 endif
 
-
 ifeq ($(HAVE_COMPRESSION), 1)
    DEFINES += -DHAVE_COMPRESSION
    OBJ     += tasks/task_decompress.o
@@ -1764,20 +1772,23 @@ endif
 ifeq ($(HAVE_COCOA),1)
    DEFINES += -DHAVE_MAIN
    OBJ += input/drivers/cocoa_input.o \
-			 input/drivers_keyboard/keyboard_event_apple.o \
-			 ui/drivers/ui_cocoa.o \
-			 ui/drivers/cocoa/ui_cocoa_window.o \
-			 ui/drivers/cocoa/ui_cocoa_browser_window.o \
-			 ui/drivers/cocoa/ui_cocoa_msg_window.o \
-			 ui/drivers/cocoa/ui_cocoa_application.o \
-			 ui/drivers/cocoa/cocoa_common.o \
-			 gfx/drivers_context/cocoa_gl_ctx.o
+          input/drivers_keyboard/keyboard_event_apple.o \
+          ui/drivers/ui_cocoa.o \
+          ui/drivers/cocoa/ui_cocoa_window.o \
+          ui/drivers/cocoa/ui_cocoa_browser_window.o \
+          ui/drivers/cocoa/ui_cocoa_msg_window.o \
+          ui/drivers/cocoa/ui_cocoa_application.o \
+          ui/drivers/cocoa/cocoa_common.o \
+          gfx/drivers_context/cocoa_gl_ctx.o
 endif
 
 ifneq ($(findstring DOS,$(OS)),)
-   OBJ += gfx/drivers/vga_gfx.o gfx/drivers_font/vga_font.o \
-          input/drivers/dos_input.o input/drivers_joypad/dos_joypad.o \
- 				  frontend/drivers/platform_dos.o input/drivers_keyboard/keyboard_event_dos.o
+   OBJ += gfx/drivers/vga_gfx.o \
+          gfx/drivers_font/vga_font.o \
+          input/drivers/dos_input.o \
+          input/drivers_joypad/dos_joypad.o \
+          frontend/drivers/platform_dos.o \
+          input/drivers_keyboard/keyboard_event_dos.o
 
    ifeq ($(HAVE_MENU_COMMON), 1)
       OBJ += menu/drivers_display/menu_display_vga.o
@@ -1785,52 +1796,89 @@ ifneq ($(findstring DOS,$(OS)),)
 endif
 
 ifeq ($(HAVE_STATIC_VIDEO_FILTERS), 1)
-OBJ += gfx/video_filters/2xsai.o \
-		 gfx/video_filters/super2xsai.o \
-		 gfx/video_filters/supereagle.o \
-		 gfx/video_filters/2xbr.o \
-		 gfx/video_filters/darken.o \
-		 gfx/video_filters/epx.o \
-		 gfx/video_filters/scale2x.o \
-		 gfx/video_filters/blargg_ntsc_snes.o \
-		 gfx/video_filters/lq2x.o \
-		 gfx/video_filters/phosphor2x.o
+   OBJ += gfx/video_filters/2xsai.o \
+          gfx/video_filters/super2xsai.o \
+          gfx/video_filters/supereagle.o \
+          gfx/video_filters/2xbr.o \
+          gfx/video_filters/darken.o \
+          gfx/video_filters/epx.o \
+          gfx/video_filters/scale2x.o \
+          gfx/video_filters/blargg_ntsc_snes.o \
+          gfx/video_filters/lq2x.o \
+          gfx/video_filters/phosphor2x.o \
+          gfx/video_filters/normal2x.o
 endif
 
 ifeq ($(WANT_IOSUHAX), 1)
-DEFINES += -I$(DEPS_DIR)/libiosuhax
-CFLAGS  += -I$(DEPS_DIR)/libiosuhax
-OBJ += $(DEPS_DIR)/libiosuhax/iosuhax.o \
-		 $(DEPS_DIR)/libiosuhax/iosuhax_devoptab.o \
-		 $(DEPS_DIR)/libiosuhax/iosuhax_disc_interface.o
+   DEFINES += -I$(DEPS_DIR)/libiosuhax
+   CFLAGS  += -I$(DEPS_DIR)/libiosuhax
+   OBJ += $(DEPS_DIR)/libiosuhax/iosuhax.o \
+          $(DEPS_DIR)/libiosuhax/iosuhax_devoptab.o \
+          $(DEPS_DIR)/libiosuhax/iosuhax_disc_interface.o
 endif
 
 ifeq ($(WANT_LIBFAT), 1)
-DEFINES += -I$(DEPS_DIR)/libfat/include
-CFLAGS  += -I$(DEPS_DIR)/libfat/include
-OBJ += $(DEPS_DIR)/libfat/cache.o \
-		 $(DEPS_DIR)/libfat/directory.o \
-		 $(DEPS_DIR)/libfat/disc.o \
-		 $(DEPS_DIR)/libfat/fatdir.o \
-		 $(DEPS_DIR)/libfat/fatfile.o \
-		 $(DEPS_DIR)/libfat/file_allocation_table.o \
-		 $(DEPS_DIR)/libfat/filetime.o \
-		 $(DEPS_DIR)/libfat/libfat.o \
-		 $(DEPS_DIR)/libfat/lock.o \
-		 $(DEPS_DIR)/libfat/partition.o
+   DEFINES += -I$(DEPS_DIR)/libfat/include
+   CFLAGS  += -I$(DEPS_DIR)/libfat/include
+   OBJ += $(DEPS_DIR)/libfat/cache.o \
+          $(DEPS_DIR)/libfat/directory.o \
+          $(DEPS_DIR)/libfat/disc.o \
+          $(DEPS_DIR)/libfat/fatdir.o \
+          $(DEPS_DIR)/libfat/fatfile.o \
+          $(DEPS_DIR)/libfat/file_allocation_table.o \
+          $(DEPS_DIR)/libfat/filetime.o \
+          $(DEPS_DIR)/libfat/libfat.o \
+          $(DEPS_DIR)/libfat/lock.o \
+          $(DEPS_DIR)/libfat/partition.o
 endif
 
 ifeq ($(HAVE_STATIC_AUDIO_FILTERS), 1)
-OBJ += libretro-common/audio/dsp_filters/echo.o \
-		 libretro-common/audio/dsp_filters/eq.o \
-		 libretro-common/audio/dsp_filters/chorus.o \
-		 libretro-common/audio/dsp_filters/iir.o \
-		 libretro-common/audio/dsp_filters/panning.o \
-		 libretro-common/audio/dsp_filters/phaser.o \
-		 libretro-common/audio/dsp_filters/reverb.o \
-		 libretro-common/audio/dsp_filters/wahwah.o
+   OBJ += libretro-common/audio/dsp_filters/echo.o \
+          libretro-common/audio/dsp_filters/eq.o \
+          libretro-common/audio/dsp_filters/chorus.o \
+          libretro-common/audio/dsp_filters/iir.o \
+          libretro-common/audio/dsp_filters/panning.o \
+          libretro-common/audio/dsp_filters/phaser.o \
+          libretro-common/audio/dsp_filters/reverb.o \
+          libretro-common/audio/dsp_filters/wahwah.o
 endif
 
 ifeq ($(HAVE_RPILED), 1)
    OBJ += led/drivers/led_rpi.o
 endif
+
+##################################
+### Classic Platform specifics ###
+###############WIP################
+# Help at https://modmyclassic.com/comp
+
+ifeq ($(HAVE_CLASSIC), 1)
+  CFLAGS += -DHAVE_CLASSIC
+endif
+
+ifeq ($(HAVE_C_A7A7), 1)
+   C_A7A7_OPT = -Ofast \
+                -fno-lto \
+                -fdata-sections -ffunction-sections -Wl,--gc-sections \
+                -fno-stack-protector -fno-ident -fomit-frame-pointer \
+                -falign-functions=1 -falign-jumps=1 -falign-loops=1 \
+                -fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
+                -fmerge-all-constants -fno-math-errno \
+                -marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
+   CFLAGS += $(C_A7A7_OPT)
+   CXXFLAGS += $(C_A7A7_OPT)
+   ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
+      CFLAGS += -march=armv7-a
+   else
+      CFLAGS += -march=armv7ve
+      # If gcc is 5.0 or later
+      ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1)
+         LDFLAGS += -static-libgcc -static-libstdc++
+      endif
+   endif
+endif
+
+ifeq ($(HAVE_HAKCHI), 1)
+   CFLAGS += -DHAVE_HAKCHI
+endif
+##################################
diff --git a/Makefile.griffin b/Makefile.griffin
index 0249e2b8e5..03d6d22d8d 100644
--- a/Makefile.griffin
+++ b/Makefile.griffin
@@ -320,6 +320,7 @@ else ifeq ($(platform), windows_msvc6_x86)
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 0
    HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_MATERIALUI          := 1
    HAVE_XMB                 := 1
@@ -361,6 +362,7 @@ else ifeq ($(platform), windows_msvc2003_x86)
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
    HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_MATERIALUI          := 1
    HAVE_XMB                 := 1
@@ -407,6 +409,7 @@ else ifeq ($(platform), windows_msvc2005_x86)
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
    HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_MATERIALUI          := 1
    HAVE_XMB                 := 1
@@ -454,6 +457,7 @@ else ifneq (,$(findstring windows_msvc2010,$(platform)))
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
    HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_MATERIALUI          := 1
    HAVE_XMB                 := 1
@@ -524,6 +528,7 @@ else ifneq (,$(findstring windows_msvc2012,$(platform)))
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
    HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_MATERIALUI          := 1
    HAVE_XMB                 := 1
@@ -598,6 +603,7 @@ else ifneq (,$(findstring windows_msvc2013,$(platform)))
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
    HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_MATERIALUI          := 1
    HAVE_XMB                 := 1
@@ -672,6 +678,7 @@ else ifneq (,$(findstring windows_msvc2015,$(platform)))
    HAVE_7ZIP                := 1
    HAVE_NETWORKING          := 1
    HAVE_NETWORK_CMD         := 1
+	HAVE_NETPLAYDISCOVERY    := 1
    HAVE_OVERLAY             := 1
    HAVE_MATERIALUI          := 1
    HAVE_XMB                 := 1
@@ -857,6 +864,10 @@ ifeq ($(HAVE_NETWORKING), 1)
    CFLAGS      += -DHAVE_NETWORKING
 endif
 
+ifeq ($(HAVE_NETPLAYDISCOVERY), 1)
+   CFLAGS      += -DHAVE_NETPLAYDISCOVERY
+endif
+
 ifeq ($(RARCH_CONSOLE), 1)
    CFLAGS += -DRARCH_CONSOLE
 endif
diff --git a/Makefile.libnx b/Makefile.libnx
index 00343d6b1c..b9f482b563 100644
--- a/Makefile.libnx
+++ b/Makefile.libnx
@@ -36,6 +36,7 @@ HAVE_STATIC_AUDIO_FILTERS = 1
 HAVE_MENU = 1
 HAVE_RUNAHEAD = 1
 HAVE_NETWORKING = 1
+HAVE_NETPLAYDISCOVERY = 1
 HAVE_STB_FONT = 1
 HAVE_CHEEVOS = 1
 
@@ -55,9 +56,8 @@ ifeq ($(HAVE_OPENGL), 1)
   HAVE_RGUI = 1
   HAVE_MATERIALUI = 1
 
-  HAVE_ZARCH = 0
   HAVE_XMB = 1
-  HAVE_STRIPES = 0
+  HAVE_OZONE = 1
 
   HAVE_OVERLAY = 1
 else
@@ -66,11 +66,12 @@ else
   HAVE_ZARCH = 0
   HAVE_MATERIALUI = 0
   HAVE_XMB = 0
+  HAVE_OZONE = 0
   HAVE_STRIPES = 0
 endif
 
 include Makefile.common
-BLACKLIST := $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
+BLACKLIST :=
 
 OBJ := $(filter-out $(BLACKLIST),$(OBJ))
 
@@ -221,7 +222,8 @@ ifneq ($(ROMFS),)
 	export NROFLAGS += --romfsdir=$(CURDIR)/$(ROMFS)
 endif
 
-DEPENDS	:=	$(OFILES:.o=.d)
+DEPENDS_TMP  := $(OFILES:.o=.d)
+DEPENDS      := $(filter-out libretro_libnx.a,$(DEPENDS_TMP))
 
 .PHONY: clean all
 
@@ -243,7 +245,7 @@ endif
 $(OUTPUT).elf	:	$(OBJ)
 
 clean:
-	rm -f $(OBJ) $(OUTPUT).pfs0 $(OUTPUT).nro $(OUTPUT).elf
+	rm -f $(DEPENDS) $(OBJ) $(OUTPUT).pfs0 $(OUTPUT).nro $(OUTPUT).elf
 
 #---------------------------------------------------------------------------------
 # you need a rule like this for each extension you use as binary data
diff --git a/Makefile.nintendoc b/Makefile.nintendoc
deleted file mode 100644
index 4f971984a4..0000000000
--- a/Makefile.nintendoc
+++ /dev/null
@@ -1,62 +0,0 @@
-# Hakchi version added to ease confusion amongst Hakchi community due to messy past...
-#
-# Make sure you have readelf installed (sudo apt-get install readelf) to patch the binary
-# Might not be needed for your build but it's a useful tool and for safety it should be
-# run anyway to ensure the SDL2 link isn't broken...
-
-HAKCHI_VER := Hakchi_Retroarch_Neo_v1_7_3b
-HAKCHI_NAME := "Hakchi RetroArch 'Neo' v1.7.3b
-MOD_CREATOR := TheOtherGuys
-MOD_CATEGORY := RetroArch
-
-HAKCHI_DIR := hakchi
-TARGET := retroarch
-GIT_COMMIT := $(shell echo "`git rev-parse --short HEAD``git diff-index --quiet HEAD -- || echo '-dirty'`")
-
-all: $(TARGET)
-
-retroarch:
-	readelf -v #Check if you have readelf installed... (sudo apt-get install readelf)
-	./configure --host=arm-linux-gnueabihf --disable-freetype --enable-opengles --enable-udev --enable-alsa --enable-neon --enable-floathard
-	make -f Makefile -j HAVE_HAKCHI=1
-	patchelf --replace-needed libSDL2-2.0.so.0 libSDL2.so retroarch #libSDL2-2.0.so.0 sym link doesn't exist on native build. Just patch the binary...
-	#/usr/bin/arm-linux-gnueabihf-strip retroarch
-	rm -f $(HAKCHI_DIR)/bin/retroarch
-	cp retroarch $(HAKCHI_DIR)/bin/retroarch
-	echo $$(echo "Built by: " $$USER @ $$(date) \\\\\\ Git Commit: $(GIT_COMMIT)) > $(HAKCHI_DIR)/etc/libretro/retroarch_version
-	cp $(HAKCHI_DIR)/readme.md $(HAKCHI_DIR)/readme_COPY.md
-	printf "%s\n" \
-	"---" \
-	"Name: $(HAKCHI_VER)" \
-	"Creator: $(MOD_CREATOR)" \
-	"Category: $(MOD_CATEGORY)" \
-	"Version: $(HAKCHI_VER)" \
-	"Built on: $(shell date)" \
-	"Git commit: $(GIT_COMMIT)" \
-	"---" > $(HAKCHI_DIR)/readme.md
-	cat $(HAKCHI_DIR)/readme_COPY.md >> $(HAKCHI_DIR)/readme.md
-	rm $(HAKCHI_DIR)/readme_COPY.md
-	@echo "** BUILDING HAKCHI $(HAKCHI_VER) HMOD PACKAGE **"
-	cd $(HAKCHI_DIR)/; tar -czvf "$(HAKCHI_VER).hmod" *
-	mv $(HAKCHI_DIR)/$(HAKCHI_VER).hmod .
-	@echo "** BUILT HAKCHI $(HAKCHI_VER) HMOD PACKAGE **"
-clean:
-	rm -f *.o
-	rm -f audio/*.o
-	rm -f conf/*.o
-	rm -f gfx/*.o
-	rm -f gfx/drivers_font/*.o
-	rm -f gfx/drivers_font_renderer/*.o
-	rm -f gfx/drivers_context/*.o
-	rm -f gfx/py_state/*.o
-	rm -f compat/*.o
-	rm -f record/*.o
-	rm -f input/*.o
-	rm -f tools/*.o
-	rm -f $(BINDIR)/retroarch
-	rm -f $(BINDIR)/retroarch-joyconfig
-	rm -f $(PNDDIR)/readme.html
-	rm -f retroarch
-	rm -f $(HAKCHI_DIR)/bin/retroarch
-	rm -f $(HAKCHI_VER).hmod
-	rm -f $(HAKCHI_DIR)/etc/libretro/retroarch_version
diff --git a/Makefile.ps2 b/Makefile.ps2
new file mode 100644
index 0000000000..cbd9a5c556
--- /dev/null
+++ b/Makefile.ps2
@@ -0,0 +1,105 @@
+BUILD_PRX          = 0
+DEBUG              = 1
+HAVE_KERNEL_PRX    = 0
+HAVE_LOGGER        = 0
+HAVE_FILE_LOGGER   = 0
+HAVE_THREADS       = 0
+BIG_STACK          = 0
+WHOLE_ARCHIVE_LINK = 0
+PS2_IP = 192.168.1.150
+
+#Configuration for IRX
+EE_BIN2O = bin2o
+IRX_DIR = $(PS2SDK)/iop/irx
+
+TARGET = retroarchps2.elf
+
+ifeq ($(DEBUG), 1)
+   OPTIMIZE_LV	:= -O0 -g
+	RARCH_DEFINES += -DDEBUG
+else
+   OPTIMIZE_LV	:= -O2
+endif
+
+ifeq ($(WHOLE_ARCHIVE_LINK), 1)
+   WHOLE_START := -Wl,--whole-archive
+   WHOLE_END := -Wl,--no-whole-archive
+endif
+
+INCDIR = -I$(PS2SDK)/ports/include -I$(PS2DEV)/gsKit/include -I$(PS2SDK)/iop/include -I$(PS2SDK)/ee/include -I$(PS2SDK)/common/include
+INCDIR += -Ips2 -Ips2/include -Ilibretro-common/include
+INCDIR += -Ideps -Ideps/stb -Ideps/libz -Ideps/7zip -Ideps/pthreads -Ideps/pthreads/platform/ps2 -Ideps/pthreads/platform/helper
+GPVAL = -G0
+CFLAGS = $(OPTIMIZE_LV)  -ffast-math -fsingle-precision-constant
+ASFLAGS = $(CFLAGS)
+
+RARCH_DEFINES += -DPS2 -DUSE_IOP_CTYPE_MACRO -D_MIPS_ARCH_R5900 -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DWANT_ZLIB
+RARCH_DEFINES += -DHAVE_GRIFFIN=1 -DRARCH_INTERNAL -DRARCH_CONSOLE -DHAVE_MENU -DHAVE_RGUI -DHAVE_FILTERS_BUILTIN -DHAVE_7ZIP -DHAVE_CC_RESAMPLER
+
+LIBDIR =
+LDFLAGS = -L$(PS2SDK)/ports/lib -L$(PS2DEV)/gsKit/lib -L$(PS2SDK)/ee/lib -L.
+#LIBS = $(WHOLE_START) -lretro_ps2 $(WHOLE_END) -lstdc++ -lm -lz -lgskit -ldmakit -lpng -laudsrv -lpad -lcdvd -lmad -lfileXio -lpatches
+LIBS += $(WHOLE_START) -lretro_ps2 $(WHOLE_END) 
+LIBS += -lm -lg -lz -ldebug -lfileXio -laudsrv -lpatches -lpoweroff -ldma -lgskit -ldmakit -lpad -lsdl
+
+#IRX modules
+# IRX modules - modules have to be in IRX_DIR
+IRX = iomanX.irx fileXio.irx usbd.irx usbhdfsd.irx freesd.irx audsrv.irx poweroff.irx ps2dev9.irx ps2atad.irx ps2hdd.irx ps2fs.irx
+IRX_OBJ = $(IRX:.irx=.o)
+EE_OBJS += $(IRX_OBJ)
+
+ifeq ($(HAVE_THREADS), 1)
+RARCH_DEFINES += -DHAVE_THREADS
+endif
+
+ifeq ($(HAVE_FILE_LOGGER), 1)
+CFLAGS += -DHAVE_FILE_LOGGER
+endif
+
+ifeq ($(HAVE_KERNEL_PRX), 1)
+CFLAGS += -DHAVE_KERNEL_PRX
+endif
+
+ifeq ($(BIG_STACK), 1)
+CFLAGS += -DBIG_STACK
+endif
+
+CFLAGS += $(RARCH_DEFINES)
+
+# Missing objecst on the PS2SDK
+EE_OBJS += ps2/compat_ctype.o
+
+#EE_OBJS = griffin/griffin.o bootstrap/ps2/kernel_functions.o
+EE_OBJS += griffin/griffin.o
+
+EE_CFLAGS = $(CFLAGS)
+EE_LDFLAGS = $(LDFLAGS)
+EE_LIBS = $(LIBS)
+EE_ASFLAGS = $(ASFLAGS)
+EE_INCS = $(INCDIR)
+EE_IRX_OBJ = $(IRX_OBJ) 
+EE_BIN = $(TARGET)
+EE_GPVAL = $(GPVAL)
+
+all: $(EE_IRX_OBJ) $(EE_BIN)
+
+clean:
+	rm -f $(EE_BIN) $(EE_OBJS)
+
+prepare:
+	ps2client -h $(PS2_IP) reset
+	ps2client -h $(PS2_IP) netdump
+
+run:
+	ps2client -h $(PS2_IP) execee host:$(EE_BIN)
+
+debug: clean prepare all run
+
+#Specific file name and output per IRX Module
+$(EE_IRX_OBJ):
+	$(EE_BIN2O) $(EE_GPVAL) $(IRX_DIR)/$(@:.o=.irx) $@ $(@:.o=_irx)
+
+#Include preferences
+include $(PS2SDK)/samples/Makefile.pref 
+include $(PS2SDK)/samples/Makefile.eeglobal
+   
\ No newline at end of file
diff --git a/Makefile.wiiu b/Makefile.wiiu
index 83c890e2a8..e77be12ea9 100644
--- a/Makefile.wiiu
+++ b/Makefile.wiiu
@@ -105,7 +105,7 @@ endif
    	OBJ += griffin/griffin.o
    	DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB
    	DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
-   	DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING
+   	DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY
    #	DEFINES += -DWANT_IFADDRS
    #	DEFINES += -DHAVE_FREETYPE
    	DEFINES += -DHAVE_XMB -DHAVE_MATERIALUI
@@ -128,6 +128,7 @@ endif
    	HAVE_LANGEXTRA = 1
    	HAVE_LIBRETRODB = 1
    	HAVE_NETWORKING = 1
+		HAVE_NETPLAYDISCOVERY = 1
    	HAVE_CHEEVOS = 1
    #	WANT_IFADDRS = 1
    	HAVE_OVERLAY = 1
@@ -137,8 +138,6 @@ endif
    	WANT_IOSUHAX = 1
 
    	include Makefile.common
-   	BLACKLIST := $(LIBRETRO_COMM_DIR)/net/net_ifinfo.o
-   	OBJ := $(filter-out $(BLACKLIST),$(OBJ))
 
    	OBJ += gfx/drivers/gx2_gfx.o
    	OBJ += gfx/drivers_font/wiiu_font.o
diff --git a/Makefile.win b/Makefile.win
index 932d0f896f..02d70bde7f 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -8,6 +8,7 @@ HAVE_OPENGL = 1
 HAVE_DYLIB = 1
 HAVE_D3D9 = 1
 HAVE_NETWORKING = 1
+HAVE_NETPLAYDISCOVERY = 1
 HAVE_STDIN_CMD = 1
 HAVE_COMMAND = 1
 HAVE_THREADS = 1
diff --git a/README.md b/README.md
index 1e4105cc53..c7fcf261c5 100644
--- a/README.md
+++ b/README.md
@@ -189,46 +189,46 @@ The default super resolution is 2560. It is displayed just under the CRT switch
 
 If native resolutions are activated you will need a whole new set of modelines:
 
-- 512 x 240 @ 50.006977 SNESpal
+- 256 x 240 @ 50.006977 SNESpal
+- 256 x 448 @ 50.006977 SNESpal
 - 512 x 224 @ 50.006977 SNESpal
+- 512 x 240 @ 50.006977 SNESpal
 - 512 x 448 @ 50.006977 SNESpal
+- 256 x 240 @ 60.098812 SNESntsc
+- 256 x 448 @ 60.098812 SNESntsc
 - 512 x 240 @ 60.098812 SNESntsc
 - 512 x 224 @ 60.098812 SNESntsc
 - 512 x 448 @ 60.098812 SNESntsc
-- 256 x 240 @ 50.006977 SNESpal
-- 256 x 448 @ 50.006977 SNESpal
-- 256 x 240 @ 60.098812 SNESntsc
-- 256 x 448 @ 60.098812 SNESntsc
-- 320 x 240 @ 59.922745 MDntsc
-- 320 x 448 @ 59.922745 MDntp
-- 320 x 480 @ 59.922745 MDntsc
 - 256 x 192 @ 59.922745 MDntsc
-- 320 x 224 @ 59.922745 MDntsc
 - 256 x 224 @ 59.922745 MDntsc
-- 320 x 288 @ 49.701458 MDpal
-- 320 x 576 @ 49.701458 MDpal
+- 320 x 224 @ 59.922745 MDntsc
+- 320 x 240 @ 59.922745 MDntsc
+- 320 x 448 @ 59.922745 MDntsc
+- 320 x 480 @ 59.922745 MDntsc
 - 256 x 192 @ 49.701458 MDpal
+- 256 x 224 @ 49.701458 MDpal
 - 320 x 224 @ 49.701458 MDpal
 - 320 x 240 @ 49.701458 MDpal
+- 320 x 288 @ 49.701458 MDpal
 - 320 x 448 @ 49.701458 MDpal
 - 320 x 480 @ 49.701458 MDpal
-- 256 x 224 @ 49.701458 MDpal
+- 320 x 576 @ 49.701458 MDpal
 - 256 x 288 @ 49.701458 MSYSpal
 - 256 x 240 @ 60.098812 NESntsc
 - 256 x 240 @ 50.006977 NESpal
 
-- 640 x 480 @ 60.130001 N64ntsc
 - 640 x 237 @ 60.130001 N64ntsc
 - 640 x 240 @ 60.130001 N64ntsc
+- 640 x 480 @ 60.130001 N64ntsc
+- 640 x 288 @ 50.000000 N64pal
 - 640 x 480 @ 50.000000 N64pal
-- 640 x 576 @ 50.000000 n64pal
-- 640 x 288 @ 50.000000 n64pal
+- 640 x 576 @ 50.000000 N64pal
 
 - 256 x 252 @ 49.759998 PSXpal
-- 384 x 252 @ 49.759998 PSXpal
-- 640 x 540 @ 49.759998 PSXpal
 - 320 x 252 @ 49.759998 PSXpal
+- 384 x 252 @ 49.759998 PSXpal
 - 640 x 252 @ 49.759998 PSXpal
+- 640 x 540 @ 49.759998 PSXpal
 
 - 384 x 240 @ 59.941002 PSXntsc
 - 256 x 480 @ 59.941002 PSXntsc
diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index d0cc9d6497..cae227e790 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -796,6 +796,9 @@ size_t audio_driver_sample_batch(const int16_t *data, size_t frames)
  **/
 void audio_driver_sample_rewind(int16_t left, int16_t right)
 {
+   if (audio_driver_rewind_ptr == 0)
+      return;
+
    audio_driver_rewind_buf[--audio_driver_rewind_ptr] = right;
    audio_driver_rewind_buf[--audio_driver_rewind_ptr] = left;
 }
@@ -819,7 +822,10 @@ size_t audio_driver_sample_batch_rewind(const int16_t *data, size_t frames)
    size_t samples   = frames << 1;
 
    for (i = 0; i < samples; i++)
-      audio_driver_rewind_buf[--audio_driver_rewind_ptr] = data[i];
+   {
+      if (audio_driver_rewind_ptr > 0)
+         audio_driver_rewind_buf[--audio_driver_rewind_ptr] = data[i];
+   }
 
    return frames;
 }
@@ -905,11 +911,13 @@ void audio_driver_setup_rewind(void)
 
    for (i = 0; i < audio_driver_data_ptr; i += 2)
    {
-      audio_driver_rewind_buf[--audio_driver_rewind_ptr] =
-         audio_driver_output_samples_conv_buf[i + 1];
+      if (audio_driver_rewind_ptr > 0)
+         audio_driver_rewind_buf[--audio_driver_rewind_ptr] =
+            audio_driver_output_samples_conv_buf[i + 1];
 
-      audio_driver_rewind_buf[--audio_driver_rewind_ptr] =
-         audio_driver_output_samples_conv_buf[i + 0];
+      if (audio_driver_rewind_ptr > 0)
+         audio_driver_rewind_buf[--audio_driver_rewind_ptr] =
+            audio_driver_output_samples_conv_buf[i + 0];
    }
 
    audio_driver_data_ptr = 0;
diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index 1d67fa0768..c90db9873c 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -335,6 +335,7 @@ extern audio_driver_t audio_ps3;
 extern audio_driver_t audio_gx;
 extern audio_driver_t audio_ax;
 extern audio_driver_t audio_psp;
+extern audio_driver_t audio_ps2;
 extern audio_driver_t audio_ctr_csnd;
 extern audio_driver_t audio_ctr_dsp;
 extern audio_driver_t audio_switch;
diff --git a/audio/drivers/wasapi.c b/audio/drivers/wasapi.c
index 593a377082..d711fd7141 100644
--- a/audio/drivers/wasapi.c
+++ b/audio/drivers/wasapi.c
@@ -29,6 +29,19 @@
 #include <mmreg.h>
 #include <audioclient.h>
 
+#ifdef _MSC_VER
+/* IID_IAudioClient                 1CB9AD4C-DBFA-4c32-B178-C2F568A703B2 */
+static const GUID IID_IAudioClient = { 0x1CB9AD4C, 0xDBFA, 0xB178, 0xC2, 0xF5, 0x68, 0xA7, 0x03, 0xB2 };
+/* IID_IAudioRenderClient           F294ACFC-3146-4483-A7BF-ADDCA7C260E2 */
+static const GUID IID_IAudioRenderClient = { 0xF294ACFC, 0x3146, 0x4483, 0xA7BF, 0xAD, 0xDC, 0xA7, 0xC2, 0x60, 0xE2 };
+/* IID_IMMDeviceEnumerator          A95664D2-9614-4F35-A746-DE8DB63617E6 */
+static const GUID IID_IMMDeviceEnumerator = { 0xA95664D2, 0x9614, 0x4F35, 0xA746, 0xDE, 0x8D, 0xB6, 0x36, 0x17, 0xE6 };
+/* CLSID_MMDeviceEnumerator         BCDE0395-E52F-467C-8E3D-C4579291692E */
+static const GUID CLSID_MMDeviceEnumerator = { 0xBCDE0395, 0xE52F, 0x467C, 0x8E3D, 0xC4, 0x57, 0x92, 0x91, 0x69, 0x2E };
+/* KSDATAFORMAT_SUBTYPE_IEEE_FLOAT  00000003-0000-0010-8000-00aa00389b71 */
+static const GUID KSDATAFORMAT_SUBTYPE_IEEE_FLOAT = { 0x00000003, 0x0000, 0x0010, 0x8000, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71 };
+#endif
+
 #include <lists/string_list.h>
 #include <queues/fifo_queue.h>
 
diff --git a/cheevos-new/cheevos.c b/cheevos-new/cheevos.c
index e67af93c59..78d7d0d6ab 100644
--- a/cheevos-new/cheevos.c
+++ b/cheevos-new/cheevos.c
@@ -1743,7 +1743,10 @@ found:
 
       {
          settings_t *settings = config_get_ptr();
-         if (!string_is_equal(settings->arrays.menu_driver, "xmb") ||
+         if (!(
+               string_is_equal(settings->arrays.menu_driver, "xmb") || 
+               string_is_equal(settings->arrays.menu_driver, "ozone")
+            ) ||
                !settings->bools.cheevos_badges_enable)
             CORO_RET();
       }
diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index d6d1b36325..c4f637255f 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -1,3735 +1,3738 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2015-2018 - Andre Leiradella
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <string.h>
-#include <ctype.h>
-
-#include <file/file_path.h>
-#include <string/stdstring.h>
-#include <formats/jsonsax.h>
-#include <streams/interface_stream.h>
-#include <streams/file_stream.h>
-#include <features/features_cpu.h>
-#include <compat/strl.h>
-#include <rhash.h>
-#include <retro_miscellaneous.h>
-#include <retro_math.h>
-#include <net/net_http.h>
-#include <libretro.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-#ifdef HAVE_MENU
-#include "../menu/menu_driver.h"
-#include "../menu/menu_entries.h"
-#endif
-
-#ifdef HAVE_THREADS
-#include <rthreads/rthreads.h>
-#endif
-
-#include "badges.h"
-#include "cheevos.h"
-#include "var.h"
-#include "cond.h"
-
-#include "../file_path_special.h"
-#include "../paths.h"
-#include "../command.h"
-#include "../dynamic.h"
-#include "../configuration.h"
-#include "../performance_counters.h"
-#include "../msg_hash.h"
-#include "../retroarch.h"
-#include "../core.h"
-
-#include "../network/net_http_special.h"
-#include "../tasks/tasks_internal.h"
-
-#include "../verbosity.h"
-
-/* Define this macro to prevent cheevos from being deactivated. */
-#undef CHEEVOS_DONT_DEACTIVATE
-
-/* Define this macro to log URLs (will log the user token). */
-#undef CHEEVOS_LOG_URLS
-
-/* Define this macro to dump all cheevos' addresses. */
-#undef CHEEVOS_DUMP_ADDRS
-
-/* Define this macro to remove HTTP timeouts. */
-#undef CHEEVOS_NO_TIMEOUT
-
-/* Define this macro to load a JSON file from disk instead of downloading
- * from retroachievements.org. */
-#undef CHEEVOS_JSON_OVERRIDE
-
-/* Define this macro with a string to save the JSON file to disk with
- * that name. */
-#undef CHEEVOS_SAVE_JSON
-
-/* Define this macro to have the password and token logged. THIS WILL DISCLOSE
- * THE USER'S PASSWORD, TAKE CARE! */
-#undef CHEEVOS_LOG_PASSWORD
-
-/* Define this macro to log downloaded badge images. */
-#undef CHEEVOS_LOG_BADGES
-
-/* C89 wants only int values in enums. */
-#define CHEEVOS_JSON_KEY_GAMEID       0xb4960eecU
-#define CHEEVOS_JSON_KEY_ACHIEVEMENTS 0x69749ae1U
-#define CHEEVOS_JSON_KEY_ID           0x005973f2U
-#define CHEEVOS_JSON_KEY_MEMADDR      0x1e76b53fU
-#define CHEEVOS_JSON_KEY_TITLE        0x0e2a9a07U
-#define CHEEVOS_JSON_KEY_DESCRIPTION  0xe61a1f69U
-#define CHEEVOS_JSON_KEY_POINTS       0xca8fce22U
-#define CHEEVOS_JSON_KEY_AUTHOR       0xa804edb8U
-#define CHEEVOS_JSON_KEY_MODIFIED     0xdcea4fe6U
-#define CHEEVOS_JSON_KEY_CREATED      0x3a84721dU
-#define CHEEVOS_JSON_KEY_BADGENAME    0x887685d9U
-#define CHEEVOS_JSON_KEY_CONSOLE_ID   0x071656e5U
-#define CHEEVOS_JSON_KEY_TOKEN        0x0e2dbd26U
-#define CHEEVOS_JSON_KEY_FLAGS        0x0d2e96b2U
-#define CHEEVOS_JSON_KEY_LEADERBOARDS 0xf1247d2dU
-#define CHEEVOS_JSON_KEY_MEM          0x0b8807e4U
-#define CHEEVOS_JSON_KEY_FORMAT       0xb341208eU
-#define CHEEVOS_JSON_KEY_SUCCESS      0x110461deU
-#define CHEEVOS_JSON_KEY_ERROR        0x0d2011cfU
-
-typedef struct
-{
-   cheevos_cond_t *conds;
-   unsigned        count;
-} cheevos_condset_t;
-
-typedef struct
-{
-   cheevos_condset_t *condsets;
-   unsigned count;
-} cheevos_condition_t;
-
-typedef struct
-{
-   unsigned    id;
-   const char *title;
-   const char *description;
-   const char *author;
-   const char *badge;
-   unsigned    points;
-   unsigned    dirty;
-   int         active;
-   int         last;
-   int         modified;
-
-   cheevos_condition_t condition;
-} cheevo_t;
-
-typedef struct
-{
-   cheevo_t *cheevos;
-   unsigned  count;
-} cheevoset_t;
-
-typedef struct
-{
-   int is_element;
-   int mode;
-} cheevos_deactivate_t;
-
-typedef struct
-{
-   unsigned    key_hash;
-   int         is_key;
-   const char *value;
-   size_t      length;
-} cheevos_getvalueud_t;
-
-typedef struct
-{
-   int      in_cheevos;
-   int      in_lboards;
-   uint32_t field_hash;
-   unsigned core_count;
-   unsigned unofficial_count;
-   unsigned lboard_count;
-} cheevos_countud_t;
-
-typedef struct
-{
-   const char *string;
-   size_t      length;
-} cheevos_field_t;
-
-typedef struct
-{
-   int      in_cheevos;
-   int      in_lboards;
-   int      is_console_id;
-   unsigned core_count;
-   unsigned unofficial_count;
-   unsigned lboard_count;
-
-   cheevos_field_t *field;
-   cheevos_field_t  id, memaddr, title, desc, points, author;
-   cheevos_field_t  modified, created, badge, flags, format;
-} cheevos_readud_t;
-
-typedef struct
-{
-   int label;
-   const char *name;
-   const uint32_t *ext_hashes;
-} cheevos_finder_t;
-
-typedef struct
-{
-   cheevos_var_t var;
-   double        multiplier;
-   bool          compare_next;
-} cheevos_term_t;
-
-typedef struct
-{
-   cheevos_term_t *terms;
-   unsigned        count;
-   unsigned        compare_count;
-} cheevos_expr_t;
-
-typedef struct
-{
-   unsigned    id;
-   unsigned    format;
-   const char *title;
-   const char *description;
-   int         active;
-   int         last_value;
-
-   cheevos_condition_t start;
-   cheevos_condition_t cancel;
-   cheevos_condition_t submit;
-   cheevos_expr_t      value;
-} cheevos_leaderboard_t;
-
-typedef struct
-{
-   retro_task_t* task;
-#ifdef HAVE_THREADS
-   slock_t*      task_lock;
-#endif
-
-   cheevos_console_t console_id;
-   bool core_supports;
-   bool addrs_patched;
-   int  add_buffer;
-   int  add_hits;
-
-   cheevoset_t core;
-   cheevoset_t unofficial;
-   cheevos_leaderboard_t *leaderboards;
-   unsigned lboard_count;
-
-   char token[32];
-
-   retro_ctx_memory_info_t meminfo[4];
-} cheevos_locals_t;
-
-typedef struct
-{
-   uint8_t id[4]; /* NES^Z */
-   uint8_t rom_size;
-   uint8_t vrom_size;
-   uint8_t rom_type;
-   uint8_t rom_type2;
-   uint8_t reserve[8];
-} cheevos_nes_header_t;
-
-static cheevos_locals_t cheevos_locals =
-{
-   /* task                */ NULL,
-#ifdef HAVE_THREADS
-   /* task_lock           */ NULL,
-#endif
-
-   /* console_id          */ CHEEVOS_CONSOLE_NONE,
-   /* core_supports       */ true,
-   /* addrs_patched       */ false,
-   /* add_buffer          */ 0,
-   /* add_hits            */ 0,
-
-   /* core                */ {NULL, 0},
-   /* unofficial          */ {NULL, 0},
-   /* leaderboards        */ NULL,
-   /* lboard_count        */ 0,
-
-   /* token               */ {0},
-
-   {
-   /* meminfo[0]          */ {NULL, 0, 0},
-   /* meminfo[1]          */ {NULL, 0, 0},
-   /* meminfo[2]          */ {NULL, 0, 0},
-   /* meminfo[3]          */ {NULL, 0, 0}
-   }
-};
-
-bool cheevos_loaded = false;
-bool cheevos_hardcore_active = false;
-bool cheevos_hardcore_paused = false;
-bool cheevos_state_loaded_flag = false;
-int cheats_are_enabled = 0;
-int cheats_were_enabled = 0;
-
-#ifdef HAVE_THREADS
-#define CHEEVOS_LOCK(l)   do { slock_lock(l); } while (0)
-#define CHEEVOS_UNLOCK(l) do { slock_unlock(l); } while (0)
-#else
-#define CHEEVOS_LOCK(l)
-#define CHEEVOS_UNLOCK(l)
-#endif
-
-/*****************************************************************************
-Supporting functions.
-*****************************************************************************/
-
-#ifndef CHEEVOS_VERBOSE
-
-void cheevos_log(const char *fmt, ...)
-{
-   (void)fmt;
-}
-
-#endif
-
-static unsigned size_in_megabytes(unsigned val)
-{
-   return (val * 1024 * 1024);
-}
-
-#ifdef CHEEVOS_LOG_URLS
-static void cheevos_log_url(const char* format, const char* url)
-{
-#ifdef CHEEVOS_LOG_PASSWORD
-   CHEEVOS_LOG(format, url);
-#else
-   char copy[256];
-   char* aux      = NULL;
-   char* next     = NULL;
-
-   if (!string_is_empty(url))
-      strlcpy(copy, url, sizeof(copy));
-
-   aux = strstr(copy, "?p=");
-
-   if (!aux)
-      aux = strstr(copy, "&p=");
-
-   if (aux)
-   {
-      aux += 3;
-      next = strchr(aux, '&');
-
-      if (next)
-      {
-         do
-         {
-            *aux++ = *next++;
-         }while (next[-1] != 0);
-      }
-      else
-         *aux = 0;
-   }
-
-   aux = strstr(copy, "?t=");
-
-   if (!aux)
-      aux = strstr(copy, "&t=");
-
-   if (aux)
-   {
-      aux += 3;
-      next = strchr(aux, '&');
-
-      if (next)
-      {
-         do
-         {
-            *aux++ = *next++;
-         }while (next[-1] != 0);
-      }
-      else
-         *aux = 0;
-   }
-
-   CHEEVOS_LOG(format, copy);
-#endif
-}
-#endif
-
-static uint32_t cheevos_djb2(const char* str, size_t length)
-{
-   const unsigned char *aux = (const unsigned char*)str;
-   const unsigned char *end = aux + length;
-   uint32_t            hash = 5381;
-
-   while (aux < end)
-      hash = (hash << 5) + hash + *aux++;
-
-   return hash;
-}
-
-static int cheevos_getvalue__json_key(void *userdata,
-      const char *name, size_t length)
-{
-   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
-
-   if (ud)
-      ud->is_key = cheevos_djb2(name, length) == ud->key_hash;
-   return 0;
-}
-
-static int cheevos_getvalue__json_string(void *userdata,
-      const char *string, size_t length)
-{
-   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
-
-   if (ud && ud->is_key)
-   {
-      ud->value  = string;
-      ud->length = length;
-      ud->is_key = 0;
-   }
-
-   return 0;
-}
-
-static int cheevos_getvalue__json_boolean(void *userdata, int istrue)
-{
-   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
-
-   if (ud && ud->is_key)
-   {
-      if (istrue)
-      {
-         ud->value  = "true";
-         ud->length = 4;
-      }
-      else
-      {
-         ud->value  = "false";
-         ud->length = 5;
-      }
-      ud->is_key    = 0;
-   }
-
-   return 0;
-}
-
-static int cheevos_getvalue__json_null(void *userdata)
-{
-   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
-
-   if (ud && ud->is_key )
-   {
-      ud->value = "null";
-      ud->length = 4;
-      ud->is_key = 0;
-   }
-
-   return 0;
-}
-
-static int cheevos_get_value(const char *json, unsigned key_hash,
-      char *value, size_t length)
-{
-   static const jsonsax_handlers_t handlers =
-   {
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      cheevos_getvalue__json_key,
-      NULL,
-      cheevos_getvalue__json_string,
-      cheevos_getvalue__json_string, /* number */
-      cheevos_getvalue__json_boolean,
-      cheevos_getvalue__json_null
-   };
-
-   cheevos_getvalueud_t ud;
-
-   ud.key_hash = key_hash;
-   ud.is_key   = 0;
-   ud.value    = NULL;
-   ud.length   = 0;
-   *value      = 0;
-
-   if ((jsonsax_parse(json, &handlers, (void*)&ud) == JSONSAX_OK)
-         && ud.value && ud.length < length)
-   {
-      if (!string_is_empty(ud.value))
-         strlcpy(value, ud.value, ud.length + 1);
-      return 0;
-   }
-
-   return -1;
-}
-
-/*****************************************************************************
-Count number of achievements in a JSON file.
-*****************************************************************************/
-
-static int cheevos_count__json_end_array(void *userdata)
-{
-  cheevos_countud_t* ud = (cheevos_countud_t*)userdata;
-
-  if (ud)
-  {
-     ud->in_cheevos     = 0;
-     ud->in_lboards     = 0;
-  }
-
-  return 0;
-}
-
-static int cheevos_count__json_key(void *userdata,
-      const char *name, size_t length)
-{
-   cheevos_countud_t* ud = (cheevos_countud_t*)userdata;
-
-   if (ud)
-   {
-      ud->field_hash        = cheevos_djb2(name, length);
-      if (ud->field_hash == CHEEVOS_JSON_KEY_ACHIEVEMENTS)
-         ud->in_cheevos = 1;
-      else if (ud->field_hash == CHEEVOS_JSON_KEY_LEADERBOARDS)
-         ud->in_lboards = 1;
-   }
-
-   return 0;
-}
-
-static int cheevos_count__json_number(void *userdata,
-      const char *number, size_t length)
-{
-   cheevos_countud_t* ud = (cheevos_countud_t*)userdata;
-
-   if (ud)
-   {
-      if (ud->in_cheevos && ud->field_hash == CHEEVOS_JSON_KEY_FLAGS)
-      {
-         long flags = strtol(number, NULL, 10);
-
-         if (flags == 3)
-            ud->core_count++;       /* Core achievements */
-         else if (flags == 5)
-            ud->unofficial_count++; /* Unofficial achievements */
-      }
-      else if (ud->in_lboards && ud->field_hash == CHEEVOS_JSON_KEY_ID)
-         ud->lboard_count++;
-   }
-
-   return 0;
-}
-
-static int cheevos_count_cheevos(const char *json,
-      unsigned *core_count, unsigned *unofficial_count,
-      unsigned *lboard_count)
-{
-   static const jsonsax_handlers_t handlers =
-   {
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      cheevos_count__json_end_array,
-      cheevos_count__json_key,
-      NULL,
-      NULL,
-      cheevos_count__json_number,
-      NULL,
-      NULL
-   };
-
-   int res;
-   cheevos_countud_t ud;
-   ud.in_cheevos       = 0;
-   ud.in_lboards       = 0;
-   ud.core_count       = 0;
-   ud.unofficial_count = 0;
-   ud.lboard_count     = 0;
-
-   res                 = jsonsax_parse(json, &handlers, (void*)&ud);
-
-   *core_count         = ud.core_count;
-   *unofficial_count   = ud.unofficial_count;
-   *lboard_count       = ud.lboard_count;
-
-   return res;
-}
-
-/*****************************************************************************
-Parse the MemAddr field.
-*****************************************************************************/
-
-static unsigned cheevos_count_cond_sets(const char *memaddr)
-{
-   cheevos_cond_t cond;
-   unsigned count = 0;
-
-   for (;;)
-   {
-      count++;
-
-      for (;;)
-      {
-         cheevos_cond_parse(&cond, &memaddr);
-
-         if (*memaddr != '_')
-            break;
-
-         memaddr++;
-      }
-
-      if (*memaddr != 'S')
-         break;
-
-      memaddr++;
-   }
-
-   return count;
-}
-
-static int cheevos_parse_condition(
-      cheevos_condition_t *condition,
-      const char* memaddr)
-{
-   if (!condition)
-      return 0;
-
-   condition->count = cheevos_count_cond_sets(memaddr);
-
-   if (condition->count)
-   {
-      unsigned set                 = 0;
-      const cheevos_condset_t* end = NULL;
-      cheevos_condset_t *conds     = NULL;
-      cheevos_condset_t *condset   = NULL;
-      cheevos_condset_t *condsets  = (cheevos_condset_t*)
-         calloc(condition->count, sizeof(cheevos_condset_t));
-
-      (void)conds;
-
-      if (!condsets)
-         return -1;
-
-      condition->condsets = condsets;
-      end                 = condition->condsets + condition->count;
-
-      for (condset = condition->condsets; condset < end; condset++, set++)
-      {
-         condset->count =
-            cheevos_cond_count_in_set(memaddr, set);
-         condset->conds = NULL;
-
-         CHEEVOS_LOG("[CHEEVOS]: set %p (index=%u)\n", condset, set);
-         CHEEVOS_LOG("[CHEEVOS]:   conds: %u\n", condset->count);
-
-         if (condset->count)
-         {
-            cheevos_cond_t *conds = (cheevos_cond_t*)
-               calloc(condset->count, sizeof(cheevos_cond_t));
-
-            if (!conds)
-            {
-               while (--condset >= condition->condsets)
-               {
-                  if ((void*)condset->conds)
-                     free((void*)condset->conds);
-               }
-
-               return -1;
-            }
-
-            condset->conds = conds;
-            cheevos_cond_parse_in_set(condset->conds, memaddr, set);
-         }
-      }
-   }
-
-   return 0;
-}
-
-static void cheevos_free_condition(cheevos_condition_t* condition)
-{
-   unsigned i;
-
-   if (!condition)
-      return;
-
-   if (condition->condsets)
-   {
-      for (i = 0; i < condition->count; i++)
-      {
-         if (condition->condsets[i].conds)
-         {
-            free(condition->condsets[i].conds);
-            condition->condsets[i].conds = NULL;
-         }
-      }
-
-      if (condition->condsets)
-      {
-         free(condition->condsets);
-         condition->condsets = NULL;
-      }
-   }
-}
-
-/*****************************************************************************
-Parse the Mem field of leaderboards.
-*****************************************************************************/
-
-static int cheevos_parse_expression(cheevos_expr_t *expr, const char* mem)
-{
-   unsigned i;
-   const char *aux;
-   cheevos_term_t *terms  = NULL;
-   char       *end        = NULL;
-
-   if (!expr)
-      return -1;
-
-   expr->count            = 1;
-   expr->compare_count    = 1;
-
-   for (aux = mem;; aux++)
-   {
-      if (*aux == '"' || *aux == ':')
-         break;
-      expr->count += *aux == '_';
-   }
-
-   if (expr->count > 0)
-      terms = (cheevos_term_t*)
-         calloc(expr->count, sizeof(cheevos_term_t));
-
-   if (!terms)
-      return -1;
-
-   expr->terms = terms;
-
-   for (i = 0; i < expr->count; i++)
-   {
-      expr->terms[i].compare_next = false;
-      expr->terms[i].multiplier   = 1;
-   }
-
-   for (i = 0, aux = mem; i < expr->count;)
-   {
-      cheevos_var_parse(&expr->terms[i].var, &aux);
-
-      if (*aux != '*')
-      {
-         /* expression has no multiplier */
-         if (*aux == '_')
-         {
-            aux++;
-            i++;
-         }
-         else if (*aux == '$')
-         {
-            expr->terms[i].compare_next = true;
-            expr->compare_count++;
-            aux++;
-            i++;
-         }
-
-         /* no multiplier at end of string */
-         else if (*aux == '\0' || *aux == '"' || *aux == ',')
-            return 0;
-
-         /* invalid character in expression */
-         else
-         {
-            if (expr->terms)
-            {
-               free(expr->terms);
-               expr->terms = NULL;
-            }
-            return -1;
-         }
-      }
-      else
-      {
-         if (aux[1] == 'h' || aux[1] == 'H')
-            expr->terms[i].multiplier = (double)strtol(aux + 2, &end, 16);
-         else
-            expr->terms[i].multiplier = strtod(aux + 1, &end);
-         aux = end;
-
-         if (*aux == '$')
-         {
-            aux++;
-            expr->terms[i].compare_next = true;
-            expr->compare_count++;
-         }
-         else
-            expr->terms[i].compare_next = false;
-
-         aux++;
-         i++;
-      }
-   }
-   return 0;
-}
-
-static int cheevos_parse_mem(cheevos_leaderboard_t *lb, const char* mem)
-{
-   lb->start.condsets  = NULL;
-   lb->cancel.condsets = NULL;
-   lb->submit.condsets = NULL;
-   lb->value.terms     = NULL;
-
-   for (;;)
-   {
-      if (*mem == 'S' && mem[1] == 'T' && mem[2] == 'A' && mem[3] == ':')
-      {
-         if (cheevos_parse_condition(&lb->start, mem + 4))
-            goto error;
-      }
-      else if (*mem == 'C' && mem[1] == 'A' && mem[2] == 'N' && mem[3] == ':')
-      {
-         if (cheevos_parse_condition(&lb->cancel, mem + 4))
-            goto error;
-      }
-      else if (*mem == 'S' && mem[1] == 'U' && mem[2] == 'B' && mem[3] == ':')
-      {
-         if (cheevos_parse_condition(&lb->submit, mem + 4))
-            goto error;
-      }
-      else if (*mem == 'V' && mem[1] == 'A' && mem[2] == 'L' && mem[3] == ':')
-      {
-         if (cheevos_parse_expression(&lb->value, mem + 4))
-            goto error;
-      }
-
-      for (mem += 4;; mem++)
-      {
-         if (*mem == ':' && mem[1] == ':')
-         {
-            mem += 2;
-            break;
-         }
-         else if (*mem == '"')
-            return 0;
-      }
-   }
-
-error:
-   cheevos_free_condition(&lb->start);
-   cheevos_free_condition(&lb->cancel);
-   cheevos_free_condition(&lb->submit);
-   if (lb->value.terms)
-   {
-      free((void*)lb->value.terms);
-      lb->value.terms = NULL;
-   }
-   return -1;
-}
-
-/*****************************************************************************
-Load achievements from a JSON string.
-*****************************************************************************/
-
-static INLINE const char *cheevos_dupstr(const cheevos_field_t *field)
-{
-   char *string = (char*)malloc(field->length + 1);
-
-   if (!string)
-      return NULL;
-
-   memcpy ((void*)string, (void*)field->string, field->length);
-   string[field->length] = 0;
-
-   return string;
-}
-
-static int cheevos_new_cheevo(cheevos_readud_t *ud)
-{
-   cheevo_t *cheevo    = NULL;
-   long flags          = strtol(ud->flags.string, NULL, 10);
-
-   if (flags == 3)
-      cheevo           = cheevos_locals.core.cheevos + ud->core_count++;
-   else if (flags == 5)
-      cheevo           = cheevos_locals.unofficial.cheevos + ud->unofficial_count++;
-   else
-      return 0;
-
-   cheevo->id          = (unsigned)strtol(ud->id.string, NULL, 10);
-   cheevo->title       = cheevos_dupstr(&ud->title);
-   cheevo->description = cheevos_dupstr(&ud->desc);
-   cheevo->author      = cheevos_dupstr(&ud->author);
-   cheevo->badge       = cheevos_dupstr(&ud->badge);
-   cheevo->points      = (unsigned)strtol(ud->points.string, NULL, 10);
-   cheevo->dirty       = 0;
-   cheevo->active      = CHEEVOS_ACTIVE_SOFTCORE | CHEEVOS_ACTIVE_HARDCORE;
-   cheevo->last        = 1;
-   cheevo->modified    = 0;
-
-   if (  !cheevo->title       ||
-         !cheevo->description ||
-         !cheevo->author      ||
-         !cheevo->badge)
-      goto error;
-
-   if (cheevos_parse_condition(&cheevo->condition, ud->memaddr.string))
-      goto error;
-
-   return 0;
-
-error:
-   if (cheevo->title)
-   {
-      free((void*)cheevo->title);
-      cheevo->title = NULL;
-   }
-   if (cheevo->description)
-   {
-      free((void*)cheevo->description);
-      cheevo->description = NULL;
-   }
-   if (cheevo->author)
-   {
-      free((void*)cheevo->author);
-      cheevo->author = NULL;
-   }
-   if (cheevo->badge)
-   {
-      free((void*)cheevo->badge);
-      cheevo->badge = NULL;
-   }
-   return -1;
-}
-
-/*****************************************************************************
-Helper functions for displaying leaderboard values.
-*****************************************************************************/
-
-static void cheevos_format_value(const unsigned value, const unsigned type,
-   char* formatted_value, size_t formatted_size)
-{
-   unsigned mins, secs, millis;
-
-   switch(type)
-   {
-      case CHEEVOS_FORMAT_VALUE:
-         snprintf(formatted_value, formatted_size, "%u", value);
-         break;
-
-      case CHEEVOS_FORMAT_SCORE:
-         snprintf(formatted_value, formatted_size,
-               "%06upts", value);
-         break;
-
-      case CHEEVOS_FORMAT_FRAMES:
-         mins   = value / 3600;
-         secs   = (value % 3600) / 60;
-         millis = (int) (value % 60) * (10.00 / 6.00);
-         snprintf(formatted_value, formatted_size,
-               "%02u:%02u.%02u", mins, secs, millis);
-         break;
-
-      case CHEEVOS_FORMAT_MILLIS:
-         mins   = value / 6000;
-         secs   = (value % 6000) / 100;
-         millis = (int) (value % 100);
-         snprintf(formatted_value, formatted_size,
-               "%02u:%02u.%02u", mins, secs, millis);
-         break;
-
-      case CHEEVOS_FORMAT_SECS:
-         mins   = value / 60;
-         secs   = value % 60;
-         snprintf(formatted_value, formatted_size,
-               "%02u:%02u", mins, secs);
-         break;
-
-      default:
-         snprintf(formatted_value, formatted_size,
-               "%u (?)", value);
-   }
-}
-
-unsigned cheevos_parse_format(cheevos_field_t* format)
-{
-   /* Most likely */
-   if (strncmp(format->string, "VALUE", format->length) == 0)
-      return CHEEVOS_FORMAT_VALUE;
-   else if (strncmp(format->string, "TIME", format->length) == 0)
-      return CHEEVOS_FORMAT_FRAMES;
-   else if (strncmp(format->string, "SCORE", format->length) == 0)
-      return CHEEVOS_FORMAT_SCORE;
-
-   /* Less likely */
-   else if (strncmp(format->string, "MILLISECS", format->length) == 0)
-      return CHEEVOS_FORMAT_MILLIS;
-   else if (strncmp(format->string, "TIMESECS", format->length) == 0)
-      return CHEEVOS_FORMAT_SECS;
-
-   /* Rare (RPS only) */
-   else if (strncmp(format->string, "POINTS", format->length) == 0)
-      return CHEEVOS_FORMAT_SCORE;
-   else if (strncmp(format->string, "FRAMES", format->length) == 0)
-      return CHEEVOS_FORMAT_FRAMES;
-   else
-      return CHEEVOS_FORMAT_OTHER;
-}
-
-static int cheevos_new_lboard(cheevos_readud_t *ud)
-{
-   cheevos_leaderboard_t *lboard = NULL;
-   cheevos_leaderboard_t *ldb    = cheevos_locals.leaderboards;
-
-   if (!ldb || !ud)
-      return -1;
-
-   lboard                        = ldb + ud->lboard_count++;
-
-   lboard->id                    = (unsigned)strtol(ud->id.string, NULL, 10);
-   lboard->format                = cheevos_parse_format(&ud->format);
-   lboard->title                 = cheevos_dupstr(&ud->title);
-   lboard->description           = cheevos_dupstr(&ud->desc);
-
-   if (!lboard->title || !lboard->description)
-      goto error;
-
-   if (cheevos_parse_mem(lboard, ud->memaddr.string))
-      goto error;
-
-   return 0;
-
-error:
-   if ((void*)lboard->title)
-      free((void*)lboard->title);
-   if ((void*)lboard->description)
-      free((void*)lboard->description);
-   return -1;
-}
-
-static int cheevos_read__json_key( void *userdata,
-      const char *name, size_t length)
-{
-   cheevos_readud_t *ud = (cheevos_readud_t*)userdata;
-
-   if (ud)
-   {
-      int        common = ud->in_cheevos || ud->in_lboards;
-      uint32_t     hash = cheevos_djb2(name, length);
-      ud->field         = NULL;
-
-      switch (hash)
-      {
-         case CHEEVOS_JSON_KEY_ACHIEVEMENTS:
-            ud->in_cheevos = 1;
-            break;
-         case CHEEVOS_JSON_KEY_LEADERBOARDS:
-            ud->in_lboards = 1;
-            break;
-         case CHEEVOS_JSON_KEY_CONSOLE_ID:
-            ud->is_console_id = 1;
-            break;
-         case CHEEVOS_JSON_KEY_ID:
-            if (common)
-               ud->field = &ud->id;
-            break;
-         case CHEEVOS_JSON_KEY_MEMADDR:
-            if (ud->in_cheevos)
-               ud->field = &ud->memaddr;
-            break;
-         case CHEEVOS_JSON_KEY_MEM:
-            if (ud->in_lboards)
-               ud->field = &ud->memaddr;
-            break;
-         case CHEEVOS_JSON_KEY_TITLE:
-            if (common)
-               ud->field = &ud->title;
-            break;
-         case CHEEVOS_JSON_KEY_DESCRIPTION:
-            if (common)
-               ud->field = &ud->desc;
-            break;
-         case CHEEVOS_JSON_KEY_POINTS:
-            if (ud->in_cheevos)
-               ud->field = &ud->points;
-            break;
-         case CHEEVOS_JSON_KEY_AUTHOR:
-            if (ud->in_cheevos)
-               ud->field = &ud->author;
-            break;
-         case CHEEVOS_JSON_KEY_MODIFIED:
-            if (ud->in_cheevos)
-               ud->field = &ud->modified;
-            break;
-         case CHEEVOS_JSON_KEY_CREATED:
-            if (ud->in_cheevos)
-               ud->field = &ud->created;
-            break;
-         case CHEEVOS_JSON_KEY_BADGENAME:
-            if (ud->in_cheevos)
-               ud->field = &ud->badge;
-            break;
-         case CHEEVOS_JSON_KEY_FLAGS:
-            if (ud->in_cheevos)
-               ud->field = &ud->flags;
-            break;
-         case CHEEVOS_JSON_KEY_FORMAT:
-            if (ud->in_lboards)
-               ud->field = &ud->format;
-            break;
-         default:
-            break;
-      }
-   }
-
-   return 0;
-}
-
-static int cheevos_read__json_string(void *userdata,
-      const char *string, size_t length)
-{
-   cheevos_readud_t *ud = (cheevos_readud_t*)userdata;
-
-   if (ud && ud->field)
-   {
-      ud->field->string = string;
-      ud->field->length = length;
-   }
-
-   return 0;
-}
-
-static int cheevos_read__json_number(void *userdata,
-      const char *number, size_t length)
-{
-   cheevos_readud_t *ud = (cheevos_readud_t*)userdata;
-
-   if (ud)
-   {
-      if (ud->field)
-      {
-         ud->field->string = number;
-         ud->field->length = length;
-      }
-      else if (ud->is_console_id)
-      {
-         cheevos_locals.console_id = (cheevos_console_t)
-            strtol(number, NULL, 10);
-         ud->is_console_id         = 0;
-      }
-   }
-
-   return 0;
-}
-
-static int cheevos_read__json_end_object(void *userdata)
-{
-   cheevos_readud_t *ud = (cheevos_readud_t*)userdata;
-
-   if (ud)
-   {
-      if (ud->in_cheevos)
-         return cheevos_new_cheevo(ud);
-      if (ud->in_lboards)
-         return cheevos_new_lboard(ud);
-   }
-
-   return 0;
-}
-
-static int cheevos_read__json_end_array(void *userdata)
-{
-   cheevos_readud_t *ud = (cheevos_readud_t*)userdata;
-
-   if (ud)
-   {
-      ud->in_cheevos    = 0;
-      ud->in_lboards    = 0;
-   }
-
-   return 0;
-}
-
-static int cheevos_parse(const char *json)
-{
-   static const jsonsax_handlers_t handlers =
-   {
-      NULL,
-      NULL,
-      NULL,
-      cheevos_read__json_end_object,
-      NULL,
-      cheevos_read__json_end_array,
-      cheevos_read__json_key,
-      NULL,
-      cheevos_read__json_string,
-      cheevos_read__json_number,
-      NULL,
-      NULL
-   };
-
-   cheevos_readud_t ud;
-   unsigned core_count, unofficial_count, lboard_count;
-   /* Count the number of achievements in the JSON file. */
-   int res = cheevos_count_cheevos(json, &core_count, &unofficial_count,
-      &lboard_count);
-
-   if (res != JSONSAX_OK)
-      return -1;
-
-   /* Allocate the achievements. */
-
-   cheevos_locals.core.cheevos = (cheevo_t*)
-      calloc(core_count, sizeof(cheevo_t));
-   cheevos_locals.core.count   = core_count;
-
-   cheevos_locals.unofficial.cheevos = (cheevo_t*)
-      calloc(unofficial_count, sizeof(cheevo_t));
-   cheevos_locals.unofficial.count   = unofficial_count;
-
-   cheevos_locals.leaderboards = (cheevos_leaderboard_t*)
-      calloc(lboard_count, sizeof(cheevos_leaderboard_t));
-   cheevos_locals.lboard_count = lboard_count;
-
-   if (   !cheevos_locals.core.cheevos       ||
-          !cheevos_locals.unofficial.cheevos ||
-          !cheevos_locals.leaderboards)
-   {
-      if ((void*)cheevos_locals.core.cheevos)
-         free((void*)cheevos_locals.core.cheevos);
-      if ((void*)cheevos_locals.unofficial.cheevos)
-         free((void*)cheevos_locals.unofficial.cheevos);
-      if ((void*)cheevos_locals.leaderboards)
-         free((void*)cheevos_locals.leaderboards);
-      cheevos_locals.core.count = cheevos_locals.unofficial.count =
-         cheevos_locals.lboard_count = 0;
-
-      return -1;
-   }
-
-   /* Load the achievements. */
-   ud.in_cheevos       = 0;
-   ud.in_lboards       = 0;
-   ud.is_console_id    = 0;
-   ud.field            = NULL;
-   ud.core_count       = 0;
-   ud.unofficial_count = 0;
-   ud.lboard_count     = 0;
-
-   if (jsonsax_parse(json, &handlers, (void*)&ud) != JSONSAX_OK)
-      goto error;
-
-   return 0;
-
-error:
-   cheevos_unload();
-
-   return -1;
-}
-
-/*****************************************************************************
-Test all the achievements (call once per frame).
-*****************************************************************************/
-
-static int cheevos_test_condition(cheevos_cond_t *cond)
-{
-   unsigned sval = 0;
-   unsigned tval = 0;
-
-   if (!cond)
-      return 0;
-
-   sval          = cheevos_var_get_value(&cond->source) +
-                   cheevos_locals.add_buffer;
-   tval          = cheevos_var_get_value(&cond->target);
-
-   switch (cond->op)
-   {
-      case CHEEVOS_COND_OP_EQUALS:
-         return (sval == tval);
-      case CHEEVOS_COND_OP_LESS_THAN:
-         return (sval < tval);
-      case CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL:
-         return (sval <= tval);
-      case CHEEVOS_COND_OP_GREATER_THAN:
-         return (sval > tval);
-      case CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL:
-         return (sval >= tval);
-      case CHEEVOS_COND_OP_NOT_EQUAL_TO:
-         return (sval != tval);
-      default:
-         break;
-   }
-
-   return 1;
-}
-
-static int cheevos_test_pause_cond_set(const cheevos_condset_t *condset,
-      int *dirty_conds, int *reset_conds, int process_pause)
-{
-   int cond_valid            = 0;
-   int set_valid             = 1; /* must start true so AND logic works */
-   cheevos_cond_t *cond      = NULL;
-   const cheevos_cond_t *end = condset->conds + condset->count;
-
-   cheevos_locals.add_buffer = 0;
-   cheevos_locals.add_hits   = 0;
-
-   for (cond = condset->conds; cond < end; cond++)
-   {
-      if (cond->pause != process_pause)
-         continue;
-
-      if (cond->type == CHEEVOS_COND_TYPE_ADD_SOURCE)
-      {
-         cheevos_locals.add_buffer += cheevos_var_get_value(&cond->source);
-         continue;
-      }
-
-      if (cond->type == CHEEVOS_COND_TYPE_SUB_SOURCE)
-      {
-         cheevos_locals.add_buffer -= cheevos_var_get_value(&cond->source);
-         continue;
-      }
-
-      if (cond->type == CHEEVOS_COND_TYPE_ADD_HITS)
-      {
-         if (cheevos_test_condition(cond))
-         {
-            cond->curr_hits++;
-            *dirty_conds = 1;
-         }
-
-         cheevos_locals.add_hits += cond->curr_hits;
-         continue;
-      }
-
-      /* always evaluate the condition to ensure delta values get tracked correctly */
-      cond_valid = cheevos_test_condition(cond);
-
-      /* if the condition has a target hit count that has already been met,
-       * it's automatically true, even if not currently true. */
-      if (  (cond->req_hits != 0) &&
-            (cond->curr_hits + cheevos_locals.add_hits) >= cond->req_hits)
-      {
-            cond_valid = 1;
-      }
-      else if (cond_valid)
-      {
-         cond->curr_hits++;
-         *dirty_conds = 1;
-
-         /* Process this logic, if this condition is true: */
-         if (cond->req_hits == 0)
-            ; /* Not a hit-based requirement: ignore any additional logic! */
-         else if ((cond->curr_hits + cheevos_locals.add_hits) < cond->req_hits)
-            cond_valid = 0; /* HitCount target has not yet been met, condition is not yet valid. */
-      }
-
-      cheevos_locals.add_buffer = 0;
-      cheevos_locals.add_hits   = 0;
-
-      if (cond->type == CHEEVOS_COND_TYPE_PAUSE_IF)
-      {
-         /* as soon as we find a PauseIf that evaluates to true,
-          * stop processing the rest of the group. */
-         if (cond_valid)
-            return 1;
-
-         /* if we make it to the end of the function, make sure we are
-          * indicating nothing matched. if we do find a later PauseIf match,
-          * it'll automatically return true via the previous condition. */
-         set_valid = 0;
-
-         if (cond->req_hits == 0)
-         {
-            /* PauseIf didn't evaluate true, and doesn't have a HitCount,
-             * reset the HitCount to indicate the condition didn't match. */
-            if (cond->curr_hits != 0)
-            {
-               cond->curr_hits = 0;
-               *dirty_conds = 1;
-            }
-         }
-         else
-         {
-            /* PauseIf has a HitCount that hasn't been met, ignore it for now. */
-         }
-      }
-      else if (cond->type == CHEEVOS_COND_TYPE_RESET_IF)
-      {
-         if (cond_valid)
-         {
-            *reset_conds = 1; /* Resets all hits found so far */
-            set_valid    = 0; /* Cannot be valid if we've hit a reset condition. */
-         }
-      }
-      else /* Sequential or non-sequential? */
-         set_valid &= cond_valid;
-   }
-
-   return set_valid;
-}
-
-static int cheevos_test_cond_set(const cheevos_condset_t *condset,
-      int *dirty_conds, int *reset_conds)
-{
-   int in_pause              = 0;
-   int has_pause             = 0;
-   cheevos_cond_t *cond      = NULL;
-
-   if (!condset)
-      return 1; /* important: empty group must evaluate true */
-
-   /* the ints below are used for Pause conditions and their dependent AddSource/AddHits. */
-
-   /* this loop needs to go backwards to check AddSource/AddHits */
-   cond = condset->conds + condset->count - 1;
-   for (; cond >= condset->conds; cond--)
-   {
-      if (cond->type == CHEEVOS_COND_TYPE_PAUSE_IF)
-      {
-         has_pause = 1;
-         in_pause = 1;
-         cond->pause = 1;
-      }
-      else if (cond->type == CHEEVOS_COND_TYPE_ADD_SOURCE ||
-               cond->type == CHEEVOS_COND_TYPE_SUB_SOURCE ||
-               cond->type == CHEEVOS_COND_TYPE_ADD_HITS)
-      {
-         cond->pause = in_pause;
-      }
-      else
-      {
-         in_pause = 0;
-         cond->pause = 0;
-      }
-   }
-
-   if (has_pause)
-   {  /* one or more Pause conditions exists, if any of them are true,
-       * stop processing this group. */
-      if (cheevos_test_pause_cond_set(condset, dirty_conds, reset_conds, 1))
-         return 0;
-   }
-
-   /* process the non-Pause conditions to see if the group is true */
-   return cheevos_test_pause_cond_set(condset, dirty_conds, reset_conds, 0);
-}
-
-static int cheevos_reset_cond_set(cheevos_condset_t *condset, int deltas)
-{
-   int dirty                 = 0;
-   const cheevos_cond_t *end = NULL;
-
-   if (!condset)
-      return 0;
-
-   end                       = condset->conds + condset->count;
-
-   if (deltas)
-   {
-      cheevos_cond_t *cond      = NULL;
-      for (cond = condset->conds; cond < end; cond++)
-      {
-         dirty                 |= cond->curr_hits != 0;
-
-         cond->curr_hits        = 0;
-
-         cond->source.previous  = cond->source.value;
-         cond->target.previous  = cond->target.value;
-      }
-   }
-   else
-   {
-      cheevos_cond_t *cond      = NULL;
-      for (cond = condset->conds; cond < end; cond++)
-      {
-         dirty           |= cond->curr_hits != 0;
-         cond->curr_hits  = 0;
-      }
-   }
-
-   return dirty;
-}
-
-static int cheevos_test_cheevo(cheevo_t *cheevo)
-{
-   int dirty_conds              = 0;
-   int reset_conds              = 0;
-   int ret_val                  = 0;
-   int ret_val_sub_cond         = 0;
-   cheevos_condset_t *condset   = NULL;
-   cheevos_condset_t *end       = NULL;
-
-   if (!cheevo)
-      return 0;
-
-   ret_val_sub_cond             = cheevo->condition.count == 1;
-   condset                      = cheevo->condition.condsets;
-
-   if (!condset)
-      return 0;
-
-   end                          = condset + cheevo->condition.count;
-
-   if (condset < end)
-   {
-      ret_val = cheevos_test_cond_set(condset, &dirty_conds, &reset_conds);
-      condset++;
-   }
-
-   while (condset < end)
-   {
-      ret_val_sub_cond |= cheevos_test_cond_set(
-            condset, &dirty_conds, &reset_conds);
-      condset++;
-   }
-
-   if (dirty_conds)
-      cheevo->dirty |= CHEEVOS_DIRTY_CONDITIONS;
-
-   if (reset_conds)
-   {
-      int dirty = 0;
-
-      for (condset = cheevo->condition.condsets; condset < end; condset++)
-         dirty |= cheevos_reset_cond_set(condset, 0);
-
-      if (dirty)
-         cheevo->dirty |= CHEEVOS_DIRTY_CONDITIONS;
-   }
-
-   return (ret_val && ret_val_sub_cond);
-}
-
-static void cheevos_url_encode(const char *str, char *encoded, size_t len)
-{
-   if (!str)
-      return;
-
-   while (*str)
-   {
-      if (     isalnum((unsigned char)*str) || *str == '-'
-            || *str == '_' || *str == '.'
-            || *str == '~')
-      {
-         if (len >= 2)
-         {
-            *encoded++ = *str++;
-            len--;
-         }
-         else
-            break;
-      }
-      else
-      {
-         if (len >= 4)
-         {
-            snprintf(encoded, len, "%%%02x", (uint8_t)*str);
-            encoded += 3;
-            str++;
-            len -= 3;
-         }
-         else
-            break;
-      }
-   }
-
-   *encoded = 0;
-}
-
-static void cheevos_make_unlock_url(const cheevo_t *cheevo,
-      char* url, size_t url_size)
-{
-   settings_t *settings = config_get_ptr();
-
-   if (!settings)
-      return;
-
-   snprintf(
-      url, url_size,
-      "http://retroachievements.org/dorequest.php?r=awardachievement&u=%s&t=%s&a=%u&h=%d",
-      settings->arrays.cheevos_username,
-      cheevos_locals.token,
-      cheevo->id,
-      settings->bools.cheevos_hardcore_mode_enable && !cheevos_hardcore_paused ? 1 : 0
-   );
-
-   url[url_size - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-   cheevos_log_url("[CHEEVOS]: url to award the cheevo: %s\n", url);
-#endif
-}
-
-static void cheevos_unlocked(void *task_data, void *user_data,
-      const char *error)
-{
-   cheevo_t *cheevo = (cheevo_t *)user_data;
-
-   if (!error)
-   {
-      CHEEVOS_LOG("[CHEEVOS]: awarded achievement %u.\n", cheevo->id);
-   }
-   else
-   {
-      char url[256];
-      url[0] = '\0';
-
-      CHEEVOS_ERR("[CHEEVOS]: error awarding achievement %u, retrying...\n", cheevo->id);
-
-      cheevos_make_unlock_url(cheevo, url, sizeof(url));
-      task_push_http_transfer(url, true, NULL, cheevos_unlocked, cheevo);
-   }
-}
-
-static void cheevos_test_cheevo_set(const cheevoset_t *set)
-{
-   settings_t *settings = config_get_ptr();
-   int mode             = CHEEVOS_ACTIVE_SOFTCORE;
-   cheevo_t *cheevo     = NULL;
-   const cheevo_t *end  = NULL;
-
-   if (!set)
-      return;
-
-   end                  = set->cheevos + set->count;
-
-   if (settings && settings->bools.cheevos_hardcore_mode_enable && !cheevos_hardcore_paused)
-      mode = CHEEVOS_ACTIVE_HARDCORE;
-
-   for (cheevo = set->cheevos; cheevo < end; cheevo++)
-   {
-      if (cheevo->active & mode)
-      {
-         int valid = cheevos_test_cheevo(cheevo);
-
-         if (cheevo->last)
-         {
-            cheevos_condset_t* condset   = cheevo->condition.condsets;
-            const cheevos_condset_t* end = cheevo->condition.condsets
-               + cheevo->condition.count;
-
-            for (; condset < end; condset++)
-               cheevos_reset_cond_set(condset, 0);
-         }
-         else if (valid)
-         {
-            char msg[256];
-            char url[256];
-            msg[0] = url[0] = '\0';
-
-            cheevo->active &= ~mode;
-
-            if (mode == CHEEVOS_ACTIVE_HARDCORE)
-               cheevo->active &= ~CHEEVOS_ACTIVE_SOFTCORE;
-
-            CHEEVOS_LOG("[CHEEVOS]: awarding cheevo %u: %s (%s).\n",
-                  cheevo->id, cheevo->title, cheevo->description);
-
-            snprintf(msg, sizeof(msg), "Achievement Unlocked: %s",
-                  cheevo->title);
-            msg[sizeof(msg) - 1] = 0;
-            runloop_msg_queue_push(msg, 0, 2 * 60, false);
-            runloop_msg_queue_push(cheevo->description, 0, 3 * 60, false);
-
-            cheevos_make_unlock_url(cheevo, url, sizeof(url));
-            task_push_http_transfer(url, true, NULL,
-                  cheevos_unlocked, cheevo);
-
-            if (settings && settings->bools.cheevos_auto_screenshot)
-            {
-               char shotname[256];
-
-               snprintf(shotname, sizeof(shotname), "%s/%s-cheevo-%u",
-                  settings->paths.directory_screenshot,
-                  path_basename(path_get(RARCH_PATH_BASENAME)),
-                  cheevo->id);
-               shotname[sizeof(shotname) - 1] = '\0';
-
-               if (take_screenshot(shotname, true,
-                        video_driver_cached_frame_has_valid_framebuffer(), false, true))
-                  CHEEVOS_LOG("[CHEEVOS]: got a screenshot for cheevo %u\n", cheevo->id);
-               else
-                  CHEEVOS_LOG("[CHEEVOS]: failed to get screenshot for cheevo %u\n", cheevo->id);
-            }
-         }
-
-         cheevo->last = valid;
-      }
-   }
-}
-
-static int cheevos_test_lboard_condition(const cheevos_condition_t* condition)
-{
-   int dirty_conds              = 0;
-   int reset_conds              = 0;
-   int ret_val                  = 0;
-   int ret_val_sub_cond         = 0;
-   cheevos_condset_t *condset   = NULL;
-   const cheevos_condset_t *end = NULL;
-
-   if (!condition)
-      return 0;
-
-   ret_val_sub_cond             = condition->count == 1;
-   condset                      = condition->condsets;
-   end                          = condset + condition->count;
-
-   if (condset < end)
-   {
-      ret_val = cheevos_test_cond_set(
-            condset, &dirty_conds, &reset_conds);
-      condset++;
-   }
-
-   while (condset < end)
-   {
-      ret_val_sub_cond |= cheevos_test_cond_set(
-            condset, &dirty_conds, &reset_conds);
-      condset++;
-   }
-
-   if (reset_conds)
-   {
-      for (condset = condition->condsets; condset < end; condset++)
-         cheevos_reset_cond_set(condset, 0);
-   }
-
-   return (ret_val && ret_val_sub_cond);
-}
-
-static int cheevos_expr_value(cheevos_expr_t* expr)
-{
-   unsigned i;
-   int values[16];
-   /* Separate possible values with '$' operator, submit the largest */
-   unsigned current_value = 0;
-   cheevos_term_t* term   = NULL;
-
-   if (!expr)
-      return 0;
-
-   term                   = expr->terms;
-
-   if (!term)
-      return 0;
-
-   if (expr->compare_count >=  ARRAY_SIZE(values))
-   {
-      CHEEVOS_ERR("[CHEEVOS]: too many values in the leaderboard expression: %u\n", expr->compare_count);
-      return 0;
-   }
-
-   memset(values, 0, sizeof values);
-
-   for (i = expr->count; i != 0; i--, term++)
-   {
-      if (current_value >= ARRAY_SIZE(values))
-      {
-         CHEEVOS_ERR("[CHEEVOS]: too many values in the leaderboard expression: %u\n", current_value);
-         return 0;
-      }
-
-      values[current_value] +=
-         cheevos_var_get_value(&term->var) * term->multiplier;
-
-      if (term->compare_next)
-         current_value++;
-   }
-
-   if (expr->compare_count > 1)
-   {
-      unsigned j;
-      int maximum = values[0];
-
-      for (j = 1; j < expr->compare_count; j++)
-         maximum = values[j] > maximum ? values[j] : maximum;
-
-      return maximum;
-   }
-   else
-      return values[0];
-}
-
-static void cheevos_make_lboard_url(const cheevos_leaderboard_t *lboard,
-      char* url, size_t url_size)
-{
-   MD5_CTX ctx;
-   uint8_t hash[16];
-   char signature[64];
-   settings_t *settings = config_get_ptr();
-
-   hash[0] = '\0';
-
-   snprintf(signature, sizeof(signature), "%u%s%u", lboard->id,
-      settings->arrays.cheevos_username,
-      lboard->id);
-
-   MD5_Init(&ctx);
-   MD5_Update(&ctx, (void*)signature, strlen(signature));
-   MD5_Final(hash, &ctx);
-
-   snprintf(
-      url, url_size,
-      "http://retroachievements.org/dorequest.php?r=submitlbentry&u=%s&t=%s&i=%u&s=%d"
-      "&v=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-      settings->arrays.cheevos_username,
-      cheevos_locals.token,
-      lboard->id,
-      lboard->last_value,
-      hash[ 0], hash[ 1], hash[ 2], hash[ 3],
-      hash[ 4], hash[ 5], hash[ 6], hash[ 7],
-      hash[ 8], hash[ 9], hash[10], hash[11],
-      hash[12], hash[13], hash[14], hash[15]
-   );
-
-   url[url_size - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-   cheevos_log_url("[CHEEVOS]: url to submit the leaderboard: %s\n", url);
-#endif
-}
-
-static void cheevos_lboard_submit(void *task_data, void *user_data,
-      const char *error)
-{
-   cheevos_leaderboard_t *lboard = (cheevos_leaderboard_t *)user_data;
-
-   if (!lboard)
-      return;
-
-   if (!error)
-   {
-      CHEEVOS_ERR("[CHEEVOS]: error submitting leaderboard %u\n", lboard->id);
-      return;
-   }
-
-   CHEEVOS_LOG("[CHEEVOS]: submitted leaderboard %u.\n", lboard->id);
-}
-
-static void cheevos_test_leaderboards(void)
-{
-   unsigned i;
-   cheevos_leaderboard_t* lboard = cheevos_locals.leaderboards;
-
-   if (!lboard)
-      return;
-
-   for (i = cheevos_locals.lboard_count; i != 0; i--, lboard++)
-   {
-      if (lboard->active)
-      {
-         int value = cheevos_expr_value(&lboard->value);
-
-         if (value != lboard->last_value)
-         {
-            CHEEVOS_LOG("[CHEEVOS]: value lboard  %s %u\n",
-                  lboard->title, value);
-            lboard->last_value = value;
-         }
-
-         if (cheevos_test_lboard_condition(&lboard->submit))
-         {
-            lboard->active = 0;
-
-            /* failsafe for improper LBs */
-            if (value == 0)
-            {
-               CHEEVOS_LOG("[CHEEVOS]: error: lboard %s tried to submit 0\n",
-                     lboard->title);
-               runloop_msg_queue_push("Leaderboard attempt cancelled!",
-                     0, 2 * 60, false);
-            }
-            else
-            {
-               char url[256];
-               char msg[256];
-               char formatted_value[16];
-
-               cheevos_make_lboard_url(lboard, url, sizeof(url));
-               task_push_http_transfer(url, true, NULL,
-                     cheevos_lboard_submit, lboard);
-               CHEEVOS_LOG("[CHEEVOS]: submit lboard %s\n", lboard->title);
-
-               cheevos_format_value(value, lboard->format,
-                     formatted_value, sizeof(formatted_value));
-               snprintf(msg, sizeof(msg), "Submitted %s for %s",
-                     formatted_value, lboard->title);
-               msg[sizeof(msg) - 1] = 0;
-               runloop_msg_queue_push(msg, 0, 2 * 60, false);
-            }
-         }
-
-         if (cheevos_test_lboard_condition(&lboard->cancel))
-         {
-            CHEEVOS_LOG("[CHEEVOS]: cancel lboard %s\n", lboard->title);
-            lboard->active = 0;
-            runloop_msg_queue_push("Leaderboard attempt cancelled!",
-                  0, 2 * 60, false);
-         }
-      }
-      else
-      {
-         if (cheevos_test_lboard_condition(&lboard->start))
-         {
-            char msg[256];
-
-            CHEEVOS_LOG("[CHEEVOS]: start lboard  %s\n", lboard->title);
-            lboard->active     = 1;
-            lboard->last_value = -1;
-
-            snprintf(msg, sizeof(msg),
-                  "Leaderboard Active: %s", lboard->title);
-            msg[sizeof(msg) - 1] = 0;
-            runloop_msg_queue_push(msg, 0, 2 * 60, false);
-            runloop_msg_queue_push(lboard->description, 0, 3*60, false);
-         }
-      }
-   }
-}
-
-/*****************************************************************************
-Free the loaded achievements.
-*****************************************************************************/
-
-static void cheevos_free_condset(const cheevos_condset_t *set)
-{
-   if (set && set->conds)
-      free((void*)set->conds);
-}
-
-static void cheevos_free_cheevo(const cheevo_t *cheevo)
-{
-   if (!cheevo)
-      return;
-
-   if (cheevo->title)
-      free((void*)cheevo->title);
-   if (cheevo->description)
-      free((void*)cheevo->description);
-   if (cheevo->author)
-      free((void*)cheevo->author);
-   if (cheevo->badge)
-      free((void*)cheevo->badge);
-   cheevos_free_condset(cheevo->condition.condsets);
-}
-
-static void cheevos_free_cheevo_set(const cheevoset_t *set)
-{
-   const cheevo_t *cheevo = NULL;
-   const cheevo_t *end    = NULL;
-
-   if (!set)
-      return;
-
-   cheevo                 = set->cheevos;
-   end                    = cheevo + set->count;
-
-   while (cheevo < end)
-      cheevos_free_cheevo(cheevo++);
-
-   if (set->cheevos)
-      free((void*)set->cheevos);
-}
-
-#ifndef CHEEVOS_DONT_DEACTIVATE
-static int cheevos_deactivate__json_index(void *userdata, unsigned int index)
-{
-   cheevos_deactivate_t *ud = (cheevos_deactivate_t*)userdata;
-
-   if (ud)
-      ud->is_element        = 1;
-
-   return 0;
-}
-
-static int cheevos_deactivate__json_number(void *userdata,
-      const char *number, size_t length)
-{
-   long id;
-   int found;
-   cheevo_t* cheevo         = NULL;
-   const cheevo_t* end      = NULL;
-   cheevos_deactivate_t *ud = (cheevos_deactivate_t*)userdata;
-
-   if (ud && ud->is_element)
-   {
-      ud->is_element = 0;
-      id             = strtol(number, NULL, 10);
-      found          = 0;
-      cheevo         = cheevos_locals.core.cheevos;
-      end            = cheevo + cheevos_locals.core.count;
-
-      for (; cheevo < end; cheevo++)
-      {
-         if (cheevo->id == (unsigned)id)
-         {
-            cheevo->active &= ~ud->mode;
-            found = 1;
-            break;
-         }
-      }
-
-      if (!found)
-      {
-         cheevo = cheevos_locals.unofficial.cheevos;
-         end    = cheevo + cheevos_locals.unofficial.count;
-
-         for (; cheevo < end; cheevo++)
-         {
-            if (cheevo->id == (unsigned)id)
-            {
-               cheevo->active &= ~ud->mode;
-               found = 1;
-               break;
-            }
-         }
-      }
-
-      if (found)
-         CHEEVOS_LOG("[CHEEVOS]: deactivated unlocked cheevo %u (%s).\n",
-               cheevo->id, cheevo->title);
-      else
-         CHEEVOS_ERR("[CHEEVOS]: unknown cheevo to deactivate: %u.\n", id);
-   }
-
-   return 0;
-}
-
-static int cheevos_deactivate_unlocks(const char* json, unsigned mode)
-{
-   static const jsonsax_handlers_t handlers =
-   {
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      NULL,
-      cheevos_deactivate__json_index,
-      NULL,
-      cheevos_deactivate__json_number,
-      NULL,
-      NULL
-   };
-
-   cheevos_deactivate_t ud;
-
-   ud.is_element = 0;
-   ud.mode       = mode;
-   return jsonsax_parse(json, &handlers, (void*)&ud) != JSONSAX_OK;
-}
-#endif
-
-void cheevos_reset_game(void)
-{
-   cheevo_t *end       = NULL;
-   cheevo_t *cheevo    = cheevos_locals.core.cheevos;
-
-   if (!cheevo)
-      return;
-
-   end                 = cheevo + cheevos_locals.core.count;
-
-   for (; cheevo < end; cheevo++)
-      cheevo->last     = 1;
-
-   cheevo              = cheevos_locals.unofficial.cheevos;
-   end                 = cheevo + cheevos_locals.unofficial.count;
-
-   for (; cheevo < end; cheevo++)
-      cheevo->last = 1;
-}
-
-void cheevos_populate_menu(void *data)
-{
-#ifdef HAVE_MENU
-   unsigned i                    = 0;
-   unsigned items_found          = 0;
-   settings_t *settings          = config_get_ptr();
-   menu_displaylist_info_t *info = (menu_displaylist_info_t*)data;
-   cheevo_t *end                 = NULL;
-   cheevo_t *cheevo              = cheevos_locals.core.cheevos;
-   end                           = cheevo + cheevos_locals.core.count;
-
-   if(settings->bools.cheevos_enable && settings->bools.cheevos_hardcore_mode_enable 
-      && cheevos_loaded)
-   {
-      if (!cheevos_hardcore_paused)
-         menu_entries_append_enum(info->list,
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE),
-               msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE),
-               MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE,
-               MENU_SETTING_ACTION_PAUSE_ACHIEVEMENTS, 0, 0);
-      else
-         menu_entries_append_enum(info->list,
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_RESUME),
-               msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_RESUME),
-               MENU_ENUM_LABEL_ACHIEVEMENT_RESUME,
-               MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS, 0, 0);
-   }
-
-   if (cheevo)
-   {
-      for (i = 0; cheevo < end; i++, cheevo++)
-      {
-         if (!(cheevo->active & CHEEVOS_ACTIVE_HARDCORE))
-         {
-            menu_entries_append_enum(info->list, cheevo->title,
-               cheevo->description,
-               MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY_HARDCORE,
-               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
-            set_badge_info(&badges_ctx, i, cheevo->badge,
-               (cheevo->active & CHEEVOS_ACTIVE_HARDCORE));
-         }
-         else if (!(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE))
-         {
-            menu_entries_append_enum(info->list, cheevo->title,
-               cheevo->description,
-               MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY,
-               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
-            set_badge_info(&badges_ctx, i, cheevo->badge,
-               (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
-         }
-         else
-         {
-            menu_entries_append_enum(info->list, cheevo->title,
-               cheevo->description,
-               MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
-               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
-            set_badge_info(&badges_ctx, i, cheevo->badge,
-               (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
-         }
-         items_found++;
-      }
-   }
-
-   cheevo = cheevos_locals.unofficial.cheevos;
-
-   if (cheevo && settings->bools.cheevos_test_unofficial)
-   {
-      end    = cheevo + cheevos_locals.unofficial.count;
-
-      for (i = items_found; cheevo < end; i++, cheevo++)
-      {
-         if (!(cheevo->active & CHEEVOS_ACTIVE_HARDCORE))
-         {
-            menu_entries_append_enum(info->list, cheevo->title,
-               cheevo->description,
-               MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY_HARDCORE,
-               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
-            set_badge_info(&badges_ctx, i, cheevo->badge,
-                  (cheevo->active & CHEEVOS_ACTIVE_HARDCORE));
-         }
-         else if (!(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE))
-         {
-            menu_entries_append_enum(info->list, cheevo->title,
-               cheevo->description,
-               MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY,
-               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
-            set_badge_info(&badges_ctx, i, cheevo->badge,
-                  (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
-         }
-         else
-         {
-            menu_entries_append_enum(info->list, cheevo->title,
-               cheevo->description,
-               MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
-               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
-            set_badge_info(&badges_ctx, i, cheevo->badge,
-                  (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
-         }
-         items_found++;
-      }
-   }
-
-   if (items_found == 0)
-   {
-      menu_entries_append_enum(info->list,
-            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY),
-            msg_hash_to_str(MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY),
-            MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY,
-            FILE_TYPE_NONE, 0, 0);
-   }
-#endif
-}
-
-bool cheevos_get_description(cheevos_ctx_desc_t *desc)
-{
-   if (!desc)
-      return false;
-
-   if (cheevos_loaded)
-   {
-      cheevo_t *cheevos = cheevos_locals.core.cheevos;
-
-      if (!cheevos)
-         return false;
-
-      if (desc->idx >= cheevos_locals.core.count)
-      {
-         cheevos    = cheevos_locals.unofficial.cheevos;
-         desc->idx -= cheevos_locals.core.count;
-      }
-
-      if (!string_is_empty(cheevos[desc->idx].description))
-         strlcpy(desc->s, cheevos[desc->idx].description, desc->len);
-   }
-   else
-      *desc->s = 0;
-
-   return true;
-}
-
-bool cheevos_apply_cheats(bool *data_bool)
-{
-   cheats_are_enabled   = *data_bool;
-   cheats_were_enabled |= cheats_are_enabled;
-
-   return true;
-}
-
-bool cheevos_unload(void)
-{
-   bool running;
-   CHEEVOS_LOCK(cheevos_locals.task_lock);
-   running = cheevos_locals.task != NULL;
-   CHEEVOS_UNLOCK(cheevos_locals.task_lock);
-
-   if (running)
-   {
-      CHEEVOS_LOG("[CHEEVOS]: Asked the load thread to terminate\n");
-      task_queue_cancel_task(cheevos_locals.task);
-
-#ifdef HAVE_THREADS
-      do
-      {
-         CHEEVOS_LOCK(cheevos_locals.task_lock);
-         running = cheevos_locals.task != NULL;
-         CHEEVOS_UNLOCK(cheevos_locals.task_lock);
-      }
-      while (running);
-#endif
-   }
-
-   if (cheevos_loaded)
-   {
-      cheevos_free_cheevo_set(&cheevos_locals.core);
-      cheevos_free_cheevo_set(&cheevos_locals.unofficial);
-   }
-
-   cheevos_locals.core.cheevos       = NULL;
-   cheevos_locals.unofficial.cheevos = NULL;
-   cheevos_locals.core.count         = 0;
-   cheevos_locals.unofficial.count   = 0;
-
-   cheevos_loaded     = false;
-   cheevos_hardcore_paused = false;
-
-   return true;
-}
-
-bool cheevos_toggle_hardcore_mode(void)
-{
-   settings_t *settings = config_get_ptr();
-
-   if (!settings)
-      return false;
-
-   /* reset and deinit rewind to avoid cheat the score */
-   if (settings->bools.cheevos_hardcore_mode_enable && !cheevos_hardcore_paused)
-   {
-      const char *msg = msg_hash_to_str(
-            MSG_CHEEVOS_HARDCORE_MODE_ENABLE);
-
-      /* send reset core cmd to avoid any user
-       * savestate previusly loaded. */
-      command_event(CMD_EVENT_RESET, NULL);
-
-      if (settings->bools.rewind_enable)
-         command_event(CMD_EVENT_REWIND_DEINIT, NULL);
-
-      CHEEVOS_LOG("%s\n", msg);
-      runloop_msg_queue_push(msg, 0, 3 * 60, true);
-   }
-   else
-   {
-      if (settings->bools.rewind_enable)
-         command_event(CMD_EVENT_REWIND_INIT, NULL);
-   }
-
-   return true;
-}
-
-static void cheevos_patch_addresses(cheevoset_t* set)
-{
-   unsigned i;
-   cheevo_t* cheevo = NULL;
-
-   if (!set)
-      return;
-
-   cheevo           = set->cheevos;
-
-   if (!cheevo)
-      return;
-
-   for (i = set->count; i != 0; i--, cheevo++)
-   {
-      unsigned j;
-      cheevos_condset_t* condset = cheevo->condition.condsets;
-
-      for (j = cheevo->condition.count; j != 0; j--, condset++)
-      {
-         unsigned k;
-         cheevos_cond_t* cond = condset->conds;
-
-         for (k = condset->count; k != 0; k--, cond++)
-         {
-            switch (cond->source.type)
-            {
-               case CHEEVOS_VAR_TYPE_ADDRESS:
-               case CHEEVOS_VAR_TYPE_DELTA_MEM:
-                  cheevos_var_patch_addr(&cond->source,
-                        cheevos_locals.console_id);
-#ifdef CHEEVOS_DUMP_ADDRS
-                  CHEEVOS_LOG("[CHEEVOS]: s-var %03d:%08X\n",
-                        cond->source.bank_id + 1, cond->source.value);
-#endif
-                  break;
-
-               default:
-                  break;
-            }
-
-            switch (cond->target.type)
-            {
-               case CHEEVOS_VAR_TYPE_ADDRESS:
-               case CHEEVOS_VAR_TYPE_DELTA_MEM:
-                  cheevos_var_patch_addr(&cond->target,
-                        cheevos_locals.console_id);
-#ifdef CHEEVOS_DUMP_ADDRS
-                  CHEEVOS_LOG("[CHEEVOS]: t-var %03d:%08X\n",
-                        cond->target.bank_id + 1, cond->target.value);
-#endif
-                  break;
-
-               default:
-                  break;
-            }
-         }
-      }
-   }
-}
-
-static void cheevos_patch_lb_conditions(cheevos_condition_t* condition)
-{
-   unsigned i;
-   cheevos_condset_t* condset = NULL;
-
-   if (!condition)
-      return;
-
-   condset                    = condition->condsets;
-
-   for (i = condition->count; i != 0; i--, condset++)
-   {
-      unsigned j;
-      cheevos_cond_t* cond = condset->conds;
-
-      for (j = condset->count; j != 0; j--, cond++)
-      {
-         switch (cond->source.type)
-         {
-            case CHEEVOS_VAR_TYPE_ADDRESS:
-            case CHEEVOS_VAR_TYPE_DELTA_MEM:
-               cheevos_var_patch_addr(&cond->source,
-                     cheevos_locals.console_id);
-#ifdef CHEEVOS_DUMP_ADDRS
-               CHEEVOS_LOG("[CHEEVOS]: s-var %03d:%08X\n",
-                     cond->source.bank_id + 1, cond->source.value);
-#endif
-               break;
-            default:
-               break;
-         }
-         switch (cond->target.type)
-         {
-            case CHEEVOS_VAR_TYPE_ADDRESS:
-            case CHEEVOS_VAR_TYPE_DELTA_MEM:
-               cheevos_var_patch_addr(&cond->target,
-                     cheevos_locals.console_id);
-#ifdef CHEEVOS_DUMP_ADDRS
-               CHEEVOS_LOG("[CHEEVOS]: t-var %03d:%08X\n",
-                     cond->target.bank_id + 1, cond->target.value);
-#endif
-               break;
-            default:
-               break;
-         }
-      }
-   }
-}
-
-static void cheevos_patch_lb_expressions(cheevos_expr_t* expression)
-{
-   unsigned i;
-   cheevos_term_t* term = NULL;
-
-   if (!expression)
-      return;
-
-   term                 = expression->terms;
-
-   for (i = expression->count; i != 0; i--, term++)
-   {
-      switch (term->var.type)
-      {
-         case CHEEVOS_VAR_TYPE_ADDRESS:
-         case CHEEVOS_VAR_TYPE_DELTA_MEM:
-            cheevos_var_patch_addr(&term->var, cheevos_locals.console_id);
-#ifdef CHEEVOS_DUMP_ADDRS
-            CHEEVOS_LOG("[CHEEVOS]: s-var %03d:%08X\n",
-                  term->var.bank_id + 1, term->var.value);
-#endif
-            break;
-         default:
-            break;
-      }
-   }
-}
-
-static void cheevos_patch_lbs(cheevos_leaderboard_t *leaderboard)
-{
-   unsigned i;
-
-   for (i = 0; i < cheevos_locals.lboard_count; i++)
-   {
-      cheevos_condition_t *start  = &leaderboard[i].start;
-      cheevos_condition_t *cancel = &leaderboard[i].cancel;
-      cheevos_condition_t *submit = &leaderboard[i].submit;
-      cheevos_expr_t *value       = &leaderboard[i].value;
-
-      cheevos_patch_lb_conditions(start);
-      cheevos_patch_lb_conditions(cancel);
-      cheevos_patch_lb_conditions(submit);
-      cheevos_patch_lb_expressions(value);
-   }
-}
-
-void cheevos_test(void)
-{
-   settings_t *settings = config_get_ptr();
-
-   if (!cheevos_locals.addrs_patched)
-   {
-      cheevos_patch_addresses(&cheevos_locals.core);
-      cheevos_patch_addresses(&cheevos_locals.unofficial);
-      cheevos_patch_lbs(cheevos_locals.leaderboards);
-
-      cheevos_locals.addrs_patched = true;
-   }
-
-   cheevos_test_cheevo_set(&cheevos_locals.core);
-
-   if (settings)
-   {
-      if (settings->bools.cheevos_test_unofficial)
-         cheevos_test_cheevo_set(&cheevos_locals.unofficial);
-
-      if (settings->bools.cheevos_hardcore_mode_enable &&
-          settings->bools.cheevos_leaderboards_enable  &&
-          !cheevos_hardcore_paused)
-         cheevos_test_leaderboards();
-   }
-}
-
-bool cheevos_set_cheats(void)
-{
-   cheats_were_enabled = cheats_are_enabled;
-   return true;
-}
-
-void cheevos_set_support_cheevos(bool state)
-{
-   cheevos_locals.core_supports = state;
-}
-
-bool cheevos_get_support_cheevos(void)
-{
-  return cheevos_locals.core_supports;
-}
-
-cheevos_console_t cheevos_get_console(void)
-{
-   return cheevos_locals.console_id;
-}
-
-#include "coro.h"
-
-/* Uncomment the following two lines to debug cheevos_iterate, this will
- * disable the coroutine yielding.
- *
- * The code is very easy to understand. It's meant to be like BASIC:
- * CORO_GOTO will jump execution to another label, CORO_GOSUB will
- * call another label, and CORO_RET will return from a CORO_GOSUB.
- *
- * This coroutine code is inspired in a very old pure C implementation
- * that runs everywhere:
- *
- * https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
- */
-/*#undef CORO_YIELD
-#define CORO_YIELD()*/
-
-typedef struct
-{
-   /* variables used in the co-routine */
-   char badge_name[16];
-   char url[256];
-   char badge_basepath[PATH_MAX_LENGTH];
-   char badge_fullpath[PATH_MAX_LENGTH];
-   unsigned char hash[16];
-   bool round;
-   unsigned gameid;
-   unsigned i;
-   unsigned j;
-   unsigned k;
-   size_t bytes;
-   size_t count;
-   size_t offset;
-   size_t len;
-   size_t size;
-   MD5_CTX md5;
-   cheevos_nes_header_t header;
-   retro_time_t t0;
-   struct retro_system_info sysinfo;
-   void *data;
-   char *json;
-   const char *path;
-   const char *ext;
-   intfstream_t *stream;
-   cheevo_t *cheevo;
-   settings_t *settings;
-   struct http_connection_t *conn;
-   struct http_t *http;
-   const cheevo_t *cheevo_end;
-
-   /* co-routine required fields */
-   CORO_FIELDS
-} coro_t;
-
-enum
-{
-   /* Negative values because CORO_SUB generates positive values */
-   SNES_MD5     = -1,
-   GENESIS_MD5  = -2,
-   LYNX_MD5     = -3,
-   NES_MD5      = -4,
-   GENERIC_MD5  = -5,
-   FILENAME_MD5 = -6,
-   EVAL_MD5     = -7,
-   FILL_MD5     = -8,
-   GET_GAMEID   = -9,
-   GET_CHEEVOS  = -10,
-   GET_BADGES   = -11,
-   LOGIN        = -12,
-   HTTP_GET     = -13,
-   DEACTIVATE   = -14,
-   PLAYING      = -15,
-   DELAY        = -16
-};
-
-static int cheevos_iterate(coro_t *coro)
-{
-   ssize_t num_read = 0;
-   size_t to_read   = 4096;
-   uint8_t *buffer  = NULL;
-   const char *end  = NULL;
-
-   static const uint32_t genesis_exts[] =
-   {
-      0x0b888feeU, /* mdx */
-      0x005978b6U, /* md  */
-      0x0b88aa89U, /* smd */
-      0x0b88767fU, /* gen */
-      0x0b8861beU, /* bin */
-      0x0b886782U, /* cue */
-      0x0b8880d0U, /* iso */
-      0x0b88aa98U, /* sms */
-      0x005977f3U, /* gg  */
-      0x0059797fU, /* sg  */
-      0
-   };
-
-   static const uint32_t snes_exts[] =
-   {
-      0x0b88aa88U, /* smc */
-      0x0b8872bbU, /* fig */
-      0x0b88a9a1U, /* sfc */
-      0x0b887623U, /* gd3 */
-      0x0b887627U, /* gd7 */
-      0x0b886bf3U, /* dx2 */
-      0x0b886312U, /* bsx */
-      0x0b88abd2U, /* swc */
-      0
-   };
-
-   static const uint32_t lynx_exts[] =
-   {
-      0x0b888cf7U, /* lnx */
-      0
-   };
-
-   static cheevos_finder_t finders[] =
-   {
-      {SNES_MD5,    "SNES (8Mb padding)",                snes_exts},
-      {GENESIS_MD5, "Genesis (6Mb padding)",             genesis_exts},
-      {LYNX_MD5,    "Atari Lynx (only first 512 bytes)", lynx_exts},
-      {NES_MD5,     "NES (discards VROM)",               NULL},
-      {GENERIC_MD5, "Generic (plain content)",           NULL},
-      {FILENAME_MD5, "Generic (filename)",               NULL}
-   };
-
-   CORO_ENTER();
-
-
-
-      cheevos_locals.addrs_patched = false;
-
-      coro->settings               = config_get_ptr();
-
-      cheevos_locals.meminfo[0].id = RETRO_MEMORY_SYSTEM_RAM;
-      core_get_memory(&cheevos_locals.meminfo[0]);
-
-      cheevos_locals.meminfo[1].id = RETRO_MEMORY_SAVE_RAM;
-      core_get_memory(&cheevos_locals.meminfo[1]);
-
-      cheevos_locals.meminfo[2].id = RETRO_MEMORY_VIDEO_RAM;
-      core_get_memory(&cheevos_locals.meminfo[2]);
-
-      cheevos_locals.meminfo[3].id = RETRO_MEMORY_RTC;
-      core_get_memory(&cheevos_locals.meminfo[3]);
-
-      CHEEVOS_LOG("[CHEEVOS]: system RAM: %p %u\n",
-            cheevos_locals.meminfo[0].data,
-            cheevos_locals.meminfo[0].size);
-      CHEEVOS_LOG("[CHEEVOS]: save RAM:   %p %u\n",
-            cheevos_locals.meminfo[1].data,
-            cheevos_locals.meminfo[1].size);
-      CHEEVOS_LOG("[CHEEVOS]: video RAM:  %p %u\n",
-            cheevos_locals.meminfo[2].data,
-            cheevos_locals.meminfo[2].size);
-      CHEEVOS_LOG("[CHEEVOS]: RTC:        %p %u\n",
-            cheevos_locals.meminfo[3].data,
-            cheevos_locals.meminfo[3].size);
-
-      /* Bail out if cheevos are disabled.
-         * But set the above anyways,
-         * command_read_ram needs it. */
-      if (!coro->settings->bools.cheevos_enable)
-         CORO_STOP();
-
-      /* Load the content into memory, or copy it
-         * over to our own buffer */
-      if (!coro->data)
-      {
-         coro->stream = intfstream_open_file(
-               coro->path,
-               RETRO_VFS_FILE_ACCESS_READ,
-               RETRO_VFS_FILE_ACCESS_HINT_NONE);
-
-         if (!coro->stream)
-            CORO_STOP();
-
-         CORO_YIELD();
-         coro->len         = 0;
-         coro->count       = intfstream_get_size(coro->stream);
-
-         /* size limit */
-         if (coro->count > size_in_megabytes(64))
-            coro->count    = size_in_megabytes(64);
-
-         coro->data        = malloc(coro->count);
-
-         if (!coro->data)
-         {
-            intfstream_close(coro->stream);
-            free(coro->stream);
-            CORO_STOP();
-         }
-
-         for (;;)
-         {
-            buffer   = (uint8_t*)coro->data + coro->len;
-            to_read  = 4096;
-
-            if (to_read > coro->count)
-               to_read = coro->count;
-
-            num_read = intfstream_read(coro->stream,
-                  (void*)buffer, to_read);
-
-            if (num_read <= 0)
-               break;
-
-            coro->len         += num_read;
-            coro->count       -= num_read;
-
-            if (coro->count == 0)
-               break;
-
-            CORO_YIELD();
-         }
-
-         intfstream_close(coro->stream);
-         free(coro->stream);
-      }
-
-      /* Use the supported extensions as a hint
-         * to what method we should use. */
-      core_get_system_info(&coro->sysinfo);
-
-      for (coro->i = 0; coro->i < ARRAY_SIZE(finders); coro->i++)
-      {
-         if (finders[coro->i].ext_hashes)
-         {
-            coro->ext = coro->sysinfo.valid_extensions;
-
-            while (coro->ext)
-            {
-               unsigned hash;
-               end = strchr(coro->ext, '|');
-
-               if (end)
-               {
-                  hash      = cheevos_djb2(
-                        coro->ext, end - coro->ext);
-                  coro->ext = end + 1;
-               }
-               else
-               {
-                  hash      = cheevos_djb2(
-                        coro->ext, strlen(coro->ext));
-                  coro->ext = NULL;
-               }
-
-               for (coro->j = 0; finders[coro->i].ext_hashes[coro->j]; coro->j++)
-               {
-                  if (finders[coro->i].ext_hashes[coro->j] == hash)
-                  {
-                     CHEEVOS_LOG("[CHEEVOS]: testing %s.\n",
-                           finders[coro->i].name);
-
-                     /*
-                        * Inputs:  CHEEVOS_VAR_INFO
-                        * Outputs: CHEEVOS_VAR_GAMEID, the game was found if it's different from 0
-                        */
-                     CORO_GOSUB(finders[coro->i].label);
-
-                     if (coro->gameid != 0)
-                        goto found;
-
-                     coro->ext = NULL; /* force next finder */
-                     break;
-                  }
-               }
-            }
-         }
-      }
-
-      for (coro->i = 0; coro->i < ARRAY_SIZE(finders); coro->i++)
-      {
-         if (finders[coro->i].ext_hashes)
-            continue;
-
-         CHEEVOS_LOG("[CHEEVOS]: testing %s.\n",
-               finders[coro->i].name);
-
-         /*
-            * Inputs:  CHEEVOS_VAR_INFO
-            * Outputs: CHEEVOS_VAR_GAMEID
-            */
-         CORO_GOSUB(finders[coro->i].label);
-
-         if (coro->gameid != 0)
-            goto found;
-      }
-
-      CHEEVOS_LOG("[CHEEVOS]: this game doesn't feature achievements.\n");
-      CORO_STOP();
-
-found:
-
-#ifdef CHEEVOS_JSON_OVERRIDE
-      {
-         size_t size = 0;
-         FILE *file  = fopen(CHEEVOS_JSON_OVERRIDE, "rb");
-
-         fseek(file, 0, SEEK_END);
-         size = ftell(file);
-         fseek(file, 0, SEEK_SET);
-
-         coro->json = (char*)malloc(size + 1);
-         fread((void*)coro->json, 1, size, file);
-
-         fclose(file);
-         coro->json[size] = 0;
-      }
-#else
-      CORO_GOSUB(GET_CHEEVOS);
-
-      if (!coro->json)
-      {
-         runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false);
-         CHEEVOS_ERR("[CHEEVOS]: error loading achievements.\n");
-         CORO_STOP();
-      }
-#endif
-
-#ifdef CHEEVOS_SAVE_JSON
-      {
-         FILE *file = fopen(CHEEVOS_SAVE_JSON, "w");
-         fwrite((void*)coro->json, 1, strlen(coro->json), file);
-         fclose(file);
-      }
-#endif
-      if (cheevos_parse(coro->json))
-      {
-         if ((void*)coro->json)
-            free((void*)coro->json);
-         CORO_STOP();
-      }
-
-      if ((void*)coro->json)
-         free((void*)coro->json);
-
-      if (   cheevos_locals.core.count == 0
-            && cheevos_locals.unofficial.count == 0
-            && cheevos_locals.lboard_count == 0)
-      {
-         runloop_msg_queue_push(
-               "This game has no achievements.",
-               0, 5 * 60, false);
-
-         cheevos_free_cheevo_set(&cheevos_locals.core);
-         cheevos_free_cheevo_set(&cheevos_locals.unofficial);
-
-         cheevos_locals.core.cheevos       = NULL;
-         cheevos_locals.unofficial.cheevos = NULL;
-         cheevos_locals.core.count         = 0;
-         cheevos_locals.unofficial.count   = 0;
-
-         cheevos_loaded     = false;
-         cheevos_hardcore_paused = false;
-         CORO_STOP();
-      }
-
-      cheevos_loaded = true;
-
-      /*
-         * Inputs:  CHEEVOS_VAR_GAMEID
-         * Outputs:
-         */
-      CORO_GOSUB(DEACTIVATE);
-
-      /*
-         * Inputs:  CHEEVOS_VAR_GAMEID
-         * Outputs:
-         */
-      CORO_GOSUB(PLAYING);
-
-      if (coro->settings->bools.cheevos_verbose_enable && cheevos_locals.core.count > 0)
-      {
-         char msg[256];
-         int mode                     = CHEEVOS_ACTIVE_SOFTCORE;
-         const cheevo_t* cheevo       = cheevos_locals.core.cheevos;
-         const cheevo_t* end          = cheevo + cheevos_locals.core.count;
-         int number_of_unlocked       = cheevos_locals.core.count;
-
-         if (coro->settings->bools.cheevos_hardcore_mode_enable && !cheevos_hardcore_paused)
-            mode = CHEEVOS_ACTIVE_HARDCORE;
-
-         for (; cheevo < end; cheevo++)
-            if (cheevo->active & mode)
-               number_of_unlocked--;
-
-         snprintf(msg, sizeof(msg),
-               "You have %d of %d achievements unlocked.",
-               number_of_unlocked, cheevos_locals.core.count);
-         msg[sizeof(msg) - 1] = 0;
-         runloop_msg_queue_push(msg, 0, 6 * 60, false);
-      }
-
-      CORO_GOSUB(GET_BADGES);
-      CORO_STOP();
-
-      /**************************************************************************
-       * Info   Tries to identify a SNES game
-         * Input  CHEEVOS_VAR_INFO the content info
-         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
-         *************************************************************************/
-   CORO_SUB(SNES_MD5)
-
-      MD5_Init(&coro->md5);
-
-      coro->offset = 0;
-      coro->count  = 0;
-
-      CORO_GOSUB(EVAL_MD5);
-
-      if (coro->count == 0)
-      {
-         MD5_Final(coro->hash, &coro->md5);
-         coro->gameid = 0;
-         CORO_RET();
-      }
-
-      if (coro->count < size_in_megabytes(8))
-      {
-         /*
-            * Inputs:  CHEEVOS_VAR_MD5, CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT
-            * Outputs: CHEEVOS_VAR_MD5
-            */
-         coro->offset      = 0;
-         coro->count       = size_in_megabytes(8) - coro->count;
-         CORO_GOSUB(FILL_MD5);
-      }
-
-      MD5_Final(coro->hash, &coro->md5);
-      CORO_GOTO(GET_GAMEID);
-
-      /**************************************************************************
-       * Info   Tries to identify a Genesis game
-         * Input  CHEEVOS_VAR_INFO the content info
-         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
-         *************************************************************************/
-   CORO_SUB(GENESIS_MD5)
-
-      MD5_Init(&coro->md5);
-
-      coro->offset = 0;
-      coro->count  = 0;
-      CORO_GOSUB(EVAL_MD5);
-
-      if (coro->count == 0)
-      {
-         MD5_Final(coro->hash, &coro->md5);
-         coro->gameid = 0;
-         CORO_RET();
-      }
-
-      if (coro->count < size_in_megabytes(6))
-      {
-         coro->offset = 0;
-         coro->count  = size_in_megabytes(6) - coro->count;
-         CORO_GOSUB(FILL_MD5);
-      }
-
-      MD5_Final(coro->hash, &coro->md5);
-      CORO_GOTO(GET_GAMEID);
-
-      /**************************************************************************
-       * Info   Tries to identify an Atari Lynx game
-         * Input  CHEEVOS_VAR_INFO the content info
-         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
-         *************************************************************************/
-   CORO_SUB(LYNX_MD5)
-
-      if (coro->len < 0x0240)
-      {
-         coro->gameid = 0;
-         CORO_RET();
-      }
-
-      MD5_Init(&coro->md5);
-
-      coro->offset       = 0x0040;
-      coro->count        = 0x0200;
-      CORO_GOSUB(EVAL_MD5);
-
-      MD5_Final(coro->hash, &coro->md5);
-      CORO_GOTO(GET_GAMEID);
-
-      /**************************************************************************
-       * Info   Tries to identify a NES game
-         * Input  CHEEVOS_VAR_INFO the content info
-         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
-         *************************************************************************/
-   CORO_SUB(NES_MD5)
-
-      /* Note about the references to the FCEU emulator below. There is no
-         * core-specific code in this function, it's rather Retro Achievements
-         * specific code that must be followed to the letter so we compute
-         * the correct ROM hash. Retro Achievements does indeed use some
-         * FCEU related method to compute the hash, since its NES emulator
-         * is based on it. */
-
-      if (coro->len < sizeof(coro->header))
-      {
-         coro->gameid = 0;
-         CORO_RET();
-      }
-
-      memcpy((void*)&coro->header, coro->data,
-            sizeof(coro->header));
-
-      if (     coro->header.id[0] != 'N'
-            || coro->header.id[1] != 'E'
-            || coro->header.id[2] != 'S'
-            || coro->header.id[3] != 0x1a)
-      {
-         coro->gameid = 0;
-         CORO_RET();
-      }
-
-      {
-         size_t romsize = 256;
-         /* from FCEU core - compute size using the cart mapper */
-         int mapper     = (coro->header.rom_type >> 4) | (coro->header.rom_type2 & 0xF0);
-
-         if (coro->header.rom_size)
-            romsize     = next_pow2(coro->header.rom_size);
-
-         /* for games not to the power of 2, so we just read enough
-            * PRG rom from it, but we have to keep ROM_size to the power of 2
-            * since PRGCartMapping wants ROM_size to be to the power of 2
-            * so instead if not to power of 2, we just use head.ROM_size when
-            * we use FCEU_read. */
-         coro->round       = mapper != 53 && mapper != 198 && mapper != 228;
-         coro->bytes       = coro->round ? romsize : coro->header.rom_size;
-      }
-
-      /* from FCEU core - check if Trainer included in ROM data */
-      MD5_Init(&coro->md5);
-      coro->offset = sizeof(coro->header) + (coro->header.rom_type & 4
-            ? sizeof(coro->header) : 0);
-      coro->count  = 0x4000 * coro->bytes;
-      CORO_GOSUB(EVAL_MD5);
-
-      if (coro->count < 0x4000 * coro->bytes)
-      {
-         coro->offset      = 0xff;
-         coro->count       = 0x4000 * coro->bytes - coro->count;
-         CORO_GOSUB(FILL_MD5);
-      }
-
-      MD5_Final(coro->hash, &coro->md5);
-      CORO_GOTO(GET_GAMEID);
-
-      /**************************************************************************
-       * Info   Tries to identify a "generic" game
-         * Input  CHEEVOS_VAR_INFO the content info
-         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
-         *************************************************************************/
-   CORO_SUB(GENERIC_MD5)
-
-      MD5_Init(&coro->md5);
-
-      coro->offset      = 0;
-      coro->count       = 0;
-      CORO_GOSUB(EVAL_MD5);
-
-      MD5_Final(coro->hash, &coro->md5);
-
-      if (coro->count == 0)
-         CORO_RET();
-
-      CORO_GOTO(GET_GAMEID);
-
-      /**************************************************************************
-       * Info  Tries to identify a game based on its filename (with no extension)
-         * Input  CHEEVOS_VAR_INFO the content info
-         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
-         *************************************************************************/
-   CORO_SUB(FILENAME_MD5)
-      if (!string_is_empty(coro->path))
-      {
-         char base_noext[PATH_MAX_LENGTH];
-         fill_pathname_base_noext(base_noext, coro->path, sizeof(base_noext));
-
-         MD5_Init(&coro->md5);
-         MD5_Update(&coro->md5, (void*)base_noext, strlen(base_noext));
-         MD5_Final(coro->hash, &coro->md5);
-
-         CORO_GOTO(GET_GAMEID);
-      }
-      CORO_RET();
-
-      /**************************************************************************
-       * Info    Evaluates the CHEEVOS_VAR_MD5 hash
-         * Inputs  CHEEVOS_VAR_INFO, CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT
-         * Outputs CHEEVOS_VAR_MD5, CHEEVOS_VAR_COUNT
-         *************************************************************************/
-   CORO_SUB(EVAL_MD5)
-
-      if (coro->count == 0)
-         coro->count = coro->len;
-
-      if (coro->len - coro->offset < coro->count)
-         coro->count = coro->len - coro->offset;
-
-      /* size limit */
-      if (coro->count > size_in_megabytes(64))
-         coro->count = size_in_megabytes(64);
-
-      MD5_Update(&coro->md5,
-            (void*)((uint8_t*)coro->data + coro->offset),
-            coro->count);
-      CORO_RET();
-
-      /**************************************************************************
-       * Info    Updates the CHEEVOS_VAR_MD5 hash with a repeated value
-         * Inputs  CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT
-         * Outputs CHEEVOS_VAR_MD5
-         *************************************************************************/
-   CORO_SUB(FILL_MD5)
-
-      {
-         char buffer[4096];
-
-         while (coro->count > 0)
-         {
-            size_t len = sizeof(buffer);
-
-            if (len > coro->count)
-               len = coro->count;
-
-            memset((void*)buffer, coro->offset, len);
-            MD5_Update(&coro->md5, (void*)buffer, len);
-            coro->count -= len;
-         }
-      }
-
-      CORO_RET();
-
-      /**************************************************************************
-       * Info    Gets the achievements from Retro Achievements
-         * Inputs  coro->hash
-         * Outputs CHEEVOS_VAR_GAMEID
-         *************************************************************************/
-   CORO_SUB(GET_GAMEID)
-
-      {
-         char gameid[16];
-
-         CHEEVOS_LOG(
-               "[CHEEVOS]: getting game id for hash %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
-               coro->hash[ 0], coro->hash[ 1], coro->hash[ 2], coro->hash[ 3],
-               coro->hash[ 4], coro->hash[ 5], coro->hash[ 6], coro->hash[ 7],
-               coro->hash[ 8], coro->hash[ 9], coro->hash[10], coro->hash[11],
-               coro->hash[12], coro->hash[13], coro->hash[14], coro->hash[15]
-               );
-
-         snprintf(
-               coro->url, sizeof(coro->url),
-               "http://retroachievements.org/dorequest.php?r=gameid&m=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-               coro->hash[ 0], coro->hash[ 1], coro->hash[ 2], coro->hash[ 3],
-               coro->hash[ 4], coro->hash[ 5], coro->hash[ 6], coro->hash[ 7],
-               coro->hash[ 8], coro->hash[ 9], coro->hash[10], coro->hash[11],
-               coro->hash[12], coro->hash[13], coro->hash[14], coro->hash[15]
-               );
-
-         coro->url[sizeof(coro->url) - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-         cheevos_log_url("[CHEEVOS]: url to get the game's id: %s\n", coro->url);
-#endif
-
-         CORO_GOSUB(HTTP_GET);
-
-         if (!coro->json)
-            CORO_RET();
-
-         if (cheevos_get_value(coro->json,
-                  CHEEVOS_JSON_KEY_GAMEID, gameid, sizeof(gameid)))
-         {
-            if ((void*)coro->json)
-               free((void*)coro->json);
-            CHEEVOS_ERR("[CHEEVOS]: error getting game_id.\n");
-            CORO_RET();
-         }
-
-         if ((void*)coro->json)
-            free((void*)coro->json);
-         CHEEVOS_LOG("[CHEEVOS]: got game id %s.\n", gameid);
-         coro->gameid = (unsigned)strtol(gameid, NULL, 10);
-         CORO_RET();
-      }
-
-      /**************************************************************************
-       * Info    Gets the achievements from Retro Achievements
-         * Inputs  CHEEVOS_VAR_GAMEID
-         * Outputs CHEEVOS_VAR_JSON
-         *************************************************************************/
-   CORO_SUB(GET_CHEEVOS)
-
-      CORO_GOSUB(LOGIN);
-
-      snprintf(coro->url, sizeof(coro->url),
-            "http://retroachievements.org/dorequest.php?r=patch&g=%u&u=%s&t=%s",
-            coro->gameid,
-            coro->settings->arrays.cheevos_username,
-            cheevos_locals.token);
-
-      coro->url[sizeof(coro->url) - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-      cheevos_log_url("[CHEEVOS]: url to get the list of cheevos: %s\n", coro->url);
-#endif
-
-      CORO_GOSUB(HTTP_GET);
-
-      if (!coro->json)
-      {
-         CHEEVOS_ERR("[CHEEVOS]: error getting achievements for game id %u.\n", coro->gameid);
-         CORO_STOP();
-      }
-
-      CHEEVOS_LOG("[CHEEVOS]: got achievements for game id %u.\n", coro->gameid);
-      CORO_RET();
-
-      /**************************************************************************
-       * Info    Gets the achievements from Retro Achievements
-         * Inputs  CHEEVOS_VAR_GAMEID
-         * Outputs CHEEVOS_VAR_JSON
-         *************************************************************************/
-   CORO_SUB(GET_BADGES)
-
-      badges_ctx = new_badges_ctx;
-
-      {
-         settings_t *settings = config_get_ptr();
-         if (!string_is_equal(settings->arrays.menu_driver, "xmb") ||
-               !settings->bools.cheevos_badges_enable)
-            CORO_RET();
-      }
-
-      coro->cheevo            = cheevos_locals.core.cheevos;
-      coro->cheevo_end        = cheevos_locals.core.cheevos + cheevos_locals.core.count;
-
-      for (; coro->cheevo < coro->cheevo_end; coro->cheevo++)
-      {
-         for (coro->j = 0 ; coro->j < 2; coro->j++)
-         {
-            coro->badge_fullpath[0] = '\0';
-            fill_pathname_application_special(
-                  coro->badge_fullpath,
-                  sizeof(coro->badge_fullpath),
-                  APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);
-
-            if (!path_is_directory(coro->badge_fullpath))
-               path_mkdir(coro->badge_fullpath);
-            CORO_YIELD();
-            if (coro->j == 0)
-               snprintf(coro->badge_name,
-                     sizeof(coro->badge_name),
-                     "%s.png", coro->cheevo->badge);
-            else
-               snprintf(coro->badge_name,
-                     sizeof(coro->badge_name),
-                     "%s_lock.png", coro->cheevo->badge);
-
-            fill_pathname_join(
-                  coro->badge_fullpath,
-                  coro->badge_fullpath,
-                  coro->badge_name,
-                  sizeof(coro->badge_fullpath));
-
-            if (!badge_exists(coro->badge_fullpath))
-            {
-#ifdef CHEEVOS_LOG_BADGES
-               CHEEVOS_LOG(
-                     "[CHEEVOS]: downloading badge %s\n",
-                     coro->badge_fullpath);
-#endif
-               snprintf(coro->url,
-                     sizeof(coro->url),
-                     "http://i.retroachievements.org/Badge/%s",
-                     coro->badge_name);
-
-               CORO_GOSUB(HTTP_GET);
-
-               if (coro->json)
-               {
-                  if (!filestream_write_file(coro->badge_fullpath,
-                           coro->json, coro->k))
-                     CHEEVOS_ERR("[CHEEVOS]: error writing badge %s\n", coro->badge_fullpath);
-                  else
-                     free(coro->json);
-               }
-            }
-         }
-      }
-
-      CORO_RET();
-
-      /**************************************************************************
-       * Info Logs in the user at Retro Achievements
-         *************************************************************************/
-   CORO_SUB(LOGIN)
-
-      if (cheevos_locals.token[0])
-         CORO_RET();
-
-      {
-         char urle_user[64];
-         char urle_login[64];
-         const char *username = coro ? coro->settings->arrays.cheevos_username : NULL;
-         const char *login    = NULL;
-         bool via_token       = false;
-
-         if (coro)
-         {
-            if (string_is_empty(coro->settings->arrays.cheevos_password))
-            {
-               via_token      = true;
-               login          = coro->settings->arrays.cheevos_token;
-            }
-            else
-               login          = coro->settings->arrays.cheevos_password;
-         }
-         else
-            login = NULL;
-
-         if (string_is_empty(username) || string_is_empty(login))
-         {
-            runloop_msg_queue_push(
-                  "Missing RetroAchievements account information.",
-                  0, 5 * 60, false);
-            runloop_msg_queue_push(
-                  "Please fill in your account information in Settings.",
-                  0, 5 * 60, false);
-            CHEEVOS_ERR("[CHEEVOS]: login info not informed.\n");
-            CORO_STOP();
-         }
-
-         cheevos_url_encode(username, urle_user, sizeof(urle_user));
-         cheevos_url_encode(login, urle_login, sizeof(urle_login));
-
-         snprintf(
-               coro->url, sizeof(coro->url),
-               "http://retroachievements.org/dorequest.php?r=login&u=%s&%c=%s",
-                     urle_user, via_token ? 't' : 'p', urle_login
-               );
-
-         coro->url[sizeof(coro->url) - 1] = 0;
-      }
-
-#ifdef CHEEVOS_LOG_URLS
-      cheevos_log_url("[CHEEVOS]: url to login: %s\n",
-            coro->url);
-#endif
-
-      CORO_GOSUB(HTTP_GET);
-
-      if (coro->json)
-      {
-         char error_response[64];
-         char error_message[256];
-
-         cheevos_get_value(
-               coro->json,
-               CHEEVOS_JSON_KEY_ERROR,
-               error_response,
-               sizeof(error_response)
-         );
-
-         /* No error, continue with login */
-         if (string_is_empty(error_response))
-         {
-            int res = cheevos_get_value(
-               coro->json,
-               CHEEVOS_JSON_KEY_TOKEN,
-               cheevos_locals.token,
-               sizeof(cheevos_locals.token));
-
-            if ((void*)coro->json)
-               free((void*)coro->json);
-
-            if (!res)
-            {
-               if (coro->settings->bools.cheevos_verbose_enable)
-               {
-                  char msg[256];
-                  snprintf(msg, sizeof(msg),
-                        "RetroAchievements: Logged in as \"%s\".",
-                        coro->settings->arrays.cheevos_username);
-                  msg[sizeof(msg) - 1] = 0;
-                  runloop_msg_queue_push(msg, 0, 3 * 60, false);
-               }
-
-               /* Save token to config and clear pass on success */
-               *coro->settings->arrays.cheevos_password = '\0';
-               strncpy(
-                     coro->settings->arrays.cheevos_token,
-                     cheevos_locals.token, sizeof(cheevos_locals.token)
-               );
-               CORO_RET();
-            }
-         }
-
-         if ((void*)coro->json)
-            free((void*)coro->json);
-
-         /* Site returned error, display it */
-         snprintf(error_message, sizeof(error_message),
-               "RetroAchievements: %s",
-               error_response);
-         error_message[sizeof(error_message) - 1] = 0;
-         runloop_msg_queue_push(error_message, 0, 5 * 60, false);
-         *coro->settings->arrays.cheevos_token = '\0';
-
-         CORO_STOP();
-      }
-
-      runloop_msg_queue_push("RetroAchievements: Error contacting server.", 0, 5 * 60, false);
-      CHEEVOS_ERR("[CHEEVOS]: error getting user token.\n");
-
-      CORO_STOP();
-
-      /**************************************************************************
-       * Info    Pauses execution for five seconds
-         *************************************************************************/
-   CORO_SUB(DELAY)
-
-      {
-         retro_time_t t1;
-         coro->t0         = cpu_features_get_time_usec();
-
-         do
-         {
-            CORO_YIELD();
-            t1 = cpu_features_get_time_usec();
-         }while ((t1 - coro->t0) < 3000000);
-      }
-
-      CORO_RET();
-
-      /**************************************************************************
-       * Info    Makes a HTTP GET request
-         * Inputs  CHEEVOS_VAR_URL
-         * Outputs CHEEVOS_VAR_JSON
-         *************************************************************************/
-   CORO_SUB(HTTP_GET)
-
-      for (coro->k = 0; coro->k < 5; coro->k++)
-      {
-         if (coro->k != 0)
-            CHEEVOS_LOG("[CHEEVOS]: Retrying HTTP request: %u of 5\n", coro->k + 1);
-
-         coro->json       = NULL;
-         coro->conn       = net_http_connection_new(
-               coro->url, "GET", NULL);
-
-         if (!coro->conn)
-         {
-            CORO_GOSUB(DELAY);
-            continue;
-         }
-
-         /* Don't bother with timeouts here, it's just a string scan. */
-         while (!net_http_connection_iterate(coro->conn)) {}
-
-         /* Error finishing the connection descriptor. */
-         if (!net_http_connection_done(coro->conn))
-         {
-            net_http_connection_free(coro->conn);
-            continue;
-         }
-
-         coro->http = net_http_new(coro->conn);
-
-         /* Error connecting to the endpoint. */
-         if (!coro->http)
-         {
-            net_http_connection_free(coro->conn);
-            CORO_GOSUB(DELAY);
-            continue;
-         }
-
-         while (!net_http_update(coro->http, NULL, NULL))
-            CORO_YIELD();
-
-         {
-            size_t length;
-            uint8_t *data = net_http_data(coro->http,
-                  &length, false);
-
-            if (data)
-            {
-               coro->json = (char*)malloc(length + 1);
-
-               if (coro->json)
-               {
-                  memcpy((void*)coro->json, (void*)data, length);
-                  free(data);
-                  coro->json[length] = 0;
-               }
-
-               coro->k = (unsigned)length;
-               net_http_delete(coro->http);
-               net_http_connection_free(coro->conn);
-               CORO_RET();
-            }
-         }
-
-         net_http_delete(coro->http);
-         net_http_connection_free(coro->conn);
-      }
-
-      CHEEVOS_LOG("[CHEEVOS]: Couldn't connect to server after 5 tries\n");
-      CORO_RET();
-
-      /**************************************************************************
-       * Info    Deactivates the achievements already awarded
-         * Inputs  CHEEVOS_VAR_GAMEID
-         * Outputs
-         *************************************************************************/
-   CORO_SUB(DEACTIVATE)
-
-#ifndef CHEEVOS_DONT_DEACTIVATE
-      CORO_GOSUB(LOGIN);
-
-      /* Deactivate achievements in softcore mode. */
-      snprintf(
-            coro->url, sizeof(coro->url),
-            "http://retroachievements.org/dorequest.php?r=unlocks&u=%s&t=%s&g=%u&h=0",
-            coro->settings->arrays.cheevos_username,
-            cheevos_locals.token, coro->gameid
-            );
-
-      coro->url[sizeof(coro->url) - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-      cheevos_log_url("[CHEEVOS]: url to get the list of unlocked cheevos in softcore: %s\n", coro->url);
-#endif
-
-      CORO_GOSUB(HTTP_GET);
-
-      if (coro->json)
-      {
-         if (!cheevos_deactivate_unlocks(coro->json, CHEEVOS_ACTIVE_SOFTCORE))
-            CHEEVOS_LOG("[CHEEVOS]: deactivated unlocked achievements in softcore mode.\n");
-         else
-            CHEEVOS_ERR("[CHEEVOS]: error deactivating unlocked achievements in softcore mode.\n");
-
-         if ((void*)coro->json)
-            free((void*)coro->json);
-      }
-      else
-         CHEEVOS_ERR("[CHEEVOS]: error retrieving list of unlocked achievements in softcore mode.\n");
-
-      /* Deactivate achievements in hardcore mode. */
-      snprintf(
-            coro->url, sizeof(coro->url),
-            "http://retroachievements.org/dorequest.php?r=unlocks&u=%s&t=%s&g=%u&h=1",
-            coro->settings->arrays.cheevos_username,
-            cheevos_locals.token, coro->gameid
-            );
-
-      coro->url[sizeof(coro->url) - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-      cheevos_log_url("[CHEEVOS]: url to get the list of unlocked cheevos in hardcore: %s\n", coro->url);
-#endif
-
-      CORO_GOSUB(HTTP_GET);
-
-      if (coro->json)
-      {
-         if (!cheevos_deactivate_unlocks(coro->json, CHEEVOS_ACTIVE_HARDCORE))
-            CHEEVOS_LOG("[CHEEVOS]: deactivated unlocked achievements in hardcore mode.\n");
-         else
-            CHEEVOS_ERR("[CHEEVOS]: error deactivating unlocked achievements in hardcore mode.\n");
-
-         if ((void*)coro->json)
-            free((void*)coro->json);
-      }
-      else
-         CHEEVOS_ERR("[CHEEVOS]: error retrieving list of unlocked achievements in hardcore mode.\n");
-
-#endif
-      CORO_RET();
-
-      /**************************************************************************
-       * Info    Posts the "playing" activity to Retro Achievements
-         * Inputs  CHEEVOS_VAR_GAMEID
-         * Outputs
-         *************************************************************************/
-   CORO_SUB(PLAYING)
-
-      snprintf(
-            coro->url, sizeof(coro->url),
-            "http://retroachievements.org/dorequest.php?r=postactivity&u=%s&t=%s&a=3&m=%u",
-            coro->settings->arrays.cheevos_username,
-            cheevos_locals.token, coro->gameid
-            );
-
-      coro->url[sizeof(coro->url) - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-      cheevos_log_url("[CHEEVOS]: url to post the 'playing' activity: %s\n", coro->url);
-#endif
-
-      CORO_GOSUB(HTTP_GET);
-
-      if (coro->json)
-      {
-         CHEEVOS_LOG("[CHEEVOS]: posted playing activity.\n");
-         if ((void*)coro->json)
-            free((void*)coro->json);
-      }
-      else
-         CHEEVOS_ERR("[CHEEVOS]: error posting playing activity.\n");
-
-      CHEEVOS_LOG("[CHEEVOS]: posted playing activity.\n");
-      CORO_RET();
-
-   CORO_LEAVE();
-}
-
-static void cheevos_task_handler(retro_task_t *task)
-{
-   coro_t *coro = (coro_t*)task->state;
-
-   if (!coro)
-      return;
-
-   if (!cheevos_iterate(coro) || task_get_cancelled(task))
-   {
-      task_set_finished(task, true);
-
-      CHEEVOS_LOCK(cheevos_locals.task_lock);
-      cheevos_locals.task = NULL;
-      CHEEVOS_UNLOCK(cheevos_locals.task_lock);
-
-      if (task_get_cancelled(task))
-      {
-         CHEEVOS_LOG("[CHEEVOS]: Load task cancelled\n");
-      }
-      else
-      {
-         CHEEVOS_LOG("[CHEEVOS]: Load task finished\n");
-      }
-
-      if (coro->data)
-         free(coro->data);
-
-      if ((void*)coro->path)
-         free((void*)coro->path);
-
-      free((void*)coro);
-   }
-}
-
-bool cheevos_load(const void *data)
-{
-   retro_task_t *task;
-   const struct retro_game_info *info = NULL;
-   coro_t *coro                       = NULL;
-
-   cheevos_loaded = false;
-   cheevos_hardcore_paused = false;
-
-   if (!cheevos_locals.core_supports || !data)
-      return false;
-
-   coro = (coro_t*)calloc(1, sizeof(*coro));
-
-   if (!coro)
-      return false;
-
-   task = (retro_task_t*)calloc(1, sizeof(*task));
-
-   if (!task)
-   {
-      if ((void*)coro)
-         free((void*)coro);
-      return false;
-   }
-
-   CORO_SETUP();
-
-   info = (const struct retro_game_info*)data;
-
-   if (info->data)
-   {
-      coro->len = info->size;
-
-      /* size limit */
-      if (coro->len > size_in_megabytes(64))
-         coro->len = size_in_megabytes(64);
-
-      coro->data = malloc(coro->len);
-
-      if (!coro->data)
-      {
-         if ((void*)task)
-            free((void*)task);
-         if ((void*)coro)
-            free((void*)coro);
-         return false;
-      }
-
-      memcpy(coro->data, info->data, coro->len);
-      coro->path       = NULL;
-   }
-   else
-   {
-      coro->data       = NULL;
-      coro->path       = strdup(info->path);
-   }
-
-   task->handler   = cheevos_task_handler;
-   task->state     = (void*)coro;
-   task->mute      = true;
-   task->callback  = NULL;
-   task->user_data = NULL;
-   task->progress  = 0;
-   task->title     = NULL;
-
-#ifdef HAVE_THREADS
-   if (cheevos_locals.task_lock == NULL)
-   {
-      cheevos_locals.task_lock = slock_new();
-   }
-#endif
-
-   CHEEVOS_LOCK(cheevos_locals.task_lock);
-   cheevos_locals.task = task;
-   CHEEVOS_UNLOCK(cheevos_locals.task_lock);
-
-   task_queue_push(task);
-
-   return true;
-}
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2015-2018 - Andre Leiradella
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <string.h>
+#include <ctype.h>
+
+#include <file/file_path.h>
+#include <string/stdstring.h>
+#include <formats/jsonsax.h>
+#include <streams/interface_stream.h>
+#include <streams/file_stream.h>
+#include <features/features_cpu.h>
+#include <compat/strl.h>
+#include <rhash.h>
+#include <retro_miscellaneous.h>
+#include <retro_math.h>
+#include <net/net_http.h>
+#include <libretro.h>
+
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+#ifdef HAVE_MENU
+#include "../menu/menu_driver.h"
+#include "../menu/menu_entries.h"
+#endif
+
+#ifdef HAVE_THREADS
+#include <rthreads/rthreads.h>
+#endif
+
+#include "badges.h"
+#include "cheevos.h"
+#include "var.h"
+#include "cond.h"
+
+#include "../file_path_special.h"
+#include "../paths.h"
+#include "../command.h"
+#include "../dynamic.h"
+#include "../configuration.h"
+#include "../performance_counters.h"
+#include "../msg_hash.h"
+#include "../retroarch.h"
+#include "../core.h"
+
+#include "../network/net_http_special.h"
+#include "../tasks/tasks_internal.h"
+
+#include "../verbosity.h"
+
+/* Define this macro to prevent cheevos from being deactivated. */
+#undef CHEEVOS_DONT_DEACTIVATE
+
+/* Define this macro to log URLs (will log the user token). */
+#undef CHEEVOS_LOG_URLS
+
+/* Define this macro to dump all cheevos' addresses. */
+#undef CHEEVOS_DUMP_ADDRS
+
+/* Define this macro to remove HTTP timeouts. */
+#undef CHEEVOS_NO_TIMEOUT
+
+/* Define this macro to load a JSON file from disk instead of downloading
+ * from retroachievements.org. */
+#undef CHEEVOS_JSON_OVERRIDE
+
+/* Define this macro with a string to save the JSON file to disk with
+ * that name. */
+#undef CHEEVOS_SAVE_JSON
+
+/* Define this macro to have the password and token logged. THIS WILL DISCLOSE
+ * THE USER'S PASSWORD, TAKE CARE! */
+#undef CHEEVOS_LOG_PASSWORD
+
+/* Define this macro to log downloaded badge images. */
+#undef CHEEVOS_LOG_BADGES
+
+/* C89 wants only int values in enums. */
+#define CHEEVOS_JSON_KEY_GAMEID       0xb4960eecU
+#define CHEEVOS_JSON_KEY_ACHIEVEMENTS 0x69749ae1U
+#define CHEEVOS_JSON_KEY_ID           0x005973f2U
+#define CHEEVOS_JSON_KEY_MEMADDR      0x1e76b53fU
+#define CHEEVOS_JSON_KEY_TITLE        0x0e2a9a07U
+#define CHEEVOS_JSON_KEY_DESCRIPTION  0xe61a1f69U
+#define CHEEVOS_JSON_KEY_POINTS       0xca8fce22U
+#define CHEEVOS_JSON_KEY_AUTHOR       0xa804edb8U
+#define CHEEVOS_JSON_KEY_MODIFIED     0xdcea4fe6U
+#define CHEEVOS_JSON_KEY_CREATED      0x3a84721dU
+#define CHEEVOS_JSON_KEY_BADGENAME    0x887685d9U
+#define CHEEVOS_JSON_KEY_CONSOLE_ID   0x071656e5U
+#define CHEEVOS_JSON_KEY_TOKEN        0x0e2dbd26U
+#define CHEEVOS_JSON_KEY_FLAGS        0x0d2e96b2U
+#define CHEEVOS_JSON_KEY_LEADERBOARDS 0xf1247d2dU
+#define CHEEVOS_JSON_KEY_MEM          0x0b8807e4U
+#define CHEEVOS_JSON_KEY_FORMAT       0xb341208eU
+#define CHEEVOS_JSON_KEY_SUCCESS      0x110461deU
+#define CHEEVOS_JSON_KEY_ERROR        0x0d2011cfU
+
+typedef struct
+{
+   cheevos_cond_t *conds;
+   unsigned        count;
+} cheevos_condset_t;
+
+typedef struct
+{
+   cheevos_condset_t *condsets;
+   unsigned count;
+} cheevos_condition_t;
+
+typedef struct
+{
+   unsigned    id;
+   const char *title;
+   const char *description;
+   const char *author;
+   const char *badge;
+   unsigned    points;
+   unsigned    dirty;
+   int         active;
+   int         last;
+   int         modified;
+
+   cheevos_condition_t condition;
+} cheevo_t;
+
+typedef struct
+{
+   cheevo_t *cheevos;
+   unsigned  count;
+} cheevoset_t;
+
+typedef struct
+{
+   int is_element;
+   int mode;
+} cheevos_deactivate_t;
+
+typedef struct
+{
+   unsigned    key_hash;
+   int         is_key;
+   const char *value;
+   size_t      length;
+} cheevos_getvalueud_t;
+
+typedef struct
+{
+   int      in_cheevos;
+   int      in_lboards;
+   uint32_t field_hash;
+   unsigned core_count;
+   unsigned unofficial_count;
+   unsigned lboard_count;
+} cheevos_countud_t;
+
+typedef struct
+{
+   const char *string;
+   size_t      length;
+} cheevos_field_t;
+
+typedef struct
+{
+   int      in_cheevos;
+   int      in_lboards;
+   int      is_console_id;
+   unsigned core_count;
+   unsigned unofficial_count;
+   unsigned lboard_count;
+
+   cheevos_field_t *field;
+   cheevos_field_t  id, memaddr, title, desc, points, author;
+   cheevos_field_t  modified, created, badge, flags, format;
+} cheevos_readud_t;
+
+typedef struct
+{
+   int label;
+   const char *name;
+   const uint32_t *ext_hashes;
+} cheevos_finder_t;
+
+typedef struct
+{
+   cheevos_var_t var;
+   double        multiplier;
+   bool          compare_next;
+} cheevos_term_t;
+
+typedef struct
+{
+   cheevos_term_t *terms;
+   unsigned        count;
+   unsigned        compare_count;
+} cheevos_expr_t;
+
+typedef struct
+{
+   unsigned    id;
+   unsigned    format;
+   const char *title;
+   const char *description;
+   int         active;
+   int         last_value;
+
+   cheevos_condition_t start;
+   cheevos_condition_t cancel;
+   cheevos_condition_t submit;
+   cheevos_expr_t      value;
+} cheevos_leaderboard_t;
+
+typedef struct
+{
+   retro_task_t* task;
+#ifdef HAVE_THREADS
+   slock_t*      task_lock;
+#endif
+
+   cheevos_console_t console_id;
+   bool core_supports;
+   bool addrs_patched;
+   int  add_buffer;
+   int  add_hits;
+
+   cheevoset_t core;
+   cheevoset_t unofficial;
+   cheevos_leaderboard_t *leaderboards;
+   unsigned lboard_count;
+
+   char token[32];
+
+   retro_ctx_memory_info_t meminfo[4];
+} cheevos_locals_t;
+
+typedef struct
+{
+   uint8_t id[4]; /* NES^Z */
+   uint8_t rom_size;
+   uint8_t vrom_size;
+   uint8_t rom_type;
+   uint8_t rom_type2;
+   uint8_t reserve[8];
+} cheevos_nes_header_t;
+
+static cheevos_locals_t cheevos_locals =
+{
+   /* task                */ NULL,
+#ifdef HAVE_THREADS
+   /* task_lock           */ NULL,
+#endif
+
+   /* console_id          */ CHEEVOS_CONSOLE_NONE,
+   /* core_supports       */ true,
+   /* addrs_patched       */ false,
+   /* add_buffer          */ 0,
+   /* add_hits            */ 0,
+
+   /* core                */ {NULL, 0},
+   /* unofficial          */ {NULL, 0},
+   /* leaderboards        */ NULL,
+   /* lboard_count        */ 0,
+
+   /* token               */ {0},
+
+   {
+   /* meminfo[0]          */ {NULL, 0, 0},
+   /* meminfo[1]          */ {NULL, 0, 0},
+   /* meminfo[2]          */ {NULL, 0, 0},
+   /* meminfo[3]          */ {NULL, 0, 0}
+   }
+};
+
+bool cheevos_loaded = false;
+bool cheevos_hardcore_active = false;
+bool cheevos_hardcore_paused = false;
+bool cheevos_state_loaded_flag = false;
+int cheats_are_enabled = 0;
+int cheats_were_enabled = 0;
+
+#ifdef HAVE_THREADS
+#define CHEEVOS_LOCK(l)   do { slock_lock(l); } while (0)
+#define CHEEVOS_UNLOCK(l) do { slock_unlock(l); } while (0)
+#else
+#define CHEEVOS_LOCK(l)
+#define CHEEVOS_UNLOCK(l)
+#endif
+
+/*****************************************************************************
+Supporting functions.
+*****************************************************************************/
+
+#ifndef CHEEVOS_VERBOSE
+
+void cheevos_log(const char *fmt, ...)
+{
+   (void)fmt;
+}
+
+#endif
+
+static unsigned size_in_megabytes(unsigned val)
+{
+   return (val * 1024 * 1024);
+}
+
+#ifdef CHEEVOS_LOG_URLS
+static void cheevos_log_url(const char* format, const char* url)
+{
+#ifdef CHEEVOS_LOG_PASSWORD
+   CHEEVOS_LOG(format, url);
+#else
+   char copy[256];
+   char* aux      = NULL;
+   char* next     = NULL;
+
+   if (!string_is_empty(url))
+      strlcpy(copy, url, sizeof(copy));
+
+   aux = strstr(copy, "?p=");
+
+   if (!aux)
+      aux = strstr(copy, "&p=");
+
+   if (aux)
+   {
+      aux += 3;
+      next = strchr(aux, '&');
+
+      if (next)
+      {
+         do
+         {
+            *aux++ = *next++;
+         }while (next[-1] != 0);
+      }
+      else
+         *aux = 0;
+   }
+
+   aux = strstr(copy, "?t=");
+
+   if (!aux)
+      aux = strstr(copy, "&t=");
+
+   if (aux)
+   {
+      aux += 3;
+      next = strchr(aux, '&');
+
+      if (next)
+      {
+         do
+         {
+            *aux++ = *next++;
+         }while (next[-1] != 0);
+      }
+      else
+         *aux = 0;
+   }
+
+   CHEEVOS_LOG(format, copy);
+#endif
+}
+#endif
+
+static uint32_t cheevos_djb2(const char* str, size_t length)
+{
+   const unsigned char *aux = (const unsigned char*)str;
+   const unsigned char *end = aux + length;
+   uint32_t            hash = 5381;
+
+   while (aux < end)
+      hash = (hash << 5) + hash + *aux++;
+
+   return hash;
+}
+
+static int cheevos_getvalue__json_key(void *userdata,
+      const char *name, size_t length)
+{
+   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
+
+   if (ud)
+      ud->is_key = cheevos_djb2(name, length) == ud->key_hash;
+   return 0;
+}
+
+static int cheevos_getvalue__json_string(void *userdata,
+      const char *string, size_t length)
+{
+   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
+
+   if (ud && ud->is_key)
+   {
+      ud->value  = string;
+      ud->length = length;
+      ud->is_key = 0;
+   }
+
+   return 0;
+}
+
+static int cheevos_getvalue__json_boolean(void *userdata, int istrue)
+{
+   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
+
+   if (ud && ud->is_key)
+   {
+      if (istrue)
+      {
+         ud->value  = "true";
+         ud->length = 4;
+      }
+      else
+      {
+         ud->value  = "false";
+         ud->length = 5;
+      }
+      ud->is_key    = 0;
+   }
+
+   return 0;
+}
+
+static int cheevos_getvalue__json_null(void *userdata)
+{
+   cheevos_getvalueud_t* ud = (cheevos_getvalueud_t*)userdata;
+
+   if (ud && ud->is_key )
+   {
+      ud->value = "null";
+      ud->length = 4;
+      ud->is_key = 0;
+   }
+
+   return 0;
+}
+
+static int cheevos_get_value(const char *json, unsigned key_hash,
+      char *value, size_t length)
+{
+   static const jsonsax_handlers_t handlers =
+   {
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      cheevos_getvalue__json_key,
+      NULL,
+      cheevos_getvalue__json_string,
+      cheevos_getvalue__json_string, /* number */
+      cheevos_getvalue__json_boolean,
+      cheevos_getvalue__json_null
+   };
+
+   cheevos_getvalueud_t ud;
+
+   ud.key_hash = key_hash;
+   ud.is_key   = 0;
+   ud.value    = NULL;
+   ud.length   = 0;
+   *value      = 0;
+
+   if ((jsonsax_parse(json, &handlers, (void*)&ud) == JSONSAX_OK)
+         && ud.value && ud.length < length)
+   {
+      if (!string_is_empty(ud.value))
+         strlcpy(value, ud.value, ud.length + 1);
+      return 0;
+   }
+
+   return -1;
+}
+
+/*****************************************************************************
+Count number of achievements in a JSON file.
+*****************************************************************************/
+
+static int cheevos_count__json_end_array(void *userdata)
+{
+  cheevos_countud_t* ud = (cheevos_countud_t*)userdata;
+
+  if (ud)
+  {
+     ud->in_cheevos     = 0;
+     ud->in_lboards     = 0;
+  }
+
+  return 0;
+}
+
+static int cheevos_count__json_key(void *userdata,
+      const char *name, size_t length)
+{
+   cheevos_countud_t* ud = (cheevos_countud_t*)userdata;
+
+   if (ud)
+   {
+      ud->field_hash        = cheevos_djb2(name, length);
+      if (ud->field_hash == CHEEVOS_JSON_KEY_ACHIEVEMENTS)
+         ud->in_cheevos = 1;
+      else if (ud->field_hash == CHEEVOS_JSON_KEY_LEADERBOARDS)
+         ud->in_lboards = 1;
+   }
+
+   return 0;
+}
+
+static int cheevos_count__json_number(void *userdata,
+      const char *number, size_t length)
+{
+   cheevos_countud_t* ud = (cheevos_countud_t*)userdata;
+
+   if (ud)
+   {
+      if (ud->in_cheevos && ud->field_hash == CHEEVOS_JSON_KEY_FLAGS)
+      {
+         long flags = strtol(number, NULL, 10);
+
+         if (flags == 3)
+            ud->core_count++;       /* Core achievements */
+         else if (flags == 5)
+            ud->unofficial_count++; /* Unofficial achievements */
+      }
+      else if (ud->in_lboards && ud->field_hash == CHEEVOS_JSON_KEY_ID)
+         ud->lboard_count++;
+   }
+
+   return 0;
+}
+
+static int cheevos_count_cheevos(const char *json,
+      unsigned *core_count, unsigned *unofficial_count,
+      unsigned *lboard_count)
+{
+   static const jsonsax_handlers_t handlers =
+   {
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      cheevos_count__json_end_array,
+      cheevos_count__json_key,
+      NULL,
+      NULL,
+      cheevos_count__json_number,
+      NULL,
+      NULL
+   };
+
+   int res;
+   cheevos_countud_t ud;
+   ud.in_cheevos       = 0;
+   ud.in_lboards       = 0;
+   ud.core_count       = 0;
+   ud.unofficial_count = 0;
+   ud.lboard_count     = 0;
+
+   res                 = jsonsax_parse(json, &handlers, (void*)&ud);
+
+   *core_count         = ud.core_count;
+   *unofficial_count   = ud.unofficial_count;
+   *lboard_count       = ud.lboard_count;
+
+   return res;
+}
+
+/*****************************************************************************
+Parse the MemAddr field.
+*****************************************************************************/
+
+static unsigned cheevos_count_cond_sets(const char *memaddr)
+{
+   cheevos_cond_t cond;
+   unsigned count = 0;
+
+   for (;;)
+   {
+      count++;
+
+      for (;;)
+      {
+         cheevos_cond_parse(&cond, &memaddr);
+
+         if (*memaddr != '_')
+            break;
+
+         memaddr++;
+      }
+
+      if (*memaddr != 'S')
+         break;
+
+      memaddr++;
+   }
+
+   return count;
+}
+
+static int cheevos_parse_condition(
+      cheevos_condition_t *condition,
+      const char* memaddr)
+{
+   if (!condition)
+      return 0;
+
+   condition->count = cheevos_count_cond_sets(memaddr);
+
+   if (condition->count)
+   {
+      unsigned set                 = 0;
+      const cheevos_condset_t* end = NULL;
+      cheevos_condset_t *conds     = NULL;
+      cheevos_condset_t *condset   = NULL;
+      cheevos_condset_t *condsets  = (cheevos_condset_t*)
+         calloc(condition->count, sizeof(cheevos_condset_t));
+
+      (void)conds;
+
+      if (!condsets)
+         return -1;
+
+      condition->condsets = condsets;
+      end                 = condition->condsets + condition->count;
+
+      for (condset = condition->condsets; condset < end; condset++, set++)
+      {
+         condset->count =
+            cheevos_cond_count_in_set(memaddr, set);
+         condset->conds = NULL;
+
+         CHEEVOS_LOG("[CHEEVOS]: set %p (index=%u)\n", condset, set);
+         CHEEVOS_LOG("[CHEEVOS]:   conds: %u\n", condset->count);
+
+         if (condset->count)
+         {
+            cheevos_cond_t *conds = (cheevos_cond_t*)
+               calloc(condset->count, sizeof(cheevos_cond_t));
+
+            if (!conds)
+            {
+               while (--condset >= condition->condsets)
+               {
+                  if ((void*)condset->conds)
+                     free((void*)condset->conds);
+               }
+
+               return -1;
+            }
+
+            condset->conds = conds;
+            cheevos_cond_parse_in_set(condset->conds, memaddr, set);
+         }
+      }
+   }
+
+   return 0;
+}
+
+static void cheevos_free_condition(cheevos_condition_t* condition)
+{
+   unsigned i;
+
+   if (!condition)
+      return;
+
+   if (condition->condsets)
+   {
+      for (i = 0; i < condition->count; i++)
+      {
+         if (condition->condsets[i].conds)
+         {
+            free(condition->condsets[i].conds);
+            condition->condsets[i].conds = NULL;
+         }
+      }
+
+      if (condition->condsets)
+      {
+         free(condition->condsets);
+         condition->condsets = NULL;
+      }
+   }
+}
+
+/*****************************************************************************
+Parse the Mem field of leaderboards.
+*****************************************************************************/
+
+static int cheevos_parse_expression(cheevos_expr_t *expr, const char* mem)
+{
+   unsigned i;
+   const char *aux;
+   cheevos_term_t *terms  = NULL;
+   char       *end        = NULL;
+
+   if (!expr)
+      return -1;
+
+   expr->count            = 1;
+   expr->compare_count    = 1;
+
+   for (aux = mem;; aux++)
+   {
+      if (*aux == '"' || *aux == ':')
+         break;
+      expr->count += *aux == '_';
+   }
+
+   if (expr->count > 0)
+      terms = (cheevos_term_t*)
+         calloc(expr->count, sizeof(cheevos_term_t));
+
+   if (!terms)
+      return -1;
+
+   expr->terms = terms;
+
+   for (i = 0; i < expr->count; i++)
+   {
+      expr->terms[i].compare_next = false;
+      expr->terms[i].multiplier   = 1;
+   }
+
+   for (i = 0, aux = mem; i < expr->count;)
+   {
+      cheevos_var_parse(&expr->terms[i].var, &aux);
+
+      if (*aux != '*')
+      {
+         /* expression has no multiplier */
+         if (*aux == '_')
+         {
+            aux++;
+            i++;
+         }
+         else if (*aux == '$')
+         {
+            expr->terms[i].compare_next = true;
+            expr->compare_count++;
+            aux++;
+            i++;
+         }
+
+         /* no multiplier at end of string */
+         else if (*aux == '\0' || *aux == '"' || *aux == ',')
+            return 0;
+
+         /* invalid character in expression */
+         else
+         {
+            if (expr->terms)
+            {
+               free(expr->terms);
+               expr->terms = NULL;
+            }
+            return -1;
+         }
+      }
+      else
+      {
+         if (aux[1] == 'h' || aux[1] == 'H')
+            expr->terms[i].multiplier = (double)strtol(aux + 2, &end, 16);
+         else
+            expr->terms[i].multiplier = strtod(aux + 1, &end);
+         aux = end;
+
+         if (*aux == '$')
+         {
+            aux++;
+            expr->terms[i].compare_next = true;
+            expr->compare_count++;
+         }
+         else
+            expr->terms[i].compare_next = false;
+
+         aux++;
+         i++;
+      }
+   }
+   return 0;
+}
+
+static int cheevos_parse_mem(cheevos_leaderboard_t *lb, const char* mem)
+{
+   lb->start.condsets  = NULL;
+   lb->cancel.condsets = NULL;
+   lb->submit.condsets = NULL;
+   lb->value.terms     = NULL;
+
+   for (;;)
+   {
+      if (*mem == 'S' && mem[1] == 'T' && mem[2] == 'A' && mem[3] == ':')
+      {
+         if (cheevos_parse_condition(&lb->start, mem + 4))
+            goto error;
+      }
+      else if (*mem == 'C' && mem[1] == 'A' && mem[2] == 'N' && mem[3] == ':')
+      {
+         if (cheevos_parse_condition(&lb->cancel, mem + 4))
+            goto error;
+      }
+      else if (*mem == 'S' && mem[1] == 'U' && mem[2] == 'B' && mem[3] == ':')
+      {
+         if (cheevos_parse_condition(&lb->submit, mem + 4))
+            goto error;
+      }
+      else if (*mem == 'V' && mem[1] == 'A' && mem[2] == 'L' && mem[3] == ':')
+      {
+         if (cheevos_parse_expression(&lb->value, mem + 4))
+            goto error;
+      }
+
+      for (mem += 4;; mem++)
+      {
+         if (*mem == ':' && mem[1] == ':')
+         {
+            mem += 2;
+            break;
+         }
+         else if (*mem == '"')
+            return 0;
+      }
+   }
+
+error:
+   cheevos_free_condition(&lb->start);
+   cheevos_free_condition(&lb->cancel);
+   cheevos_free_condition(&lb->submit);
+   if (lb->value.terms)
+   {
+      free((void*)lb->value.terms);
+      lb->value.terms = NULL;
+   }
+   return -1;
+}
+
+/*****************************************************************************
+Load achievements from a JSON string.
+*****************************************************************************/
+
+static INLINE const char *cheevos_dupstr(const cheevos_field_t *field)
+{
+   char *string = (char*)malloc(field->length + 1);
+
+   if (!string)
+      return NULL;
+
+   memcpy ((void*)string, (void*)field->string, field->length);
+   string[field->length] = 0;
+
+   return string;
+}
+
+static int cheevos_new_cheevo(cheevos_readud_t *ud)
+{
+   cheevo_t *cheevo    = NULL;
+   long flags          = strtol(ud->flags.string, NULL, 10);
+
+   if (flags == 3)
+      cheevo           = cheevos_locals.core.cheevos + ud->core_count++;
+   else if (flags == 5)
+      cheevo           = cheevos_locals.unofficial.cheevos + ud->unofficial_count++;
+   else
+      return 0;
+
+   cheevo->id          = (unsigned)strtol(ud->id.string, NULL, 10);
+   cheevo->title       = cheevos_dupstr(&ud->title);
+   cheevo->description = cheevos_dupstr(&ud->desc);
+   cheevo->author      = cheevos_dupstr(&ud->author);
+   cheevo->badge       = cheevos_dupstr(&ud->badge);
+   cheevo->points      = (unsigned)strtol(ud->points.string, NULL, 10);
+   cheevo->dirty       = 0;
+   cheevo->active      = CHEEVOS_ACTIVE_SOFTCORE | CHEEVOS_ACTIVE_HARDCORE;
+   cheevo->last        = 1;
+   cheevo->modified    = 0;
+
+   if (  !cheevo->title       ||
+         !cheevo->description ||
+         !cheevo->author      ||
+         !cheevo->badge)
+      goto error;
+
+   if (cheevos_parse_condition(&cheevo->condition, ud->memaddr.string))
+      goto error;
+
+   return 0;
+
+error:
+   if (cheevo->title)
+   {
+      free((void*)cheevo->title);
+      cheevo->title = NULL;
+   }
+   if (cheevo->description)
+   {
+      free((void*)cheevo->description);
+      cheevo->description = NULL;
+   }
+   if (cheevo->author)
+   {
+      free((void*)cheevo->author);
+      cheevo->author = NULL;
+   }
+   if (cheevo->badge)
+   {
+      free((void*)cheevo->badge);
+      cheevo->badge = NULL;
+   }
+   return -1;
+}
+
+/*****************************************************************************
+Helper functions for displaying leaderboard values.
+*****************************************************************************/
+
+static void cheevos_format_value(const unsigned value, const unsigned type,
+   char* formatted_value, size_t formatted_size)
+{
+   unsigned mins, secs, millis;
+
+   switch(type)
+   {
+      case CHEEVOS_FORMAT_VALUE:
+         snprintf(formatted_value, formatted_size, "%u", value);
+         break;
+
+      case CHEEVOS_FORMAT_SCORE:
+         snprintf(formatted_value, formatted_size,
+               "%06upts", value);
+         break;
+
+      case CHEEVOS_FORMAT_FRAMES:
+         mins   = value / 3600;
+         secs   = (value % 3600) / 60;
+         millis = (int) (value % 60) * (10.00 / 6.00);
+         snprintf(formatted_value, formatted_size,
+               "%02u:%02u.%02u", mins, secs, millis);
+         break;
+
+      case CHEEVOS_FORMAT_MILLIS:
+         mins   = value / 6000;
+         secs   = (value % 6000) / 100;
+         millis = (int) (value % 100);
+         snprintf(formatted_value, formatted_size,
+               "%02u:%02u.%02u", mins, secs, millis);
+         break;
+
+      case CHEEVOS_FORMAT_SECS:
+         mins   = value / 60;
+         secs   = value % 60;
+         snprintf(formatted_value, formatted_size,
+               "%02u:%02u", mins, secs);
+         break;
+
+      default:
+         snprintf(formatted_value, formatted_size,
+               "%u (?)", value);
+   }
+}
+
+unsigned cheevos_parse_format(cheevos_field_t* format)
+{
+   /* Most likely */
+   if (strncmp(format->string, "VALUE", format->length) == 0)
+      return CHEEVOS_FORMAT_VALUE;
+   else if (strncmp(format->string, "TIME", format->length) == 0)
+      return CHEEVOS_FORMAT_FRAMES;
+   else if (strncmp(format->string, "SCORE", format->length) == 0)
+      return CHEEVOS_FORMAT_SCORE;
+
+   /* Less likely */
+   else if (strncmp(format->string, "MILLISECS", format->length) == 0)
+      return CHEEVOS_FORMAT_MILLIS;
+   else if (strncmp(format->string, "TIMESECS", format->length) == 0)
+      return CHEEVOS_FORMAT_SECS;
+
+   /* Rare (RPS only) */
+   else if (strncmp(format->string, "POINTS", format->length) == 0)
+      return CHEEVOS_FORMAT_SCORE;
+   else if (strncmp(format->string, "FRAMES", format->length) == 0)
+      return CHEEVOS_FORMAT_FRAMES;
+   else
+      return CHEEVOS_FORMAT_OTHER;
+}
+
+static int cheevos_new_lboard(cheevos_readud_t *ud)
+{
+   cheevos_leaderboard_t *lboard = NULL;
+   cheevos_leaderboard_t *ldb    = cheevos_locals.leaderboards;
+
+   if (!ldb || !ud)
+      return -1;
+
+   lboard                        = ldb + ud->lboard_count++;
+
+   lboard->id                    = (unsigned)strtol(ud->id.string, NULL, 10);
+   lboard->format                = cheevos_parse_format(&ud->format);
+   lboard->title                 = cheevos_dupstr(&ud->title);
+   lboard->description           = cheevos_dupstr(&ud->desc);
+
+   if (!lboard->title || !lboard->description)
+      goto error;
+
+   if (cheevos_parse_mem(lboard, ud->memaddr.string))
+      goto error;
+
+   return 0;
+
+error:
+   if ((void*)lboard->title)
+      free((void*)lboard->title);
+   if ((void*)lboard->description)
+      free((void*)lboard->description);
+   return -1;
+}
+
+static int cheevos_read__json_key( void *userdata,
+      const char *name, size_t length)
+{
+   cheevos_readud_t *ud = (cheevos_readud_t*)userdata;
+
+   if (ud)
+   {
+      int        common = ud->in_cheevos || ud->in_lboards;
+      uint32_t     hash = cheevos_djb2(name, length);
+      ud->field         = NULL;
+
+      switch (hash)
+      {
+         case CHEEVOS_JSON_KEY_ACHIEVEMENTS:
+            ud->in_cheevos = 1;
+            break;
+         case CHEEVOS_JSON_KEY_LEADERBOARDS:
+            ud->in_lboards = 1;
+            break;
+         case CHEEVOS_JSON_KEY_CONSOLE_ID:
+            ud->is_console_id = 1;
+            break;
+         case CHEEVOS_JSON_KEY_ID:
+            if (common)
+               ud->field = &ud->id;
+            break;
+         case CHEEVOS_JSON_KEY_MEMADDR:
+            if (ud->in_cheevos)
+               ud->field = &ud->memaddr;
+            break;
+         case CHEEVOS_JSON_KEY_MEM:
+            if (ud->in_lboards)
+               ud->field = &ud->memaddr;
+            break;
+         case CHEEVOS_JSON_KEY_TITLE:
+            if (common)
+               ud->field = &ud->title;
+            break;
+         case CHEEVOS_JSON_KEY_DESCRIPTION:
+            if (common)
+               ud->field = &ud->desc;
+            break;
+         case CHEEVOS_JSON_KEY_POINTS:
+            if (ud->in_cheevos)
+               ud->field = &ud->points;
+            break;
+         case CHEEVOS_JSON_KEY_AUTHOR:
+            if (ud->in_cheevos)
+               ud->field = &ud->author;
+            break;
+         case CHEEVOS_JSON_KEY_MODIFIED:
+            if (ud->in_cheevos)
+               ud->field = &ud->modified;
+            break;
+         case CHEEVOS_JSON_KEY_CREATED:
+            if (ud->in_cheevos)
+               ud->field = &ud->created;
+            break;
+         case CHEEVOS_JSON_KEY_BADGENAME:
+            if (ud->in_cheevos)
+               ud->field = &ud->badge;
+            break;
+         case CHEEVOS_JSON_KEY_FLAGS:
+            if (ud->in_cheevos)
+               ud->field = &ud->flags;
+            break;
+         case CHEEVOS_JSON_KEY_FORMAT:
+            if (ud->in_lboards)
+               ud->field = &ud->format;
+            break;
+         default:
+            break;
+      }
+   }
+
+   return 0;
+}
+
+static int cheevos_read__json_string(void *userdata,
+      const char *string, size_t length)
+{
+   cheevos_readud_t *ud = (cheevos_readud_t*)userdata;
+
+   if (ud && ud->field)
+   {
+      ud->field->string = string;
+      ud->field->length = length;
+   }
+
+   return 0;
+}
+
+static int cheevos_read__json_number(void *userdata,
+      const char *number, size_t length)
+{
+   cheevos_readud_t *ud = (cheevos_readud_t*)userdata;
+
+   if (ud)
+   {
+      if (ud->field)
+      {
+         ud->field->string = number;
+         ud->field->length = length;
+      }
+      else if (ud->is_console_id)
+      {
+         cheevos_locals.console_id = (cheevos_console_t)
+            strtol(number, NULL, 10);
+         ud->is_console_id         = 0;
+      }
+   }
+
+   return 0;
+}
+
+static int cheevos_read__json_end_object(void *userdata)
+{
+   cheevos_readud_t *ud = (cheevos_readud_t*)userdata;
+
+   if (ud)
+   {
+      if (ud->in_cheevos)
+         return cheevos_new_cheevo(ud);
+      if (ud->in_lboards)
+         return cheevos_new_lboard(ud);
+   }
+
+   return 0;
+}
+
+static int cheevos_read__json_end_array(void *userdata)
+{
+   cheevos_readud_t *ud = (cheevos_readud_t*)userdata;
+
+   if (ud)
+   {
+      ud->in_cheevos    = 0;
+      ud->in_lboards    = 0;
+   }
+
+   return 0;
+}
+
+static int cheevos_parse(const char *json)
+{
+   static const jsonsax_handlers_t handlers =
+   {
+      NULL,
+      NULL,
+      NULL,
+      cheevos_read__json_end_object,
+      NULL,
+      cheevos_read__json_end_array,
+      cheevos_read__json_key,
+      NULL,
+      cheevos_read__json_string,
+      cheevos_read__json_number,
+      NULL,
+      NULL
+   };
+
+   cheevos_readud_t ud;
+   unsigned core_count, unofficial_count, lboard_count;
+   /* Count the number of achievements in the JSON file. */
+   int res = cheevos_count_cheevos(json, &core_count, &unofficial_count,
+      &lboard_count);
+
+   if (res != JSONSAX_OK)
+      return -1;
+
+   /* Allocate the achievements. */
+
+   cheevos_locals.core.cheevos = (cheevo_t*)
+      calloc(core_count, sizeof(cheevo_t));
+   cheevos_locals.core.count   = core_count;
+
+   cheevos_locals.unofficial.cheevos = (cheevo_t*)
+      calloc(unofficial_count, sizeof(cheevo_t));
+   cheevos_locals.unofficial.count   = unofficial_count;
+
+   cheevos_locals.leaderboards = (cheevos_leaderboard_t*)
+      calloc(lboard_count, sizeof(cheevos_leaderboard_t));
+   cheevos_locals.lboard_count = lboard_count;
+
+   if (   !cheevos_locals.core.cheevos       ||
+          !cheevos_locals.unofficial.cheevos ||
+          !cheevos_locals.leaderboards)
+   {
+      if ((void*)cheevos_locals.core.cheevos)
+         free((void*)cheevos_locals.core.cheevos);
+      if ((void*)cheevos_locals.unofficial.cheevos)
+         free((void*)cheevos_locals.unofficial.cheevos);
+      if ((void*)cheevos_locals.leaderboards)
+         free((void*)cheevos_locals.leaderboards);
+      cheevos_locals.core.count = cheevos_locals.unofficial.count =
+         cheevos_locals.lboard_count = 0;
+
+      return -1;
+   }
+
+   /* Load the achievements. */
+   ud.in_cheevos       = 0;
+   ud.in_lboards       = 0;
+   ud.is_console_id    = 0;
+   ud.field            = NULL;
+   ud.core_count       = 0;
+   ud.unofficial_count = 0;
+   ud.lboard_count     = 0;
+
+   if (jsonsax_parse(json, &handlers, (void*)&ud) != JSONSAX_OK)
+      goto error;
+
+   return 0;
+
+error:
+   cheevos_unload();
+
+   return -1;
+}
+
+/*****************************************************************************
+Test all the achievements (call once per frame).
+*****************************************************************************/
+
+static int cheevos_test_condition(cheevos_cond_t *cond)
+{
+   unsigned sval = 0;
+   unsigned tval = 0;
+
+   if (!cond)
+      return 0;
+
+   sval          = cheevos_var_get_value(&cond->source) +
+                   cheevos_locals.add_buffer;
+   tval          = cheevos_var_get_value(&cond->target);
+
+   switch (cond->op)
+   {
+      case CHEEVOS_COND_OP_EQUALS:
+         return (sval == tval);
+      case CHEEVOS_COND_OP_LESS_THAN:
+         return (sval < tval);
+      case CHEEVOS_COND_OP_LESS_THAN_OR_EQUAL:
+         return (sval <= tval);
+      case CHEEVOS_COND_OP_GREATER_THAN:
+         return (sval > tval);
+      case CHEEVOS_COND_OP_GREATER_THAN_OR_EQUAL:
+         return (sval >= tval);
+      case CHEEVOS_COND_OP_NOT_EQUAL_TO:
+         return (sval != tval);
+      default:
+         break;
+   }
+
+   return 1;
+}
+
+static int cheevos_test_pause_cond_set(const cheevos_condset_t *condset,
+      int *dirty_conds, int *reset_conds, int process_pause)
+{
+   int cond_valid            = 0;
+   int set_valid             = 1; /* must start true so AND logic works */
+   cheevos_cond_t *cond      = NULL;
+   const cheevos_cond_t *end = condset->conds + condset->count;
+
+   cheevos_locals.add_buffer = 0;
+   cheevos_locals.add_hits   = 0;
+
+   for (cond = condset->conds; cond < end; cond++)
+   {
+      if (cond->pause != process_pause)
+         continue;
+
+      if (cond->type == CHEEVOS_COND_TYPE_ADD_SOURCE)
+      {
+         cheevos_locals.add_buffer += cheevos_var_get_value(&cond->source);
+         continue;
+      }
+
+      if (cond->type == CHEEVOS_COND_TYPE_SUB_SOURCE)
+      {
+         cheevos_locals.add_buffer -= cheevos_var_get_value(&cond->source);
+         continue;
+      }
+
+      if (cond->type == CHEEVOS_COND_TYPE_ADD_HITS)
+      {
+         if (cheevos_test_condition(cond))
+         {
+            cond->curr_hits++;
+            *dirty_conds = 1;
+         }
+
+         cheevos_locals.add_hits += cond->curr_hits;
+         continue;
+      }
+
+      /* always evaluate the condition to ensure delta values get tracked correctly */
+      cond_valid = cheevos_test_condition(cond);
+
+      /* if the condition has a target hit count that has already been met,
+       * it's automatically true, even if not currently true. */
+      if (  (cond->req_hits != 0) &&
+            (cond->curr_hits + cheevos_locals.add_hits) >= cond->req_hits)
+      {
+            cond_valid = 1;
+      }
+      else if (cond_valid)
+      {
+         cond->curr_hits++;
+         *dirty_conds = 1;
+
+         /* Process this logic, if this condition is true: */
+         if (cond->req_hits == 0)
+            ; /* Not a hit-based requirement: ignore any additional logic! */
+         else if ((cond->curr_hits + cheevos_locals.add_hits) < cond->req_hits)
+            cond_valid = 0; /* HitCount target has not yet been met, condition is not yet valid. */
+      }
+
+      cheevos_locals.add_buffer = 0;
+      cheevos_locals.add_hits   = 0;
+
+      if (cond->type == CHEEVOS_COND_TYPE_PAUSE_IF)
+      {
+         /* as soon as we find a PauseIf that evaluates to true,
+          * stop processing the rest of the group. */
+         if (cond_valid)
+            return 1;
+
+         /* if we make it to the end of the function, make sure we are
+          * indicating nothing matched. if we do find a later PauseIf match,
+          * it'll automatically return true via the previous condition. */
+         set_valid = 0;
+
+         if (cond->req_hits == 0)
+         {
+            /* PauseIf didn't evaluate true, and doesn't have a HitCount,
+             * reset the HitCount to indicate the condition didn't match. */
+            if (cond->curr_hits != 0)
+            {
+               cond->curr_hits = 0;
+               *dirty_conds = 1;
+            }
+         }
+         else
+         {
+            /* PauseIf has a HitCount that hasn't been met, ignore it for now. */
+         }
+      }
+      else if (cond->type == CHEEVOS_COND_TYPE_RESET_IF)
+      {
+         if (cond_valid)
+         {
+            *reset_conds = 1; /* Resets all hits found so far */
+            set_valid    = 0; /* Cannot be valid if we've hit a reset condition. */
+         }
+      }
+      else /* Sequential or non-sequential? */
+         set_valid &= cond_valid;
+   }
+
+   return set_valid;
+}
+
+static int cheevos_test_cond_set(const cheevos_condset_t *condset,
+      int *dirty_conds, int *reset_conds)
+{
+   int in_pause              = 0;
+   int has_pause             = 0;
+   cheevos_cond_t *cond      = NULL;
+
+   if (!condset)
+      return 1; /* important: empty group must evaluate true */
+
+   /* the ints below are used for Pause conditions and their dependent AddSource/AddHits. */
+
+   /* this loop needs to go backwards to check AddSource/AddHits */
+   cond = condset->conds + condset->count - 1;
+   for (; cond >= condset->conds; cond--)
+   {
+      if (cond->type == CHEEVOS_COND_TYPE_PAUSE_IF)
+      {
+         has_pause = 1;
+         in_pause = 1;
+         cond->pause = 1;
+      }
+      else if (cond->type == CHEEVOS_COND_TYPE_ADD_SOURCE ||
+               cond->type == CHEEVOS_COND_TYPE_SUB_SOURCE ||
+               cond->type == CHEEVOS_COND_TYPE_ADD_HITS)
+      {
+         cond->pause = in_pause;
+      }
+      else
+      {
+         in_pause = 0;
+         cond->pause = 0;
+      }
+   }
+
+   if (has_pause)
+   {  /* one or more Pause conditions exists, if any of them are true,
+       * stop processing this group. */
+      if (cheevos_test_pause_cond_set(condset, dirty_conds, reset_conds, 1))
+         return 0;
+   }
+
+   /* process the non-Pause conditions to see if the group is true */
+   return cheevos_test_pause_cond_set(condset, dirty_conds, reset_conds, 0);
+}
+
+static int cheevos_reset_cond_set(cheevos_condset_t *condset, int deltas)
+{
+   int dirty                 = 0;
+   const cheevos_cond_t *end = NULL;
+
+   if (!condset)
+      return 0;
+
+   end                       = condset->conds + condset->count;
+
+   if (deltas)
+   {
+      cheevos_cond_t *cond      = NULL;
+      for (cond = condset->conds; cond < end; cond++)
+      {
+         dirty                 |= cond->curr_hits != 0;
+
+         cond->curr_hits        = 0;
+
+         cond->source.previous  = cond->source.value;
+         cond->target.previous  = cond->target.value;
+      }
+   }
+   else
+   {
+      cheevos_cond_t *cond      = NULL;
+      for (cond = condset->conds; cond < end; cond++)
+      {
+         dirty           |= cond->curr_hits != 0;
+         cond->curr_hits  = 0;
+      }
+   }
+
+   return dirty;
+}
+
+static int cheevos_test_cheevo(cheevo_t *cheevo)
+{
+   int dirty_conds              = 0;
+   int reset_conds              = 0;
+   int ret_val                  = 0;
+   int ret_val_sub_cond         = 0;
+   cheevos_condset_t *condset   = NULL;
+   cheevos_condset_t *end       = NULL;
+
+   if (!cheevo)
+      return 0;
+
+   ret_val_sub_cond             = cheevo->condition.count == 1;
+   condset                      = cheevo->condition.condsets;
+
+   if (!condset)
+      return 0;
+
+   end                          = condset + cheevo->condition.count;
+
+   if (condset < end)
+   {
+      ret_val = cheevos_test_cond_set(condset, &dirty_conds, &reset_conds);
+      condset++;
+   }
+
+   while (condset < end)
+   {
+      ret_val_sub_cond |= cheevos_test_cond_set(
+            condset, &dirty_conds, &reset_conds);
+      condset++;
+   }
+
+   if (dirty_conds)
+      cheevo->dirty |= CHEEVOS_DIRTY_CONDITIONS;
+
+   if (reset_conds)
+   {
+      int dirty = 0;
+
+      for (condset = cheevo->condition.condsets; condset < end; condset++)
+         dirty |= cheevos_reset_cond_set(condset, 0);
+
+      if (dirty)
+         cheevo->dirty |= CHEEVOS_DIRTY_CONDITIONS;
+   }
+
+   return (ret_val && ret_val_sub_cond);
+}
+
+static void cheevos_url_encode(const char *str, char *encoded, size_t len)
+{
+   if (!str)
+      return;
+
+   while (*str)
+   {
+      if (     isalnum((unsigned char)*str) || *str == '-'
+            || *str == '_' || *str == '.'
+            || *str == '~')
+      {
+         if (len >= 2)
+         {
+            *encoded++ = *str++;
+            len--;
+         }
+         else
+            break;
+      }
+      else
+      {
+         if (len >= 4)
+         {
+            snprintf(encoded, len, "%%%02x", (uint8_t)*str);
+            encoded += 3;
+            str++;
+            len -= 3;
+         }
+         else
+            break;
+      }
+   }
+
+   *encoded = 0;
+}
+
+static void cheevos_make_unlock_url(const cheevo_t *cheevo,
+      char* url, size_t url_size)
+{
+   settings_t *settings = config_get_ptr();
+
+   if (!settings)
+      return;
+
+   snprintf(
+      url, url_size,
+      "http://retroachievements.org/dorequest.php?r=awardachievement&u=%s&t=%s&a=%u&h=%d",
+      settings->arrays.cheevos_username,
+      cheevos_locals.token,
+      cheevo->id,
+      settings->bools.cheevos_hardcore_mode_enable && !cheevos_hardcore_paused ? 1 : 0
+   );
+
+   url[url_size - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+   cheevos_log_url("[CHEEVOS]: url to award the cheevo: %s\n", url);
+#endif
+}
+
+static void cheevos_unlocked(void *task_data, void *user_data,
+      const char *error)
+{
+   cheevo_t *cheevo = (cheevo_t *)user_data;
+
+   if (!error)
+   {
+      CHEEVOS_LOG("[CHEEVOS]: awarded achievement %u.\n", cheevo->id);
+   }
+   else
+   {
+      char url[256];
+      url[0] = '\0';
+
+      CHEEVOS_ERR("[CHEEVOS]: error awarding achievement %u, retrying...\n", cheevo->id);
+
+      cheevos_make_unlock_url(cheevo, url, sizeof(url));
+      task_push_http_transfer(url, true, NULL, cheevos_unlocked, cheevo);
+   }
+}
+
+static void cheevos_test_cheevo_set(const cheevoset_t *set)
+{
+   settings_t *settings = config_get_ptr();
+   int mode             = CHEEVOS_ACTIVE_SOFTCORE;
+   cheevo_t *cheevo     = NULL;
+   const cheevo_t *end  = NULL;
+
+   if (!set)
+      return;
+
+   end                  = set->cheevos + set->count;
+
+   if (settings && settings->bools.cheevos_hardcore_mode_enable && !cheevos_hardcore_paused)
+      mode = CHEEVOS_ACTIVE_HARDCORE;
+
+   for (cheevo = set->cheevos; cheevo < end; cheevo++)
+   {
+      if (cheevo->active & mode)
+      {
+         int valid = cheevos_test_cheevo(cheevo);
+
+         if (cheevo->last)
+         {
+            cheevos_condset_t* condset   = cheevo->condition.condsets;
+            const cheevos_condset_t* end = cheevo->condition.condsets
+               + cheevo->condition.count;
+
+            for (; condset < end; condset++)
+               cheevos_reset_cond_set(condset, 0);
+         }
+         else if (valid)
+         {
+            char msg[256];
+            char url[256];
+            msg[0] = url[0] = '\0';
+
+            cheevo->active &= ~mode;
+
+            if (mode == CHEEVOS_ACTIVE_HARDCORE)
+               cheevo->active &= ~CHEEVOS_ACTIVE_SOFTCORE;
+
+            CHEEVOS_LOG("[CHEEVOS]: awarding cheevo %u: %s (%s).\n",
+                  cheevo->id, cheevo->title, cheevo->description);
+
+            snprintf(msg, sizeof(msg), "Achievement Unlocked: %s",
+                  cheevo->title);
+            msg[sizeof(msg) - 1] = 0;
+            runloop_msg_queue_push(msg, 0, 2 * 60, false);
+            runloop_msg_queue_push(cheevo->description, 0, 3 * 60, false);
+
+            cheevos_make_unlock_url(cheevo, url, sizeof(url));
+            task_push_http_transfer(url, true, NULL,
+                  cheevos_unlocked, cheevo);
+
+            if (settings && settings->bools.cheevos_auto_screenshot)
+            {
+               char shotname[256];
+
+               snprintf(shotname, sizeof(shotname), "%s/%s-cheevo-%u",
+                  settings->paths.directory_screenshot,
+                  path_basename(path_get(RARCH_PATH_BASENAME)),
+                  cheevo->id);
+               shotname[sizeof(shotname) - 1] = '\0';
+
+               if (take_screenshot(shotname, true,
+                        video_driver_cached_frame_has_valid_framebuffer(), false, true))
+                  CHEEVOS_LOG("[CHEEVOS]: got a screenshot for cheevo %u\n", cheevo->id);
+               else
+                  CHEEVOS_LOG("[CHEEVOS]: failed to get screenshot for cheevo %u\n", cheevo->id);
+            }
+         }
+
+         cheevo->last = valid;
+      }
+   }
+}
+
+static int cheevos_test_lboard_condition(const cheevos_condition_t* condition)
+{
+   int dirty_conds              = 0;
+   int reset_conds              = 0;
+   int ret_val                  = 0;
+   int ret_val_sub_cond         = 0;
+   cheevos_condset_t *condset   = NULL;
+   const cheevos_condset_t *end = NULL;
+
+   if (!condition)
+      return 0;
+
+   ret_val_sub_cond             = condition->count == 1;
+   condset                      = condition->condsets;
+   end                          = condset + condition->count;
+
+   if (condset < end)
+   {
+      ret_val = cheevos_test_cond_set(
+            condset, &dirty_conds, &reset_conds);
+      condset++;
+   }
+
+   while (condset < end)
+   {
+      ret_val_sub_cond |= cheevos_test_cond_set(
+            condset, &dirty_conds, &reset_conds);
+      condset++;
+   }
+
+   if (reset_conds)
+   {
+      for (condset = condition->condsets; condset < end; condset++)
+         cheevos_reset_cond_set(condset, 0);
+   }
+
+   return (ret_val && ret_val_sub_cond);
+}
+
+static int cheevos_expr_value(cheevos_expr_t* expr)
+{
+   unsigned i;
+   int values[16];
+   /* Separate possible values with '$' operator, submit the largest */
+   unsigned current_value = 0;
+   cheevos_term_t* term   = NULL;
+
+   if (!expr)
+      return 0;
+
+   term                   = expr->terms;
+
+   if (!term)
+      return 0;
+
+   if (expr->compare_count >=  ARRAY_SIZE(values))
+   {
+      CHEEVOS_ERR("[CHEEVOS]: too many values in the leaderboard expression: %u\n", expr->compare_count);
+      return 0;
+   }
+
+   memset(values, 0, sizeof values);
+
+   for (i = expr->count; i != 0; i--, term++)
+   {
+      if (current_value >= ARRAY_SIZE(values))
+      {
+         CHEEVOS_ERR("[CHEEVOS]: too many values in the leaderboard expression: %u\n", current_value);
+         return 0;
+      }
+
+      values[current_value] +=
+         cheevos_var_get_value(&term->var) * term->multiplier;
+
+      if (term->compare_next)
+         current_value++;
+   }
+
+   if (expr->compare_count > 1)
+   {
+      unsigned j;
+      int maximum = values[0];
+
+      for (j = 1; j < expr->compare_count; j++)
+         maximum = values[j] > maximum ? values[j] : maximum;
+
+      return maximum;
+   }
+   else
+      return values[0];
+}
+
+static void cheevos_make_lboard_url(const cheevos_leaderboard_t *lboard,
+      char* url, size_t url_size)
+{
+   MD5_CTX ctx;
+   uint8_t hash[16];
+   char signature[64];
+   settings_t *settings = config_get_ptr();
+
+   hash[0] = '\0';
+
+   snprintf(signature, sizeof(signature), "%u%s%u", lboard->id,
+      settings->arrays.cheevos_username,
+      lboard->id);
+
+   MD5_Init(&ctx);
+   MD5_Update(&ctx, (void*)signature, strlen(signature));
+   MD5_Final(hash, &ctx);
+
+   snprintf(
+      url, url_size,
+      "http://retroachievements.org/dorequest.php?r=submitlbentry&u=%s&t=%s&i=%u&s=%d"
+      "&v=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+      settings->arrays.cheevos_username,
+      cheevos_locals.token,
+      lboard->id,
+      lboard->last_value,
+      hash[ 0], hash[ 1], hash[ 2], hash[ 3],
+      hash[ 4], hash[ 5], hash[ 6], hash[ 7],
+      hash[ 8], hash[ 9], hash[10], hash[11],
+      hash[12], hash[13], hash[14], hash[15]
+   );
+
+   url[url_size - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+   cheevos_log_url("[CHEEVOS]: url to submit the leaderboard: %s\n", url);
+#endif
+}
+
+static void cheevos_lboard_submit(void *task_data, void *user_data,
+      const char *error)
+{
+   cheevos_leaderboard_t *lboard = (cheevos_leaderboard_t *)user_data;
+
+   if (!lboard)
+      return;
+
+   if (!error)
+   {
+      CHEEVOS_ERR("[CHEEVOS]: error submitting leaderboard %u\n", lboard->id);
+      return;
+   }
+
+   CHEEVOS_LOG("[CHEEVOS]: submitted leaderboard %u.\n", lboard->id);
+}
+
+static void cheevos_test_leaderboards(void)
+{
+   unsigned i;
+   cheevos_leaderboard_t* lboard = cheevos_locals.leaderboards;
+
+   if (!lboard)
+      return;
+
+   for (i = cheevos_locals.lboard_count; i != 0; i--, lboard++)
+   {
+      if (lboard->active)
+      {
+         int value = cheevos_expr_value(&lboard->value);
+
+         if (value != lboard->last_value)
+         {
+            CHEEVOS_LOG("[CHEEVOS]: value lboard  %s %u\n",
+                  lboard->title, value);
+            lboard->last_value = value;
+         }
+
+         if (cheevos_test_lboard_condition(&lboard->submit))
+         {
+            lboard->active = 0;
+
+            /* failsafe for improper LBs */
+            if (value == 0)
+            {
+               CHEEVOS_LOG("[CHEEVOS]: error: lboard %s tried to submit 0\n",
+                     lboard->title);
+               runloop_msg_queue_push("Leaderboard attempt cancelled!",
+                     0, 2 * 60, false);
+            }
+            else
+            {
+               char url[256];
+               char msg[256];
+               char formatted_value[16];
+
+               cheevos_make_lboard_url(lboard, url, sizeof(url));
+               task_push_http_transfer(url, true, NULL,
+                     cheevos_lboard_submit, lboard);
+               CHEEVOS_LOG("[CHEEVOS]: submit lboard %s\n", lboard->title);
+
+               cheevos_format_value(value, lboard->format,
+                     formatted_value, sizeof(formatted_value));
+               snprintf(msg, sizeof(msg), "Submitted %s for %s",
+                     formatted_value, lboard->title);
+               msg[sizeof(msg) - 1] = 0;
+               runloop_msg_queue_push(msg, 0, 2 * 60, false);
+            }
+         }
+
+         if (cheevos_test_lboard_condition(&lboard->cancel))
+         {
+            CHEEVOS_LOG("[CHEEVOS]: cancel lboard %s\n", lboard->title);
+            lboard->active = 0;
+            runloop_msg_queue_push("Leaderboard attempt cancelled!",
+                  0, 2 * 60, false);
+         }
+      }
+      else
+      {
+         if (cheevos_test_lboard_condition(&lboard->start))
+         {
+            char msg[256];
+
+            CHEEVOS_LOG("[CHEEVOS]: start lboard  %s\n", lboard->title);
+            lboard->active     = 1;
+            lboard->last_value = -1;
+
+            snprintf(msg, sizeof(msg),
+                  "Leaderboard Active: %s", lboard->title);
+            msg[sizeof(msg) - 1] = 0;
+            runloop_msg_queue_push(msg, 0, 2 * 60, false);
+            runloop_msg_queue_push(lboard->description, 0, 3*60, false);
+         }
+      }
+   }
+}
+
+/*****************************************************************************
+Free the loaded achievements.
+*****************************************************************************/
+
+static void cheevos_free_condset(const cheevos_condset_t *set)
+{
+   if (set && set->conds)
+      free((void*)set->conds);
+}
+
+static void cheevos_free_cheevo(const cheevo_t *cheevo)
+{
+   if (!cheevo)
+      return;
+
+   if (cheevo->title)
+      free((void*)cheevo->title);
+   if (cheevo->description)
+      free((void*)cheevo->description);
+   if (cheevo->author)
+      free((void*)cheevo->author);
+   if (cheevo->badge)
+      free((void*)cheevo->badge);
+   cheevos_free_condset(cheevo->condition.condsets);
+}
+
+static void cheevos_free_cheevo_set(const cheevoset_t *set)
+{
+   const cheevo_t *cheevo = NULL;
+   const cheevo_t *end    = NULL;
+
+   if (!set)
+      return;
+
+   cheevo                 = set->cheevos;
+   end                    = cheevo + set->count;
+
+   while (cheevo < end)
+      cheevos_free_cheevo(cheevo++);
+
+   if (set->cheevos)
+      free((void*)set->cheevos);
+}
+
+#ifndef CHEEVOS_DONT_DEACTIVATE
+static int cheevos_deactivate__json_index(void *userdata, unsigned int index)
+{
+   cheevos_deactivate_t *ud = (cheevos_deactivate_t*)userdata;
+
+   if (ud)
+      ud->is_element        = 1;
+
+   return 0;
+}
+
+static int cheevos_deactivate__json_number(void *userdata,
+      const char *number, size_t length)
+{
+   long id;
+   int found;
+   cheevo_t* cheevo         = NULL;
+   const cheevo_t* end      = NULL;
+   cheevos_deactivate_t *ud = (cheevos_deactivate_t*)userdata;
+
+   if (ud && ud->is_element)
+   {
+      ud->is_element = 0;
+      id             = strtol(number, NULL, 10);
+      found          = 0;
+      cheevo         = cheevos_locals.core.cheevos;
+      end            = cheevo + cheevos_locals.core.count;
+
+      for (; cheevo < end; cheevo++)
+      {
+         if (cheevo->id == (unsigned)id)
+         {
+            cheevo->active &= ~ud->mode;
+            found = 1;
+            break;
+         }
+      }
+
+      if (!found)
+      {
+         cheevo = cheevos_locals.unofficial.cheevos;
+         end    = cheevo + cheevos_locals.unofficial.count;
+
+         for (; cheevo < end; cheevo++)
+         {
+            if (cheevo->id == (unsigned)id)
+            {
+               cheevo->active &= ~ud->mode;
+               found = 1;
+               break;
+            }
+         }
+      }
+
+      if (found)
+         CHEEVOS_LOG("[CHEEVOS]: deactivated unlocked cheevo %u (%s).\n",
+               cheevo->id, cheevo->title);
+      else
+         CHEEVOS_ERR("[CHEEVOS]: unknown cheevo to deactivate: %u.\n", id);
+   }
+
+   return 0;
+}
+
+static int cheevos_deactivate_unlocks(const char* json, unsigned mode)
+{
+   static const jsonsax_handlers_t handlers =
+   {
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      cheevos_deactivate__json_index,
+      NULL,
+      cheevos_deactivate__json_number,
+      NULL,
+      NULL
+   };
+
+   cheevos_deactivate_t ud;
+
+   ud.is_element = 0;
+   ud.mode       = mode;
+   return jsonsax_parse(json, &handlers, (void*)&ud) != JSONSAX_OK;
+}
+#endif
+
+void cheevos_reset_game(void)
+{
+   cheevo_t *end       = NULL;
+   cheevo_t *cheevo    = cheevos_locals.core.cheevos;
+
+   if (!cheevo)
+      return;
+
+   end                 = cheevo + cheevos_locals.core.count;
+
+   for (; cheevo < end; cheevo++)
+      cheevo->last     = 1;
+
+   cheevo              = cheevos_locals.unofficial.cheevos;
+   end                 = cheevo + cheevos_locals.unofficial.count;
+
+   for (; cheevo < end; cheevo++)
+      cheevo->last = 1;
+}
+
+void cheevos_populate_menu(void *data)
+{
+#ifdef HAVE_MENU
+   unsigned i                    = 0;
+   unsigned items_found          = 0;
+   settings_t *settings          = config_get_ptr();
+   menu_displaylist_info_t *info = (menu_displaylist_info_t*)data;
+   cheevo_t *end                 = NULL;
+   cheevo_t *cheevo              = cheevos_locals.core.cheevos;
+   end                           = cheevo + cheevos_locals.core.count;
+
+   if(settings->bools.cheevos_enable && settings->bools.cheevos_hardcore_mode_enable 
+      && cheevos_loaded)
+   {
+      if (!cheevos_hardcore_paused)
+         menu_entries_append_enum(info->list,
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE),
+               msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE),
+               MENU_ENUM_LABEL_ACHIEVEMENT_PAUSE,
+               MENU_SETTING_ACTION_PAUSE_ACHIEVEMENTS, 0, 0);
+      else
+         menu_entries_append_enum(info->list,
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_RESUME),
+               msg_hash_to_str(MENU_ENUM_LABEL_ACHIEVEMENT_RESUME),
+               MENU_ENUM_LABEL_ACHIEVEMENT_RESUME,
+               MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS, 0, 0);
+   }
+
+   if (cheevo)
+   {
+      for (i = 0; cheevo < end; i++, cheevo++)
+      {
+         if (!(cheevo->active & CHEEVOS_ACTIVE_HARDCORE))
+         {
+            menu_entries_append_enum(info->list, cheevo->title,
+               cheevo->description,
+               MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY_HARDCORE,
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+            set_badge_info(&badges_ctx, i, cheevo->badge,
+               (cheevo->active & CHEEVOS_ACTIVE_HARDCORE));
+         }
+         else if (!(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE))
+         {
+            menu_entries_append_enum(info->list, cheevo->title,
+               cheevo->description,
+               MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY,
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+            set_badge_info(&badges_ctx, i, cheevo->badge,
+               (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
+         }
+         else
+         {
+            menu_entries_append_enum(info->list, cheevo->title,
+               cheevo->description,
+               MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+            set_badge_info(&badges_ctx, i, cheevo->badge,
+               (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
+         }
+         items_found++;
+      }
+   }
+
+   cheevo = cheevos_locals.unofficial.cheevos;
+
+   if (cheevo && settings->bools.cheevos_test_unofficial)
+   {
+      end    = cheevo + cheevos_locals.unofficial.count;
+
+      for (i = items_found; cheevo < end; i++, cheevo++)
+      {
+         if (!(cheevo->active & CHEEVOS_ACTIVE_HARDCORE))
+         {
+            menu_entries_append_enum(info->list, cheevo->title,
+               cheevo->description,
+               MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY_HARDCORE,
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+            set_badge_info(&badges_ctx, i, cheevo->badge,
+                  (cheevo->active & CHEEVOS_ACTIVE_HARDCORE));
+         }
+         else if (!(cheevo->active & CHEEVOS_ACTIVE_SOFTCORE))
+         {
+            menu_entries_append_enum(info->list, cheevo->title,
+               cheevo->description,
+               MENU_ENUM_LABEL_CHEEVOS_UNLOCKED_ENTRY,
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+            set_badge_info(&badges_ctx, i, cheevo->badge,
+                  (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
+         }
+         else
+         {
+            menu_entries_append_enum(info->list, cheevo->title,
+               cheevo->description,
+               MENU_ENUM_LABEL_CHEEVOS_LOCKED_ENTRY,
+               MENU_SETTINGS_CHEEVOS_START + i, 0, 0);
+            set_badge_info(&badges_ctx, i, cheevo->badge,
+                  (cheevo->active & CHEEVOS_ACTIVE_SOFTCORE));
+         }
+         items_found++;
+      }
+   }
+
+   if (items_found == 0)
+   {
+      menu_entries_append_enum(info->list,
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY),
+            msg_hash_to_str(MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY),
+            MENU_ENUM_LABEL_NO_ACHIEVEMENTS_TO_DISPLAY,
+            FILE_TYPE_NONE, 0, 0);
+   }
+#endif
+}
+
+bool cheevos_get_description(cheevos_ctx_desc_t *desc)
+{
+   if (!desc)
+      return false;
+
+   if (cheevos_loaded)
+   {
+      cheevo_t *cheevos = cheevos_locals.core.cheevos;
+
+      if (!cheevos)
+         return false;
+
+      if (desc->idx >= cheevos_locals.core.count)
+      {
+         cheevos    = cheevos_locals.unofficial.cheevos;
+         desc->idx -= cheevos_locals.core.count;
+      }
+
+      if (!string_is_empty(cheevos[desc->idx].description))
+         strlcpy(desc->s, cheevos[desc->idx].description, desc->len);
+   }
+   else
+      *desc->s = 0;
+
+   return true;
+}
+
+bool cheevos_apply_cheats(bool *data_bool)
+{
+   cheats_are_enabled   = *data_bool;
+   cheats_were_enabled |= cheats_are_enabled;
+
+   return true;
+}
+
+bool cheevos_unload(void)
+{
+   bool running;
+   CHEEVOS_LOCK(cheevos_locals.task_lock);
+   running = cheevos_locals.task != NULL;
+   CHEEVOS_UNLOCK(cheevos_locals.task_lock);
+
+   if (running)
+   {
+      CHEEVOS_LOG("[CHEEVOS]: Asked the load thread to terminate\n");
+      task_queue_cancel_task(cheevos_locals.task);
+
+#ifdef HAVE_THREADS
+      do
+      {
+         CHEEVOS_LOCK(cheevos_locals.task_lock);
+         running = cheevos_locals.task != NULL;
+         CHEEVOS_UNLOCK(cheevos_locals.task_lock);
+      }
+      while (running);
+#endif
+   }
+
+   if (cheevos_loaded)
+   {
+      cheevos_free_cheevo_set(&cheevos_locals.core);
+      cheevos_free_cheevo_set(&cheevos_locals.unofficial);
+   }
+
+   cheevos_locals.core.cheevos       = NULL;
+   cheevos_locals.unofficial.cheevos = NULL;
+   cheevos_locals.core.count         = 0;
+   cheevos_locals.unofficial.count   = 0;
+
+   cheevos_loaded     = false;
+   cheevos_hardcore_paused = false;
+
+   return true;
+}
+
+bool cheevos_toggle_hardcore_mode(void)
+{
+   settings_t *settings = config_get_ptr();
+
+   if (!settings)
+      return false;
+
+   /* reset and deinit rewind to avoid cheat the score */
+   if (settings->bools.cheevos_hardcore_mode_enable && !cheevos_hardcore_paused)
+   {
+      const char *msg = msg_hash_to_str(
+            MSG_CHEEVOS_HARDCORE_MODE_ENABLE);
+
+      /* send reset core cmd to avoid any user
+       * savestate previusly loaded. */
+      command_event(CMD_EVENT_RESET, NULL);
+
+      if (settings->bools.rewind_enable)
+         command_event(CMD_EVENT_REWIND_DEINIT, NULL);
+
+      CHEEVOS_LOG("%s\n", msg);
+      runloop_msg_queue_push(msg, 0, 3 * 60, true);
+   }
+   else
+   {
+      if (settings->bools.rewind_enable)
+         command_event(CMD_EVENT_REWIND_INIT, NULL);
+   }
+
+   return true;
+}
+
+static void cheevos_patch_addresses(cheevoset_t* set)
+{
+   unsigned i;
+   cheevo_t* cheevo = NULL;
+
+   if (!set)
+      return;
+
+   cheevo           = set->cheevos;
+
+   if (!cheevo)
+      return;
+
+   for (i = set->count; i != 0; i--, cheevo++)
+   {
+      unsigned j;
+      cheevos_condset_t* condset = cheevo->condition.condsets;
+
+      for (j = cheevo->condition.count; j != 0; j--, condset++)
+      {
+         unsigned k;
+         cheevos_cond_t* cond = condset->conds;
+
+         for (k = condset->count; k != 0; k--, cond++)
+         {
+            switch (cond->source.type)
+            {
+               case CHEEVOS_VAR_TYPE_ADDRESS:
+               case CHEEVOS_VAR_TYPE_DELTA_MEM:
+                  cheevos_var_patch_addr(&cond->source,
+                        cheevos_locals.console_id);
+#ifdef CHEEVOS_DUMP_ADDRS
+                  CHEEVOS_LOG("[CHEEVOS]: s-var %03d:%08X\n",
+                        cond->source.bank_id + 1, cond->source.value);
+#endif
+                  break;
+
+               default:
+                  break;
+            }
+
+            switch (cond->target.type)
+            {
+               case CHEEVOS_VAR_TYPE_ADDRESS:
+               case CHEEVOS_VAR_TYPE_DELTA_MEM:
+                  cheevos_var_patch_addr(&cond->target,
+                        cheevos_locals.console_id);
+#ifdef CHEEVOS_DUMP_ADDRS
+                  CHEEVOS_LOG("[CHEEVOS]: t-var %03d:%08X\n",
+                        cond->target.bank_id + 1, cond->target.value);
+#endif
+                  break;
+
+               default:
+                  break;
+            }
+         }
+      }
+   }
+}
+
+static void cheevos_patch_lb_conditions(cheevos_condition_t* condition)
+{
+   unsigned i;
+   cheevos_condset_t* condset = NULL;
+
+   if (!condition)
+      return;
+
+   condset                    = condition->condsets;
+
+   for (i = condition->count; i != 0; i--, condset++)
+   {
+      unsigned j;
+      cheevos_cond_t* cond = condset->conds;
+
+      for (j = condset->count; j != 0; j--, cond++)
+      {
+         switch (cond->source.type)
+         {
+            case CHEEVOS_VAR_TYPE_ADDRESS:
+            case CHEEVOS_VAR_TYPE_DELTA_MEM:
+               cheevos_var_patch_addr(&cond->source,
+                     cheevos_locals.console_id);
+#ifdef CHEEVOS_DUMP_ADDRS
+               CHEEVOS_LOG("[CHEEVOS]: s-var %03d:%08X\n",
+                     cond->source.bank_id + 1, cond->source.value);
+#endif
+               break;
+            default:
+               break;
+         }
+         switch (cond->target.type)
+         {
+            case CHEEVOS_VAR_TYPE_ADDRESS:
+            case CHEEVOS_VAR_TYPE_DELTA_MEM:
+               cheevos_var_patch_addr(&cond->target,
+                     cheevos_locals.console_id);
+#ifdef CHEEVOS_DUMP_ADDRS
+               CHEEVOS_LOG("[CHEEVOS]: t-var %03d:%08X\n",
+                     cond->target.bank_id + 1, cond->target.value);
+#endif
+               break;
+            default:
+               break;
+         }
+      }
+   }
+}
+
+static void cheevos_patch_lb_expressions(cheevos_expr_t* expression)
+{
+   unsigned i;
+   cheevos_term_t* term = NULL;
+
+   if (!expression)
+      return;
+
+   term                 = expression->terms;
+
+   for (i = expression->count; i != 0; i--, term++)
+   {
+      switch (term->var.type)
+      {
+         case CHEEVOS_VAR_TYPE_ADDRESS:
+         case CHEEVOS_VAR_TYPE_DELTA_MEM:
+            cheevos_var_patch_addr(&term->var, cheevos_locals.console_id);
+#ifdef CHEEVOS_DUMP_ADDRS
+            CHEEVOS_LOG("[CHEEVOS]: s-var %03d:%08X\n",
+                  term->var.bank_id + 1, term->var.value);
+#endif
+            break;
+         default:
+            break;
+      }
+   }
+}
+
+static void cheevos_patch_lbs(cheevos_leaderboard_t *leaderboard)
+{
+   unsigned i;
+
+   for (i = 0; i < cheevos_locals.lboard_count; i++)
+   {
+      cheevos_condition_t *start  = &leaderboard[i].start;
+      cheevos_condition_t *cancel = &leaderboard[i].cancel;
+      cheevos_condition_t *submit = &leaderboard[i].submit;
+      cheevos_expr_t *value       = &leaderboard[i].value;
+
+      cheevos_patch_lb_conditions(start);
+      cheevos_patch_lb_conditions(cancel);
+      cheevos_patch_lb_conditions(submit);
+      cheevos_patch_lb_expressions(value);
+   }
+}
+
+void cheevos_test(void)
+{
+   settings_t *settings = config_get_ptr();
+
+   if (!cheevos_locals.addrs_patched)
+   {
+      cheevos_patch_addresses(&cheevos_locals.core);
+      cheevos_patch_addresses(&cheevos_locals.unofficial);
+      cheevos_patch_lbs(cheevos_locals.leaderboards);
+
+      cheevos_locals.addrs_patched = true;
+   }
+
+   cheevos_test_cheevo_set(&cheevos_locals.core);
+
+   if (settings)
+   {
+      if (settings->bools.cheevos_test_unofficial)
+         cheevos_test_cheevo_set(&cheevos_locals.unofficial);
+
+      if (settings->bools.cheevos_hardcore_mode_enable &&
+          settings->bools.cheevos_leaderboards_enable  &&
+          !cheevos_hardcore_paused)
+         cheevos_test_leaderboards();
+   }
+}
+
+bool cheevos_set_cheats(void)
+{
+   cheats_were_enabled = cheats_are_enabled;
+   return true;
+}
+
+void cheevos_set_support_cheevos(bool state)
+{
+   cheevos_locals.core_supports = state;
+}
+
+bool cheevos_get_support_cheevos(void)
+{
+  return cheevos_locals.core_supports;
+}
+
+cheevos_console_t cheevos_get_console(void)
+{
+   return cheevos_locals.console_id;
+}
+
+#include "coro.h"
+
+/* Uncomment the following two lines to debug cheevos_iterate, this will
+ * disable the coroutine yielding.
+ *
+ * The code is very easy to understand. It's meant to be like BASIC:
+ * CORO_GOTO will jump execution to another label, CORO_GOSUB will
+ * call another label, and CORO_RET will return from a CORO_GOSUB.
+ *
+ * This coroutine code is inspired in a very old pure C implementation
+ * that runs everywhere:
+ *
+ * https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
+ */
+/*#undef CORO_YIELD
+#define CORO_YIELD()*/
+
+typedef struct
+{
+   /* variables used in the co-routine */
+   char badge_name[16];
+   char url[256];
+   char badge_basepath[PATH_MAX_LENGTH];
+   char badge_fullpath[PATH_MAX_LENGTH];
+   unsigned char hash[16];
+   bool round;
+   unsigned gameid;
+   unsigned i;
+   unsigned j;
+   unsigned k;
+   size_t bytes;
+   size_t count;
+   size_t offset;
+   size_t len;
+   size_t size;
+   MD5_CTX md5;
+   cheevos_nes_header_t header;
+   retro_time_t t0;
+   struct retro_system_info sysinfo;
+   void *data;
+   char *json;
+   const char *path;
+   const char *ext;
+   intfstream_t *stream;
+   cheevo_t *cheevo;
+   settings_t *settings;
+   struct http_connection_t *conn;
+   struct http_t *http;
+   const cheevo_t *cheevo_end;
+
+   /* co-routine required fields */
+   CORO_FIELDS
+} coro_t;
+
+enum
+{
+   /* Negative values because CORO_SUB generates positive values */
+   SNES_MD5     = -1,
+   GENESIS_MD5  = -2,
+   LYNX_MD5     = -3,
+   NES_MD5      = -4,
+   GENERIC_MD5  = -5,
+   FILENAME_MD5 = -6,
+   EVAL_MD5     = -7,
+   FILL_MD5     = -8,
+   GET_GAMEID   = -9,
+   GET_CHEEVOS  = -10,
+   GET_BADGES   = -11,
+   LOGIN        = -12,
+   HTTP_GET     = -13,
+   DEACTIVATE   = -14,
+   PLAYING      = -15,
+   DELAY        = -16
+};
+
+static int cheevos_iterate(coro_t *coro)
+{
+   ssize_t num_read = 0;
+   size_t to_read   = 4096;
+   uint8_t *buffer  = NULL;
+   const char *end  = NULL;
+
+   static const uint32_t genesis_exts[] =
+   {
+      0x0b888feeU, /* mdx */
+      0x005978b6U, /* md  */
+      0x0b88aa89U, /* smd */
+      0x0b88767fU, /* gen */
+      0x0b8861beU, /* bin */
+      0x0b886782U, /* cue */
+      0x0b8880d0U, /* iso */
+      0x0b88aa98U, /* sms */
+      0x005977f3U, /* gg  */
+      0x0059797fU, /* sg  */
+      0
+   };
+
+   static const uint32_t snes_exts[] =
+   {
+      0x0b88aa88U, /* smc */
+      0x0b8872bbU, /* fig */
+      0x0b88a9a1U, /* sfc */
+      0x0b887623U, /* gd3 */
+      0x0b887627U, /* gd7 */
+      0x0b886bf3U, /* dx2 */
+      0x0b886312U, /* bsx */
+      0x0b88abd2U, /* swc */
+      0
+   };
+
+   static const uint32_t lynx_exts[] =
+   {
+      0x0b888cf7U, /* lnx */
+      0
+   };
+
+   static cheevos_finder_t finders[] =
+   {
+      {SNES_MD5,    "SNES (8Mb padding)",                snes_exts},
+      {GENESIS_MD5, "Genesis (6Mb padding)",             genesis_exts},
+      {LYNX_MD5,    "Atari Lynx (only first 512 bytes)", lynx_exts},
+      {NES_MD5,     "NES (discards VROM)",               NULL},
+      {GENERIC_MD5, "Generic (plain content)",           NULL},
+      {FILENAME_MD5, "Generic (filename)",               NULL}
+   };
+
+   CORO_ENTER();
+
+
+
+      cheevos_locals.addrs_patched = false;
+
+      coro->settings               = config_get_ptr();
+
+      cheevos_locals.meminfo[0].id = RETRO_MEMORY_SYSTEM_RAM;
+      core_get_memory(&cheevos_locals.meminfo[0]);
+
+      cheevos_locals.meminfo[1].id = RETRO_MEMORY_SAVE_RAM;
+      core_get_memory(&cheevos_locals.meminfo[1]);
+
+      cheevos_locals.meminfo[2].id = RETRO_MEMORY_VIDEO_RAM;
+      core_get_memory(&cheevos_locals.meminfo[2]);
+
+      cheevos_locals.meminfo[3].id = RETRO_MEMORY_RTC;
+      core_get_memory(&cheevos_locals.meminfo[3]);
+
+      CHEEVOS_LOG("[CHEEVOS]: system RAM: %p %u\n",
+            cheevos_locals.meminfo[0].data,
+            cheevos_locals.meminfo[0].size);
+      CHEEVOS_LOG("[CHEEVOS]: save RAM:   %p %u\n",
+            cheevos_locals.meminfo[1].data,
+            cheevos_locals.meminfo[1].size);
+      CHEEVOS_LOG("[CHEEVOS]: video RAM:  %p %u\n",
+            cheevos_locals.meminfo[2].data,
+            cheevos_locals.meminfo[2].size);
+      CHEEVOS_LOG("[CHEEVOS]: RTC:        %p %u\n",
+            cheevos_locals.meminfo[3].data,
+            cheevos_locals.meminfo[3].size);
+
+      /* Bail out if cheevos are disabled.
+         * But set the above anyways,
+         * command_read_ram needs it. */
+      if (!coro->settings->bools.cheevos_enable)
+         CORO_STOP();
+
+      /* Load the content into memory, or copy it
+         * over to our own buffer */
+      if (!coro->data)
+      {
+         coro->stream = intfstream_open_file(
+               coro->path,
+               RETRO_VFS_FILE_ACCESS_READ,
+               RETRO_VFS_FILE_ACCESS_HINT_NONE);
+
+         if (!coro->stream)
+            CORO_STOP();
+
+         CORO_YIELD();
+         coro->len         = 0;
+         coro->count       = intfstream_get_size(coro->stream);
+
+         /* size limit */
+         if (coro->count > size_in_megabytes(64))
+            coro->count    = size_in_megabytes(64);
+
+         coro->data        = malloc(coro->count);
+
+         if (!coro->data)
+         {
+            intfstream_close(coro->stream);
+            free(coro->stream);
+            CORO_STOP();
+         }
+
+         for (;;)
+         {
+            buffer   = (uint8_t*)coro->data + coro->len;
+            to_read  = 4096;
+
+            if (to_read > coro->count)
+               to_read = coro->count;
+
+            num_read = intfstream_read(coro->stream,
+                  (void*)buffer, to_read);
+
+            if (num_read <= 0)
+               break;
+
+            coro->len         += num_read;
+            coro->count       -= num_read;
+
+            if (coro->count == 0)
+               break;
+
+            CORO_YIELD();
+         }
+
+         intfstream_close(coro->stream);
+         free(coro->stream);
+      }
+
+      /* Use the supported extensions as a hint
+         * to what method we should use. */
+      core_get_system_info(&coro->sysinfo);
+
+      for (coro->i = 0; coro->i < ARRAY_SIZE(finders); coro->i++)
+      {
+         if (finders[coro->i].ext_hashes)
+         {
+            coro->ext = coro->sysinfo.valid_extensions;
+
+            while (coro->ext)
+            {
+               unsigned hash;
+               end = strchr(coro->ext, '|');
+
+               if (end)
+               {
+                  hash      = cheevos_djb2(
+                        coro->ext, end - coro->ext);
+                  coro->ext = end + 1;
+               }
+               else
+               {
+                  hash      = cheevos_djb2(
+                        coro->ext, strlen(coro->ext));
+                  coro->ext = NULL;
+               }
+
+               for (coro->j = 0; finders[coro->i].ext_hashes[coro->j]; coro->j++)
+               {
+                  if (finders[coro->i].ext_hashes[coro->j] == hash)
+                  {
+                     CHEEVOS_LOG("[CHEEVOS]: testing %s.\n",
+                           finders[coro->i].name);
+
+                     /*
+                        * Inputs:  CHEEVOS_VAR_INFO
+                        * Outputs: CHEEVOS_VAR_GAMEID, the game was found if it's different from 0
+                        */
+                     CORO_GOSUB(finders[coro->i].label);
+
+                     if (coro->gameid != 0)
+                        goto found;
+
+                     coro->ext = NULL; /* force next finder */
+                     break;
+                  }
+               }
+            }
+         }
+      }
+
+      for (coro->i = 0; coro->i < ARRAY_SIZE(finders); coro->i++)
+      {
+         if (finders[coro->i].ext_hashes)
+            continue;
+
+         CHEEVOS_LOG("[CHEEVOS]: testing %s.\n",
+               finders[coro->i].name);
+
+         /*
+            * Inputs:  CHEEVOS_VAR_INFO
+            * Outputs: CHEEVOS_VAR_GAMEID
+            */
+         CORO_GOSUB(finders[coro->i].label);
+
+         if (coro->gameid != 0)
+            goto found;
+      }
+
+      CHEEVOS_LOG("[CHEEVOS]: this game doesn't feature achievements.\n");
+      CORO_STOP();
+
+found:
+
+#ifdef CHEEVOS_JSON_OVERRIDE
+      {
+         size_t size = 0;
+         FILE *file  = fopen(CHEEVOS_JSON_OVERRIDE, "rb");
+
+         fseek(file, 0, SEEK_END);
+         size = ftell(file);
+         fseek(file, 0, SEEK_SET);
+
+         coro->json = (char*)malloc(size + 1);
+         fread((void*)coro->json, 1, size, file);
+
+         fclose(file);
+         coro->json[size] = 0;
+      }
+#else
+      CORO_GOSUB(GET_CHEEVOS);
+
+      if (!coro->json)
+      {
+         runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false);
+         CHEEVOS_ERR("[CHEEVOS]: error loading achievements.\n");
+         CORO_STOP();
+      }
+#endif
+
+#ifdef CHEEVOS_SAVE_JSON
+      {
+         FILE *file = fopen(CHEEVOS_SAVE_JSON, "w");
+         fwrite((void*)coro->json, 1, strlen(coro->json), file);
+         fclose(file);
+      }
+#endif
+      if (cheevos_parse(coro->json))
+      {
+         if ((void*)coro->json)
+            free((void*)coro->json);
+         CORO_STOP();
+      }
+
+      if ((void*)coro->json)
+         free((void*)coro->json);
+
+      if (   cheevos_locals.core.count == 0
+            && cheevos_locals.unofficial.count == 0
+            && cheevos_locals.lboard_count == 0)
+      {
+         runloop_msg_queue_push(
+               "This game has no achievements.",
+               0, 5 * 60, false);
+
+         cheevos_free_cheevo_set(&cheevos_locals.core);
+         cheevos_free_cheevo_set(&cheevos_locals.unofficial);
+
+         cheevos_locals.core.cheevos       = NULL;
+         cheevos_locals.unofficial.cheevos = NULL;
+         cheevos_locals.core.count         = 0;
+         cheevos_locals.unofficial.count   = 0;
+
+         cheevos_loaded     = false;
+         cheevos_hardcore_paused = false;
+         CORO_STOP();
+      }
+
+      cheevos_loaded = true;
+
+      /*
+         * Inputs:  CHEEVOS_VAR_GAMEID
+         * Outputs:
+         */
+      CORO_GOSUB(DEACTIVATE);
+
+      /*
+         * Inputs:  CHEEVOS_VAR_GAMEID
+         * Outputs:
+         */
+      CORO_GOSUB(PLAYING);
+
+      if (coro->settings->bools.cheevos_verbose_enable && cheevos_locals.core.count > 0)
+      {
+         char msg[256];
+         int mode                     = CHEEVOS_ACTIVE_SOFTCORE;
+         const cheevo_t* cheevo       = cheevos_locals.core.cheevos;
+         const cheevo_t* end          = cheevo + cheevos_locals.core.count;
+         int number_of_unlocked       = cheevos_locals.core.count;
+
+         if (coro->settings->bools.cheevos_hardcore_mode_enable && !cheevos_hardcore_paused)
+            mode = CHEEVOS_ACTIVE_HARDCORE;
+
+         for (; cheevo < end; cheevo++)
+            if (cheevo->active & mode)
+               number_of_unlocked--;
+
+         snprintf(msg, sizeof(msg),
+               "You have %d of %d achievements unlocked.",
+               number_of_unlocked, cheevos_locals.core.count);
+         msg[sizeof(msg) - 1] = 0;
+         runloop_msg_queue_push(msg, 0, 6 * 60, false);
+      }
+
+      CORO_GOSUB(GET_BADGES);
+      CORO_STOP();
+
+      /**************************************************************************
+       * Info   Tries to identify a SNES game
+         * Input  CHEEVOS_VAR_INFO the content info
+         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
+         *************************************************************************/
+   CORO_SUB(SNES_MD5)
+
+      MD5_Init(&coro->md5);
+
+      coro->offset = 0;
+      coro->count  = 0;
+
+      CORO_GOSUB(EVAL_MD5);
+
+      if (coro->count == 0)
+      {
+         MD5_Final(coro->hash, &coro->md5);
+         coro->gameid = 0;
+         CORO_RET();
+      }
+
+      if (coro->count < size_in_megabytes(8))
+      {
+         /*
+            * Inputs:  CHEEVOS_VAR_MD5, CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT
+            * Outputs: CHEEVOS_VAR_MD5
+            */
+         coro->offset      = 0;
+         coro->count       = size_in_megabytes(8) - coro->count;
+         CORO_GOSUB(FILL_MD5);
+      }
+
+      MD5_Final(coro->hash, &coro->md5);
+      CORO_GOTO(GET_GAMEID);
+
+      /**************************************************************************
+       * Info   Tries to identify a Genesis game
+         * Input  CHEEVOS_VAR_INFO the content info
+         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
+         *************************************************************************/
+   CORO_SUB(GENESIS_MD5)
+
+      MD5_Init(&coro->md5);
+
+      coro->offset = 0;
+      coro->count  = 0;
+      CORO_GOSUB(EVAL_MD5);
+
+      if (coro->count == 0)
+      {
+         MD5_Final(coro->hash, &coro->md5);
+         coro->gameid = 0;
+         CORO_RET();
+      }
+
+      if (coro->count < size_in_megabytes(6))
+      {
+         coro->offset = 0;
+         coro->count  = size_in_megabytes(6) - coro->count;
+         CORO_GOSUB(FILL_MD5);
+      }
+
+      MD5_Final(coro->hash, &coro->md5);
+      CORO_GOTO(GET_GAMEID);
+
+      /**************************************************************************
+       * Info   Tries to identify an Atari Lynx game
+         * Input  CHEEVOS_VAR_INFO the content info
+         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
+         *************************************************************************/
+   CORO_SUB(LYNX_MD5)
+
+      if (coro->len < 0x0240)
+      {
+         coro->gameid = 0;
+         CORO_RET();
+      }
+
+      MD5_Init(&coro->md5);
+
+      coro->offset       = 0x0040;
+      coro->count        = 0x0200;
+      CORO_GOSUB(EVAL_MD5);
+
+      MD5_Final(coro->hash, &coro->md5);
+      CORO_GOTO(GET_GAMEID);
+
+      /**************************************************************************
+       * Info   Tries to identify a NES game
+         * Input  CHEEVOS_VAR_INFO the content info
+         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
+         *************************************************************************/
+   CORO_SUB(NES_MD5)
+
+      /* Note about the references to the FCEU emulator below. There is no
+         * core-specific code in this function, it's rather Retro Achievements
+         * specific code that must be followed to the letter so we compute
+         * the correct ROM hash. Retro Achievements does indeed use some
+         * FCEU related method to compute the hash, since its NES emulator
+         * is based on it. */
+
+      if (coro->len < sizeof(coro->header))
+      {
+         coro->gameid = 0;
+         CORO_RET();
+      }
+
+      memcpy((void*)&coro->header, coro->data,
+            sizeof(coro->header));
+
+      if (     coro->header.id[0] != 'N'
+            || coro->header.id[1] != 'E'
+            || coro->header.id[2] != 'S'
+            || coro->header.id[3] != 0x1a)
+      {
+         coro->gameid = 0;
+         CORO_RET();
+      }
+
+      {
+         size_t romsize = 256;
+         /* from FCEU core - compute size using the cart mapper */
+         int mapper     = (coro->header.rom_type >> 4) | (coro->header.rom_type2 & 0xF0);
+
+         if (coro->header.rom_size)
+            romsize     = next_pow2(coro->header.rom_size);
+
+         /* for games not to the power of 2, so we just read enough
+            * PRG rom from it, but we have to keep ROM_size to the power of 2
+            * since PRGCartMapping wants ROM_size to be to the power of 2
+            * so instead if not to power of 2, we just use head.ROM_size when
+            * we use FCEU_read. */
+         coro->round       = mapper != 53 && mapper != 198 && mapper != 228;
+         coro->bytes       = coro->round ? romsize : coro->header.rom_size;
+      }
+
+      /* from FCEU core - check if Trainer included in ROM data */
+      MD5_Init(&coro->md5);
+      coro->offset = sizeof(coro->header) + (coro->header.rom_type & 4
+            ? sizeof(coro->header) : 0);
+      coro->count  = 0x4000 * coro->bytes;
+      CORO_GOSUB(EVAL_MD5);
+
+      if (coro->count < 0x4000 * coro->bytes)
+      {
+         coro->offset      = 0xff;
+         coro->count       = 0x4000 * coro->bytes - coro->count;
+         CORO_GOSUB(FILL_MD5);
+      }
+
+      MD5_Final(coro->hash, &coro->md5);
+      CORO_GOTO(GET_GAMEID);
+
+      /**************************************************************************
+       * Info   Tries to identify a "generic" game
+         * Input  CHEEVOS_VAR_INFO the content info
+         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
+         *************************************************************************/
+   CORO_SUB(GENERIC_MD5)
+
+      MD5_Init(&coro->md5);
+
+      coro->offset      = 0;
+      coro->count       = 0;
+      CORO_GOSUB(EVAL_MD5);
+
+      MD5_Final(coro->hash, &coro->md5);
+
+      if (coro->count == 0)
+         CORO_RET();
+
+      CORO_GOTO(GET_GAMEID);
+
+      /**************************************************************************
+       * Info  Tries to identify a game based on its filename (with no extension)
+         * Input  CHEEVOS_VAR_INFO the content info
+         * Output CHEEVOS_VAR_GAMEID the Retro Achievements game ID, or 0 if not found
+         *************************************************************************/
+   CORO_SUB(FILENAME_MD5)
+      if (!string_is_empty(coro->path))
+      {
+         char base_noext[PATH_MAX_LENGTH];
+         fill_pathname_base_noext(base_noext, coro->path, sizeof(base_noext));
+
+         MD5_Init(&coro->md5);
+         MD5_Update(&coro->md5, (void*)base_noext, strlen(base_noext));
+         MD5_Final(coro->hash, &coro->md5);
+
+         CORO_GOTO(GET_GAMEID);
+      }
+      CORO_RET();
+
+      /**************************************************************************
+       * Info    Evaluates the CHEEVOS_VAR_MD5 hash
+         * Inputs  CHEEVOS_VAR_INFO, CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT
+         * Outputs CHEEVOS_VAR_MD5, CHEEVOS_VAR_COUNT
+         *************************************************************************/
+   CORO_SUB(EVAL_MD5)
+
+      if (coro->count == 0)
+         coro->count = coro->len;
+
+      if (coro->len - coro->offset < coro->count)
+         coro->count = coro->len - coro->offset;
+
+      /* size limit */
+      if (coro->count > size_in_megabytes(64))
+         coro->count = size_in_megabytes(64);
+
+      MD5_Update(&coro->md5,
+            (void*)((uint8_t*)coro->data + coro->offset),
+            coro->count);
+      CORO_RET();
+
+      /**************************************************************************
+       * Info    Updates the CHEEVOS_VAR_MD5 hash with a repeated value
+         * Inputs  CHEEVOS_VAR_OFFSET, CHEEVOS_VAR_COUNT
+         * Outputs CHEEVOS_VAR_MD5
+         *************************************************************************/
+   CORO_SUB(FILL_MD5)
+
+      {
+         char buffer[4096];
+
+         while (coro->count > 0)
+         {
+            size_t len = sizeof(buffer);
+
+            if (len > coro->count)
+               len = coro->count;
+
+            memset((void*)buffer, coro->offset, len);
+            MD5_Update(&coro->md5, (void*)buffer, len);
+            coro->count -= len;
+         }
+      }
+
+      CORO_RET();
+
+      /**************************************************************************
+       * Info    Gets the achievements from Retro Achievements
+         * Inputs  coro->hash
+         * Outputs CHEEVOS_VAR_GAMEID
+         *************************************************************************/
+   CORO_SUB(GET_GAMEID)
+
+      {
+         char gameid[16];
+
+         CHEEVOS_LOG(
+               "[CHEEVOS]: getting game id for hash %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
+               coro->hash[ 0], coro->hash[ 1], coro->hash[ 2], coro->hash[ 3],
+               coro->hash[ 4], coro->hash[ 5], coro->hash[ 6], coro->hash[ 7],
+               coro->hash[ 8], coro->hash[ 9], coro->hash[10], coro->hash[11],
+               coro->hash[12], coro->hash[13], coro->hash[14], coro->hash[15]
+               );
+
+         snprintf(
+               coro->url, sizeof(coro->url),
+               "http://retroachievements.org/dorequest.php?r=gameid&m=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+               coro->hash[ 0], coro->hash[ 1], coro->hash[ 2], coro->hash[ 3],
+               coro->hash[ 4], coro->hash[ 5], coro->hash[ 6], coro->hash[ 7],
+               coro->hash[ 8], coro->hash[ 9], coro->hash[10], coro->hash[11],
+               coro->hash[12], coro->hash[13], coro->hash[14], coro->hash[15]
+               );
+
+         coro->url[sizeof(coro->url) - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+         cheevos_log_url("[CHEEVOS]: url to get the game's id: %s\n", coro->url);
+#endif
+
+         CORO_GOSUB(HTTP_GET);
+
+         if (!coro->json)
+            CORO_RET();
+
+         if (cheevos_get_value(coro->json,
+                  CHEEVOS_JSON_KEY_GAMEID, gameid, sizeof(gameid)))
+         {
+            if ((void*)coro->json)
+               free((void*)coro->json);
+            CHEEVOS_ERR("[CHEEVOS]: error getting game_id.\n");
+            CORO_RET();
+         }
+
+         if ((void*)coro->json)
+            free((void*)coro->json);
+         CHEEVOS_LOG("[CHEEVOS]: got game id %s.\n", gameid);
+         coro->gameid = (unsigned)strtol(gameid, NULL, 10);
+         CORO_RET();
+      }
+
+      /**************************************************************************
+       * Info    Gets the achievements from Retro Achievements
+         * Inputs  CHEEVOS_VAR_GAMEID
+         * Outputs CHEEVOS_VAR_JSON
+         *************************************************************************/
+   CORO_SUB(GET_CHEEVOS)
+
+      CORO_GOSUB(LOGIN);
+
+      snprintf(coro->url, sizeof(coro->url),
+            "http://retroachievements.org/dorequest.php?r=patch&g=%u&u=%s&t=%s",
+            coro->gameid,
+            coro->settings->arrays.cheevos_username,
+            cheevos_locals.token);
+
+      coro->url[sizeof(coro->url) - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+      cheevos_log_url("[CHEEVOS]: url to get the list of cheevos: %s\n", coro->url);
+#endif
+
+      CORO_GOSUB(HTTP_GET);
+
+      if (!coro->json)
+      {
+         CHEEVOS_ERR("[CHEEVOS]: error getting achievements for game id %u.\n", coro->gameid);
+         CORO_STOP();
+      }
+
+      CHEEVOS_LOG("[CHEEVOS]: got achievements for game id %u.\n", coro->gameid);
+      CORO_RET();
+
+      /**************************************************************************
+       * Info    Gets the achievements from Retro Achievements
+         * Inputs  CHEEVOS_VAR_GAMEID
+         * Outputs CHEEVOS_VAR_JSON
+         *************************************************************************/
+   CORO_SUB(GET_BADGES)
+
+      badges_ctx = new_badges_ctx;
+
+      {
+         settings_t *settings = config_get_ptr();
+         if (!(
+               string_is_equal(settings->arrays.menu_driver, "xmb") ||
+               string_is_equal(settings->arrays.menu_driver, "ozone")
+            ) ||
+               !settings->bools.cheevos_badges_enable)
+            CORO_RET();
+      }
+
+      coro->cheevo            = cheevos_locals.core.cheevos;
+      coro->cheevo_end        = cheevos_locals.core.cheevos + cheevos_locals.core.count;
+
+      for (; coro->cheevo < coro->cheevo_end; coro->cheevo++)
+      {
+         for (coro->j = 0 ; coro->j < 2; coro->j++)
+         {
+            coro->badge_fullpath[0] = '\0';
+            fill_pathname_application_special(
+                  coro->badge_fullpath,
+                  sizeof(coro->badge_fullpath),
+                  APPLICATION_SPECIAL_DIRECTORY_THUMBNAILS_CHEEVOS_BADGES);
+
+            if (!path_is_directory(coro->badge_fullpath))
+               path_mkdir(coro->badge_fullpath);
+            CORO_YIELD();
+            if (coro->j == 0)
+               snprintf(coro->badge_name,
+                     sizeof(coro->badge_name),
+                     "%s.png", coro->cheevo->badge);
+            else
+               snprintf(coro->badge_name,
+                     sizeof(coro->badge_name),
+                     "%s_lock.png", coro->cheevo->badge);
+
+            fill_pathname_join(
+                  coro->badge_fullpath,
+                  coro->badge_fullpath,
+                  coro->badge_name,
+                  sizeof(coro->badge_fullpath));
+
+            if (!badge_exists(coro->badge_fullpath))
+            {
+#ifdef CHEEVOS_LOG_BADGES
+               CHEEVOS_LOG(
+                     "[CHEEVOS]: downloading badge %s\n",
+                     coro->badge_fullpath);
+#endif
+               snprintf(coro->url,
+                     sizeof(coro->url),
+                     "http://i.retroachievements.org/Badge/%s",
+                     coro->badge_name);
+
+               CORO_GOSUB(HTTP_GET);
+
+               if (coro->json)
+               {
+                  if (!filestream_write_file(coro->badge_fullpath,
+                           coro->json, coro->k))
+                     CHEEVOS_ERR("[CHEEVOS]: error writing badge %s\n", coro->badge_fullpath);
+                  else
+                     free(coro->json);
+               }
+            }
+         }
+      }
+
+      CORO_RET();
+
+      /**************************************************************************
+       * Info Logs in the user at Retro Achievements
+         *************************************************************************/
+   CORO_SUB(LOGIN)
+
+      if (cheevos_locals.token[0])
+         CORO_RET();
+
+      {
+         char urle_user[64];
+         char urle_login[64];
+         const char *username = coro ? coro->settings->arrays.cheevos_username : NULL;
+         const char *login    = NULL;
+         bool via_token       = false;
+
+         if (coro)
+         {
+            if (string_is_empty(coro->settings->arrays.cheevos_password))
+            {
+               via_token      = true;
+               login          = coro->settings->arrays.cheevos_token;
+            }
+            else
+               login          = coro->settings->arrays.cheevos_password;
+         }
+         else
+            login = NULL;
+
+         if (string_is_empty(username) || string_is_empty(login))
+         {
+            runloop_msg_queue_push(
+                  "Missing RetroAchievements account information.",
+                  0, 5 * 60, false);
+            runloop_msg_queue_push(
+                  "Please fill in your account information in Settings.",
+                  0, 5 * 60, false);
+            CHEEVOS_ERR("[CHEEVOS]: login info not informed.\n");
+            CORO_STOP();
+         }
+
+         cheevos_url_encode(username, urle_user, sizeof(urle_user));
+         cheevos_url_encode(login, urle_login, sizeof(urle_login));
+
+         snprintf(
+               coro->url, sizeof(coro->url),
+               "http://retroachievements.org/dorequest.php?r=login&u=%s&%c=%s",
+                     urle_user, via_token ? 't' : 'p', urle_login
+               );
+
+         coro->url[sizeof(coro->url) - 1] = 0;
+      }
+
+#ifdef CHEEVOS_LOG_URLS
+      cheevos_log_url("[CHEEVOS]: url to login: %s\n",
+            coro->url);
+#endif
+
+      CORO_GOSUB(HTTP_GET);
+
+      if (coro->json)
+      {
+         char error_response[64];
+         char error_message[256];
+
+         cheevos_get_value(
+               coro->json,
+               CHEEVOS_JSON_KEY_ERROR,
+               error_response,
+               sizeof(error_response)
+         );
+
+         /* No error, continue with login */
+         if (string_is_empty(error_response))
+         {
+            int res = cheevos_get_value(
+               coro->json,
+               CHEEVOS_JSON_KEY_TOKEN,
+               cheevos_locals.token,
+               sizeof(cheevos_locals.token));
+
+            if ((void*)coro->json)
+               free((void*)coro->json);
+
+            if (!res)
+            {
+               if (coro->settings->bools.cheevos_verbose_enable)
+               {
+                  char msg[256];
+                  snprintf(msg, sizeof(msg),
+                        "RetroAchievements: Logged in as \"%s\".",
+                        coro->settings->arrays.cheevos_username);
+                  msg[sizeof(msg) - 1] = 0;
+                  runloop_msg_queue_push(msg, 0, 3 * 60, false);
+               }
+
+               /* Save token to config and clear pass on success */
+               *coro->settings->arrays.cheevos_password = '\0';
+               strncpy(
+                     coro->settings->arrays.cheevos_token,
+                     cheevos_locals.token, sizeof(cheevos_locals.token)
+               );
+               CORO_RET();
+            }
+         }
+
+         if ((void*)coro->json)
+            free((void*)coro->json);
+
+         /* Site returned error, display it */
+         snprintf(error_message, sizeof(error_message),
+               "RetroAchievements: %s",
+               error_response);
+         error_message[sizeof(error_message) - 1] = 0;
+         runloop_msg_queue_push(error_message, 0, 5 * 60, false);
+         *coro->settings->arrays.cheevos_token = '\0';
+
+         CORO_STOP();
+      }
+
+      runloop_msg_queue_push("RetroAchievements: Error contacting server.", 0, 5 * 60, false);
+      CHEEVOS_ERR("[CHEEVOS]: error getting user token.\n");
+
+      CORO_STOP();
+
+      /**************************************************************************
+       * Info    Pauses execution for five seconds
+         *************************************************************************/
+   CORO_SUB(DELAY)
+
+      {
+         retro_time_t t1;
+         coro->t0         = cpu_features_get_time_usec();
+
+         do
+         {
+            CORO_YIELD();
+            t1 = cpu_features_get_time_usec();
+         }while ((t1 - coro->t0) < 3000000);
+      }
+
+      CORO_RET();
+
+      /**************************************************************************
+       * Info    Makes a HTTP GET request
+         * Inputs  CHEEVOS_VAR_URL
+         * Outputs CHEEVOS_VAR_JSON
+         *************************************************************************/
+   CORO_SUB(HTTP_GET)
+
+      for (coro->k = 0; coro->k < 5; coro->k++)
+      {
+         if (coro->k != 0)
+            CHEEVOS_LOG("[CHEEVOS]: Retrying HTTP request: %u of 5\n", coro->k + 1);
+
+         coro->json       = NULL;
+         coro->conn       = net_http_connection_new(
+               coro->url, "GET", NULL);
+
+         if (!coro->conn)
+         {
+            CORO_GOSUB(DELAY);
+            continue;
+         }
+
+         /* Don't bother with timeouts here, it's just a string scan. */
+         while (!net_http_connection_iterate(coro->conn)) {}
+
+         /* Error finishing the connection descriptor. */
+         if (!net_http_connection_done(coro->conn))
+         {
+            net_http_connection_free(coro->conn);
+            continue;
+         }
+
+         coro->http = net_http_new(coro->conn);
+
+         /* Error connecting to the endpoint. */
+         if (!coro->http)
+         {
+            net_http_connection_free(coro->conn);
+            CORO_GOSUB(DELAY);
+            continue;
+         }
+
+         while (!net_http_update(coro->http, NULL, NULL))
+            CORO_YIELD();
+
+         {
+            size_t length;
+            uint8_t *data = net_http_data(coro->http,
+                  &length, false);
+
+            if (data)
+            {
+               coro->json = (char*)malloc(length + 1);
+
+               if (coro->json)
+               {
+                  memcpy((void*)coro->json, (void*)data, length);
+                  free(data);
+                  coro->json[length] = 0;
+               }
+
+               coro->k = (unsigned)length;
+               net_http_delete(coro->http);
+               net_http_connection_free(coro->conn);
+               CORO_RET();
+            }
+         }
+
+         net_http_delete(coro->http);
+         net_http_connection_free(coro->conn);
+      }
+
+      CHEEVOS_LOG("[CHEEVOS]: Couldn't connect to server after 5 tries\n");
+      CORO_RET();
+
+      /**************************************************************************
+       * Info    Deactivates the achievements already awarded
+         * Inputs  CHEEVOS_VAR_GAMEID
+         * Outputs
+         *************************************************************************/
+   CORO_SUB(DEACTIVATE)
+
+#ifndef CHEEVOS_DONT_DEACTIVATE
+      CORO_GOSUB(LOGIN);
+
+      /* Deactivate achievements in softcore mode. */
+      snprintf(
+            coro->url, sizeof(coro->url),
+            "http://retroachievements.org/dorequest.php?r=unlocks&u=%s&t=%s&g=%u&h=0",
+            coro->settings->arrays.cheevos_username,
+            cheevos_locals.token, coro->gameid
+            );
+
+      coro->url[sizeof(coro->url) - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+      cheevos_log_url("[CHEEVOS]: url to get the list of unlocked cheevos in softcore: %s\n", coro->url);
+#endif
+
+      CORO_GOSUB(HTTP_GET);
+
+      if (coro->json)
+      {
+         if (!cheevos_deactivate_unlocks(coro->json, CHEEVOS_ACTIVE_SOFTCORE))
+            CHEEVOS_LOG("[CHEEVOS]: deactivated unlocked achievements in softcore mode.\n");
+         else
+            CHEEVOS_ERR("[CHEEVOS]: error deactivating unlocked achievements in softcore mode.\n");
+
+         if ((void*)coro->json)
+            free((void*)coro->json);
+      }
+      else
+         CHEEVOS_ERR("[CHEEVOS]: error retrieving list of unlocked achievements in softcore mode.\n");
+
+      /* Deactivate achievements in hardcore mode. */
+      snprintf(
+            coro->url, sizeof(coro->url),
+            "http://retroachievements.org/dorequest.php?r=unlocks&u=%s&t=%s&g=%u&h=1",
+            coro->settings->arrays.cheevos_username,
+            cheevos_locals.token, coro->gameid
+            );
+
+      coro->url[sizeof(coro->url) - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+      cheevos_log_url("[CHEEVOS]: url to get the list of unlocked cheevos in hardcore: %s\n", coro->url);
+#endif
+
+      CORO_GOSUB(HTTP_GET);
+
+      if (coro->json)
+      {
+         if (!cheevos_deactivate_unlocks(coro->json, CHEEVOS_ACTIVE_HARDCORE))
+            CHEEVOS_LOG("[CHEEVOS]: deactivated unlocked achievements in hardcore mode.\n");
+         else
+            CHEEVOS_ERR("[CHEEVOS]: error deactivating unlocked achievements in hardcore mode.\n");
+
+         if ((void*)coro->json)
+            free((void*)coro->json);
+      }
+      else
+         CHEEVOS_ERR("[CHEEVOS]: error retrieving list of unlocked achievements in hardcore mode.\n");
+
+#endif
+      CORO_RET();
+
+      /**************************************************************************
+       * Info    Posts the "playing" activity to Retro Achievements
+         * Inputs  CHEEVOS_VAR_GAMEID
+         * Outputs
+         *************************************************************************/
+   CORO_SUB(PLAYING)
+
+      snprintf(
+            coro->url, sizeof(coro->url),
+            "http://retroachievements.org/dorequest.php?r=postactivity&u=%s&t=%s&a=3&m=%u",
+            coro->settings->arrays.cheevos_username,
+            cheevos_locals.token, coro->gameid
+            );
+
+      coro->url[sizeof(coro->url) - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+      cheevos_log_url("[CHEEVOS]: url to post the 'playing' activity: %s\n", coro->url);
+#endif
+
+      CORO_GOSUB(HTTP_GET);
+
+      if (coro->json)
+      {
+         CHEEVOS_LOG("[CHEEVOS]: posted playing activity.\n");
+         if ((void*)coro->json)
+            free((void*)coro->json);
+      }
+      else
+         CHEEVOS_ERR("[CHEEVOS]: error posting playing activity.\n");
+
+      CHEEVOS_LOG("[CHEEVOS]: posted playing activity.\n");
+      CORO_RET();
+
+   CORO_LEAVE();
+}
+
+static void cheevos_task_handler(retro_task_t *task)
+{
+   coro_t *coro = (coro_t*)task->state;
+
+   if (!coro)
+      return;
+
+   if (!cheevos_iterate(coro) || task_get_cancelled(task))
+   {
+      task_set_finished(task, true);
+
+      CHEEVOS_LOCK(cheevos_locals.task_lock);
+      cheevos_locals.task = NULL;
+      CHEEVOS_UNLOCK(cheevos_locals.task_lock);
+
+      if (task_get_cancelled(task))
+      {
+         CHEEVOS_LOG("[CHEEVOS]: Load task cancelled\n");
+      }
+      else
+      {
+         CHEEVOS_LOG("[CHEEVOS]: Load task finished\n");
+      }
+
+      if (coro->data)
+         free(coro->data);
+
+      if ((void*)coro->path)
+         free((void*)coro->path);
+
+      free((void*)coro);
+   }
+}
+
+bool cheevos_load(const void *data)
+{
+   retro_task_t *task;
+   const struct retro_game_info *info = NULL;
+   coro_t *coro                       = NULL;
+
+   cheevos_loaded = false;
+   cheevos_hardcore_paused = false;
+
+   if (!cheevos_locals.core_supports || !data)
+      return false;
+
+   coro = (coro_t*)calloc(1, sizeof(*coro));
+
+   if (!coro)
+      return false;
+
+   task = (retro_task_t*)calloc(1, sizeof(*task));
+
+   if (!task)
+   {
+      if ((void*)coro)
+         free((void*)coro);
+      return false;
+   }
+
+   CORO_SETUP();
+
+   info = (const struct retro_game_info*)data;
+
+   if (info->data)
+   {
+      coro->len = info->size;
+
+      /* size limit */
+      if (coro->len > size_in_megabytes(64))
+         coro->len = size_in_megabytes(64);
+
+      coro->data = malloc(coro->len);
+
+      if (!coro->data)
+      {
+         if ((void*)task)
+            free((void*)task);
+         if ((void*)coro)
+            free((void*)coro);
+         return false;
+      }
+
+      memcpy(coro->data, info->data, coro->len);
+      coro->path       = NULL;
+   }
+   else
+   {
+      coro->data       = NULL;
+      coro->path       = strdup(info->path);
+   }
+
+   task->handler   = cheevos_task_handler;
+   task->state     = (void*)coro;
+   task->mute      = true;
+   task->callback  = NULL;
+   task->user_data = NULL;
+   task->progress  = 0;
+   task->title     = NULL;
+
+#ifdef HAVE_THREADS
+   if (cheevos_locals.task_lock == NULL)
+   {
+      cheevos_locals.task_lock = slock_new();
+   }
+#endif
+
+   CHEEVOS_LOCK(cheevos_locals.task_lock);
+   cheevos_locals.task = task;
+   CHEEVOS_UNLOCK(cheevos_locals.task_lock);
+
+   task_queue_push(task);
+
+   return true;
+}
diff --git a/cheevos/cheevos.h b/cheevos/cheevos.h
index 0e53cc0021..ec25ae0019 100644
--- a/cheevos/cheevos.h
+++ b/cheevos/cheevos.h
@@ -98,7 +98,8 @@ typedef enum
    CHEEVOS_CONSOLE_VIRTUAL_BOY     = 28,
    CHEEVOS_CONSOLE_MSX             = 29,
    CHEEVOS_CONSOLE_COMMODORE_64    = 30,
-   CHEEVOS_CONSOLE_ZX81            = 31
+   CHEEVOS_CONSOLE_ZX81            = 31,
+   CHEEVOS_CONSOLE_ATARI_7800      = 51
 } cheevos_console_t;
 
 enum
diff --git a/command.c b/command.c
index f52fcee785..a87a52e1e4 100644
--- a/command.c
+++ b/command.c
@@ -1278,6 +1278,7 @@ static bool event_init_content(void)
 {
    bool contentless = false;
    bool is_inited   = false;
+   settings_t *settings            = config_get_ptr();
 
    content_get_status(&contentless, &is_inited);
 
@@ -1304,7 +1305,18 @@ static bool event_init_content(void)
       RARCH_LOG("%s.\n",
             msg_hash_to_str(MSG_SKIPPING_SRAM_LOAD));
 
+/*
+   Since the operations are asynchronouse we can't guarantee users will not use auto_load_state to cheat on
+   achievements so we forbid auto_load_state from happening if cheevos_enable and cheevos_hardcode_mode_enable
+   are true
+*/
+#ifdef HAVE_CHEEVOS
+   if (!settings->bools.cheevos_enable || !settings->bools.cheevos_hardcore_mode_enable)
+      command_event_load_auto_state();
+#else
    command_event_load_auto_state();
+#endif
+
    command_event(CMD_EVENT_BSV_MOVIE_INIT, NULL);
    command_event(CMD_EVENT_NETPLAY_INIT, NULL);
 
@@ -2433,17 +2445,12 @@ TODO: Add a setting for these tweaks */
          break;
       case CMD_EVENT_ADD_TO_FAVORITES:
       {
-         global_t *global               = global_get_ptr();
-         rarch_system_info_t *sys_info  = runloop_get_system_info();
-         const char *core_name          = NULL;
-         const char *core_path          = NULL;
-         const char *label              = NULL;
-
-         if (sys_info)
-         {
-            core_name = sys_info->info.library_name;
-            core_path = path_get(RARCH_PATH_CORE);
-         }
+         /* TODO/FIXME - does path_get(RARCH_PATH_CORE) depend on the system info struct? Investigate */
+         global_t *global                 = global_get_ptr();
+         struct retro_system_info *system = runloop_get_libretro_system_info();
+         const char *label                = NULL;
+         const char *core_path            = system ? path_get(RARCH_PATH_CORE) : NULL;
+         const char *core_name            = system ? system->library_name : NULL;
 
          if (!string_is_empty(global->name.label))
             label = global->name.label;
diff --git a/config.def.h b/config.def.h
index e9cadb4165..f0ee60d58b 100644
--- a/config.def.h
+++ b/config.def.h
@@ -188,7 +188,7 @@ static const bool video_threaded = false;
 #endif
 
 #if defined(HAVE_THREADS)
-#if defined(GEKKO) || defined(PSP)
+#if defined(GEKKO) || defined(PSP) || defined(PS2)
 /* For single-core consoles right now it's better to have this be disabled. */
 static const bool threaded_data_runloop_enable = false;
 #else
@@ -266,6 +266,12 @@ static const float default_input_overlay_opacity = 0.7f;
 
 static bool default_block_config_read    = true;
 
+#ifdef HAVE_LIBNX
+static bool menu_use_preferred_system_color_theme = true;
+#else
+static bool menu_use_preferred_system_color_theme = false;
+#endif
+
 static bool quick_menu_show_take_screenshot             = true;
 static bool quick_menu_show_save_load_state             = true;
 static bool quick_menu_show_undo_save_load_state        = true;
@@ -472,6 +478,11 @@ static const float crt_refresh_rate = 60/1.001;
  * Used for setups where one manually rotates the monitor. */
 static const bool allow_rotate = true;
 
+#ifdef _3DS
+/* Enable bottom LCD screen */
+static const bool video_3ds_lcd_bottom = true;
+#endif
+
 /* AUDIO */
 
 /* Will enable audio or not. */
@@ -725,7 +736,7 @@ static const bool desktop_menu_enable = true;
 
 #if defined(__QNX__) || defined(_XBOX1) || defined(_XBOX360) || defined(__CELLOS_LV2__) || (defined(__MACH__) && defined(IOS)) || defined(ANDROID) || defined(WIIU) || defined(HAVE_NEON) || defined(GEKKO) || defined(__ARM_NEON__)
 static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWER;
-#elif defined(PSP) || defined(_3DS) || defined(VITA)
+#elif defined(PSP) || defined(_3DS) || defined(VITA) || defined(PS2)
 static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_LOWEST;
 #else
 static enum resampler_quality audio_resampler_quality_level = RESAMPLER_QUALITY_NORMAL;
@@ -811,4 +822,6 @@ static char buildbot_server_url[] = "";
 
 static char buildbot_assets_server_url[] = "http://buildbot.libretro.com/assets/";
 
+static char default_discord_app_id[] = "475456035851599874";
+
 #endif
diff --git a/config.features.h b/config.features.h
index 93062366f4..f3e0d85b50 100644
--- a/config.features.h
+++ b/config.features.h
@@ -308,7 +308,7 @@ static const bool _python_supp = true;
 static const bool _python_supp = false;
 #endif
 
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
+#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
 static const bool _cocoa_supp = true;
 #else
 static const bool _cocoa_supp = false;
diff --git a/configuration.c b/configuration.c
index 4759929212..299f475e99 100644
--- a/configuration.c
+++ b/configuration.c
@@ -148,6 +148,7 @@ enum video_driver_enum
    VIDEO_XENON360,
    VIDEO_PSP1,
    VIDEO_VITA2D,
+   VIDEO_PS2,
    VIDEO_CTR,
    VIDEO_SWITCH,
    VIDEO_D3D8,
@@ -191,6 +192,7 @@ enum audio_driver_enum
    AUDIO_WIIU,
    AUDIO_RWEBAUDIO,
    AUDIO_PSP,
+   AUDIO_PS2,
    AUDIO_CTR,
    AUDIO_SWITCH,
    AUDIO_NULL
@@ -214,6 +216,7 @@ enum input_driver_enum
    INPUT_DINPUT,
    INPUT_PS3,
    INPUT_PSP,
+   INPUT_PS2,
    INPUT_CTR,
    INPUT_SWITCH,
    INPUT_XENON360,
@@ -237,6 +240,7 @@ enum joypad_driver_enum
    JOYPAD_WIIU,
    JOYPAD_XDK,
    JOYPAD_PSP,
+   JOYPAD_PS2,
    JOYPAD_CTR,
    JOYPAD_SWITCH,
    JOYPAD_DINPUT,
@@ -288,6 +292,7 @@ enum menu_driver_enum
    MENU_XMB,
    MENU_STRIPES,
    MENU_NUKLEAR,
+   MENU_OZONE,
    MENU_NULL
 };
 
@@ -324,6 +329,8 @@ static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VG;
 static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_VITA2D;
 #elif defined(PSP)
 static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_PSP1;
+#elif defined(PS2)
+static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_PS2;
 #elif defined(_3DS)
 static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_CTR;
 #elif defined(SWITCH)
@@ -354,6 +361,8 @@ static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_WII;
 static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_WIIU;
 #elif defined(PSP) || defined(VITA)
 static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_PSP;
+#elif defined(PS2)
+static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_PS2;
 #elif defined(_3DS)
 static enum audio_driver_enum AUDIO_DEFAULT_DRIVER = AUDIO_CTR;
 #elif defined(SWITCH)
@@ -434,6 +443,8 @@ static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_DINPUT;
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_PS3;
 #elif defined(PSP) || defined(VITA)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_PSP;
+#elif defined(PS2)
+static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_PS2;
 #elif defined(_3DS)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_CTR;
 #elif defined(SWITCH)
@@ -450,7 +461,7 @@ static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_UDEV;
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_LINUXRAW;
 #elif defined(HAVE_WAYLAND)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_WAYLAND;
-#elif defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
+#elif defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_COCOA;
 #elif defined(__QNX__)
 static enum input_driver_enum INPUT_DEFAULT_DRIVER = INPUT_QNX;
@@ -476,6 +487,8 @@ static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_WIIU;
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_XDK;
 #elif defined(PSP) || defined(VITA)
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_PSP;
+#elif defined(PS2)
+static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_PS2;
 #elif defined(_3DS)
 static enum joypad_driver_enum JOYPAD_DEFAULT_DRIVER = JOYPAD_CTR;
 #elif defined(SWITCH)
@@ -510,7 +523,7 @@ static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_V4L2;
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_RWEBCAM;
 #elif defined(ANDROID)
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_ANDROID;
-#elif defined(HAVE_AVFOUNDATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH))
+#elif defined(HAVE_AVFOUNDATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL))
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_AVFOUNDATION;
 #else
 static enum camera_driver_enum CAMERA_DEFAULT_DRIVER = CAMERA_NULL;
@@ -524,7 +537,7 @@ static enum wifi_driver_enum WIFI_DEFAULT_DRIVER = WIFI_NULL;
 
 #if defined(ANDROID)
 static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_ANDROID;
-#elif defined(HAVE_CORELOCATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH))
+#elif defined(HAVE_CORELOCATION) && (defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL))
 static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_CORELOCATION;
 #else
 static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_NULL;
@@ -534,6 +547,8 @@ static enum location_driver_enum LOCATION_DEFAULT_DRIVER = LOCATION_NULL;
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XUI;
 #elif defined(HAVE_MATERIALUI) && defined(RARCH_MOBILE)
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_MATERIALUI;
+#elif defined(HAVE_OZONE) && defined(HAVE_LIBNX)
+static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_OZONE;
 #elif defined(HAVE_XMB) && !defined(_XBOX)
 static enum menu_driver_enum MENU_DEFAULT_DRIVER = MENU_XMB;
 #elif defined(HAVE_RGUI)
@@ -660,6 +675,8 @@ const char *config_get_default_audio(void)
 #else
          return "psp";
 #endif
+      case AUDIO_PS2:
+         return "ps2";
       case AUDIO_CTR:
          return "csnd";
       case AUDIO_SWITCH:
@@ -755,6 +772,8 @@ const char *config_get_default_video(void)
          return "d3d12";
       case VIDEO_PSP1:
          return "psp1";
+      case VIDEO_PS2:
+         return "ps2";
       case VIDEO_VITA2D:
          return "vita2d";
       case VIDEO_CTR:
@@ -815,6 +834,8 @@ const char *config_get_default_input(void)
 #else
          return "psp";
 #endif
+      case INPUT_PS2:
+         return "ps2";
       case INPUT_CTR:
          return "ctr";
       case INPUT_SWITCH:
@@ -885,6 +906,8 @@ const char *config_get_default_joypad(void)
 #else
          return "psp";
 #endif
+      case JOYPAD_PS2:
+         return "ps2";
       case JOYPAD_CTR:
          return "ctr";
       case JOYPAD_SWITCH:
@@ -1028,6 +1051,8 @@ const char *config_get_default_menu(void)
          return "rgui";
       case MENU_XUI:
          return "xui";
+      case MENU_OZONE:
+         return "ozone";
       case MENU_MATERIALUI:
          return "glui";
       case MENU_XMB:
@@ -1111,7 +1136,7 @@ static struct config_array_setting *populate_settings_array(settings_t *settings
    SETTING_ARRAY("midi_input",               settings->arrays.midi_input, true, midi_input, true);
    SETTING_ARRAY("midi_output",              settings->arrays.midi_output, true, midi_output, true);
    SETTING_ARRAY("youtube_stream_key",       settings->arrays.youtube_stream_key, true, NULL, true);
-   SETTING_ARRAY("twitch_stream_key",        settings->arrays.twitch_stream_key, true, NULL, true);
+   SETTING_ARRAY("discord_app_id",           settings->arrays.discord_app_id, true, default_discord_app_id, true);
    *size = count;
 
    return tmp;
@@ -1382,6 +1407,7 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
    SETTING_BOOL("quick_menu_show_save_content_dir_overrides",  &settings->bools.quick_menu_show_save_content_dir_overrides, true, quick_menu_show_save_content_dir_overrides, false);
    SETTING_BOOL("quick_menu_show_information",   &settings->bools.quick_menu_show_information, true, quick_menu_show_information, false);
    SETTING_BOOL("kiosk_mode_enable",             &settings->bools.kiosk_mode_enable, true, kiosk_mode_enable, false);
+   SETTING_BOOL("menu_use_preferred_system_color_theme",         &settings->bools.menu_use_preferred_system_color_theme, true, menu_use_preferred_system_color_theme, false);
    SETTING_BOOL("content_show_settings",         &settings->bools.menu_content_show_settings, true, content_show_settings, false);
    SETTING_BOOL("content_show_favorites",        &settings->bools.menu_content_show_favorites, true, content_show_favorites, false);
 #ifdef HAVE_IMAGEVIEWER
@@ -1491,6 +1517,10 @@ static struct config_bool_setting *populate_settings_bool(settings_t *settings,
 
    SETTING_BOOL("sustained_performance_mode",    &settings->bools.sustained_performance_mode, true, sustained_performance_mode, false);
 
+#ifdef _3DS
+   SETTING_BOOL("video_3ds_lcd_bottom",          &settings->bools.video_3ds_lcd_bottom, true, video_3ds_lcd_bottom, false);
+#endif
+
    *size = count;
 
    return tmp;
@@ -1575,6 +1605,16 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("dpi_override_value",           &settings->uints.menu_dpi_override_value, true, menu_dpi_override_value, false);
    SETTING_UINT("menu_thumbnails",              &settings->uints.menu_thumbnails, true, menu_thumbnails_default, false);
    SETTING_UINT("menu_timedate_style", &settings->uints.menu_timedate_style, true, menu_timedate_style, false);
+#ifdef HAVE_LIBNX
+   SETTING_UINT("split_joycon_p1", &settings->uints.input_split_joycon[0], true, 0, false);
+   SETTING_UINT("split_joycon_p2", &settings->uints.input_split_joycon[1], true, 0, false);
+   SETTING_UINT("split_joycon_p3", &settings->uints.input_split_joycon[2], true, 0, false);
+   SETTING_UINT("split_joycon_p4", &settings->uints.input_split_joycon[3], true, 0, false);
+   SETTING_UINT("split_joycon_p5", &settings->uints.input_split_joycon[4], true, 0, false);
+   SETTING_UINT("split_joycon_p6", &settings->uints.input_split_joycon[5], true, 0, false);
+   SETTING_UINT("split_joycon_p7", &settings->uints.input_split_joycon[6], true, 0, false);
+   SETTING_UINT("split_joycon_p8", &settings->uints.input_split_joycon[7], true, 0, false);
+#endif
 #ifdef HAVE_XMB
    SETTING_UINT("menu_left_thumbnails",         &settings->uints.menu_left_thumbnails, true, menu_left_thumbnails_default, false);
    SETTING_UINT("xmb_alpha_factor",             &settings->uints.menu_xmb_alpha_factor, true, xmb_alpha_factor, false);
@@ -1588,6 +1628,9 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
 #endif
    SETTING_UINT("materialui_menu_color_theme",  &settings->uints.menu_materialui_color_theme, true, MATERIALUI_THEME_BLUE, false);
    SETTING_UINT("menu_shader_pipeline",         &settings->uints.menu_xmb_shader_pipeline, true, menu_shader_pipeline, false);
+#ifdef HAVE_OZONE
+   SETTING_UINT("ozone_menu_color_theme",       &settings->uints.menu_ozone_color_theme, true, 0, false);
+#endif
 #endif
    SETTING_UINT("audio_out_rate",               &settings->uints.audio_out_rate, true, out_rate, false);
    SETTING_UINT("custom_viewport_width",        &settings->video_viewport_custom.width, false, 0 /* TODO */, false);
@@ -1804,6 +1847,9 @@ void config_set_defaults(void)
    *settings->paths.path_menu_xmb_font            = '\0';
 #endif
 
+   strlcpy(settings->arrays.discord_app_id,
+      default_discord_app_id,  sizeof(settings->arrays.discord_app_id));
+
 #ifdef HAVE_MATERIALUI
    if (g_defaults.menu.materialui.menu_color_theme_enable)
       settings->uints.menu_materialui_color_theme = g_defaults.menu.materialui.menu_color_theme;
@@ -2349,7 +2395,8 @@ static bool check_menu_driver_compatibility(void)
    char *menu_driver    = settings->arrays.menu_driver;
 
    if (string_is_equal  (menu_driver, "rgui") ||
-         string_is_equal(menu_driver, "null"))
+         string_is_equal(menu_driver, "null") ||
+         string_is_equal(video_driver, "null"))
       return true;
 
    /* TODO/FIXME - maintenance hazard */
@@ -2357,11 +2404,13 @@ static bool check_menu_driver_compatibility(void)
          string_is_equal(video_driver, "d3d10")  ||
          string_is_equal(video_driver, "d3d11")  ||
          string_is_equal(video_driver, "d3d12")  ||
+         string_is_equal(video_driver, "gdi")    ||
          string_is_equal(video_driver, "gl")     ||
          string_is_equal(video_driver, "gx2")    ||
          string_is_equal(video_driver, "vulkan") ||
          string_is_equal(video_driver, "metal")  ||
-         string_is_equal(video_driver, "vita"))
+         string_is_equal(video_driver, "ctr")    ||
+         string_is_equal(video_driver, "vita2d"))
       return true;   
 
    return false;
diff --git a/configuration.h b/configuration.h
index 28f599ff87..5ca67844fb 100644
--- a/configuration.h
+++ b/configuration.h
@@ -104,6 +104,7 @@ typedef struct settings
       bool video_statistics_show;
       bool video_framecount_show;
       bool video_msg_bgcolor_enable;
+      bool video_3ds_lcd_bottom;
 
       /* Audio */
       bool audio_enable;
@@ -175,6 +176,8 @@ typedef struct settings
       bool menu_content_show_history;
       bool menu_content_show_add;
       bool menu_content_show_playlists;
+      bool menu_use_preferred_system_color_theme;
+      bool menu_preferred_system_color_theme_set;
       bool menu_unified_controls;
       bool quick_menu_show_take_screenshot;
       bool quick_menu_show_save_load_state;
@@ -407,6 +410,7 @@ typedef struct settings
       unsigned menu_xmb_theme;
       unsigned menu_xmb_color_theme;
       unsigned menu_materialui_color_theme;
+      unsigned menu_ozone_color_theme;
       unsigned menu_font_color_red;
       unsigned menu_font_color_green;
       unsigned menu_font_color_blue;
@@ -482,6 +486,8 @@ typedef struct settings
 
       char youtube_stream_key[PATH_MAX_LENGTH];
       char twitch_stream_key[PATH_MAX_LENGTH];
+
+      char discord_app_id[PATH_MAX_LENGTH];
    } arrays;
 
    struct
diff --git a/core_impl.c b/core_impl.c
index eb4b2fffd0..a8a5acb949 100644
--- a/core_impl.c
+++ b/core_impl.c
@@ -396,7 +396,9 @@ bool core_unload(void)
 {
    video_driver_set_cached_frame_ptr(NULL);
 
-   current_core.retro_deinit();
+   if (current_core.inited)
+      current_core.retro_deinit();
+
    return true;
 }
 
@@ -407,9 +409,11 @@ bool core_unload_game(void)
 
    video_driver_set_cached_frame_ptr(NULL);
 
-   current_core.retro_unload_game();
-
-   current_core.game_loaded = false;
+   if (current_core.game_loaded)
+   {
+      current_core.retro_unload_game();
+      current_core.game_loaded = false;
+   }
 
    audio_driver_stop();
 
diff --git a/core_info.c b/core_info.c
index 18c8caf448..d7ea70ed91 100644
--- a/core_info.c
+++ b/core_info.c
@@ -205,7 +205,7 @@ static bool core_info_list_iterate(
          current_path,
          info_path_base_size);
 
-#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA) && !defined(HW_WUP))
+#if defined(RARCH_MOBILE) || (defined(RARCH_CONSOLE) && !defined(PSP) && !defined(_3DS) && !defined(VITA) && !defined(PS2) && !defined(HW_WUP))
    substr = strrchr(info_path_base, '_');
    if (substr)
       *substr = '\0';
diff --git a/cores/libretro-video-processor/Makefile b/cores/libretro-video-processor/Makefile
index 6323f9a53d..319723a941 100644
--- a/cores/libretro-video-processor/Makefile
+++ b/cores/libretro-video-processor/Makefile
@@ -109,7 +109,7 @@ else
    SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--version-script=link.T -Wl,--no-undefined
 endif
 
-LDFLAGS += $(LIBV4L2) $(LIBASOUND) $(LIBUDEV)
+LDFLAGS += $(LIBV4L2) $(LIBASOUND) $(LIBUDEV) -lm
 
 ifeq ($(DEBUG), 1)
    CFLAGS += -O0 -g
diff --git a/cores/libretro-video-processor/video_processor_v4l2.c b/cores/libretro-video-processor/video_processor_v4l2.c
index d5f0813f19..15cbe0d02b 100644
--- a/cores/libretro-video-processor/video_processor_v4l2.c
+++ b/cores/libretro-video-processor/video_processor_v4l2.c
@@ -26,12 +26,13 @@
 
 #define LIBRARY_NAME		"V4L2"
 #define LIBRARY_VERSION		"0.0.2"
-#define VIDEO_BUFFERS		2
+#define VIDEO_BUFFERS_MAX   2
 #define AUDIO_SAMPLE_RATE	48000
 #define AUDIO_BUFSIZE		64
 #define ENVVAR_BUFLEN		1024
 
 #include <libretro.h>
+#include <clamping.h>
 
 #include <sys/mman.h>
 #include <errno.h>
@@ -39,6 +40,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <math.h>
 
 #include <linux/videodev2.h>
 #include <libv4l2.h>
@@ -61,7 +63,7 @@
 
 #include <string/stdstring.h>
 
-struct video_buffer
+struct v4l2_capbuf
 {
    void   *start;
    size_t   len;
@@ -70,12 +72,42 @@ struct video_buffer
 /*
  * Video capture state
  */
-static int video_fd = -1;
-static struct v4l2_format video_format;
-static struct v4l2_standard video_standard;
-static struct video_buffer video_buffer[VIDEO_BUFFERS];
-static size_t video_nbuffers;
-static uint16_t *conv_data;
+static int  video_device_fd = -1;
+static char video_device[ENVVAR_BUFLEN];
+static char audio_device[ENVVAR_BUFLEN];
+
+static struct  v4l2_format video_format;
+static struct  v4l2_standard video_standard;
+static struct  v4l2_buffer video_buf;
+
+static uint8_t v4l2_ncapbuf_target;
+static size_t  v4l2_ncapbuf;
+static struct  v4l2_capbuf v4l2_capbuf[VIDEO_BUFFERS_MAX];
+
+static float   dummy_pos=0;
+
+static int      video_half_feed_rate=0; // for interlaced captures
+static uint32_t video_cap_width;
+static uint32_t video_cap_height;
+static uint32_t video_out_height;
+static char     video_capture_mode[ENVVAR_BUFLEN];
+static char     video_output_mode[ENVVAR_BUFLEN];
+static char     video_frame_times[ENVVAR_BUFLEN];
+
+static uint8_t  *frame_cap;
+static uint32_t *frame_out;
+static uint32_t *frames[4];
+static uint32_t *frame_prev1;
+static uint32_t *frame_prev2;
+static uint32_t *frame_prev3;
+static uint32_t *frame_curr;
+
+
+// Frametime debug messages
+struct timeval ft_prevtime = { 0 }, ft_prevtime2 = { 0 };
+char *ft_info = NULL, *ft_info2 = NULL;
+double ft_favg, ft_ftime;
+int ft_fcount;
 
 /*
  * Audio capture state
@@ -196,6 +228,7 @@ enumerate_video_devices(char *buf, size_t buflen)
    /* Just return a few options. We'll fail later if the device is not found. */
    appendstr(buf, "/dev/video0|/dev/video1|/dev/video2|/dev/video3", buflen);
 #endif
+
 }
 
 static void
@@ -239,20 +272,28 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_set_environment)(retro_environment_t
 {
    char video_devices[ENVVAR_BUFLEN];
    char audio_devices[ENVVAR_BUFLEN];
-   struct retro_variable envvars[3]  = {{NULL}};
+   struct retro_variable envvars[] = {
+      { "videoproc_videodev", NULL },
+      { "videoproc_audiodev", NULL },
+      { "videoproc_capture_mode", "Capture mode; alternate|interlaced|top|bottom|alternate_hack" },
+      { "videoproc_output_mode","Output mode; progressive|deinterlaced|interlaced" },
+      { "videoproc_frame_times","Print frame times to terminal (v4l2 only); Off|On" },
+      { NULL, NULL }
+   };
 
    VIDEOPROC_CORE_PREFIX(environment_cb) = cb;
 
-#ifdef HAVE_ALSA
-   struct retro_audio_callback audio_cb;
-   audio_cb.callback = audio_callback;
-   audio_cb.set_state = audio_set_state;
-   VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK, &audio_cb);
-#endif
+   // Allows retroarch to seed the previous values
+   VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_SET_VARIABLES, envvars);
 
+   // Enumerate all real devices
    enumerate_video_devices(video_devices, sizeof(video_devices));
    enumerate_audio_devices(audio_devices, sizeof(audio_devices));
 
+   // Add the dummy device
+   appendstr(video_devices, "|dummy", ENVVAR_BUFLEN);
+
+   // Registers available devices list (still respects saved device if it exists)
    envvars[0].key   = "videoproc_videodev";
    envvars[0].value = video_devices;
    envvars[1].key   = "videoproc_audiodev";
@@ -301,6 +342,10 @@ static bool open_devices(void)
    VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &videodev);
    VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &audiodev);
 
+   if (strcmp(videodev.value, "dummy") == 0) {
+      return true;
+   }
+
    /* Video device is required */
    if (videodev.value == NULL)
    {
@@ -309,19 +354,19 @@ static bool open_devices(void)
    }
 
    /* Open the V4L2 device */
-   video_fd = v4l2_open(videodev.value, O_RDWR, 0);
-   if (video_fd == -1)
+   video_device_fd = v4l2_open(videodev.value, O_RDWR, 0);
+   if (video_device_fd == -1)
    {
       printf("Couldn't open %s: %s\n", videodev.value, strerror(errno));
       return false;
    }
 
    /* Query V4L2 device capabilities */
-   error = v4l2_ioctl(video_fd, VIDIOC_QUERYCAP, &caps);
+   error = v4l2_ioctl(video_device_fd, VIDIOC_QUERYCAP, &caps);
    if (error != 0)
    {
       printf("VIDIOC_QUERYCAP failed: %s\n", strerror(errno));
-      v4l2_close(video_fd);
+      v4l2_close(video_device_fd);
       return false;
    }
 
@@ -339,7 +384,7 @@ static bool open_devices(void)
       unsigned int rate;
 
       /*
-       * Open the audio capture device and configure it for 48kHz, 16-bit stereo
+       * Open the audio capture device and configure it for 44kHz, 16-bit stereo
        */
       error = snd_pcm_open(&audio_handle, audiodev.value, SND_PCM_STREAM_CAPTURE, 0);
       if (error < 0)
@@ -422,10 +467,10 @@ static void close_devices(void)
    }
 #endif
 
-   if (video_fd != -1)
+   if (video_device_fd != -1)
    {
-      v4l2_close(video_fd);
-      video_fd = -1;
+      v4l2_close(video_device_fd);
+      video_device_fd = -1;
    }
 }
 
@@ -450,27 +495,49 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_get_system_info)(struct retro_system_
 
 RETRO_API void VIDEOPROC_CORE_PREFIX(retro_get_system_av_info)(struct retro_system_av_info *info)
 {
+   struct retro_variable videodev = { "videoproc_videodev", NULL };
    struct v4l2_cropcap cc;
    int error;
 
-   /*
-    * Query the device cropping limits. If available, we can use this to find the capture pixel aspect.
-    */
-   memset(&cc, 0, sizeof(cc));
-   cc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-   error = v4l2_ioctl(video_fd, VIDIOC_CROPCAP, &cc);
-   if (error == 0)
-      info->geometry.aspect_ratio = (double)cc.pixelaspect.denominator
-         / (double)cc.pixelaspect.numerator;
+   VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &videodev);
 
-   info->geometry.base_width  = info->geometry.max_width = video_format.fmt.pix.width;
-   info->geometry.base_height = info->geometry.max_height = video_format.fmt.pix.height;
-   info->timing.fps           = (double)video_standard.frameperiod.denominator /
-      (double)video_standard.frameperiod.numerator;
-   info->timing.sample_rate   = AUDIO_SAMPLE_RATE;
+   if (strcmp(videodev.value, "dummy") == 0) {
+      info->geometry.aspect_ratio = 4.0/3.0;
+      info->geometry.base_width  = info->geometry.max_width = video_cap_width;
+      info->geometry.base_height = video_cap_height; //out?
+      info->geometry.max_height  = video_out_height;
+      info->timing.fps           = 60;
+      info->timing.sample_rate   = AUDIO_SAMPLE_RATE;
+   } else {
+       /*
+        * Query the device cropping limits. If available, we can use this to find the capture pixel aspect.
+        */
+       memset(&cc, 0, sizeof(cc));
+       cc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+       error = v4l2_ioctl(video_device_fd, VIDIOC_CROPCAP, &cc);
 
-   printf("Resolution %ux%u %f fps\n", info->geometry.base_width,
-         info->geometry.base_height, info->timing.fps);
+       info->geometry.base_width  = info->geometry.max_width = video_format.fmt.pix.width;
+       info->geometry.base_height = video_format.fmt.pix.height;
+       //TODO Only double if frames are NOT fields (interlaced, full resolution)
+       info->geometry.max_height = video_format.fmt.pix.height * 2;
+       //TODO Only double if frames ARE fields (progressive or deinterlaced, full framerate)
+       // *2 for fields
+       info->timing.fps           = ((double)(video_standard.frameperiod.denominator*2)) /
+                                    (double)video_standard.frameperiod.numerator;
+       info->timing.sample_rate   = AUDIO_SAMPLE_RATE;
+
+       if (error == 0) {
+          //TODO Allow for fixed 4:3 and 16:9 modes
+          info->geometry.aspect_ratio = (double)info->geometry.base_width / (double)info->geometry.max_height /\
+                                         ((double)cc.pixelaspect.numerator / (double)cc.pixelaspect.denominator);
+       }
+   }
+
+   printf("Aspect ratio: %f\n",info->geometry.aspect_ratio);
+   printf("Buffer Resolution %ux%u %f fps\n", info->geometry.base_width,
+             info->geometry.base_height, info->timing.fps);
+   printf("Buffer Max Resolution %ux%u\n", info->geometry.max_width, 
+             info->geometry.max_height);
 }
 
 RETRO_API void VIDEOPROC_CORE_PREFIX(retro_set_controller_port_device)(unsigned port, unsigned device)
@@ -483,23 +550,99 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_reset)(void)
    open_devices();
 }
 
-RETRO_API void VIDEOPROC_CORE_PREFIX(retro_run)(void)
-{
-   struct v4l2_buffer buf;
-   uint8_t *src;
-   uint16_t *dst;
-   int i, error;
+//TODO improve this mess and make it generic enough for use with dummy mode
+void v4l2_frame_times(struct v4l2_buffer buf) {
+   if (strcmp("Off", video_frame_times) == 0)
+       return; 
 
-   VIDEOPROC_CORE_PREFIX(input_poll_cb)();
+   if (ft_info == NULL)
+       ft_info = calloc(5000, sizeof(char));
 
-   if (video_fd == -1)
-      return;
+   if ( (buf.timestamp.tv_sec - ft_prevtime.tv_sec >= 1) && \
+        (buf.timestamp.tv_usec + 1000000 - ft_prevtime2.tv_usec) >= 1000000) {
+       double csec = ((double) buf.timestamp.tv_sec) + (buf.timestamp.tv_usec/1000000);
+       double psec = ((double) ft_prevtime.tv_sec) + (ft_prevtime.tv_usec/1000000);
+       printf("Fields last %.2f seconds: %d\n", csec - psec, ft_fcount);
+       printf("Average frame times: %.3fms\n", ft_favg/(1000*ft_fcount));
+       printf("Fields timestampdiffs last second:\n%s\n", ft_info);
+       free(ft_info);
+       ft_info = calloc(5000, sizeof(char));
+       ft_fcount = 0;
+       ft_favg = 0;
+       ft_prevtime = buf.timestamp;
+   }
+   ft_fcount++;
+   ft_info2 = strdup(ft_info);
+   ft_ftime = (double) (buf.timestamp.tv_usec + ((buf.timestamp.tv_sec - ft_prevtime2.tv_sec >= 1) ? 1000000 : 0)  - ft_prevtime2.tv_usec);
+   ft_favg += ft_ftime;
+   snprintf(ft_info, 5000 * sizeof(char), "%s %6.d %d %d %.2fms%s", ft_info2, buf.sequence, buf.index, buf.field, ft_ftime/1000, (!(ft_fcount % 7)) ? "\n" : "");
+   free(ft_info2);
 
-   memset(&buf, 0, sizeof(buf));
-   buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-   buf.memory = V4L2_MEMORY_MMAP;
+   ft_prevtime2 = buf.timestamp;
+}
 
-   error = v4l2_ioctl(video_fd, VIDIOC_DQBUF, &buf);
+void source_dummy(int width, int height) {
+   int i, triangpos, triangpos_t=0, triangpos_b=0, offset=0;
+   bool field_ahead = false;
+   uint8_t *src = frame_cap;
+   float step = M_PI/64;
+
+   if (video_buf.field == V4L2_FIELD_TOP) {
+      offset=0;
+   } else if (video_buf.field == V4L2_FIELD_BOTTOM) {
+      offset=1;
+   }
+
+   dummy_pos += step;
+   //dummy_pos = M_PI/4; step = 0; // no animation
+   triangpos = (sinf(dummy_pos)+1)/2*width;
+   if (video_buf.field == V4L2_FIELD_INTERLACED) {
+      if (video_half_feed_rate == 0)
+          video_half_feed_rate = 1;
+      triangpos_t = (sinf(dummy_pos)+1)/2*width;
+      dummy_pos += step;
+      triangpos_b = (sinf(dummy_pos)+1)/2*width;
+   }
+
+   for (i = 0; i < width * height; i+=1, src+=3) {
+      float color = (clamp_float((float)(triangpos - (i%width) + offset)/10, -1, 1)+1)/2;
+      src[0] = 0x10 + color*0xE0;
+      src[1] = 0x10 + color*0xE0;
+      src[2] = 0x10 + color*0xE0;
+
+      // End of a line
+      if ( ((i+1) % width) == 0 ) {
+         triangpos -= 2; //offset should be half of this?
+         triangpos_t -= 1;
+         triangpos_b -= 1;
+         if (video_buf.field == V4L2_FIELD_INTERLACED) {
+            if (field_ahead) {
+               triangpos = triangpos_b;
+               field_ahead = false;
+            } else {
+               triangpos = triangpos_t;
+               field_ahead = true;
+            }
+         }
+      }
+   }
+
+   if(video_buf.field == V4L2_FIELD_TOP) 
+      video_buf.field = V4L2_FIELD_BOTTOM;
+   else if (video_buf.field == V4L2_FIELD_BOTTOM) 
+      video_buf.field = V4L2_FIELD_TOP;
+}
+
+void source_v4l2_normal(int width, int height) {
+   struct v4l2_buffer bufcp;
+   
+   int error;
+
+   // Wait until v4l2 dequees a buffer
+   memset(&video_buf, 0, sizeof(struct v4l2_buffer));
+   video_buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   video_buf.memory = V4L2_MEMORY_MMAP;
+   error = v4l2_ioctl(video_device_fd, VIDIOC_DQBUF, &video_buf);
    if (error != 0)
    {
       printf("VIDIOC_DQBUF failed: %s\n", strerror(errno));
@@ -507,19 +650,329 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_run)(void)
       return;
    }
 
-   src = (uint8_t*)video_buffer[buf.index].start;
-   dst = (uint16_t*)conv_data;
-
-   /* RGB24 to RGB565 */
-   for (i = 0; i < video_format.fmt.pix.width * video_format.fmt.pix.height; i++, src += 3, dst += 1)
-      *dst = ((src[0] >> 3) << 11) | ((src[1] >> 2) << 5) | ((src[2] >> 3) << 0);
-
-   error = v4l2_ioctl(video_fd, VIDIOC_QBUF, &buf);
+   bufcp = video_buf;
+   memcpy( (uint32_t*) frame_cap, (uint8_t*) v4l2_capbuf[video_buf.index].start, video_format.fmt.pix.width * video_format.fmt.pix.height * 3);
+   
+   error = v4l2_ioctl(video_device_fd, VIDIOC_QBUF, &video_buf);
    if (error != 0)
       printf("VIDIOC_QBUF failed: %s\n", strerror(errno));
 
-   VIDEOPROC_CORE_PREFIX(video_refresh_cb)(conv_data, video_format.fmt.pix.width,
-         video_format.fmt.pix.height, video_format.fmt.pix.width * 2);
+   v4l2_frame_times(bufcp);
+}
+
+
+void source_v4l2_alternate_hack(int width, int height) {
+   struct v4l2_buffer bufcp;
+   struct v4l2_format fmt;
+   struct v4l2_requestbuffers reqbufs;
+   enum v4l2_buf_type type;
+   
+   int error;
+   uint32_t index;
+
+   // For later, saving time
+   memset(&fmt, 0, sizeof(fmt));
+   fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   error = v4l2_ioctl(video_device_fd, VIDIOC_G_FMT, &fmt);
+   if (error != 0)
+   {
+      printf("VIDIOC_G_FMT failed: %s\n", strerror(errno));
+   }
+
+   // Wait until v4l2 dequees a buffer
+   memset(&video_buf, 0, sizeof(struct v4l2_buffer));
+   video_buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   video_buf.memory = V4L2_MEMORY_MMAP;
+   error = v4l2_ioctl(video_device_fd, VIDIOC_DQBUF, &video_buf);
+   if (error != 0)
+   {
+      printf("VIDIOC_DQBUF failed: %s\n", strerror(errno));
+      VIDEOPROC_CORE_PREFIX(video_refresh_cb)(NULL, 0, 0, 0);
+      return;
+   }
+
+   type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   v4l2_ioctl(video_device_fd, VIDIOC_STREAMOFF, &type);
+
+   //Let's get the data as fast as possible!
+   bufcp = video_buf;
+   memcpy( (uint32_t*) frame_cap, (uint8_t*) v4l2_capbuf[video_buf.index].start, video_format.fmt.pix.width * video_format.fmt.pix.height * 3);
+
+   v4l2_munmap(v4l2_capbuf[0].start, v4l2_capbuf[0].len);
+
+   if (video_buf.field == V4L2_FIELD_TOP)
+       fmt.fmt.pix.field = V4L2_FIELD_BOTTOM;
+   else
+       fmt.fmt.pix.field = V4L2_FIELD_TOP;
+
+   error = v4l2_ioctl(video_device_fd, VIDIOC_S_FMT, &fmt);
+   if (error != 0)
+   {
+      printf("VIDIOC_S_FMT failed: %s\n", strerror(errno));
+   }
+
+   video_format = fmt;
+
+   memset(&reqbufs, 0, sizeof(reqbufs));
+   reqbufs.count = v4l2_ncapbuf_target;
+   reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   reqbufs.memory = V4L2_MEMORY_MMAP;
+
+   error = v4l2_ioctl(video_device_fd, VIDIOC_REQBUFS, &reqbufs);
+   if (error != 0)
+   {
+      printf("VIDIOC_REQBUFS failed: %s\n", strerror(errno));
+   }
+   v4l2_ncapbuf = reqbufs.count;
+   //printf("GOT v4l2_ncapbuf=%ld\n", v4l2_ncapbuf);
+
+   index = 0;
+   memset(&video_buf, 0, sizeof(struct v4l2_buffer));
+   video_buf.index = index;
+   video_buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   video_buf.memory = V4L2_MEMORY_MMAP;
+
+   v4l2_ioctl(video_device_fd, VIDIOC_QUERYBUF, &video_buf);
+   v4l2_capbuf[index].len = video_buf.length;
+   v4l2_capbuf[index].start = v4l2_mmap(NULL, video_buf.length,
+         PROT_READ|PROT_WRITE, MAP_SHARED, video_device_fd, video_buf.m.offset);
+   memset(&video_buf, 0, sizeof(struct v4l2_buffer));
+
+   video_buf.index = index;
+   video_buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   video_buf.memory = V4L2_MEMORY_MMAP;
+
+   v4l2_ioctl(video_device_fd, VIDIOC_QBUF,& video_buf);
+
+   //error = v4l2_ioctl(video_device_fd, VIDIOC_QBUF, &video_buf);
+   //if (error != 0)
+   //   printf("VIDIOC_QBUF failed: %s\n", strerror(errno));
+
+   type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+   error = v4l2_ioctl(video_device_fd, VIDIOC_STREAMON, &type);
+   if (error != 0)
+   {
+      printf("VIDIOC_STREAMON failed: %s\n", strerror(errno));
+   }
+
+   v4l2_frame_times(bufcp);
+}
+
+void processing_heal(uint8_t *src, int width, int height) {
+   uint32_t *fp1 = frame_prev1;
+   for (int i = 0; i < width * height; i+=1, src += 3, ++fp1) {
+      // Tries to filter a bunch of blanked out scanline sections my capture cards spits out with this crazy hack
+      // Since the blanked out scanlines are set to a black value bellow anything that can be captued, it's quite
+      //easy to select the scanlines...
+      if (src[0] <= 0 && src[1] <= 0 && src[2] <= 0 && i >= width && i <= width * height - width) {
+         if (*(src + 0 - width*3) >= ((*fp1>> 0&0xFF)-6) && \
+             *(src + 1 - width*3) >= ((*fp1>> 8&0xFF)-6) && \
+             *(src + 2 - width*3) >= ((*fp1>>16&0xFF)-6) && \
+             *(src + 0 - width*3) <= ((*fp1>> 0&0xFF)+6) && \
+             *(src + 1 - width*3) <= ((*fp1>> 8&0xFF)+6) && \
+             *(src + 2 - width*3) <= ((*fp1>>16&0xFF)+6)) {
+            src[0] = (*fp1>> 0&0xFF);
+            src[1] = (*fp1>> 8&0xFF);
+            src[2] = (*fp1>>16&0xFF);
+         } else {
+            src[0] = (*(fp1+i+width)>> 0&0xFF);
+            src[1] = (*(fp1+i+width)>> 8&0xFF);
+            src[2] = (*(fp1+i+width)>>16&0xFF);
+         }
+      }
+   }
+}
+
+void processing_deinterlacing_crap(uint32_t *src, uint32_t *dst, int width, int height, enum v4l2_field field, int skip_lines_src) {
+   int i, targetrow=0;
+   uint32_t pixacul=0;
+   uint32_t *fp1 = frame_prev1, *fp2 = frame_prev2, *fp3 = frame_prev3;
+
+   // Helps pointing to the pixel in the adjacent row
+   if (field == V4L2_FIELD_TOP)
+      targetrow = width;
+   else
+      targetrow = width*-1;
+
+   // Starts from the even scanline if frame contains bottom fields
+   //On progressive sources, should only skip the destination lines, since all lines the source are the same fields
+   //On interlaced sources, should skip both the source and the destination lines, since only half the lines in the source are the same fields (must also skip fields later)
+   if (field == V4L2_FIELD_BOTTOM) {
+      dst += width;
+      if (skip_lines_src == 1) {
+         src += width;
+         fp1 += width;
+         fp2 += width;
+         fp3 += width;
+      }
+   }
+
+   for (i = 0; i < width * height; i+=1, src += 1, dst += 1, ++fp1, ++fp2, ++fp3) {
+      // Will fill the current destination line with current field
+      //The masking is used to prserve some information set by the
+      //deinterlacing process, uses the alpha channel to tell if a
+      //pixel needs further processing...
+      *(dst) =  (*(src) & 0x00FFFFFF) | (*dst & 0xFF000000);
+
+      // Crappy deinterlacing
+      if (i >= width && i <= (width*height-width)) {
+         pixacul=((((*(dst)>> 0&0xFF) + (pixacul>> 0&0xFF))>>1<<0 |\
+                   ((*(dst)>> 8&0xFF) + (pixacul>> 8&0xFF))>>1<<8 |\
+                   ((*(dst)>>16&0xFF) + (pixacul>>16&0xFF))>>1<<16) \
+                   & 0x00FFFFFF) | 0xFE000000;
+
+         if ( ((*(dst          ) & 0xFF000000) == 0xFE000000) ||\
+              ((*(dst+targetrow) & 0xFF000000) == 0xFE000000) )  {
+            *dst = pixacul | 0xFF000000;
+            *(dst+targetrow) = pixacul | 0xFF000000;
+         } else {
+            if (!(((*(src+0)>> 0&0xFF) >= ((*(fp2+0)>> 0&0xFF)-9) ) &&\
+                  ((*(src+0)>> 8&0xFF) >= ((*(fp2+0)>> 8&0xFF)-9) ) &&\
+                  ((*(src+0)>>16&0xFF) >= ((*(fp2+0)>>16&0xFF)-9) ) &&\
+                  ((*(src+0)>> 0&0xFF) <= ((*(fp2+0)>> 0&0xFF)+9) ) &&\
+                  ((*(src+0)>> 8&0xFF) <= ((*(fp2+0)>> 8&0xFF)+9) ) &&\
+                  ((*(src+0)>>16&0xFF) <= ((*(fp2+0)>>16&0xFF)+9) )) ) {
+               *(dst+targetrow) = pixacul;
+            } else if (!(((*fp3>> 0&0xFF) >= ((*fp1>> 0&0xFF)-9) ) &&\
+                         ((*fp3>> 8&0xFF) >= ((*fp1>> 8&0xFF)-9) ) &&\
+                         ((*fp3>>16&0xFF) >= ((*fp1>>16&0xFF)-9) ) &&\
+                         ((*fp3>> 0&0xFF) <= ((*fp1>> 0&0xFF)+9) ) &&\
+                         ((*fp3>> 8&0xFF) <= ((*fp1>> 8&0xFF)+9) ) &&\
+                         ((*fp3>>16&0xFF) <= ((*fp1>>16&0xFF)+9) ))) {
+               *(dst+targetrow) = pixacul;
+            }
+         }
+      }
+
+      // Skips a scanline if we reach the end of the current one
+      //On progressive sources, should only skip the destination lines,
+      //On interlaced sources, should skip both the source and the destination lines 
+      if ( ((i+1) % width) == 0 ) {
+         dst += width;
+         if (skip_lines_src == 1) {
+            src += width;
+            fp1 += width;
+            fp2 += width;
+            fp3 += width;
+         }
+      }
+   }
+}
+
+void processing_bgr_xrgb(uint8_t *src, uint32_t *dst, int width, int height) {
+   /* BGR24 to XRGB8888 conversion */
+   for (int i = 0; i < width * height; i+=1, src += 3, dst += 1) {
+      *dst = 0xFF << 24 | src[2] << 16 | src[1] << 8 | src[0] << 0;
+   }
+}
+
+RETRO_API void VIDEOPROC_CORE_PREFIX(retro_run)(void)
+{
+   uint32_t *aux;
+   struct retro_variable videodev    = { "videoproc_videodev", NULL };
+   struct retro_variable audiodev    = { "videoproc_audiodev", NULL };
+   struct retro_variable capturemode = { "videoproc_capture_mode", NULL };
+   struct retro_variable outputmode  = { "videoproc_output_mode", NULL };
+   struct retro_variable frametimes  = { "videoproc_frame_times", NULL };
+   bool updated = false;
+
+   if (VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE, &updated) && updated) {
+      VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &videodev);
+      VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &audiodev);
+      VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &capturemode);
+      VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &outputmode);
+      VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &frametimes);
+      // Video or Audio device(s) has(ve) been changed
+      //TODO We may get away without reseting devices when changing output mode...
+      if ((videodev.value    && (strcmp(video_device, videodev.value) != 0)) ||\
+          (audiodev.value    && (strcmp(audio_device, audiodev.value) != 0)) ||\
+          (capturemode.value && (strcmp(video_capture_mode, capturemode.value) != 0)) ||\
+          (outputmode.value  && (strcmp(video_output_mode,  outputmode.value)  != 0))) {
+          VIDEOPROC_CORE_PREFIX(retro_unload_game)();
+          // This core does not cares for the retro_game_info * argument?
+          VIDEOPROC_CORE_PREFIX(retro_load_game)(NULL); 
+      }
+
+      if (frametimes.value != NULL) {
+         strncpy(video_frame_times, frametimes.value, ENVVAR_BUFLEN-1);
+      }
+   }
+
+   VIDEOPROC_CORE_PREFIX(input_poll_cb)();
+
+   //printf("%d %d %d %s\n", video_cap_width, video_cap_height, video_buf.field, video_output_mode);
+   //TODO pass frame_curr to source_* functions
+   //half_feed_rate allows interlaced intput to be fed at half the calls to this function
+   //where the same frame is then read by the deinterlacer twice, for each field
+   if (video_half_feed_rate == 0) {
+      // Capture
+      if (strcmp(video_device, "dummy") == 0) {
+         source_dummy(video_cap_width, video_cap_height);
+      } else {
+         if (strcmp(video_capture_mode, "alternate_hack") == 0) {
+            source_v4l2_alternate_hack(video_cap_width, video_cap_height);
+            processing_heal(frame_cap, video_cap_width, video_cap_height);
+         } else {
+            source_v4l2_normal(video_cap_width, video_cap_height);
+         }
+      }
+
+      if (video_buf.field == V4L2_FIELD_INTERLACED) 
+         video_half_feed_rate = 1;
+   } else {
+      video_half_feed_rate = 0;
+   }
+
+   // Converts from bgr to xrgb, deinterlacing, final copy to the outpuit buffer (frame_out)
+   //Every frame except frame_cap shall be encoded in xrgb
+   //Every frame except frame_out shall have the same height
+   if (strcmp(video_output_mode, "deinterlaced") == 0) {
+      processing_bgr_xrgb(frame_cap, frame_curr, video_cap_width, video_cap_height);
+      // When deinterlacing a interlaced intput, we need to process both fields of a frame,
+      //one at a time (retro_run needs to be called twice, vide_half_feed_rate prevents the 
+      //source from being read twice...
+      if (strcmp(video_capture_mode, "interlaced") == 0) {
+         enum v4l2_field field_read;
+         if (video_half_feed_rate == 0)
+            field_read = V4L2_FIELD_TOP;
+         else
+            field_read = V4L2_FIELD_BOTTOM;
+         //video_half_feed_rate will allow us to capture the interlaced frame once and run the
+         //deinterlacing algo twice, extracting a given field for each run.
+         processing_deinterlacing_crap(frame_curr, frame_out, video_cap_width, video_cap_height/2, field_read, 1);
+      } else {
+         processing_deinterlacing_crap(frame_curr, frame_out, video_cap_width, video_cap_height, video_buf.field, 0);
+      }
+      aux = frame_prev3;
+      frame_prev3 = frame_prev2;
+      frame_prev2 = frame_prev1;
+      frame_prev1 = frame_curr;
+      frame_curr = aux;
+
+      VIDEOPROC_CORE_PREFIX(video_refresh_cb)(frame_out, video_cap_width,
+         video_out_height, video_cap_width * sizeof(uint32_t));
+   } else if (strcmp(video_capture_mode, "alternate_hack") == 0) {
+      // Case where alternate_hack without deinterlacing would not generate previous frame for processing_heal
+      processing_bgr_xrgb(frame_cap, frame_curr, video_cap_width, video_cap_height);
+      aux = frame_prev3;
+      frame_prev3 = frame_prev2;
+      frame_prev2 = frame_prev1;
+      frame_prev1 = frame_curr;
+      frame_curr = aux;
+
+      aux = frame_out;
+      frame_out = frame_curr;
+
+      VIDEOPROC_CORE_PREFIX(video_refresh_cb)(frame_out, video_cap_width,
+         video_out_height, video_cap_width * sizeof(uint32_t));
+
+      frame_out = aux;
+   } else {
+      processing_bgr_xrgb(frame_cap, frame_out, video_cap_width, video_out_height);
+
+      VIDEOPROC_CORE_PREFIX(video_refresh_cb)(frame_out, video_cap_width,
+         video_out_height, video_cap_width * sizeof(uint32_t));
+   }
 }
 
 RETRO_API size_t VIDEOPROC_CORE_PREFIX(retro_serialize_size)(void)
@@ -545,8 +998,26 @@ RETRO_API void VIDEOPROC_CORE_PREFIX(retro_cheat_set)(unsigned index, bool enabl
 {
 }
 
+static void videoinput_set_control_v4l2( uint32_t id, double val )
+{
+    //struct v4l2_queryctrl query;
+
+    //query.id = id;
+    //if( ioctl( video_device_fd, VIDIOC_QUERYCTRL, &query ) >= 0 && !(query.flags & V4L2_CTRL_FLAG_DISABLED) ) {
+    //    struct v4l2_control control;
+    //    control.id = id;
+    //    control.value = query.minimum + ((int) ((val * ((double) (query.maximum - query.minimum))) + 0.5));
+    //    ioctl( video_device_fd, VIDIOC_S_CTRL, &control );
+    //}
+}
+
 RETRO_API bool VIDEOPROC_CORE_PREFIX(retro_load_game)(const struct retro_game_info *game)
 {
+   struct retro_variable videodev = { "videoproc_videodev", NULL };
+   struct retro_variable audiodev = { "videoproc_audiodev", NULL };
+   struct retro_variable capture_mode = { "videoproc_capture_mode", NULL };
+   struct retro_variable output_mode  = { "videoproc_output_mode", NULL };
+   struct retro_variable frame_times  = { "videoproc_frame_times", NULL };
    enum retro_pixel_format pixel_format;
    struct v4l2_standard std;
    struct v4l2_requestbuffers reqbufs;
@@ -565,154 +1036,323 @@ RETRO_API bool VIDEOPROC_CORE_PREFIX(retro_load_game)(const struct retro_game_in
       return false;
    }
 
-   memset(&fmt, 0, sizeof(fmt));
-   fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+#ifdef HAVE_ALSA
+   if (audio_handle != NULL) {
+       struct retro_audio_callback audio_cb;
+       audio_cb.callback = audio_callback;
+       audio_cb.set_state = audio_set_state;
+       VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK, &audio_cb);
+   }
+#endif
 
-   error = v4l2_ioctl(video_fd, VIDIOC_G_FMT, &fmt);
+   VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &videodev);
+   if (videodev.value == NULL) {
+       close_devices();
+       return false;
+   }
+   strncpy(video_device, videodev.value, ENVVAR_BUFLEN-1);
 
-   if (error != 0)
-   {
-      printf("VIDIOC_G_FMT failed: %s\n", strerror(errno));
-      return false;
+   // Audio device is optional...
+   VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &audiodev);
+   if (audiodev.value != NULL) {
+      strncpy(audio_device, audiodev.value, ENVVAR_BUFLEN-1);
    }
 
-   fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB24;
-   error = v4l2_ioctl(video_fd, VIDIOC_S_FMT, &fmt);
-   if (error != 0)
-   {
-      printf("VIDIOC_S_FMT failed: %s\n", strerror(errno));
-      return false;
+   VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &capture_mode);
+   VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &output_mode);
+   if (capture_mode.value == NULL || output_mode.value == NULL) {
+       close_devices();
+       return false;
+   }
+   strncpy(video_capture_mode, capture_mode.value, ENVVAR_BUFLEN-1);
+   strncpy(video_output_mode, output_mode.value, ENVVAR_BUFLEN-1);
+
+   VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_GET_VARIABLE, &frame_times);
+   if (frame_times.value != NULL) {
+      strncpy(video_frame_times, frame_times.value, ENVVAR_BUFLEN-1);
    }
 
-   error = v4l2_ioctl(video_fd, VIDIOC_G_STD, &std_id);
-   if (error != 0)
-   {
-      printf("VIDIOC_G_STD failed: %s\n", strerror(errno));
-      return false;
-   }
-   for (index = 0, std_found = false; ; index++)
-   {
-      memset(&std, 0, sizeof(std));
-      std.index = index;
-      error = v4l2_ioctl(video_fd, VIDIOC_ENUMSTD, &std);
-      if (error)
-         break;
-      if (std.id == std_id)
-      {
-         video_standard = std;
-         std_found = true;
+   if (strcmp(video_device, "dummy") == 0) {
+      if (strcmp(video_capture_mode, "interlaced") == 0) {
+          video_format.fmt.pix.height = 480;
+          video_cap_height = 480;
+          video_buf.field = V4L2_FIELD_INTERLACED;
+      } else if (strcmp(video_capture_mode, "alternate") == 0 ||\
+                 strcmp(video_capture_mode, "top") == 0 ||\
+                 strcmp(video_capture_mode, "bottom") == 0 ||\
+                 strcmp(video_capture_mode, "alternate_hack") == 0) {
+          video_format.fmt.pix.height = 240;
+          video_cap_height = 240;
+          video_buf.field = V4L2_FIELD_TOP;
       }
-      printf("VIDIOC_ENUMSTD[%u]: %s%s\n", index, std.name, std.id == std_id ? " [*]" : "");
-   }
-   if (!std_found)
-   {
-      printf("VIDIOC_ENUMSTD did not contain std ID %08x\n", (unsigned)std_id);
-      return false;
-   }
 
-   video_format = fmt;
+      dummy_pos=0;
+      video_format.fmt.pix.width = 640;
+      video_cap_width = 640;
+   } else {
+      memset(&fmt, 0, sizeof(fmt));
+      fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
-   memset(&reqbufs, 0, sizeof(reqbufs));
-   reqbufs.count = VIDEO_BUFFERS;
-   reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-   reqbufs.memory = V4L2_MEMORY_MMAP;
+      error = v4l2_ioctl(video_device_fd, VIDIOC_G_FMT, &fmt);
 
-   error = v4l2_ioctl(video_fd, VIDIOC_REQBUFS, &reqbufs);
-   if (error != 0)
-   {
-      printf("VIDIOC_REQBUFS failed: %s\n", strerror(errno));
-      return false;
-   }
-   video_nbuffers = reqbufs.count;
-
-   for (index = 0; index < video_nbuffers; index++)
-   {
-      memset(&buf, 0, sizeof(buf));
-      buf.index = index;
-      buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-      buf.memory = V4L2_MEMORY_MMAP;
-
-      error = v4l2_ioctl(video_fd, VIDIOC_QUERYBUF, &buf);
       if (error != 0)
       {
-         printf("VIDIOC_QUERYBUF failed for %u: %s\n", index, strerror(errno));
+         printf("VIDIOC_G_FMT failed: %s\n", strerror(errno));
          return false;
       }
 
-      video_buffer[index].len = buf.length;
-      video_buffer[index].start = v4l2_mmap(NULL, buf.length,
-            PROT_READ|PROT_WRITE, MAP_SHARED, video_fd, buf.m.offset);
-      if (video_buffer[index].start == MAP_FAILED)
-      {
-         printf("v4l2_mmap failed: %s\n", strerror(errno));
-         return false;
+      fmt.fmt.pix.pixelformat = V4L2_PIX_FMT_BGR24;
+      fmt.fmt.pix.colorspace = V4L2_COLORSPACE_REC709;
+      fmt.fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
+      fmt.fmt.pix.quantization = V4L2_QUANTIZATION_LIM_RANGE;
+
+      fmt.fmt.pix.height = 240;
+      fmt.fmt.pix.field = V4L2_FIELD_TOP;
+              
+      //TODO Query the size and FPS
+      if (strcmp(video_capture_mode, "interlaced") == 0) {
+         v4l2_ncapbuf_target = 2;
+         fmt.fmt.pix.field = V4L2_FIELD_INTERLACED;
+         video_format.fmt.pix.height = 480;
+         video_cap_height = 480;
+      } else {
+         v4l2_ncapbuf_target = 2;
+         video_format.fmt.pix.height = 240;
+         video_cap_height = 240;
+         if (strcmp(video_capture_mode, "alternate") == 0)
+            fmt.fmt.pix.field = V4L2_FIELD_ALTERNATE;
+         else if (strcmp(video_capture_mode, "top") == 0)
+            fmt.fmt.pix.field = V4L2_FIELD_TOP;
+         else if (strcmp(video_capture_mode, "bottom") == 0)
+            fmt.fmt.pix.field = V4L2_FIELD_BOTTOM;
+         else if (strcmp(video_capture_mode, "alternate_hack") == 0) {
+            fmt.fmt.pix.field = V4L2_FIELD_TOP;
+            v4l2_ncapbuf_target = 1;
+         }
       }
-   }
 
-   for (index = 0; index < video_nbuffers; index++)
-   {
-      memset(&buf, 0, sizeof(buf));
-      buf.index = index;
-      buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-      buf.memory = V4L2_MEMORY_MMAP;
+      video_format.fmt.pix.width = 720;
+      video_cap_width = 720;
 
-      error = v4l2_ioctl(video_fd, VIDIOC_QBUF, &buf);
+      error = v4l2_ioctl(video_device_fd, VIDIOC_S_FMT, &fmt);
       if (error != 0)
       {
-         printf("VIDIOC_QBUF failed for %u: %s\n", index, strerror(errno));
+         printf("VIDIOC_S_FMT failed: %s\n", strerror(errno));
          return false;
       }
+
+      error = v4l2_ioctl(video_device_fd, VIDIOC_G_STD, &std_id);
+      if (error != 0)
+      {
+         printf("VIDIOC_G_STD failed: %s\n", strerror(errno));
+         return false;
+      }
+      for (index = 0, std_found = false; ; index++)
+      {
+         memset(&std, 0, sizeof(std));
+         std.index = index;
+         error = v4l2_ioctl(video_device_fd, VIDIOC_ENUMSTD, &std);
+         if (error)
+            break;
+         if (std.id == std_id)
+         {
+            video_standard = std;
+            std_found = true;
+         }
+         printf("VIDIOC_ENUMSTD[%u]: %s%s\n", index, std.name, std.id == std_id ? " [*]" : "");
+      }
+      if (!std_found)
+      {
+         printf("VIDIOC_ENUMSTD did not contain std ID %08x\n", (unsigned)std_id);
+         return false;
+      }
+
+      video_format = fmt;
+      //TODO Check if what we got is indeed what we asked for
+
+      memset(&reqbufs, 0, sizeof(reqbufs));
+      reqbufs.count = v4l2_ncapbuf_target;
+      reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+      reqbufs.memory = V4L2_MEMORY_MMAP;
+
+      error = v4l2_ioctl(video_device_fd, VIDIOC_REQBUFS, &reqbufs);
+      if (error != 0)
+      {
+         printf("VIDIOC_REQBUFS failed: %s\n", strerror(errno));
+         return false;
+      }
+      v4l2_ncapbuf = reqbufs.count;
+      printf("GOT v4l2_ncapbuf=%ld\n", v4l2_ncapbuf);
+
+      for (index = 0; index < v4l2_ncapbuf; index++)
+      {
+         memset(&buf, 0, sizeof(buf));
+         buf.index = index;
+         buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+         buf.memory = V4L2_MEMORY_MMAP;
+
+         error = v4l2_ioctl(video_device_fd, VIDIOC_QUERYBUF, &buf);
+         if (error != 0)
+         {
+            printf("VIDIOC_QUERYBUF failed for %u: %s\n", index, strerror(errno));
+            return false;
+         }
+
+         v4l2_capbuf[index].len = buf.length;
+         v4l2_capbuf[index].start = v4l2_mmap(NULL, buf.length,
+               PROT_READ|PROT_WRITE, MAP_SHARED, video_device_fd, buf.m.offset);
+         if (v4l2_capbuf[index].start == MAP_FAILED)
+         {
+            printf("v4l2_mmap failed: %s\n", strerror(errno));
+            return false;
+         }
+      }
+
+      for (index = 0; index < v4l2_ncapbuf; index++)
+      {
+         memset(&buf, 0, sizeof(buf));
+         buf.index = index;
+         buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+         buf.memory = V4L2_MEMORY_MMAP;
+
+         error = v4l2_ioctl(video_device_fd, VIDIOC_QBUF, &buf);
+         if (error != 0)
+         {
+            printf("VIDIOC_QBUF failed for %u: %s\n", index, strerror(errno));
+            return false;
+         }
+      }
+
+      type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+      error = v4l2_ioctl(video_device_fd, VIDIOC_STREAMON, &type);
+      if (error != 0)
+      {
+         printf("VIDIOC_STREAMON failed: %s\n", strerror(errno));
+         return false;
+      }
+
+      //videoinput_set_control_v4l2(V4L2_CID_HUE, (double) 0.4f);
    }
 
-   conv_data = (uint16_t*)calloc(1,
-         video_format.fmt.pix.width * video_format.fmt.pix.height * 2);
-   if (!conv_data)
+   //TODO Framerates?
+   // Each frame should combine both fields into a full frame (if not already captured interlaced), half frame-rate
+   if (strcmp(video_output_mode, "interlaced") == 0) {
+      if (strcmp(video_capture_mode, "interlaced") == 0) {
+         video_out_height = video_cap_height;
+      } else {
+         printf("WARNING: Capture mode %s with output mode %s is not properly supported yet... (Is this even usefull?)\n", \
+                 video_capture_mode, video_output_mode);
+         video_out_height = video_cap_height*2;
+      }
+   // Each frame has one field, full frame-rate
+   } else if (strcmp(video_output_mode, "progressive") == 0) {
+      video_out_height = video_cap_height; 
+   // Each frame has one or both field to be deinterlaced into a full frame (double the lines if one field), full frame-rate
+   } else if (strcmp(video_output_mode, "deinterlaced") == 0) {
+      if (strcmp(video_capture_mode, "interlaced") == 0)
+         video_out_height = video_cap_height;
+      else
+         video_out_height = video_cap_height*2;
+   } else
+      video_out_height = video_cap_height; 
+
+   printf("Capture Resolution %ux%u\n", video_cap_width, video_cap_height);
+   printf("Output Resolution %ux%u\n", video_cap_width, video_out_height);
+
+   frame_cap = calloc(1, video_cap_width * video_cap_height * sizeof(uint8_t) * 3);
+   frame_out = calloc(1, video_cap_width * video_out_height * sizeof(uint32_t));
+   //TODO: Only allocate frames if we are going to use it (for deinterlacing or other filters?)
+   frames[0] = calloc(1, video_cap_width * video_out_height * sizeof(uint32_t));
+   frames[1] = calloc(1, video_cap_width * video_out_height * sizeof(uint32_t));
+   frames[2] = calloc(1, video_cap_width * video_out_height * sizeof(uint32_t));
+   frames[3] = calloc(1, video_cap_width * video_out_height * sizeof(uint32_t));
+
+   frame_curr = frames[0];
+   frame_prev1 = frames[1];
+   frame_prev2 = frames[2];
+   frame_prev3 = frames[3];
+
+   //TODO: Check frames[] allocation
+   if (!frame_out || !frame_cap)
    {
-      printf("Cannot allocate conversion buffer\n");
+      printf("Cannot allocate buffers\n");
       return false;
    }
 
-   printf("Allocated %u byte conversion buffer\n",
-         video_format.fmt.pix.width * video_format.fmt.pix.height * 2);
+   printf("Allocated %lu byte conversion buffer\n",
+         video_cap_width * video_cap_height * sizeof(uint32_t));
 
-   pixel_format = RETRO_PIXEL_FORMAT_RGB565;
+   pixel_format = RETRO_PIXEL_FORMAT_XRGB8888;
    if (!VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_SET_PIXEL_FORMAT, &pixel_format))
    {
       printf("Cannot set pixel format\n");
       return false;
    }
 
-   type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-   error = v4l2_ioctl(video_fd, VIDIOC_STREAMON, &type);
-   if (error != 0)
-   {
-      printf("VIDIOC_STREAMON failed: %s\n", strerror(errno));
-      return false;
-   }
-
    return true;
 }
 
 RETRO_API void VIDEOPROC_CORE_PREFIX(retro_unload_game)(void)
 {
+   struct v4l2_requestbuffers reqbufs;
 
-   if (video_fd != -1)
+#ifdef HAVE_ALSA
+   if (audio_handle != NULL) {
+       VIDEOPROC_CORE_PREFIX(environment_cb)(RETRO_ENVIRONMENT_SET_AUDIO_CALLBACK, NULL);
+   }
+#endif
+
+   if ((strcmp(video_device, "dummy") != 0) && (video_device_fd != -1))
    {
       uint32_t index;
       enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-      int               error = v4l2_ioctl(video_fd, VIDIOC_STREAMOFF, &type);
+      int               error = v4l2_ioctl(video_device_fd, VIDIOC_STREAMOFF, &type);
       if (error != 0)
          printf("VIDIOC_STREAMOFF failed: %s\n", strerror(errno));
 
-      for (index = 0; index < video_nbuffers; index++)
-         v4l2_munmap(video_buffer[index].start, video_buffer[index].len);
+      for (index = 0; index < v4l2_ncapbuf; index++)
+         v4l2_munmap(v4l2_capbuf[index].start, v4l2_capbuf[index].len);
+
+      reqbufs.count = 0;
+      reqbufs.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+      reqbufs.memory = V4L2_MEMORY_MMAP;
+      error = v4l2_ioctl(video_device_fd, VIDIOC_REQBUFS, &reqbufs);
+      if (error != 0)
+         printf("VIDIOC_REQBUFS failed: %s\n", strerror(errno));
+
    }
 
-   if (conv_data)
-      free(conv_data);
-   conv_data = NULL;
+   if (frame_out)
+      free(frame_out);
+   frame_out = NULL;
+
+   if (frame_cap)
+      free(frame_cap);
+   frame_cap = NULL;
+
+   for (int i=0; i<4; ++i) {
+      if (frames[i])
+         free(frames[i]);
+      frames[i] = NULL;
+   }
+   frame_curr = NULL;
+   frame_prev1 = NULL;
+   frame_prev2 = NULL;
+   frame_prev3 = NULL;
+
+   if (ft_info) {
+      free(ft_info);
+      ft_info = NULL;
+   }
+
+   if (ft_info2) {
+      free(ft_info2);
+      ft_info2 = NULL;
+   }
 
    close_devices();
+   video_device[0] = '\0';
+   audio_device[0] = '\0';
 }
 
 RETRO_API bool VIDEOPROC_CORE_PREFIX(retro_load_game_special)(unsigned game_type,
diff --git a/deps/discord-rpc/src/discord_register_win.cpp b/deps/discord-rpc/src/discord_register_win.cpp
index e441318dd5..60b1db3e08 100644
--- a/deps/discord-rpc/src/discord_register_win.cpp
+++ b/deps/discord-rpc/src/discord_register_win.cpp
@@ -77,22 +77,22 @@ static void Discord_RegisterW(const wchar_t* applicationId, const wchar_t* comma
     wchar_t openCommand[1024];
 
     if (command && command[0]) {
-        StringCbPrintfW(openCommand, sizeof(openCommand), L"%s", command);
+        StringCbPrintfW(openCommand, sizeof(openCommand), L"%S", command);
     }
     else {
         // StringCbCopyW(openCommand, sizeof(openCommand), exeFilePath);
-        StringCbPrintfW(openCommand, sizeof(openCommand), L"%s", exeFilePath);
+        StringCbPrintfW(openCommand, sizeof(openCommand), L"%S", exeFilePath);
     }
 
     wchar_t protocolName[64];
-    StringCbPrintfW(protocolName, sizeof(protocolName), L"discord-%s", applicationId);
+    StringCbPrintfW(protocolName, sizeof(protocolName), L"discord-%S", applicationId);
     wchar_t protocolDescription[128];
     StringCbPrintfW(
-      protocolDescription, sizeof(protocolDescription), L"URL:Run game %s protocol", applicationId);
+      protocolDescription, sizeof(protocolDescription), L"URL:Run game %S protocol", applicationId);
     wchar_t urlProtocol = 0;
 
     wchar_t keyName[256];
-    StringCbPrintfW(keyName, sizeof(keyName), L"Software\\Classes\\%s", protocolName);
+    StringCbPrintfW(keyName, sizeof(keyName), L"Software\\Classes\\%S", protocolName);
     HKEY key;
     auto status =
       RegCreateKeyExW(HKEY_CURRENT_USER, keyName, 0, nullptr, 0, KEY_WRITE, nullptr, &key, nullptr);
diff --git a/deps/mbedtls/asn1write.c b/deps/mbedtls/asn1write.c
index 69b61b205f..d7a1e33f7e 100644
--- a/deps/mbedtls/asn1write.c
+++ b/deps/mbedtls/asn1write.c
@@ -345,7 +345,7 @@ mbedtls_asn1_named_data *mbedtls_asn1_store_named_data( mbedtls_asn1_named_data
             return( NULL );
 
         cur->oid.len = oid_len;
-        cur->oid.p = mbedtls_calloc( 1, oid_len );
+        cur->oid.p   = (unsigned char*)(unsigned char*)(unsigned char*)(unsigned char*)(unsigned char*)(unsigned char*)(unsigned char*)(unsigned char*)(unsigned char*)mbedtls_calloc( 1, oid_len );
         if( cur->oid.p == NULL )
         {
             mbedtls_free( cur );
@@ -355,7 +355,7 @@ mbedtls_asn1_named_data *mbedtls_asn1_store_named_data( mbedtls_asn1_named_data
         memcpy( cur->oid.p, oid, oid_len );
 
         cur->val.len = val_len;
-        cur->val.p = mbedtls_calloc( 1, val_len );
+        cur->val.p   = (unsigned char*)mbedtls_calloc( 1, val_len );
         if( cur->val.p == NULL )
         {
             mbedtls_free( cur->oid.p );
@@ -378,7 +378,7 @@ mbedtls_asn1_named_data *mbedtls_asn1_store_named_data( mbedtls_asn1_named_data
             return( NULL );
 
         mbedtls_free( cur->val.p );
-        cur->val.p = p;
+        cur->val.p   = (unsigned char*)p;
         cur->val.len = val_len;
     }
 
diff --git a/deps/mbedtls/blowfish.c b/deps/mbedtls/blowfish.c
index 5f97f77122..e11f186067 100644
--- a/deps/mbedtls/blowfish.c
+++ b/deps/mbedtls/blowfish.c
@@ -73,7 +73,264 @@ static const uint32_t P[MBEDTLS_BLOWFISH_ROUNDS + 2] = {
 };
 
 /* declarations of data at the end of this file */
-static const uint32_t S[4][256];
+static const uint32_t S[4][256] = {
+    {   0xD1310BA6L, 0x98DFB5ACL, 0x2FFD72DBL, 0xD01ADFB7L,
+        0xB8E1AFEDL, 0x6A267E96L, 0xBA7C9045L, 0xF12C7F99L,
+        0x24A19947L, 0xB3916CF7L, 0x0801F2E2L, 0x858EFC16L,
+        0x636920D8L, 0x71574E69L, 0xA458FEA3L, 0xF4933D7EL,
+        0x0D95748FL, 0x728EB658L, 0x718BCD58L, 0x82154AEEL,
+        0x7B54A41DL, 0xC25A59B5L, 0x9C30D539L, 0x2AF26013L,
+        0xC5D1B023L, 0x286085F0L, 0xCA417918L, 0xB8DB38EFL,
+        0x8E79DCB0L, 0x603A180EL, 0x6C9E0E8BL, 0xB01E8A3EL,
+        0xD71577C1L, 0xBD314B27L, 0x78AF2FDAL, 0x55605C60L,
+        0xE65525F3L, 0xAA55AB94L, 0x57489862L, 0x63E81440L,
+        0x55CA396AL, 0x2AAB10B6L, 0xB4CC5C34L, 0x1141E8CEL,
+        0xA15486AFL, 0x7C72E993L, 0xB3EE1411L, 0x636FBC2AL,
+        0x2BA9C55DL, 0x741831F6L, 0xCE5C3E16L, 0x9B87931EL,
+        0xAFD6BA33L, 0x6C24CF5CL, 0x7A325381L, 0x28958677L,
+        0x3B8F4898L, 0x6B4BB9AFL, 0xC4BFE81BL, 0x66282193L,
+        0x61D809CCL, 0xFB21A991L, 0x487CAC60L, 0x5DEC8032L,
+        0xEF845D5DL, 0xE98575B1L, 0xDC262302L, 0xEB651B88L,
+        0x23893E81L, 0xD396ACC5L, 0x0F6D6FF3L, 0x83F44239L,
+        0x2E0B4482L, 0xA4842004L, 0x69C8F04AL, 0x9E1F9B5EL,
+        0x21C66842L, 0xF6E96C9AL, 0x670C9C61L, 0xABD388F0L,
+        0x6A51A0D2L, 0xD8542F68L, 0x960FA728L, 0xAB5133A3L,
+        0x6EEF0B6CL, 0x137A3BE4L, 0xBA3BF050L, 0x7EFB2A98L,
+        0xA1F1651DL, 0x39AF0176L, 0x66CA593EL, 0x82430E88L,
+        0x8CEE8619L, 0x456F9FB4L, 0x7D84A5C3L, 0x3B8B5EBEL,
+        0xE06F75D8L, 0x85C12073L, 0x401A449FL, 0x56C16AA6L,
+        0x4ED3AA62L, 0x363F7706L, 0x1BFEDF72L, 0x429B023DL,
+        0x37D0D724L, 0xD00A1248L, 0xDB0FEAD3L, 0x49F1C09BL,
+        0x075372C9L, 0x80991B7BL, 0x25D479D8L, 0xF6E8DEF7L,
+        0xE3FE501AL, 0xB6794C3BL, 0x976CE0BDL, 0x04C006BAL,
+        0xC1A94FB6L, 0x409F60C4L, 0x5E5C9EC2L, 0x196A2463L,
+        0x68FB6FAFL, 0x3E6C53B5L, 0x1339B2EBL, 0x3B52EC6FL,
+        0x6DFC511FL, 0x9B30952CL, 0xCC814544L, 0xAF5EBD09L,
+        0xBEE3D004L, 0xDE334AFDL, 0x660F2807L, 0x192E4BB3L,
+        0xC0CBA857L, 0x45C8740FL, 0xD20B5F39L, 0xB9D3FBDBL,
+        0x5579C0BDL, 0x1A60320AL, 0xD6A100C6L, 0x402C7279L,
+        0x679F25FEL, 0xFB1FA3CCL, 0x8EA5E9F8L, 0xDB3222F8L,
+        0x3C7516DFL, 0xFD616B15L, 0x2F501EC8L, 0xAD0552ABL,
+        0x323DB5FAL, 0xFD238760L, 0x53317B48L, 0x3E00DF82L,
+        0x9E5C57BBL, 0xCA6F8CA0L, 0x1A87562EL, 0xDF1769DBL,
+        0xD542A8F6L, 0x287EFFC3L, 0xAC6732C6L, 0x8C4F5573L,
+        0x695B27B0L, 0xBBCA58C8L, 0xE1FFA35DL, 0xB8F011A0L,
+        0x10FA3D98L, 0xFD2183B8L, 0x4AFCB56CL, 0x2DD1D35BL,
+        0x9A53E479L, 0xB6F84565L, 0xD28E49BCL, 0x4BFB9790L,
+        0xE1DDF2DAL, 0xA4CB7E33L, 0x62FB1341L, 0xCEE4C6E8L,
+        0xEF20CADAL, 0x36774C01L, 0xD07E9EFEL, 0x2BF11FB4L,
+        0x95DBDA4DL, 0xAE909198L, 0xEAAD8E71L, 0x6B93D5A0L,
+        0xD08ED1D0L, 0xAFC725E0L, 0x8E3C5B2FL, 0x8E7594B7L,
+        0x8FF6E2FBL, 0xF2122B64L, 0x8888B812L, 0x900DF01CL,
+        0x4FAD5EA0L, 0x688FC31CL, 0xD1CFF191L, 0xB3A8C1ADL,
+        0x2F2F2218L, 0xBE0E1777L, 0xEA752DFEL, 0x8B021FA1L,
+        0xE5A0CC0FL, 0xB56F74E8L, 0x18ACF3D6L, 0xCE89E299L,
+        0xB4A84FE0L, 0xFD13E0B7L, 0x7CC43B81L, 0xD2ADA8D9L,
+        0x165FA266L, 0x80957705L, 0x93CC7314L, 0x211A1477L,
+        0xE6AD2065L, 0x77B5FA86L, 0xC75442F5L, 0xFB9D35CFL,
+        0xEBCDAF0CL, 0x7B3E89A0L, 0xD6411BD3L, 0xAE1E7E49L,
+        0x00250E2DL, 0x2071B35EL, 0x226800BBL, 0x57B8E0AFL,
+        0x2464369BL, 0xF009B91EL, 0x5563911DL, 0x59DFA6AAL,
+        0x78C14389L, 0xD95A537FL, 0x207D5BA2L, 0x02E5B9C5L,
+        0x83260376L, 0x6295CFA9L, 0x11C81968L, 0x4E734A41L,
+        0xB3472DCAL, 0x7B14A94AL, 0x1B510052L, 0x9A532915L,
+        0xD60F573FL, 0xBC9BC6E4L, 0x2B60A476L, 0x81E67400L,
+        0x08BA6FB5L, 0x571BE91FL, 0xF296EC6BL, 0x2A0DD915L,
+        0xB6636521L, 0xE7B9F9B6L, 0xFF34052EL, 0xC5855664L,
+        0x53B02D5DL, 0xA99F8FA1L, 0x08BA4799L, 0x6E85076AL   },
+    {   0x4B7A70E9L, 0xB5B32944L, 0xDB75092EL, 0xC4192623L,
+        0xAD6EA6B0L, 0x49A7DF7DL, 0x9CEE60B8L, 0x8FEDB266L,
+        0xECAA8C71L, 0x699A17FFL, 0x5664526CL, 0xC2B19EE1L,
+        0x193602A5L, 0x75094C29L, 0xA0591340L, 0xE4183A3EL,
+        0x3F54989AL, 0x5B429D65L, 0x6B8FE4D6L, 0x99F73FD6L,
+        0xA1D29C07L, 0xEFE830F5L, 0x4D2D38E6L, 0xF0255DC1L,
+        0x4CDD2086L, 0x8470EB26L, 0x6382E9C6L, 0x021ECC5EL,
+        0x09686B3FL, 0x3EBAEFC9L, 0x3C971814L, 0x6B6A70A1L,
+        0x687F3584L, 0x52A0E286L, 0xB79C5305L, 0xAA500737L,
+        0x3E07841CL, 0x7FDEAE5CL, 0x8E7D44ECL, 0x5716F2B8L,
+        0xB03ADA37L, 0xF0500C0DL, 0xF01C1F04L, 0x0200B3FFL,
+        0xAE0CF51AL, 0x3CB574B2L, 0x25837A58L, 0xDC0921BDL,
+        0xD19113F9L, 0x7CA92FF6L, 0x94324773L, 0x22F54701L,
+        0x3AE5E581L, 0x37C2DADCL, 0xC8B57634L, 0x9AF3DDA7L,
+        0xA9446146L, 0x0FD0030EL, 0xECC8C73EL, 0xA4751E41L,
+        0xE238CD99L, 0x3BEA0E2FL, 0x3280BBA1L, 0x183EB331L,
+        0x4E548B38L, 0x4F6DB908L, 0x6F420D03L, 0xF60A04BFL,
+        0x2CB81290L, 0x24977C79L, 0x5679B072L, 0xBCAF89AFL,
+        0xDE9A771FL, 0xD9930810L, 0xB38BAE12L, 0xDCCF3F2EL,
+        0x5512721FL, 0x2E6B7124L, 0x501ADDE6L, 0x9F84CD87L,
+        0x7A584718L, 0x7408DA17L, 0xBC9F9ABCL, 0xE94B7D8CL,
+        0xEC7AEC3AL, 0xDB851DFAL, 0x63094366L, 0xC464C3D2L,
+        0xEF1C1847L, 0x3215D908L, 0xDD433B37L, 0x24C2BA16L,
+        0x12A14D43L, 0x2A65C451L, 0x50940002L, 0x133AE4DDL,
+        0x71DFF89EL, 0x10314E55L, 0x81AC77D6L, 0x5F11199BL,
+        0x043556F1L, 0xD7A3C76BL, 0x3C11183BL, 0x5924A509L,
+        0xF28FE6EDL, 0x97F1FBFAL, 0x9EBABF2CL, 0x1E153C6EL,
+        0x86E34570L, 0xEAE96FB1L, 0x860E5E0AL, 0x5A3E2AB3L,
+        0x771FE71CL, 0x4E3D06FAL, 0x2965DCB9L, 0x99E71D0FL,
+        0x803E89D6L, 0x5266C825L, 0x2E4CC978L, 0x9C10B36AL,
+        0xC6150EBAL, 0x94E2EA78L, 0xA5FC3C53L, 0x1E0A2DF4L,
+        0xF2F74EA7L, 0x361D2B3DL, 0x1939260FL, 0x19C27960L,
+        0x5223A708L, 0xF71312B6L, 0xEBADFE6EL, 0xEAC31F66L,
+        0xE3BC4595L, 0xA67BC883L, 0xB17F37D1L, 0x018CFF28L,
+        0xC332DDEFL, 0xBE6C5AA5L, 0x65582185L, 0x68AB9802L,
+        0xEECEA50FL, 0xDB2F953BL, 0x2AEF7DADL, 0x5B6E2F84L,
+        0x1521B628L, 0x29076170L, 0xECDD4775L, 0x619F1510L,
+        0x13CCA830L, 0xEB61BD96L, 0x0334FE1EL, 0xAA0363CFL,
+        0xB5735C90L, 0x4C70A239L, 0xD59E9E0BL, 0xCBAADE14L,
+        0xEECC86BCL, 0x60622CA7L, 0x9CAB5CABL, 0xB2F3846EL,
+        0x648B1EAFL, 0x19BDF0CAL, 0xA02369B9L, 0x655ABB50L,
+        0x40685A32L, 0x3C2AB4B3L, 0x319EE9D5L, 0xC021B8F7L,
+        0x9B540B19L, 0x875FA099L, 0x95F7997EL, 0x623D7DA8L,
+        0xF837889AL, 0x97E32D77L, 0x11ED935FL, 0x16681281L,
+        0x0E358829L, 0xC7E61FD6L, 0x96DEDFA1L, 0x7858BA99L,
+        0x57F584A5L, 0x1B227263L, 0x9B83C3FFL, 0x1AC24696L,
+        0xCDB30AEBL, 0x532E3054L, 0x8FD948E4L, 0x6DBC3128L,
+        0x58EBF2EFL, 0x34C6FFEAL, 0xFE28ED61L, 0xEE7C3C73L,
+        0x5D4A14D9L, 0xE864B7E3L, 0x42105D14L, 0x203E13E0L,
+        0x45EEE2B6L, 0xA3AAABEAL, 0xDB6C4F15L, 0xFACB4FD0L,
+        0xC742F442L, 0xEF6ABBB5L, 0x654F3B1DL, 0x41CD2105L,
+        0xD81E799EL, 0x86854DC7L, 0xE44B476AL, 0x3D816250L,
+        0xCF62A1F2L, 0x5B8D2646L, 0xFC8883A0L, 0xC1C7B6A3L,
+        0x7F1524C3L, 0x69CB7492L, 0x47848A0BL, 0x5692B285L,
+        0x095BBF00L, 0xAD19489DL, 0x1462B174L, 0x23820E00L,
+        0x58428D2AL, 0x0C55F5EAL, 0x1DADF43EL, 0x233F7061L,
+        0x3372F092L, 0x8D937E41L, 0xD65FECF1L, 0x6C223BDBL,
+        0x7CDE3759L, 0xCBEE7460L, 0x4085F2A7L, 0xCE77326EL,
+        0xA6078084L, 0x19F8509EL, 0xE8EFD855L, 0x61D99735L,
+        0xA969A7AAL, 0xC50C06C2L, 0x5A04ABFCL, 0x800BCADCL,
+        0x9E447A2EL, 0xC3453484L, 0xFDD56705L, 0x0E1E9EC9L,
+        0xDB73DBD3L, 0x105588CDL, 0x675FDA79L, 0xE3674340L,
+        0xC5C43465L, 0x713E38D8L, 0x3D28F89EL, 0xF16DFF20L,
+        0x153E21E7L, 0x8FB03D4AL, 0xE6E39F2BL, 0xDB83ADF7L   },
+    {   0xE93D5A68L, 0x948140F7L, 0xF64C261CL, 0x94692934L,
+        0x411520F7L, 0x7602D4F7L, 0xBCF46B2EL, 0xD4A20068L,
+        0xD4082471L, 0x3320F46AL, 0x43B7D4B7L, 0x500061AFL,
+        0x1E39F62EL, 0x97244546L, 0x14214F74L, 0xBF8B8840L,
+        0x4D95FC1DL, 0x96B591AFL, 0x70F4DDD3L, 0x66A02F45L,
+        0xBFBC09ECL, 0x03BD9785L, 0x7FAC6DD0L, 0x31CB8504L,
+        0x96EB27B3L, 0x55FD3941L, 0xDA2547E6L, 0xABCA0A9AL,
+        0x28507825L, 0x530429F4L, 0x0A2C86DAL, 0xE9B66DFBL,
+        0x68DC1462L, 0xD7486900L, 0x680EC0A4L, 0x27A18DEEL,
+        0x4F3FFEA2L, 0xE887AD8CL, 0xB58CE006L, 0x7AF4D6B6L,
+        0xAACE1E7CL, 0xD3375FECL, 0xCE78A399L, 0x406B2A42L,
+        0x20FE9E35L, 0xD9F385B9L, 0xEE39D7ABL, 0x3B124E8BL,
+        0x1DC9FAF7L, 0x4B6D1856L, 0x26A36631L, 0xEAE397B2L,
+        0x3A6EFA74L, 0xDD5B4332L, 0x6841E7F7L, 0xCA7820FBL,
+        0xFB0AF54EL, 0xD8FEB397L, 0x454056ACL, 0xBA489527L,
+        0x55533A3AL, 0x20838D87L, 0xFE6BA9B7L, 0xD096954BL,
+        0x55A867BCL, 0xA1159A58L, 0xCCA92963L, 0x99E1DB33L,
+        0xA62A4A56L, 0x3F3125F9L, 0x5EF47E1CL, 0x9029317CL,
+        0xFDF8E802L, 0x04272F70L, 0x80BB155CL, 0x05282CE3L,
+        0x95C11548L, 0xE4C66D22L, 0x48C1133FL, 0xC70F86DCL,
+        0x07F9C9EEL, 0x41041F0FL, 0x404779A4L, 0x5D886E17L,
+        0x325F51EBL, 0xD59BC0D1L, 0xF2BCC18FL, 0x41113564L,
+        0x257B7834L, 0x602A9C60L, 0xDFF8E8A3L, 0x1F636C1BL,
+        0x0E12B4C2L, 0x02E1329EL, 0xAF664FD1L, 0xCAD18115L,
+        0x6B2395E0L, 0x333E92E1L, 0x3B240B62L, 0xEEBEB922L,
+        0x85B2A20EL, 0xE6BA0D99L, 0xDE720C8CL, 0x2DA2F728L,
+        0xD0127845L, 0x95B794FDL, 0x647D0862L, 0xE7CCF5F0L,
+        0x5449A36FL, 0x877D48FAL, 0xC39DFD27L, 0xF33E8D1EL,
+        0x0A476341L, 0x992EFF74L, 0x3A6F6EABL, 0xF4F8FD37L,
+        0xA812DC60L, 0xA1EBDDF8L, 0x991BE14CL, 0xDB6E6B0DL,
+        0xC67B5510L, 0x6D672C37L, 0x2765D43BL, 0xDCD0E804L,
+        0xF1290DC7L, 0xCC00FFA3L, 0xB5390F92L, 0x690FED0BL,
+        0x667B9FFBL, 0xCEDB7D9CL, 0xA091CF0BL, 0xD9155EA3L,
+        0xBB132F88L, 0x515BAD24L, 0x7B9479BFL, 0x763BD6EBL,
+        0x37392EB3L, 0xCC115979L, 0x8026E297L, 0xF42E312DL,
+        0x6842ADA7L, 0xC66A2B3BL, 0x12754CCCL, 0x782EF11CL,
+        0x6A124237L, 0xB79251E7L, 0x06A1BBE6L, 0x4BFB6350L,
+        0x1A6B1018L, 0x11CAEDFAL, 0x3D25BDD8L, 0xE2E1C3C9L,
+        0x44421659L, 0x0A121386L, 0xD90CEC6EL, 0xD5ABEA2AL,
+        0x64AF674EL, 0xDA86A85FL, 0xBEBFE988L, 0x64E4C3FEL,
+        0x9DBC8057L, 0xF0F7C086L, 0x60787BF8L, 0x6003604DL,
+        0xD1FD8346L, 0xF6381FB0L, 0x7745AE04L, 0xD736FCCCL,
+        0x83426B33L, 0xF01EAB71L, 0xB0804187L, 0x3C005E5FL,
+        0x77A057BEL, 0xBDE8AE24L, 0x55464299L, 0xBF582E61L,
+        0x4E58F48FL, 0xF2DDFDA2L, 0xF474EF38L, 0x8789BDC2L,
+        0x5366F9C3L, 0xC8B38E74L, 0xB475F255L, 0x46FCD9B9L,
+        0x7AEB2661L, 0x8B1DDF84L, 0x846A0E79L, 0x915F95E2L,
+        0x466E598EL, 0x20B45770L, 0x8CD55591L, 0xC902DE4CL,
+        0xB90BACE1L, 0xBB8205D0L, 0x11A86248L, 0x7574A99EL,
+        0xB77F19B6L, 0xE0A9DC09L, 0x662D09A1L, 0xC4324633L,
+        0xE85A1F02L, 0x09F0BE8CL, 0x4A99A025L, 0x1D6EFE10L,
+        0x1AB93D1DL, 0x0BA5A4DFL, 0xA186F20FL, 0x2868F169L,
+        0xDCB7DA83L, 0x573906FEL, 0xA1E2CE9BL, 0x4FCD7F52L,
+        0x50115E01L, 0xA70683FAL, 0xA002B5C4L, 0x0DE6D027L,
+        0x9AF88C27L, 0x773F8641L, 0xC3604C06L, 0x61A806B5L,
+        0xF0177A28L, 0xC0F586E0L, 0x006058AAL, 0x30DC7D62L,
+        0x11E69ED7L, 0x2338EA63L, 0x53C2DD94L, 0xC2C21634L,
+        0xBBCBEE56L, 0x90BCB6DEL, 0xEBFC7DA1L, 0xCE591D76L,
+        0x6F05E409L, 0x4B7C0188L, 0x39720A3DL, 0x7C927C24L,
+        0x86E3725FL, 0x724D9DB9L, 0x1AC15BB4L, 0xD39EB8FCL,
+        0xED545578L, 0x08FCA5B5L, 0xD83D7CD3L, 0x4DAD0FC4L,
+        0x1E50EF5EL, 0xB161E6F8L, 0xA28514D9L, 0x6C51133CL,
+        0x6FD5C7E7L, 0x56E14EC4L, 0x362ABFCEL, 0xDDC6C837L,
+        0xD79A3234L, 0x92638212L, 0x670EFA8EL, 0x406000E0L  },
+    {   0x3A39CE37L, 0xD3FAF5CFL, 0xABC27737L, 0x5AC52D1BL,
+        0x5CB0679EL, 0x4FA33742L, 0xD3822740L, 0x99BC9BBEL,
+        0xD5118E9DL, 0xBF0F7315L, 0xD62D1C7EL, 0xC700C47BL,
+        0xB78C1B6BL, 0x21A19045L, 0xB26EB1BEL, 0x6A366EB4L,
+        0x5748AB2FL, 0xBC946E79L, 0xC6A376D2L, 0x6549C2C8L,
+        0x530FF8EEL, 0x468DDE7DL, 0xD5730A1DL, 0x4CD04DC6L,
+        0x2939BBDBL, 0xA9BA4650L, 0xAC9526E8L, 0xBE5EE304L,
+        0xA1FAD5F0L, 0x6A2D519AL, 0x63EF8CE2L, 0x9A86EE22L,
+        0xC089C2B8L, 0x43242EF6L, 0xA51E03AAL, 0x9CF2D0A4L,
+        0x83C061BAL, 0x9BE96A4DL, 0x8FE51550L, 0xBA645BD6L,
+        0x2826A2F9L, 0xA73A3AE1L, 0x4BA99586L, 0xEF5562E9L,
+        0xC72FEFD3L, 0xF752F7DAL, 0x3F046F69L, 0x77FA0A59L,
+        0x80E4A915L, 0x87B08601L, 0x9B09E6ADL, 0x3B3EE593L,
+        0xE990FD5AL, 0x9E34D797L, 0x2CF0B7D9L, 0x022B8B51L,
+        0x96D5AC3AL, 0x017DA67DL, 0xD1CF3ED6L, 0x7C7D2D28L,
+        0x1F9F25CFL, 0xADF2B89BL, 0x5AD6B472L, 0x5A88F54CL,
+        0xE029AC71L, 0xE019A5E6L, 0x47B0ACFDL, 0xED93FA9BL,
+        0xE8D3C48DL, 0x283B57CCL, 0xF8D56629L, 0x79132E28L,
+        0x785F0191L, 0xED756055L, 0xF7960E44L, 0xE3D35E8CL,
+        0x15056DD4L, 0x88F46DBAL, 0x03A16125L, 0x0564F0BDL,
+        0xC3EB9E15L, 0x3C9057A2L, 0x97271AECL, 0xA93A072AL,
+        0x1B3F6D9BL, 0x1E6321F5L, 0xF59C66FBL, 0x26DCF319L,
+        0x7533D928L, 0xB155FDF5L, 0x03563482L, 0x8ABA3CBBL,
+        0x28517711L, 0xC20AD9F8L, 0xABCC5167L, 0xCCAD925FL,
+        0x4DE81751L, 0x3830DC8EL, 0x379D5862L, 0x9320F991L,
+        0xEA7A90C2L, 0xFB3E7BCEL, 0x5121CE64L, 0x774FBE32L,
+        0xA8B6E37EL, 0xC3293D46L, 0x48DE5369L, 0x6413E680L,
+        0xA2AE0810L, 0xDD6DB224L, 0x69852DFDL, 0x09072166L,
+        0xB39A460AL, 0x6445C0DDL, 0x586CDECFL, 0x1C20C8AEL,
+        0x5BBEF7DDL, 0x1B588D40L, 0xCCD2017FL, 0x6BB4E3BBL,
+        0xDDA26A7EL, 0x3A59FF45L, 0x3E350A44L, 0xBCB4CDD5L,
+        0x72EACEA8L, 0xFA6484BBL, 0x8D6612AEL, 0xBF3C6F47L,
+        0xD29BE463L, 0x542F5D9EL, 0xAEC2771BL, 0xF64E6370L,
+        0x740E0D8DL, 0xE75B1357L, 0xF8721671L, 0xAF537D5DL,
+        0x4040CB08L, 0x4EB4E2CCL, 0x34D2466AL, 0x0115AF84L,
+        0xE1B00428L, 0x95983A1DL, 0x06B89FB4L, 0xCE6EA048L,
+        0x6F3F3B82L, 0x3520AB82L, 0x011A1D4BL, 0x277227F8L,
+        0x611560B1L, 0xE7933FDCL, 0xBB3A792BL, 0x344525BDL,
+        0xA08839E1L, 0x51CE794BL, 0x2F32C9B7L, 0xA01FBAC9L,
+        0xE01CC87EL, 0xBCC7D1F6L, 0xCF0111C3L, 0xA1E8AAC7L,
+        0x1A908749L, 0xD44FBD9AL, 0xD0DADECBL, 0xD50ADA38L,
+        0x0339C32AL, 0xC6913667L, 0x8DF9317CL, 0xE0B12B4FL,
+        0xF79E59B7L, 0x43F5BB3AL, 0xF2D519FFL, 0x27D9459CL,
+        0xBF97222CL, 0x15E6FC2AL, 0x0F91FC71L, 0x9B941525L,
+        0xFAE59361L, 0xCEB69CEBL, 0xC2A86459L, 0x12BAA8D1L,
+        0xB6C1075EL, 0xE3056A0CL, 0x10D25065L, 0xCB03A442L,
+        0xE0EC6E0EL, 0x1698DB3BL, 0x4C98A0BEL, 0x3278E964L,
+        0x9F1F9532L, 0xE0D392DFL, 0xD3A0342BL, 0x8971F21EL,
+        0x1B0A7441L, 0x4BA3348CL, 0xC5BE7120L, 0xC37632D8L,
+        0xDF359F8DL, 0x9B992F2EL, 0xE60B6F47L, 0x0FE3F11DL,
+        0xE54CDA54L, 0x1EDAD891L, 0xCE6279CFL, 0xCD3E7E6FL,
+        0x1618B166L, 0xFD2C1D05L, 0x848FD2C5L, 0xF6FB2299L,
+        0xF523F357L, 0xA6327623L, 0x93A83531L, 0x56CCCD02L,
+        0xACF08162L, 0x5A75EBB5L, 0x6E163697L, 0x88D273CCL,
+        0xDE966292L, 0x81B949D0L, 0x4C50901BL, 0x71C65614L,
+        0xE6C6C7BDL, 0x327A140AL, 0x45E1D006L, 0xC3F27B9AL,
+        0xC9AA53FDL, 0x62A80F00L, 0xBB25BFE2L, 0x35BDD2F6L,
+        0x71126905L, 0xB2040222L, 0xB6CBCF7CL, 0xCD769C2BL,
+        0x53113EC0L, 0x1640E3D3L, 0x38ABBD60L, 0x2547ADF0L,
+        0xBA38209CL, 0xF746CE76L, 0x77AFA1C5L, 0x20756060L,
+        0x85CBFE4EL, 0x8AE88DD8L, 0x7AAAF9B0L, 0x4CF9AA7EL,
+        0x1948C25CL, 0x02FB8A8CL, 0x01C36AE4L, 0xD6EBE1F9L,
+        0x90D4F869L, 0xA65CDEA0L, 0x3F09252DL, 0xC208E69FL,
+        0xB74E6132L, 0xCE77E25BL, 0x578FDFE3L, 0x3AC372E6L  }
+};
 
 static uint32_t F( mbedtls_blowfish_context *ctx, uint32_t x )
 {
@@ -390,264 +647,6 @@ int mbedtls_blowfish_crypt_ctr( mbedtls_blowfish_context *ctx,
 }
 #endif /* MBEDTLS_CIPHER_MODE_CTR */
 
-static const uint32_t S[4][256] = {
-    {   0xD1310BA6L, 0x98DFB5ACL, 0x2FFD72DBL, 0xD01ADFB7L,
-        0xB8E1AFEDL, 0x6A267E96L, 0xBA7C9045L, 0xF12C7F99L,
-        0x24A19947L, 0xB3916CF7L, 0x0801F2E2L, 0x858EFC16L,
-        0x636920D8L, 0x71574E69L, 0xA458FEA3L, 0xF4933D7EL,
-        0x0D95748FL, 0x728EB658L, 0x718BCD58L, 0x82154AEEL,
-        0x7B54A41DL, 0xC25A59B5L, 0x9C30D539L, 0x2AF26013L,
-        0xC5D1B023L, 0x286085F0L, 0xCA417918L, 0xB8DB38EFL,
-        0x8E79DCB0L, 0x603A180EL, 0x6C9E0E8BL, 0xB01E8A3EL,
-        0xD71577C1L, 0xBD314B27L, 0x78AF2FDAL, 0x55605C60L,
-        0xE65525F3L, 0xAA55AB94L, 0x57489862L, 0x63E81440L,
-        0x55CA396AL, 0x2AAB10B6L, 0xB4CC5C34L, 0x1141E8CEL,
-        0xA15486AFL, 0x7C72E993L, 0xB3EE1411L, 0x636FBC2AL,
-        0x2BA9C55DL, 0x741831F6L, 0xCE5C3E16L, 0x9B87931EL,
-        0xAFD6BA33L, 0x6C24CF5CL, 0x7A325381L, 0x28958677L,
-        0x3B8F4898L, 0x6B4BB9AFL, 0xC4BFE81BL, 0x66282193L,
-        0x61D809CCL, 0xFB21A991L, 0x487CAC60L, 0x5DEC8032L,
-        0xEF845D5DL, 0xE98575B1L, 0xDC262302L, 0xEB651B88L,
-        0x23893E81L, 0xD396ACC5L, 0x0F6D6FF3L, 0x83F44239L,
-        0x2E0B4482L, 0xA4842004L, 0x69C8F04AL, 0x9E1F9B5EL,
-        0x21C66842L, 0xF6E96C9AL, 0x670C9C61L, 0xABD388F0L,
-        0x6A51A0D2L, 0xD8542F68L, 0x960FA728L, 0xAB5133A3L,
-        0x6EEF0B6CL, 0x137A3BE4L, 0xBA3BF050L, 0x7EFB2A98L,
-        0xA1F1651DL, 0x39AF0176L, 0x66CA593EL, 0x82430E88L,
-        0x8CEE8619L, 0x456F9FB4L, 0x7D84A5C3L, 0x3B8B5EBEL,
-        0xE06F75D8L, 0x85C12073L, 0x401A449FL, 0x56C16AA6L,
-        0x4ED3AA62L, 0x363F7706L, 0x1BFEDF72L, 0x429B023DL,
-        0x37D0D724L, 0xD00A1248L, 0xDB0FEAD3L, 0x49F1C09BL,
-        0x075372C9L, 0x80991B7BL, 0x25D479D8L, 0xF6E8DEF7L,
-        0xE3FE501AL, 0xB6794C3BL, 0x976CE0BDL, 0x04C006BAL,
-        0xC1A94FB6L, 0x409F60C4L, 0x5E5C9EC2L, 0x196A2463L,
-        0x68FB6FAFL, 0x3E6C53B5L, 0x1339B2EBL, 0x3B52EC6FL,
-        0x6DFC511FL, 0x9B30952CL, 0xCC814544L, 0xAF5EBD09L,
-        0xBEE3D004L, 0xDE334AFDL, 0x660F2807L, 0x192E4BB3L,
-        0xC0CBA857L, 0x45C8740FL, 0xD20B5F39L, 0xB9D3FBDBL,
-        0x5579C0BDL, 0x1A60320AL, 0xD6A100C6L, 0x402C7279L,
-        0x679F25FEL, 0xFB1FA3CCL, 0x8EA5E9F8L, 0xDB3222F8L,
-        0x3C7516DFL, 0xFD616B15L, 0x2F501EC8L, 0xAD0552ABL,
-        0x323DB5FAL, 0xFD238760L, 0x53317B48L, 0x3E00DF82L,
-        0x9E5C57BBL, 0xCA6F8CA0L, 0x1A87562EL, 0xDF1769DBL,
-        0xD542A8F6L, 0x287EFFC3L, 0xAC6732C6L, 0x8C4F5573L,
-        0x695B27B0L, 0xBBCA58C8L, 0xE1FFA35DL, 0xB8F011A0L,
-        0x10FA3D98L, 0xFD2183B8L, 0x4AFCB56CL, 0x2DD1D35BL,
-        0x9A53E479L, 0xB6F84565L, 0xD28E49BCL, 0x4BFB9790L,
-        0xE1DDF2DAL, 0xA4CB7E33L, 0x62FB1341L, 0xCEE4C6E8L,
-        0xEF20CADAL, 0x36774C01L, 0xD07E9EFEL, 0x2BF11FB4L,
-        0x95DBDA4DL, 0xAE909198L, 0xEAAD8E71L, 0x6B93D5A0L,
-        0xD08ED1D0L, 0xAFC725E0L, 0x8E3C5B2FL, 0x8E7594B7L,
-        0x8FF6E2FBL, 0xF2122B64L, 0x8888B812L, 0x900DF01CL,
-        0x4FAD5EA0L, 0x688FC31CL, 0xD1CFF191L, 0xB3A8C1ADL,
-        0x2F2F2218L, 0xBE0E1777L, 0xEA752DFEL, 0x8B021FA1L,
-        0xE5A0CC0FL, 0xB56F74E8L, 0x18ACF3D6L, 0xCE89E299L,
-        0xB4A84FE0L, 0xFD13E0B7L, 0x7CC43B81L, 0xD2ADA8D9L,
-        0x165FA266L, 0x80957705L, 0x93CC7314L, 0x211A1477L,
-        0xE6AD2065L, 0x77B5FA86L, 0xC75442F5L, 0xFB9D35CFL,
-        0xEBCDAF0CL, 0x7B3E89A0L, 0xD6411BD3L, 0xAE1E7E49L,
-        0x00250E2DL, 0x2071B35EL, 0x226800BBL, 0x57B8E0AFL,
-        0x2464369BL, 0xF009B91EL, 0x5563911DL, 0x59DFA6AAL,
-        0x78C14389L, 0xD95A537FL, 0x207D5BA2L, 0x02E5B9C5L,
-        0x83260376L, 0x6295CFA9L, 0x11C81968L, 0x4E734A41L,
-        0xB3472DCAL, 0x7B14A94AL, 0x1B510052L, 0x9A532915L,
-        0xD60F573FL, 0xBC9BC6E4L, 0x2B60A476L, 0x81E67400L,
-        0x08BA6FB5L, 0x571BE91FL, 0xF296EC6BL, 0x2A0DD915L,
-        0xB6636521L, 0xE7B9F9B6L, 0xFF34052EL, 0xC5855664L,
-        0x53B02D5DL, 0xA99F8FA1L, 0x08BA4799L, 0x6E85076AL   },
-    {   0x4B7A70E9L, 0xB5B32944L, 0xDB75092EL, 0xC4192623L,
-        0xAD6EA6B0L, 0x49A7DF7DL, 0x9CEE60B8L, 0x8FEDB266L,
-        0xECAA8C71L, 0x699A17FFL, 0x5664526CL, 0xC2B19EE1L,
-        0x193602A5L, 0x75094C29L, 0xA0591340L, 0xE4183A3EL,
-        0x3F54989AL, 0x5B429D65L, 0x6B8FE4D6L, 0x99F73FD6L,
-        0xA1D29C07L, 0xEFE830F5L, 0x4D2D38E6L, 0xF0255DC1L,
-        0x4CDD2086L, 0x8470EB26L, 0x6382E9C6L, 0x021ECC5EL,
-        0x09686B3FL, 0x3EBAEFC9L, 0x3C971814L, 0x6B6A70A1L,
-        0x687F3584L, 0x52A0E286L, 0xB79C5305L, 0xAA500737L,
-        0x3E07841CL, 0x7FDEAE5CL, 0x8E7D44ECL, 0x5716F2B8L,
-        0xB03ADA37L, 0xF0500C0DL, 0xF01C1F04L, 0x0200B3FFL,
-        0xAE0CF51AL, 0x3CB574B2L, 0x25837A58L, 0xDC0921BDL,
-        0xD19113F9L, 0x7CA92FF6L, 0x94324773L, 0x22F54701L,
-        0x3AE5E581L, 0x37C2DADCL, 0xC8B57634L, 0x9AF3DDA7L,
-        0xA9446146L, 0x0FD0030EL, 0xECC8C73EL, 0xA4751E41L,
-        0xE238CD99L, 0x3BEA0E2FL, 0x3280BBA1L, 0x183EB331L,
-        0x4E548B38L, 0x4F6DB908L, 0x6F420D03L, 0xF60A04BFL,
-        0x2CB81290L, 0x24977C79L, 0x5679B072L, 0xBCAF89AFL,
-        0xDE9A771FL, 0xD9930810L, 0xB38BAE12L, 0xDCCF3F2EL,
-        0x5512721FL, 0x2E6B7124L, 0x501ADDE6L, 0x9F84CD87L,
-        0x7A584718L, 0x7408DA17L, 0xBC9F9ABCL, 0xE94B7D8CL,
-        0xEC7AEC3AL, 0xDB851DFAL, 0x63094366L, 0xC464C3D2L,
-        0xEF1C1847L, 0x3215D908L, 0xDD433B37L, 0x24C2BA16L,
-        0x12A14D43L, 0x2A65C451L, 0x50940002L, 0x133AE4DDL,
-        0x71DFF89EL, 0x10314E55L, 0x81AC77D6L, 0x5F11199BL,
-        0x043556F1L, 0xD7A3C76BL, 0x3C11183BL, 0x5924A509L,
-        0xF28FE6EDL, 0x97F1FBFAL, 0x9EBABF2CL, 0x1E153C6EL,
-        0x86E34570L, 0xEAE96FB1L, 0x860E5E0AL, 0x5A3E2AB3L,
-        0x771FE71CL, 0x4E3D06FAL, 0x2965DCB9L, 0x99E71D0FL,
-        0x803E89D6L, 0x5266C825L, 0x2E4CC978L, 0x9C10B36AL,
-        0xC6150EBAL, 0x94E2EA78L, 0xA5FC3C53L, 0x1E0A2DF4L,
-        0xF2F74EA7L, 0x361D2B3DL, 0x1939260FL, 0x19C27960L,
-        0x5223A708L, 0xF71312B6L, 0xEBADFE6EL, 0xEAC31F66L,
-        0xE3BC4595L, 0xA67BC883L, 0xB17F37D1L, 0x018CFF28L,
-        0xC332DDEFL, 0xBE6C5AA5L, 0x65582185L, 0x68AB9802L,
-        0xEECEA50FL, 0xDB2F953BL, 0x2AEF7DADL, 0x5B6E2F84L,
-        0x1521B628L, 0x29076170L, 0xECDD4775L, 0x619F1510L,
-        0x13CCA830L, 0xEB61BD96L, 0x0334FE1EL, 0xAA0363CFL,
-        0xB5735C90L, 0x4C70A239L, 0xD59E9E0BL, 0xCBAADE14L,
-        0xEECC86BCL, 0x60622CA7L, 0x9CAB5CABL, 0xB2F3846EL,
-        0x648B1EAFL, 0x19BDF0CAL, 0xA02369B9L, 0x655ABB50L,
-        0x40685A32L, 0x3C2AB4B3L, 0x319EE9D5L, 0xC021B8F7L,
-        0x9B540B19L, 0x875FA099L, 0x95F7997EL, 0x623D7DA8L,
-        0xF837889AL, 0x97E32D77L, 0x11ED935FL, 0x16681281L,
-        0x0E358829L, 0xC7E61FD6L, 0x96DEDFA1L, 0x7858BA99L,
-        0x57F584A5L, 0x1B227263L, 0x9B83C3FFL, 0x1AC24696L,
-        0xCDB30AEBL, 0x532E3054L, 0x8FD948E4L, 0x6DBC3128L,
-        0x58EBF2EFL, 0x34C6FFEAL, 0xFE28ED61L, 0xEE7C3C73L,
-        0x5D4A14D9L, 0xE864B7E3L, 0x42105D14L, 0x203E13E0L,
-        0x45EEE2B6L, 0xA3AAABEAL, 0xDB6C4F15L, 0xFACB4FD0L,
-        0xC742F442L, 0xEF6ABBB5L, 0x654F3B1DL, 0x41CD2105L,
-        0xD81E799EL, 0x86854DC7L, 0xE44B476AL, 0x3D816250L,
-        0xCF62A1F2L, 0x5B8D2646L, 0xFC8883A0L, 0xC1C7B6A3L,
-        0x7F1524C3L, 0x69CB7492L, 0x47848A0BL, 0x5692B285L,
-        0x095BBF00L, 0xAD19489DL, 0x1462B174L, 0x23820E00L,
-        0x58428D2AL, 0x0C55F5EAL, 0x1DADF43EL, 0x233F7061L,
-        0x3372F092L, 0x8D937E41L, 0xD65FECF1L, 0x6C223BDBL,
-        0x7CDE3759L, 0xCBEE7460L, 0x4085F2A7L, 0xCE77326EL,
-        0xA6078084L, 0x19F8509EL, 0xE8EFD855L, 0x61D99735L,
-        0xA969A7AAL, 0xC50C06C2L, 0x5A04ABFCL, 0x800BCADCL,
-        0x9E447A2EL, 0xC3453484L, 0xFDD56705L, 0x0E1E9EC9L,
-        0xDB73DBD3L, 0x105588CDL, 0x675FDA79L, 0xE3674340L,
-        0xC5C43465L, 0x713E38D8L, 0x3D28F89EL, 0xF16DFF20L,
-        0x153E21E7L, 0x8FB03D4AL, 0xE6E39F2BL, 0xDB83ADF7L   },
-    {   0xE93D5A68L, 0x948140F7L, 0xF64C261CL, 0x94692934L,
-        0x411520F7L, 0x7602D4F7L, 0xBCF46B2EL, 0xD4A20068L,
-        0xD4082471L, 0x3320F46AL, 0x43B7D4B7L, 0x500061AFL,
-        0x1E39F62EL, 0x97244546L, 0x14214F74L, 0xBF8B8840L,
-        0x4D95FC1DL, 0x96B591AFL, 0x70F4DDD3L, 0x66A02F45L,
-        0xBFBC09ECL, 0x03BD9785L, 0x7FAC6DD0L, 0x31CB8504L,
-        0x96EB27B3L, 0x55FD3941L, 0xDA2547E6L, 0xABCA0A9AL,
-        0x28507825L, 0x530429F4L, 0x0A2C86DAL, 0xE9B66DFBL,
-        0x68DC1462L, 0xD7486900L, 0x680EC0A4L, 0x27A18DEEL,
-        0x4F3FFEA2L, 0xE887AD8CL, 0xB58CE006L, 0x7AF4D6B6L,
-        0xAACE1E7CL, 0xD3375FECL, 0xCE78A399L, 0x406B2A42L,
-        0x20FE9E35L, 0xD9F385B9L, 0xEE39D7ABL, 0x3B124E8BL,
-        0x1DC9FAF7L, 0x4B6D1856L, 0x26A36631L, 0xEAE397B2L,
-        0x3A6EFA74L, 0xDD5B4332L, 0x6841E7F7L, 0xCA7820FBL,
-        0xFB0AF54EL, 0xD8FEB397L, 0x454056ACL, 0xBA489527L,
-        0x55533A3AL, 0x20838D87L, 0xFE6BA9B7L, 0xD096954BL,
-        0x55A867BCL, 0xA1159A58L, 0xCCA92963L, 0x99E1DB33L,
-        0xA62A4A56L, 0x3F3125F9L, 0x5EF47E1CL, 0x9029317CL,
-        0xFDF8E802L, 0x04272F70L, 0x80BB155CL, 0x05282CE3L,
-        0x95C11548L, 0xE4C66D22L, 0x48C1133FL, 0xC70F86DCL,
-        0x07F9C9EEL, 0x41041F0FL, 0x404779A4L, 0x5D886E17L,
-        0x325F51EBL, 0xD59BC0D1L, 0xF2BCC18FL, 0x41113564L,
-        0x257B7834L, 0x602A9C60L, 0xDFF8E8A3L, 0x1F636C1BL,
-        0x0E12B4C2L, 0x02E1329EL, 0xAF664FD1L, 0xCAD18115L,
-        0x6B2395E0L, 0x333E92E1L, 0x3B240B62L, 0xEEBEB922L,
-        0x85B2A20EL, 0xE6BA0D99L, 0xDE720C8CL, 0x2DA2F728L,
-        0xD0127845L, 0x95B794FDL, 0x647D0862L, 0xE7CCF5F0L,
-        0x5449A36FL, 0x877D48FAL, 0xC39DFD27L, 0xF33E8D1EL,
-        0x0A476341L, 0x992EFF74L, 0x3A6F6EABL, 0xF4F8FD37L,
-        0xA812DC60L, 0xA1EBDDF8L, 0x991BE14CL, 0xDB6E6B0DL,
-        0xC67B5510L, 0x6D672C37L, 0x2765D43BL, 0xDCD0E804L,
-        0xF1290DC7L, 0xCC00FFA3L, 0xB5390F92L, 0x690FED0BL,
-        0x667B9FFBL, 0xCEDB7D9CL, 0xA091CF0BL, 0xD9155EA3L,
-        0xBB132F88L, 0x515BAD24L, 0x7B9479BFL, 0x763BD6EBL,
-        0x37392EB3L, 0xCC115979L, 0x8026E297L, 0xF42E312DL,
-        0x6842ADA7L, 0xC66A2B3BL, 0x12754CCCL, 0x782EF11CL,
-        0x6A124237L, 0xB79251E7L, 0x06A1BBE6L, 0x4BFB6350L,
-        0x1A6B1018L, 0x11CAEDFAL, 0x3D25BDD8L, 0xE2E1C3C9L,
-        0x44421659L, 0x0A121386L, 0xD90CEC6EL, 0xD5ABEA2AL,
-        0x64AF674EL, 0xDA86A85FL, 0xBEBFE988L, 0x64E4C3FEL,
-        0x9DBC8057L, 0xF0F7C086L, 0x60787BF8L, 0x6003604DL,
-        0xD1FD8346L, 0xF6381FB0L, 0x7745AE04L, 0xD736FCCCL,
-        0x83426B33L, 0xF01EAB71L, 0xB0804187L, 0x3C005E5FL,
-        0x77A057BEL, 0xBDE8AE24L, 0x55464299L, 0xBF582E61L,
-        0x4E58F48FL, 0xF2DDFDA2L, 0xF474EF38L, 0x8789BDC2L,
-        0x5366F9C3L, 0xC8B38E74L, 0xB475F255L, 0x46FCD9B9L,
-        0x7AEB2661L, 0x8B1DDF84L, 0x846A0E79L, 0x915F95E2L,
-        0x466E598EL, 0x20B45770L, 0x8CD55591L, 0xC902DE4CL,
-        0xB90BACE1L, 0xBB8205D0L, 0x11A86248L, 0x7574A99EL,
-        0xB77F19B6L, 0xE0A9DC09L, 0x662D09A1L, 0xC4324633L,
-        0xE85A1F02L, 0x09F0BE8CL, 0x4A99A025L, 0x1D6EFE10L,
-        0x1AB93D1DL, 0x0BA5A4DFL, 0xA186F20FL, 0x2868F169L,
-        0xDCB7DA83L, 0x573906FEL, 0xA1E2CE9BL, 0x4FCD7F52L,
-        0x50115E01L, 0xA70683FAL, 0xA002B5C4L, 0x0DE6D027L,
-        0x9AF88C27L, 0x773F8641L, 0xC3604C06L, 0x61A806B5L,
-        0xF0177A28L, 0xC0F586E0L, 0x006058AAL, 0x30DC7D62L,
-        0x11E69ED7L, 0x2338EA63L, 0x53C2DD94L, 0xC2C21634L,
-        0xBBCBEE56L, 0x90BCB6DEL, 0xEBFC7DA1L, 0xCE591D76L,
-        0x6F05E409L, 0x4B7C0188L, 0x39720A3DL, 0x7C927C24L,
-        0x86E3725FL, 0x724D9DB9L, 0x1AC15BB4L, 0xD39EB8FCL,
-        0xED545578L, 0x08FCA5B5L, 0xD83D7CD3L, 0x4DAD0FC4L,
-        0x1E50EF5EL, 0xB161E6F8L, 0xA28514D9L, 0x6C51133CL,
-        0x6FD5C7E7L, 0x56E14EC4L, 0x362ABFCEL, 0xDDC6C837L,
-        0xD79A3234L, 0x92638212L, 0x670EFA8EL, 0x406000E0L  },
-    {   0x3A39CE37L, 0xD3FAF5CFL, 0xABC27737L, 0x5AC52D1BL,
-        0x5CB0679EL, 0x4FA33742L, 0xD3822740L, 0x99BC9BBEL,
-        0xD5118E9DL, 0xBF0F7315L, 0xD62D1C7EL, 0xC700C47BL,
-        0xB78C1B6BL, 0x21A19045L, 0xB26EB1BEL, 0x6A366EB4L,
-        0x5748AB2FL, 0xBC946E79L, 0xC6A376D2L, 0x6549C2C8L,
-        0x530FF8EEL, 0x468DDE7DL, 0xD5730A1DL, 0x4CD04DC6L,
-        0x2939BBDBL, 0xA9BA4650L, 0xAC9526E8L, 0xBE5EE304L,
-        0xA1FAD5F0L, 0x6A2D519AL, 0x63EF8CE2L, 0x9A86EE22L,
-        0xC089C2B8L, 0x43242EF6L, 0xA51E03AAL, 0x9CF2D0A4L,
-        0x83C061BAL, 0x9BE96A4DL, 0x8FE51550L, 0xBA645BD6L,
-        0x2826A2F9L, 0xA73A3AE1L, 0x4BA99586L, 0xEF5562E9L,
-        0xC72FEFD3L, 0xF752F7DAL, 0x3F046F69L, 0x77FA0A59L,
-        0x80E4A915L, 0x87B08601L, 0x9B09E6ADL, 0x3B3EE593L,
-        0xE990FD5AL, 0x9E34D797L, 0x2CF0B7D9L, 0x022B8B51L,
-        0x96D5AC3AL, 0x017DA67DL, 0xD1CF3ED6L, 0x7C7D2D28L,
-        0x1F9F25CFL, 0xADF2B89BL, 0x5AD6B472L, 0x5A88F54CL,
-        0xE029AC71L, 0xE019A5E6L, 0x47B0ACFDL, 0xED93FA9BL,
-        0xE8D3C48DL, 0x283B57CCL, 0xF8D56629L, 0x79132E28L,
-        0x785F0191L, 0xED756055L, 0xF7960E44L, 0xE3D35E8CL,
-        0x15056DD4L, 0x88F46DBAL, 0x03A16125L, 0x0564F0BDL,
-        0xC3EB9E15L, 0x3C9057A2L, 0x97271AECL, 0xA93A072AL,
-        0x1B3F6D9BL, 0x1E6321F5L, 0xF59C66FBL, 0x26DCF319L,
-        0x7533D928L, 0xB155FDF5L, 0x03563482L, 0x8ABA3CBBL,
-        0x28517711L, 0xC20AD9F8L, 0xABCC5167L, 0xCCAD925FL,
-        0x4DE81751L, 0x3830DC8EL, 0x379D5862L, 0x9320F991L,
-        0xEA7A90C2L, 0xFB3E7BCEL, 0x5121CE64L, 0x774FBE32L,
-        0xA8B6E37EL, 0xC3293D46L, 0x48DE5369L, 0x6413E680L,
-        0xA2AE0810L, 0xDD6DB224L, 0x69852DFDL, 0x09072166L,
-        0xB39A460AL, 0x6445C0DDL, 0x586CDECFL, 0x1C20C8AEL,
-        0x5BBEF7DDL, 0x1B588D40L, 0xCCD2017FL, 0x6BB4E3BBL,
-        0xDDA26A7EL, 0x3A59FF45L, 0x3E350A44L, 0xBCB4CDD5L,
-        0x72EACEA8L, 0xFA6484BBL, 0x8D6612AEL, 0xBF3C6F47L,
-        0xD29BE463L, 0x542F5D9EL, 0xAEC2771BL, 0xF64E6370L,
-        0x740E0D8DL, 0xE75B1357L, 0xF8721671L, 0xAF537D5DL,
-        0x4040CB08L, 0x4EB4E2CCL, 0x34D2466AL, 0x0115AF84L,
-        0xE1B00428L, 0x95983A1DL, 0x06B89FB4L, 0xCE6EA048L,
-        0x6F3F3B82L, 0x3520AB82L, 0x011A1D4BL, 0x277227F8L,
-        0x611560B1L, 0xE7933FDCL, 0xBB3A792BL, 0x344525BDL,
-        0xA08839E1L, 0x51CE794BL, 0x2F32C9B7L, 0xA01FBAC9L,
-        0xE01CC87EL, 0xBCC7D1F6L, 0xCF0111C3L, 0xA1E8AAC7L,
-        0x1A908749L, 0xD44FBD9AL, 0xD0DADECBL, 0xD50ADA38L,
-        0x0339C32AL, 0xC6913667L, 0x8DF9317CL, 0xE0B12B4FL,
-        0xF79E59B7L, 0x43F5BB3AL, 0xF2D519FFL, 0x27D9459CL,
-        0xBF97222CL, 0x15E6FC2AL, 0x0F91FC71L, 0x9B941525L,
-        0xFAE59361L, 0xCEB69CEBL, 0xC2A86459L, 0x12BAA8D1L,
-        0xB6C1075EL, 0xE3056A0CL, 0x10D25065L, 0xCB03A442L,
-        0xE0EC6E0EL, 0x1698DB3BL, 0x4C98A0BEL, 0x3278E964L,
-        0x9F1F9532L, 0xE0D392DFL, 0xD3A0342BL, 0x8971F21EL,
-        0x1B0A7441L, 0x4BA3348CL, 0xC5BE7120L, 0xC37632D8L,
-        0xDF359F8DL, 0x9B992F2EL, 0xE60B6F47L, 0x0FE3F11DL,
-        0xE54CDA54L, 0x1EDAD891L, 0xCE6279CFL, 0xCD3E7E6FL,
-        0x1618B166L, 0xFD2C1D05L, 0x848FD2C5L, 0xF6FB2299L,
-        0xF523F357L, 0xA6327623L, 0x93A83531L, 0x56CCCD02L,
-        0xACF08162L, 0x5A75EBB5L, 0x6E163697L, 0x88D273CCL,
-        0xDE966292L, 0x81B949D0L, 0x4C50901BL, 0x71C65614L,
-        0xE6C6C7BDL, 0x327A140AL, 0x45E1D006L, 0xC3F27B9AL,
-        0xC9AA53FDL, 0x62A80F00L, 0xBB25BFE2L, 0x35BDD2F6L,
-        0x71126905L, 0xB2040222L, 0xB6CBCF7CL, 0xCD769C2BL,
-        0x53113EC0L, 0x1640E3D3L, 0x38ABBD60L, 0x2547ADF0L,
-        0xBA38209CL, 0xF746CE76L, 0x77AFA1C5L, 0x20756060L,
-        0x85CBFE4EL, 0x8AE88DD8L, 0x7AAAF9B0L, 0x4CF9AA7EL,
-        0x1948C25CL, 0x02FB8A8CL, 0x01C36AE4L, 0xD6EBE1F9L,
-        0x90D4F869L, 0xA65CDEA0L, 0x3F09252DL, 0xC208E69FL,
-        0xB74E6132L, 0xCE77E25BL, 0x578FDFE3L, 0x3AC372E6L  }
-};
 
 #endif /* !MBEDTLS_BLOWFISH_ALT */
 #endif /* MBEDTLS_BLOWFISH_C */
diff --git a/deps/mbedtls/cipher_wrap.c b/deps/mbedtls/cipher_wrap.c
index dc76af8ff4..dabc7a25d4 100644
--- a/deps/mbedtls/cipher_wrap.c
+++ b/deps/mbedtls/cipher_wrap.c
@@ -87,8 +87,8 @@ static void *gcm_ctx_alloc( void )
 
 static void gcm_ctx_free( void *ctx )
 {
-    mbedtls_gcm_free( ctx );
-    mbedtls_free( ctx );
+    mbedtls_gcm_free((mbedtls_gcm_context*)ctx);
+    mbedtls_free(ctx);
 }
 #endif /* MBEDTLS_GCM_C */
 
@@ -106,7 +106,7 @@ static void *ccm_ctx_alloc( void )
 
 static void ccm_ctx_free( void *ctx )
 {
-    mbedtls_ccm_free( ctx );
+    mbedtls_ccm_free((mbedtls_ccm_context*)ctx);
     mbedtls_free( ctx );
 }
 #endif /* MBEDTLS_CCM_C */
@@ -162,7 +162,7 @@ static int aes_setkey_enc_wrap( void *ctx, const unsigned char *key,
 
 static void * aes_ctx_alloc( void )
 {
-    mbedtls_aes_context *aes = mbedtls_calloc( 1, sizeof( mbedtls_aes_context ) );
+    mbedtls_aes_context *aes = (mbedtls_aes_context*)mbedtls_calloc( 1, sizeof( mbedtls_aes_context ) );
 
     if( aes == NULL )
         return( NULL );
@@ -518,8 +518,8 @@ static int camellia_setkey_enc_wrap( void *ctx, const unsigned char *key,
 
 static void * camellia_ctx_alloc( void )
 {
-    mbedtls_camellia_context *ctx;
-    ctx = mbedtls_calloc( 1, sizeof( mbedtls_camellia_context ) );
+    mbedtls_camellia_context *ctx = (mbedtls_camellia_context*)
+       mbedtls_calloc( 1, sizeof( mbedtls_camellia_context ) );
 
     if( ctx == NULL )
         return( NULL );
@@ -906,7 +906,8 @@ static int des3_set3key_enc_wrap( void *ctx, const unsigned char *key,
 
 static void * des_ctx_alloc( void )
 {
-    mbedtls_des_context *des = mbedtls_calloc( 1, sizeof( mbedtls_des_context ) );
+    mbedtls_des_context *des = (mbedtls_des_context*)
+       mbedtls_calloc( 1, sizeof( mbedtls_des_context ) );
 
     if( des == NULL )
         return( NULL );
@@ -924,8 +925,7 @@ static void des_ctx_free( void *ctx )
 
 static void * des3_ctx_alloc( void )
 {
-    mbedtls_des3_context *des3;
-    des3 = mbedtls_calloc( 1, sizeof( mbedtls_des3_context ) );
+    mbedtls_des3_context *des3 = (mbedtls_des3_context*)mbedtls_calloc( 1, sizeof( mbedtls_des3_context ) );
 
     if( des3 == NULL )
         return( NULL );
@@ -1123,8 +1123,7 @@ static int blowfish_setkey_wrap( void *ctx, const unsigned char *key,
 
 static void * blowfish_ctx_alloc( void )
 {
-    mbedtls_blowfish_context *ctx;
-    ctx = mbedtls_calloc( 1, sizeof( mbedtls_blowfish_context ) );
+    mbedtls_blowfish_context *ctx = (mbedtls_blowfish_context*)mbedtls_calloc( 1, sizeof( mbedtls_blowfish_context ) );
 
     if( ctx == NULL )
         return( NULL );
@@ -1233,8 +1232,7 @@ static int arc4_setkey_wrap( void *ctx, const unsigned char *key,
 
 static void * arc4_ctx_alloc( void )
 {
-    mbedtls_arc4_context *ctx;
-    ctx = mbedtls_calloc( 1, sizeof( mbedtls_arc4_context ) );
+    mbedtls_arc4_context *ctx = (mbedtls_arc4_context*)mbedtls_calloc( 1, sizeof( mbedtls_arc4_context ) );
 
     if( ctx == NULL )
         return( NULL );
diff --git a/deps/mbedtls/hmac_drbg.c b/deps/mbedtls/hmac_drbg.c
index a32052b724..a8ed885c82 100644
--- a/deps/mbedtls/hmac_drbg.c
+++ b/deps/mbedtls/hmac_drbg.c
@@ -447,7 +447,7 @@ static size_t test_offset;
 static int hmac_drbg_self_test_entropy( void *data,
                                         unsigned char *buf, size_t len )
 {
-    const unsigned char *p = data;
+    const unsigned char *p = (const unsigned char*)data;
     memcpy( buf, p + test_offset, len );
     test_offset += len;
     return( 0 );
diff --git a/deps/mbedtls/pem.c b/deps/mbedtls/pem.c
index 37e857e92c..2995d7fd70 100644
--- a/deps/mbedtls/pem.c
+++ b/deps/mbedtls/pem.c
@@ -323,7 +323,7 @@ int mbedtls_pem_read_buffer( mbedtls_pem_context *ctx, const char *header, const
     if( ret == MBEDTLS_ERR_BASE64_INVALID_CHARACTER )
         return( MBEDTLS_ERR_PEM_INVALID_DATA + ret );
 
-    if( ( buf = mbedtls_calloc( 1, len ) ) == NULL )
+    if( ( buf = (unsigned char*)mbedtls_calloc( 1, len ) ) == NULL )
         return( MBEDTLS_ERR_PEM_ALLOC_FAILED );
 
     if( ( ret = mbedtls_base64_decode( buf, len, &len, s1, s2 - s1 ) ) != 0 )
@@ -409,7 +409,7 @@ int mbedtls_pem_write_buffer( const char *header, const char *footer,
         return( MBEDTLS_ERR_BASE64_BUFFER_TOO_SMALL );
     }
 
-    if( ( encode_buf = mbedtls_calloc( 1, use_len ) ) == NULL )
+    if( ( encode_buf = (unsigned char*)mbedtls_calloc( 1, use_len ) ) == NULL )
         return( MBEDTLS_ERR_PEM_ALLOC_FAILED );
 
     if( ( ret = mbedtls_base64_encode( encode_buf, use_len, &use_len, der_data,
diff --git a/deps/mbedtls/ssl_tls.c b/deps/mbedtls/ssl_tls.c
index e417d1915a..6c136351c9 100644
--- a/deps/mbedtls/ssl_tls.c
+++ b/deps/mbedtls/ssl_tls.c
@@ -163,7 +163,7 @@ static int ssl_session_copy( mbedtls_ssl_session *dst, const mbedtls_ssl_session
     {
         int ret;
 
-        dst->peer_cert = mbedtls_calloc( 1, sizeof(mbedtls_x509_crt) );
+        dst->peer_cert = (mbedtls_x509_crt*)mbedtls_calloc( 1, sizeof(mbedtls_x509_crt) );
         if( dst->peer_cert == NULL )
             return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
 
@@ -182,7 +182,7 @@ static int ssl_session_copy( mbedtls_ssl_session *dst, const mbedtls_ssl_session
 #if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_SSL_CLI_C)
     if( src->ticket != NULL )
     {
-        dst->ticket = mbedtls_calloc( 1, src->ticket_len );
+        dst->ticket = (unsigned char*)mbedtls_calloc( 1, src->ticket_len );
         if( dst->ticket == NULL )
             return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
 
@@ -2471,14 +2471,15 @@ static int ssl_flight_append( mbedtls_ssl_context *ssl )
     mbedtls_ssl_flight_item *msg;
 
     /* Allocate space for current message */
-    if( ( msg = mbedtls_calloc( 1, sizeof(  mbedtls_ssl_flight_item ) ) ) == NULL )
+    if( ( msg = (mbedtls_ssl_flight_item*)
+             mbedtls_calloc( 1, sizeof(  mbedtls_ssl_flight_item ) ) ) == NULL )
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "alloc %d bytes failed",
                             sizeof( mbedtls_ssl_flight_item ) ) );
         return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
     }
 
-    if( ( msg->p = mbedtls_calloc( 1, ssl->out_msglen ) ) == NULL )
+    if( ( msg->p = (unsigned char*)mbedtls_calloc( 1, ssl->out_msglen ) ) == NULL )
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "alloc %d bytes failed", ssl->out_msglen ) );
         mbedtls_free( msg );
@@ -2950,7 +2951,7 @@ static int ssl_reassemble_dtls_handshake( mbedtls_ssl_context *ssl )
         /* The bitmask needs one bit per byte of message excluding header */
         alloc_len = 12 + msg_len + msg_len / 8 + ( msg_len % 8 != 0 );
 
-        ssl->handshake->hs_msg = mbedtls_calloc( 1, alloc_len );
+        ssl->handshake->hs_msg = (unsigned char*)mbedtls_calloc( 1, alloc_len );
         if( ssl->handshake->hs_msg == NULL )
         {
             MBEDTLS_SSL_DEBUG_MSG( 1, ( "alloc failed (%d bytes)", alloc_len ) );
@@ -4453,7 +4454,7 @@ int mbedtls_ssl_parse_certificate( mbedtls_ssl_context *ssl )
         mbedtls_free( ssl->session_negotiate->peer_cert );
     }
 
-    if( ( ssl->session_negotiate->peer_cert = mbedtls_calloc( 1,
+    if( ( ssl->session_negotiate->peer_cert = (mbedtls_x509_crt*)mbedtls_calloc( 1,
                     sizeof( mbedtls_x509_crt ) ) ) == NULL )
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "alloc(%d bytes) failed",
@@ -5506,17 +5507,17 @@ static int ssl_handshake_init( mbedtls_ssl_context *ssl )
      */
     if( ssl->transform_negotiate == NULL )
     {
-        ssl->transform_negotiate = mbedtls_calloc( 1, sizeof(mbedtls_ssl_transform) );
+        ssl->transform_negotiate = (mbedtls_ssl_transform*)mbedtls_calloc( 1, sizeof(mbedtls_ssl_transform) );
     }
 
     if( ssl->session_negotiate == NULL )
     {
-        ssl->session_negotiate = mbedtls_calloc( 1, sizeof(mbedtls_ssl_session) );
+        ssl->session_negotiate = (mbedtls_ssl_session*)mbedtls_calloc( 1, sizeof(mbedtls_ssl_session) );
     }
 
     if( ssl->handshake == NULL )
     {
-        ssl->handshake = mbedtls_calloc( 1, sizeof(mbedtls_ssl_handshake_params) );
+        ssl->handshake = (mbedtls_ssl_handshake_params*)mbedtls_calloc( 1, sizeof(mbedtls_ssl_handshake_params) );
     }
 
     /* All pointers should exist and can be directly freed without issue */
@@ -5610,8 +5611,8 @@ int mbedtls_ssl_setup( mbedtls_ssl_context *ssl,
     /*
      * Prepare base structures
      */
-    if( ( ssl-> in_buf = mbedtls_calloc( 1, len ) ) == NULL ||
-        ( ssl->out_buf = mbedtls_calloc( 1, len ) ) == NULL )
+    if( ( ssl-> in_buf = (unsigned char*)mbedtls_calloc( 1, len ) ) == NULL ||
+        ( ssl->out_buf = (unsigned char*)mbedtls_calloc( 1, len ) ) == NULL )
     {
         MBEDTLS_SSL_DEBUG_MSG( 1, ( "alloc(%d bytes) failed", len ) );
         mbedtls_free( ssl->in_buf );
@@ -5936,27 +5937,26 @@ static int ssl_append_key_cert( mbedtls_ssl_key_cert **head,
                                 mbedtls_x509_crt *cert,
                                 mbedtls_pk_context *key )
 {
-    mbedtls_ssl_key_cert *new;
-
-    new = mbedtls_calloc( 1, sizeof( mbedtls_ssl_key_cert ) );
-    if( new == NULL )
+    mbedtls_ssl_key_cert *keycert = (mbedtls_ssl_key_cert*)
+       mbedtls_calloc( 1, sizeof( mbedtls_ssl_key_cert ) );
+    if( keycert == NULL )
         return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
 
-    new->cert = cert;
-    new->key  = key;
-    new->next = NULL;
+    keycert->cert = cert;
+    keycert->key  = key;
+    keycert->next = NULL;
 
     /* Update head is the list was null, else add to the end */
     if( *head == NULL )
     {
-        *head = new;
+        *head = keycert;
     }
     else
     {
         mbedtls_ssl_key_cert *cur = *head;
         while( cur->next != NULL )
             cur = cur->next;
-        cur->next = new;
+        cur->next = keycert;
     }
 
     return( 0 );
@@ -6054,8 +6054,8 @@ int mbedtls_ssl_conf_psk( mbedtls_ssl_config *conf,
         conf->psk_identity = NULL;
     }
 
-    if( ( conf->psk = mbedtls_calloc( 1, psk_len ) ) == NULL ||
-        ( conf->psk_identity = mbedtls_calloc( 1, psk_identity_len ) ) == NULL )
+    if( ( conf->psk = (unsigned char*)mbedtls_calloc( 1, psk_len ) ) == NULL ||
+        ( conf->psk_identity = (unsigned char*)mbedtls_calloc( 1, psk_identity_len ) ) == NULL )
     {
         mbedtls_free( conf->psk );
         mbedtls_free( conf->psk_identity );
@@ -6085,7 +6085,8 @@ int mbedtls_ssl_set_hs_psk( mbedtls_ssl_context *ssl,
     if( ssl->handshake->psk != NULL )
         mbedtls_free( ssl->handshake->psk );
 
-    if( ( ssl->handshake->psk = mbedtls_calloc( 1, psk_len ) ) == NULL )
+    if( ( ssl->handshake->psk = (unsigned char*)
+             mbedtls_calloc( 1, psk_len ) ) == NULL )
         return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
 
     ssl->handshake->psk_len = psk_len;
@@ -6185,7 +6186,7 @@ int mbedtls_ssl_set_hostname( mbedtls_ssl_context *ssl, const char *hostname )
     if( hostname_len > MBEDTLS_SSL_MAX_HOST_NAME_LEN )
         return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
 
-    ssl->hostname = mbedtls_calloc( 1, hostname_len + 1 );
+    ssl->hostname = (char*)mbedtls_calloc( 1, hostname_len + 1 );
 
     if( ssl->hostname == NULL )
         return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
diff --git a/discord/discord.c b/discord/discord.c
index 0a33824fa5..0efe85e036 100644
--- a/discord/discord.c
+++ b/discord/discord.c
@@ -16,8 +16,10 @@
 #include <file/file_path.h>
 
 #include "discord.h"
+#include "discord_register.h"
 
 #include "../retroarch.h"
+#include "../configuration.h"
 #include "../core.h"
 #include "../core_info.h"
 #include "../paths.h"
@@ -35,7 +37,6 @@
 #include "../cheevos/cheevos.h"
 #endif
 
-static const char* APPLICATION_ID = "475456035851599874";
 static int FrustrationLevel       = 0;
 
 static int64_t start_time         = 0;
@@ -211,6 +212,7 @@ void discord_update(enum discord_presence presence)
 
 void discord_init(void)
 {
+   settings_t *settings = config_get_ptr();
    DiscordEventHandlers handlers;
 
    RARCH_LOG("[Discord] initializing ..\n");
@@ -224,7 +226,11 @@ void discord_init(void)
    handlers.spectateGame = handle_discord_spectate;
    handlers.joinRequest  = handle_discord_join_request;
 
-   Discord_Initialize(APPLICATION_ID, &handlers, 1, NULL);
+   /* To-Do: Add the arguments RetroArch was started with to the register URI*/
+   const char command[256] = "retroarch";
+
+   Discord_Initialize(settings->arrays.discord_app_id, &handlers, 0, NULL);
+   Discord_Register(settings->arrays.discord_app_id, NULL);
 
    discord_ready         = true;
 }
diff --git a/driver.c b/driver.c
index 68f5b314d7..a282df040c 100644
--- a/driver.c
+++ b/driver.c
@@ -18,8 +18,6 @@
 #include <compat/posix_string.h>
 #include <string/stdstring.h>
 
-#include <audio/audio_resampler.h>
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -28,9 +26,7 @@
 #include "menu/menu_driver.h"
 #endif
 
-#include "command.h"
 #include "dynamic.h"
-#include "msg_hash.h"
 
 #include "audio/audio_driver.h"
 #include "camera/camera_driver.h"
@@ -40,7 +36,6 @@
 #include "led/led_driver.h"
 #include "midi/midi_driver.h"
 #include "configuration.h"
-#include "core.h"
 #include "core_info.h"
 #include "driver.h"
 #include "retroarch.h"
diff --git a/dynamic.c b/dynamic.c
index 81a03dd2a1..04698748e3 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -39,6 +39,10 @@
 #include "cheevos/cheevos.h"
 #endif
 
+#ifdef HAVE_OPENGL
+#include "gfx/common/gl_common.h"
+#endif
+
 #ifdef HAVE_NETWORKING
 #include "network/netplay/netplay.h"
 #endif
@@ -50,7 +54,6 @@
 #include "camera/camera_driver.h"
 #include "location/location_driver.h"
 #include "record/record_driver.h"
-#include "core.h"
 #include "driver.h"
 #include "performance_counters.h"
 #include "gfx/video_driver.h"
@@ -58,13 +61,11 @@
 #include "midi/midi_driver.h"
 
 #include "cores/internal_cores.h"
-#include "frontend/frontend_driver.h"
 #include "content.h"
 #include "dirs.h"
 #include "paths.h"
 #include "retroarch.h"
 #include "configuration.h"
-#include "msg_hash.h"
 #include "verbosity.h"
 #include "tasks/tasks_internal.h"
 
@@ -314,6 +315,10 @@ static dylib_t libretro_get_system_info_lib(const char *path,
 }
 #endif
 
+static char current_library_name[1024];
+static char current_library_version[1024];
+static char current_valid_extensions[1024];
+
 /**
  * libretro_get_system_info:
  * @path                         : Path to libretro library.
@@ -370,13 +375,23 @@ bool libretro_get_system_info(const char *path,
 
    memcpy(info, &dummy_info, sizeof(*info));
 
-   if (!string_is_empty(dummy_info.library_name))
-      info->library_name    = strdup(dummy_info.library_name);
-   if (!string_is_empty(dummy_info.library_version))
-      info->library_version    = strdup(dummy_info.library_version);
+   current_library_name[0] = '\0';
+   current_library_version[0] = '\0';
+   current_valid_extensions[0] = '\0';
 
+   if (!string_is_empty(dummy_info.library_name))
+      strlcpy(current_library_name, 
+            dummy_info.library_name, sizeof(current_library_name));
+   if (!string_is_empty(dummy_info.library_version))
+      strlcpy(current_library_version, 
+            dummy_info.library_version, sizeof(current_library_version));
    if (dummy_info.valid_extensions)
-      info->valid_extensions = strdup(dummy_info.valid_extensions);
+      strlcpy(current_valid_extensions, 
+            dummy_info.valid_extensions, sizeof(current_valid_extensions));
+
+   info->library_name     = current_library_name;
+   info->library_version  = current_library_version;
+   info->valid_extensions = current_valid_extensions;
 
 #ifdef HAVE_DYNAMIC
    dylib_close(lib);
@@ -705,10 +720,6 @@ static bool load_symbols(enum rarch_core_type type, struct retro_core_t *current
  **/
 bool init_libretro_sym(enum rarch_core_type type, struct retro_core_t *current_core)
 {
-   /* Guarantee that we can do "dirty" casting.
-    * Every OS that this program supports should pass this. */
-   retro_assert(sizeof(void*) == sizeof(void (*)(void)));
-
    if (!load_symbols(type, current_core))
       return false;
 
@@ -1368,22 +1379,22 @@ bool rarch_environment_cb(unsigned cmd, void *data)
          if (!dynamic_verify_hw_context(cb->context_type, cb->version_minor, cb->version_major))
             return false;
 
-         if (cb->context_type == RETRO_HW_CONTEXT_OPENGL_CORE)
-         {
-            gfx_ctx_flags_t flags;
-            flags.flags = 0;
-            BIT32_SET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT);
-
-            video_context_driver_set_flags(&flags);
-         }
+#if defined(HAVE_OPENGL)
+         if (!gl_set_core_context(cb->context_type)) { }
+#endif
 
          cb->get_current_framebuffer = video_driver_get_current_framebuffer;
          cb->get_proc_address        = video_driver_get_proc_address;
 
          /* Old ABI. Don't copy garbage. */
          if (cmd & RETRO_ENVIRONMENT_EXPERIMENTAL)
+         {
             memcpy(hwr,
                   cb, offsetof(struct retro_hw_render_callback, stencil));
+            memset(hwr + offsetof(struct retro_hw_render_callback, stencil),
+                  0, sizeof(*cb) - offsetof(struct retro_hw_render_callback, stencil));
+            
+         }
          else
             memcpy(hwr, cb, sizeof(*cb));
          break;
@@ -1582,9 +1593,10 @@ bool rarch_environment_cb(unsigned cmd, void *data)
             struct retro_subsystem_info *info_ptr = NULL;
             free(system->subsystem.data);
             system->subsystem.data = NULL;
+            system->subsystem.size = 0;
 
             info_ptr = (struct retro_subsystem_info*)
-               calloc(i, sizeof(*info_ptr));
+               malloc(i * sizeof(*info_ptr));
 
             if (!info_ptr)
                return false;
@@ -1620,6 +1632,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
 
             free(system->ports.data);
             system->ports.data = NULL;
+            system->ports.size = 0;
 
             info_ptr = (struct retro_controller_info*)calloc(i, sizeof(*info_ptr));
             if (!info_ptr)
@@ -1644,6 +1657,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
 
             RARCH_LOG("Environ SET_MEMORY_MAPS.\n");
             free((void*)system->mmaps.descriptors);
+            system->mmaps.descriptors     = 0;
             system->mmaps.num_descriptors = 0;
             descriptors = (rarch_memory_descriptor_t*)
                calloc(mmaps->num_descriptors,
@@ -1840,6 +1854,8 @@ bool rarch_environment_cb(unsigned cmd, void *data)
 #ifdef HAVE_NETWORKING
          if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_REPLAYING, NULL))
             result &= ~(1|2);
+         if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
+            result |= 4;
 #endif
          if (data != NULL)
          {
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index 2e367ec0f7..d7b654349a 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -292,6 +292,12 @@ static void frontend_darwin_get_os(char *s, size_t len, int *major, int *minor)
    get_ios_version(major, minor);
    strlcpy(s, "iOS", len);
 #elif defined(OSX)
+
+#if MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 // MAC_OS_X_VERSION_10_13
+   NSOperatingSystemVersion version = NSProcessInfo.processInfo.operatingSystemVersion;
+   *major = (int)version.majorVersion;
+   *minor = (int)version.minorVersion;
+#else
    if ([[NSProcessInfo processInfo] respondsToSelector:@selector(operatingSystemVersion)])
    {
       typedef struct
@@ -309,6 +315,7 @@ static void frontend_darwin_get_os(char *s, size_t len, int *major, int *minor)
       Gestalt(gestaltSystemVersionMinor, (SInt32*)minor);
       Gestalt(gestaltSystemVersionMajor, (SInt32*)major);
    }
+#endif
    strlcpy(s, "OSX", len);
 #endif
 }
diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c
new file mode 100644
index 0000000000..93d389d889
--- /dev/null
+++ b/frontend/drivers/platform_ps2.c
@@ -0,0 +1,514 @@
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ * Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ * * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+
+#include "../frontend_driver.h"
+
+#include <io_common.h>
+#include <loadfile.h>
+#include <unistd.h>
+#include <sbv_patches.h>
+#include <fileXio_rpc.h>
+#include <audsrv.h>
+#include <sifrpc.h>
+#include <iopcontrol.h>
+#include <libpwroff.h>
+#include <SDL/SDL.h>
+
+
+enum BootDeviceIDs{
+    BOOT_DEVICE_UNKNOWN = -1,
+    BOOT_DEVICE_MC0 = 0,
+    BOOT_DEVICE_MC1,
+    BOOT_DEVICE_CDROM,
+    BOOT_DEVICE_MASS,
+    BOOT_DEVICE_HDD,
+    BOOT_DEVICE_HOST,
+    
+    BOOT_DEVICE_COUNT,
+};
+
+extern unsigned char poweroff_irx_start[];
+extern unsigned int poweroff_irx_size;
+
+extern unsigned char ps2dev9_irx_start[];
+extern unsigned int ps2dev9_irx_size;
+
+extern unsigned char ps2atad_irx_start[];
+extern unsigned int ps2atad_irx_size;
+
+extern unsigned char ps2hdd_irx_start[];
+extern unsigned int ps2hdd_irx_size;
+
+extern unsigned char ps2fs_irx_start[];
+extern unsigned int ps2fs_irx_size;
+
+extern unsigned char iomanX_irx_start[];
+extern unsigned int iomanX_irx_size;
+
+extern unsigned char fileXio_irx_start[];
+extern unsigned int fileXio_irx_size;
+
+extern unsigned char freesd_irx_start[];
+extern unsigned int freesd_irx_size;
+
+extern unsigned char audsrv_irx_start[];
+extern unsigned int audsrv_irx_size;
+
+extern unsigned char usbd_irx_start[];
+extern unsigned int usbd_irx_size;
+
+extern unsigned char usbhdfsd_irx_start[];
+extern unsigned int usbhdfsd_irx_size;
+
+static unsigned char HDDModulesLoaded=0;
+
+char eboot_path[512];
+char user_path[512];
+
+static enum frontend_fork ps2_fork_mode = FRONTEND_FORK_NONE;
+
+//Only paths residing on "basic" devices (devices that don't require mounting) 
+//can be specified here, since this system doesn't perform mounting based on the path.
+#define DEFAULT_PATH    "mass:"
+
+static int getBootDeviceID(char *path) {
+    int result = BOOT_DEVICE_HOST;
+
+    if(!strncmp(path, "mc0:", 4)) result=BOOT_DEVICE_MC0;
+    else if(!strncmp(path, "mc1:", 4)) result=BOOT_DEVICE_MC1;
+    else if(!strncmp(path, "cdrom0:", 7)) result=BOOT_DEVICE_CDROM;
+    else if(!strncmp(path, "mass:", 5) || !strncmp(path, "mass0:", 6)) result=BOOT_DEVICE_MASS;
+    else if(!strncmp(path, "hdd:", 4) || !strncmp(path, "hdd0:", 5)) result=BOOT_DEVICE_HDD;
+    else if(!strncmp(path, "host", 4) && ((path[4]>='0' && path[4]<='9') || path[4]==':')) result=BOOT_DEVICE_HOST;
+    else result=BOOT_DEVICE_UNKNOWN;
+
+    return result;
+}
+
+//HACK! If booting from a USB device, keep trying to open this program again until it succeeds. This will ensure that the emulator will be able to load its files.
+static void waitUntilDeviceIsReady(const char *path) {
+   FILE *file;
+
+   while((file=fopen(path, "rb"))==NULL){
+      //Wait for a while first, or the IOP will get swamped by requests from the EE.
+      nopdelay();
+      nopdelay();
+      nopdelay();
+      nopdelay();
+      nopdelay();
+      nopdelay();
+      nopdelay();
+      nopdelay();
+   };
+
+   fclose(file);
+}
+
+void setPWDOnPFS(const char *FullCWD_path) {
+    int i;
+    char *path;
+    
+    path=NULL;
+    for(i=strlen(FullCWD_path); i>=0; i--){ /* Try to seperate the CWD from the path to this ELF. */
+        if(FullCWD_path[i]==':'){
+            if((path=malloc(i+6+2))!=NULL){
+                strcpy(path, "pfs0:/");
+                strncat(path, FullCWD_path, i+1);
+                path[i+1+6]='\0';
+            }
+            break;
+        }
+        else if((FullCWD_path[i]=='\\')||(FullCWD_path[i]=='/')){
+            if((path=malloc(i+6+1))!=NULL){
+                strcpy(path, "pfs0:/");
+                strncat(path, FullCWD_path, i);
+                path[i+6]='\0';
+            }
+            break;
+        }
+    }
+    
+    if(path!=NULL){
+        chdir(path);
+        free(path);
+    }
+}
+
+static const char *getMountParams(const char *command, char *BlockDevice) {
+   const char *MountPath;
+   int BlockDeviceNameLen;
+
+   MountPath=NULL;
+   if(strlen(command)>6 && (MountPath=strchr(&command[5], ':'))!=NULL){
+      BlockDeviceNameLen=(unsigned int)MountPath-(unsigned int)command;
+      strncpy(BlockDevice, command, BlockDeviceNameLen);
+      BlockDevice[BlockDeviceNameLen]='\0';
+      
+      MountPath++;    //This is the location of the mount path;
+   }
+
+   return MountPath;
+}
+
+static void create_path_names(void)
+{
+#ifndef IS_SALAMANDER
+#if defined(HAVE_LOGGER)
+   
+#elif defined(HAVE_FILE_LOGGER)
+   retro_main_log_file_init("ux0:/temp/retroarch-log.txt"); // It really depend from where we are executing this
+#endif
+#endif
+
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE], g_defaults.dirs[DEFAULT_DIR_PORT],
+         "CORES", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_INFO], g_defaults.dirs[DEFAULT_DIR_PORT],
+         "INFO", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_INFO]));
+
+   /* user data */
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CHEATS], user_path,
+         "CHEATS", sizeof(g_defaults.dirs[DEFAULT_DIR_CHEATS]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG], user_path,
+         "CONFIG", sizeof(g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS], user_path,
+         "DOWNLOADS", sizeof(g_defaults.dirs[DEFAULT_DIR_CORE_ASSETS]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_PLAYLIST], user_path,
+         "PLAYLISTS", sizeof(g_defaults.dirs[DEFAULT_DIR_PLAYLIST]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_REMAP], g_defaults.dirs[DEFAULT_DIR_MENU_CONFIG],
+         "REMAPS", sizeof(g_defaults.dirs[DEFAULT_DIR_REMAP]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SRAM], user_path,
+         "SAVEFILES", sizeof(g_defaults.dirs[DEFAULT_DIR_SRAM]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SAVESTATE], user_path,
+         "SAVESTATES", sizeof(g_defaults.dirs[DEFAULT_DIR_SAVESTATE]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT], user_path,
+         "SCREENSHOTS", sizeof(g_defaults.dirs[DEFAULT_DIR_SCREENSHOT]));
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_SYSTEM], user_path,
+         "SYSTEM", sizeof(g_defaults.dirs[DEFAULT_DIR_SYSTEM]));
+
+   /* cache dir */
+   fill_pathname_join(g_defaults.dirs[DEFAULT_DIR_CACHE], user_path,
+         "TEMP", sizeof(g_defaults.dirs[DEFAULT_DIR_CACHE]));
+
+   /* history and main config */
+   strlcpy(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY],
+         user_path, sizeof(g_defaults.dirs[DEFAULT_DIR_CONTENT_HISTORY]));
+   fill_pathname_join(g_defaults.path.config, user_path,
+         file_path_str(FILE_PATH_MAIN_CONFIG), sizeof(g_defaults.path.config));
+}
+
+static void poweroffCallback(void *arg)
+{
+	//Close all files and unmount all partitions.
+	//close(fd);
+
+	//If you use PFS, close all files and unmount all partitions.
+	//fileXioDevctl("pfs:", PDIOC_CLOSEALL, NULL, 0, NULL, 0)
+
+	//Shut down DEV9, if you used it.
+	//while(fileXioDevctl("dev9x:", DDIOC_OFF, NULL, 0, NULL, 0) < 0){};
+
+	printf("Shutdown!");
+	poweroffShutdown();
+}
+
+static void frontend_ps2_get_environment_settings(int *argc, char *argv[],
+      void *args, void *params_data)
+{
+   char cwd[FILENAME_MAX], blockDevice[16];
+   const char *mountPoint;
+   int bootDeviceID;
+
+   //TODO: I DONT KNOW YET, WHY IT CRASHES IF UNCOMENT THIS PART 
+   getcwd(cwd, sizeof(cwd));
+   bootDeviceID=getBootDeviceID(cwd);
+   //Mount the HDD partition, if required.
+   if(bootDeviceID==BOOT_DEVICE_HDD){
+   /* Try not to adjust this unless you know what you are doing. The tricky part i keeping the NULL character in the middle of that argument list separated from the number 4. */
+   static const char PS2HDD_args[]="-o\0""2";
+   static const char PS2FS_args[]="-o\0""8";
+
+   if(!HDDModulesLoaded){
+      SifExecModuleBuffer(poweroff_irx_start, poweroff_irx_size, 0, NULL, NULL);
+      SifExecModuleBuffer(ps2dev9_irx_start, ps2dev9_irx_size, 0, NULL, NULL);
+      SifExecModuleBuffer(ps2atad_irx_start, ps2atad_irx_size, 0, NULL, NULL);
+      SifExecModuleBuffer(ps2hdd_irx_start, ps2hdd_irx_size, sizeof(PS2HDD_args), PS2HDD_args, NULL);
+      SifExecModuleBuffer(ps2fs_irx_start, ps2fs_irx_size, sizeof(PS2FS_args), PS2FS_args, NULL);
+      HDDModulesLoaded=1;
+   }
+      
+      //Attempt to mount the partition.
+      if((mountPoint=getMountParams(cwd, blockDevice))!=NULL && !strncmp(mountPoint, "pfs:", 4)){
+         fileXioMount("pfs0:", blockDevice, FIO_MT_RDWR);
+         
+         setPWDOnPFS(&mountPoint[4]);
+      }
+   } else if(bootDeviceID==BOOT_DEVICE_CDROM){
+      chdir(DEFAULT_PATH);
+   } else if(bootDeviceID==BOOT_DEVICE_MASS){
+      waitUntilDeviceIsReady(argv[0]);
+   } else if (bootDeviceID==BOOT_DEVICE_UNKNOWN) {
+
+   }
+
+   create_path_names();
+
+#ifndef IS_SALAMANDER
+   if (!string_is_empty(argv[1]))
+   {
+      static char path[PATH_MAX_LENGTH] = {0};
+      struct rarch_main_wrap      *args =
+         (struct rarch_main_wrap*)params_data;
+
+      if (args)
+      {
+         strlcpy(path, argv[1], sizeof(path));
+
+         args->touched        = true;
+         args->no_content     = false;
+         args->verbose        = false;
+         args->config_path    = NULL;
+         args->sram_path      = NULL;
+         args->state_path     = NULL;
+         args->content_path   = path;
+         args->libretro_path  = NULL;
+
+         RARCH_LOG("argv[0]: %s\n", argv[0]);
+         RARCH_LOG("argv[1]: %s\n", argv[1]);
+         RARCH_LOG("argv[2]: %s\n", argv[2]);
+
+         RARCH_LOG("Auto-start game %s.\n", argv[1]);
+      }
+   }
+#endif
+   int i;
+   for (i = 0; i < DEFAULT_DIR_LAST; i++)
+   {
+      const char *dir_path = g_defaults.dirs[i];
+      if (!string_is_empty(dir_path))
+         path_mkdir(dir_path);
+   }
+
+}
+
+static void frontend_ps2_init(void *data)
+{
+   SifInitRpc(0);
+#if !defined(DEBUG)
+   while(!SifIopReset(NULL, 0)){}; // Comment this line if you don't wanna debug the output
+#endif
+
+   while(!SifIopSync()){};
+   SifInitRpc(0);
+   sbv_patch_enable_lmb();
+
+   SifExecModuleBuffer(iomanX_irx_start, iomanX_irx_size, 0, NULL, NULL);
+   SifExecModuleBuffer(fileXio_irx_start, fileXio_irx_size, 0, NULL, NULL);
+   
+   SifLoadModule("rom0:SIO2MAN", 0, NULL);
+   SifLoadModule("rom0:MCMAN", 0, NULL);
+   SifLoadModule("rom0:MCSERV", 0, NULL);
+   SifLoadModule("rom0:PADMAN", 0, NULL);
+   
+   SifExecModuleBuffer(usbd_irx_start, usbd_irx_size, 0, NULL, NULL);
+   SifExecModuleBuffer(usbhdfsd_irx_start, usbhdfsd_irx_size, 0, NULL, NULL);
+   SifExecModuleBuffer(freesd_irx_start, freesd_irx_size, 0, NULL, NULL);
+   SifExecModuleBuffer(audsrv_irx_start, audsrv_irx_size, 0, NULL, NULL);
+
+   fileXioInit();
+   audsrv_init();
+
+   SDL_Init(SDL_INIT_TIMER);
+}
+
+static void frontend_ps2_deinit(void *data)
+{
+   (void)data;
+#ifndef IS_SALAMANDER
+   verbosity_disable();
+#ifdef HAVE_FILE_LOGGER
+   command_event(CMD_EVENT_LOG_FILE_DEINIT, NULL);
+#endif
+
+#endif
+   fileXioUmount("pfs0:");
+   fileXioExit();
+
+   SifExitRpc();
+}
+
+static void frontend_ps2_exec(const char *path, bool should_load_game)
+{
+#if defined(IS_SALAMANDER)
+   char argp[512] = {0};
+   SceSize   args = 0;
+
+   strlcpy(argp, eboot_path, sizeof(argp));
+   args = strlen(argp) + 1;
+
+#ifndef IS_SALAMANDER
+   if (should_load_game && !path_is_empty(RARCH_PATH_CONTENT))
+   {
+      argp[args] = '\0';
+      strlcat(argp + args, path_get(RARCH_PATH_CONTENT), sizeof(argp) - args);
+      args += strlen(argp + args) + 1;
+   }
+#endif
+
+   RARCH_LOG("Attempt to load executable: [%s].\n", path);
+   // exitspawn_kernel(path, args, argp); // I don't know what this is doing
+#endif
+}
+
+#ifndef IS_SALAMANDER
+static bool frontend_ps2_set_fork(enum frontend_fork fork_mode)
+{
+   switch (fork_mode)
+   {
+      case FRONTEND_FORK_CORE:
+         RARCH_LOG("FRONTEND_FORK_CORE\n");
+         ps2_fork_mode  = fork_mode;
+         break;
+      case FRONTEND_FORK_CORE_WITH_ARGS:
+         RARCH_LOG("FRONTEND_FORK_CORE_WITH_ARGS\n");
+         ps2_fork_mode  = fork_mode;
+         break;
+      case FRONTEND_FORK_RESTART:
+         RARCH_LOG("FRONTEND_FORK_RESTART\n");
+         /* NOTE: We don't implement Salamander, so just turn
+          * this into FRONTEND_FORK_CORE. */
+         ps2_fork_mode  = FRONTEND_FORK_CORE;
+         break;
+      case FRONTEND_FORK_NONE:
+      default:
+         return false;
+   }
+
+   return true;
+}
+#endif
+
+static void frontend_ps2_exitspawn(char *core_path, size_t core_path_size)
+{
+   bool should_load_game = false;
+#ifndef IS_SALAMANDER
+   if (ps2_fork_mode == FRONTEND_FORK_NONE)
+      return;
+
+   switch (ps2_fork_mode)
+   {
+      case FRONTEND_FORK_CORE_WITH_ARGS:
+         should_load_game = true;
+         break;
+      case FRONTEND_FORK_NONE:
+      default:
+         break;
+   }
+#endif
+   frontend_ps2_exec(core_path, should_load_game);
+}
+
+static void frontend_ps2_shutdown(bool unused)
+{
+   poweroffInit();
+   //Set callback function
+	poweroffSetCallback(&poweroffCallback, NULL);
+}
+
+static int frontend_ps2_get_rating(void)
+{
+    return 10;
+}
+
+enum frontend_architecture frontend_ps2_get_architecture(void)
+{
+    return FRONTEND_ARCH_MIPS;
+}
+
+static int frontend_ps2_parse_drive_list(void *data, bool load_content)
+{
+#ifndef IS_SALAMANDER
+   file_list_t *list = (file_list_t*)data;
+   enum msg_hash_enums enum_idx = load_content ?
+      MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR :
+      MSG_UNKNOWN;
+
+   menu_entries_append_enum(list,
+         "mc0:/",
+         msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
+         enum_idx,
+         FILE_TYPE_DIRECTORY, 0, 0);
+   menu_entries_append_enum(list,
+         "mc1:/",
+         msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
+         enum_idx,
+         FILE_TYPE_DIRECTORY, 0, 0);
+   menu_entries_append_enum(list,
+         "mass:/",
+         msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
+         enum_idx,
+         FILE_TYPE_DIRECTORY, 0, 0);
+   menu_entries_append_enum(list,
+         "hdd0:/",
+         msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
+         enum_idx,
+         FILE_TYPE_DIRECTORY, 0, 0);
+   menu_entries_append_enum(list,
+         "host:/",
+         msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
+         enum_idx,
+         FILE_TYPE_DIRECTORY, 0, 0);
+#endif
+
+   return 0;
+}
+
+frontend_ctx_driver_t frontend_ctx_ps2 = {
+   frontend_ps2_get_environment_settings,                         /* environment_get */
+   frontend_ps2_init,                         /* init */
+   frontend_ps2_deinit,                         /* deinit */
+   frontend_ps2_exitspawn,                         /* exitspawn */
+   NULL,                         /* process_args */
+   frontend_ps2_exec,                         /* exec */
+   #ifdef IS_SALAMANDER
+   NULL,                         /* set_fork */
+#else
+   frontend_ps2_set_fork,                         /* set_fork */
+#endif
+   frontend_ps2_shutdown,                         /* shutdown */
+   NULL,                         /* get_name */
+   NULL,                         /* get_os */
+   frontend_ps2_get_rating,                         /* get_rating */
+   NULL,                         /* load_content */
+   frontend_ps2_get_architecture,                         /* get_architecture */
+   NULL,                         /* get_powerstate */
+   frontend_ps2_parse_drive_list,                         /* parse_drive_list */
+   NULL,                         /* get_mem_total */
+   NULL,                         /* get_mem_free */
+   NULL,                         /* install_signal_handler */
+   NULL,                         /* get_sighandler_state */
+   NULL,                         /* set_sighandler_state */
+   NULL,                         /* destroy_sighandler_state */
+   NULL,                         /* attach_console */
+   NULL,                         /* detach_console */
+#ifdef HAVE_LAKKA
+   NULL,                         /* get_lakka_version */
+#endif
+   NULL,                         /* watch_path_for_changes */
+   NULL,                         /* check_for_path_changes */
+   NULL,                         /* set_sustained_performance_mode */
+   "null",
+};
diff --git a/frontend/drivers/platform_switch.c b/frontend/drivers/platform_switch.c
index 39cb228a47..756c9b8151 100644
--- a/frontend/drivers/platform_switch.c
+++ b/frontend/drivers/platform_switch.c
@@ -62,10 +62,19 @@ static uint32_t *splashData = NULL;
 
 static bool psmInitialized = false;
 
+static AppletHookCookie applet_hook_cookie;
+
 #ifdef NXLINK
 extern bool nxlink_connected;
 #endif
 
+static void on_applet_hook(AppletHookType hook, void* param) {
+   if(hook == AppletHookType_OnExitRequest) {
+      RARCH_LOG("Got AppletHook OnExitRequest, exiting.\n");
+      retroarch_main_quit();
+   }
+}
+
 #endif /* HAVE_LIBNX */
 
 static void get_first_valid_core(char *path_return)
@@ -191,6 +200,7 @@ static void frontend_switch_deinit(void *data)
    (void)data;
 
 #ifdef HAVE_LIBNX
+   nifmExit();
 #if defined(SWITCH) && defined(NXLINK)
    socketExit();
 #endif
@@ -208,6 +218,7 @@ static void frontend_switch_deinit(void *data)
 #ifndef HAVE_OPENGL
    gfxExit();
 #endif
+   appletUnlockExit();
 #endif
 }
 
@@ -607,6 +618,9 @@ static void frontend_switch_init(void *data)
    (void)data;
 
 #ifdef HAVE_LIBNX
+   nifmInitialize();
+   appletLockExit();
+   appletHook(&applet_hook_cookie, on_applet_hook, NULL);
 #ifndef HAVE_OPENGL
    /* Init Resolution before initDefault */
    gfxInitResolution(1280, 720);
@@ -616,6 +630,9 @@ static void frontend_switch_init(void *data)
 
    gfxConfigureTransform(0);
 #endif /* HAVE_OPENGL */
+
+   appletInitializeGamePlayRecording();
+
 #ifdef NXLINK
    socketInitializeDefault();
    nxlink_connected = nxlinkStdio() != -1;
diff --git a/frontend/drivers/platform_unix.c b/frontend/drivers/platform_unix.c
index f63c819d21..ddce3cc9c0 100644
--- a/frontend/drivers/platform_unix.c
+++ b/frontend/drivers/platform_unix.c
@@ -565,6 +565,9 @@ static bool device_is_xperia_play(const char *name)
          strstr(name, "R800at") ||
          strstr(name, "R800i") ||
          strstr(name, "R800a") ||
+         strstr(name, "R800") ||
+         strstr(name, "Xperia Play") ||
+         strstr(name, "Play") ||
          strstr(name, "SO-01D")
       )
       return true;
diff --git a/frontend/drivers/platform_wiiu.c b/frontend/drivers/platform_wiiu.c
index 1976beb86a..69e9ffc7c4 100644
--- a/frontend/drivers/platform_wiiu.c
+++ b/frontend/drivers/platform_wiiu.c
@@ -530,6 +530,9 @@ static void wiiu_log_init(int port)
 {
    wiiu_log_lock = 0;
 
+   if(wiiu_log_socket >= 0)
+      return;
+
    if(broadcast_init(port) < 0)
       return;
 
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index d846ed5928..b8ff69a442 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -56,6 +56,9 @@ static frontend_ctx_driver_t *frontend_ctx_drivers[] = {
 #if defined(PSP) || defined(VITA)
    &frontend_ctx_psp,
 #endif
+#if defined(PS2)
+   &frontend_ctx_ps2,
+#endif
 #if defined(_3DS)
    &frontend_ctx_ctr,
 #endif
@@ -141,6 +144,9 @@ bool frontend_driver_get_core_extension(char *s, size_t len)
 #elif defined(VITA)
    strlcpy(s, "self|bin", len);
    return true;
+#elif defined(PS2)
+   strlcpy(s, "elf", len);
+   return true;
 #elif defined(_XBOX1)
    strlcpy(s, "xbe", len);
    return true;
@@ -187,6 +193,9 @@ bool frontend_driver_get_salamander_basename(char *s, size_t len)
 #elif defined(VITA)
    strlcpy(s, "eboot.bin", len);
    return true;
+#elif defined(PS2)
+   strlcpy(s, "eboot.elf", len);
+   return true;
 #elif defined(_XBOX1)
    strlcpy(s, "default.xbe", len);
    return true;
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index c6092ad7ef..f5de976563 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -120,6 +120,7 @@ extern frontend_ctx_driver_t frontend_ctx_qnx;
 extern frontend_ctx_driver_t frontend_ctx_darwin;
 extern frontend_ctx_driver_t frontend_ctx_unix;
 extern frontend_ctx_driver_t frontend_ctx_psp;
+extern frontend_ctx_driver_t frontend_ctx_ps2;
 extern frontend_ctx_driver_t frontend_ctx_ctr;
 extern frontend_ctx_driver_t frontend_ctx_switch;
 extern frontend_ctx_driver_t frontend_ctx_win32;
diff --git a/gfx/common/gdi_common.h b/gfx/common/gdi_common.h
index ddb33b3fb3..3fc5423f9f 100644
--- a/gfx/common/gdi_common.h
+++ b/gfx/common/gdi_common.h
@@ -34,6 +34,8 @@ typedef struct gdi
    unsigned video_height;
    unsigned screen_width;
    unsigned screen_height;
+   void *ctx_data;
+   const gfx_ctx_driver_t *ctx_driver;
 } gdi_t;
 
 typedef struct gdi_texture
diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h
index 41a52f2bd5..893fdfb709 100644
--- a/gfx/common/gl_common.h
+++ b/gfx/common/gl_common.h
@@ -19,6 +19,7 @@
 
 #include <boolean.h>
 #include <string.h>
+#include <libretro.h>
 #include <retro_common_api.h>
 
 #ifdef HAVE_CONFIG_H
@@ -316,6 +317,8 @@ struct gl
 
    const gl_renderchain_driver_t *renderchain_driver;
    void *renderchain_data;
+   void *ctx_data;
+   const gfx_ctx_driver_t *ctx_driver;
 };
 
 static INLINE void gl_bind_texture(GLuint id, GLint wrap_mode, GLint mag_filter,
@@ -386,6 +389,23 @@ static INLINE GLenum gl_min_filter_to_mag(GLenum type)
    return type;
 }
 
+static INLINE bool gl_set_core_context(enum retro_hw_context_type ctx_type)
+{
+   gfx_ctx_flags_t flags;
+   if (ctx_type != RETRO_HW_CONTEXT_OPENGL_CORE)
+      return false;
+
+   /**
+    * Ensure that the rest of the frontend knows we have a core context
+    */
+   flags.flags = 0;
+   BIT32_SET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT);
+
+   video_context_driver_set_flags(&flags);
+
+   return true;
+}
+
 RETRO_END_DECLS
 
 #endif
diff --git a/gfx/common/metal/Context.h b/gfx/common/metal/Context.h
index 7e8e7eab7c..5068df92a2 100644
--- a/gfx/common/metal/Context.h
+++ b/gfx/common/metal/Context.h
@@ -61,6 +61,9 @@ typedef struct
 /*! @brief resets the viewport for the main render encoder to the drawable size */
 - (void)resetRenderViewport;
 
+/*! @brief resets the scissor rect for the main render encoder to the drawable size */
+- (void)resetScissorRect;
+
 /*! @brief draws a quad at the specified position (normalized coordinates) using the main render encoder */
 - (void)drawQuadX:(float)x y:(float)y w:(float)w h:(float)h
                 r:(float)r g:(float)g b:(float)b a:(float)a;
diff --git a/gfx/common/metal/Context.m b/gfx/common/metal/Context.m
index 00ca54e3f4..69d1c059f6 100644
--- a/gfx/common/metal/Context.m
+++ b/gfx/common/metal/Context.m
@@ -565,6 +565,17 @@
    [self.rce setViewport:vp];
 }
 
+- (void)resetScissorRect
+{
+   MTLScissorRect sr = {
+      .x       = 0,
+      .y       = 0,
+      .width   = _viewport.full_width,
+      .height  = _viewport.full_height,
+   };
+   [self.rce setScissorRect:sr];
+}
+
 - (void)drawQuadX:(float)x y:(float)y w:(float)w h:(float)h
                 r:(float)r g:(float)g b:(float)b a:(float)a
 {
diff --git a/gfx/common/metal/MenuDisplay.h b/gfx/common/metal/MenuDisplay.h
index 12d5bbd6fd..734e6489d0 100644
--- a/gfx/common/metal/MenuDisplay.h
+++ b/gfx/common/metal/MenuDisplay.h
@@ -14,6 +14,8 @@
 - (instancetype)initWithContext:(Context *)context;
 - (void)drawPipeline:(menu_display_ctx_draw_t *)draw video:(video_frame_info_t *)video;
 - (void)draw:(menu_display_ctx_draw_t *)draw video:(video_frame_info_t *)video;
+- (void)setScissorRect:(MTLScissorRect)rect;
+- (void)clearScissorRect;
 
 #pragma mark - static methods
 
diff --git a/gfx/common/metal/MenuDisplay.m b/gfx/common/metal/MenuDisplay.m
index cde9edc265..c5ad4e3c52 100644
--- a/gfx/common/metal/MenuDisplay.m
+++ b/gfx/common/metal/MenuDisplay.m
@@ -14,8 +14,10 @@
 {
    Context *_context;
    MTLClearColor _clearColor;
-   bool _clearNextRender;
+   MTLScissorRect _scissorRect;
+   BOOL _useScissorRect;
    Uniforms _uniforms;
+   bool _clearNextRender;
 }
 
 - (instancetype)initWithContext:(Context *)context
@@ -25,6 +27,7 @@
       _context = context;
       _clearColor = MTLClearColorMake(0.0, 0.0, 0.0, 1.0);
       _uniforms.projectionMatrix = matrix_proj_ortho(0, 1, 0, 1);
+      _useScissorRect = NO;
    }
    return self;
 }
@@ -73,6 +76,19 @@
    return _clearColor;
 }
 
+- (void)setScissorRect:(MTLScissorRect)rect
+{
+   _scissorRect = rect;
+   _useScissorRect = YES;
+}
+
+- (void)clearScissorRect
+{
+   _useScissorRect = NO;
+   [_context resetScissorRect];
+}
+
+
 - (MTLPrimitiveType)_toPrimitiveType:(enum menu_display_prim_type)prim
 {
    switch (prim)
@@ -181,6 +197,10 @@
    };
    [rce setViewport:vp];
    
+   if (_useScissorRect) {
+      [rce setScissorRect:_scissorRect];
+   }
+   
    switch (draw->pipeline.id)
    {
 #if HAVE_SHADERPIPELINE
diff --git a/gfx/common/metal/TexturedView.m b/gfx/common/metal/TexturedView.m
index 89859ec2b0..e41355f3a5 100644
--- a/gfx/common/metal/TexturedView.m
+++ b/gfx/common/metal/TexturedView.m
@@ -86,20 +86,16 @@
    
    _frame = frame;
    
-   // update vertices
-   CGPoint o = frame.origin;
-   CGSize s = frame.size;
-   
-   float l = o.x;
-   float t = o.y;
-   float r = o.x + s.width;
-   float b = o.y + s.height;
+   float l = (float)CGRectGetMinX(frame);
+   float t = (float)CGRectGetMinY(frame);
+   float r = (float)CGRectGetMaxX(frame);
+   float b = (float)CGRectGetMaxY(frame);
    
    Vertex v[4] = {
-      {{l, b, 0}, {0, 1}},
-      {{r, b, 0}, {1, 1}},
-      {{l, t, 0}, {0, 0}},
-      {{r, t, 0}, {1, 0}},
+      {simd_make_float3(l, b, 0), simd_make_float2(0, 1)},
+      {simd_make_float3(r, b, 0), simd_make_float2(1, 1)},
+      {simd_make_float3(l, t, 0), simd_make_float2(0, 0)},
+      {simd_make_float3(r, t, 0), simd_make_float2(1, 0)},
    };
    memcpy(_v, v, sizeof(_v));
 }
diff --git a/gfx/common/metal_common.m b/gfx/common/metal_common.m
index 3358883392..2c2129d911 100644
--- a/gfx/common/metal_common.m
+++ b/gfx/common/metal_common.m
@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 #import "metal_common.h"
-#import "../../ui/drivers/cocoa/cocoa_common.h"
+#import "../../ui/drivers/cocoa/cocoa_common_metal.h"
 #import <memory.h>
 #import <gfx/video_frame.h>
 #import <Metal/Metal.h>
diff --git a/gfx/common/sixel_common.h b/gfx/common/sixel_common.h
index 5d6e40ced1..f53438f0eb 100644
--- a/gfx/common/sixel_common.h
+++ b/gfx/common/sixel_common.h
@@ -29,6 +29,8 @@ typedef struct sixel
    unsigned video_height;
    unsigned screen_width;
    unsigned screen_height;
+   void *ctx_data;
+   const gfx_ctx_driver_t *ctx_driver;
 } sixel_t;
 
 #endif
diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 503922603c..24402cddba 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -979,10 +979,18 @@ static void vulkan_check_dynamic_state(
    {
       VkRect2D sci;
 
-      sci.offset.x      = vk->vp.x;
-      sci.offset.y      = vk->vp.y;
-      sci.extent.width  = vk->vp.width;
-      sci.extent.height = vk->vp.height;
+      if (vk->tracker.use_scissor)
+      {
+         sci = vk->tracker.scissor;
+      }
+      else
+      {
+         /* No scissor -> viewport */
+         sci.offset.x      = vk->vp.x;
+         sci.offset.y      = vk->vp.y;
+         sci.extent.width  = vk->vp.width;
+         sci.extent.height = vk->vp.height;
+      }
 
       vkCmdSetViewport(vk->cmd, 0, 1, &vk->vk_vp);
       vkCmdSetScissor (vk->cmd, 0, 1, &sci);
diff --git a/gfx/common/vulkan_common.h b/gfx/common/vulkan_common.h
index e4e3a50570..a66544af6a 100644
--- a/gfx/common/vulkan_common.h
+++ b/gfx/common/vulkan_common.h
@@ -332,6 +332,8 @@ typedef struct vk
 
    vulkan_context_t *context;
    video_info_t video;
+   void *ctx_data;
+   const gfx_ctx_driver_t *ctx_driver;
 
    VkFormat tex_fmt;
    math_matrix_4x4 mvp, mvp_no_rot;
@@ -421,6 +423,8 @@ typedef struct vk
    struct
    {
       uint64_t dirty;
+      VkRect2D scissor;
+      bool use_scissor;
       VkPipeline pipeline;
       VkImageView view;
       VkSampler sampler;
@@ -499,6 +503,7 @@ static INLINE unsigned vulkan_format_to_bpp(VkFormat format)
          return 4;
 
       case VK_FORMAT_R4G4B4A4_UNORM_PACK16:
+      case VK_FORMAT_B4G4R4A4_UNORM_PACK16:
       case VK_FORMAT_R5G6B5_UNORM_PACK16:
          return 2;
 
diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index 74a5c074d2..4857e09dd7 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -47,6 +47,12 @@
 #include "../../tasks/tasks_internal.h"
 #endif
 
+/* An annoyance...
+ * Have to keep track of bottom screen enable state
+ * externally, otherwise cannot detect current state
+ * when reinitialising... */
+static bool ctr_bottom_screen_enabled = true;
+
 static INLINE void ctr_check_3D_slider(ctr_video_t* ctr)
 {
    float slider_val             = *(float*)0x1FF81080;
@@ -263,7 +269,7 @@ static void ctr_lcd_aptHook(APT_HookType hook, void* param)
       if(not_2DS && srvGetServiceHandle(&lcd_handle, "gsp::Lcd") >= 0)
       {
          u32 *cmdbuf = getThreadCommandBuffer();
-         cmdbuf[0] = ((hook == APTHOOK_ONSUSPEND) || ctr->lcd_buttom_on)? 0x00110040: 0x00120040;
+         cmdbuf[0] = ((hook == APTHOOK_ONSUSPEND) || ctr_bottom_screen_enabled)? 0x00110040: 0x00120040;
          cmdbuf[1] = 2;
          svcSendSyncRequest(lcd_handle);
          svcCloseHandle(lcd_handle);
@@ -283,11 +289,38 @@ static bool ctr_tasks_finder(retro_task_t *task,void *userdata)
 task_finder_data_t ctr_tasks_finder_data = {ctr_tasks_finder, NULL};
 #endif
 
+static void ctr_set_bottom_screen_enable(void* data, bool enabled)
+{
+   Handle lcd_handle;
+   u8 not_2DS;
+   extern PrintConsole* currentConsole;
+   ctr_video_t *ctr = (ctr_video_t*)data;
+
+    if (!ctr)
+      return;
+
+   gfxBottomFramebuffers[0] = enabled ? (u8*)currentConsole->frameBuffer:
+                                        (u8*)ctr->empty_framebuffer;
+
+   CFGU_GetModelNintendo2DS(&not_2DS);
+   if(not_2DS && srvGetServiceHandle(&lcd_handle, "gsp::Lcd") >= 0)
+   {
+      u32 *cmdbuf = getThreadCommandBuffer();
+      cmdbuf[0] = enabled? 0x00110040:  0x00120040;
+      cmdbuf[1] = 2;
+      svcSendSyncRequest(lcd_handle);
+      svcCloseHandle(lcd_handle);
+   }
+
+   ctr_bottom_screen_enabled = enabled;
+}
+
 static void* ctr_init(const video_info_t* video,
       const input_driver_t** input, void** input_data)
 {
    float refresh_rate;
    void* ctrinput   = NULL;
+   settings_t *settings = config_get_ptr();
    ctr_video_t* ctr = (ctr_video_t*)linearAlloc(sizeof(ctr_video_t));
 
    if (!ctr)
@@ -415,7 +448,6 @@ static void* ctr_init(const video_info_t* video,
 
    if (input && input_data)
    {
-      settings_t *settings = config_get_ptr();
       ctrinput             = input_ctr.init(settings->arrays.input_joypad_driver);
       *input               = ctrinput ? &input_ctr : NULL;
       *input_data          = ctrinput;
@@ -425,7 +457,7 @@ static void* ctr_init(const video_info_t* video,
    ctr->should_resize = true;
    ctr->smooth        = video->smooth;
    ctr->vsync         = video->vsync;
-   ctr->lcd_buttom_on = true;
+   ctr->lcd_buttom_on = true; /* Unused */
    ctr->current_buffer_top = 0;
 
    ctr->empty_framebuffer = linearAlloc(320 * 240 * 2);
@@ -444,6 +476,11 @@ static void* ctr_init(const video_info_t* video,
    ctr->menu_texture_frame_enable = false;
    ctr->menu_texture_enable = false;
 
+   /* Set bottom screen enable state, if required */
+   if (settings->bools.video_3ds_lcd_bottom != ctr_bottom_screen_enabled) {
+      ctr_set_bottom_screen_enable(ctr, settings->bools.video_3ds_lcd_bottom);
+   }
+
    gspSetEventCallback(GSPGPU_EVENT_VBlank0, (ThreadFunc)ctr_vsync_hook, ctr, false);
 
    return ctr;
@@ -494,24 +531,7 @@ static bool ctr_frame(void* data, const void* frame,
    hidTouchRead(&state_tmp_touch);
    if((state_tmp & KEY_TOUCH) && (state_tmp_touch.py < 120))
    {
-      Handle lcd_handle;
-      u8 not_2DS;
-      extern PrintConsole* currentConsole;
-
-      gfxBottomFramebuffers[0] = ctr->lcd_buttom_on ? (u8*)ctr->empty_framebuffer:
-                                                      (u8*)currentConsole->frameBuffer;
-
-      CFGU_GetModelNintendo2DS(&not_2DS);
-      if(not_2DS && srvGetServiceHandle(&lcd_handle, "gsp::Lcd") >= 0)
-      {
-         u32 *cmdbuf = getThreadCommandBuffer();
-         cmdbuf[0] = ctr->lcd_buttom_on? 0x00120040:  0x00110040;
-         cmdbuf[1] = 2;
-         svcSendSyncRequest(lcd_handle);
-         svcCloseHandle(lcd_handle);
-      }
-
-      ctr->lcd_buttom_on = !ctr->lcd_buttom_on;
+      ctr_set_bottom_screen_enable(ctr, !ctr_bottom_screen_enabled);
    }
 
 
diff --git a/gfx/drivers/d3d10.c b/gfx/drivers/d3d10.c
index dd08fdf786..b123cda661 100644
--- a/gfx/drivers/d3d10.c
+++ b/gfx/drivers/d3d10.c
@@ -23,6 +23,8 @@
 #include "../../driver.h"
 #include "../../verbosity.h"
 #include "../../configuration.h"
+#include "../../retroarch.h"
+
 #include "../video_driver.h"
 #include "../font_driver.h"
 #include "../common/win32_common.h"
@@ -909,10 +911,10 @@ d3d10_gfx_init(const video_info_t* video,
 
    if (settings->bools.video_shader_enable)
    {
-      const char* ext = path_get_extension(settings->paths.path_shader);
+      const char* ext = path_get_extension(retroarch_get_shader_preset());
 
       if (ext && !strncmp(ext, "slang", 5))
-         d3d10_gfx_set_shader(d3d10, RARCH_SHADER_SLANG, settings->paths.path_shader);
+         d3d10_gfx_set_shader(d3d10, RARCH_SHADER_SLANG, retroarch_get_shader_preset());
    }
 
 #if 0
diff --git a/gfx/drivers/d3d11.c b/gfx/drivers/d3d11.c
index 405894bbef..137ad02525 100644
--- a/gfx/drivers/d3d11.c
+++ b/gfx/drivers/d3d11.c
@@ -25,6 +25,7 @@
 #include "../../driver.h"
 #include "../../verbosity.h"
 #include "../configuration.h"
+#include "../../retroarch.h"
 #include "../video_driver.h"
 #include "../font_driver.h"
 #include "../common/win32_common.h"
@@ -954,10 +955,10 @@ d3d11_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
 
    if (settings->bools.video_shader_enable)
    {
-      const char* ext = path_get_extension(settings->paths.path_shader);
+      const char* ext = path_get_extension(retroarch_get_shader_preset());
 
       if (ext && !strncmp(ext, "slang", 5))
-         d3d11_gfx_set_shader(d3d11, RARCH_SHADER_SLANG, settings->paths.path_shader);
+         d3d11_gfx_set_shader(d3d11, RARCH_SHADER_SLANG, retroarch_get_shader_preset());
    }
 
    if (video_driver_get_hw_context()->context_type == RETRO_HW_CONTEXT_DIRECT3D &&
diff --git a/gfx/drivers/d3d12.c b/gfx/drivers/d3d12.c
index 0f2ab31178..c4dab9fcc3 100644
--- a/gfx/drivers/d3d12.c
+++ b/gfx/drivers/d3d12.c
@@ -31,6 +31,7 @@
 #include "../../driver.h"
 #include "../../verbosity.h"
 #include "../../configuration.h"
+#include "../../retroarch.h"
 
 #include "wiiu/wiiu_dbg.h"
 
@@ -971,10 +972,10 @@ d3d12_gfx_init(const video_info_t* video, const input_driver_t** input, void** i
 
    if (settings->bools.video_shader_enable)
    {
-      const char* ext = path_get_extension(settings->paths.path_shader);
+      const char* ext = path_get_extension(retroarch_get_shader_preset());
 
       if (ext && string_is_equal(ext, "slangp"))
-         d3d12_gfx_set_shader(d3d12, RARCH_SHADER_SLANG, settings->paths.path_shader);
+         d3d12_gfx_set_shader(d3d12, RARCH_SHADER_SLANG, retroarch_get_shader_preset());
    }
 
    return d3d12;
diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c
index 6b820c1e18..b2c438961b 100644
--- a/gfx/drivers/gdi_gfx.c
+++ b/gfx/drivers/gdi_gfx.c
@@ -30,6 +30,7 @@
 
 #include "../../driver.h"
 #include "../../configuration.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../frontend/frontend_driver.h"
 #include "../common/gdi_common.h"
@@ -82,6 +83,7 @@ static void *gdi_gfx_init(const video_info_t *video,
    unsigned full_x, full_y;
    gfx_ctx_input_t inp;
    gfx_ctx_mode_t mode;
+   void *ctx_data                       = NULL;
    const gfx_ctx_driver_t *ctx_driver   = NULL;
    unsigned win_width = 0, win_height   = 0;
    unsigned temp_width = 0, temp_height = 0;
@@ -106,10 +108,14 @@ static void *gdi_gfx_init(const video_info_t *video,
 
    ctx_driver = video_context_driver_init_first(gdi,
          settings->arrays.video_context_driver,
-         GFX_CTX_GDI_API, 1, 0, false);
+         GFX_CTX_GDI_API, 1, 0, false, &ctx_data);
    if (!ctx_driver)
       goto error;
 
+   if (ctx_data)
+      gdi->ctx_data = ctx_data;
+
+   gdi->ctx_driver = ctx_driver;
    video_context_driver_set((const gfx_ctx_driver_t*)ctx_driver);
 
    RARCH_LOG("[GDI]: Found GDI context: %s\n", ctx_driver->ident);
@@ -193,8 +199,9 @@ static bool gdi_gfx_frame(void *data, const void *frame,
    HWND hwnd                 = win32_get_window();
    BITMAPINFO *info;
 
-   /* FIXME */
+   /* FIXME: Force these settings off as they interfere with the rendering */
    video_info->xmb_shadows_enable = false;
+   video_info->menu_shader_pipeline = 0;
 
    if (!frame || !frame_width || !frame_height)
       return true;
@@ -355,23 +362,21 @@ static void gdi_gfx_set_nonblock_state(void *data, bool toggle)
 
 static bool gdi_gfx_alive(void *data)
 {
-   gfx_ctx_size_t size_data;
    unsigned temp_width  = 0;
    unsigned temp_height = 0;
    bool quit            = false;
    bool resize          = false;
    bool ret             = false;
+   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
+   gdi_t *gdi           = (gdi_t*)data;
 
    /* Needed because some context drivers don't track their sizes */
    video_driver_get_size(&temp_width, &temp_height);
 
-   size_data.quit       = &quit;
-   size_data.resize     = &resize;
-   size_data.width      = &temp_width;
-   size_data.height     = &temp_height;
+   gdi->ctx_driver->check_window(gdi->ctx_data,
+            &quit, &resize, &temp_width, &temp_height, is_shutdown);
 
-   if (video_context_driver_check_window(&size_data))
-      ret = !quit;
+   ret = !quit;
 
    if (temp_width != 0 && temp_height != 0)
       video_driver_set_size(&temp_width, &temp_height);
@@ -401,7 +406,7 @@ static bool gdi_gfx_has_windowed(void *data)
 static void gdi_gfx_free(void *data)
 {
    gdi_t *gdi = (gdi_t*)data;
-   HWND hwnd = win32_get_window();
+   HWND hwnd  = win32_get_window();
 
    if (gdi_menu_frame)
    {
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index aa0f52dba7..f9b93604fd 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -118,10 +118,14 @@ static const GLfloat white_color[] = {
 
 static bool gl_shared_context_use = false;
 
-void context_bind_hw_render(bool enable)
+#define gl_context_bind_hw_render(gl, enable) \
+   if (gl_shared_context_use) \
+      gl->ctx_driver->bind_hw_render(gl->ctx_data, enable)
+
+void context_bind_hw_render(void *data, bool enable)
 {
-   if (gl_shared_context_use)
-      video_context_driver_bind_hw_render(&enable);
+   gl_t *gl = (gl_t*)data;
+   gl_context_bind_hw_render(gl, enable);
 }
 
 
@@ -210,8 +214,9 @@ static void gl_render_overlay(gl_t *gl, video_frame_info_t *video_info)
       glViewport(0, 0, width, height);
 
    /* Ensure that we reset the attrib array. */
-   video_info->cb_shader_use(gl,
-         video_info->shader_data, VIDEO_SHADER_STOCK_BLEND, true);
+   if (video_info->shader_driver && video_info->shader_driver->use)
+      video_info->shader_driver->use(gl,
+            video_info->shader_data, VIDEO_SHADER_STOCK_BLEND, true);
 
    gl->coords.vertex    = gl->overlay_vertex_coord;
    gl->coords.tex_coord = gl->overlay_tex_coord;
@@ -580,19 +585,17 @@ static void gl_init_textures(gl_t *gl, const video_info_t *video)
 static INLINE void gl_set_shader_viewports(gl_t *gl)
 {
    unsigned i, width, height;
-   video_shader_ctx_info_t shader_info;
    video_frame_info_t video_info;
 
    video_driver_build_info(&video_info);
    video_driver_get_size(&width, &height);
 
-   shader_info.data       = gl;
-   shader_info.set_active = true;
-
    for (i = 0; i < 2; i++)
    {
-      shader_info.idx        = i;
-      video_shader_driver_use(&shader_info);
+      if (video_info.shader_driver && video_info.shader_driver->use)
+         video_info.shader_driver->use(gl,
+               video_info.shader_data, i, true);
+
       gl_set_viewport(gl, &video_info,
             width, height, false, true);
    }
@@ -678,7 +681,7 @@ static void gl_set_texture_frame(void *data,
    if (!gl)
       return;
 
-   context_bind_hw_render(false);
+   gl_context_bind_hw_render(gl, false);
 
    menu_filter = settings->bools.menu_linear_filter ? TEXTURE_FILTER_LINEAR : TEXTURE_FILTER_NEAREST;
 
@@ -695,7 +698,7 @@ static void gl_set_texture_frame(void *data,
    gl->menu_texture_alpha = alpha;
    glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
 
-   context_bind_hw_render(true);
+   gl_context_bind_hw_render(gl, true);
 }
 
 static void gl_set_texture_enable(void *data, bool state, bool full_screen)
@@ -777,8 +780,9 @@ static void gl_render_osd_background(
    video_driver_set_viewport(video_info->width,
          video_info->height, true, false);
 
-   video_info->cb_shader_use(gl,
-         video_info->shader_data, VIDEO_SHADER_STOCK_BLEND, true);
+   if (video_info->shader_driver && video_info->shader_driver->use)
+      video_info->shader_driver->use(gl,
+            video_info->shader_data, VIDEO_SHADER_STOCK_BLEND, true);
 
    video_driver_set_coords(&coords_data);
 
@@ -877,8 +881,9 @@ static INLINE void gl_draw_texture(gl_t *gl, video_frame_info_t *video_info)
 
    glBindTexture(GL_TEXTURE_2D, gl->menu_texture);
 
-   video_info->cb_shader_use(gl,
-         video_info->shader_data, VIDEO_SHADER_STOCK_BLEND, true);
+   if (video_info->shader_driver && video_info->shader_driver->use)
+      video_info->shader_driver->use(gl,
+            video_info->shader_data, VIDEO_SHADER_STOCK_BLEND, true);
 
    gl->coords.vertices    = 4;
 
@@ -953,17 +958,19 @@ static bool gl_frame(void *data, const void *frame,
       return false;
 
 #ifdef HAVE_LIBNX
-   /* Should be called once per frame */
+   // Should be called once per frame
    if(!appletMainLoop())
     return false;
 #endif
 
-   context_bind_hw_render(false);
+   gl_context_bind_hw_render(gl, false);
 
    if (gl->core_context_in_use && gl->renderchain_driver->bind_vao)
       gl->renderchain_driver->bind_vao(gl, gl->renderchain_data);
 
-   video_info->cb_shader_use(gl, video_info->shader_data, 1, true);
+   if (video_info->shader_driver && video_info->shader_driver->use)
+      video_info->shader_driver->use(gl,
+            video_info->shader_data, 1, true);
 
 #ifdef IOS
    /* Apparently the viewport is lost each frame, thanks Apple. */
@@ -1164,7 +1171,9 @@ static bool gl_frame(void *data, const void *frame,
    /* Reset state which could easily mess up libretro core. */
    if (gl->hw_render_fbo_init)
    {
-      video_info->cb_shader_use(gl, video_info->shader_data, 0, true);
+      if (video_info->shader_driver && video_info->shader_driver->use)
+         video_info->shader_driver->use(gl,
+               video_info->shader_data, 0, true);
 
       glBindTexture(GL_TEXTURE_2D, 0);
       if (gl->renderchain_driver->disable_client_arrays)
@@ -1226,7 +1235,7 @@ static bool gl_frame(void *data, const void *frame,
       gl->renderchain_driver->unbind_vao(gl,
             gl->renderchain_data);
 
-   context_bind_hw_render(true);
+   gl_context_bind_hw_render(gl, true);
 
    return true;
 }
@@ -1266,7 +1275,7 @@ static void gl_free(void *data)
    if (!gl)
       return;
 
-   context_bind_hw_render(false);
+   gl_context_bind_hw_render(gl, false);
 
    if (gl->have_sync)
    {
@@ -1332,13 +1341,13 @@ static void gl_set_nonblock_state(void *data, bool state)
 
    RARCH_LOG("[GL]: VSync => %s\n", state ? "off" : "on");
 
-   context_bind_hw_render(false);
+   gl_context_bind_hw_render(gl, false);
 
    if (!state)
       interval = settings->uints.video_swap_interval;
 
    video_context_driver_swap_interval(&interval);
-   context_bind_hw_render(true);
+   gl_context_bind_hw_render(gl, true);
 }
 
 static bool resolve_extensions(gl_t *gl, const char *context_ident, const video_info_t *video)
@@ -1501,48 +1510,48 @@ static bool gl_init_pbo_readback(gl_t *gl)
 static const gfx_ctx_driver_t *gl_get_context(gl_t *gl)
 {
    enum gfx_ctx_api api;
+   const gfx_ctx_driver_t *gfx_ctx      = NULL;
+   void                      *ctx_data  = NULL;
    const char                 *api_name = NULL;
    settings_t                 *settings = config_get_ptr();
    struct retro_hw_render_callback *hwr = video_driver_get_hw_context();
    unsigned major                       = hwr->version_major;
    unsigned minor                       = hwr->version_minor;
-   enum retro_hw_context_type ctx_type  = hwr->context_type;
-   bool hw_context_in_use               = ctx_type != RETRO_HW_CONTEXT_NONE;
 
 #ifdef HAVE_OPENGLES
    api                                  = GFX_CTX_OPENGL_ES_API;
    api_name                             = "OpenGL ES 2.0";
 
-   switch (ctx_type)
+   if (hwr->context_type == RETRO_HW_CONTEXT_OPENGLES3)
    {
-      case RETRO_HW_CONTEXT_OPENGLES3:
-         major                             = 3;
-         minor                             = 0;
-         api_name                          = "OpenGL ES 3.0";
-         break;
-      case RETRO_HW_CONTEXT_OPENGLES_VERSION:
-         api_name                          = "OpenGL ES 3.1+";
-         break;
-      case RETRO_HW_CONTEXT_NONE:
-      default:
-         break;
+      major                             = 3;
+      minor                             = 0;
+      api_name                          = "OpenGL ES 3.0";
    }
+   else if (hwr->context_type == RETRO_HW_CONTEXT_OPENGLES_VERSION)
+      api_name                          = "OpenGL ES 3.1+";
 #else
-   api                                     = GFX_CTX_OPENGL_API;
-   api_name                                = "OpenGL";
+   api                                  = GFX_CTX_OPENGL_API;
+   api_name                             = "OpenGL";
 #endif
 
    (void)api_name;
 
    gl_shared_context_use = settings->bools.video_shared_context
-      && hw_context_in_use;
+      && hwr->context_type != RETRO_HW_CONTEXT_NONE;
 
-   if (libretro_get_shared_context() && hw_context_in_use)
+   if (     (libretro_get_shared_context())
+         && (hwr->context_type != RETRO_HW_CONTEXT_NONE))
       gl_shared_context_use = true;
 
-   return video_context_driver_init_first(gl,
+   gfx_ctx = video_context_driver_init_first(gl,
          settings->arrays.video_context_driver,
-         api, major, minor, gl_shared_context_use);
+         api, major, minor, gl_shared_context_use, &ctx_data);
+
+   if (ctx_data)
+      gl->ctx_data = ctx_data;
+
+   return gfx_ctx;
 }
 
 #ifdef GL_DEBUG
@@ -1733,6 +1742,7 @@ static void *gl_init(const video_info_t *video,
 
    video_context_driver_set((const gfx_ctx_driver_t*)ctx_driver);
 
+   gl->ctx_driver                       = ctx_driver;
    gl->video_info                       = *video;
 
    RARCH_LOG("[GL]: Found GL context: %s\n", ctx_driver->ident);
@@ -1789,18 +1799,10 @@ static void *gl_init(const video_info_t *video,
 
    if (hwr->context_type == RETRO_HW_CONTEXT_OPENGL_CORE)
    {
-      gfx_ctx_flags_t flags;
-
       gl_query_core_context_set(true);
       gl->core_context_in_use = true;
 
-      /**
-       * Ensure that the rest of the frontend knows we have a core context
-       */
-      flags.flags = 0;
-      BIT32_SET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT);
-
-      video_context_driver_set_flags(&flags);
+      gl_set_core_context(hwr->context_type);
 
       RARCH_LOG("[GL]: Using Core GL context, setting up VAO...\n");
       if (!gl_check_capability(GL_CAPS_VAO))
@@ -1877,9 +1879,9 @@ static void *gl_init(const video_info_t *video,
        * create textures. */
       gl->textures = 1;
 #ifdef GL_DEBUG
-      context_bind_hw_render(true);
+      gl_context_bind_hw_render(gl, true);
       gl_begin_debug(gl);
-      context_bind_hw_render(false);
+      gl_context_bind_hw_render(gl, false);
 #endif
    }
 
@@ -2015,7 +2017,7 @@ static void *gl_init(const video_info_t *video,
       goto error;
    }
 
-   context_bind_hw_render(true);
+   gl_context_bind_hw_render(gl, true);
    return gl;
 
 error:
@@ -2026,31 +2028,26 @@ error:
 
 static bool gl_alive(void *data)
 {
-   gfx_ctx_size_t size_data;
    unsigned temp_width  = 0;
    unsigned temp_height = 0;
    bool ret             = false;
    bool quit            = false;
    bool resize          = false;
    gl_t         *gl     = (gl_t*)data;
+   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
 
    /* Needed because some context drivers don't track their sizes */
    video_driver_get_size(&temp_width, &temp_height);
 
-   size_data.quit       = &quit;
-   size_data.resize     = &resize;
-   size_data.width      = &temp_width;
-   size_data.height     = &temp_height;
+   gl->ctx_driver->check_window(gl->ctx_data,
+         &quit, &resize, &temp_width, &temp_height, is_shutdown);
 
-   if (video_context_driver_check_window(&size_data))
-   {
-      if (quit)
-         gl->quitting = true;
-      else if (resize)
-         gl->should_resize = true;
+   if (quit)
+      gl->quitting = true;
+   else if (resize)
+      gl->should_resize = true;
 
-      ret = !gl->quitting;
-   }
+   ret = !gl->quitting;
 
    if (temp_width != 0 && temp_height != 0)
       video_driver_set_size(&temp_width, &temp_height);
@@ -2077,7 +2074,7 @@ static void gl_update_tex_filter_frame(gl_t *gl)
    wrap_info.idx                     = 0;
    wrap_info.type                    = RARCH_WRAP_BORDER;
 
-   context_bind_hw_render(false);
+   gl_context_bind_hw_render(gl, false);
 
    shader_filter.index               = 1;
    shader_filter.smooth              = &smooth;
@@ -2114,7 +2111,7 @@ static void gl_update_tex_filter_frame(gl_t *gl)
    }
 
    glBindTexture(GL_TEXTURE_2D, gl->texture[gl->tex_index]);
-   context_bind_hw_render(true);
+   gl_context_bind_hw_render(gl, true);
 }
 
 static bool gl_set_shader(void *data,
@@ -2129,7 +2126,7 @@ static bool gl_set_shader(void *data,
    if (!gl)
       return false;
 
-   context_bind_hw_render(false);
+   gl_context_bind_hw_render(gl, false);
 
    if (type == RARCH_SHADER_NONE)
       return false;
@@ -2212,13 +2209,13 @@ static bool gl_set_shader(void *data,
 
    /* Apparently need to set viewport for passes when we aren't using FBOs. */
    gl_set_shader_viewports(gl);
-   context_bind_hw_render(true);
+   gl_context_bind_hw_render(gl, true);
 #endif
 
    return true;
 
 error:
-   context_bind_hw_render(true);
+   gl_context_bind_hw_render(gl, true);
    return false;
 }
 
@@ -2316,7 +2313,7 @@ static bool gl_overlay_load(void *data,
    if (!gl)
       return false;
 
-   context_bind_hw_render(false);
+   gl_context_bind_hw_render(gl, false);
 
    gl_free_overlay(gl);
    gl->overlay_tex = (GLuint*)
@@ -2324,7 +2321,7 @@ static bool gl_overlay_load(void *data,
 
    if (!gl->overlay_tex)
    {
-      context_bind_hw_render(true);
+      gl_context_bind_hw_render(gl, true);
       return false;
    }
 
@@ -2362,7 +2359,7 @@ static bool gl_overlay_load(void *data,
          gl->overlay_color_coord[16 * i + j] = 1.0f;
    }
 
-   context_bind_hw_render(true);
+   gl_context_bind_hw_render(gl, true);
    return true;
 }
 
diff --git a/gfx/drivers/metal.m b/gfx/drivers/metal.m
index 0fcd932d01..3496d035bf 100644
--- a/gfx/drivers/metal.m
+++ b/gfx/drivers/metal.m
@@ -1,9 +1,17 @@
-//
-//  metal.m
-//  RetroArch_Metal
-//
-//  Created by Stuart Carnie on 5/14/18.
-//
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2018      - Stuart Carnie
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #import <Metal/Metal.h>
 #import <MetalKit/MetalKit.h>
@@ -28,9 +36,7 @@
 #endif
 
 #ifdef HAVE_MENU
-
 #import "../../menu/menu_driver.h"
-
 #endif
 
 #import "../font_driver.h"
@@ -145,10 +151,12 @@ static void metal_free(void *data)
 static void metal_set_viewport(void *data, unsigned viewport_width,
                                unsigned viewport_height, bool force_full, bool allow_rotate)
 {
-//   RARCH_LOG("[Metal]: set_viewport size: %dx%d full: %s rotate: %s\n",
-//             viewport_width, viewport_height,
-//             force_full ? "YES" : "NO",
-//             allow_rotate ? "YES" : "NO");
+#if 0
+   RARCH_LOG("[Metal]: set_viewport size: %dx%d full: %s rotate: %s\n",
+             viewport_width, viewport_height,
+             force_full ? "YES" : "NO",
+             allow_rotate ? "YES" : "NO");
+#endif
 }
 
 static void metal_set_rotation(void *data, unsigned rotation)
@@ -270,7 +278,9 @@ static void metal_set_texture_enable(void *data, bool state, bool full_screen)
       return;
    
    md.menu.enabled = state;
-   //md.menu.fullScreen = full_screen;
+#if 0
+   md.menu.fullScreen = full_screen;
+#endif
 }
 
 static void metal_set_osd_msg(void *data,
@@ -398,7 +408,7 @@ static const video_overlay_interface_t metal_overlay_interface = {
 };
 
 static void metal_get_overlay_interface(void *data,
-                                        const video_overlay_interface_t **iface)
+      const video_overlay_interface_t **iface)
 {
    (void)data;
    *iface = &metal_overlay_interface;
diff --git a/gfx/drivers/ps2_gfx.c b/gfx/drivers/ps2_gfx.c
new file mode 100644
index 0000000000..cb921bbc68
--- /dev/null
+++ b/gfx/drivers/ps2_gfx.c
@@ -0,0 +1,424 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2018 - Francisco Javier Trujillo Mata
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "../video_driver.h"
+
+#include "../../driver.h"
+#include "../../verbosity.h"
+
+#include <loadcore.h>
+#include <kernel.h>
+#include <gsKit.h>
+#include <gsInline.h>
+
+#define GS_TEXT GS_SETREG_RGBAQ(0x80,0x80,0x80,0x80,0x00) // turn white GS Screen
+#define GS_BLACK GS_SETREG_RGBAQ(0x00,0x00,0x00,0x00,0x00) // turn white GS Screen
+
+typedef struct ps2_video
+{
+   GSGLOBAL *gsGlobal;
+   GSTEXTURE *menuTexture;
+   GSTEXTURE *coreTexture;
+   
+   bool menuVisible;
+   bool fullscreen;
+
+   bool rgb32;
+   bool force_aspect;
+   int menu_filter;
+   int core_filter;
+} ps2_video_t;
+
+// PRIVATE METHODS
+static GSGLOBAL *init_GSGlobal(void) {
+	GSGLOBAL *gsGlobal = gsKit_init_global();
+
+      gsGlobal->PSM = GS_PSM_CT16;
+	gsGlobal->PSMZ = GS_PSMZ_16S;
+	gsGlobal->DoubleBuffering = GS_SETTING_OFF;
+	gsGlobal->ZBuffering = GS_SETTING_OFF;
+      gsGlobal->PrimAlphaEnable = GS_SETTING_OFF;
+
+	dmaKit_init(D_CTRL_RELE_OFF,D_CTRL_MFD_OFF, D_CTRL_STS_UNSPEC,
+		    D_CTRL_STD_OFF, D_CTRL_RCYC_8, 1 << DMA_CHANNEL_GIF);
+
+	// Initialize the DMAC
+	dmaKit_chan_init(DMA_CHANNEL_GIF);
+
+	gsKit_init_screen(gsGlobal);
+      gsKit_mode_switch(gsGlobal, GS_ONESHOT);
+
+	gsKit_clear(gsGlobal, GS_BLACK);
+
+      return gsGlobal;
+}
+
+static GSTEXTURE * prepare_new_texture(void) {
+      GSTEXTURE *texture = malloc(sizeof *texture);
+      texture->Width = 0;
+      texture->Height = 0;
+      texture->Mem = NULL;
+      return texture;
+}
+
+static void init_ps2_video(ps2_video_t *ps2) {
+   ps2->gsGlobal = init_GSGlobal();
+   ps2->menuTexture = prepare_new_texture();
+   ps2->coreTexture = prepare_new_texture();
+}
+
+static void deinitTexture(GSTEXTURE *texture) {
+   free(texture->Mem);
+   free(texture->Clut);
+   texture->Mem = NULL;
+   texture->Clut = NULL;
+}
+
+static void color_correction32(uint32_t *buffer, uint32_t dimensions)
+{
+    uint32_t i;
+    uint32_t x32;
+    for (i = 0; i < dimensions; i++) {
+      x32 = buffer[i];
+      buffer[i] = ((x32 >> 16) & 0xFF) | ((x32 << 16) & 0xFF0000) | (x32 & 0xFF00FF00);
+    }
+}
+
+static void color_correction16(uint16_t *buffer, uint32_t dimensions)
+{
+    uint32_t i;
+    uint16_t x16;
+    for (i = 0; i < dimensions; i++) {
+      x16 = buffer[i];
+      buffer[i] = (x16 & 0x8000) | ((x16 << 10) & 0x7C00) | (x16 & 0x3E0) | ((x16 >> 10) & 0x1F);
+    }
+}
+
+static void transfer_texture(GSTEXTURE *texture, const void *frame, 
+      int width, int height, bool rgb32, int filter, bool color_correction) {
+   
+   int PSM = rgb32 ? GS_PSM_CT32 : GS_PSM_CT16;
+   size_t size = gsKit_texture_size_ee(width, height, PSM);
+   if (  !texture->Mem || 
+      texture->Width != width || 
+      texture->Height != height ||
+      texture->PSM != PSM ) {
+      texture->Width = width;
+      texture->Height = height;
+      texture->PSM = PSM;
+      texture->Filter = filter;
+      free(texture->Mem);
+      texture->Mem = memalign(128, size);
+}
+
+if (color_correction) {
+   int pixels = width * height;
+   if (rgb32) {
+      uint32_t *buffer = (uint32_t *)frame;
+      color_correction32(buffer, pixels);
+   } else {
+      uint16_t *buffer = (uint16_t *)frame;
+      color_correction16(buffer, pixels);
+   }
+}
+
+   memcpy(texture->Mem, frame, size);
+}
+
+static void vram_alloc(GSGLOBAL *gsGlobal, GSTEXTURE *texture) {
+   uint32_t size = gsKit_texture_size(texture->Width, texture->Height, texture->PSM);
+   texture->Vram=gsKit_vram_alloc(gsGlobal, size, GSKIT_ALLOC_USERBUFFER);
+   if(texture->Vram == GSKIT_ALLOC_ERROR) {
+      printf("VRAM Allocation Failed. Will not upload texture.\n");
+   }
+}
+
+static void prim_texture(GSGLOBAL *gsGlobal, GSTEXTURE *texture, int zPosition, bool force_aspect) {
+      float x1, y1, x2, y2;
+      if (force_aspect) {
+         float delta = 1.0f;
+         float texture_aspect_ratio = texture->Width / texture->Height;
+         float gsGlobal_aspect_ratio = gsGlobal->Width / gsGlobal->Height;
+         if (texture_aspect_ratio < gsGlobal_aspect_ratio) {
+            //height
+            delta = gsGlobal->Height / texture->Height;
+         } else {
+            //width
+            delta = gsGlobal->Width / texture->Width;
+         }
+         float newWidth = texture->Width * delta;
+         float newHeight = texture->Height * delta;
+         
+         x1 = (gsGlobal->Width - newWidth) / 2.0f;
+         y1 = (gsGlobal->Height - newHeight) / 2.0f;
+         x2 = newWidth + x1;
+         y2 = newHeight + y1;
+
+      } else {
+         x1 = 0.0f;
+         y1 = 0.0f;
+         x2 = gsGlobal->Width;
+         y2 = gsGlobal->Height;
+      }
+
+   gsKit_prim_sprite_texture( gsGlobal, texture,
+                              x1, //X1
+                              y1,  // Y1
+                              0.0f,  // U1
+                              0.0f,  // V1
+                              x2, // X2
+                              y2, // Y2
+                              texture->Width, // U2
+                              texture->Height, // V2
+                              zPosition,
+                              GS_TEXT);
+}
+
+
+static void *ps2_gfx_init(const video_info_t *video,
+      const input_driver_t **input, void **input_data)
+{
+   void *ps2input = NULL;
+   *input_data = NULL;
+   (void)video;
+
+   ps2_video_t *ps2 = (ps2_video_t*)calloc(1, sizeof(ps2_video_t));
+
+   if (!ps2)
+      return NULL;
+
+   init_ps2_video(ps2);
+   ps2->rgb32 = video->rgb32;
+   ps2->fullscreen = video->fullscreen;
+   ps2->core_filter = video->smooth ? GS_FILTER_LINEAR : GS_FILTER_NEAREST;
+   ps2->force_aspect = video->force_aspect;
+
+   if (input && input_data)
+   {
+      settings_t *settings = config_get_ptr();
+      ps2input = input_ps2.init(settings->arrays.input_joypad_driver);
+      *input = ps2input ? &input_ps2 : NULL;
+      *input_data  = ps2input;
+   }
+
+   return ps2;
+}
+
+static bool ps2_gfx_frame(void *data, const void *frame,
+      unsigned width, unsigned height, uint64_t frame_count,
+      unsigned pitch, const char *msg, video_frame_info_t *video_info)
+{
+#ifdef DISPLAY_FPS
+   uint32_t diff;
+   static uint64_t currentTick,lastTick;
+   static int frames;
+   static float fps = 0.0;
+#endif
+   ps2_video_t *ps2 = (ps2_video_t*)data;
+
+   if (!width || !height)
+      return false;
+
+   if (frame_count%120==0) {
+      printf("ps2_gfx_frame %i\n", frame_count);
+   }
+   gsKit_vram_clear(ps2->gsGlobal);
+
+   if (frame) {
+      transfer_texture(ps2->coreTexture, frame, width, height, ps2->rgb32, ps2->core_filter, 1);
+      vram_alloc(ps2->gsGlobal, ps2->coreTexture);
+      gsKit_texture_upload(ps2->gsGlobal, ps2->coreTexture); 
+      prim_texture(ps2->gsGlobal, ps2->coreTexture, 1, ps2->force_aspect);
+   }
+
+   bool texture_empty = !ps2->menuTexture->Width || !ps2->menuTexture->Height;
+   if (ps2->menuVisible && !texture_empty) {
+      vram_alloc(ps2->gsGlobal, ps2->menuTexture);
+      gsKit_texture_upload(ps2->gsGlobal, ps2->menuTexture);
+      prim_texture(ps2->gsGlobal, ps2->menuTexture, 2, ps2->fullscreen);
+   }
+
+   gsKit_sync_flip(ps2->gsGlobal);
+   gsKit_queue_exec(ps2->gsGlobal);
+
+   return true;
+}
+
+static void ps2_gfx_set_nonblock_state(void *data, bool toggle)
+{
+   (void)data;
+   (void)toggle;
+}
+
+static bool ps2_gfx_alive(void *data)
+{
+   (void)data;
+   return true;
+}
+
+static bool ps2_gfx_focus(void *data)
+{
+   (void)data;
+   return true;
+}
+
+static bool ps2_gfx_suppress_screensaver(void *data, bool enable)
+{
+   (void)data;
+   (void)enable;
+   return false;
+}
+
+static bool ps2_gfx_has_windowed(void *data)
+{
+   (void)data;
+   return true;
+}
+
+static void ps2_gfx_free(void *data)
+{
+   ps2_video_t *ps2 = (ps2_video_t*)data;
+
+   gsKit_clear(ps2->gsGlobal, GS_BLACK);
+   gsKit_vram_clear(ps2->gsGlobal);
+
+   deinitTexture(ps2->menuTexture);
+   deinitTexture(ps2->coreTexture);
+
+   gsKit_deinit_global(ps2->gsGlobal);
+
+   free(data);
+}
+
+static bool ps2_gfx_set_shader(void *data,
+      enum rarch_shader_type type, const char *path)
+{
+   (void)data;
+   (void)type;
+   (void)path;
+
+   return false;
+}
+
+static void ps2_gfx_set_rotation(void *data,
+      unsigned rotation)
+{
+   (void)data;
+   (void)rotation;
+}
+
+static void ps2_gfx_viewport_info(void *data,
+      struct video_viewport *vp)
+{
+   (void)data;
+   (void)vp;
+}
+
+static bool ps2_gfx_read_viewport(void *data, uint8_t *buffer, bool is_idle)
+{
+   (void)data;
+   (void)buffer;
+
+   return true;
+}
+
+static void ps2_set_filtering(void *data, unsigned index, bool smooth)
+{
+   ps2_video_t *ps2 = (ps2_video_t*)data;
+
+   ps2->menu_filter = smooth ? GS_FILTER_LINEAR : GS_FILTER_NEAREST;
+}
+
+static void ps2_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
+{
+   ps2_video_t *ps2 = (ps2_video_t*)data;
+}
+
+static void ps2_apply_state_changes(void *data)
+{
+   ps2_video_t *ps2 = (ps2_video_t*)data;
+}
+
+static void ps2_set_texture_frame(void *data, const void *frame, bool rgb32,
+                               unsigned width, unsigned height, float alpha)
+{
+   ps2_video_t *ps2 = (ps2_video_t*)data;
+
+   transfer_texture(ps2->menuTexture, frame, width, height, rgb32, ps2->menu_filter, 0);
+}
+
+static void ps2_set_texture_enable(void *data, bool enable, bool fullscreen)
+{
+   ps2_video_t *ps2 = (ps2_video_t*)data;
+   ps2->menuVisible = enable;
+   ps2->fullscreen = fullscreen;
+}
+
+static const video_poke_interface_t ps2_poke_interface = {
+   NULL,          /* get_flags  */
+   NULL,          /* set_coords */
+   NULL,          /* set_mvp */
+   NULL,
+   NULL,
+   NULL,
+   NULL, /* get_refresh_rate */
+   ps2_set_filtering,
+   NULL, /* get_video_output_size */
+   NULL, /* get_video_output_prev */
+   NULL, /* get_video_output_next */
+   NULL, /* get_current_framebuffer */
+   NULL, /* get_proc_address */
+   ps2_set_aspect_ratio,
+   ps2_apply_state_changes,
+   ps2_set_texture_frame,
+   ps2_set_texture_enable,
+   NULL,                        /* set_osd_msg */
+   NULL,                        /* show_mouse  */
+   NULL,                        /* grab_mouse_toggle */
+   NULL,                        /* get_current_shader */
+   NULL,                        /* get_current_software_framebuffer */
+   NULL                         /* get_hw_render_interface */
+};
+
+
+static void ps2_gfx_get_poke_interface(void *data,
+      const video_poke_interface_t **iface)
+{
+   (void)data;
+   *iface = &ps2_poke_interface;
+}
+
+video_driver_t video_ps2 = {
+   ps2_gfx_init,
+   ps2_gfx_frame,
+   ps2_gfx_set_nonblock_state,
+   ps2_gfx_alive,
+   ps2_gfx_focus,
+   ps2_gfx_suppress_screensaver,
+   ps2_gfx_has_windowed,
+   ps2_gfx_set_shader,
+   ps2_gfx_free,
+   "ps2",
+   NULL, /* set_viewport */
+   ps2_gfx_set_rotation,
+   ps2_gfx_viewport_info,
+   ps2_gfx_read_viewport,
+   NULL, /* read_frame_raw */
+
+#ifdef HAVE_OVERLAY
+  NULL, /* overlay_interface */
+#endif
+  ps2_gfx_get_poke_interface,
+};
diff --git a/gfx/drivers/sixel_gfx.c b/gfx/drivers/sixel_gfx.c
index 4777587688..8daecdaa32 100644
--- a/gfx/drivers/sixel_gfx.c
+++ b/gfx/drivers/sixel_gfx.c
@@ -188,9 +188,10 @@ static void scroll_on_demand(int pixelheight)
 static void *sixel_gfx_init(const video_info_t *video,
       const input_driver_t **input, void **input_data)
 {
+   gfx_ctx_input_t inp;
+   void *ctx_data                       = NULL;
    settings_t *settings                 = config_get_ptr();
    sixel_t *sixel                       = (sixel_t*)calloc(1, sizeof(*sixel));
-   gfx_ctx_input_t inp;
    const gfx_ctx_driver_t *ctx_driver   = NULL;
    const char *scale_str                = NULL;
 
@@ -218,11 +219,15 @@ static void *sixel_gfx_init(const video_info_t *video,
 
    ctx_driver = video_context_driver_init_first(sixel,
          settings->arrays.video_context_driver,
-         GFX_CTX_SIXEL_API, 1, 0, false);
+         GFX_CTX_SIXEL_API, 1, 0, false, &ctx_data);
 
    if (!ctx_driver)
       goto error;
 
+   if (ctx_data)
+      sixel->ctx_data = ctx_data;
+
+   sixel->ctx_driver = ctx_driver;
    video_context_driver_set((const gfx_ctx_driver_t*)ctx_driver);
 
    RARCH_LOG("[SIXEL]: Found SIXEL context: %s\n", ctx_driver->ident);
@@ -434,16 +439,14 @@ static bool sixel_gfx_alive(void *data)
    unsigned temp_height = 0;
    bool quit            = false;
    bool resize          = false;
+   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
+   sixel_t *sixel       = (sixel_t*)data;
 
    /* Needed because some context drivers don't track their sizes */
    video_driver_get_size(&temp_width, &temp_height);
 
-   size_data.quit       = &quit;
-   size_data.resize     = &resize;
-   size_data.width      = &temp_width;
-   size_data.height     = &temp_height;
-
-   video_context_driver_check_window(&size_data);
+   sixel->ctx_driver->check_window(sixel->ctx_data,
+            &quit, &resize, &temp_width, &temp_height, is_shutdown);
 
    if (temp_width != 0 && temp_height != 0)
       video_driver_set_size(&temp_width, &temp_height);
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index 7f9c383d3e..1813452e25 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -71,6 +71,8 @@ typedef struct
    VGuint mGlyphIndices[1024];
    VGPaint mPaintFg;
    VGPaint mPaintBg;
+   void *ctx_data;
+   const gfx_ctx_driver_t *ctx_driver;
 } vg_t;
 
 static PFNVGCREATEEGLIMAGETARGETKHRPROC pvgCreateEGLImageTargetKHR;
@@ -102,15 +104,20 @@ static void *vg_init(const video_info_t *video,
    int interval                    = 0;
    unsigned temp_width             = 0;
    unsigned temp_height            = 0;
+   void *ctx_data                  = NULL;
    settings_t        *settings     = config_get_ptr();
    vg_t                    *vg     = (vg_t*)calloc(1, sizeof(vg_t));
    const gfx_ctx_driver_t *ctx     = video_context_driver_init_first(
          vg, settings->arrays.video_context_driver,
-         GFX_CTX_OPENVG_API, 0, 0, false);
+         GFX_CTX_OPENVG_API, 0, 0, false, &ctx_data);
 
    if (!vg || !ctx)
       goto error;
 
+   if (ctx_data)
+      vg->ctx_data = ctx_data;
+
+   vg->ctx_driver = ctx;
    video_context_driver_set((void*)ctx);
 
    video_context_driver_get_video_size(&mode);
@@ -434,18 +441,15 @@ static bool vg_frame(void *data, const void *frame,
 
 static bool vg_alive(void *data)
 {
-   gfx_ctx_size_t size_data;
    bool quit            = false;
+   bool resize          = false;
    unsigned temp_width  = 0;
    unsigned temp_height = 0;
    vg_t            *vg  = (vg_t*)data;
+   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
 
-   size_data.quit       = &quit;
-   size_data.resize     = &vg->should_resize;
-   size_data.width      = &temp_width;
-   size_data.height     = &temp_height;
-
-   video_context_driver_check_window(&size_data);
+   vg->ctx_driver->check_window(vg->ctx_data,
+            &quit, &resize, &temp_width, &temp_height, is_shutdown);
 
    if (temp_width != 0 && temp_height != 0)
       video_driver_set_size(&temp_width, &temp_height);
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index cec0089daa..140dbff7b7 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -61,14 +61,19 @@ static void vulkan_viewport_info(void *data, struct video_viewport *vp);
 
 static const gfx_ctx_driver_t *vulkan_get_context(vk_t *vk)
 {
-   unsigned major       = 1;
-   unsigned minor       = 0;
-   settings_t *settings = config_get_ptr();
-   enum gfx_ctx_api api = GFX_CTX_VULKAN_API;
-
-   return video_context_driver_init_first(
+   void                 *ctx_data  = NULL;
+   unsigned major                  = 1;
+   unsigned minor                  = 0;
+   settings_t *settings            = config_get_ptr();
+   enum gfx_ctx_api api            = GFX_CTX_VULKAN_API;
+   const gfx_ctx_driver_t *gfx_ctx = video_context_driver_init_first(
          vk, settings->arrays.video_context_driver,
-         api, major, minor, false);
+         api, major, minor, false, &ctx_data);
+
+   if (ctx_data)
+      vk->ctx_data = ctx_data;
+
+   return gfx_ctx;
 }
 
 static void vulkan_init_render_pass(
@@ -1131,23 +1136,23 @@ static void *vulkan_init(const video_info_t *video,
    vk_t *vk                           = (vk_t*)calloc(1, sizeof(*vk));
    if (!vk)
       return NULL;
-
-   vk->video = *video;
-
-   ctx_driver = vulkan_get_context(vk);
+   ctx_driver                         = vulkan_get_context(vk);
    if (!ctx_driver)
    {
       RARCH_ERR("[Vulkan]: Failed to get Vulkan context.\n");
       goto error;
    }
 
+   vk->video                          = *video;
+   vk->ctx_driver                     = ctx_driver;
+
    video_context_driver_set((const gfx_ctx_driver_t*)ctx_driver);
 
    video_context_driver_get_video_size(&mode);
-   full_x = mode.width;
-   full_y = mode.height;
-   mode.width  = 0;
-   mode.height = 0;
+   full_x                             = mode.width;
+   full_y                             = mode.height;
+   mode.width                         = 0;
+   mode.height                        = 0;
 
    RARCH_LOG("[Vulkan]: Detecting screen resolution %ux%u.\n", full_x, full_y);
    interval = video->vsync ? video->swap_interval : 0;
@@ -1182,7 +1187,7 @@ static void *vulkan_init(const video_info_t *video,
 
    RARCH_LOG("[Vulkan]: Using resolution %ux%u\n", temp_width, temp_height);
 
-   video_context_driver_get_context_data(&vk->context);
+   *(void**)&vk->context = vk->ctx_driver->get_context_data(vk->ctx_data);
 
    vk->vsync             = video->vsync;
    vk->fullscreen        = video->fullscreen;
@@ -1280,30 +1285,25 @@ static void vulkan_set_nonblock_state(void *data, bool state)
 
 static bool vulkan_alive(void *data)
 {
-   gfx_ctx_size_t size_data;
    unsigned temp_width  = 0;
    unsigned temp_height = 0;
    bool ret             = false;
    bool quit            = false;
    bool resize          = false;
    vk_t *vk             = (vk_t*)data;
+   bool is_shutdown     = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
 
    video_driver_get_size(&temp_width, &temp_height);
 
-   size_data.quit       = &quit;
-   size_data.resize     = &resize;
-   size_data.width      = &temp_width;
-   size_data.height     = &temp_height;
+   vk->ctx_driver->check_window(vk->ctx_data,
+            &quit, &resize, &temp_width, &temp_height, is_shutdown);
 
-   if (video_context_driver_check_window(&size_data))
-   {
-      if (quit)
-         vk->quitting      = true;
-      else if (resize)
-         vk->should_resize = true;
+   if (quit)
+      vk->quitting      = true;
+   else if (resize)
+      vk->should_resize = true;
 
-      ret = !vk->quitting;
-   }
+   ret = !vk->quitting;
 
    if (temp_width != 0 && temp_height != 0)
       video_driver_set_size(&temp_width, &temp_height);
@@ -1779,6 +1779,30 @@ static bool vulkan_frame(void *data, const void *frame,
    vulkan_filter_chain_build_offscreen_passes(
          (vulkan_filter_chain_t*)vk->filter_chain,
          vk->cmd, &vk->vk_vp);
+
+#if defined(HAVE_MENU)
+   /* Upload menu texture. */
+   if (vk->menu.enable)
+   {
+       if (vk->menu.textures[vk->menu.last_index].image != VK_NULL_HANDLE ||
+           vk->menu.textures[vk->menu.last_index].buffer != VK_NULL_HANDLE)
+       {
+           struct vk_texture *optimal = &vk->menu.textures_optimal[vk->menu.last_index];
+           struct vk_texture *texture = &vk->menu.textures[vk->menu.last_index];
+
+           if (optimal->memory != VK_NULL_HANDLE)
+           {
+               if (vk->menu.dirty[vk->menu.last_index])
+               {
+                   vulkan_copy_staging_to_dynamic(vk, vk->cmd,
+                           optimal, texture);
+                   vk->menu.dirty[vk->menu.last_index] = false;
+               }
+           }
+       }
+   }
+#endif
+
    /* Render to backbuffer. */
    if (chain->backbuffer.image != VK_NULL_HANDLE && vk->context->has_acquired_swapchain)
    {
@@ -1813,7 +1837,8 @@ static bool vulkan_frame(void *data, const void *frame,
       {
          menu_driver_frame(video_info);
 
-         if (vk->menu.textures[vk->menu.last_index].image != VK_NULL_HANDLE)
+         if (vk->menu.textures[vk->menu.last_index].image != VK_NULL_HANDLE ||
+             vk->menu.textures[vk->menu.last_index].buffer != VK_NULL_HANDLE)
          {
             struct vk_draw_quad quad;
             struct vk_texture *optimal = &vk->menu.textures_optimal[vk->menu.last_index];
@@ -1823,16 +1848,7 @@ static bool vulkan_frame(void *data, const void *frame,
             quad.texture = &vk->menu.textures[vk->menu.last_index];
 
             if (optimal->memory != VK_NULL_HANDLE)
-            {
-               if (vk->menu.dirty[vk->menu.last_index])
-               {
-                  vulkan_copy_staging_to_dynamic(vk, vk->cmd,
-                        optimal,
-                        quad.texture);
-                  vk->menu.dirty[vk->menu.last_index] = false;
-               }
                quad.texture = optimal;
-            }
 
             quad.sampler = optimal->mipmap ?
                vk->samplers.mipmap_linear : vk->samplers.linear;
@@ -2197,9 +2213,6 @@ static void vulkan_set_texture_frame(void *data,
    for (y = 0; y < height; y++, dst += texture->stride, src += stride)
       memcpy(dst, src, stride);
 
-   vulkan_sync_texture_to_gpu(vk, texture);
-   vkUnmapMemory(vk->context->device, texture->memory);
-
    vk->menu.alpha      = alpha;
    vk->menu.last_index = index;
 
@@ -2212,7 +2225,10 @@ static void vulkan_set_texture_frame(void *data,
             NULL, rgb32 ? NULL : &br_swizzle,
             VULKAN_TEXTURE_DYNAMIC);
    }
+   else
+       vulkan_sync_texture_to_gpu(vk, texture);
 
+   vkUnmapMemory(vk->context->device, texture->memory);
    vk->menu.dirty[index] = true;
 }
 
@@ -2603,6 +2619,7 @@ static bool vulkan_overlay_load(void *data,
       const void *image_data, unsigned num_images)
 {
    unsigned i, j;
+   bool old_enabled;
    const struct texture_image *images =
       (const struct texture_image*)image_data;
    vk_t *vk                           = (vk_t*)data;
@@ -2620,6 +2637,7 @@ static bool vulkan_overlay_load(void *data,
 #ifdef HAVE_THREADS
    slock_unlock(vk->context->queue_lock);
 #endif
+   old_enabled = vk->overlay.enable;
    vulkan_overlay_free(vk);
 
    vk->overlay.images = (struct vk_texture*)
@@ -2647,6 +2665,7 @@ static bool vulkan_overlay_load(void *data,
          vk->overlay.vertex[4 * i + j].color = white;
    }
 
+   vk->overlay.enable = old_enabled;
    return true;
 
 error:
diff --git a/gfx/drivers_context/macos_ctx.m b/gfx/drivers_context/cocoa_gl_ctx_metal.m
similarity index 97%
rename from gfx/drivers_context/macos_ctx.m
rename to gfx/drivers_context/cocoa_gl_ctx_metal.m
index 329fc062cf..d554ab8385 100644
--- a/gfx/drivers_context/macos_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx_metal.m
@@ -22,7 +22,7 @@
 #else
 #include <ApplicationServices/ApplicationServices.h>
 #endif
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
 #include <OpenGL/CGLTypes.h>
 #include <OpenGL/OpenGL.h>
 #include <AppKit/NSScreen.h>
@@ -37,7 +37,7 @@
 #include <retro_assert.h>
 #include <compat/apple_compat.h>
 
-#import "../../ui/drivers/cocoa/cocoa_common.h"
+#import "../../ui/drivers/cocoa/cocoa_common_metal.h"
 #include "../video_driver.h"
 #include "../../configuration.h"
 #include "../../verbosity.h"
@@ -107,8 +107,8 @@ static int g_fast_forward_skips;
 static bool g_is_syncing = true;
 static bool g_use_hw_ctx = false;
 
-#if defined(HAVE_COCOA)
-#include "../../ui/drivers/ui_cocoa.h"
+#if defined(HAVE_COCOA_METAL)
+#include "../../ui/drivers/ui_cocoa_metal.h"
 static NSOpenGLPixelFormat* g_format;
 
 void *glcontext_get_ptr(void)
@@ -203,7 +203,7 @@ float get_backing_scale_factor(void)
       return backing_scale_def;
    
    backing_scale_def = 1.0f;
-#ifdef HAVE_COCOA
+#ifdef HAVE_COCOA_METAL
    screen = (BRIDGE RAScreen*)get_chosen_screen();
    
    if (screen)
@@ -228,7 +228,7 @@ void cocoagl_gfx_ctx_update(void)
    switch (cocoagl_api)
    {
       case GFX_CTX_OPENGL_API:
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
 #if MAC_OS_X_VERSION_10_7
          CGLUpdateContext(g_hw_ctx.CGLContextObj);
          CGLUpdateContext(g_context.CGLContextObj);
@@ -256,7 +256,7 @@ static void cocoagl_gfx_ctx_destroy(void *data)
       case GFX_CTX_OPENGL_ES_API:
          [GLContextClass clearCurrentContext];
          
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
          [g_context clearDrawable];
          RELEASE(g_context);
          RELEASE(g_format);
@@ -302,7 +302,7 @@ static void *cocoagl_gfx_ctx_init(video_frame_info_t *video_info, void *video_dr
          // setViewType is not (yet?) defined for iOS
          // [apple_platform setViewType:APPLE_VIEW_TYPE_OPENGL_ES];
          break;
-#elif defined(HAVE_COCOA)
+#elif defined(HAVE_COCOA_METAL)
       case GFX_CTX_OPENGL_API:
          [apple_platform setViewType:APPLE_VIEW_TYPE_OPENGL];
          break;
@@ -341,7 +341,7 @@ static bool cocoagl_gfx_ctx_bind_api(void *data, enum gfx_ctx_api api, unsigned
 #if defined(HAVE_COCOATOUCH)
       case GFX_CTX_OPENGL_ES_API:
          break;
-#elif defined(HAVE_COCOA)
+#elif defined(HAVE_COCOA_METAL)
       case GFX_CTX_OPENGL_API:
          break;
 #ifdef HAVE_VULKAN
@@ -376,7 +376,7 @@ static void cocoagl_gfx_ctx_swap_interval(void *data, int interval)
          //   Just skip presents so fast forward still works.
          g_is_syncing         = interval ? true : false;
          g_fast_forward_skips = interval ? 0 : 3;
-#elif defined(HAVE_COCOA)
+#elif defined(HAVE_COCOA_METAL)
          GLint value          = interval ? 1 : 0;
          [g_context setValues:&value forParameter:NSOpenGLCPSwapInterval];
 #endif
@@ -405,7 +405,7 @@ static void cocoagl_gfx_ctx_show_mouse(void *data, bool state)
 {
    (void)data;
    
-#ifdef HAVE_COCOA
+#ifdef HAVE_COCOA_METAL
    if (state)
       [NSCursor unhide];
    else
@@ -421,7 +421,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data,
    cocoa_ctx->width = width;
    cocoa_ctx->height = height;
    
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
    //CocoaView *g_view = (BRIDGE CocoaView *)nsview_get_ptr();
    NSView *g_view = apple_platform.renderView;
 #endif
@@ -431,7 +431,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data,
       case GFX_CTX_OPENGL_API:
       case GFX_CTX_OPENGL_ES_API:
       {
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
          if ([g_view respondsToSelector: @selector(setWantsBestResolutionOpenGLSurface:)])
             [g_view setWantsBestResolutionOpenGLSurface:YES];
          
@@ -507,7 +507,7 @@ static bool cocoagl_gfx_ctx_set_video_mode(void *data,
          break;
    }
    
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
    static bool has_went_fullscreen = false;
    /* TODO: Screen mode support. */
    
@@ -563,7 +563,7 @@ float cocoagl_gfx_ctx_get_native_scale(void)
 static void cocoagl_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned* height)
 {
    float screenscale               = cocoagl_gfx_ctx_get_native_scale();
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
    CGRect size;
    GLsizei backingPixelWidth, backingPixelHeight;
    NSView *g_view                  = apple_platform.renderView;
@@ -584,7 +584,7 @@ static void cocoagl_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned
    *height                         = CGRectGetHeight(size) * screenscale;
 }
 
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
 static void cocoagl_gfx_ctx_update_title(void *data, void *data2)
 {
    ui_window_cocoa_t view;
@@ -611,7 +611,7 @@ static bool cocoagl_gfx_ctx_get_metrics(void *data, enum display_metric_types ty
                                         float *value)
 {
    RAScreen *screen              = (BRIDGE RAScreen*)get_chosen_screen();
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
    NSDictionary *description     = [screen deviceDescription];
    NSSize  display_pixel_size    = [[description objectForKey:NSDeviceSize] sizeValue];
    CGSize  display_physical_size = CGDisplayScreenSize(
@@ -719,7 +719,7 @@ static void cocoagl_gfx_ctx_swap_buffers(void *data, void *data2)
          if (!(--g_fast_forward_skips < 0))
             return;
          
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
          [g_context flushBuffer];
          [g_hw_ctx flushBuffer];
 #elif defined(HAVE_COCOATOUCH)
@@ -892,7 +892,7 @@ const gfx_ctx_driver_t gfx_ctx_cocoagl = {
    .set_video_mode       = cocoagl_gfx_ctx_set_video_mode,
    .get_video_size       = cocoagl_gfx_ctx_get_video_size,
    .get_metrics          = cocoagl_gfx_ctx_get_metrics,
-#if defined(HAVE_COCOA)
+#if defined(HAVE_COCOA_METAL)
    .update_window_title  = cocoagl_gfx_ctx_update_title,
 #endif
    .check_window         = cocoagl_gfx_ctx_check_window,
diff --git a/gfx/drivers_font/gdi_font.c b/gfx/drivers_font/gdi_font.c
index 2cb7e0e981..baa236d6ab 100644
--- a/gfx/drivers_font/gdi_font.c
+++ b/gfx/drivers_font/gdi_font.c
@@ -86,7 +86,7 @@ static void gdi_render_msg(
       void *data, const char *msg,
       const struct font_params *params)
 {
-   float x, y, scale, drop_mod, alpha, drop_alpha;
+   float x, y, scale, drop_mod, drop_alpha;
    int drop_x, drop_y, msg_strlen;
    unsigned i;
    unsigned newX, newY, newDropX, newDropY;
@@ -116,7 +116,6 @@ static void gdi_render_msg(
       red        = FONT_COLOR_GET_RED(params->color);
       green      = FONT_COLOR_GET_GREEN(params->color);
       blue       = FONT_COLOR_GET_BLUE(params->color);
-      alpha      = FONT_COLOR_GET_ALPHA(params->color);
    }
    else
    {
@@ -131,7 +130,6 @@ static void gdi_render_msg(
       red        = video_info->font_msg_color_r * 255.0f;
       green      = video_info->font_msg_color_g * 255.0f;
       blue       = video_info->font_msg_color_b * 255.0f;
-      alpha      = 255;
    }
 
    msg_strlen = strlen(msg);
diff --git a/gfx/drivers_renderchain/gl2_renderchain.c b/gfx/drivers_renderchain/gl2_renderchain.c
index 52ac479b11..64a138218f 100644
--- a/gfx/drivers_renderchain/gl2_renderchain.c
+++ b/gfx/drivers_renderchain/gl2_renderchain.c
@@ -164,7 +164,7 @@ static void gl2_renderchain_bind_backbuffer(void *data,
 #endif
 }
 
-void context_bind_hw_render(bool enable);
+void context_bind_hw_render(void *data, bool enable);
 
 void gl_load_texture_data(
       uint32_t id_data,
@@ -532,7 +532,7 @@ static void gl2_renderchain_deinit_hw_render(
    if (!gl)
       return;
 
-   context_bind_hw_render(true);
+   context_bind_hw_render(gl, true);
 
    if (gl->hw_render_fbo_init)
       gl2_delete_fb(gl->textures, gl->hw_render_fbo);
@@ -540,7 +540,7 @@ static void gl2_renderchain_deinit_hw_render(
       gl2_delete_rb(gl->textures, chain->hw_render_depth);
    gl->hw_render_fbo_init = false;
 
-   context_bind_hw_render(false);
+   context_bind_hw_render(gl, false);
 }
 
 static void gl2_renderchain_free(gl_t *gl, void *chain_data)
@@ -956,7 +956,7 @@ static bool gl2_renderchain_init_hw_render(
 
    /* We can only share texture objects through contexts.
     * FBOs are "abstract" objects and are not shared. */
-   context_bind_hw_render(true);
+   context_bind_hw_render(gl, true);
 
    RARCH_LOG("[GL]: Initializing HW render (%u x %u).\n", width, height);
    glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_fbo_size);
@@ -1037,7 +1037,7 @@ static bool gl2_renderchain_init_hw_render(
    gl2_renderchain_bind_backbuffer(gl, chain_data);
    gl->hw_render_fbo_init = true;
 
-   context_bind_hw_render(false);
+   context_bind_hw_render(gl, false);
    return true;
 }
 
@@ -1076,7 +1076,7 @@ static bool gl2_renderchain_read_viewport(
    if (!gl)
       return false;
 
-   context_bind_hw_render(false);
+   context_bind_hw_render(gl, false);
 
    num_pixels = gl->vp.width * gl->vp.height;
 
@@ -1160,11 +1160,11 @@ static bool gl2_renderchain_read_viewport(
       gl->readback_buffer_screenshot = NULL;
    }
 
-   context_bind_hw_render(true);
+   context_bind_hw_render(gl, true);
    return true;
 
 error:
-   context_bind_hw_render(true);
+   context_bind_hw_render(gl, true);
 
    return false;
 }
diff --git a/gfx/drivers_shader/glslang_util.cpp b/gfx/drivers_shader/glslang_util.cpp
index 96b0b6026b..d2e9a993f7 100644
--- a/gfx/drivers_shader/glslang_util.cpp
+++ b/gfx/drivers_shader/glslang_util.cpp
@@ -55,6 +55,15 @@ bool glslang_read_shader_file(const char *path, vector<string> *output, bool roo
       return false;
    }
 
+   /* Remove Windows \r chars if we encounter them.
+    * filestream_read_file() allocates one extra for 0 terminator. */
+   auto itr = remove_if(buf, buf + len + 1, [](char c) {
+      return c == '\r';
+   });
+
+   if (itr < buf + len)
+      *itr = '\0';
+
    /* Cannot use string_split since it removes blank lines (strtok). */
    ptr = buf;
 
diff --git a/gfx/drivers_shader/slang_process.cpp b/gfx/drivers_shader/slang_process.cpp
index a8a6db588b..3d9f1179f2 100644
--- a/gfx/drivers_shader/slang_process.cpp
+++ b/gfx/drivers_shader/slang_process.cpp
@@ -7,6 +7,7 @@
 #include <compat/strl.h>
 #include <string>
 #include <stdint.h>
+#include <algorithm>
 
 #include "glslang_util.h"
 #include "slang_preprocess.h"
diff --git a/gfx/video_display_server.c b/gfx/video_display_server.c
index 653cd0d8ad..98fd57eca1 100644
--- a/gfx/video_display_server.c
+++ b/gfx/video_display_server.c
@@ -21,7 +21,14 @@
 #include "../verbosity.h"
 
 static const video_display_server_t *current_display_server = NULL;
-static void *current_display_server_data = NULL;
+static void                    *current_display_server_data = NULL;
+
+const char *video_display_server_get_ident(void)
+{
+   if (!current_display_server)
+      return "null";
+   return current_display_server->ident;
+}
 
 void* video_display_server_init(void)
 {
diff --git a/gfx/video_display_server.h b/gfx/video_display_server.h
index 6f06228915..9a39100807 100644
--- a/gfx/video_display_server.h
+++ b/gfx/video_display_server.h
@@ -52,6 +52,8 @@ bool video_display_server_switch_resolution(
 
 const char *video_display_server_get_output_options(void);
 
+const char *video_display_server_get_ident(void);
+
 extern const video_display_server_t dispserv_win32;
 extern const video_display_server_t dispserv_x11;
 extern const video_display_server_t dispserv_null;
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index dd7168415e..75f2f46bfb 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -295,6 +295,9 @@ static const video_driver_t *video_drivers[] = {
 #ifdef PSP
    &video_psp1,
 #endif
+#ifdef PS2
+   &video_ps2,
+#endif
 #ifdef _3DS
    &video_ctr,
 #endif
@@ -395,7 +398,7 @@ static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
 #if defined(__QNX__)
    &gfx_ctx_qnx,
 #endif
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
+#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
    &gfx_ctx_cocoagl,
 #endif
 #if defined(__APPLE__) && !defined(TARGET_IPHONE_SIMULATOR) && !defined(TARGET_OS_IPHONE)
@@ -460,12 +463,6 @@ static bool set_resize_null(void *a, unsigned b, unsigned c)
    return false;
 }
 
-void video_driver_set_resize(unsigned width, unsigned height)
-{
-   if (current_video_context.set_resize)
-      current_video_context.set_resize(video_context_data, width, height);
-}
-
 /**
  * video_driver_find_handle:
  * @idx                : index of driver to get handle to.
@@ -677,11 +674,9 @@ retro_proc_address_t video_driver_get_proc_address(const char *sym)
 bool video_driver_set_shader(enum rarch_shader_type type,
       const char *path)
 {
-   bool ret = false;
    if (current_video->set_shader)
-      ret = current_video->set_shader(video_driver_data, type, path);
-
-   return ret;
+      return current_video->set_shader(video_driver_data, type, path);
+   return false;
 }
 
 static void video_driver_filter_free(void)
@@ -2756,6 +2751,7 @@ void video_driver_build_info(video_frame_info_t *video_info)
    video_info->scale_integer         = settings->bools.video_scale_integer;
    video_info->aspect_ratio_idx      = settings->uints.video_aspect_ratio_idx;
    video_info->post_filter_record    = settings->bools.video_post_filter_record;
+   video_info->input_menu_swap_ok_cancel_buttons    = settings->bools.input_menu_swap_ok_cancel_buttons;
    video_info->max_swapchain_images  = settings->uints.video_max_swapchain_images;
    video_info->windowed_fullscreen   = settings->bools.video_windowed_fullscreen;
    video_info->fullscreen            = settings->bools.video_fullscreen || retroarch_is_forced_fullscreen();
@@ -2793,6 +2789,7 @@ void video_driver_build_info(video_frame_info_t *video_info)
    video_info->menu_footer_opacity    = settings->floats.menu_footer_opacity;
    video_info->menu_header_opacity    = settings->floats.menu_header_opacity;
    video_info->materialui_color_theme = settings->uints.menu_materialui_color_theme;
+   video_info->ozone_color_theme      = settings->uints.menu_ozone_color_theme;
    video_info->menu_shader_pipeline   = settings->uints.menu_xmb_shader_pipeline;
    video_info->xmb_theme              = settings->uints.menu_xmb_theme;
    video_info->xmb_color_theme        = settings->uints.menu_xmb_color_theme;
@@ -2830,6 +2827,7 @@ void video_driver_build_info(video_frame_info_t *video_info)
    video_info->input_driver_nonblock_state = input_driver_is_nonblock_state();
 
    video_info->context_data           = video_context_data;
+   video_info->shader_driver          = current_shader;
    video_info->shader_data            = current_shader_data;
 
    video_info->cb_update_window_title = current_video_context.update_window_title;
@@ -2837,7 +2835,6 @@ void video_driver_build_info(video_frame_info_t *video_info)
    video_info->cb_get_metrics         = current_video_context.get_metrics;
    video_info->cb_set_resize          = current_video_context.set_resize;
 
-   video_info->cb_shader_use          = video_driver_cb_shader_use;
    video_info->cb_set_mvp             = video_driver_cb_shader_set_mvp;
 
    video_info->userdata               = video_driver_get_ptr(false);
@@ -3015,74 +3012,30 @@ static const gfx_ctx_driver_t *video_context_driver_init(
       const gfx_ctx_driver_t *ctx,
       const char *ident,
       enum gfx_ctx_api api, unsigned major,
-      unsigned minor, bool hw_render_ctx)
+      unsigned minor, bool hw_render_ctx,
+      void **ctx_data)
 {
-   if (ctx->bind_api(data, api, major, minor))
+   video_frame_info_t video_info;
+
+   if (!ctx->bind_api(data, api, major, minor))
    {
-      video_frame_info_t video_info;
-      void       *ctx_data = NULL;
+      RARCH_WARN("Failed to bind API (#%u, version %u.%u)"
+            " on context driver \"%s\".\n",
+            (unsigned)api, major, minor, ctx->ident);
 
-      video_driver_build_info(&video_info);
-
-      ctx_data = ctx->init(&video_info, data);
-
-      if (!ctx_data)
-         return NULL;
-
-      if (ctx->bind_hw_render)
-         ctx->bind_hw_render(ctx_data,
-               video_info.shared_context && hw_render_ctx);
-
-      video_context_data = ctx_data;
-
-      return ctx;
+      return NULL;
    }
 
-#ifndef _WIN32
-   RARCH_WARN("Failed to bind API (#%u, version %u.%u)"
-         " on context driver \"%s\".\n",
-         (unsigned)api, major, minor, ctx->ident);
-#endif
+   video_driver_build_info(&video_info);
 
-   return NULL;
-}
+   if (!(*ctx_data = ctx->init(&video_info, data)))
+      return NULL;
 
-/**
- * video_context_driver_find_driver:
- * @data                    : Input data.
- * @ident                   : Identifier of graphics context driver to find.
- * @api                     : API of higher-level graphics API.
- * @major                   : Major version number of higher-level graphics API.
- * @minor                   : Minor version number of higher-level graphics API.
- * @hw_render_ctx           : Request a graphics context driver capable of
- *                            hardware rendering?
- *
- * Finds graphics context driver and initializes.
- *
- * Returns: graphics context driver if found, otherwise NULL.
- **/
-static const gfx_ctx_driver_t *video_context_driver_find_driver(void *data,
-      const char *ident,
-      enum gfx_ctx_api api, unsigned major,
-      unsigned minor, bool hw_render_ctx)
-{
-   int i = find_video_context_driver_index(ident);
+   if (ctx->bind_hw_render)
+      ctx->bind_hw_render(*ctx_data,
+            video_info.shared_context && hw_render_ctx);
 
-   if (i >= 0)
-      return video_context_driver_init(data, gfx_ctx_drivers[i], ident,
-            api, major, minor, hw_render_ctx);
-
-   for (i = 0; gfx_ctx_drivers[i]; i++)
-   {
-      const gfx_ctx_driver_t *ctx =
-         video_context_driver_init(data, gfx_ctx_drivers[i], ident,
-            api, major, minor, hw_render_ctx);
-
-      if (ctx)
-         return ctx;
-   }
-
-   return NULL;
+   return ctx;
 }
 
 /**
@@ -3101,28 +3054,35 @@ static const gfx_ctx_driver_t *video_context_driver_find_driver(void *data,
  **/
 const gfx_ctx_driver_t *video_context_driver_init_first(void *data,
       const char *ident, enum gfx_ctx_api api, unsigned major,
-      unsigned minor, bool hw_render_ctx)
+      unsigned minor, bool hw_render_ctx, void **ctx_data)
 {
-   return video_context_driver_find_driver(data, ident, api,
-         major, minor, hw_render_ctx);
-}
+   int                i = find_video_context_driver_index(ident);
 
-bool video_context_driver_check_window(gfx_ctx_size_t *size_data)
-{
-   if (     video_context_data
-         && current_video_context.check_window)
+   if (i >= 0)
    {
-      bool is_shutdown = rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL);
-      current_video_context.check_window(video_context_data,
-            size_data->quit,
-            size_data->resize,
-            size_data->width,
-            size_data->height,
-            is_shutdown);
-      return true;
+      const gfx_ctx_driver_t *ctx = video_context_driver_init(data, gfx_ctx_drivers[i], ident,
+            api, major, minor, hw_render_ctx, ctx_data);
+      if (ctx)
+      {
+         video_context_data = *ctx_data;
+         return ctx;
+      }
    }
 
-   return false;
+   for (i = 0; gfx_ctx_drivers[i]; i++)
+   {
+      const gfx_ctx_driver_t *ctx =
+         video_context_driver_init(data, gfx_ctx_drivers[i], ident,
+            api, major, minor, hw_render_ctx, ctx_data);
+
+      if (ctx)
+      {
+         video_context_data = *ctx_data;
+         return ctx;
+      }
+   }
+
+   return NULL;
 }
 
 bool video_context_driver_init_image_buffer(const video_info_t *data)
@@ -3162,14 +3122,6 @@ bool video_context_driver_get_video_output_next(void)
    return true;
 }
 
-bool video_context_driver_bind_hw_render(bool *enable)
-{
-   if (!current_video_context.bind_hw_render)
-      return false;
-   current_video_context.bind_hw_render(video_context_data, *enable);
-   return true;
-}
-
 void video_context_driver_make_current(bool release)
 {
    if (current_video_context.make_current)
@@ -3324,15 +3276,6 @@ bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info)
    return true;
 }
 
-bool video_context_driver_get_context_data(void *data)
-{
-   if (!current_video_context.get_context_data)
-      return false;
-   *(void**)data = current_video_context.get_context_data(
-         video_context_data);
-   return true;
-}
-
 bool video_context_driver_show_mouse(bool *bool_data)
 {
    if (!current_video_context.show_mouse)
@@ -3435,15 +3378,13 @@ enum gfx_ctx_api video_context_driver_get_api(void)
 
 bool video_driver_has_windowed(void)
 {
-#if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
-   return false;
-#else
+#if !(defined(RARCH_CONSOLE) || defined(RARCH_MOBILE))
    if (video_driver_data && current_video->has_windowed)
       return current_video->has_windowed(video_driver_data);
    else if (video_context_data && current_video_context.has_windowed)
       return current_video_context.has_windowed(video_context_data);
-   return false;
 #endif
+   return false;
 }
 
 bool video_driver_cached_frame_has_valid_framebuffer(void)
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 19f1767460..3a261ebdb8 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -404,6 +404,7 @@ typedef struct video_info
 
 typedef struct video_frame_info
 {
+   bool input_menu_swap_ok_cancel_buttons;
    bool input_driver_nonblock_state;
    bool shared_context;
    bool black_frame_insertion;
@@ -444,6 +445,7 @@ typedef struct video_frame_info
    unsigned xmb_color_theme;
    unsigned menu_shader_pipeline;
    unsigned materialui_color_theme;
+   unsigned ozone_color_theme;
    unsigned custom_vp_width;
    unsigned custom_vp_height;
    unsigned custom_vp_full_width;
@@ -493,13 +495,13 @@ typedef struct video_frame_info
       float *value);
    bool (*cb_set_resize)(void*, unsigned, unsigned);
 
-   void (*cb_shader_use)(void *data, void *shader_data, unsigned index, bool set_active);
    bool (*cb_set_mvp)(void *data, void *shader_data,
          const void *mat_data);
 
    void *context_data;
    void *shader_data;
    void *userdata;
+   const shader_backend_t *shader_driver;
 } video_frame_info_t;
 
 typedef void (*update_window_title_cb)(void*, void*);
@@ -1126,8 +1128,6 @@ void video_driver_set_threaded(bool val);
 void video_driver_get_status(uint64_t *frame_count, bool * is_alive,
       bool *is_focused);
 
-void video_driver_set_resize(unsigned width, unsigned height);
-
 /**
  * video_context_driver_init_first:
  * @data                    : Input data.
@@ -1142,10 +1142,10 @@ void video_driver_set_resize(unsigned width, unsigned height);
  *
  * Returns: graphics context driver if found, otherwise NULL.
  **/
-const gfx_ctx_driver_t *video_context_driver_init_first(void *data, const char *ident,
-      enum gfx_ctx_api api, unsigned major, unsigned minor, bool hw_render_ctx);
-
-bool video_context_driver_check_window(gfx_ctx_size_t *size_data);
+const gfx_ctx_driver_t *video_context_driver_init_first(
+      void *data, const char *ident,
+      enum gfx_ctx_api api, unsigned major, unsigned minor,
+      bool hw_render_ctx, void **ctx_data);
 
 bool video_context_driver_find_prev_driver(void);
 
@@ -1183,8 +1183,6 @@ bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info);
 
 bool video_context_driver_get_refresh_rate(float *refresh_rate);
 
-bool video_context_driver_get_context_data(void *data);
-
 bool video_context_driver_show_mouse(bool *bool_data);
 
 bool video_context_driver_set_flags(gfx_ctx_flags_t *flags);
@@ -1253,6 +1251,7 @@ extern video_driver_t video_vulkan;
 extern video_driver_t video_metal;
 extern video_driver_t video_psp1;
 extern video_driver_t video_vita2d;
+extern video_driver_t video_ps2;
 extern video_driver_t video_ctr;
 extern video_driver_t video_switch;
 extern video_driver_t video_d3d8;
diff --git a/gfx/video_filter.c b/gfx/video_filter.c
index 935c435e7a..bb76dbcba5 100644
--- a/gfx/video_filter.c
+++ b/gfx/video_filter.c
@@ -333,6 +333,7 @@ extern const struct softfilter_implementation *supertwoxsai_get_implementation(s
 extern const struct softfilter_implementation *twoxbr_get_implementation(softfilter_simd_mask_t simd);
 extern const struct softfilter_implementation *darken_get_implementation(softfilter_simd_mask_t simd);
 extern const struct softfilter_implementation *scale2x_get_implementation(softfilter_simd_mask_t simd);
+extern const struct softfilter_implementation *normal2x_get_implementation(softfilter_simd_mask_t simd);
 
 static const softfilter_get_implementation_t soft_plugs_builtin[] = {
    blargg_ntsc_snes_get_implementation,
@@ -345,6 +346,7 @@ static const softfilter_get_implementation_t soft_plugs_builtin[] = {
    supereagle_get_implementation,
    epx_get_implementation,
    scale2x_get_implementation,
+   normal2x_get_implementation,
 };
 
 static bool append_softfilter_plugs(rarch_softfilter_t *filt,
diff --git a/gfx/video_filters/Makefile b/gfx/video_filters/Makefile
index 81c04b8f82..3a1a3e6b8f 100644
--- a/gfx/video_filters/Makefile
+++ b/gfx/video_filters/Makefile
@@ -70,7 +70,7 @@ ASMFLAGS := -INEON/asm
 asflags += -mfpu=neon
 endif
            
-objects += blargg_ntsc_snes.$(DYLIB) phosphor2x.$(DYLIB) epx.$(DYLIB) lq2x.$(DYLIB) 2xsai.$(DYLIB) super2xsai.$(DYLIB) supereagle.$(DYLIB) 2xbr.$(DYLIB) darken.$(DYLIB) scale2x.$(DYLIB)
+objects += blargg_ntsc_snes.$(DYLIB) phosphor2x.$(DYLIB) epx.$(DYLIB) lq2x.$(DYLIB) 2xsai.$(DYLIB) super2xsai.$(DYLIB) supereagle.$(DYLIB) 2xbr.$(DYLIB) darken.$(DYLIB) scale2x.$(DYLIB) normal2x.$(DYLIB)
 
 all: build;
 
diff --git a/gfx/video_filters/Normal2x.filt b/gfx/video_filters/Normal2x.filt
new file mode 100644
index 0000000000..500574af11
--- /dev/null
+++ b/gfx/video_filters/Normal2x.filt
@@ -0,0 +1 @@
+filter = normal2x
diff --git a/gfx/video_filters/normal2x.c b/gfx/video_filters/normal2x.c
new file mode 100644
index 0000000000..d39159b436
--- /dev/null
+++ b/gfx/video_filters/normal2x.c
@@ -0,0 +1,218 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2018 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* Compile: gcc -o normal2x.so -shared normal2x.c -std=c99 -O3 -Wall -pedantic -fPIC */
+
+#include "softfilter.h"
+#include <stdlib.h>
+
+#ifdef RARCH_INTERNAL
+#define softfilter_get_implementation normal2x_get_implementation
+#define softfilter_thread_data normal2x_softfilter_thread_data
+#define filter_data normal2x_filter_data
+#endif
+
+struct softfilter_thread_data
+{
+   void *out_data;
+   const void *in_data;
+   size_t out_pitch;
+   size_t in_pitch;
+   unsigned colfmt;
+   unsigned width;
+   unsigned height;
+   int first;
+   int last;
+};
+
+struct filter_data
+{
+   unsigned threads;
+   struct softfilter_thread_data *workers;
+   unsigned in_fmt;
+};
+
+static unsigned normal2x_generic_input_fmts(void)
+{
+   return SOFTFILTER_FMT_XRGB8888 | SOFTFILTER_FMT_RGB565;
+}
+
+static unsigned normal2x_generic_output_fmts(unsigned input_fmts)
+{
+   return input_fmts;
+}
+
+static unsigned normal2x_generic_threads(void *data)
+{
+   struct filter_data *filt = (struct filter_data*)data;
+   return filt->threads;
+}
+
+static void *normal2x_generic_create(const struct softfilter_config *config,
+      unsigned in_fmt, unsigned out_fmt,
+      unsigned max_width, unsigned max_height,
+      unsigned threads, softfilter_simd_mask_t simd, void *userdata)
+{
+   struct filter_data *filt = (struct filter_data*)calloc(1, sizeof(*filt));
+   (void)simd;
+   (void)config;
+   (void)userdata;
+   
+   if (!filt) {
+      return NULL;
+   }
+   /* Apparently the code is not thread-safe,
+    * so force single threaded operation... */
+   filt->workers = (struct softfilter_thread_data*)calloc(1, sizeof(struct softfilter_thread_data));
+   filt->threads = 1;
+   filt->in_fmt  = in_fmt;
+   if (!filt->workers) {
+      free(filt);
+      return NULL;
+   }
+   return filt;
+}
+
+static void normal2x_generic_output(void *data,
+      unsigned *out_width, unsigned *out_height,
+      unsigned width, unsigned height)
+{
+   *out_width = width << 1;
+   *out_height = height << 1;
+}
+
+static void normal2x_generic_destroy(void *data)
+{
+   struct filter_data *filt = (struct filter_data*)data;
+   if (!filt) {
+      return;
+   }
+   free(filt->workers);
+   free(filt);
+}
+
+static void normal2x_work_cb_xrgb8888(void *data, void *thread_data)
+{
+   struct softfilter_thread_data *thr = (struct softfilter_thread_data*)thread_data;
+   const uint32_t *input = (const uint32_t*)thr->in_data;
+   uint32_t *output = (uint32_t*)thr->out_data;
+   unsigned in_stride = (unsigned)(thr->in_pitch >> 2);
+   unsigned out_stride = (unsigned)(thr->out_pitch >> 2);
+   unsigned x, y;
+   
+   for (y = 0; y < thr->height; ++y)
+   {
+      uint32_t *out_ptr = output;
+      for (x = 0; x < thr->width; ++x)
+      {
+         uint64_t colour = (uint64_t)*(input + x);
+         colour |= colour << 32;
+         
+         *(uint64_t *)(out_ptr) = colour;
+         *(uint64_t *)(out_ptr + out_stride) = colour;
+         
+         out_ptr += 2;
+      }
+      
+      input += in_stride;
+		output += out_stride << 1;
+   }
+}
+
+static void normal2x_work_cb_rgb565(void *data, void *thread_data)
+{
+   struct softfilter_thread_data *thr = (struct softfilter_thread_data*)thread_data;
+   const uint16_t *input = (const uint16_t*)thr->in_data;
+   uint16_t *output = (uint16_t*)thr->out_data;
+   unsigned in_stride = (unsigned)(thr->in_pitch >> 1);
+   unsigned out_stride = (unsigned)(thr->out_pitch >> 1);
+   unsigned x, y;
+   
+   for (y = 0; y < thr->height; ++y)
+   {
+      uint16_t * out_ptr = output;
+      for (x = 0; x < thr->width; ++x)
+      {
+         uint32_t colour = (uint32_t)*(input + x);
+         colour |= colour << 16;
+         
+         *(uint32_t *)(out_ptr) = colour;
+         *(uint32_t *)(out_ptr + out_stride) = colour;
+         
+         out_ptr += 2;
+      }
+      
+      input += in_stride;
+		output += out_stride << 1;
+   }
+}
+
+static void normal2x_generic_packets(void *data,
+      struct softfilter_work_packet *packets,
+      void *output, size_t output_stride,
+      const void *input, unsigned width, unsigned height, size_t input_stride)
+{
+   /* We are guaranteed single threaded operation
+    * (filt->threads = 1) so we don't need to loop
+    * over threads and can cull some code. This only
+    * makes the tiniest performance difference, but
+    * every little helps when running on an o3DS... */
+   struct filter_data *filt = (struct filter_data*)data;
+   struct softfilter_thread_data *thr = (struct softfilter_thread_data*)&filt->workers[0];
+   
+   thr->out_data = (uint8_t*)output;
+   thr->in_data = (const uint8_t*)input;
+   thr->out_pitch = output_stride;
+   thr->in_pitch = input_stride;
+   thr->width = width;
+   thr->height = height;
+   
+   if (filt->in_fmt == SOFTFILTER_FMT_XRGB8888) {
+      packets[0].work = normal2x_work_cb_xrgb8888;
+   } else if (filt->in_fmt == SOFTFILTER_FMT_RGB565) {
+      packets[0].work = normal2x_work_cb_rgb565;
+   }
+   packets[0].thread_data = thr;
+}
+
+static const struct softfilter_implementation normal2x_generic = {
+   normal2x_generic_input_fmts,
+   normal2x_generic_output_fmts,
+   
+   normal2x_generic_create,
+   normal2x_generic_destroy,
+   
+   normal2x_generic_threads,
+   normal2x_generic_output,
+   normal2x_generic_packets,
+   
+   SOFTFILTER_API_VERSION,
+   "Normal2x",
+   "normal2x",
+};
+
+const struct softfilter_implementation *softfilter_get_implementation(
+      softfilter_simd_mask_t simd)
+{
+   (void)simd;
+   return &normal2x_generic;
+}
+
+#ifdef RARCH_INTERNAL
+#undef softfilter_get_implementation
+#undef softfilter_thread_data
+#undef filter_data
+#endif
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 30d8c7718a..d057b0a8f2 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -438,6 +438,8 @@ VIDEO DRIVER
 #include "../gfx/drivers/gx_gfx.c"
 #elif defined(PSP)
 #include "../gfx/drivers/psp1_gfx.c"
+#elif defined(PS2)
+#include "../gfx/drivers/ps2_gfx.c"
 #elif defined(HAVE_VITA2D)
 #include "../deps/libvita2d/source/vita2d.c"
 #include "../deps/libvita2d/source/vita2d_texture.c"
@@ -567,7 +569,10 @@ INPUT
 #elif defined(SN_TARGET_PSP2) || defined(PSP) || defined(VITA)
 #include "../input/drivers/psp_input.c"
 #include "../input/drivers_joypad/psp_joypad.c"
-#elif defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
+#elif defined(PS2)
+#include "../input/drivers/ps2_input.c"
+#include "../input/drivers_joypad/ps2_joypad.c"
+#elif defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
 #include "../input/drivers/cocoa_input.c"
 #elif defined(_3DS)
 #include "../input/drivers/ctr_input.c"
@@ -764,6 +769,8 @@ AUDIO
 #include "../audio/drivers/rwebaudio.c"
 #elif defined(PSP) || defined(VITA)
 #include "../audio/drivers/psp_audio.c"
+#elif defined(PS2)
+// #include "../audio/drivers/ps2_audio.c"
 #elif defined(_3DS)
 #include "../audio/drivers/ctr_csnd_audio.c"
 #include "../audio/drivers/ctr_dsp_audio.c"
@@ -860,6 +867,7 @@ FILTERS
 #include "../gfx/video_filters/blargg_ntsc_snes.c"
 #include "../gfx/video_filters/lq2x.c"
 #include "../gfx/video_filters/phosphor2x.c"
+#include "../gfx/video_filters/normal2x.c"
 
 #include "../libretro-common/audio/dsp_filters/echo.c"
 #include "../libretro-common/audio/dsp_filters/eq.c"
@@ -958,6 +966,8 @@ FRONTEND
 #include "../frontend/drivers/platform_wiiu.c"
 #elif defined(PSP) || defined(VITA)
 #include "../frontend/drivers/platform_psp.c"
+#elif defined(PS2)
+#include "../frontend/drivers/platform_ps2.c"
 #elif defined(_3DS)
 #include "../frontend/drivers/platform_ctr.c"
 #elif defined(SWITCH) && defined(HAVE_LIBNX)
@@ -1035,6 +1045,7 @@ RETROARCH
 #include "../intl/msg_hash_chs.c"
 #include "../intl/msg_hash_cht.c"
 #include "../intl/msg_hash_ar.c"
+#include "../intl/msg_hash_el.c"
 #endif
 
 #include "../intl/msg_hash_us.c"
@@ -1263,6 +1274,14 @@ MENU
 #ifdef HAVE_XMB
 #include "../menu/drivers/xmb.c"
 #endif
+#ifdef HAVE_OZONE
+#include "../menu/drivers/ozone/ozone.c"
+#include "../menu/drivers/ozone/ozone_display.c"
+#include "../menu/drivers/ozone/ozone_entries.c"
+#include "../menu/drivers/ozone/ozone_sidebar.c"
+#include "../menu/drivers/ozone/ozone_texture.c"
+#include "../menu/drivers/ozone/ozone_theme.c"
+#endif
 
 #ifdef HAVE_STRIPES
 #include "../menu/drivers/stripes.c"
diff --git a/griffin/griffin_objc.m b/griffin/griffin_objc.m
index 1393d61bf1..f11512e7a4 100644
--- a/griffin/griffin_objc.m
+++ b/griffin/griffin_objc.m
@@ -27,9 +27,14 @@
 #include "../frontend/drivers/platform_darwin.m"
 #endif
 
+#if defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
 #if defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA)
-#include "../gfx/drivers_context/macos_ctx.m"
+#include "../gfx/drivers_context/cocoa_gl_ctx.m"
 #include "../ui/drivers/cocoa/cocoa_common.m"
+#else
+#include "../gfx/drivers_context/cocoa_gl_ctx_metal.m"
+#include "../ui/drivers/cocoa/cocoa_common_metal.m"
+#endif
 
 #if defined(HAVE_COCOATOUCH)
 
@@ -45,6 +50,12 @@
 #include "../ui/drivers/cocoa/ui_cocoa_window.m"
 #include "../ui/drivers/cocoa/ui_cocoa_msg_window.m"
 #include "../ui/drivers/cocoa/ui_cocoa_application.m"
+#elif defined(HAVE_COCOA_METAL)
+#include "../ui/drivers/ui_cocoa_metal.m"
+#include "../ui/drivers/cocoa/ui_cocoa_browser_window_metal.m"
+#include "../ui/drivers/cocoa/ui_cocoa_window_metal.m"
+#include "../ui/drivers/cocoa/ui_cocoa_msg_window_metal.m"
+#include "../ui/drivers/cocoa/ui_cocoa_application_metal.m"
 #endif
 
 #endif
diff --git a/hakchi/bin/retroarch-clover b/hakchi/bin/retroarch-clover
deleted file mode 100644
index 4143555d4c..0000000000
--- a/hakchi/bin/retroarch-clover
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-source /etc/preinit
-script_init
-
-uistop
-
-core="$1"
-rom="$2"
-shift 2
-
-if [ -f "/bin/remote-exec" ]; then
-  echo retroarch-clover-child "$core" "\"$rom\"" ${1+"$@"} > /var/exec.flag
-else
-  exec retroarch-clover-child "$core" "\"$rom\"" ${1+"$@"}
-fi
diff --git a/hakchi/bin/retroarch-clover-child b/hakchi/bin/retroarch-clover-child
deleted file mode 100644
index f078f6ccfa..0000000000
--- a/hakchi/bin/retroarch-clover-child
+++ /dev/null
@@ -1,322 +0,0 @@
-#!/bin/sh
-
-source /etc/preinit
-script_init
-
-#### Variable Definitions ##################################################
-
-HOME=/etc/libretro
-corename="$1"
-noprefix="${corename#km_}"
-core="$HOME/core/${1}_libretro.so"
-rom="$2"
-filename="$(basename "$rom")"
-id="${filename%.*}"
-extension="${filename##*.}"
-newrsram=/var/saves/retroarch
-autosave="/var/cache/retroarch/$id.state.auto"
-t_suffix=_time.txt
-debug=0
-bezel_mode=0
-clovercon_file=/dev/clovercon1
-shift 2
-
-while [ $# -gt 0 ]; do
-  [ "$1" == "--load-state-file" ] && load="$2"
-  [ "$1" == "--save-on-quit" ] && save="$2"
-  [ "$1" == "--rollback-input-dir" ] && load="$2/savestate"
-  [ "$1" == "--rollback-output-dir" ] && save="$2/savestate"
-  [ "$1" == "--save-screenshot-on-quit" ] && screenshot="$2"
-  [ "$1" == "--save-data-backing-file" ] && sram="$2"
-  [ "$1" == "--graphic-filter" ] && filter="$2"
-  [ "$1" == "--enable-crt-scanlines" ] && crt=1
-  [ "$1" == "--video-mode" ] && [ "$2" == "crt-filter" ] && filter=crt720 && crt=1
-  [ "$1" == "--video-mode" ] && [ "$2" == "keep-aspect-ratio" ] && filter=gpu720
-  [ "$1" == "--video-mode" ] && [ "$2" == "pixel-perfect" ] && filter=ppu
-  [ "$1" == "--smooth43" ] && smooth43=1
-  [ "$1" == "--no-smooth" ] && no_smooth=1
-  [ "$1" == "--no-scanlines" ] && no_scanlines=1
-  [ "$1" == "--bezel-mode" ] && bezel_mode=1
-  [ "$1" == "--title-code" ] && title_code="$2"
-  [ "$1" == "--ra-extra" ] && extra="$2"
-  [ "$1" == "--ra-nosaves" ] && nosaves=1
-  [ "$1" == "--load-time-path" ] && timefile_load="$2"
-  [ "$1" == "--save-time-path" ] && timefile_save="$2"
-  [ "$1" == "--replay-inputs" ] && demo=1
-  [ "$1" == "--decorative-frame-path" ] && frame="$2"
-  [ "$1" == "--debug-usb" ] && debug=1
-  [ "$1" == "--debug-nand" ] && debug=2
-  [ "$1" == "--custom-loadscreen" ] && custom_loadscreen="$2"
-  shift
-done
-
-#### Visuals ###############################################################
-
-#Retrospective fix for hakchi port splashes
-if ! echo $corename | grep "prboom\|tyrquake\|cannonball"; then
-  umount "$rootfs/share/retroarch/assets/RAloading-min.png"
-fi
-
-# Display Splash Screen
-if [ ! -z "$custom_loadscreen" ]; then
-  decodepng "$rootfs/share/retroarch/assets/$custom_loadscreen" > /dev/fb0;
-else
-  if [ -f "$mountpoint/media/hakchi/RA_loading_screens/$noprefix.png" ] && [ -f "$rootfs/share/retroarch/assets/RAloading-min.png" ]; then
-	  decodepng "$mountpoint/media/hakchi/RA_loading_screens/$noprefix.png"  > /dev/fb0;
-  else
-    if [ -f "$rootfs/share/retroarch/assets/core_loading_screens/$noprefix.png" ] && [ -f "$rootfs/share/retroarch/assets/RAloading-min.png" ]; then
-      decodepng "$rootfs/share/retroarch/assets/core_loading_screens/$noprefix.png"  > /dev/fb0;
-    else
-      decodepng "$rootfs/share/retroarch/assets/RAloading-min.png" > /dev/fb0;
-    fi
-  fi
-fi
-
-#### Network Mounting ######################################################
-
-if [ -f "/media/hakchi/retroarch-mounted.cfg" ]; then
-  mv -f /media/hakchi/retroarch-mounted.cfg /etc/libretro/
-fi
-
-source /etc/libretro/retroarch-mounted.cfg
-if [ "$ra_mount_enable" == "true" ] && [ ! -z "${ra_mount_address// }" ] && [ ! -d /var/mount ]; then
-  mkdir -p /var/mount
-  if [ ! -z "${ra_mount_user// }" ] && [ ! -z "${ra_mount_pass// }" ]; then
-    mount -t cifs -o user=$ra_mount_user,pass=$ra_mount_pass $ra_mount_address /var/mount
-  elif [ ! -z "${ra_mount_user// }" ] && [ -z "${ra_mount_pass// }" ]; then
-    mount -t cifs -o user=$ra_mount_user $ra_mount_address /var/mount
-  else
-    mount -t cifs $ra_mount_address /var/mount
-  fi
-fi
-
-#### Saves and Configs #####################################################
-
-[ ! -z "$demo" ] && load="$(dirname "$load")/savestate"
-
-# Create cache and /var/saves/retroarch directories
-mkdir -p /var/cache/retroarch
-mkdir -p "$newrsram"
-
-# Create a "cartridge.sram" file of 21B to avoid hakchi2 save-state manager from removing the folder
-# Just in case we're going the "/var/saves/CLV-Z-RETROARCH" way
-# if [ -f "/var/saves/CLV-Z-RETROARCH/cartridge.sram" ]; then
-  # [ "$(wc -c </var/saves/CLV-Z-RETROARCH/cartridge.sram)" -lt 21 ] && rm /var/saves/CLV-Z-RETROARCH/cartridge.sram && dd if=/dev/zero of=/var/saves/CLV-Z-RETROARCH/cartridge.sram bs=21 count=1
-# else
-  # dd if=/dev/zero of=/var/saves/CLV-Z-RETROARCH/cartridge.sram bs=21 count=1
-# fi
-
-# Moving RetroArch saves from "/var/saves/" to "/var/saves/retroarch/" if the ID is known (if the .desktop is on the console atm)
-if [ -z "$(ls -A "$newrsram")" ]; then # so this whole part only executes at the 1st launch
-  if [ -d "/media/hakchi" ]; then
-    desktop_search="/media/hakchi/games"
-  else
-    desktop_search="/var/lib/hakchi/games"
-  fi
-  for rasaves in /var/saves/CLV-*; do
-    fdsgame=0
-    canoecheck=0
-    gameid="$(basename "$rasaves")"
-	# [ "$gameid" = "CLV-Z-RETROARCH" ] && continue
-    if [ -f "$rasaves/cartridge.sram" ] && [ -f "$rasaves/cartridge.sram.hash" ]; then
-      [ "$(tail -c 20 "$rasaves/cartridge.sram")" = "$(cat "$rasaves/cartridge.sram.hash")" ] && canoecheck=1 # check if thats a Canoe save
-    fi
-    if [ "$canoecheck" = 0 ] && [ -f "$rasaves/cartridge.sram" ]; then
-      if [ ! -z "$(find "$desktop_search" -name "$gameid.desktop")" ]; then # search for .desktop file
-	    filename2="$(cat `find "$desktop_search" -name "$gameid.desktop"` | grep "^Exec=" | basename `awk '{print $2}'`)"
-		[ "${filename2##*.}" = "fds" ] && fdsgame=1
-		filename2="${filename2%.*}"
-		if [ ! -z "$(cat `find "$desktop_search" -name "$gameid.desktop"` | grep "/bin/gpsp")" ]; then
-		  mv "$rasaves/cartridge.sram" "$newrsram/$filename2.sav" # rename the file to .sav if its a gpSP save
-		elif [ ! -z "$(cat `find "$desktop_search" -name "$gameid.desktop"` | grep "/bin/nes\|/bin/nestopia")" ] && [ "$fdsgame" = 1 ]; then
-		  mv "$rasaves/cartridge.sram" "$newrsram/$filename2.sav" # rename the file to .sav if its a FDS Nestopia save
-		else
-		  mv "$rasaves/cartridge.sram" "$newrsram/$filename2.srm" # rename the file to .srm
-		fi
-	  fi
-    fi
-    if ls "$rasaves" | grep -w "brm$"; then
-      mv "$rasaves/"*.brm "$newrsram" # no need to rename those, just move
-    fi
-  done
-fi
-
-# Copy savestates from USB if any
-if [ -d "/media/data/ra_savestates" ] && ls "/media/data/ra_savestates/$title_code/$id.state"*; then
-  cp "/media/data/ra_savestates/$title_code/$id.state"* /var/cache/retroarch
-fi
-
-# Move mame config files to "/var/saves/retroarch"
-if [ -d "/etc/libretro/.config/retroarch/config/arcade" ]; then
-  if [ ! -z "$(ls -A /etc/libretro/.config/retroarch/config/arcade)" ]; then
-    mv /etc/libretro/.config/retroarch/config/arcade/* "$newrsram"
-	[ -z "$(ls -A /etc/libretro/.config/retroarch/config/arcade)" ] && rmdir /etc/libretro/.config/retroarch/config/arcade
-  fi
-fi
-
-# saves if any
-if [ ! -z "$load" ] && [ -f "$load" ] && [ -z "$nosaves" ]; then
-  if [ "$(hexdump -n 2 -e '1/1 "%02X"' "$load")" == "1F8B" ]; then
-    cp -f "$load" "$autosave.gz"
-    gunzip -f "$autosave.gz"
-  else
-    cp -f "$load" "$autosave"
-  fi
-fi
-
-# Moving and renaming save from "/var/saves/CLV-*/cartridge.*" to "/var/saves/retroarch/$id.*" that were previously unknown
-if [ "$noprefix" == "nestopia" ] && [ "$extension" == "fds" ]; then
-  [ ! -z "$sram" ] && [ -f "$sram" ] && mv "$sram" "$newrsram/$id.sav"
-elif [ "$noprefix" == "gpsp" ]; then
-  [ ! -z "$sram" ] && [ -f "$sram" ] && mv "$sram" "$newrsram/$id.sav"
-elif [ "$noprefix" == "genesis_plus_gx" ]; then
-  [ -f "/var/saves/$title_code/$id.brm" ] && mv "/var/saves/$title_code/$id.brm" "$newrsram"
-else
-  [ ! -z "$sram" ] && [ -f "$sram" ] && mv "$sram" "$newrsram/$id.srm"
-fi
-
-#### General ###############################################################
-
-#Overcommit this. (Should solve dumb crashes due to memory limits)
-echo "1" > "/proc/sys/vm/overcommit_memory"
-
-[ -z "$timefile_save" ] && timefile_save="$load$t_suffix"
-[ -z "$timefile_load" ] && timefile_load="$load$t_suffix"
-
-# Hold L button while starting a game to toggle bezel-mode for this game
-if [ -e "$clovercon_file" ] && [ "$(cat $clovercon_file)" == "0004" ]; then
-  if [ "$bezel_mode" == "0" ]; then
-    sed -i "s/^Exec.*/& --bezel-mode/" "$gamepath/$title_code/$title_code.desktop" && bezel_mode=1
-  else
-    sed -i "s/ --bezel-mode//g" "$gamepath/$title_code/$title_code.desktop" && bezel_mode=0
-  fi
-fi
-# Hold R button while starting a game to toggle bezel-mode for this core
-if [ -e "$clovercon_file" ] && [ "$(cat $clovercon_file)" == "0008" ]; then
-  [ ! -f "$HOME/bezel-core" ] && touch "$HOME/bezel-core"
-  if grep "^$corename$" "$HOME/bezel-core"; then
-    sed -i "/^$corename$/d" "$HOME/bezel-core"
-  else
-    echo "$corename" >> "$HOME/bezel-core"
-  fi
-fi
-[ -f "$HOME/bezel-core" ] && grep "^$corename$" "$HOME/bezel-core" && bezel_mode=1
-
-# Smooth, border and scanlines
-if [ "$bezel_mode" == "1" ]; then
-  [ "$filter" == "crt720" ] && overlay1=scanlines.png && overlay2="$frame.png"
-else
-  [ "$filter" == "crt720" ] && overlay1=scanlines.png
-fi
-[ "$filter" == "crt720" ] && [ ! -z "$no_scanlines" ] || [ ! "$filter" == "crt720" ] && overlay1="$frame.png"
-retroarch_watchdog --configEdit /etc/libretro/.config/retroarch/overlay/default.cfg overlay0_overlay "$overlay1" overlay0_desc0_overlay "$overlay2"
-retroarch_watchdog --configEdit /etc/libretro/.config/retroarch/overlay/default_scanlines.cfg overlay0_desc0_overlay "$frame.png"
-
-ra_config_args=""
-# Functions to make the rest easier
-smooth(){ ra_config_args="$ra_config_args video_smooth $1"; }
-overlay(){ ra_config_args="$ra_config_args input_overlay_enable $1"; }
-overlay_file(){ ra_config_args="$ra_config_args input_overlay ~/.config/retroarch/overlay/$1"; }
-int_scale(){ ra_config_args="$ra_config_args video_scale_integer $1"; }
-ratio(){ ra_config_args="$ra_config_args aspect_ratio_index $1"; }
-width(){ ra_config_args="$ra_config_args custom_viewport_width $1"; }
-height(){ ra_config_args="$ra_config_args custom_viewport_height $1"; }
-posx(){ ra_config_args="$ra_config_args custom_viewport_x $1"; }
-posy(){ ra_config_args="$ra_config_args custom_viewport_y $1"; }
-
-# Smooth and bezel-mode
-if [ "$bezel_mode" == "1" ]; then
-  [ "$filter" == "crt720" ] && width 877 && posx 201
-  [ "$filter" == "gpu720" ] && smooth false && width 877 && posx 201
-  [ "$filter" == "ppu" ] && smooth false && width 768 && posx 256
-  ratio 22 && overlay true && overlay_file default.cfg && height 672 && posy 24 && int_scale true
-fi
-[ "$filter" == "crt720" ] && overlay true
-[ "$filter" == "crt720" ] && [ -z "$no_smooth" ] && smooth true
-[ "$filter" == "crt720" ] && [ ! -z "$no_smooth" ] && smooth false
-[ "$filter" == "gpu720" ] && [ ! -z "$smooth43" ] && smooth true
-
-# Set config for standalone launch mode
-if [ -z "${corename// }" ]; then
-    ra_config_args="$ra_config_args savefile_directory /var/saves/CLV-Z-RETROARCH"
-    ra_config_args="$ra_config_args savestate_directory /var/saves/CLV-Z-RASAVESTATES"
-    ra_config_args="$ra_config_args savestate_auto_save false"
-    ra_config_args="$ra_config_args savestate_auto_load false"
-    ra_config_args="$ra_config_args autosave_interval 0"
-fi
-
-[ ! -z "$ra_config_args" ] && retroarch_watchdog --configEdit /etc/libretro/retroarch.cfg $ra_config_args
-
-#### Runtime ###############################################################
-
-if [ -f "/media/hakchi/RA_DEV_MODE" ]; then #Devmode Active (Record current session)
-  if [ -z "${corename// }" ]; then
-    rm -f /media/Development_RetroArch.log
-    echo "Pre RA load Core Temp: $(more /sys/devices/virtual/thermal/thermal_zone0/temp)" >> /media/Development_RA_temp.log
-    retroarch -c "$HOME/retroarch.cfg" -vf > /media/Development_RetroArch.log 2>&1 &
-  else
-    rm -f /media/Development_RetroArch.log
-    echo "Pre RA load Core Temp: $(more /sys/devices/virtual/thermal/thermal_zone0/temp)" >> /media/Development_RA_temp.log
-    retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" "$extra" > /media/Development_RetroArch.log 2>&1 &
-  fi
-else
-  if [ -z "${corename// }" ]; then
-    retroarch -c "$HOME/retroarch.cfg" -vf &
-  fi
-  if [ "$debug" == "0" ]; then #Default
-    retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" "$extra" &
-  fi
-  if [ "$debug" == "1" ]; then #Verbose USB mode
-    retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" "$extra" > "/media/${filename}_RetroArch.log" 2>&1 &
-  fi
-  if [ "$debug" == "2" ]; then #Verbose NAND mode
-    retroarch -c "$HOME/retroarch.cfg" -vfL "$core" "$rom" "$extra" > "/tmp/${filename}_RetroArch.log" 2>&1 &
-  fi
-fi
-
-#### Watchdog ##############################################################
-
-# Set Watchdog Arguments
-watchdog_args="$!"
-# Demo mode enabled
-[ ! -z "$demo" ] && watchdog_args="$watchdog_args --demo"
-# Set Screenshot Args
-[ ! -z "$screenshot" ] && [ -z "$nosaves" ] && watchdog_args="$watchdog_args --screenshot $screenshot"
-# Load Time Played
-[ -f "$timefile_load" ] && watchdog_args="$watchdog_args --time $(cat "$timefile_load")"
-[ -z "$demo" ] && watchdog_args="$watchdog_args --timePath $timefile_save"
-
-# Create output folders
-[ ! -z "$save" ] && mkdir -p "$(dirname "$save")"
-[ ! -z "$sram" ] && mkdir -p "$(dirname "$sram")"
-[ ! -z "$screenshot" ] && mkdir -p "$(dirname "$screenshot")"
-
-# Run retroarch watchdog
-retroarch_watchdog $watchdog_args
-
-#### Cleanup ###############################################################
-
-# Saves!
-[ ! -z "$save" ] && [ -f "$autosave" ] && [ -z "$nosaves" ] && gzip -f "$autosave" && mv -f "$autosave.gz" "$save"
-
-# Restore Retroarch Config
-retroarch_watchdog --configRestore /etc/libretro/retroarch.cfg
-
-# Copy savestates to USB if any and delete cache folder
-if [ -d "/media/hakchi" ] && ls "/var/cache/retroarch/$id".*[^auto]; then
-  [ ! -d "/media/data/ra_savestates/$title_code" ] && mkdir -p "/media/data/ra_savestates/$title_code"
-  cp "/var/cache/retroarch/$id".*[^auto] "/media/data/ra_savestates/$title_code"
-fi
-rm -rf /var/cache/retroarch/
-
-#Remove network drive mount if Hakchi Mount mod is enabled
-if [ ! -f "$rootfs/etc/hakchi_mount_mod" ]; then
-  umount "/var/mount" && rm -rf "/var/mount"
-fi
-
-if [ -f "/media/hakchi/RA_DEV_MODE" ]; then #Devmode Active (Record current session)
-  echo "Post RA load Core Temp: $(more /sys/devices/virtual/thermal/thermal_zone0/temp)" >> /media/Development_RA_temp.log
-fi
-
-# Back to the shell
-uistart
diff --git a/hakchi/bin/retroarch-mini b/hakchi/bin/retroarch-mini
deleted file mode 100644
index a00ab31434..0000000000
--- a/hakchi/bin/retroarch-mini
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-source /etc/preinit
-script_init
-
-uistop
-
-exec retroarch-clover-child
-if [ -f "/bin/remote-exec" ]; then
-  echo retroarch-clover-child > /var/exec.flag
-else
-  exec retroarch-clover-child
-fi
diff --git a/hakchi/etc/libretro/info/CORE_INFO_FILES_GO_HERE.md b/hakchi/etc/libretro/info/CORE_INFO_FILES_GO_HERE.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/hakchi/etc/libretro/system/BIOS_FILES_GO_HERE.md b/hakchi/etc/libretro/system/BIOS_FILES_GO_HERE.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/hakchi/etc/preinit.d/be9af_retroarch b/hakchi/etc/preinit.d/be9af_retroarch
deleted file mode 100644
index 871d348329..0000000000
--- a/hakchi/etc/preinit.d/be9af_retroarch
+++ /dev/null
@@ -1,18 +0,0 @@
-Hakchi_Libretro_Initialise(){
-  if [ -z "$(mount | grep "/etc/libretro ")" ] && [ -d "$mountpoint/media/$modname" ] && [ "$cfg_usb_rw" == "y" ]; then
-    local externalPath="$mountpoint/media/data/ra_data"
-    local localPath="$rootfs/etc/libretro/.config/retroarch"
-    for ra_folders in database thumbnails playlists downloads; do
-      if [ ! -d "$externalPath/$ra_folders" ]; then
-        mkdir -p "$externalPath/$ra_folders"
-        copy "$localPath/$ra_folders" "$externalPath"
-        rm -rf "$localPath/$ra_folders/"*
-      fi
-      mount_bind "$externalPath/$ra_folders" "$localPath/$ra_folders"
-      overmount "${localPath#$rootfs}/$ra_folders"
-    done
-    unset ra_folders
-  fi
-  [ -f "$mountpoint/usr/bin/clover-kachikachi" ] && overmount /usr/bin/clover-kachikachi
-  [ -f "$mountpoint/usr/bin/clover-canoe-shvc" ] && overmount /usr/bin/clover-canoe-shvc
-}
diff --git a/hakchi/etc/preinit.d/pe9af_retroarch b/hakchi/etc/preinit.d/pe9af_retroarch
deleted file mode 100644
index a05a2a8094..0000000000
--- a/hakchi/etc/preinit.d/pe9af_retroarch
+++ /dev/null
@@ -1 +0,0 @@
-Hakchi_Libretro_Initialise
diff --git a/hakchi/install b/hakchi/install
deleted file mode 100644
index a36083ccf8..0000000000
--- a/hakchi/install
+++ /dev/null
@@ -1,55 +0,0 @@
-echo "Grabbing old config variables..."
-cheevos_username=$(grep -i "cheevos_username*" $rootfs/etc/libretro/retroarch.cfg)
-cheevos_password=$(grep -i "cheevos_password*" $rootfs/etc/libretro/retroarch.cfg)
-cheevos_token=$(grep -i "cheevos_token*" $rootfs/etc/libretro/retroarch.cfg)
-netplay_nickname=$(grep -i "netplay_nickname*" $rootfs/etc/libretro/retroarch.cfg)
-netplay_mitm_server=$(grep -i "netplay_mitm_server*" $rootfs/etc/libretro/retroarch.cfg)
-netplay_ip_port=$(grep -i "netplay_ip_port*" $rootfs/etc/libretro/retroarch.cfg)
-netplay_ip_address=$(grep -i "netplay_ip_address*" $rootfs/etc/libretro/retroarch.cfg)
-netplay_password=$(grep -i "netplay_password*" $rootfs/etc/libretro/retroarch.cfg)
-netplay_spectate_password=$(grep -i "netplay_spectate_password*" $rootfs/etc/libretro/retroarch.cfg)
-
-echo "Uninstalling old version of Hakchi RetroArch neo..."
-var=$(hakchi pack_list | grep "Hakchi_Retroarch_Neo_") && hakchi pack_uninstall $var
-echo "Uninstalled $var, Installing new version now..."
-
-transfer_default
-chmod +x $rootfs/bin/*
-chmod +x $rootfs/usr/bin/*
-mkdir -p $rootfs/etc/libretro/system
-[ -f "/newroot/usr/share/kachikachi/fds_bios.bin" ] && cp -f /newroot/usr/share/kachikachi/fds_bios.bin $rootfs/etc/libretro/system/disksys.rom
-mkdir -p $rootfs/etc/options_menu/retroarch/default_files
-copy $rootfs/etc/libretro/retroarch.cfg $rootfs/etc/options_menu/retroarch/default_files/
-copy $rootfs/etc/libretro/retroarch-core-options.cfg $rootfs/etc/options_menu/retroarch/default_files/
-loadscr_path=$rootfs/share/retroarch/assets/core_loading_screens
-for arcade_loadscr in "$loadscr_path/fbalpha2012.png" "$loadscr_path/fbalpha2012_cps1.png" "$loadscr_path/fbalpha2012_cps2.png" "$loadscr_path/fbalpha2012_cps3.png" "$loadscr_path/fbalpha2012_neogeo.png" "$loadscr_path/fb_alpha.png" "$loadscr_path/mame2003.png" "$loadscr_path/mame2003_xtreme.png" "$loadscr_path/mame2010.png" "$loadscr_path/mame2014.png"; do
-  if [ ! -e "$arcade_loadscr" ]; then
-    ln -s "${loadscr_path#/newroot}/mame2000.png" "$arcade_loadscr"
-  fi
-done
-for snes_loadscr in "$loadscr_path/snes9x2002.png" "$loadscr_path/snes9x2005.png" "$loadscr_path/snes9x2010.png"; do
-  if [ ! -e "$snes_loadscr" ]; then
-    ln -s "${loadscr_path#/newroot}/snes9x.png" "$snes_loadscr"
-  fi
-done
-[ ! -e "$loadscr_path/fceumm.png" ] && ln -s ${loadscr_path#/newroot}/nestopia.png $loadscr_path/fceumm.png
-[ ! -e "$loadscr_path/mupen64plus.png" ] && ln -s ${loadscr_path#/newroot}/glupen64.png $loadscr_path/mupen64plus.png
-[ ! -e "$loadscr_path/genesis_plus_gx.png" ] && ln -s ${loadscr_path#/newroot}/picodrive.png $loadscr_path/genesis_plus_gx.png
-
-
-echo "Reloading built in config..."
-sed -i -e 's/cheevos_username = "[^"]*"/cheevos_username = "'$cheevos_username'"/g' $rootfs/etc/libretro/retroarch.cfg
-sed -i -e 's/cheevos_password = "[^"]*"/cheevos_password = "'$cheevos_password'"/g' $rootfs/etc/libretro/retroarch.cfg
-sed -i -e 's/cheevos_token = "[^"]*"/cheevos_token = "'$cheevos_token'"/g' $rootfs/etc/libretro/retroarch.cfg
-sed -i -e 's/netplay_mitm_server = "[^"]*"/netplay_mitm_server = "'$netplay_mitm_server'"/g' $rootfs/etc/libretro/retroarch.cfg
-sed -i -e 's/netplay_ip_port = "[^"]*"/netplay_ip_port = "'$netplay_ip_port'"/g' $rootfs/etc/libretro/retroarch.cfg
-sed -i -e 's/netplay_ip_address = "[^"]*"/netplay_ip_address = "'$netplay_ip_address'"/g' $rootfs/etc/libretro/retroarch.cfg
-sed -i -e 's/netplay_spectate_password = "[^"]*"/netplay_spectate_password = "'$netplay_spectate_password'"/g' $rootfs/etc/libretro/retroarch.cfg
-
-if [ "$cheevos_username" == "hakchiresources" ]; then
-  sed -i -e 's/cheevos_enable = "[^"]*"/cheevos_enable = "false"/g' $rootfs/etc/libretro/retroarch.cfg
-fi
-
-
-echo "Install complete!"
-return 1
diff --git a/hakchi/readme.md b/hakchi/readme.md
deleted file mode 100644
index 180962dd62..0000000000
--- a/hakchi/readme.md
+++ /dev/null
@@ -1,49 +0,0 @@
-
-## New Release Overview video
-
-## Changelog
-
-### 1.7.3b - July 2018
-
-**Please note: NES cores are no longer bundled with RA. You will need to download them seperately**
-
-**Please note: Standalone RetroArch Saves will be located in your saves under CLV-RETROARCH** 
-
-- Huge amount of optimisation and streamlining reduced deployed package size by over half! (Complete RA now only ~5mb compared to ~12mb)
-- RA Saves and savestates fully functional and working for all cores (that support them!)
-- Launching RetroArch standalone now fully functional and working. Saves also supported. 
-- Switching roms within RetroArch standalone now supports saving.
-- Stability fixes for intensive cores (N64, PSX) reducing the risk of C8 crashing.
-- Added ability to now download and update cores directly from the RA menu via HakchiCloud!
-- Added network storage support. You can now play entire rom sets and media directly from your networked drives!
-- Playlist support now implemented. Add thousands of roms to your RetroArch GUI with boxart and thumbnails and launch the roms directly from the GUI (No GUI limit!)
-- New layout look
-- Saving mechanism reworked, better functionality and Hakchi Save Manager support.
-- Loading and shutting down of RetroArch times reduced via optimisation.
-- Fixed occasional C8 errors when launching RetroArch directly 
-- Holding R now enables bezel mode per core instead of individual games
-- Numerous bug fixes
-
-### 1.7.3a - May 2018
-
-- Built with preconfigured network and achievement support. (As soon as network connection is available, network and achievements are enabled.)
-- New RetroArch binary 1.7.3 (completely overhauled audio mixer)
-- Few RA bug fixes
-- Default GUI is now changed to XMB with the purpose of using network and achievements.
-- A few mapping issues Fixed for keyboard to gamepad
-- Saves mame config properly (dip switches, etc.)
-- Optimizations to avoid to many writes on NAND
-- Boot sequence optimised
-- Doom and Quake splash screen bug fixed.
-
-RetroArch and Retroarch Cores by libretro
-
-Hakchi RetroArch Neo main development by Swingflip, Bslenul and CompCom
-
-Hakchi by MadMonkey 
-
-Special thanks to Team Hakchi Resources, Team Shinkansen and MadMonkey
-
-https://hakchiresources.com
-
-(c) 2016-2018
diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index aa6aa0489c..6a9050381f 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -1057,11 +1057,12 @@ static void handle_hotplug(android_input_t *android,
     * This device is composed of two hid devices
     * We make it look like one device
     */
-   else if(strstr(device_model, "R800") &&
-         (
-          strstr(device_name, "keypad-game-zeus") ||
-          strstr(device_name, "keypad-zeus")
-         )
+   else if((strstr(device_model, "R800") || strstr(device_model, "Xperia Play")) && 
+            (
+               strstr(device_name, "keypad-game-zeus") ||
+               strstr(device_name, "keypad-zeus") ||
+               strstr(device_name, "Android Gamepad")
+            )
          )
    {
       /* only use the hack if the device is one of the built-in devices */
diff --git a/input/drivers/ps2_input.c b/input/drivers/ps2_input.c
new file mode 100644
index 0000000000..6942c700f9
--- /dev/null
+++ b/input/drivers/ps2_input.c
@@ -0,0 +1,152 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stdlib.h>
+
+#ifdef HAVE_CONFIG_H
+#include "../../config.h"
+#endif
+
+#include <libpad.h>
+
+#include <boolean.h>
+#include <libretro.h>
+#include <retro_miscellaneous.h>
+
+#include "../input_driver.h"
+
+typedef struct ps2_input
+{
+   bool blocked;
+   const input_device_driver_t *joypad;
+} ps2_input_t;
+
+static void ps2_input_poll(void *data)
+{
+   ps2_input_t *ps2 = (ps2_input_t*)data;
+
+   if (ps2 && ps2->joypad)
+      ps2->joypad->poll();
+}
+
+static int16_t ps2_input_state(void *data,
+      rarch_joypad_info_t joypad_info,
+      const struct retro_keybind **binds,
+      unsigned port, unsigned device,
+      unsigned idx, unsigned id)
+{
+   ps2_input_t *ps2           = (ps2_input_t*)data;
+
+   switch (device)
+   {
+      case RETRO_DEVICE_JOYPAD:
+         return input_joypad_pressed(ps2->joypad, joypad_info, port, binds[port], id);
+      case RETRO_DEVICE_ANALOG:
+         if (binds[port])
+            return input_joypad_analog(ps2->joypad, joypad_info, port, idx, id, binds[port]);
+         break;
+   }
+
+   return 0;
+}
+
+static void ps2_input_free_input(void *data)
+{
+   ps2_input_t *ps2 = (ps2_input_t*)data;
+
+   if (ps2 && ps2->joypad)
+      ps2->joypad->destroy();
+
+   free(data);
+}
+
+static void* ps2_input_initialize(const char *joypad_driver)
+{
+   ps2_input_t *ps2 = (ps2_input_t*)calloc(1, sizeof(*ps2));
+   if (!ps2)
+      return NULL;
+
+   ps2->joypad = input_joypad_init_driver(joypad_driver, ps2);
+
+   return ps2;
+}
+
+static uint64_t ps2_input_get_capabilities(void *data)
+{
+   (void)data;
+
+   return (1 << RETRO_DEVICE_JOYPAD) |  (1 << RETRO_DEVICE_ANALOG);
+}
+
+static const input_device_driver_t *ps2_input_get_joypad_driver(void *data)
+{
+   ps2_input_t *ps2 = (ps2_input_t*)data;
+   if (ps2)
+      return ps2->joypad;
+   return NULL;
+}
+
+static void ps2_input_grab_mouse(void *data, bool state)
+{
+   (void)data;
+   (void)state;
+}
+
+static bool ps2_input_set_rumble(void *data, unsigned port,
+      enum retro_rumble_effect effect, uint16_t strength)
+{
+   ps2_input_t *ps2 = (ps2_input_t*)data;
+
+   if (ps2 && ps2->joypad)
+      return input_joypad_set_rumble(ps2->joypad,
+         port, effect, strength);
+   return false;
+}
+
+static bool ps2_input_keyboard_mapping_is_blocked(void *data)
+{
+   ps2_input_t *ps2 = (ps2_input_t*)data;
+   if (!ps2)
+      return false;
+   return ps2->blocked;
+}
+
+static void ps2_input_keyboard_mapping_set_block(void *data, bool value)
+{
+   ps2_input_t *ps2 = (ps2_input_t*)data;
+   if (!ps2)
+      return;
+   ps2->blocked = value;
+}
+
+input_driver_t input_ps2 = {
+   ps2_input_initialize,
+   ps2_input_poll,
+   ps2_input_state,
+   ps2_input_free_input,
+   NULL,
+   NULL,
+   ps2_input_get_capabilities,
+   "ps2",
+   ps2_input_grab_mouse,
+   NULL,
+   ps2_input_set_rumble,
+   ps2_input_get_joypad_driver,
+   NULL,
+   ps2_input_keyboard_mapping_is_blocked,
+   ps2_input_keyboard_mapping_set_block,
+};
diff --git a/input/drivers/switch_input.c b/input/drivers/switch_input.c
index 26cfd510d5..2c48642b2e 100644
--- a/input/drivers/switch_input.c
+++ b/input/drivers/switch_input.c
@@ -11,12 +11,14 @@
 
 #ifdef HAVE_LIBNX
 #include <switch.h>
+
+#define MULTITOUCH_LIMIT 4 /* supports up to this many fingers at once */
+#define TOUCH_AXIS_MAX 0x7fff /* abstraction of pointer coords */
 #endif
 
 #include "../input_driver.h"
 
 #define MAX_PADS 10
-#define TOUCH_AXIS_MAX 0x7fff /* abstraction of pointer coords */
 
 /* TODO/FIXME - 
  * fix game focus toggle */
@@ -27,16 +29,15 @@ typedef struct switch_input
    bool blocked;
 
 #ifdef HAVE_LIBNX
-   uint32_t touch_x;
-   uint32_t touch_y;
-
    uint32_t touch_scale_x;
    uint32_t touch_scale_y;
 
    uint32_t touch_half_resolution_x;
    uint32_t touch_half_resolution_y;
 
-   bool touch_state;
+   bool touch_state[MULTITOUCH_LIMIT];
+   uint32_t touch_x[MULTITOUCH_LIMIT];
+   uint32_t touch_y[MULTITOUCH_LIMIT];
 #endif
 } switch_input_t;
 
@@ -50,15 +51,18 @@ static void switch_input_poll(void *data)
 #ifdef HAVE_LIBNX
    uint32_t touch_count = hidTouchCount();
 
-   sw->touch_state = touch_count > 0;
-
-   if (sw->touch_state)
+   for (int i = 0; i < MULTITOUCH_LIMIT; i++)
    {
-      touchPosition touch_position;
-      hidTouchRead(&touch_position, 0);
+      sw->touch_state[i] = touch_count > i;
 
-      sw->touch_x = touch_position.px;
-      sw->touch_y = touch_position.py;
+      if (sw->touch_state[i])
+      {
+         touchPosition touch_position;
+         hidTouchRead(&touch_position, i);
+
+         sw->touch_x[i] = touch_position.px;
+         sw->touch_y[i] = touch_position.py;
+      }
    }
 #endif
 }
@@ -76,17 +80,17 @@ void calc_touch_scaling(switch_input_t *sw, uint32_t x, uint32_t y, uint32_t axi
 static int16_t switch_pointer_device_state(switch_input_t *sw, 
       unsigned id, unsigned idx)
 {
-   if (idx != 0)
+   if (idx >= MULTITOUCH_LIMIT)
       return 0;
 
    switch (id)
    {
       case RETRO_DEVICE_ID_POINTER_PRESSED:
-         return sw->touch_state;
+         return sw->touch_state[idx];
       case RETRO_DEVICE_ID_POINTER_X:
-         return ((sw->touch_x - sw->touch_half_resolution_x) * sw->touch_scale_x);
+         return ((sw->touch_x[idx] - sw->touch_half_resolution_x) * sw->touch_scale_x);
       case RETRO_DEVICE_ID_POINTER_Y:
-         return ((sw->touch_y - sw->touch_half_resolution_y) * sw->touch_scale_y);
+         return ((sw->touch_y[idx] - sw->touch_half_resolution_y) * sw->touch_scale_y);
    }
 
    return 0;
@@ -133,6 +137,10 @@ static void switch_input_free_input(void *data)
       sw->joypad->destroy();
 
    free(sw);
+
+#ifdef HAVE_LIBNX
+   hidExit();
+#endif
 }
 
 static void* switch_input_init(const char *joypad_driver)
@@ -141,6 +149,10 @@ static void* switch_input_init(const char *joypad_driver)
    if (!sw)
       return NULL;
 
+#ifdef HAVE_LIBNX
+   hidInitialize();
+#endif
+
    sw->joypad = input_joypad_init_driver(joypad_driver, sw);
 
 #ifdef HAVE_LIBNX
diff --git a/input/drivers_hid/btstack_hid.c b/input/drivers_hid/btstack_hid.c
index fb701e7505..cf7e1cf6c9 100644
--- a/input/drivers_hid/btstack_hid.c
+++ b/input/drivers_hid/btstack_hid.c
@@ -1284,7 +1284,7 @@ static bool btstack_try_load(void)
    }
 #endif
 
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
+#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
    run_loop_init_ptr(RUN_LOOP_COCOA);
 #else
    run_loop_init_ptr(RUN_LOOP_POSIX);
diff --git a/input/drivers_joypad/ps2_joypad.c b/input/drivers_joypad/ps2_joypad.c
new file mode 100644
index 0000000000..969c075ebe
--- /dev/null
+++ b/input/drivers_joypad/ps2_joypad.c
@@ -0,0 +1,167 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2013-2014 - CatalystG
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stddef.h>
+#include <boolean.h>
+
+#include "../input_driver.h"
+
+#include "libpad.h"
+
+#define PS2_MAX_PADS 1
+
+/*
+ * Global var's
+ */
+// pad_dma_buf is provided by the user, one buf for each pad
+// contains the pad's current state
+static char padBuf[256] __attribute__((aligned(64)));
+
+static uint64_t pad_state[PS2_MAX_PADS];
+
+
+static const char *ps2_joypad_name(unsigned pad)
+{
+   return "PS2 Controller";
+}
+
+static bool ps2_joypad_init(void *data)
+{
+   unsigned i;
+   unsigned players_count = PS2_MAX_PADS;
+
+   for (i = 0; i < players_count; i++)
+   {
+      bool auto_configure = input_autoconfigure_connect( ps2_joypad_name(i),
+                                                         NULL,
+                                                         ps2_joypad.ident,
+                                                         i,
+                                                         0,
+                                                         0);
+      if (!auto_configure) {
+         input_config_set_device_name(i, ps2_joypad_name(i));
+      }
+
+      padInit(i);
+
+      int ret;
+      int port, slot;
+
+      port = 0; // 0 -> Connector 1, 1 -> Connector 2
+      slot = 0; // Always zero if not using multitap
+
+      printf("PortMax: %d\n", padGetPortMax());
+      printf("SlotMax: %d\n", padGetSlotMax(port));
+
+
+      if((ret = padPortOpen(port, slot, padBuf)) == 0) {
+         printf("padOpenPort failed: %d\n", ret);
+      }
+
+
+   }
+
+   return true;
+}
+
+static bool ps2_joypad_button(unsigned port_num, uint16_t joykey)
+{
+   if (port_num >= PS2_MAX_PADS)
+      return false;
+
+   return (pad_state[port_num] & (UINT64_C(1) << joykey));
+}
+
+static void ps2_joypad_get_buttons(unsigned port_num, input_bits_t *state)
+{
+	BIT256_CLEAR_ALL_PTR(state);
+}
+
+static int16_t ps2_joypad_axis(unsigned port_num, uint32_t joyaxis)
+{
+   return 0;
+}
+
+static void ps2_joypad_poll(void)
+{
+   unsigned player;
+   unsigned players_count = PS2_MAX_PADS;
+   struct padButtonStatus buttons;
+
+   for (player = 0; player < players_count; player++)
+   {
+      unsigned j, k;
+      unsigned i  = player;
+      unsigned p  = player;
+   
+      int ret = padRead(player, player, &buttons); // port, slot, buttons
+      if (ret != 0)
+      {
+         int32_t state_tmp = 0xffff ^ buttons.btns;
+
+         pad_state[i] = 0;
+
+         pad_state[i] |= (state_tmp & PAD_LEFT) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_LEFT) : 0;
+         pad_state[i] |= (state_tmp & PAD_DOWN) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_DOWN) : 0;
+         pad_state[i] |= (state_tmp & PAD_RIGHT) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_RIGHT) : 0;
+         pad_state[i] |= (state_tmp & PAD_UP) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_UP) : 0;
+         pad_state[i] |= (state_tmp & PAD_START) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_START) : 0;
+         pad_state[i] |= (state_tmp & PAD_SELECT) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_SELECT) : 0;
+         pad_state[i] |= (state_tmp & PAD_TRIANGLE) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_X) : 0;
+         pad_state[i] |= (state_tmp & PAD_SQUARE) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_Y) : 0;
+         pad_state[i] |= (state_tmp & PAD_CROSS) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_B) : 0;
+         pad_state[i] |= (state_tmp & PAD_CIRCLE) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_A) : 0;
+         pad_state[i] |= (state_tmp & PAD_R1) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R) : 0;
+         pad_state[i] |= (state_tmp & PAD_L1) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L) : 0;
+         pad_state[i] |= (state_tmp & PAD_R2) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R2) : 0;
+         pad_state[i] |= (state_tmp & PAD_L2) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L2) : 0;
+         pad_state[i] |= (state_tmp & PAD_R3) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_R3) : 0;
+         pad_state[i] |= (state_tmp & PAD_L3) ? (UINT64_C(1) << RETRO_DEVICE_ID_JOYPAD_L3) : 0;
+      }
+   }
+
+}
+
+static bool ps2_joypad_query_pad(unsigned pad)
+{
+   return pad < PS2_MAX_PADS && pad_state[pad];
+}
+
+static bool ps2_joypad_rumble(unsigned pad,
+      enum retro_rumble_effect effect, uint16_t strength)
+{
+   return false;
+}
+
+
+static void ps2_joypad_destroy(void)
+{
+}
+
+input_device_driver_t ps2_joypad = {
+   ps2_joypad_init,
+   ps2_joypad_query_pad,
+   ps2_joypad_destroy,
+   ps2_joypad_button,
+   ps2_joypad_get_buttons,
+   ps2_joypad_axis,
+   ps2_joypad_poll,
+   ps2_joypad_rumble,
+   ps2_joypad_name,
+   "ps2",
+};
diff --git a/hakchi/etc/libretro/core/CORES_GO_HERE.md b/input/drivers_joypad/ps2_joypad_copy.c
similarity index 100%
rename from hakchi/etc/libretro/core/CORES_GO_HERE.md
rename to input/drivers_joypad/ps2_joypad_copy.c
diff --git a/input/drivers_joypad/psp_joypad.c b/input/drivers_joypad/psp_joypad.c
index 943d4a0721..309a8a0f3c 100644
--- a/input/drivers_joypad/psp_joypad.c
+++ b/input/drivers_joypad/psp_joypad.c
@@ -34,6 +34,7 @@
 #include <psp2/ctrl.h>
 #include <psp2/touch.h>
 #define PSP_MAX_PADS 4
+static int psp2_model;
 static SceCtrlPortInfo old_ctrl_info, curr_ctrl_info;
 static SceCtrlActuator actuators[PSP_MAX_PADS] = {0};
 
@@ -63,7 +64,7 @@ extern uint64_t lifecycle_state;
 static const char *psp_joypad_name(unsigned pad)
 {
 #ifdef VITA
-   if (!sceCtrlIsMultiControllerSupported())
+   if (psp2_model != SCE_KERNEL_MODEL_VITATV)
       return "Vita Controller";
 
    switch (curr_ctrl_info.port[pad + 1])
@@ -88,7 +89,8 @@ static bool psp_joypad_init(void *data)
    (void)data;
 
 #if defined(VITA)
-   if (!sceCtrlIsMultiControllerSupported())
+   psp2_model = sceKernelGetModelForCDialog();
+   if (psp2_model != SCE_KERNEL_MODEL_VITATV)
    {
       sceTouchSetSamplingState(SCE_TOUCH_PORT_BACK, SCE_TOUCH_SAMPLING_STATE_START);
       sceTouchSetSamplingState(SCE_TOUCH_PORT_FRONT, SCE_TOUCH_SAMPLING_STATE_START);
@@ -190,7 +192,7 @@ static void psp_joypad_poll(void)
 #endif
 
 #ifdef VITA
-   if (!sceCtrlIsMultiControllerSupported())
+   if (psp2_model != SCE_KERNEL_MODEL_VITATV)
       players_count = 1;
    else
    {
@@ -235,7 +237,7 @@ static void psp_joypad_poll(void)
       SceCtrlData state_tmp;
       unsigned i  = player;
 #if defined(VITA)
-      unsigned p = (sceCtrlIsMultiControllerSupported()) ? player + 1 : player;
+      unsigned p = (psp2_model == SCE_KERNEL_MODEL_VITATV) ? player + 1 : player;
       if (curr_ctrl_info.port[p] == SCE_CTRL_TYPE_UNPAIRED)
          continue;
 #elif defined(SN_TARGET_PSP2)
@@ -259,7 +261,7 @@ static void psp_joypad_poll(void)
          continue;
 #endif
 #if defined(VITA)
-      if (!sceCtrlIsMultiControllerSupported()
+      if (psp2_model == SCE_KERNEL_MODEL_VITA
          && settings->bools.input_backtouch_enable)
       {
          unsigned i;
@@ -330,7 +332,7 @@ static bool psp_joypad_rumble(unsigned pad,
       enum retro_rumble_effect effect, uint16_t strength)
 {
 #ifdef VITA
-   if (!sceCtrlIsMultiControllerSupported())
+   if (psp2_model != SCE_KERNEL_MODEL_VITATV)
       return false;
 
    switch (effect)
diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c
index 4475c62e5f..2841032dda 100644
--- a/input/drivers_joypad/udev_joypad.c
+++ b/input/drivers_joypad/udev_joypad.c
@@ -80,6 +80,8 @@ struct udev_joypad
    char *path;
    int32_t vid;
    int32_t pid;
+   /* Deal with analog triggers that report -32767 to 32767 */
+   bool neg_trigger[NUM_AXES];
 };
 
 struct joypad_udev_entry
@@ -217,6 +219,14 @@ static int udev_add_pad(struct udev_device *dev, unsigned p, int fd, const char
          if (abs->maximum > abs->minimum)
          {
             pad->axes[axes]   = udev_compute_axis(abs, abs->value);
+            /* Deal with analog triggers that report -32767 to 32767
+               by testing if the axis initial value is negative, allowing for
+               for some slop (1300 =~ 4%)in an axis centred around 0.
+               The actual work is done in udev_joypad_axis.
+               All bets are off if you're sitting on it. Reinitailise it by unpluging 
+               and plugging back in. */
+            if (udev_compute_axis(abs, abs->value) < -1300)
+              pad->neg_trigger[i] = true;
             pad->axes_bind[i] = axes++;
          }
       }
@@ -662,12 +672,20 @@ static int16_t udev_joypad_axis(unsigned port, uint32_t joyaxis)
    if (AXIS_NEG_GET(joyaxis) < NUM_AXES)
    {
       val = pad->axes[AXIS_NEG_GET(joyaxis)];
+      /* Deal with analog triggers that report -32767 to 32767 */
+      if (((AXIS_NEG_GET(joyaxis) == ABS_Z) || (AXIS_NEG_GET(joyaxis) == ABS_RZ))
+            && (pad->neg_trigger[AXIS_NEG_GET(joyaxis)]))
+         val = (val + 0x7fff) / 2;
       if (val > 0)
          val = 0;
    }
    else if (AXIS_POS_GET(joyaxis) < NUM_AXES)
    {
       val = pad->axes[AXIS_POS_GET(joyaxis)];
+      /* Deal with analog triggers that report -32767 to 32767 */
+      if (((AXIS_POS_GET(joyaxis) == ABS_Z) || (AXIS_POS_GET(joyaxis) == ABS_RZ))
+            && (pad->neg_trigger[AXIS_POS_GET(joyaxis)]))
+         val = (val + 0x7fff) / 2;
       if (val < 0)
          val = 0;
    }
diff --git a/input/input_autodetect_builtin.c b/input/input_autodetect_builtin.c
index df74a8627f..98d9e3405d 100644
--- a/input/input_autodetect_builtin.c
+++ b/input/input_autodetect_builtin.c
@@ -178,6 +178,32 @@ DECL_AXIS_EX(r_x_minus, -2, "R-Stick left") \
 DECL_AXIS_EX(r_y_plus,  +3, "R-Stick down") \
 DECL_AXIS_EX(r_y_minus, -3, "R-Stick up")
 
+#define PS2INPUT_DEFAULT_BINDS \
+DECL_BTN_EX(a, 8, "Circle") \
+DECL_BTN_EX(b, 0, "Cross") \
+DECL_BTN_EX(x, 9, "Triangle") \
+DECL_BTN_EX(y, 1, "Square") \
+DECL_BTN_EX(start, 3, "Start") \
+DECL_BTN_EX(select, 2, "Select") \
+DECL_BTN_EX(up, 4, "D-Pad up") \
+DECL_BTN_EX(down, 5, "D-Pad down") \
+DECL_BTN_EX(left, 6, "D-Pad left") \
+DECL_BTN_EX(right, 7, "D-Pad right") \
+DECL_BTN_EX(l, 10, "L1") \
+DECL_BTN_EX(r, 11, "R1") \
+DECL_BTN_EX(l2, 12, "L2") \
+DECL_BTN_EX(r2, 13, "R2") \
+DECL_BTN_EX(l3, 14, "L3") \
+DECL_BTN_EX(r3, 15, "R3") \
+DECL_AXIS_EX(l_x_plus,  +0, "L-Stick right") \
+DECL_AXIS_EX(l_x_minus, -0, "L-Stick left") \
+DECL_AXIS_EX(l_y_plus,  +1, "L-Stick down") \
+DECL_AXIS_EX(l_y_minus, -1, "L-Stick up") \
+DECL_AXIS_EX(r_x_plus,  +2, "R-Stick right") \
+DECL_AXIS_EX(r_x_minus, -2, "R-Stick left") \
+DECL_AXIS_EX(r_y_plus,  +3, "R-Stick down") \
+DECL_AXIS_EX(r_y_minus, -3, "R-Stick up")
+
 #define CTRINPUT_DEFAULT_BINDS \
 DECL_BTN(a, 8) \
 DECL_BTN(b, 0) \
@@ -641,6 +667,9 @@ const char* const input_builtin_autoconfs[] =
 #elif defined(PSP)
    DECL_AUTOCONF_DEVICE("PSP Controller", "psp", PSPINPUT_DEFAULT_BINDS),
 #endif
+#if defined(PS2)
+   DECL_AUTOCONF_DEVICE("PS2 Controller", "ps2", PS2INPUT_DEFAULT_BINDS),
+#endif
 #ifdef _3DS
    DECL_AUTOCONF_DEVICE("3DS Controller", "ctr", CTRINPUT_DEFAULT_BINDS),
 #endif
diff --git a/input/input_driver.c b/input/input_driver.c
index f49fd829fe..7261a4ca27 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -86,6 +86,9 @@ static const input_driver_t *input_drivers[] = {
 #if defined(SN_TARGET_PSP2) || defined(PSP) || defined(VITA)
    &input_psp,
 #endif
+#if defined(PS2)
+   &input_ps2,
+#endif
 #if defined(_3DS)
    &input_ctr,
 #endif
@@ -122,7 +125,7 @@ static const input_driver_t *input_drivers[] = {
 #if defined(__linux__) && !defined(ANDROID)
    &input_linuxraw,
 #endif
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
+#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH) || defined(HAVE_COCOA_METAL)
    &input_cocoa,
 #endif
 #ifdef __QNX__
@@ -161,6 +164,9 @@ static input_device_driver_t *joypad_drivers[] = {
 #if defined(PSP) || defined(VITA)
    &psp_joypad,
 #endif
+#if defined(PS2)
+   &ps2_joypad,
+#endif
 #ifdef _3DS
    &ctr_joypad,
 #endif
@@ -1174,9 +1180,14 @@ void input_get_state_for_port(void *data, unsigned port, input_bits_t *p_new_sta
    joypad_info.auto_binds                       = input_autoconf_binds[joypad_info.joy_idx];
    joypad_info.axis_threshold                   = input_driver_axis_threshold;
 
+   if (!joypad_driver)
+      return;
+
    for (i = 0; i < RARCH_FIRST_CUSTOM_BIND; i++)
    {
       bool bit_pressed = false;
+      int16_t val;
+      val = input_joypad_analog(joypad_driver, joypad_info, port, RETRO_DEVICE_INDEX_ANALOG_BUTTON, i, libretro_input_binds[port]);
 
       if (input_driver_input_state(joypad_info, libretro_input_binds,
                port, RETRO_DEVICE_JOYPAD, 0, i) != 0)
@@ -1184,11 +1195,10 @@ void input_get_state_for_port(void *data, unsigned port, input_bits_t *p_new_sta
 
       if (bit_pressed)
          BIT256_SET_PTR(p_new_state, i);
+      if (bit_pressed && val)
+         p_new_state->analog_buttons[i] = val;
    }
 
-   if (!joypad_driver)
-      return;
-
    for (i = 0; i < 2; i++)
    {
       for (j = 0; j < 2; j++)
diff --git a/input/input_driver.h b/input/input_driver.h
index 6c5b4f1a0f..b3169021ec 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -806,6 +806,7 @@ extern input_device_driver_t xinput_joypad;
 extern input_device_driver_t sdl_joypad;
 extern input_device_driver_t ps3_joypad;
 extern input_device_driver_t psp_joypad;
+extern input_device_driver_t ps2_joypad;
 extern input_device_driver_t ctr_joypad;
 extern input_device_driver_t switch_joypad;
 extern input_device_driver_t xdk_joypad;
@@ -825,6 +826,7 @@ extern input_driver_t input_dinput;
 extern input_driver_t input_x;
 extern input_driver_t input_ps3;
 extern input_driver_t input_psp;
+extern input_driver_t input_ps2;
 extern input_driver_t input_ctr;
 extern input_driver_t input_switch;
 extern input_driver_t input_xenon360;
diff --git a/input/input_mapper.c b/input/input_mapper.c
index 4e9484e237..b6b386a656 100644
--- a/input/input_mapper.c
+++ b/input/input_mapper.c
@@ -195,7 +195,7 @@ void input_mapper_poll(input_mapper_t *handle)
 
                      handle->analog_value[i][
                         remap_button - RARCH_FIRST_CUSTOM_BIND] =
-                           32767 * invert;
+                           (current_input.analog_buttons[j] ? current_input.analog_buttons[j] : 32767) * invert;
                   }
                }
             }
diff --git a/input/input_types.h b/input/input_types.h
index 0bc64d8c42..5fa49c1fce 100644
--- a/input/input_types.h
+++ b/input/input_types.h
@@ -25,6 +25,7 @@ typedef struct input_keyboard_ctx_wait input_keyboard_ctx_wait_t;
 typedef struct {
    uint32_t data[8];
    uint16_t analogs[8];
+   uint16_t analog_buttons[16];
 } input_bits_t;
 typedef struct joypad_connection joypad_connection_t;
 typedef struct pad_connection_listener_interface pad_connection_listener_t;
diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h
index e47f4ba0c0..88b3ade95b 100644
--- a/intl/msg_hash_ar.h
+++ b/intl/msg_hash_ar.h
@@ -3674,3 +3674,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Reset the current configuration to default values."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "Menu Color Theme")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h
index 70ab24efab..813689be7c 100644
--- a/intl/msg_hash_chs.h
+++ b/intl/msg_hash_chs.h
@@ -1772,6 +1772,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "裁剪过扫描部分（需重启）")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "禁用桌面元素")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "3DS底部屏幕")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "视频驱动")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -4693,3 +4695,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "将当前配置文件的所有设置恢复为默认。"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "菜单颜色主题")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h
index 41a56ad911..c025ffed0a 100644
--- a/intl/msg_hash_cht.h
+++ b/intl/msg_hash_cht.h
@@ -1590,6 +1590,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "Crop Overscan (Reload)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "禁用桌面元素")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "3DS底部屏幕")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "視訊驅動")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -3450,3 +3452,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Reset the current configuration to default values."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "選單顏色主題")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h
index a9eccfa635..f87411aa60 100644
--- a/intl/msg_hash_de.h
+++ b/intl/msg_hash_de.h
@@ -1663,6 +1663,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "Bildränder (Overscan) zuschneiden (Neustart erforderlich)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "Deaktiviere Desktop-Gestaltung")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "3DS-Bildschirm unten")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "Videotreiber")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -3586,3 +3588,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Setzt die momentane Konfiguration auf die Standardwerte zurück."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "Menü-Farbschema")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_el.c b/intl/msg_hash_el.c
new file mode 100644
index 0000000000..54e449bbc4
--- /dev/null
+++ b/intl/msg_hash_el.c
@@ -0,0 +1,2270 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdio.h>
+#include <stdint.h>
+#include <stddef.h>
+
+#include <compat/strl.h>
+#include <string/stdstring.h>
+
+#include "../msg_hash.h"
+#include "../verbosity.h"
+
+#ifdef RARCH_INTERNAL
+#include "../configuration.h"
+
+int menu_hash_get_help_el_enum(enum msg_hash_enums msg, char *s, size_t len)
+{
+    settings_t *settings = config_get_ptr();
+
+    if (msg == MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM)
+    {
+       snprintf(s, len,
+             "TODO/FIXME - Fill in message here."
+             );
+       return 0;
+    }
+    if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
+        msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN)
+    {
+       unsigned idx = msg - MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN;
+
+       switch (idx)
+       {
+          case RARCH_FAST_FORWARD_KEY:
+             snprintf(s, len,
+                   "Αλλαγή ανάμεσα σε γρήγορη και \n"
+                   "κανονική ταχύτητα."
+                   );
+             break;
+          case RARCH_FAST_FORWARD_HOLD_KEY:
+             snprintf(s, len,
+                   "Κρατήστε πατημένο για γρήγορη ταχύτητα. \n"
+                   " \n"
+                   "Αφήνοντας το κουμπί απενεργοποιείται η γρήγορη ταχύτητα."
+                   );
+             break;
+          case RARCH_SLOWMOTION_KEY:
+             snprintf(s, len,
+                   "Αλλάζει την αργή ταχύτητα.");
+             break;
+          case RARCH_SLOWMOTION_HOLD_KEY:
+             snprintf(s, len,
+                   "Κρατήστε για αρχή ταχύτητα.");
+             break;
+          case RARCH_PAUSE_TOGGLE:
+             snprintf(s, len,
+                   "Αλλαγή ανάμεσα σε κατάσταση παύσης και μη παύσης.");
+             break;
+          case RARCH_FRAMEADVANCE:
+             snprintf(s, len,
+                   "Προπόρευση καρέ κατά την παύση περιεχομένου.");
+             break;
+          case RARCH_SHADER_NEXT:
+             snprintf(s, len,
+                   "Εφαρμόζει την επόμενη σκίαση στο ευρετήριο.");
+             break;
+          case RARCH_SHADER_PREV:
+             snprintf(s, len,
+                   "Εφαρμόζει την προηγούμενη σκίαση στο ευρετήριο.");
+             break;
+          case RARCH_CHEAT_INDEX_PLUS:
+          case RARCH_CHEAT_INDEX_MINUS:
+          case RARCH_CHEAT_TOGGLE:
+             snprintf(s, len,
+                   "Κωδικοί.");
+             break;
+          case RARCH_RESET:
+             snprintf(s, len,
+                   "Επαναφορά του περιεχομένου.");
+             break;
+          case RARCH_SCREENSHOT:
+             snprintf(s, len,
+                   "Λήψη στιγμιοτύπου.");
+             break;
+          case RARCH_MUTE:
+             snprintf(s, len,
+                   "Σίγαση/κατάργηση σίγασης ήχου.");
+             break;
+          case RARCH_OSK:
+             snprintf(s, len,
+                   "Ενεργοποιεί το πληκτρολόγιο οθόνης.");
+             break;
+          case RARCH_NETPLAY_GAME_WATCH:
+             snprintf(s, len,
+                   "Εναλλαγή λειτουργίας παιχνιδιού/παρακολούθησης Netplay.");
+             break;
+          case RARCH_ENABLE_HOTKEY:
+             {
+                /* Work around C89 limitations */
+                const char *t =
+                   "Ενεργοποίηση άλλων πλήκτρων εντολών. \n"
+                   " \n"
+                   "Εάν αυτό το πλήκτρο είναι συνδεδεμένο είτε με\n"
+                   "ένα πληκτρολόγιο ή κάποιο κουμπί χειριστιερίου, \n"
+                   "όλα τα υπόλοιπα κουμπιά εντολών θα ενεργοποιηθούν μόνο \n";
+                const char *u = 
+                   "εάν και αυτό είναι πατημένο την ίδια στιγμή. \n"
+                   " \n"
+                   "Διαφορετικά, όλα τα κουμπιά εντολών πληκτρολογίου \n"
+                   "μπορούν να απενεργοποιηθούν από τον χρήστη.";
+                strlcpy(s, t, len);
+                strlcat(s, u, len);
+             }
+             break;
+          case RARCH_VOLUME_UP:
+             snprintf(s, len,
+                   "Αυξάνει την ένταση του ήχου.");
+             break;
+          case RARCH_VOLUME_DOWN:
+             snprintf(s, len,
+                   "Μειώνει την ένταση του ήχου.");
+             break;
+          case RARCH_OVERLAY_NEXT:
+             snprintf(s, len,
+                   "Αλλάζει στο επόμενο επικάλλυμα. Επαναφέρεται.");
+             break;
+          case RARCH_DISK_EJECT_TOGGLE:
+             snprintf(s, len,
+                   "Ενεργοποιεί την αφαίρεση δίσκων. \n"
+                   " \n"
+                   "Χρησιμοποιείται για περιεχόμενο με πολλούς δίσκους. ");
+             break;
+          case RARCH_DISK_NEXT:
+          case RARCH_DISK_PREV:
+             snprintf(s, len,
+                   "Αλλάζει ανάμεσα σε εικόνες δίσκων. Χρησιμοποιείστε μετά την εξαγωγή. \n"
+                   " \n"
+                   "Ολοκληρώστε πατώντας εξαγωγή ξανά.");
+             break;
+          case RARCH_GRAB_MOUSE_TOGGLE:
+             snprintf(s, len,
+                   "Ενεργοποίηση ελέγχου ποντικιού. \n"
+                   " \n"
+                   "Όταν το ποντίκι ελέγχεται, το RetroArch κρύβει το \n"
+                   "ποντίκι, και κρατάει τον δρομέα μέσα στο \n"
+                   "παράθυρο για να επιτρέψει την σχετική εισαγωγή \n"
+                   "ώστε να λειτουργήσει καλύτερα.");
+             break;
+          case RARCH_GAME_FOCUS_TOGGLE:
+             snprintf(s, len,
+                   "Ενεργοποίηση εστίασης παιχνιδιού.\n"
+                   " \n"
+                   "Όταν ένα παιχνίδι έχει την εστίαση, το RetroArch θα απενεργοποιήσει \n"
+                   "τα κουμπιά εντολών και θα κρατήσει τον δρομέα του ποντικιού μέσα στο παράθυρο.");
+             break;
+          case RARCH_MENU_TOGGLE:
+             snprintf(s, len, "Ενεργοποιεί το μενού.");
+             break;
+          case RARCH_LOAD_STATE_KEY:
+             snprintf(s, len,
+                   "Φορτώνει κατάσταση.");
+             break;
+          case RARCH_FULLSCREEN_TOGGLE_KEY:
+             snprintf(s, len,
+                   "Ενεργοποιεί την πλήρη οθόνη.");
+             break;
+          case RARCH_QUIT_KEY:
+             snprintf(s, len,
+                   "Κουμπί καθαρής εξόδου από το RetroArch. \n"
+                   " \n"
+                   "Η απότομη απενεργοποίηση της λειτουργίας του θα \n"
+                   "τερματίσει το RetroArch χωρίς να αποθηκεύσει την RAM κ.α."
+#ifdef __unix__
+                   "\nΣε Unix-likes, SIGINT/SIGTERM επιτρέπουν την \n"
+                   "καθαρή απενεργοποίηση."
+#endif
+                   "");
+             break;
+          case RARCH_STATE_SLOT_PLUS:
+          case RARCH_STATE_SLOT_MINUS:
+             snprintf(s, len,
+                   "Θυρίδες κατάστασης. \n"
+                   " \n"
+                   "Με την θυρίδα τοποθετημένη στο 0, το όνομα της αποθηκευμένης κατάστασης είναι \n"
+                   "*.state (ή οτιδήποτε έχει καθοριστεί στην γραμμή εντολών). \n"
+                   " \n"
+                   "Όταν η θυρίδα δεν είναι 0, η διαδρομή θα είναι <διαδρομή><d>, \n"
+                   "όπου <d> είναι ο αριθμός θυρίδας.");
+             break;
+          case RARCH_SAVE_STATE_KEY:
+             snprintf(s, len,
+                   "Αποθηκεύει την κατάσταση.");
+             break;
+          case RARCH_REWIND:
+             snprintf(s, len,
+                   "Κρατήστε το κουμπί για επιστροφή προς τα πίσω. \n"
+                   " \n"
+                   "Η επιστροφή προς τα πίσω πρέπει να είναι ενεργοποιημένη.");
+             break;
+          case RARCH_BSV_RECORD_TOGGLE:
+             snprintf(s, len,
+                   "Αλλαγή ανάμεσα σε εγγραφή ή όχι.");
+             break;
+          default:
+             if (string_is_empty(s))
+                strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len);
+             break;
+       }
+
+       return 0;
+    }
+
+    switch (msg)
+    {
+        case MENU_ENUM_LABEL_ACCOUNTS_RETRO_ACHIEVEMENTS:
+            snprintf(s, len, "Στοιχεία σύνδεσης για τον \n"
+                    "λογαριασμό Retro Achievements. \n"
+                    " \n"
+                    "Επισκεφθείτε το retroachievements.org και εγγραφείτε \n"
+                    "για δωρεάν λογαριασμό. \n"
+                    " \n"
+                    "Μετά την ολοκλήρωση της εγγραφής, πρέπει να \n"
+                    "εισάγετε το όνομα χρήστη και τον κωδικό στο \n"
+                    "RetroArch.");
+            break;
+        case MENU_ENUM_LABEL_CHEEVOS_USERNAME:
+            snprintf(s, len, "Όνομα χρήστη για τον λογαριασμό σας στο Retro Achievements.");
+            break;
+        case MENU_ENUM_LABEL_CHEEVOS_PASSWORD:
+            snprintf(s, len, "Κωδικός για τον λογαριασμό σας στο Retro Achievements.");
+            break;
+        case MENU_ENUM_LABEL_USER_LANGUAGE:
+            {
+               /* Work around C89 limitations */
+               const char *t =
+                  "Τοπικοποίηση του μενού και όλων των μηνυμάτων \n"
+                  "ανάλογα με την γλώσσα που έχετε επιλέξει \n"
+                  "εδώ. \n"
+                  " \n"
+                  "Χρειάζεται επανεκκίνηση για να ενεργοποιηθούν \n"
+                  "οι αλλαγές. \n";
+               const char *u = 
+                  " \n"
+                  "Σημείωση: πιθανόν να μην έχουν εφαρμοστεί \n"
+                  "όλες οι γλώσσες. \n"
+                  " \n"
+                  "Σε περίπτωση που μία γλώσσα δεν έχει εφαρμοστεί, \n"
+                  "χρησιμοποιούμε τα Αγγλικά.";
+               strlcpy(s, t, len);
+               strlcat(s, u, len);
+            }
+            break;
+        case MENU_ENUM_LABEL_VIDEO_FONT_PATH:
+            snprintf(s, len, "Αλλαγή της γραμματοσειράς που χρησιμοποιείται \n"
+                    "για το κείμενο της Οθόνης Απεικόνισης.");
+            break;
+        case MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS:
+            snprintf(s, len, "Αυτόματη φόρτωση επιλογών πυρήνα βάση περιεχομένου.");
+            break;
+        case MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE:
+            snprintf(s, len, "Αυτόματη φόρτωση ρυθμίσεων παράκαμψης.");
+            break;
+        case MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE:
+            snprintf(s, len, "Αυτόματη φόρτωση αρχείων αναδιοργάνωσης πλήκτρων.");
+            break;
+        case MENU_ENUM_LABEL_SORT_SAVESTATES_ENABLE:
+            snprintf(s, len, "Οργάνωση καταστάσεων αποθήκευσης σε φακέλους \n"
+                    "ονομασμένες με βάση τον πυρήνα libretro που χρησιμοποιούν.");
+            break;
+        case MENU_ENUM_LABEL_SORT_SAVEFILES_ENABLE:
+            snprintf(s, len, "Οργάνωση αρχείων αποθήκευσης σε φακέλους \n"
+                    "ονομασμένα με βάση τον πυρήνα libretro που χρησιμοποιούν.");
+            break;
+        case MENU_ENUM_LABEL_RESUME_CONTENT:
+            snprintf(s, len, "Έξοδος από το μενού και επιστροφή \n"
+                    "στο περιεχόμενο.");
+            break;
+        case MENU_ENUM_LABEL_RESTART_CONTENT:
+            snprintf(s, len, "Επανεκκινεί το περιεχόμενο από την αρχή.");
+            break;
+        case MENU_ENUM_LABEL_CLOSE_CONTENT:
+            snprintf(s, len, "Κλείνει το περιεχόμενο και το αποφορτώνει από την \n"
+                    "μνήμη.");
+            break;
+        case MENU_ENUM_LABEL_UNDO_LOAD_STATE:
+            snprintf(s, len, "Εάν μία κατάσταση φορτώθηκε, το περιεχόμενο \n"
+                    "θα επανέλθει στην κατάσταση πριν την φόρτωση.");
+            break;
+        case MENU_ENUM_LABEL_UNDO_SAVE_STATE:
+            snprintf(s, len, "Εάν μία κατάσταση αντικαταστάθηκε, θα \n"
+                    "επανέλθει στην προηγούμενη κατάσταση αποθήκευσης.");
+            break;
+        case MENU_ENUM_LABEL_TAKE_SCREENSHOT:
+            snprintf(s, len, "Δημιουργία στιγμιοτύπου. \n"
+                    " \n"
+                    "Το στιγμιότυπο θα αποθηκευθεί στην \n"
+                    "Διαδρομή Στιγμιοτύπων.");
+            break;
+        case MENU_ENUM_LABEL_ADD_TO_FAVORITES:
+            snprintf(s, len, "Προσθήκη της καταχώρισης στα Αγαπημένα.");
+            break;
+        case MENU_ENUM_LABEL_RUN:
+            snprintf(s, len, "Έναρξη περιεχομένου.");
+            break;
+        case MENU_ENUM_LABEL_INFORMATION:
+            snprintf(s, len, "Προβολή περισσότερων μεταδεδομένων πληροφοριών \n"
+                    "σχετικά με το περιεχόμενο.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_CONFIG:
+            snprintf(s, len, "Αρχείο Διαμόρφωσης.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE:
+            snprintf(s, len, "Συμπιεσμένο αρχείο.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_RECORD_CONFIG:
+            snprintf(s, len, "Αρχείο διαμόρφωσης καταγραφών.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_CURSOR:
+            snprintf(s, len, "Αρχείο ερωτήματος βάσης δεδομένων.");
+            break;
+        case MENU_ENUM_LABEL_FILE_CONFIG:
+            snprintf(s, len, "Αρχείο Διαμόρφωσης.");
+            break;
+        case MENU_ENUM_LABEL_SCAN_THIS_DIRECTORY:
+            snprintf(s, len,
+                     "Επέλεξε αυτό για να ανιχνεύσεις περιεχόμενο στην \n"
+                             "τρέχουσα διαδρομή.");
+            break;
+        case MENU_ENUM_LABEL_USE_THIS_DIRECTORY:
+            snprintf(s, len,
+                     "Επέλεξε αυτό για να ορίσεις αυτήν ως την διαδρομή.");
+            break;
+        case MENU_ENUM_LABEL_CONTENT_DATABASE_DIRECTORY:
+            snprintf(s, len,
+                     "Ευρετήριο Βάσης Δεδομένων Περιεχομένου. \n"
+                             " \n"
+                             "Διαδρομή για το ευρετήριο της βάσης δεδομένων \n"
+                             "περιεχομένου.");
+            break;
+        case MENU_ENUM_LABEL_THUMBNAILS_DIRECTORY:
+            snprintf(s, len,
+                     "Ευρετήριο Μικρογραφιών. \n"
+                             " \n"
+                             "Για την αποθήκευση αρχείων μικρογραφιών.");
+            break;
+        case MENU_ENUM_LABEL_LIBRETRO_INFO_PATH:
+            snprintf(s, len,
+                     "Ευρετήριο Πληροφοριών Πυρήνων. \n"
+                             " \n"
+                             "Ένα ευρετήριο για το που να ψάξεις \n"
+                             "για πληφοροφίες των πυρήνων libretro.");
+            break;
+        case MENU_ENUM_LABEL_PLAYLIST_DIRECTORY:
+            snprintf(s, len,
+                     "Ευρετήριο Λιστών Αναπαραγωγής. \n"
+                             " \n"
+                             "Αποθηκέυστε όλα τα αρχεία λιστών αναπαραγωγής \n"
+                             "σε αυτό το ευρετήριο.");
+            break;
+        case MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN:
+            snprintf(s, len,
+                     "Μερικοί πυρήνες μπορεί να έχουν \n"
+                             "λειτουργία απενεργοποίησης. \n"
+                             " \n"
+                             "If this option is left disabled, \n"
+                             "selecting the shutdown procedure \n"
+                             "would trigger RetroArch being shut \n"
+                             "down. \n"
+                             " \n"
+                             "Enabling this option will load a \n"
+                             "dummy core instead so that we remain \n"
+                             "inside the menu and RetroArch won't \n"
+                             "shutdown.");
+            break;
+        case MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE:
+            snprintf(s, len,
+                     "Some cores might need \n"
+                             "firmware or bios files. \n"
+                             " \n"
+                             "If this option is disabled, \n"
+                             "it will try to load even if such \n"
+                             "firmware is missing. \n");
+            break;
+        case MENU_ENUM_LABEL_PARENT_DIRECTORY:
+            snprintf(s, len,
+                     "Go back to the parent directory.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_SHADER_PRESET:
+            snprintf(s, len,
+                     "Shader preset file.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_SHADER:
+            snprintf(s, len,
+                     "Shader file.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_REMAP:
+            snprintf(s, len,
+                     "Remap controls file.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_CHEAT:
+            snprintf(s, len,
+                     "Cheat file.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_OVERLAY:
+            snprintf(s, len,
+                     "Overlay file.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_RDB:
+            snprintf(s, len,
+                     "Database file.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_FONT:
+            snprintf(s, len,
+                     "TrueType font file.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_PLAIN_FILE:
+            snprintf(s, len,
+                     "Plain file.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_MOVIE_OPEN:
+            snprintf(s, len,
+                     "Video. \n"
+                             " \n"
+                             "Select it to open this file with the \n"
+                             "video player.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_MUSIC_OPEN:
+            snprintf(s, len,
+                     "Music. \n"
+                             " \n"
+                             "Select it to open this file with the \n"
+                             "music player.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_IMAGE:
+            snprintf(s, len,
+                     "Image file.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_IMAGE_OPEN_WITH_VIEWER:
+            snprintf(s, len,
+                     "Image. \n"
+                             " \n"
+                             "Select it to open this file with the \n"
+                             "image viewer.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_CORE_SELECT_FROM_COLLECTION:
+            snprintf(s, len,
+                     "Libretro core. \n"
+                             " \n"
+                             "Selecting this will associate this core \n"
+                             "to the game.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_CORE:
+            snprintf(s, len,
+                     "Libretro core. \n"
+                             " \n"
+                             "Select this file to have RetroArch load this core.");
+            break;
+        case MENU_ENUM_LABEL_FILE_BROWSER_DIRECTORY:
+            snprintf(s, len,
+                     "Directory. \n"
+                             " \n"
+                             "Select it to open this directory.");
+            break;
+        case MENU_ENUM_LABEL_CACHE_DIRECTORY:
+            snprintf(s, len,
+                     "Cache Directory. \n"
+                             " \n"
+                             "Content decompressed by RetroArch will be \n"
+                             "temporarily extracted to this directory.");
+            break;
+        case MENU_ENUM_LABEL_HISTORY_LIST_ENABLE:
+            snprintf(s, len,
+                     "If enabled, every content loaded \n"
+                             "in RetroArch will be automatically \n"
+                             "added to the recent history list.");
+            break;
+        case MENU_ENUM_LABEL_RGUI_BROWSER_DIRECTORY:
+            snprintf(s, len,
+                     "File Browser Directory. \n"
+                             " \n"
+                             "Sets start directory for menu file browser.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_POLL_TYPE_BEHAVIOR:
+            snprintf(s, len,
+                     "Influence how input polling is done inside \n"
+                             "RetroArch. \n"
+                             " \n"
+                             "Early  - Input polling is performed before \n"
+                             "the frame is processed. \n"
+                             "Normal - Input polling is performed when \n"
+                             "polling is requested. \n"
+                             "Late   - Input polling is performed on \n"
+                             "first input state request per frame.\n"
+                             " \n"
+                             "Setting it to 'Early' or 'Late' can result \n"
+                             "in less latency, \n"
+                             "depending on your configuration.\n\n"
+                             "Will be ignored when using netplay."
+            );
+            break;
+        case MENU_ENUM_LABEL_INPUT_DESCRIPTOR_HIDE_UNBOUND:
+            snprintf(s, len,
+                     "Hide input descriptors that were not set \n"
+                             "by the core.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_REFRESH_RATE:
+            snprintf(s, len,
+                     "Video refresh rate of your monitor. \n"
+                             "Used to calculate a suitable audio input rate.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_FORCE_SRGB_DISABLE:
+            snprintf(s, len,
+                     "Forcibly disable sRGB FBO support. Some Intel \n"
+                             "OpenGL drivers on Windows have video problems \n"
+                             "with sRGB FBO support enabled.");
+            break;
+        case MENU_ENUM_LABEL_AUDIO_ENABLE:
+            snprintf(s, len,
+                     "Enable audio output.");
+            break;
+        case MENU_ENUM_LABEL_AUDIO_SYNC:
+            snprintf(s, len,
+                     "Synchronize audio (recommended).");
+            break;
+        case MENU_ENUM_LABEL_AUDIO_LATENCY:
+            snprintf(s, len,
+                     "Desired audio latency in milliseconds. \n"
+                             "Might not be honored if the audio driver \n"
+                             "can't provide given latency.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE:
+            snprintf(s, len,
+                     "Allow cores to set rotation. If false, \n"
+                             "rotation requests are honored, but ignored.\n\n"
+                             "Used for setups where one manually rotates \n"
+                             "the monitor.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_DESCRIPTOR_LABEL_SHOW:
+            snprintf(s, len,
+                     "Show the input descriptors set by the core \n"
+                             "instead of the default ones.");
+            break;
+        case MENU_ENUM_LABEL_CONTENT_HISTORY_SIZE:
+            snprintf(s, len,
+                     "Number of entries that will be kept in \n"
+                             "content history playlist.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_WINDOWED_FULLSCREEN:
+            snprintf(s, len,
+                     "To use windowed mode or not when going \n"
+                             "fullscreen.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_FONT_SIZE:
+            snprintf(s, len,
+                     "Font size for on-screen messages.");
+            break;
+        case MENU_ENUM_LABEL_SAVESTATE_AUTO_INDEX:
+            snprintf(s, len,
+                     "Automatically increment slot index on each save, \n"
+                             "generating multiple savestate files. \n"
+                             "When the content is loaded, state slot will be \n"
+                             "set to the highest existing value (last savestate).");
+            break;
+        case MENU_ENUM_LABEL_FPS_SHOW:
+            snprintf(s, len,
+                     "Enables displaying the current frames \n"
+                             "per second.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_FONT_ENABLE:
+            snprintf(s, len,
+                     "Show and/or hide onscreen messages.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_X:
+        case MENU_ENUM_LABEL_VIDEO_MESSAGE_POS_Y:
+            snprintf(s, len,
+                     "Offset for where messages will be placed \n"
+                             "onscreen. Values are in range [0.0, 1.0].");
+            break;
+        case MENU_ENUM_LABEL_INPUT_OVERLAY_ENABLE:
+            snprintf(s, len,
+                     "Enable or disable the current overlay.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_OVERLAY_HIDE_IN_MENU:
+            snprintf(s, len,
+                     "Hide the current overlay from appearing \n"
+                             "inside the menu.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS:
+            snprintf(s, len,
+                      "Show keyboard/controller button presses on \n"
+                            "the onscreen overlay.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS_PORT:
+            snprintf(s, len,
+                      "Select the port to listen for controller input \n"
+                            "to display on the onscreen overlay.");
+            break;
+        case MENU_ENUM_LABEL_OVERLAY_PRESET:
+            snprintf(s, len,
+                     "Path to input overlay.");
+            break;
+        case MENU_ENUM_LABEL_OVERLAY_OPACITY:
+            snprintf(s, len,
+                     "Overlay opacity.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_BIND_TIMEOUT:
+            snprintf(s, len,
+                     "Input bind timer timeout (in seconds). \n"
+                             "Amount of seconds to wait until proceeding \n"
+                             "to the next bind.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_BIND_HOLD:
+            snprintf(s, len,
+               "Input bind hold time (in seconds). \n"
+               "Amount of seconds to hold an input to bind it.");
+            break;
+        case MENU_ENUM_LABEL_OVERLAY_SCALE:
+            snprintf(s, len,
+                     "Overlay scale.");
+            break;
+        case MENU_ENUM_LABEL_AUDIO_OUTPUT_RATE:
+            snprintf(s, len,
+                     "Audio output samplerate.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT:
+            snprintf(s, len,
+                     "Set to true if hardware-rendered cores \n"
+                             "should get their private context. \n"
+                             "Avoids having to assume hardware state changes \n"
+                             "inbetween frames."
+            );
+            break;
+        case MENU_ENUM_LABEL_CORE_LIST:
+            snprintf(s, len,
+                     "Load Core. \n"
+                             " \n"
+                             "Browse for a libretro core \n"
+                             "implementation. Where the browser \n"
+                             "starts depends on your Core Directory \n"
+                             "path. If blank, it will start in root. \n"
+                             " \n"
+                             "If Core Directory is a directory, the menu \n"
+                             "will use that as top folder. If Core \n"
+                             "Directory is a full path, it will start \n"
+                             "in the folder where the file is.");
+            break;
+        case MENU_ENUM_LABEL_VALUE_MENU_ENUM_CONTROLS_PROLOG:
+            snprintf(s, len,
+                     "You can use the following controls below \n"
+                             "on either your gamepad or keyboard in order\n"
+                             "to control the menu: \n"
+                             " \n"
+            );
+            break;
+        case MENU_ENUM_LABEL_WELCOME_TO_RETROARCH:
+            snprintf(s, len,
+                     "Welcome to RetroArch\n"
+            );
+            break;
+        case MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING_DESC:
+            {
+               /* Work around C89 limitations */
+               char u[501];
+               const char *t =
+                  "RetroArch relies on an unique form of\n"
+                  "audio/video synchronization where it needs to be\n"
+                  "calibrated against the refresh rate of your\n"
+                  "display for best performance results.\n"
+                  " \n"
+                  "If you experience any audio crackling or video\n"
+                  "tearing, usually it means that you need to\n"
+                  "calibrate the settings. Some choices below:\n"
+                  " \n";
+               snprintf(u, sizeof(u), /* can't inline this due to the printf arguments */
+                     "a) Go to '%s' -> '%s', and enable\n"
+                     "'Threaded Video'. Refresh rate will not matter\n"
+                     "in this mode, framerate will be higher,\n"
+                     "but video might be less smooth.\n"
+                     "b) Go to '%s' -> '%s', and look at\n"
+                     "'%s'. Let it run for\n"
+                     "2048 frames, then press 'OK'.",
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SETTINGS),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SETTINGS),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO));
+               strlcpy(s, t, len);
+               strlcat(s, u, len);
+            }
+            break;
+        case MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT_DESC:
+            snprintf(s, len,
+                     "To scan for content, go to '%s' and\n"
+                             "select either '%s' or %s'.\n"
+                             " \n"
+                             "Files will be compared to database entries.\n"
+                             "If there is a match, it will add an entry\n"
+                             "to a collection.\n"
+                             " \n"
+                             "You can then easily access this content by\n"
+                             "going to '%s' ->\n"
+                             "'%s'\n"
+                             "instead of having to go through the\n"
+                             "filebrowser everytime.\n"
+                             " \n"
+                             "NOTE: Content for some cores might still not be\n"
+                             "scannable.",
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCAN_FILE),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST)
+            );
+            break;
+        case MENU_ENUM_LABEL_VALUE_EXTRACTING_PLEASE_WAIT:
+            snprintf(s, len,
+                     "Welcome to RetroArch\n"
+                             "\n"
+                             "Extracting assets, please wait.\n"
+                             "This might take a while...\n"
+            );
+            break;
+        case MENU_ENUM_LABEL_INPUT_DRIVER:
+            {
+               const char *lbl = settings ? settings->arrays.input_driver : NULL;
+
+               if (string_is_equal(lbl, msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_UDEV)))
+                     snprintf(s, len,
+                           "udev Input driver. \n"
+                           " \n"
+                           "It uses the recent evdev joypad API \n"
+                           "for joystick support. It supports \n"
+                           "hotplugging and force feedback. \n"
+                           " \n"
+                           "The driver reads evdev events for keyboard \n"
+                           "support. It also supports keyboard callback, \n"
+                           "mice and touchpads. \n"
+                           " \n"
+                           "By default in most distros, /dev/input nodes \n"
+                           "are root-only (mode 600). You can set up a udev \n"
+                           "rule which makes these accessible to non-root."
+                           );
+               else if (string_is_equal(lbl,
+                        msg_hash_to_str(MENU_ENUM_LABEL_INPUT_DRIVER_LINUXRAW)))
+                     snprintf(s, len,
+                           "linuxraw Input driver. \n"
+                           " \n"
+                           "This driver requires an active TTY. Keyboard \n"
+                           "events are read directly from the TTY which \n"
+                           "makes it simpler, but not as flexible as udev. \n" "Mice, etc, are not supported at all. \n"
+                           " \n"
+                           "This driver uses the older joystick API \n"
+                           "(/dev/input/js*).");
+               else
+                     snprintf(s, len,
+                           "Input driver.\n"
+                           " \n"
+                           "Depending on video driver, it might \n"
+                           "force a different input driver.");
+            }
+            break;
+        case MENU_ENUM_LABEL_LOAD_CONTENT_LIST:
+            snprintf(s, len,
+                     "Load Content. \n"
+                             "Browse for content. \n"
+                             " \n"
+                             "To load content, you need a \n"
+                             "'Core' to use, and a content file. \n"
+                             " \n"
+                             "To control where the menu starts \n"
+                             "to browse for content, set  \n"
+                             "'File Browser Directory'. \n"
+                             "If not set, it will start in root. \n"
+                             " \n"
+                             "The browser will filter out \n"
+                             "extensions for the last core set \n"
+                             "in 'Load Core', and use that core \n"
+                             "when content is loaded."
+            );
+            break;
+        case MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY:
+            snprintf(s, len,
+                     "Loading content from history. \n"
+                             " \n"
+                             "As content is loaded, content and libretro \n"
+                             "core combinations are saved to history. \n"
+                             " \n"
+                             "The history is saved to a file in the same \n"
+                             "directory as the RetroArch config file. If \n"
+                             "no config file was loaded in startup, history \n"
+                             "will not be saved or loaded, and will not exist \n"
+                             "in the main menu."
+            );
+            break;
+        case MENU_ENUM_LABEL_VIDEO_DRIVER:
+            snprintf(s, len,
+                     "Current Video driver.");
+
+            if (string_is_equal(settings->arrays.video_driver, "gl"))
+            {
+                snprintf(s, len,
+                         "OpenGL Video driver. \n"
+                                 " \n"
+                                 "This driver allows libretro GL cores to  \n"
+                                 "be used in addition to software-rendered \n"
+                                 "core implementations.\n"
+                                 " \n"
+                                 "Performance for software-rendered and \n"
+                                 "libretro GL core implementations is \n"
+                                 "dependent on your graphics card's \n"
+                                 "underlying GL driver).");
+            }
+            else if (string_is_equal(settings->arrays.video_driver, "sdl2"))
+            {
+                snprintf(s, len,
+                         "SDL 2 Video driver.\n"
+                                 " \n"
+                                 "This is an SDL 2 software-rendered video \n"
+                                 "driver.\n"
+                                 " \n"
+                                 "Performance for software-rendered libretro \n"
+                                 "core implementations is dependent \n"
+                                 "on your platform SDL implementation.");
+            }
+            else if (string_is_equal(settings->arrays.video_driver, "sdl1"))
+            {
+                snprintf(s, len,
+                         "SDL Video driver.\n"
+                                 " \n"
+                                 "This is an SDL 1.2 software-rendered video \n"
+                                 "driver.\n"
+                                 " \n"
+                                 "Performance is considered to be suboptimal. \n"
+                                 "Consider using it only as a last resort.");
+            }
+            else if (string_is_equal(settings->arrays.video_driver, "d3d"))
+            {
+                snprintf(s, len,
+                         "Direct3D Video driver. \n"
+                                 " \n"
+                                 "Performance for software-rendered cores \n"
+                                 "is dependent on your graphic card's \n"
+                                 "underlying D3D driver).");
+            }
+            else if (string_is_equal(settings->arrays.video_driver, "exynos"))
+            {
+                snprintf(s, len,
+                         "Exynos-G2D Video Driver. \n"
+                                 " \n"
+                                 "This is a low-level Exynos video driver. \n"
+                                 "Uses the G2D block in Samsung Exynos SoC \n"
+                                 "for blit operations. \n"
+                                 " \n"
+                                 "Performance for software rendered cores \n"
+                                 "should be optimal.");
+            }
+            else if (string_is_equal(settings->arrays.video_driver, "drm"))
+            {
+                snprintf(s, len,
+                         "Plain DRM Video Driver. \n"
+                                 " \n"
+                                 "This is a low-level video driver using. \n"
+                                 "libdrm for hardware scaling using \n"
+                                 "GPU overlays.");
+            }
+            else if (string_is_equal(settings->arrays.video_driver, "sunxi"))
+            {
+                snprintf(s, len,
+                         "Sunxi-G2D Video Driver. \n"
+                                 " \n"
+                                 "This is a low-level Sunxi video driver. \n"
+                                 "Uses the G2D block in Allwinner SoCs.");
+            }
+            break;
+        case MENU_ENUM_LABEL_AUDIO_DSP_PLUGIN:
+            snprintf(s, len,
+                     "Audio DSP plugin.\n"
+                             " Processes audio before it's sent to \n"
+                             "the driver."
+            );
+            break;
+        case MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER:
+            {
+               const char *lbl = settings ? settings->arrays.audio_resampler : NULL;
+
+               if (string_is_equal(lbl, msg_hash_to_str(
+                           MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_SINC)))
+                  strlcpy(s,
+                        "Windowed SINC implementation.", len);
+               else if (string_is_equal(lbl, msg_hash_to_str(
+                           MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER_CC)))
+                  strlcpy(s,
+                        "Convoluted Cosine implementation.", len);
+               else if (string_is_empty(s))
+                  strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len);
+            }
+            break;
+
+		case MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION: snprintf(s, len, "SET CRT");
+			break;
+
+		case MENU_ENUM_LABEL_CRT_SWITCH_RESOLUTION_SUPER: snprintf(s, len, "SET CRT SUPER");
+			break;
+
+        case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET:
+            snprintf(s, len,
+                     "Load Shader Preset. \n"
+                             " \n"
+                             " Load a shader preset directly. \n"
+                             "The menu shader menu is updated accordingly. \n"
+                             " \n"
+                             "If the CGP uses scaling methods which are not \n"
+                             "simple, (i.e. source scaling, same scaling \n"
+                             "factor for X/Y), the scaling factor displayed \n"
+                             "in the menu might not be correct."
+            );
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SHADER_SCALE_PASS:
+            snprintf(s, len,
+                     "Scale for this pass. \n"
+                             " \n"
+                             "The scale factor accumulates, i.e. 2x \n"
+                             "for first pass and 2x for second pass \n"
+                             "will give you a 4x total scale. \n"
+                             " \n"
+                             "If there is a scale factor for last \n"
+                             "pass, the result is stretched to \n"
+                             "screen with the filter specified in \n"
+                             "'Default Filter'. \n"
+                             " \n"
+                             "If 'Don't Care' is set, either 1x \n"
+                             "scale or stretch to fullscreen will \n"
+                             "be used depending if it's not the last \n"
+                             "pass or not."
+            );
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES:
+            snprintf(s, len,
+                     "Shader Passes. \n"
+                             " \n"
+                             "RetroArch allows you to mix and match various \n"
+                             "shaders with arbitrary shader passes, with \n"
+                             "custom hardware filters and scale factors. \n"
+                             " \n"
+                             "This option specifies the number of shader \n"
+                             "passes to use. If you set this to 0, and use \n"
+                             "Apply Shader Changes, you use a 'blank' shader. \n"
+                             " \n"
+                             "The Default Filter option will affect the \n"
+                             "stretching filter.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS:
+            snprintf(s, len,
+                     "Shader Parameters. \n"
+                             " \n"
+                             "Modifies current shader directly. Will not be \n"
+                             "saved to CGP/GLSLP preset file.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PARAMETERS:
+            snprintf(s, len,
+                     "Shader Preset Parameters. \n"
+                             " \n"
+                             "Modifies shader preset currently in menu."
+            );
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SHADER_PASS:
+            snprintf(s, len,
+                     "Path to shader. \n"
+                             " \n"
+                             "All shaders must be of the same \n"
+                             "type (i.e. CG, GLSL or HLSL). \n"
+                             " \n"
+                             "Set Shader Directory to set where \n"
+                             "the browser starts to look for \n"
+                             "shaders."
+            );
+            break;
+        case MENU_ENUM_LABEL_CONFIGURATION_SETTINGS:
+            snprintf(s, len,
+                     "Determines how configuration files \n"
+                             "are loaded and prioritized.");
+            break;
+        case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT:
+            snprintf(s, len,
+                     "Saves config to disk on exit.\n"
+                             "Useful for menu as settings can be\n"
+                             "modified. Overwrites the config.\n"
+                             " \n"
+                             "#include's and comments are not \n"
+                             "preserved. \n"
+                             " \n"
+                             "By design, the config file is \n"
+                             "considered immutable as it is \n"
+                             "likely maintained by the user, \n"
+                             "and should not be overwritten \n"
+                             "behind the user's back."
+#if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
+            "\nThis is not not the case on \n"
+            "consoles however, where \n"
+            "looking at the config file \n"
+            "manually isn't really an option."
+#endif
+            );
+            break;
+        case MENU_ENUM_LABEL_CONFIRM_ON_EXIT:
+            snprintf(s, len, "Are you sure you want to quit?");
+            break;
+        case MENU_ENUM_LABEL_SHOW_HIDDEN_FILES:
+            snprintf(s, len, "Show hidden files\n"
+                    "and folders.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SHADER_FILTER_PASS:
+            snprintf(s, len,
+                     "Hardware filter for this pass. \n"
+                             " \n"
+                             "If 'Don't Care' is set, 'Default \n"
+                             "Filter' will be used."
+            );
+            break;
+        case MENU_ENUM_LABEL_AUTOSAVE_INTERVAL:
+            snprintf(s, len,
+                     "Autosaves the non-volatile SRAM \n"
+                             "at a regular interval.\n"
+                             " \n"
+                             "This is disabled by default unless set \n"
+                             "otherwise. The interval is measured in \n"
+                             "seconds. \n"
+                             " \n"
+                             "A value of 0 disables autosave.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_BIND_DEVICE_TYPE:
+            snprintf(s, len,
+                     "Input Device Type. \n"
+                             " \n"
+                             "Picks which device type to use. This is \n"
+                             "relevant for the libretro core itself."
+            );
+            break;
+        case MENU_ENUM_LABEL_LIBRETRO_LOG_LEVEL:
+            snprintf(s, len,
+                     "Sets log level for libretro cores \n"
+                             "(GET_LOG_INTERFACE). \n"
+                             " \n"
+                             " If a log level issued by a libretro \n"
+                             " core is below libretro_log level, it \n"
+                             " is ignored.\n"
+                             " \n"
+                             " DEBUG logs are always ignored unless \n"
+                             " verbose mode is activated (--verbose).\n"
+                             " \n"
+                             " DEBUG = 0\n"
+                             " INFO  = 1\n"
+                             " WARN  = 2\n"
+                             " ERROR = 3"
+            );
+            break;
+        case MENU_ENUM_LABEL_STATE_SLOT_INCREASE:
+        case MENU_ENUM_LABEL_STATE_SLOT_DECREASE:
+            snprintf(s, len,
+                     "State slots.\n"
+                             " \n"
+                             " With slot set to 0, save state name is *.state \n"
+                             " (or whatever defined on commandline).\n"
+                             "When slot is != 0, path will be (path)(d), \n"
+                             "where (d) is slot number.");
+            break;
+        case MENU_ENUM_LABEL_SHADER_APPLY_CHANGES:
+            snprintf(s, len,
+                     "Apply Shader Changes. \n"
+                             " \n"
+                             "After changing shader settings, use this to \n"
+                             "apply changes. \n"
+                             " \n"
+                             "Changing shader settings is a somewhat \n"
+                             "expensive operation so it has to be \n"
+                             "done explicitly. \n"
+                             " \n"
+                             "When you apply shaders, the menu shader \n"
+                             "settings are saved to a temporary file (either \n"
+                             "menu.cgp or menu.glslp) and loaded. The file \n"
+                             "persists after RetroArch exits. The file is \n"
+                             "saved to Shader Directory."
+            );
+            break;
+        case MENU_ENUM_LABEL_SHADER_WATCH_FOR_CHANGES:
+            snprintf(s, len,
+                     "Watch shader files for new changes. \n"
+                     " \n"
+                     "After saving changes to a shader on disk, \n"
+                     "it will automatically be recompiled \n"
+                     "and applied to the running content."
+            );
+            break;
+        case MENU_ENUM_LABEL_MENU_TOGGLE:
+            snprintf(s, len,
+                     "Toggles menu.");
+            break;
+        case MENU_ENUM_LABEL_GRAB_MOUSE_TOGGLE:
+            snprintf(s, len,
+                     "Toggles mouse grab.\n"
+                             " \n"
+                             "When mouse is grabbed, RetroArch hides the \n"
+                             "mouse, and keeps the mouse pointer inside \n"
+                             "the window to allow relative mouse input to \n"
+                             "work better.");
+            break;
+        case MENU_ENUM_LABEL_GAME_FOCUS_TOGGLE:
+            snprintf(s, len,
+                     "Toggles game focus.\n"
+                             " \n"
+                             "When a game has focus, RetroArch will both disable \n"
+                             "hotkeys and keep/warp the mouse pointer inside the window.");
+            break;
+        case MENU_ENUM_LABEL_DISK_NEXT:
+            snprintf(s, len,
+                     "Cycles through disk images. Use after \n"
+                             "ejecting. \n"
+                             " \n"
+                             " Complete by toggling eject again.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_FILTER:
+#ifdef HAVE_FILTERS_BUILTIN
+            snprintf(s, len,
+                  "CPU-based video filter.");
+#else
+            snprintf(s, len,
+                     "CPU-based video filter.\n"
+                             " \n"
+                             "Path to a dynamic library.");
+#endif
+            break;
+        case MENU_ENUM_LABEL_AUDIO_DEVICE:
+            snprintf(s, len,
+                     "Override the default audio device \n"
+                             "the audio driver uses.\n"
+                             "This is driver dependent. E.g.\n"
+#ifdef HAVE_ALSA
+            " \n"
+            "ALSA wants a PCM device."
+#endif
+#ifdef HAVE_OSS
+            " \n"
+            "OSS wants a path (e.g. /dev/dsp)."
+#endif
+#ifdef HAVE_JACK
+            " \n"
+            "JACK wants portnames (e.g. system:playback1\n"
+            ",system:playback_2)."
+#endif
+#ifdef HAVE_RSOUND
+            " \n"
+            "RSound wants an IP address to an RSound \n"
+            "server."
+#endif
+            );
+            break;
+        case MENU_ENUM_LABEL_DISK_EJECT_TOGGLE:
+            snprintf(s, len,
+                     "Toggles eject for disks.\n"
+                             " \n"
+                             "Used for multiple-disk content.");
+            break;
+        case MENU_ENUM_LABEL_ENABLE_HOTKEY:
+            snprintf(s, len,
+                     "Enable other hotkeys.\n"
+                             " \n"
+                             " If this hotkey is bound to either keyboard, \n"
+                             "joybutton or joyaxis, all other hotkeys will \n"
+                             "be disabled unless this hotkey is also held \n"
+                             "at the same time. \n"
+                             " \n"
+                             "This is useful for RETRO_KEYBOARD centric \n"
+                             "implementations which query a large area of \n"
+                             "the keyboard, where it is not desirable that \n"
+                             "hotkeys get in the way.");
+            break;
+        case MENU_ENUM_LABEL_REWIND_ENABLE:
+            snprintf(s, len,
+                     "Enable rewinding.\n"
+                             " \n"
+                             "This will take a performance hit, \n"
+                             "so it is disabled by default.");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_APPLY_AFTER_TOGGLE:
+            snprintf(s, len,
+                     "Apply cheat immediately after toggling.");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_APPLY_AFTER_LOAD:
+            snprintf(s, len,
+                     "Auto-apply cheats when game loads.");
+            break;
+        case MENU_ENUM_LABEL_LIBRETRO_DIR_PATH:
+            snprintf(s, len,
+                     "Core Directory. \n"
+                             " \n"
+                             "A directory for where to search for \n"
+                             "libretro core implementations.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_AUTO:
+            snprintf(s, len,
+                     "Refresh Rate Auto.\n"
+                             " \n"
+                             "The accurate refresh rate of our monitor (Hz).\n"
+                             "This is used to calculate audio input rate with \n"
+                             "the formula: \n"
+                             " \n"
+                             "audio_input_rate = game input rate * display \n"
+                             "refresh rate / game refresh rate\n"
+                             " \n"
+                             "If the implementation does not report any \n"
+                             "values, NTSC defaults will be assumed for \n"
+                             "compatibility.\n"
+                             " \n"
+                             "This value should stay close to 60Hz to avoid \n"
+                             "large pitch changes. If your monitor does \n"
+                             "not run at 60Hz, or something close to it, \n"
+                             "disable VSync, and leave this at its default.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_REFRESH_RATE_POLLED:
+            snprintf(s, len,
+                     "Set Polled Refresh Rate\n"
+                             " \n"
+                            "Sets the refresh rate to the actual value\n"
+                            "polled from the display driver.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_ROTATION:
+            snprintf(s, len,
+                     "Forces a certain rotation \n"
+                             "of the screen.\n"
+                             " \n"
+                             "The rotation is added to rotations which\n"
+                             "the libretro core sets (see Video Allow\n"
+                             "Rotate).");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SCALE:
+            snprintf(s, len,
+                     "Fullscreen resolution.\n"
+                             " \n"
+                             "Resolution of 0 uses the \n"
+                             "resolution of the environment.\n");
+            break;
+        case MENU_ENUM_LABEL_FASTFORWARD_RATIO:
+            snprintf(s, len,
+                     "Fastforward ratio.\n"
+                             " \n"
+                             "The maximum rate at which content will\n"
+                             "be run when using fast forward.\n"
+                             " \n"
+                             " (E.g. 5.0 for 60 fps content => 300 fps \n"
+                             "cap).\n"
+                             " \n"
+                             "RetroArch will go to sleep to ensure that \n"
+                             "the maximum rate will not be exceeded.\n"
+                             "Do not rely on this cap to be perfectly \n"
+                             "accurate.");
+            break;
+        case MENU_ENUM_LABEL_VRR_RUNLOOP_ENABLE:
+            snprintf(s, len,
+                     "Sync to Exact Content Framerate.\n"
+                             " \n"
+                             "This option is the equivalent of forcing x1 speed\n"
+                             "while still allowing fast forward.\n"
+                             "No deviation from the core requested refresh rate,\n"
+                             "no sound Dynamic Rate Control).");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_MONITOR_INDEX:
+            snprintf(s, len,
+                     "Which monitor to prefer.\n"
+                             " \n"
+                             "0 (default) means no particular monitor \n"
+                             "is preferred, 1 and up (1 being first \n"
+                             "monitor), suggests RetroArch to use that \n"
+                             "particular monitor.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_CROP_OVERSCAN:
+            snprintf(s, len,
+                     "Forces cropping of overscanned \n"
+                             "frames.\n"
+                             " \n"
+                             "Exact behavior of this option is \n"
+                             "core-implementation specific.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER:
+            snprintf(s, len,
+                     "Only scales video in integer \n"
+                             "steps.\n"
+                             " \n"
+                             "The base size depends on system-reported \n"
+                             "geometry and aspect ratio.\n"
+                             " \n"
+                             "If Force Aspect is not set, X/Y will be \n"
+                             "integer scaled independently.");
+            break;
+        case MENU_ENUM_LABEL_AUDIO_VOLUME:
+            snprintf(s, len,
+                     "Audio volume, expressed in dB.\n"
+                             " \n"
+                             " 0 dB is normal volume. No gain will be applied.\n"
+                             "Gain can be controlled in runtime with Input\n"
+                             "Volume Up / Input Volume Down.");
+            break;
+        case MENU_ENUM_LABEL_AUDIO_RATE_CONTROL_DELTA:
+            snprintf(s, len,
+                     "Audio rate control.\n"
+                             " \n"
+                             "Setting this to 0 disables rate control.\n"
+                             "Any other value controls audio rate control \n"
+                             "delta.\n"
+                             " \n"
+                             "Defines how much input rate can be adjusted \n"
+                             "dynamically.\n"
+                             " \n"
+                             " Input rate is defined as: \n"
+                             " input rate * (1.0 +/- (rate control delta))");
+            break;
+        case MENU_ENUM_LABEL_AUDIO_MAX_TIMING_SKEW:
+            snprintf(s, len,
+                     "Maximum audio timing skew.\n"
+                             " \n"
+                             "Defines the maximum change in input rate.\n"
+                             "You may want to increase this to enable\n"
+                             "very large changes in timing, for example\n"
+                             "running PAL cores on NTSC displays, at the\n"
+                             "cost of inaccurate audio pitch.\n"
+                             " \n"
+                             " Input rate is defined as: \n"
+                             " input rate * (1.0 +/- (max timing skew))");
+            break;
+        case MENU_ENUM_LABEL_OVERLAY_NEXT:
+            snprintf(s, len,
+                     "Toggles to next overlay.\n"
+                             " \n"
+                             "Wraps around.");
+            break;
+        case MENU_ENUM_LABEL_LOG_VERBOSITY:
+            snprintf(s, len,
+                     "Enable or disable verbosity level \n"
+                             "of frontend.");
+            break;
+        case MENU_ENUM_LABEL_VOLUME_UP:
+            snprintf(s, len,
+                     "Increases audio volume.");
+            break;
+        case MENU_ENUM_LABEL_VOLUME_DOWN:
+            snprintf(s, len,
+                     "Decreases audio volume.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_DISABLE_COMPOSITION:
+            snprintf(s, len,
+                     "Forcibly disable composition.\n"
+                             "Only valid on Windows Vista/7 for now.");
+            break;
+        case MENU_ENUM_LABEL_PERFCNT_ENABLE:
+            snprintf(s, len,
+                     "Enable or disable frontend \n"
+                             "performance counters.");
+            break;
+        case MENU_ENUM_LABEL_SYSTEM_DIRECTORY:
+            snprintf(s, len,
+                     "System Directory. \n"
+                             " \n"
+                             "Sets the 'system' directory.\n"
+                             "Cores can query for this\n"
+                             "directory to load BIOSes, \n"
+                             "system-specific configs, etc.");
+            break;
+        case MENU_ENUM_LABEL_SAVESTATE_AUTO_SAVE:
+        case MENU_ENUM_LABEL_SAVESTATE_AUTO_LOAD:
+            snprintf(s, len,
+                     "Automatically saves a savestate at the \n"
+                             "end of RetroArch's lifetime.\n"
+                             " \n"
+                             "RetroArch will automatically load any savestate\n"
+                             "with this path on startup if 'Auto Load State\n"
+                             "is enabled.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_THREADED:
+            snprintf(s, len,
+                     "Use threaded video driver.\n"
+                             " \n"
+                             "Using this might improve performance at the \n"
+                             "possible cost of latency and more video \n"
+                             "stuttering.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_VSYNC:
+            snprintf(s, len,
+                     "Video V-Sync.\n");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_HARD_SYNC:
+            snprintf(s, len,
+                     "Attempts to hard-synchronize \n"
+                             "CPU and GPU.\n"
+                             " \n"
+                             "Can reduce latency at the cost of \n"
+                             "performance.");
+            break;
+        case MENU_ENUM_LABEL_REWIND_GRANULARITY:
+            snprintf(s, len,
+                     "Rewind granularity.\n"
+                             " \n"
+                             " When rewinding defined number of \n"
+                             "frames, you can rewind several frames \n"
+                             "at a time, increasing the rewinding \n"
+                             "speed.");
+            break;
+        case MENU_ENUM_LABEL_REWIND_BUFFER_SIZE:
+            snprintf(s, len,
+                     "Rewind buffer size (MB).\n"
+                             " \n"
+                             " The amount of memory in MB to reserve \n"
+                             "for rewinding.  Increasing this value \n"
+                             "increases the rewind history length.\n");
+            break;
+        case MENU_ENUM_LABEL_REWIND_BUFFER_SIZE_STEP:
+            snprintf(s, len,
+                     "Rewind buffer size step (MB).\n"
+                             " \n"
+                             " Each time you increase or decrease \n"
+                             "the rewind buffer size value via this \n"
+                             "UI it will change by this amount.\n");
+            break;
+        case MENU_ENUM_LABEL_SCREENSHOT:
+            snprintf(s, len,
+                     "Take screenshot.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_FRAME_DELAY:
+            snprintf(s, len,
+                     "Sets how many milliseconds to delay\n"
+                             "after VSync before running the core.\n"
+                             "\n"
+                             "Can reduce latency at the cost of\n"
+                             "higher risk of stuttering.\n"
+                             " \n"
+                             "Maximum is 15.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_HARD_SYNC_FRAMES:
+            snprintf(s, len,
+                     "Sets how many frames CPU can \n"
+                             "run ahead of GPU when using 'GPU \n"
+                             "Hard Sync'.\n"
+                             " \n"
+                             "Maximum is 3.\n"
+                             " \n"
+                             " 0: Syncs to GPU immediately.\n"
+                             " 1: Syncs to previous frame.\n"
+                             " 2: Etc ...");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_BLACK_FRAME_INSERTION:
+            snprintf(s, len,
+                     "Inserts a black frame inbetween \n"
+                             "frames.\n"
+                             " \n"
+                             "Useful for 120 Hz monitors who want to \n"
+                             "play 60 Hz material with eliminated \n"
+                             "ghosting.\n"
+                             " \n"
+                             "Video refresh rate should still be \n"
+                             "configured as if it is a 60 Hz monitor \n"
+                             "(divide refresh rate by 2).");
+            break;
+        case MENU_ENUM_LABEL_RGUI_SHOW_START_SCREEN:
+            snprintf(s, len,
+                     "Show startup screen in menu.\n"
+                             "Is automatically set to false when seen\n"
+                             "for the first time.\n"
+                             " \n"
+                             "This is only updated in config if\n"
+                             "'Save Configuration on Exit' is enabled.\n");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_FULLSCREEN:
+            snprintf(s, len, "Toggles fullscreen.");
+            break;
+        case MENU_ENUM_LABEL_BLOCK_SRAM_OVERWRITE:
+            snprintf(s, len,
+                     "Block SRAM from being overwritten \n"
+                             "when loading save states.\n"
+                             " \n"
+                             "Might potentially lead to buggy games.");
+            break;
+        case MENU_ENUM_LABEL_PAUSE_NONACTIVE:
+            snprintf(s, len,
+                     "Pause gameplay when window focus \n"
+                             "is lost.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_GPU_SCREENSHOT:
+            snprintf(s, len,
+                     "Screenshots output of GPU shaded \n"
+                             "material if available.");
+            break;
+        case MENU_ENUM_LABEL_SCREENSHOT_DIRECTORY:
+            snprintf(s, len,
+                     "Screenshot Directory. \n"
+                             " \n"
+                             "Directory to dump screenshots to."
+            );
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SWAP_INTERVAL:
+            snprintf(s, len,
+                     "VSync Swap Interval.\n"
+                             " \n"
+                             "Uses a custom swap interval for VSync. Set this \n"
+                             "to effectively halve monitor refresh rate.");
+            break;
+        case MENU_ENUM_LABEL_SAVEFILE_DIRECTORY:
+            snprintf(s, len,
+                     "Savefile Directory. \n"
+                             " \n"
+                             "Save all save files (*.srm) to this \n"
+                             "directory. This includes related files like \n"
+                             ".bsv, .rt, .psrm, etc...\n"
+                             " \n"
+                             "This will be overridden by explicit command line\n"
+                             "options.");
+            break;
+        case MENU_ENUM_LABEL_SAVESTATE_DIRECTORY:
+            snprintf(s, len,
+                     "Savestate Directory. \n"
+                             " \n"
+                             "Save all save states (*.state) to this \n"
+                             "directory.\n"
+                             " \n"
+                             "This will be overridden by explicit command line\n"
+                             "options.");
+            break;
+        case MENU_ENUM_LABEL_ASSETS_DIRECTORY:
+            snprintf(s, len,
+                     "Assets Directory. \n"
+                             " \n"
+                             " This location is queried by default when \n"
+                             "menu interfaces try to look for loadable \n"
+                             "assets, etc.");
+            break;
+        case MENU_ENUM_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY:
+            snprintf(s, len,
+                     "Dynamic Wallpapers Directory. \n"
+                             " \n"
+                             " The place to store backgrounds that will \n"
+                             "be loaded dynamically by the menu depending \n"
+                             "on context.");
+            break;
+        case MENU_ENUM_LABEL_SLOWMOTION_RATIO:
+            snprintf(s, len,
+                     "Slowmotion ratio."
+                             " \n"
+                             "When slowmotion, content will slow\n"
+                             "down by factor.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD:
+            snprintf(s, len,
+                     "Defines axis threshold.\n"
+                             " \n"
+                             "How far an axis must be tilted to result\n"
+                             "in a button press.\n"
+                             " Possible values are [0.0, 1.0].");
+            break;
+        case MENU_ENUM_LABEL_INPUT_TURBO_PERIOD:
+            snprintf(s, len,
+                     "Turbo period.\n"
+                             " \n"
+                             "Describes the period of which turbo-enabled\n"
+                             "buttons toggle.\n"
+                             " \n"
+                             "Numbers are described in frames."
+            );
+            break;
+        case MENU_ENUM_LABEL_INPUT_DUTY_CYCLE:
+            snprintf(s, len,
+                     "Duty cycle.\n"
+                             " \n"
+                             "Describes how long the period of a turbo-enabled\n"
+                             "should be.\n"
+                             " \n"
+                             "Numbers are described in frames."
+            );
+            break;
+        case MENU_ENUM_LABEL_INPUT_TOUCH_ENABLE:
+            snprintf(s, len, "Enable touch support.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_PREFER_FRONT_TOUCH:
+            snprintf(s, len, "Use front instead of back touch.");
+            break;
+        case MENU_ENUM_LABEL_MOUSE_ENABLE:
+            snprintf(s, len, "Enable mouse input inside the menu.");
+            break;
+        case MENU_ENUM_LABEL_POINTER_ENABLE:
+            snprintf(s, len, "Enable touch input inside the menu.");
+            break;
+        case MENU_ENUM_LABEL_MENU_WALLPAPER:
+            snprintf(s, len, "Path to an image to set as the background.");
+            break;
+        case MENU_ENUM_LABEL_NAVIGATION_WRAPAROUND:
+            snprintf(s, len,
+                     "Wrap-around to beginning and/or end \n"
+                             "if boundary of list is reached \n"
+                             "horizontally and/or vertically.");
+            break;
+        case MENU_ENUM_LABEL_PAUSE_LIBRETRO:
+            snprintf(s, len,
+                     "If disabled, the game will keep \n"
+                             "running in the background when we are in the \n"
+                             "menu.");
+            break;
+        case MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE:
+            snprintf(s, len,
+                     "Suspends the screensaver. Is a hint that \n"
+                             "does not necessarily have to be \n"
+                             "honored by the video driver.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_MODE:
+            snprintf(s, len,
+                     "Netplay client mode for the current user. \n"
+                             "Will be 'Server' mode if disabled.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_DELAY_FRAMES:
+            snprintf(s, len,
+                     "The amount of delay frames to use for netplay. \n"
+                             " \n"
+                             "Increasing this value will increase \n"
+                             "performance, but introduce more latency.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_PUBLIC_ANNOUNCE:
+            snprintf(s, len,
+                     "Whether to announce netplay games publicly. \n"
+                             " \n"
+                             "If set to false, clients must manually connect \n"
+                             "rather than using the public lobby.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_START_AS_SPECTATOR:
+            snprintf(s, len,
+                     "Whether to start netplay in spectator mode. \n"
+                             " \n"
+                             "If set to true, netplay will be in spectator mode \n"
+                             "on start. It's always possible to change mode \n"
+                             "later.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_ALLOW_SLAVES:
+            snprintf(s, len,
+                     "Whether to allow connections in slave mode. \n"
+                             " \n"
+                             "Slave-mode clients require very little processing \n"
+                             "power on either side, but will suffer \n"
+                             "significantly from network latency.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_REQUIRE_SLAVES:
+            snprintf(s, len,
+                     "Whether to disallow connections not in slave mode. \n"
+                             " \n"
+                             "Not recommended except for very fast networks \n"
+                             "with very weak machines. \n");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_STATELESS_MODE:
+            snprintf(s, len,
+                     "Whether to run netplay in a mode not requiring\n"
+                             "save states. \n"
+                             " \n"
+                             "If set to true, a very fast network is required,\n"
+                             "but no rewinding is performed, so there will be\n"
+                             "no netplay jitter.\n");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_CHECK_FRAMES:
+            snprintf(s, len,
+                     "The frequency in frames with which netplay \n"
+                             "will verify that the host and client are in \n"
+                             "sync. \n"
+                             " \n"
+                             "With most cores, this value will have no \n"
+                             "visible effect and can be ignored. With \n"
+                             "nondeterminstic cores, this value determines \n"
+                             "how often the netplay peers will be brought \n"
+                             "into sync. With buggy cores, setting this \n"
+                             "to any non-zero value will cause severe \n"
+                             "performance issues. Set to zero to perform \n"
+                             "no checks. This value is only used on the \n"
+                             "netplay host. \n");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_INPUT_LATENCY_FRAMES_MIN:
+            snprintf(s, len,
+                     "The number of frames of input latency for \n"
+                     "netplay to use to hide network latency. \n"
+                     " \n"
+                     "When in netplay, this option delays local \n"
+                     "input, so that the frame being run is \n"
+                     "closer to the frames being received from \n"
+                     "the network. This reduces jitter and makes \n"
+                     "netplay less CPU-intensive, but at the \n"
+                     "price of noticeable input lag. \n");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_INPUT_LATENCY_FRAMES_RANGE:
+            snprintf(s, len,
+                     "The range of frames of input latency that \n"
+                     "may be used by netplay to hide network \n"
+                     "latency. \n"
+                     "\n"
+                     "If set, netplay will adjust the number of \n"
+                     "frames of input latency dynamically to \n"
+                     "balance CPU time, input latency and \n"
+                     "network latency. This reduces jitter and \n"
+                     "makes netplay less CPU-intensive, but at \n"
+                     "the price of unpredictable input lag. \n");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_NAT_TRAVERSAL:
+            snprintf(s, len,
+                     "When hosting, attempt to listen for\n"
+                             "connections from the public internet, using\n"
+                             "UPnP or similar technologies to escape LANs. \n");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_USE_MITM_SERVER:
+            snprintf(s, len,
+                     "When hosting a netplay session, relay connection through a \n"
+                             "man-in-the-middle server \n"
+                             "to get around firewalls or NAT/UPnP issues. \n");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_MITM_SERVER:
+            snprintf(s, len,
+                     "Specifies the man-in-the-middle server \n"
+                             "to use for netplay. A server that is \n"
+                             "located closer to you may have less latency. \n");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_MAX_SWAPCHAIN_IMAGES:
+            snprintf(s, len,
+                     "Maximum amount of swapchain images. This \n"
+                             "can tell the video driver to use a specific \n"
+                             "video buffering mode. \n"
+                             " \n"
+                             "Single buffering - 1\n"
+                             "Double buffering - 2\n"
+                             "Triple buffering - 3\n"
+                             " \n"
+                             "Setting the right buffering mode can have \n"
+                             "a big impact on latency.");
+            break;
+        case MENU_ENUM_LABEL_VIDEO_SMOOTH:
+            snprintf(s, len,
+                     "Smoothens picture with bilinear filtering. \n"
+                             "Should be disabled if using shaders.");
+            break;
+        case MENU_ENUM_LABEL_TIMEDATE_ENABLE:
+            snprintf(s, len,
+                     "Shows current date and/or time inside menu.");
+            break;
+        case MENU_ENUM_LABEL_BATTERY_LEVEL_ENABLE:
+            snprintf(s, len,
+                     "Shows current battery level inside menu.");
+            break;
+        case MENU_ENUM_LABEL_CORE_ENABLE:
+            snprintf(s, len,
+                     "Shows current core inside menu.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST:
+            snprintf(s, len,
+                     "Enables Netplay in host (server) mode.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_ENABLE_CLIENT:
+            snprintf(s, len,
+                     "Enables Netplay in client mode.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_DISCONNECT:
+            snprintf(s, len,
+                     "Disconnects an active Netplay connection.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS:
+            snprintf(s, len,
+                     "Search for and connect to netplay hosts on the local network.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_SETTINGS:
+            snprintf(s, len,
+                     "Setting related to Netplay.");
+            break;
+        case MENU_ENUM_LABEL_DYNAMIC_WALLPAPER:
+            snprintf(s, len,
+                     "Dynamically load a new background \n"
+                             "depending on context.");
+            break;
+        case MENU_ENUM_LABEL_CORE_UPDATER_BUILDBOT_URL:
+            snprintf(s, len,
+                     "URL to core updater directory on the \n"
+                             "Libretro buildbot.");
+            break;
+        case MENU_ENUM_LABEL_BUILDBOT_ASSETS_URL:
+            snprintf(s, len,
+                     "URL to assets updater directory on the \n"
+                             "Libretro buildbot.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_REMAP_BINDS_ENABLE:
+            snprintf(s, len,
+                     "if enabled, overrides the input binds \n"
+                             "with the remapped binds set for the \n"
+                             "current core.");
+            break;
+        case MENU_ENUM_LABEL_OVERLAY_DIRECTORY:
+            snprintf(s, len,
+                     "Overlay Directory. \n"
+                             " \n"
+                             "Defines a directory where overlays are \n"
+                             "kept for easy access.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_MAX_USERS:
+            snprintf(s, len,
+                     "Maximum amount of users supported by \n"
+                             "RetroArch.");
+            break;
+        case MENU_ENUM_LABEL_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
+            snprintf(s, len,
+                     "After downloading, automatically extract \n"
+                             "archives that the downloads are contained \n"
+                             "inside.");
+            break;
+        case MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
+            snprintf(s, len,
+                     "Filter files being shown by \n"
+                             "supported extensions.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_NICKNAME:
+            snprintf(s, len,
+                     "The username of the person running RetroArch. \n"
+                             "This will be used for playing online games.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_TCP_UDP_PORT:
+            snprintf(s, len,
+                     "The port of the host IP address. \n"
+                             "Can be either a TCP or UDP port.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_SPECTATOR_MODE_ENABLE:
+            snprintf(s, len,
+                     "Enable or disable spectator mode for \n"
+                             "the user during netplay.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_IP_ADDRESS:
+            snprintf(s, len,
+                     "The address of the host to connect to.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_PASSWORD:
+            snprintf(s, len,
+                     "The password for connecting to the netplay \n"
+                             "host. Used only in host mode.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_SPECTATE_PASSWORD:
+            snprintf(s, len,
+                     "The password for connecting to the netplay \n"
+                             "host with only spectator privileges. Used \n"
+                             "only in host mode.");
+            break;
+        case MENU_ENUM_LABEL_STDIN_CMD_ENABLE:
+            snprintf(s, len,
+                     "Enable stdin command interface.");
+            break;
+        case MENU_ENUM_LABEL_UI_COMPANION_START_ON_BOOT:
+            snprintf(s, len,
+                     "Start User Interface companion driver \n"
+                             "on boot (if available).");
+            break;
+        case MENU_ENUM_LABEL_MENU_DRIVER:
+            snprintf(s, len, "Menu driver to use.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO:
+            snprintf(s, len,
+                     "Gamepad button combination to toggle menu. \n"
+                             " \n"
+                             "0 - None \n"
+                             "1 - Press L + R + Y + D-Pad Down \n"
+                             "simultaneously. \n"
+                             "2 - Press L3 + R3 simultaneously. \n"
+                             "3 - Press Start + Select simultaneously.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_ALL_USERS_CONTROL_MENU:
+            snprintf(s, len, "Allows any user to control the menu. \n"
+                    " \n"
+                    "When disabled, only user 1 can control the menu.");
+            break;
+        case MENU_ENUM_LABEL_INPUT_AUTODETECT_ENABLE:
+            snprintf(s, len,
+                     "Enable input auto-detection.\n"
+                             " \n"
+                             "Will attempt to auto-configure \n"
+                             "joypads, Plug-and-Play style.");
+            break;
+        case MENU_ENUM_LABEL_CAMERA_ALLOW:
+            snprintf(s, len,
+                     "Allow or disallow camera access by \n"
+                             "cores.");
+            break;
+        case MENU_ENUM_LABEL_LOCATION_ALLOW:
+            snprintf(s, len,
+                     "Allow or disallow location services \n"
+                             "access by cores.");
+            break;
+        case MENU_ENUM_LABEL_TURBO:
+            snprintf(s, len,
+                     "Turbo enable.\n"
+                             " \n"
+                             "Holding the turbo while pressing another \n"
+                             "button will let the button enter a turbo \n"
+                             "mode where the button state is modulated \n"
+                             "with a periodic signal. \n"
+                             " \n"
+                             "The modulation stops when the button \n"
+                             "itself (not turbo button) is released.");
+            break;
+        case MENU_ENUM_LABEL_OSK_ENABLE:
+            snprintf(s, len,
+                     "Enable/disable on-screen keyboard.");
+            break;
+        case MENU_ENUM_LABEL_AUDIO_MUTE:
+            snprintf(s, len,
+                     "Mute/unmute audio.");
+            break;
+        case MENU_ENUM_LABEL_REWIND:
+            snprintf(s, len,
+                     "Hold button down to rewind.\n"
+                             " \n"
+                             "Rewind must be enabled.");
+            break;
+        case MENU_ENUM_LABEL_EXIT_EMULATOR:
+            snprintf(s, len,
+                     "Key to exit RetroArch cleanly."
+#if !defined(RARCH_MOBILE) && !defined(RARCH_CONSOLE)
+                            "\nKilling it in any hard way (SIGKILL, \n"
+                            "etc) will terminate without saving\n"
+                            "RAM, etc. On Unix-likes,\n"
+                            "SIGINT/SIGTERM allows\n"
+                            "a clean deinitialization."
+#endif
+            );
+            break;
+        case MENU_ENUM_LABEL_LOAD_STATE:
+            snprintf(s, len,
+                     "Loads state.");
+            break;
+        case MENU_ENUM_LABEL_SAVE_STATE:
+            snprintf(s, len,
+                     "Saves state.");
+            break;
+        case MENU_ENUM_LABEL_NETPLAY_GAME_WATCH:
+            snprintf(s, len,
+                     "Netplay toggle play/spectate mode.");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_INDEX_PLUS:
+            snprintf(s, len,
+                     "Increment cheat index.\n");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_INDEX_MINUS:
+            snprintf(s, len,
+                     "Decrement cheat index.\n");
+            break;
+        case MENU_ENUM_LABEL_SHADER_PREV:
+            snprintf(s, len,
+                     "Applies previous shader in directory.");
+            break;
+        case MENU_ENUM_LABEL_SHADER_NEXT:
+            snprintf(s, len,
+                     "Applies next shader in directory.");
+            break;
+        case MENU_ENUM_LABEL_RESET:
+            snprintf(s, len,
+                     "Reset the content.\n");
+            break;
+        case MENU_ENUM_LABEL_PAUSE_TOGGLE:
+            snprintf(s, len,
+                     "Toggle between paused and non-paused state.");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_TOGGLE:
+            snprintf(s, len,
+                     "Toggle cheat index.\n");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_IDX:
+            snprintf(s, len,
+                     "Index position in list.\n");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_ADDRESS_BIT_POSITION:
+            snprintf(s, len,
+                     "Address bitmask when Memory Search Size < 8-bit.\n");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_REPEAT_COUNT:
+            snprintf(s, len,
+                     "The number of times the cheat will be applied.\nUse with the other two Iteration options to affect large areas of memory.");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_REPEAT_ADD_TO_ADDRESS:
+            snprintf(s, len,
+                     "After each 'Number of Iterations' the Memory Address will be increased by this number times the 'Memory Search Size'.");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_REPEAT_ADD_TO_VALUE:
+            snprintf(s, len,
+                     "After each 'Number of Iterations' the Value will be increased by this amount.");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_MATCH_IDX:
+            snprintf(s, len,
+                     "Select the match to view.");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_START_OR_CONT:
+            snprintf(s, len,
+                     "Scan memory to create new cheats");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_START_OR_RESTART:
+            snprintf(s, len,
+                     "Left/Right to change bit-size\n");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_SEARCH_EXACT:
+            snprintf(s, len,
+                     "Left/Right to change value\n");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_SEARCH_LT:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_SEARCH_GT:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_SEARCH_EQ:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_SEARCH_NEQ:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_SEARCH_EQPLUS:
+            snprintf(s, len,
+                     "Left/Right to change value\n");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_SEARCH_EQMINUS:
+            snprintf(s, len,
+                     "Left/Right to change value\n");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_ADD_MATCHES:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_VIEW_MATCHES:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_CREATE_OPTION:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_DELETE_OPTION:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_ADD_NEW_TOP:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_RELOAD_CHEATS:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_ADD_NEW_BOTTOM:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_DELETE_ALL:
+            snprintf(s, len,
+                     " ");
+            break;
+        case MENU_ENUM_LABEL_CHEAT_BIG_ENDIAN:
+            snprintf(s, len,
+                     "Big endian    : 258 = 0x0102\n"
+                     "Little endian : 258 = 0x0201");
+            break;
+        case MENU_ENUM_LABEL_HOLD_FAST_FORWARD:
+            snprintf(s, len,
+                     "Hold for fast-forward. Releasing button \n"
+                             "disables fast-forward.");
+            break;
+        case MENU_ENUM_LABEL_SLOWMOTION_HOLD:
+            snprintf(s, len,
+                     "Hold for slowmotion.");
+            break;
+        case MENU_ENUM_LABEL_FRAME_ADVANCE:
+            snprintf(s, len,
+                     "Frame advance when content is paused.");
+            break;
+        case MENU_ENUM_LABEL_BSV_RECORD_TOGGLE:
+            snprintf(s, len,
+                     "Toggle between recording and not.");
+            break;
+        case MENU_ENUM_LABEL_L_X_PLUS:
+        case MENU_ENUM_LABEL_L_X_MINUS:
+        case MENU_ENUM_LABEL_L_Y_PLUS:
+        case MENU_ENUM_LABEL_L_Y_MINUS:
+        case MENU_ENUM_LABEL_R_X_PLUS:
+        case MENU_ENUM_LABEL_R_X_MINUS:
+        case MENU_ENUM_LABEL_R_Y_PLUS:
+        case MENU_ENUM_LABEL_R_Y_MINUS:
+            snprintf(s, len,
+                     "Axis for analog stick (DualShock-esque).\n"
+                             " \n"
+                             "Bound as usual, however, if a real analog \n"
+                             "axis is bound, it can be read as a true analog.\n"
+                             " \n"
+                             "Positive X axis is right. \n"
+                             "Positive Y axis is down.");
+            break;
+        case MENU_ENUM_LABEL_VALUE_WHAT_IS_A_CORE_DESC:
+            snprintf(s, len,
+                     "RetroArch by itself does nothing. \n"
+                            " \n"
+                            "To make it do things, you need to \n"
+                            "load a program into it. \n"
+                            "\n"
+                            "We call such a program 'Libretro core', \n"
+                            "or 'core' in short. \n"
+                            " \n"
+                            "To load a core, select one from\n"
+                            "'Load Core'.\n"
+                            " \n"
+#ifdef HAVE_NETWORKING
+                    "You can obtain cores in several ways: \n"
+                    "* Download them by going to\n"
+                    "'%s' -> '%s'.\n"
+                    "* Manually move them over to\n"
+                    "'%s'.",
+                    msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER),
+                    msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST),
+                    msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH)
+#else
+                            "You can obtain cores by\n"
+                            "manually moving them over to\n"
+                            "'%s'.",
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH)
+#endif
+            );
+            break;
+        case MENU_ENUM_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD_DESC:
+            snprintf(s, len,
+                     "You can change the virtual gamepad overlay\n"
+                             "by going to '%s' -> '%s'."
+                             " \n"
+                             "From there you can change the overlay,\n"
+                             "change the size and opacity of the buttons, etc.\n"
+                             " \n"
+                             "NOTE: By default, virtual gamepad overlays are\n"
+                             "hidden when in the menu.\n"
+                             "If you'd like to change this behavior,\n"
+                             "you can set '%s' to false.",
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SETTINGS),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OVERLAY_SETTINGS),
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU)
+            );
+            break;
+        case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_ENABLE:
+            snprintf(s, len,
+                     "Enables a background color for the OSD.");
+            break;
+        case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_RED:
+            snprintf(s, len,
+                     "Sets the red value of the OSD background color. Valid values are between 0 and 255.");
+            break;
+        case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_GREEN:
+            snprintf(s, len,
+                     "Sets the green value of the OSD background color. Valid values are between 0 and 255.");
+            break;
+        case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_BLUE:
+            snprintf(s, len,
+                     "Sets the blue value of the OSD background color. Valid values are between 0 and 255.");
+            break;
+        case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_OPACITY:
+            snprintf(s, len,
+                     "Sets the opacity of the OSD background color. Valid values are between 0.0 and 1.0.");
+            break;
+        case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_COLOR_RED:
+            snprintf(s, len,
+                     "Sets the red value of the OSD text color. Valid values are between 0 and 255.");
+            break;
+        case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_COLOR_GREEN:
+            snprintf(s, len,
+                     "Sets the green value of the OSD text color. Valid values are between 0 and 255.");
+            break;
+        case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_COLOR_BLUE:
+            snprintf(s, len,
+                     "Sets the blue value of the OSD text color. Valid values are between 0 and 255.");
+            break;
+        case MENU_ENUM_LABEL_MIDI_DRIVER:
+            snprintf(s, len,
+                     "MIDI driver to use.");
+            break;
+        case MENU_ENUM_LABEL_MIDI_INPUT:
+            snprintf(s, len,
+                     "Sets the input device (driver specific).\n"
+                     "When set to \"Off\", MIDI input will be disabled.\n"
+                     "Device name can also be typed in.");
+            break;
+        case MENU_ENUM_LABEL_MIDI_OUTPUT:
+            snprintf(s, len,
+                     "Sets the output device (driver specific).\n"
+                     "When set to \"Off\", MIDI output will be disabled.\n"
+                     "Device name can also be typed in.\n"
+                     " \n"
+                     "When MIDI output is enabled and core and game/app support MIDI output,\n"
+                     "some or all sounds (depends on game/app) will be generated by MIDI device.\n"
+                     "In case of \"null\" MIDI driver this means that those sounds won't be audible.");
+            break;
+        case MENU_ENUM_LABEL_MIDI_VOLUME:
+            snprintf(s, len,
+                     "Sets the master volume of the output device.");
+            break;
+        default:
+            if (string_is_empty(s))
+                strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE), len);
+            return -1;
+    }
+
+    return 0;
+}
+#endif
+
+#ifdef HAVE_MENU
+static const char *menu_hash_to_str_el_label_enum(enum msg_hash_enums msg)
+{
+   if (msg <= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_END &&
+         msg >= MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN)
+   {
+      static char hotkey_lbl[128] = {0};
+      unsigned idx = msg - MENU_ENUM_LABEL_INPUT_HOTKEY_BIND_BEGIN;
+      snprintf(hotkey_lbl, sizeof(hotkey_lbl), "input_hotkey_binds_%d", idx);
+      return hotkey_lbl;
+   }
+
+   switch (msg)
+   {
+#include "msg_hash_lbl.h"
+      default:
+#if 0
+         RARCH_LOG("Unimplemented: [%d]\n", msg);
+#endif
+         break;
+   }
+
+   return "null";
+}
+#endif
+
+const char *msg_hash_to_str_el(enum msg_hash_enums msg) {
+#ifdef HAVE_MENU
+    const char *ret = menu_hash_to_str_el_label_enum(msg);
+
+    if (ret && !string_is_equal(ret, "null"))
+       return ret;
+#endif
+
+    switch (msg) {
+#include "msg_hash_el.h"
+        default:
+#if 0
+            RARCH_LOG("Unimplemented: [%d]\n", msg);
+            {
+               RARCH_LOG("[%d] : %s\n", msg - 1, msg_hash_to_str(((enum msg_hash_enums)(msg - 1))));
+            }
+#endif
+            break;
+    }
+
+    return "null";
+}
diff --git a/intl/msg_hash_el.h b/intl/msg_hash_el.h
new file mode 100644
index 0000000000..e3bc73e9e9
--- /dev/null
+++ b/intl/msg_hash_el.h
@@ -0,0 +1,7732 @@
+MSG_HASH(
+    MSG_COMPILER,
+    "Μεταγλωττιστής"
+    )
+MSG_HASH(
+    MSG_UNKNOWN_COMPILER,
+    "Άγνωστος Μεταγλωττιστής"
+    )
+MSG_HASH(
+    MSG_NATIVE,
+    "Ντόπιος"
+	)
+MSG_HASH(
+    MSG_DEVICE_DISCONNECTED_FROM_PORT,
+    "Η συσκευή αποσυνδέθηκε από την θύρα"
+    )
+MSG_HASH(
+    MSG_UNKNOWN_NETPLAY_COMMAND_RECEIVED,
+    "Λήφθηκε άγνωστη εντολή netplay"
+    )
+MSG_HASH(
+    MSG_FILE_ALREADY_EXISTS_SAVING_TO_BACKUP_BUFFER,
+    "Το αρχείο υπάρχει ήδη. Αποθήκευση σε εφεδρική ενδιάμεση μνήμη."
+    )
+MSG_HASH(
+    MSG_GOT_CONNECTION_FROM,
+    "Λήφθηκε σύνδεση από: \"%s\""
+    )
+MSG_HASH(
+    MSG_GOT_CONNECTION_FROM_NAME,
+    "Λήφθηκε σύνδεση από: \"%s (%s)\""
+    )
+MSG_HASH(
+    MSG_PUBLIC_ADDRESS,
+    "Δημόσια διεύθυνση"
+    )
+MSG_HASH(
+    MSG_NO_ARGUMENTS_SUPPLIED_AND_NO_MENU_BUILTIN,
+    "Δεν παρασχέθηκε διαφωνία και δεν υπάρχει ενσωματωμένο μενού, εμφάνιση βοήθειας..."
+    )
+MSG_HASH(
+    MSG_SETTING_DISK_IN_TRAY,
+    "Τοποθέτηση δίσκου στην μονάδα δίσκου"
+    )
+MSG_HASH(
+    MSG_WAITING_FOR_CLIENT,
+    "Αναμονή για πελάτη ..."
+    )
+MSG_HASH(
+    MSG_NETPLAY_YOU_HAVE_LEFT_THE_GAME,
+    "Αποσυνδεθήκατε από το παιχνίδι"
+    )
+MSG_HASH(
+    MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
+    "Έχετε συνδεθεί ως παίκτης %u"
+    )
+MSG_HASH(
+    MSG_NETPLAY_YOU_HAVE_JOINED_WITH_INPUT_DEVICES_S,
+    "Έχετε συνδεθεί με συσκευές εισόδου %.*s"
+    )
+MSG_HASH(
+    MSG_NETPLAY_PLAYER_S_LEFT,
+    "Ο παίκτης %.*s αποσυνδέθηκε από το παιχνίδι"
+    )
+MSG_HASH(
+    MSG_NETPLAY_S_HAS_JOINED_AS_PLAYER_N,
+    "%.*s συνδέθηκε ως παίκτης %u"
+    )
+MSG_HASH(
+    MSG_NETPLAY_S_HAS_JOINED_WITH_INPUT_DEVICES_S,
+    "%.*s συνδέθηκε με συσκευές εισόδου %.*s"
+    )
+MSG_HASH(
+    MSG_NETPLAY_NOT_RETROARCH,
+    "Η προσπάθεια σύνδεσης netplay απέτυχε επειδή ο συμπέκτης δεν χρησιμοποιεί το RetroArch ή χρησιμοποιεί πιο παλιά έκδοση."
+    )
+MSG_HASH(
+    MSG_NETPLAY_OUT_OF_DATE,
+    "Ο συμπαίκτης χρησιμοποιεί πιο παλιά έκδοση RetroArch. Αδύνατη η σύνδεση."
+    )
+MSG_HASH(
+    MSG_NETPLAY_DIFFERENT_VERSIONS,
+    "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Ο συμπαίκτης netplay χρησιμοποιεί διαφορετική έκδοση του RetroArch. Εάν προκύψουν προβλήματα χρησιμοποιήστε την ίδια έκδοση."
+    )
+MSG_HASH(
+    MSG_NETPLAY_DIFFERENT_CORES,
+    "Ο συμπαίκτης netplay χρησιμοποιεί διαφορειτκό πυρήνα. Αδύνατη η σύνδεση."
+    )
+MSG_HASH(
+    MSG_NETPLAY_DIFFERENT_CORE_VERSIONS,
+    "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Ο συμπαίκτης netplay χρησιμοποιεί διαφορετική έκδοση του πυρήνα. Εάν προκύψουν προβλήματα χρησιμοποιήστε την ίδια έκδοση."
+    )
+MSG_HASH(
+    MSG_NETPLAY_ENDIAN_DEPENDENT,
+    "Αυτός ο πυρήνας δεν υποστηρίζει σύνδεση διαφορετικών πλατφόρμων για netplay ανάμεσα σε αυτά τα συστήματα"
+    )
+MSG_HASH(
+    MSG_NETPLAY_PLATFORM_DEPENDENT,
+    "Αυτός ο πυρήνας δεν υποστηρίζει σύνδεση διαφορετικών πλατφόρμων για netplay"
+    )
+MSG_HASH(
+    MSG_NETPLAY_ENTER_PASSWORD,
+    "Εισάγετε κωδικό διακομιστή netplay:"
+    )
+MSG_HASH(
+    MSG_NETPLAY_INCORRECT_PASSWORD,
+    "Λάθος κωδικός"
+    )
+MSG_HASH(
+    MSG_NETPLAY_SERVER_NAMED_HANGUP,
+    "\"%s\" αποσυνδέθηκε"
+    )
+MSG_HASH(
+    MSG_NETPLAY_SERVER_HANGUP,
+    "Ένας πελάτης netplay έχει αποσυνδεθεί"
+    )
+MSG_HASH(
+    MSG_NETPLAY_CLIENT_HANGUP,
+    "Αποσύνδεση netplay"
+    )
+MSG_HASH(
+    MSG_NETPLAY_CANNOT_PLAY_UNPRIVILEGED,
+    "Δεν έχετε άδεια για να παίξετε"
+    )
+MSG_HASH(
+    MSG_NETPLAY_CANNOT_PLAY_NO_SLOTS,
+    "Δεν υπάρχουν κενές θέσεις παικτών"
+    )
+MSG_HASH(
+    MSG_NETPLAY_CANNOT_PLAY_NOT_AVAILABLE,
+    "Οι συσκευές εισόδου που ζητήθηκαν δεν είναι διαθέσιμες"
+    )
+MSG_HASH(
+    MSG_NETPLAY_CANNOT_PLAY,
+    "Δεν μπορεί να γίνει αλλαγή σε κατάσταση παιχνιδιού"
+    )
+MSG_HASH(
+    MSG_NETPLAY_PEER_PAUSED,
+    "Ο συμπαίκτης netplay \"%s\" έκανε παύση"
+    )
+MSG_HASH(
+    MSG_NETPLAY_CHANGED_NICK,
+    "Το ψευδώνυμο σας άλλαξε σε \"%s\""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SHARED_CONTEXT,
+    "Give hardware-rendered cores their own private context. Avoids having to assume hardware state changes inbetween frames."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SETTINGS,
+    "Προσαρμόζει τις εμφανισιακές ρυθμίσεις της οθόνης του μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC,
+    "Σκληρός συγχρονισμός επεξεργαστή και κάρτας γραφικών. Μειώνει την καθυστέρηση με τίμημα την επίδοση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_THREADED,
+    "Βελτιώνει την επίδοση με τίμημα την καθυστέρηση και περισσότερα κολλήματα στο βίντεο. Χρησιμοποιείστε μόνο εάν δεν μπορείτε να αποκτήσετε πλήρη ταχύτητα με άλλον τρόπο."
+    )
+MSG_HASH(
+    MSG_AUDIO_VOLUME,
+    "Ένταση ήχου"
+    )
+MSG_HASH(
+    MSG_AUTODETECT,
+    "Αυτόματη ανίχνευση"
+    )
+MSG_HASH(
+    MSG_AUTOLOADING_SAVESTATE_FROM,
+    "Αυτόματη φόρτωση κατάστασης αποθήκευσης από"
+    )
+MSG_HASH(
+    MSG_CAPABILITIES,
+    "Ικανότητες"
+    )
+MSG_HASH(
+    MSG_CONNECTING_TO_NETPLAY_HOST,
+    "Σύνδεση με εξυπηρετητή netplay"
+    )
+MSG_HASH(
+    MSG_CONNECTING_TO_PORT,
+    "Σύνδεση στην θύρα"
+    )
+MSG_HASH(
+    MSG_CONNECTION_SLOT,
+    "Θέση σύνδεσης"
+    )
+MSG_HASH(
+    MSG_SORRY_UNIMPLEMENTED_CORES_DONT_DEMAND_CONTENT_NETPLAY,
+    "Συγγνώμη, μη εφαρμοσμένο: πυρήνες που δεν απαιτούν περιεχόμενο δεν μπορούν να συμμετέχουν στο netplay."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD,
+    "Κωδικός"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS,
+    "Επιτεύγματα Λογαριασμού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME,
+    "Όνομα Χρήστη"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST,
+    "Λογαριασμοί"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST_END,
+    "Accounts List Endpoint"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACCOUNTS_RETRO_ACHIEVEMENTS,
+    "RetroAchievements"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST,
+    "Επιτεύγματα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_PAUSE,
+    "Παύση Σκληροπυρηνικής Λειτουργίας Επιτευγμάτων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_RESUME,
+    "Συνέχιση Σκληροπυρηνικής Λειτουργίας Επιτευγμάτων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST_HARDCORE,
+    "Επιτεύγματα (Σκληροπυρηνικά)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST,
+    "Σάρωση Περιεχομένου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST,
+    "Διαμορφώσεις"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ADD_TAB,
+    "Εισαγωγή περιεχομένου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_TAB,
+    "Δωμάτια Netplay"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE,
+    "Ερώτηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY,
+    "Εργαλεία"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES,
+    "Φραγή Καρέ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE,
+    "Συσκευή Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER,
+    "Οδηγός Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN,
+    "Πρόσθετο Ήχου DSP"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE,
+    "Ενεργοποίηση Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_FILTER_DIR,
+    "Φίλτρα Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_TURBO_DEADZONE_LIST,
+    "Turbo/Νεκρή Ζώνη"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY,
+    "Καθυστέρηση Ήχου (ms)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW,
+    "Μέγιστη Χρονική Διαστρέβλωση Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_MUTE,
+    "Σίγαση Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE,
+    "Συχνότητα Εξόδου Ήχου (Hz)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA,
+    "Δυναμικός Έλεγχος Βαθμού Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER,
+    "Οδηγός Επαναδειγματολήπτη Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS,
+    "Ήχος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_SYNC,
+    "Συγχρονισμός Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME,
+    "Ένταση Ήχου (dB)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_WASAPI_EXCLUSIVE_MODE,
+    "Αποκλειστική Λειτουργία WASAPI"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_WASAPI_FLOAT_FORMAT,
+    "Ασταθής Μορφή WASAPI"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_WASAPI_SH_BUFFER_LENGTH,
+    "Μήκος Κοινόχρηστης Ενδιάμεσης Μνήμης WASAPI"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL,
+    "Διάστημα Αυτόματης Αποθήκευσης SaveRAM"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE,
+    "Φόρτωση Αρχείων Παράκαμψης Αυτόματα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE,
+    "Φόρτωση Αρχείων Αναδιοργάνωσης Πλήτρκων Αυτόματα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE,
+    "Φόρτωση Προεπιλογών Σκιάσεων Αυτόματα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK,
+    "Πίσω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM,
+    "Επιβεβαίωση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO,
+    "Πληροφορίες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT,
+    "Έξοδος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN,
+    "Μετακίνηση Προς Τα Κάτω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP,
+    "Μετακίνηση Προς Τα Πάνω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_START,
+    "Εκκίνηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD,
+    "Ενεργοποίηση/Απενεργοποίηση Πληκτρολογίου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU,
+    "Ενεργοποίηση/Απενεργοποίηση Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS,
+    "Βασικός χειρισμός μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_CONFIRM,
+    "Επιβεβαίωση/ΟΚ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_INFO,
+    "Πληροφορίες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_QUIT,
+    "Έξοδος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_SCROLL_UP,
+    "Μετακίνηση Προς Τα Πάνω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_START,
+    "Προεπιλογές"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_KEYBOARD,
+    "Ενεργοποίηση/Απενεργοποίηση Πληκτρολογίου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_MENU,
+    "Ενεργοποίηση/Απενεργοποίηση Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
+    "Απενεργοποίηση αντικατάστασης SaveRAM κατά την φάση φόρτωσης κατάστασης αποθήκευσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
+    "Ενεργοποίηση Bluetooth"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
+    "Σύνδεσμος Εργαλείων του Buildbot"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY,
+    "Κρυφή Μνήμη"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CAMERA_ALLOW,
+    "Επίτρεψη Κάμερας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER,
+    "Οδηγός Κάμερας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT,
+    "Απάτη"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES,
+    "Εφαρμογή Αλλαγών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_START_SEARCH,
+    "Έναρξη Αναζήτησης Για Νέους Κωδικούς Απάτης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_CONTINUE_SEARCH,
+    "Συνέχιση Αναζήτησης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
+    "Αρχεία Απάτης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_FILE,
+    "Αρχείο Απάτης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD,
+    "Φόρτωση Αρχείου Απάτης (Αντικατάσταση)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD_APPEND,
+    "Φόρτωση Αρχείου Απάτης (Προσάρτηση)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS,
+    "Αποθήκευση Αρχείου Απάτης Ως"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_NUM_PASSES,
+    "Φορές Περάσματος Απάτης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_DESCRIPTION,
+    "Περιγραφή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
+    "Σκληροπυρηνική Λειτουργία"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_LEADERBOARDS_ENABLE,
+    "Κατατάξεις"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_BADGES_ENABLE,
+    "Εμβλήματα Επιτευγμάτων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS,
+    "Κλειδωμένα Επιτεύγματα:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ENTRY,
+    "Κλειδωμένο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS,
+    "RetroAchievements"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL,
+    "Δοκιμή Ανεπίσημων Επιτευγμάτων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS,
+    "Ξεκλειδωμένα Επιτεύγματα:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY,
+    "Ξεκλείδωτο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY_HARDCORE,
+    "Σκληροπυρηνικό"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_VERBOSE_ENABLE,
+    "Βερμπαλιστική Λειτουργία"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_AUTO_SCREENSHOT,
+    "Αυτόματο Στιγμιότυπο Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT,
+    "Κλείσιμο Περιεχομένου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONFIG,
+    "Διαμόρφωση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONFIGURATIONS,
+    "Φόρτωση Διαμορφώσεων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS,
+    "Διαμόρφωση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT,
+    "Απόθηκευση Διαμόρφωσης στην Έξοδο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST,
+    "Συλλογές"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY,
+    "Βάσεις Δεδομένων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_DIR,
+    "Περιεχόμενο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE,
+    "Μέγεθος Λίστας Ιστορικού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PLAYLIST_ENTRY_REMOVE,
+    "Επίτρεψη αφαίρεσης καταχωρήσεων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS,
+    "Γρήγορο Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR,
+    "Λήψεις"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIRECTORY,
+    "Λήψεις"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_CHEAT_OPTIONS,
+    "Απάτες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_COUNTERS,
+    "Μετρητές Πυρήνων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_ENABLE,
+    "Εμφάνιση ονόματος πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFORMATION,
+    "Πληροφορίες πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFO_AUTHORS,
+    "Δημιουργοί"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFO_CATEGORIES,
+    "Κατηγορίες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL,
+    "Επιγραφή πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME,
+    "Όνομα πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
+    "Firmware(s)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES,
+    "Άδεια(ες)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,
+    "Άδειες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS,
+    "Υποστηριζόμενες επεκτάσεις"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER,
+    "Κατασκευαστής συστήματος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME,
+    "Όνομα συστήματος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS,
+    "Χειρισμοί"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_LIST,
+    "Φόρτωση Πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_OPTIONS,
+    "Επιλογές"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_SETTINGS,
+    "Πυρήνας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE,
+    "Αυτόματη Έναρξη Πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE,
+    "Αυτόματη εξαγωγή ληφθέντος συμπιεσμένου αρχείου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL,
+    "Σύνδεσμος Buildbot Πυρήνων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST,
+    "Ενημέρωση Πυρήνων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS,
+    "Ενημερωτής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE,
+    "Αρχιτεκτονική Επεξεργαστή:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CPU_CORES,
+    "Πυρήνες Επεξεργαστή:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
+    "Δρομείς"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER,
+    "Διαχειριστής Δρομέα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CUSTOM_RATIO,
+    "Προτιμώμενη Αναλογία"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER,
+    "Διαχειριστής Βάσης Δεδομένων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION,
+    "Επιλογή Βάσης Δεδομένων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DELETE_ENTRY,
+    "Κατάργηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FAVORITES,
+    "Ευρετήριο έναρξης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT,
+    "<Ευρετήριο περιεχομένων>"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT,
+    "<Προκαθορισμένο>"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE,
+    "<Κανένα>"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND,
+    "Το ευρετήριο δεν βρέθηκε."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS,
+    "Ευρετήρια"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS,
+    "Disk Cycle Tray Status"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND,
+    "Disk Image Append"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISK_INDEX,
+    "Disk Index"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISK_OPTIONS,
+    "Disk Control"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DONT_CARE,
+    "Don't care"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST,
+    "Λήψεις"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
+    "Λήψη Πυρήνα..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
+    "Λήψη Περιεχομένου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
+    "DPI Override Enable"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
+    "DPI Override"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
+    "Οδηγοί"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
+    "Φόρτωση Dummy στο Κλείσιμο Πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHECK_FOR_MISSING_FIRMWARE,
+    "Έλεγχος για απών Firmware Πριν την Φόρτωση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
+    "Δυναμικό Φόντο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY,
+    "Δυναμικά Φόντα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
+    "Ενεργοποίηση Επιτευγμάτων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR,
+    "Χρώμα καταχώρησης μενού όταν το ποντίκι βρίσκεται από πάνω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR,
+    "Χρώμα καταχώρησης μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FALSE,
+    "Ψευδές"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FASTFORWARD_RATIO,
+    "Μέγιστη Ταχύτητα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FAVORITES_TAB,
+    "Αγαπημένα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FPS_SHOW,
+    "Προβολή Ρυθμού Καρέ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE,
+    "Περιορισμός Μέγιστης Ταχύτητας Αναπαραγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VRR_RUNLOOP_ENABLE,
+    "Συγχρονισμός με τον Ακριβή Ρυθμό Καρέ του Περιεχομένου (G-Sync, FreeSync)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS,
+    "Περιορισμός Καρέ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS,
+    "Frontend Counters"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS,
+    "Φόρτωση Επιλογών Πυρήνα Βάση Συγκεκριμένου Περιεχομένου Αυτόματα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE,
+    "Δημιουργία αρχείου επιλογών παιχνιδιού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE,
+    "Αποθήκευση αρχείου επιλογών παιχνιδιού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HELP,
+    "Βοήθεια"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING,
+    "Αντιμετώπιση Προβλημάτων Ήχου/Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD,
+    "Αλλαγή Επικαλύμματος Εικονικού Χειριστηρίου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HELP_CONTROLS,
+    "Βασικός Χειρισμός Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HELP_LIST,
+    "Βοήθεια"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HELP_LOADING_CONTENT,
+    "Φόρτωση Περιεχομένου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT,
+    "Σάρωση Για Περιεχόμενο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HELP_WHAT_IS_A_CORE,
+    "Τι Είναι Ο Πυρήνας;"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HISTORY_LIST_ENABLE,
+    "Ενεργοποίηση Λίστας Ιστορικού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HISTORY_TAB,
+    "Ιστορικό"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU,
+    "Οριζόντιο Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_IMAGES_TAB,
+    "Εικόνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INFORMATION,
+    "Πληροφορίες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INFORMATION_LIST,
+    "Πληροφορίες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE,
+    "Τύπος Αναλογικού Σε Ψηφιακό"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ALL_USERS_CONTROL_MENU,
+    "Όλοι Οι Χρήστες Χειρίζονται Το Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X,
+    "Αριστερό Αναλογικό X"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,
+    "Αριστερό Αναλογικό X- (αριστερά)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,
+    "Αριστερό Αναλογικό X+ (δεξιά)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y,
+    "Αριστερό Αναλογικό Y"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,
+    "Αριστερό Αναλογικό Y- (πάνω)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,
+    "Αριστερό Αναλογικό Y+ (κάτω)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X,
+    "Δεξί Αναλογικό X"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,
+    "Δεξί Αναλογικό X- (αριστερά)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,
+    "Δεξί Αναλογικό X+ (δεξιά)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y,
+    "Δεξί Αναλογικό Y"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,
+    "Δεξί Αναλογικό Y- (πάνω)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,
+    "Δεξί Αναλογικό Y+ (κάτω)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_TRIGGER,
+    "Σκανδάλη Όπλου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_RELOAD,
+    "Γέμισμα Όπλου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_A,
+    "Όπλο Aux A"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_B,
+    "Όπλο Aux B"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_AUX_C,
+    "Όπλο Aux C"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_START,
+    "Όπλο Start"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_SELECT,
+    "Όπλο Select"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_UP,
+    "Όπλο D-pad Πάνω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_DOWN,
+    "Όπλο D-pad Κάτω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_LEFT,
+    "Όπλο D-pad Αριστερά"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_LIGHTGUN_DPAD_RIGHT,
+    "Όπλο D-pad Δεξιά"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE,
+    "Ενεργοποίηση Αυτόματης Διαμόρφωσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD,
+    "Νεκρή Ζώνη Αναλογικού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL,
+    "Εναλλαγή Κουμπιών Επιβεβαίωσης & Ακύρωσης Στο Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL,
+    "Σύνδεση Όλων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL,
+    "Επαναφορά Συνδέσεων Όλων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_BIND_TIMEOUT,
+    "Λήξη Χρόνου Σύνδεσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_BIND_HOLD,
+    "Κράτημα Σύνδεσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND,
+    "Hide Unbound Core Input Descriptors"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW,
+    "Display Input Descriptor Labels"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX,
+    "Κατάλογος Συσκευών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE,
+    "Τύπος Συσκευής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_INDEX,
+    "Κατάλογος Ποντικιού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_DRIVER,
+    "Οδηγός Εισαγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE,
+    "Duty Cycle"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS,
+    "Σύνδεση Πλήκτρων Εντολών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE,
+    "Keyboard Gamepad Mapping Enable"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,
+    "Κουμπί A (δεξιά)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,
+    "Κουμπί B (κάτω)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,
+    "D-pad κάτω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,
+    "Κουμπί L2 (σκανδάλι)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,
+    "Κουμπί L3 (αντίχειρας)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,
+    "Κουμπί L (πίσω)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,
+    "D-pad αριστερό"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,
+    "Κουμπί R2 (σκανδάλι)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,
+    "Κουμπί R3 (αντίχειρας)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,
+    "Κουμπί R (πίσω)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,
+    "D-pad δεξί"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,
+    "Κουμπί Select"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,
+    "Κουμπί Start"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,
+    "D-pad πάνω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,
+    "Κουμπί X (πάνω)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,
+    "Κουμπί Y (αριστερό)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_KEY,
+    "(Κουμπί: %s)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_LEFT,
+    "Ποντίκι 1"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_RIGHT,
+    "Ποντίκι 2"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_MIDDLE,
+    "Ποντίκι 3"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_BUTTON4,
+    "Ποντίκι 4"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_BUTTON5,
+    "Ποντίκι 5"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_WHEEL_UP,
+    "Ροδέλα Πάνω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_WHEEL_DOWN,
+    "Ροδέλα Κάτω"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_HORIZ_WHEEL_UP,
+    "Ροδέλα Αριστερά"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_HORIZ_WHEEL_DOWN,
+    "Ροδέλα Δεξιά"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
+    "Keyboard Gamepad Mapping Type"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS,
+    "Μέγιστοι Χρήστες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
+    "Συνδιασμός Πλήκτρων Χειριστηρίου για Άνοιγμα Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,
+    "Κατάλογος απάτης -"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,
+    "Κατάλογος απάτης +"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,
+    "Απάτες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,
+    "Εξαγωγή δίσκου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,
+    "Επόμενος δίσκος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,
+    "Προηγούμενος δίσκος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,
+    "Ενεργοποίηση πλήκτρων εντολών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,
+    "Παύση γρήγορης κίνησης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,
+    "Γρήγορη κίνηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,
+    "Frameadvance"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,
+    "Πλήρης οθόνη"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,
+    "Κλείδωμα ποντικιού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,
+    "Εστίαση παιχνιδιού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,
+    "Μενού επιφάνειας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,
+    "Φόρτωση κατάστασης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,
+    "Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_BSV_RECORD_TOGGLE,
+    "Input replay movie record toggle"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,
+    "Σίγαση Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,
+    "Εναλλαγή κατάστασης παιχνιδιού/θεατή Netplay"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,
+    "Πληκτρολόγιο οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,
+    "Επόμενο επικάλλυμα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,
+    "Παύση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,
+    "Έξοδος από το RetroArch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,
+    "Επαναφορά παιχνιδιού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,
+    "Επιστροφή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_DETAILS,
+    "Λεπτομέρειες Απάτης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_SEARCH,
+    "Start or Continue Cheat Search"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,
+    "Αποθήκευση κατάστασης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,
+    "Λήψη Στιγμιότυπου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,
+    "Επόμενη σκίαση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,
+    "Προηγούμενη σκίαση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_HOLD_KEY,
+    "Παύση αργής κίνησης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_KEY,
+    "Αργή κίνηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,
+    "Θέση κατάστασης αποθήκευσης -"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,
+    "Θέση κατάστασης αποθήκευσης +"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
+    "Ένταση -"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
+    "Ένταση +"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
+    "Εμφάνιση Επικαλύμματος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
+    "Απόκρυψη Επικαλύμματος Στο Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS,
+    "Εμφάνιση Εισαγωγών Στο Επικάλλυμα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS_PORT,
+    "Εμφάνιση Θύρας Εισαγωγών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR,
+    "Τύπος Συμπεριφοράς Συγκέντρωσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_EARLY,
+    "Νωρίς"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE,
+    "Αργά"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_NORMAL,
+    "Φυσιολογικά"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_PREFER_FRONT_TOUCH,
+    "Prefer Front Touch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY,
+    "Input Remapping"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE,
+    "Remap Binds Enable"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG,
+    "Αποθήκευση Αυτόματης Διαμόρφωσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS,
+    "Εισαγωγή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE,
+    "Ενεργοποίηση Μικρού Πληκτρολογίου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_TOUCH_ENABLE,
+    "Ενεργοποίηση Αφής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,
+    "Ενεργοποίηση Turbo"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD,
+    "Turbo Period"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS,
+    "Σύνδεση Πλήκτρων Εισόδου Χρήστη %u"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LATENCY_SETTINGS,
+    "Καθυστέρηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
+    "Internal storage status"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
+    "Input Autoconfig"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
+    "Οδηγός Joypad"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
+    "Υπηρεσίες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
+    "Chinese (Simplified)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
+    "Chinese (Traditional)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_DUTCH,
+    "Dutch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_ENGLISH,
+    "English"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_ESPERANTO,
+    "Esperanto"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_FRENCH,
+    "French"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_GERMAN,
+    "German"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_ITALIAN,
+    "Italian"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_JAPANESE,
+    "Japanese"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_KOREAN,
+    "Korean"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_POLISH,
+    "Polish"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_PORTUGUESE_BRAZIL,
+    "Portuguese (Brazil)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_PORTUGUESE_PORTUGAL,
+    "Portuguese (Portugal)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_RUSSIAN,
+    "Russian"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_SPANISH,
+    "Spanish"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_VIETNAMESE,
+    "Vietnamese"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_ARABIC,
+    "Arabic"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_GREEK,
+    "Ελληνικά"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,
+    "Αριστερό Αναλογικό"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH,
+    "Πυρήνας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH,
+    "Πληροφορίες Πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL,
+    "Core Logging Level"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LINEAR,
+    "Γραμμικός"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LOAD_ARCHIVE,
+    "Φόρτωση Αρχείου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY,
+    "Φόρτωση Πρόσφατου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST,
+    "Φόρτωση Περιεχομένου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LOAD_STATE,
+    "Φόρτωση Κατάστασης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW,
+    "Επίτρεψη Τοποθεσίας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER,
+    "Οδηγός Τοποθεσίας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
+    "Αρχείο Καταγραφής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LOG_VERBOSITY,
+    "Logging Verbosity"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MAIN_MENU,
+    "Κεντρικό Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MANAGEMENT,
+    "Ρυθμίσεις Βάσης Δεδομένων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME,
+    "Χρώμα Θέματος Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE,
+    "Μπλε"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE_GREY,
+    "Μπλε Γκρι"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE,
+    "Σκούρο Μπλε"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GREEN,
+    "Πράσινο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD,
+    "Shield"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_RED,
+    "Κόκκινο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW,
+    "Κίτρινο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_FOOTER_OPACITY,
+    "Footer Opacity"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_HEADER_OPACITY,
+    "Header Opacity"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_DRIVER,
+    "Οδηγός Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_ENUM_THROTTLE_FRAMERATE,
+    "Throttle Menu Framerate"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS,
+    "Ρυθμίσεις"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER,
+    "Menu Linear Filter"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_HORIZONTAL_ANIMATION,
+    "Horizontal Animation"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SETTINGS,
+    "Εμφάνιση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER,
+    "Φόντο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY,
+    "Background opacity"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MISSING,
+    "Λείπει"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MORE,
+    "..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE,
+    "Υποστήριξη Ποντικιού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MULTIMEDIA_SETTINGS,
+    "Πολυμέσα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MUSIC_TAB,
+    "Μουσική"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
+    "Φιλτράρισμα άγνωστων επεκτάσεων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND,
+    "Navigation Wrap-Around"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NEAREST,
+    "Κοντινότερο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY,
+    "Netplay"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_ALLOW_SLAVES,
+    "Allow Slave-Mode Clients"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_CHECK_FRAMES,
+    "Netplay Check Frames"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_MIN,
+    "Input Latency Frames"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE,
+    "Input Latency Frames Range"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES,
+    "Netplay Delay Frames"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT,
+    "Disconnect from netplay host"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE,
+    "Ενεργοποίηση Netplay"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
+    "Σύνδεση σε οικοδεσπότη netplay"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
+    "Έναρξη netplay ως οικοδεσπότης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+    "Λήξη netplay ως οικοδεσπότης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
+    "Διέυθυνση Διακομιστή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS,
+    "Σάρωση τοπικού δικτύου Scan local network"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_MODE,
+    "Netplay Client Enable"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME,
+    "Όνομα Χρήστη"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_PASSWORD,
+    "Κωδικός Διακομιστή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_PUBLIC_ANNOUNCE,
+    "Δημόσια Ανακοίνωση Netplay"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_REQUEST_DEVICE_I,
+    "Request Device %u"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_REQUIRE_SLAVES,
+    "Disallow Non-Slave-Mode Clients"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SETTINGS,
+    "Ρυθμίσεις Netplay"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_ANALOG,
+    "Analog Input Sharing"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_ANALOG_MAX,
+    "Μέγιστο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_ANALOG_AVERAGE,
+    "Μέσος Όρος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_DIGITAL,
+    "Digital Input Sharing"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_DIGITAL_OR,
+    "Κοινοποίηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_DIGITAL_XOR,
+    "Grapple"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_DIGITAL_VOTE,
+    "Ψήφος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_NONE,
+    "Κανείς"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SHARE_NO_PREFERENCE,
+    "Καμία προτίμηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_START_AS_SPECTATOR,
+    "Netplay Spectator Mode"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_STATELESS_MODE,
+    "Netplay Stateless Mode"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATE_PASSWORD,
+    "Server Spectate-Only Password"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATOR_MODE_ENABLE,
+    "Netplay Spectator Enable"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_TCP_UDP_PORT,
+    "Netplay TCP Port"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_NAT_TRAVERSAL,
+    "Netplay NAT Traversal"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE,
+    "Network Commands"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETWORK_CMD_PORT,
+    "Network Command Port"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETWORK_INFORMATION,
+    "Πληροφορίες Δικτύου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE,
+    "Χειριστήριο Δικτύου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_PORT,
+    "Network Remote Base Port"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS,
+    "Δίκτυο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO,
+    "Όχι"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NONE,
+    "Τίποτα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE,
+    "Μ/Δ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY,
+    "Δεν υπάρχουν επιτεύγματα προς προβολή."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_CORE,
+    "Κανένας Πυρήνας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE,
+    "Δεν υπάρχουν διαθέσιμοι πυρήνες."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE,
+    "Δεν υπάρχουν διαθέσιμες πληροφορίες πυρήνα."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE,
+    "Δεν υπάρχουν διαθέσιμες επιλογές πυρήνα."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY,
+    "Δεν υπάρχουν καταχωρήσεις προς εμφάνιση."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE,
+    "Δεν υπάρχει διαθέσιμο ιστορικό."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE,
+    "Δεν υπάρχουν διαθέσιμες πληροφορίες."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_ITEMS,
+    "Δεν υπάρχουν αντικείμενα."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_NETPLAY_HOSTS_FOUND,
+    "Δεν βρέθηκαν εξυπηρετητές netplay."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_NETWORKS_FOUND,
+    "Δεν βρέθηκαν δίκτυα."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS,
+    "No performance counters."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_PLAYLISTS,
+    "Δεν βρέθηκαν λίστες αναπαραγωγής."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE,
+    "Δεν υπάρχουν διαθέσιμες καταχωρήσεις στην λίστα αναπαραγωγής."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND,
+    "Δεν βρέθηκαν ρυθμίσεις."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS,
+    "Δεν βρέθηκαν παράμετροι σκίασης."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OFF,
+    "OFF"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ON,
+    "ON"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ONLINE,
+    "Online"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER,
+    "Διαδικτυακός Ενημερωτής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS,
+    "Οθόνη Απεικόνισης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS,
+    "Επικάλλυμα Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ONSCREEN_OVERLAY_SETTINGS,
+    "Προσαρμογή Προσόψεων και Χειρισμών Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ONSCREEN_NOTIFICATIONS_SETTINGS,
+    "Ειδοποιήσεις Οθόνης Απεικόνισης"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ONSCREEN_NOTIFICATIONS_SETTINGS,
+    "Προσαρμόστε τις Ειδοποιήσεις Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
+    "Περιήγηση Αρχείου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OPTIONAL,
+    "Προεραιτικό"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OVERLAY,
+    "Επικάλλυμα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED,
+    "Αυτόματη Φόρτωση Προτιμώμενου Επικαλύμματος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OVERLAY_DIRECTORY,
+    "Επικάλλυμα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OVERLAY_OPACITY,
+    "Διαφάνεια Επικαλύμματος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OVERLAY_PRESET,
+    "Προκαθορισμένο Επικάλλυμα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OVERLAY_SCALE,
+    "Κλίμακα Επικαλύμματος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OVERLAY_SETTINGS,
+    "Επικάλλυμα Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PAL60_ENABLE,
+    "Χρήση Λειτουργίας PAL60"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY,
+    "Προηγούμενο ευρετήριο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO,
+    "Παύση όταν ενεργοποιείται το μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE,
+    "Μην εκτελείτε στο παρασκήνιο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PERFCNT_ENABLE,
+    "Performance Counters"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB,
+    "Λίστες Αναπαραγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PLAYLIST_DIRECTORY,
+    "Λίστα Αναπαραγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS,
+    "Λίστες Αναπαραγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_POINTER_ENABLE,
+    "Υποστήριξη Αφής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PORT,
+    "Θύρα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PRESENT,
+    "Present"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS,
+    "Ιδιωτικότητα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIDI_SETTINGS,
+    "MIDI"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH,
+    "Έξοδος από RetroArch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG,
+    "Analog supported"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_BBFC_RATING,
+    "BBFC Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CERO_RATING,
+    "CERO Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_COOP,
+    "Co-op supported"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CRC32,
+    "CRC32"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DESCRIPTION,
+    "Description"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DEVELOPER,
+    "Developer"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_ISSUE,
+    "Edge Magazine Issue"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_RATING,
+    "Edge Magazine Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_REVIEW,
+    "Edge Magazine Review"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ELSPA_RATING,
+    "ELSPA Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ENHANCEMENT_HW,
+    "Enhancement Hardware"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ESRB_RATING,
+    "ESRB Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FAMITSU_MAGAZINE_RATING,
+    "Famitsu Magazine Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FRANCHISE,
+    "Franchise"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_GENRE,
+    "Genre"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_MD5,
+    "MD5"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME,
+    "Όνομα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ORIGIN,
+    "Origin"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PEGI_RATING,
+    "PEGI Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PUBLISHER,
+    "Publisher"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH,
+    "Releasedate Month"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_YEAR,
+    "Releasedate Year"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RUMBLE,
+    "Rumble supported"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SERIAL,
+    "Serial"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SHA1,
+    "SHA1"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_START_CONTENT,
+    "Έναρξη Περιεχομένου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RDB_ENTRY_TGDB_RATING,
+    "TGDB Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REBOOT,
+    "Επανεκκίνηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RECORDING_CONFIG_DIRECTORY,
+    "Recording Config"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RECORDING_OUTPUT_DIRECTORY,
+    "Recording Output"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RECORDING_SETTINGS,
+    "Εγγραφή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RECORD_CONFIG,
+    "Custom Record Config"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STREAM_CONFIG,
+    "Custom Stream Config"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RECORD_DRIVER,
+    "Οδηγός Εγγραφής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIDI_DRIVER,
+    "Οδηγός MIDI"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RECORD_ENABLE,
+    "Ενεργοποίηση Εγγραφής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RECORD_PATH,
+    "Αποθήκευση Εγγραφής Ως..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RECORD_USE_OUTPUT_DIRECTORY,
+    "Αποθήκευση Εγγραφών στο Ευρετήριο Εξαγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REMAP_FILE,
+    "Remap File"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REMAP_FILE_LOAD,
+    "Load Remap File"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_CORE,
+    "Save Core Remap File"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_CONTENT_DIR,
+    "Save Content Directory Remap File"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_GAME,
+    "Save Game Remap File"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REMAP_FILE_REMOVE_CORE,
+    "Delete Core Remap File"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REMAP_FILE_REMOVE_GAME,
+    "Delete Game Remap File"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REMAP_FILE_REMOVE_CONTENT_DIR,
+    "Delete Game Content Directory Remap File"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REQUIRED,
+    "Απαραίτητο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RESTART_CONTENT,
+    "Επανεκκίνηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH,
+    "Επανεκκίνηση RetroArch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RESUME,
+    "Συνέχιση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RESUME_CONTENT,
+    "Συνέχιση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RETROKEYBOARD,
+    "RetroKeyboard"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RETROPAD,
+    "RetroPad"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RETROPAD_WITH_ANALOG,
+    "RetroPad με Αναλογικό"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS,
+    "Επιτεύγματα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REWIND_ENABLE,
+    "Ενεργοποίηση Επιστροφής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_AFTER_TOGGLE,
+    "Εφαρμογή Μετά Την Ενεργοποίηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_AFTER_LOAD,
+    "Αυτόματη Εφαρμογή Απατών Κατά την Φόρτωση Παιχνιδιού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY,
+    "Βαθμός Λεπτομέρειας Επιστροφής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REWIND_BUFFER_SIZE,
+    "Μέγεθος Ενδιάμεσης Μνήμης Επιστροφής (MB)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REWIND_BUFFER_SIZE_STEP,
+    "Βήμα Μεγέθους Ενδιάμεσης Μνήμης Επιστροφής (MB)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS,
+    "Επιστροφή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SETTINGS,
+    "Ρυθμίσεις Απάτης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_DETAILS_SETTINGS,
+    "Λεπτομέρειες Απάτης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SEARCH_SETTINGS,
+    "Έναρξη ή Συνέχιση Αναζήτησης Απάτης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RGUI_BROWSER_DIRECTORY,
+    "Περιηγητής Αρχείων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY,
+    "Config"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN,
+    "Εμφάνιση Αρχικής Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
+    "Δεξί Αναλογικό"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ADD_TO_FAVORITES,
+    "Προσθήκη στα Αγαπημένα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ADD_TO_FAVORITES_PLAYLIST,
+    "Προσθήκη στα Αγαπημένα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RESET_CORE_ASSOCIATION,
+    "Επαναφορά Συσχέτισης Πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RUN,
+    "Εκκίνηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RUN_MUSIC,
+    "Εκκίνηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
+    "Ενεργοποίηση SAMBA"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
+    "Αρχείο Αποθήκευσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
+    "Save State Auto Index"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD,
+    "Auto Load State"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE,
+    "Auto Save State"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,
+    "Savestate"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVESTATE_THUMBNAIL_ENABLE,
+    "Savestate Thumbnails"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG,
+    "Αποθήκευση Τρέχουσας Διαμόρφωσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
+    "Save Core Overrides"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR,
+    "Save Content Directory Overrides"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
+    "Save Game Overrides"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG,
+    "Αποθήκευση Νέας Διαμόρφωσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVE_STATE,
+    "ποθήκευση Κατάστασης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS,
+    "Αποθήκευση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY,
+    "Σάρωση Ευρετηρίου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SCAN_FILE,
+    "Σάρωση αρχείου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY,
+    "<Σάρωση Αυτού Του Ευρετηρίου>"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY,
+    "Στιγμιότυπο Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION,
+    "Ανάλυση Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SEARCH,
+    "Αναζήτηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SECONDS,
+    "δευτερόλεπτα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SETTINGS,
+    "Ρυθμίσεις"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SETTINGS_TAB,
+    "Ρυθμίσεις"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHADER,
+    "Σκίαση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES,
+    "Εφαμοργή Αλλαγών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS,
+    "Σκιάσεις"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON,
+    "Κορδέλλα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED,
+    "Κορδέλλα (απλοποιημένη)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SIMPLE_SNOW,
+    "Απλό Χιόνι"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SNOW,
+    "Χιόνι"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS,
+    "Εμφάνιση Ρυθμίσεων Για Προχωρημένους"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES,
+    "Εμφάνιση Κρυφών Αρχείων και Φακέλων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHUTDOWN,
+    "Τερματισμός"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO,
+    "Slow-Motion Ratio"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RUN_AHEAD_ENABLED,
+    "Run-Ahead to Reduce Latency"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RUN_AHEAD_FRAMES,
+    "Number of Frames to Run Ahead"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RUN_AHEAD_SECONDARY_INSTANCE,
+    "RunAhead Use Second Instance"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RUN_AHEAD_HIDE_WARNINGS,
+    "RunAhead Hide Warnings"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE,
+    "Sort Saves In Folders"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE,
+    "Sort Savestates In Folders"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVESTATES_IN_CONTENT_DIR_ENABLE,
+    "Write Savestates to Content Dir"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SAVEFILES_IN_CONTENT_DIR_ENABLE,
+    "Write Saves to Content Dir"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEMFILES_IN_CONTENT_DIR_ENABLE,
+    "System Files are in Content Dir"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SCREENSHOTS_IN_CONTENT_DIR_ENABLE,
+    "Write Screenshots to Content Dir"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SSH_ENABLE,
+    "Ενεργοποίηση SSH"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_START_CORE,
+    "Έναρξη Πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
+    "Έναρξη Απομακρυσμένου RetroPad"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_START_VIDEO_PROCESSOR,
+    "Έναρξη Επεξεργαστή Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STATE_SLOT,
+    "Θέση Κατάστασης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STATUS,
+    "Κατάσταση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE,
+    "Εντολές stdin"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SUPPORTED_CORES,
+    "Προτεινόμενοι πυρήνες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE,
+    "Αναστολή Προφύλαξης Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_BGM_ENABLE,
+    "System BGM Enable"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_DIRECTORY,
+    "Σύστημα/BIOS"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION,
+    "Πληροφορίες Συστήματος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_7ZIP_SUPPORT,
+    "Υποστήριξη 7zip"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ALSA_SUPPORT,
+    "Υποστήριξη ALSA"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE,
+    "Ημερομηνία Κατασκευής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CG_SUPPORT,
+    "Υποστήριξη Cg"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COCOA_SUPPORT,
+    "Υποστήριξη Cocoa"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COMMAND_IFACE_SUPPORT,
+    "Υποστήριξη Γραμμής Εντολών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CORETEXT_SUPPORT,
+    "Υποστήριξη CoreText"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CPU_FEATURES,
+    "Χαρακτηριστικά Επεξεργαστή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_DPI,
+    "DPI Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_HEIGHT,
+    "Ύψος Οθόνης (mm)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_WIDTH,
+    "Πλάτος Οθόνης (mm)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DSOUND_SUPPORT,
+    "Υποστήριξη DirectSound"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WASAPI_SUPPORT,
+    "Υποστήριξη WASAPI"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYLIB_SUPPORT,
+    "Υποστήριξη δυναμικής βιβλιοθήκης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYNAMIC_SUPPORT,
+    "Δυναμική φόρτωση κατά την εκτέλεση της βιβλιοθήκης libretro"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_EGL_SUPPORT,
+    "Υποστήριξη EGL"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FBO_SUPPORT,
+    "Υποστήριξη OpenGL/Direct3D render-to-texture (multi-pass shaders)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FFMPEG_SUPPORT,
+    "Υποστήριξη FFmpeg"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FREETYPE_SUPPORT,
+    "Υποστήριξη FreeType"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_STB_TRUETYPE_SUPPORT,
+    "Υποστήριξη STB TrueType"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_IDENTIFIER,
+    "Αναγνωριστικό λειτουργικού συστήματος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_NAME,
+    "Όνομα λειτουργικού συστήματος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_OS,
+    "Λειτουργικό Σύστημα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION,
+    "Έκδοση Git"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GLSL_SUPPORT,
+    "Υποστήριξη GLSL"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_HLSL_SUPPORT,
+    "Υποστήριξη HLSL"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_JACK_SUPPORT,
+    "Υποστήριξη JACK"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_KMS_SUPPORT,
+    "Υποστήριξη KMS/EGL"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LAKKA_VERSION,
+    "Έκδοση Lakka"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
+    "Υποστήριξη LibretroDB"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
+    "Υποστήριξη Libusb"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
+    "Υποστήριξη ανάλυσης libxml2 XML"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
+    "Υποστήριξη Netplay (peer-to-peer)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,
+    "Υποστήριξη Γραμμής Εντολών Δικτύου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_REMOTE_SUPPORT,
+    "Υποστήριξη Χειριστηρίου Δικτύου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENAL_SUPPORT,
+    "Υποστήριξη OpenAL"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGLES_SUPPORT,
+    "Υποστήριξη OpenGL ES"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGL_SUPPORT,
+    "Υποστήριξη OpenGL"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENSL_SUPPORT,
+    "Υποστήριξη OpenSL"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENVG_SUPPORT,
+    "Υποστήριξη OpenVG"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OSS_SUPPORT,
+    "Υποστήριξη OSS"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OVERLAY_SUPPORT,
+    "Υποστήριξη Επικαλλυμάτων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE,
+    "Πηγή ρεύματος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGED,
+    "Φορτισμένο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGING,
+    "Φορτίζει"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_DISCHARGING,
+    "Ξεφορτίζει"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_NO_SOURCE,
+    "Καμία πηγή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PULSEAUDIO_SUPPORT,
+    "Υποστήριξη PulseAudio"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PYTHON_SUPPORT,
+    "Υποστήριξη Python (υποστήριξη script στις σκιάσεις)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RBMP_SUPPORT,
+    "Υποστήριξη BMP (RBMP)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RETRORATING_LEVEL,
+    "Επίπεδο RetroRating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RJPEG_SUPPORT,
+    "Υποστήριξη JPEG (RJPEG)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ROARAUDIO_SUPPORT,
+    "Υποστήριξη RoarAudio"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RPNG_SUPPORT,
+    "Υποστήριξη PNG (RPNG)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RSOUND_SUPPORT,
+    "Υποστήριξη RSound"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RTGA_SUPPORT,
+    "Υποστήριξη TGA (RTGA)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL2_SUPPORT,
+    "Υποστήριξη SDL2"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_IMAGE_SUPPORT,
+    "Υποστήριξη Εικόνων SDL"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_SUPPORT,
+    "Υποστήριξη SDL1.2"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SLANG_SUPPORT,
+    "Υποστήριξη Slang"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_THREADING_SUPPORT,
+    "Υποστήριξη Threading"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_UDEV_SUPPORT,
+    "Υποστήριξη Udev"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_V4L2_SUPPORT,
+    "Υποστήριξη Video4Linux2"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VIDEO_CONTEXT_DRIVER,
+    "Οδηγός video context"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VULKAN_SUPPORT,
+    "Υποστήριξη Vulkan"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_METAL_SUPPORT,
+    "Υποστήριξη Metal"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WAYLAND_SUPPORT,
+    "Υποστήριξη Wayland"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_X11_SUPPORT,
+    "Υποστήριξη X11"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XAUDIO2_SUPPORT,
+    "Υποστήριξη XAudio2"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XVIDEO_SUPPORT,
+    "Υποστήριξη XVideo"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ZLIB_SUPPORT,
+    "Υποστήριξη Zlib"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT,
+    "Λήψη Στιγμιότυπου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE,
+    "Threaded tasks"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_THUMBNAILS,
+    "Σκίτσα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS,
+    "Σκίτσα Αριστερά"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_VERTICAL_THUMBNAILS,
+    "Thumbnails Vertical Disposition"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_THUMBNAILS_DIRECTORY,
+    "Σκίτσα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST,
+    "Ενημερωτής Σκίτσων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_BOXARTS,
+    "Εξώφυλλα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_SCREENSHOTS,
+    "Στιγμιότυπα Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_TITLE_SCREENS,
+    "Οθόνες Τίτλων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
+    "Εμφάνιση ημερομηνίας / ώρας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE,
+    "Στυλ ημερομηνίας / ώρας"
+    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_TIMEDATE_STYLE,
+   "Αλλάζει το στυλ της τρέχουσας ημερομηνίας ή και ώρας που φαίνεται μέσα στο μενού."
+    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS,
+   "ΧΧΧΧ-ΜΜ-ΗΗ ΩΩ:ΛΛ:ΔΔ"
+    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM,
+   "ΧΧΧΧ-ΜΜ-ΗΗ ΩΩ:ΛΛ"
+    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY,
+   "ΜΜ-ΗΗ-ΧΧΧΧ ΩΩ:ΛΛ"
+    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS,
+   "ΩΩ:ΛΛ:ΔΔ"
+    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM,
+   "ΩΩ:ΛΛ"
+    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DM_HM,
+   "ΗΗ/ΜΜ ΩΩ:ΛΛ"
+    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM,
+   "ΜΜ/ΗΗ ΩΩ:ΛΛ"
+    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_AM_PM,
+   "ΩΩ:ΛΛ:ΔΔ (ΠΜ/ΜΜ)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_TITLE_COLOR,
+    "Χρώμα τίτλου μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_TRUE,
+    "Αληθές"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE,
+    "UI Companion Enable"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT,
+    "UI Companion Start On Boot"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UI_COMPANION_TOGGLE,
+    "Εμφάνιση μενού επιφάνειας εργασίας κατά την εκκίνηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DESKTOP_MENU_ENABLE,
+    "Ενεργοποίηση μενού επιφάνειας εργασίας (επανεκκίνηση)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
+    "Γραμμή Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE,
+    "Αδυναμία ανάγνωσης συμπιεσμένου αρχείου."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE,
+    "Αναίρεση Φόρτωσης Κατάστασης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UNDO_SAVE_STATE,
+    "Αναίρεση Αποθήκευσης Κατάστασης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UNKNOWN,
+    "Άγνωστο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS,
+    "Ενημερωτής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATE_ASSETS,
+    "Ενημέρωση Βασικών Στοιχείων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES,
+    "Ενημέρωση Προφίλ Joypad"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATE_CG_SHADERS,
+    "Ενημέρωση των Σκιάσεων Cg"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATE_CHEATS,
+    "Ενημέρωση Απατών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES,
+    "Ενημέρωση Αρχείων Πληροφοριών Πυρήνων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES,
+    "Ενημέρωση Βάσεων Δεδομένων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATE_GLSL_SHADERS,
+    "Ενημέρωση Σκιάσεων GLSL"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATE_LAKKA,
+    "Ενημέρωση Lakka"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS,
+    "Ενημέρωση Επικαλλυμάτων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UPDATE_SLANG_SHADERS,
+    "Ενημέρωση Σκιάσεων Slang"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_USER,
+    "Χρήστης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_KEYBOARD,
+    "Kbd"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS,
+    "Διεπαφή Χρήστη"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_USER_LANGUAGE,
+    "Γλώσσα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_USER_SETTINGS,
+    "Χρήστης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER,
+    "Χρήση Ενσωματωμένου Προβολέα Εικόνων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_USE_BUILTIN_PLAYER,
+    "Χρήση Ενσωματωμένου Αναπαραγωγέα Πολυμέσων Use Builtin Media Player"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_USE_THIS_DIRECTORY,
+    "<Χρήση αυτού του ευρετηρίου>"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE,
+    "Επίτρεψη περιστροφής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO,
+    "Διαμόρφωση Αναλογίας Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO,
+    "Αυτόματη Αναλογία Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX,
+    "Αναλογία Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION,
+    "Εισαγωγή Μαύρων Καρέ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
+    "Περικοπή Υπερσάρωσης (Επαναφόρτωση)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
+    "Disable Desktop Composition"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+    "Κάτω οθόνη 3DS"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
+    "Οδηγός Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
+    "Φίλτρο Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_DIR,
+    "Φίλτρο Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER,
+    "Flicker filter"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FONT_ENABLE,
+    "Ενεργοποίηση Ειδοποιήσεων Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FONT_PATH,
+    "Γραμματοσειρά Ειδοποιήσεων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FONT_SIZE,
+    "Μέγεθος Γραμματοσειράς"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_ASPECT,
+    "Εξαναγκασμένη αναλογία απεικόνισης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE,
+    "Εξαναγκασμένη απενεργοποίηση sRGB FBO"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY,
+    "Καθυστέρηση Καρέ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN,
+    "Έναρξη σε Κατάσταση Πλήρης Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA,
+    "Gamma Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD,
+    "Χρήση Εγγραφής Κάρτας Γραφικών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT,
+    "Ενεργοποίηση Στιγμιότυπου Οθόνης Κάρτας Γραφικών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC,
+    "Σκληρός Συγχρονισμός Κάρτας Γραφικών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES,
+    "Σκληρός Συγχρονισμός Καρέ Κάρτας Γραφικών"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES,
+    "Μέγιστες εικόνες swapchain"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X,
+    "Θέση Ειδοποιήσης X"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y,
+    "Θέση Ειδοποιήσης Y"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX,
+    "Ένδειξη Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_POST_FILTER_RECORD,
+    "Use Post Filter Recording"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE,
+    "Κάθετος Ρυθμός Ανανέωσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO,
+    "Εκτιμόμενος Ρυθμός Καρέ Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_POLLED,
+    "Ορισμός Ρυθμού Ανανέωσης Βάση Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION,
+    "Περιστροφή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE,
+    "Κλίμακα Παραθύρου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER,
+    "Ακέραια Κλίμακα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS,
+    "Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR,
+    "Σκίαση Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES,
+    "Shader Passes"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS,
+    "Shader Parameters"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET,
+    "Load Shader Preset"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS,
+    "Save Shader Preset As"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_CORE,
+    "Save Core Preset"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_PARENT,
+    "Save Content Directory Preset"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME,
+    "Save Game Preset"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT,
+    "Enable Hardware Shared Context"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH,
+    "Διγραμμικό Φιλτράρισμα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER,
+    "Ενεργοποίηση Απαλού Φίλτρου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL,
+    "Διάστημα Εναλλαγής Κάθετου Συγχρονισμόυ (Vsync)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_TAB,
+    "Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_THREADED,
+    "Threaded Video"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_VFILTER,
+    "Deflicker"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_HEIGHT,
+    "Προτιμώμενο Ύψος Αναλογίας Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
+    "Προτιμώμενο Πλάτος Αναλογίας Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X,
+    "Προτιμώμενη Θέση Άξωνα X Αναλογίας Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
+    "Προτιμώμενη Θέση Άξωνα Y Αναλογίας Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH,
+    "Ορισμός Πλάτους Οθόνης VI"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
+    "Vertical Sync (Vsync)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN,
+    "Παράθυρο Πλήρης Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_WIDTH,
+    "Πλάτος Παραθύρου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_HEIGHT,
+    "Ύψος Παραθύρου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_X,
+    "Πλάτος Πλήρης Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_Y,
+    "Ύψος Πλήρης Οθόνης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_WIFI_DRIVER,
+    "Οδηγός Wi-Fi"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
+    "Wi-Fi"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR,
+    "Menu Alpha Factor"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED,
+    "Γραμματοσειρά Μενού Κόκκινο Χρώμα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN,
+    "Γραμματοσειρά Μενού Πράσινο Χρώμα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE,
+    "Γραμματοσειρά Μενού Μπλε Χρώμα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_FONT,
+    "Γραμματοσειρά Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,
+    "Custom"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
+    "FlatUI"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
+    "Μονόχρωμο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,
+    "Μονόχρωμο Ανεστραμμένο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC,
+    "Systematic"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_NEOACTIVE,
+    "NeoActive"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL,
+    "Pixel"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE,
+    "RetroActive"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROSYSTEM,
+    "Retrosystem"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART,
+    "Dot-Art"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_AUTOMATIC,
+    "Automatic"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
+    "Χρώμα Θέματος Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
+    "Πράσινο Μήλο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
+    "Σκούρο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT,
+    "Φωτεινό"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MORNING_BLUE,
+    "Πρωινό Μπλε"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE,
+    "Σκούρο Μωβ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE,
+    "Μπλε Ηλεκτρίκ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GOLDEN,
+    "Χρυσαφί"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED,
+    "Legacy Κόκκινο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDNIGHT_BLUE,
+    "Μεσωνύκτιο Μπλε"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_PLAIN,
+    "Απλό"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_UNDERSEA,
+    "Κάτω Από Την Θάλασσα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
+    "Ηφαιστιακό Κόκκινο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE,
+    "Menu Shader Pipeline"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR,
+    "Menu Scale Factor"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE,
+    "Ενεργοποίηση Σκιών Εικονιδίων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_HISTORY,
+    "Προβολή Καρτέλας Ιστορικού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_ADD,
+    "Προβολή Καρτέλας Εισαγωγής Περιεχομένου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_PLAYLISTS,
+    "Προβολή Καρτέλας Λίστας Αναπαραγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_FAVORITES,
+    "Προβολή Καρτέλας Αγαπημένων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_IMAGES,
+    "Προβολή Καρτέλας Εικόνων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_MUSIC,
+    "Προβολή Καρτέλας Μουσικής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS,
+    "Προβολή Καρτέλας Ρυθμίσεων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_VIDEO,
+    "Προβολή Καρτέλας Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_NETPLAY,
+    "Προβολή Καρτέλας Netplay"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_LAYOUT,
+    "Διάταξη Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_THEME,
+    "Θέμα Εικόνων Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_YES,
+    "Ναι"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO,
+    "Shader Preset"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEEVOS_ENABLE,
+    "Ενεργοποίηση ή απενεργοποίηση επιτευγμάτων. Για περισσότερες πληροφορίες επισκεφθείτε http://retroachievements.org"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEEVOS_TEST_UNOFFICIAL,
+    "Enable or disable unofficial achievements and/or beta features for testing purposes."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
+    "Enable or disable savestates, cheats, rewind, pause, and slow-motion for all games."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEEVOS_LEADERBOARDS_ENABLE,
+    "Enable or disable in-game leaderboards. Has no effect if Hardcore Mode is disabled."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEEVOS_BADGES_ENABLE,
+    "Enable or disable badge display in the Achievement List."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEEVOS_VERBOSE_ENABLE,
+    "Enable or disable OSD verbosity for achievements."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEEVOS_AUTO_SCREENSHOT,
+    "Automatically take a screenshot when an achievement is triggered."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DRIVER_SETTINGS,
+    "Αλλαγή οδηγών που χρησιμοποιούνται από το σύστημα."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS,
+    "Αλλαγή ρυθμίσεων επιτευγμάτων."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_SETTINGS,
+    "Αλλαγή ρυθμίσεων πυρήνα."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RECORDING_SETTINGS,
+    "Αλλαγή ρυθμίσεων εγγραφής."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ONSCREEN_DISPLAY_SETTINGS,
+    "Αλλαγή επικάλλυψης οθόνης και επικάλλυψης πληκτρολογίου και ρυθμίσεις ειδοποιήσεων οθόνης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS,
+    "Αλλαγή ρυθμίσεων επιστροφής, γρήγορης κίνησης και αργής κίνησης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
+    "Αλλαγή ρυθμίσεων αποθήκευσης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LOGGING_SETTINGS,
+    "Αλλαγή ρυθμίσεων αρχείου καταγραφής."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS,
+    "Αλλαγή ρυθμίσεων περιβάλλοντος χρήστη."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_USER_SETTINGS,
+    "Αλλαγή ρυθμίσεων λογαριασμού, ονόματος χρήστη και γλώσσας."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS,
+    "Αλλαγή ρυθμίσεων ιδιοτηκότητας."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIDI_SETTINGS,
+    "Αλλαγή ρυθμίσεων MIDI."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS,
+    "Αλλαγή προκαθορισμένων ευρετηρίων όπου βρίσκονται τα αρχεία."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS,
+    "Αλλαγή ρυθμίσεων λιστών αναπαραγωγής."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETWORK_SETTINGS,
+    "Αλλαγή ρυθμίσεων εξυπηρετητή και δικτύου."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
+    "Σάρωση περιεχομένου και προσθήκη στην βάση δεδομένων."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
+    "Αλλαγή ρυθμίσεων εξόδου ήχου."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
+    "Ενεργοποίηση ή απενεργοποίηση bluetooth."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
+    "Αποθήκευση αλλαγών στο αρχείο διαμόρφωσης κατά την έξοδο."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
+    "Αλλαγή προκαθορισμένων ρυθμίσεων των αρχείων διαμόρφωσης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST,
+    "Διαχειρισμός και δημιουργία αρχείων διαμόρφωσης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CPU_CORES,
+    "Αριθμός πυρήνων που έχει ο επεξεργαστής."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_FPS_SHOW,
+    "Εμφανίζει τον τρέχων ρυθμό καρέ ανά δευτερόλεπτο στην οθόνη."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS,
+    "Διαμόρφωση ρυθμίσεων πλήκτρων εντολών."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
+    "Συνδιασμός κουμπιών χειριστηρίου για την εμφάνιση του μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_SETTINGS,
+    "Αλλαγή ρυθμίσεων χειριστηρίου, πληκτρολογίου και ποντικιού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_USER_BINDS,
+    "Διαμόρφωση χειρισμών για αυτόν τον χρήστη."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LATENCY_SETTINGS,
+    "Αλλαγή ρυθμίσεων συσχετιζόμενες με το βίντεο, τον ήχο και την καθυστέρηση εισαγωγής."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LOG_VERBOSITY,
+    "Ενεργοποίηση ή απενεργοποίηση αρχείων καταγραφής στο τερματικό."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY,
+    "Συμμετοχή ή δημιουργία μίας συνεδρίας netplay."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_LAN_SCAN_SETTINGS,
+    "Αναζήτηση για και σύνδεση με οικοδεσπότη netplay στο τοπικό δίκτυο."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
+    "Εμφάνιση πληροφοριών συστήματος."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
+    "Κατεβάστε πρόσθετα, στοιχεία και περιεχόμενο για το RetroArch."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
+    "Enable or disable network sharing of your folders."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
+    "Manage operating system level services."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
+    "Show hidden files/directories inside the file browser."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SSH_ENABLE,
+    "Enable or disable remote command line access."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
+    "Αποτρέπει την προφύλαξη οθόνης του συστήματος από το να ενεργοποιηθεί."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
+    "Ορισμός μεγέθους παραθύρου σε σχέση με το μέγεθος της οπτικής γωνίας του πυρήνα. Διαφορετικά, παρακάτω μπορείτε να ορίσετε το πλάτος και το ύψος του παραθύρου σε σταθερό μέγεθος."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_USER_LANGUAGE,
+    "Ορίζει την γλώσσα του περιβάλλοντος."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION,
+    "Εισάγει ένα μαύρο καρέ ανάμεσα στα καρέ. Χρήσιμο για χρήστες με οθόνες 120Hz που θέλουν να παίξουν περιεχόμενο στα 60Hz χωρίς 'φαντάσματα' στην εικόνα."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY,
+    "Μειώνει την καθυστέρηση με μεγαλύτερο κίνδυνο για κολλήματα στο βίντεο. Προσθέτει μία επιβράδυνση μετά το V-Sync (σε ms)."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES,
+    "Ορίζει πόσα καρέ μπορεί ο επεξεργαστής να βρίσκεται μπροστά από την κάρτα γραφικών όταν χρησιμοποιείται τον 'Σκληρό Συγχρονισμό Κάρτα Γραφικών'."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
+    "Tells the video driver to explicitly use a specified buffering mode."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_MONITOR_INDEX,
+    "Επιλέγει ποιά οθόνη θα χρησιμοποιηθεί."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_AUTO,
+    "Ο ακριβής εκτιμόμενος ρυθμός ανανέωσης της οθόνης σε Hz."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_POLLED,
+    "Ο ρυθμός ανανέωσης όπως αναφέρεται από τον οδηγό οθόνης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SETTINGS,
+    "Αλλαγή ρυθμίσεων εξόδου βίντεο."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_WIFI_SETTINGS,
+    "Σαρώνει για ασύρματα δίκτυα και δημιουργεί σύνδεση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_HELP_LIST,
+    "Μάθετε περισσότερα για το πως λειτουργεί το πρόγραμμα."
+    )
+MSG_HASH(
+    MSG_ADDED_TO_FAVORITES,
+    "Προστέθηκε στα αγαπημένα"
+    )
+MSG_HASH(
+    MSG_RESET_CORE_ASSOCIATION,
+    "Ο σύνδεση με πυρήνα της λίστας αναπαραγωγής έχει επαναφερθεί."
+    )
+MSG_HASH(
+    MSG_APPENDED_DISK,
+    "Appended disk"
+    )
+MSG_HASH(
+    MSG_APPLICATION_DIR,
+    "Application Dir"
+    )
+MSG_HASH(
+    MSG_APPLYING_CHEAT,
+    "Applying cheat changes."
+    )
+MSG_HASH(
+    MSG_APPLYING_SHADER,
+    "Applying shader"
+    )
+MSG_HASH(
+    MSG_AUDIO_MUTED,
+    "Ο ήχος απενεργοποιήθηκε."
+    )
+MSG_HASH(
+    MSG_AUDIO_UNMUTED,
+    "Ο ήχος ενεργοποιήθηκε."
+    )
+MSG_HASH(
+    MSG_AUTOCONFIG_FILE_ERROR_SAVING,
+    "Error saving autoconf file."
+    )
+MSG_HASH(
+    MSG_AUTOCONFIG_FILE_SAVED_SUCCESSFULLY,
+    "Autoconfig file saved successfully."
+    )
+MSG_HASH(
+    MSG_AUTOSAVE_FAILED,
+    "Could not initialize autosave."
+    )
+MSG_HASH(
+    MSG_AUTO_SAVE_STATE_TO,
+    "Auto save state to"
+    )
+MSG_HASH(
+    MSG_BLOCKING_SRAM_OVERWRITE,
+    "Blocking SRAM Overwrite"
+    )
+MSG_HASH(
+    MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT,
+    "Bringing up command interface on port"
+    )
+MSG_HASH(
+    MSG_BYTES,
+    "bytes"
+    )
+MSG_HASH(
+    MSG_CANNOT_INFER_NEW_CONFIG_PATH,
+    "Cannot infer new config path. Use current time."
+    )
+MSG_HASH(
+    MSG_CHEEVOS_HARDCORE_MODE_ENABLE,
+    "Achievements Hardcore Mode Enabled, savestate & rewind were disabled."
+    )
+MSG_HASH(
+    MSG_COMPARING_WITH_KNOWN_MAGIC_NUMBERS,
+    "Comparing with known magic numbers..."
+    )
+MSG_HASH(
+    MSG_COMPILED_AGAINST_API,
+    "Compiled against API"
+    )
+MSG_HASH(
+    MSG_CONFIG_DIRECTORY_NOT_SET,
+    "Config directory not set. Cannot save new config."
+    )
+MSG_HASH(
+    MSG_CONNECTED_TO,
+    "Συνδέθηκε με"
+    )
+MSG_HASH(
+    MSG_CONTENT_CRC32S_DIFFER,
+    "Content CRC32s differ. Cannot use different games."
+    )
+MSG_HASH(
+    MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT,
+    "Content loading skipped. Implementation will load it on its own."
+    )
+MSG_HASH(
+    MSG_CORE_DOES_NOT_SUPPORT_SAVESTATES,
+    "Core does not support save states."
+    )
+MSG_HASH(
+    MSG_CORE_OPTIONS_FILE_CREATED_SUCCESSFULLY,
+    "Core options file created successfully."
+    )
+MSG_HASH(
+    MSG_COULD_NOT_FIND_ANY_NEXT_DRIVER,
+    "Could not find any next driver"
+    )
+MSG_HASH(
+    MSG_COULD_NOT_FIND_COMPATIBLE_SYSTEM,
+    "Could not find compatible system."
+    )
+MSG_HASH(
+    MSG_COULD_NOT_FIND_VALID_DATA_TRACK,
+    "Could not find valid data track"
+    )
+MSG_HASH(
+    MSG_COULD_NOT_OPEN_DATA_TRACK,
+    "could not open data track"
+    )
+MSG_HASH(
+    MSG_COULD_NOT_READ_CONTENT_FILE,
+    "Could not read content file"
+    )
+MSG_HASH(
+    MSG_COULD_NOT_READ_MOVIE_HEADER,
+    "Could not read movie header."
+    )
+MSG_HASH(
+    MSG_COULD_NOT_READ_STATE_FROM_MOVIE,
+    "Could not read state from movie."
+    )
+MSG_HASH(
+    MSG_CRC32_CHECKSUM_MISMATCH,
+    "CRC32 checksum mismatch between content file and saved content checksum in replay file header. Replay highly likely to desync on playback."
+    )
+MSG_HASH(
+    MSG_CUSTOM_TIMING_GIVEN,
+    "Custom timing given"
+    )
+MSG_HASH(
+    MSG_DECOMPRESSION_ALREADY_IN_PROGRESS,
+    "Decompression already in progress."
+    )
+MSG_HASH(
+    MSG_DECOMPRESSION_FAILED,
+    "Decompression failed."
+    )
+MSG_HASH(
+    MSG_DETECTED_VIEWPORT_OF,
+    "Detected viewport of"
+    )
+MSG_HASH(
+    MSG_DID_NOT_FIND_A_VALID_CONTENT_PATCH,
+    "Did not find a valid content patch."
+    )
+MSG_HASH(
+    MSG_DISCONNECT_DEVICE_FROM_A_VALID_PORT,
+    "Disconnect device from a valid port."
+    )
+MSG_HASH(
+    MSG_DISK_CLOSED,
+    "Closed"
+    )
+MSG_HASH(
+    MSG_DISK_EJECTED,
+    "Ejected"
+    )
+MSG_HASH(
+    MSG_DOWNLOADING,
+    "Γίνεται λήψη"
+    )
+MSG_HASH(
+    MSG_INDEX_FILE,
+    "ευρετηρίου"
+    )
+MSG_HASH(
+    MSG_DOWNLOAD_FAILED,
+    "Η λήψη απέτυχε"
+    )
+MSG_HASH(
+    MSG_ERROR,
+    "Πρόβλημα"
+    )
+MSG_HASH(
+    MSG_ERROR_LIBRETRO_CORE_REQUIRES_CONTENT,
+    "Libretro core requires content, but nothing was provided."
+    )
+MSG_HASH(
+    MSG_ERROR_LIBRETRO_CORE_REQUIRES_SPECIAL_CONTENT,
+    "Libretro core requires special content, but none were provided."
+    )
+MSG_HASH(
+    MSG_ERROR_PARSING_ARGUMENTS,
+    "Error parsing arguments."
+    )
+MSG_HASH(
+    MSG_ERROR_SAVING_CORE_OPTIONS_FILE,
+    "Error saving core options file."
+    )
+MSG_HASH(
+    MSG_ERROR_SAVING_REMAP_FILE,
+    "Error saving remap file."
+    )
+MSG_HASH(
+    MSG_ERROR_REMOVING_REMAP_FILE,
+    "Error removing remap file."
+    )
+MSG_HASH(
+    MSG_ERROR_SAVING_SHADER_PRESET,
+    "Error saving shader preset."
+    )
+MSG_HASH(
+    MSG_EXTERNAL_APPLICATION_DIR,
+    "External Application Dir"
+    )
+MSG_HASH(
+    MSG_EXTRACTING,
+    "Γίνεται εξαγωγή"
+    )
+MSG_HASH(
+    MSG_EXTRACTING_FILE,
+    "Γίνεται εξαγωγή αρχείου"
+    )
+MSG_HASH(
+    MSG_FAILED_SAVING_CONFIG_TO,
+    "Failed saving config to"
+    )
+MSG_HASH(
+    MSG_FAILED_TO,
+    "Failed to"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_ACCEPT_INCOMING_SPECTATOR,
+    "Failed to accept incoming spectator."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_ALLOCATE_MEMORY_FOR_PATCHED_CONTENT,
+    "Failed to allocate memory for patched content..."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_APPLY_SHADER,
+    "Failed to apply shader."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_BIND_SOCKET,
+    "Failed to bind socket."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_CREATE_THE_DIRECTORY,
+    "Failed to create the directory."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE,
+    "Failed to extract content from compressed file"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_GET_NICKNAME_FROM_CLIENT,
+    "Failed to get nickname from client."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_LOAD,
+    "Failed to load"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_LOAD_CONTENT,
+    "Failed to load content"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_LOAD_MOVIE_FILE,
+    "Failed to load movie file"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_LOAD_OVERLAY,
+    "Αποτυχία φόρτωσης επικαλλύματος."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_LOAD_STATE,
+    "Failed to load state from"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_OPEN_LIBRETRO_CORE,
+    "Failed to open libretro core"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_PATCH,
+    "Failed to patch"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_RECEIVE_HEADER_FROM_CLIENT,
+    "Failed to receive header from client."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_RECEIVE_NICKNAME,
+    "Failed to receive nickname."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_RECEIVE_NICKNAME_FROM_HOST,
+    "Failed to receive nickname from host."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_RECEIVE_NICKNAME_SIZE_FROM_HOST,
+    "Failed to receive nickname size from host."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_RECEIVE_SRAM_DATA_FROM_HOST,
+    "Failed to receive SRAM data from host."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_REMOVE_DISK_FROM_TRAY,
+    "Failed to remove disk from tray."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_REMOVE_TEMPORARY_FILE,
+    "Failed to remove temporary file"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_SAVE_SRAM,
+    "Failed to save SRAM"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_SAVE_STATE_TO,
+    "Failed to save state to"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_SEND_NICKNAME,
+    "Failed to send nickname."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_SEND_NICKNAME_SIZE,
+    "Failed to send nickname size."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_SEND_NICKNAME_TO_CLIENT,
+    "Failed to send nickname to client."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_SEND_NICKNAME_TO_HOST,
+    "Failed to send nickname to host."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_SEND_SRAM_DATA_TO_CLIENT,
+    "Failed to send SRAM data to client."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_START_AUDIO_DRIVER,
+    "Failed to start audio driver. Will continue without audio."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_START_MOVIE_RECORD,
+    "Failed to start movie record."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_START_RECORDING,
+    "Failed to start recording."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_TAKE_SCREENSHOT,
+    "Failed to take screenshot."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_UNDO_LOAD_STATE,
+    "Failed to undo load state."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_UNDO_SAVE_STATE,
+    "Failed to undo save state."
+    )
+MSG_HASH(
+    MSG_FAILED_TO_UNMUTE_AUDIO,
+    "Failed to unmute audio."
+    )
+MSG_HASH(
+    MSG_FATAL_ERROR_RECEIVED_IN,
+    "Fatal error received in"
+    )
+MSG_HASH(
+    MSG_FILE_NOT_FOUND,
+    "Το αρχείο δεν βρέθηκε"
+    )
+MSG_HASH(
+    MSG_FOUND_AUTO_SAVESTATE_IN,
+    "Found auto savestate in"
+    )
+MSG_HASH(
+    MSG_FOUND_DISK_LABEL,
+    "Found disk label"
+    )
+MSG_HASH(
+    MSG_FOUND_FIRST_DATA_TRACK_ON_FILE,
+    "Found first data track on file"
+    )
+MSG_HASH(
+    MSG_FOUND_LAST_STATE_SLOT,
+    "Found last state slot"
+    )
+MSG_HASH(
+    MSG_FOUND_SHADER,
+    "Found shader"
+    )
+MSG_HASH(
+    MSG_FRAMES,
+    "Καρέ"
+    )
+MSG_HASH(
+    MSG_GAME_SPECIFIC_CORE_OPTIONS_FOUND_AT,
+    "Per-Game Options: game-specific core options found at"
+    )
+MSG_HASH(
+    MSG_GOT_INVALID_DISK_INDEX,
+    "Got invalid disk index."
+    )
+MSG_HASH(
+    MSG_GRAB_MOUSE_STATE,
+    "Grab mouse state"
+    )
+MSG_HASH(
+    MSG_GAME_FOCUS_ON,
+    "Game focus on"
+    )
+MSG_HASH(
+    MSG_GAME_FOCUS_OFF,
+    "Game focus off"
+    )
+MSG_HASH(
+    MSG_HW_RENDERED_MUST_USE_POSTSHADED_RECORDING,
+    "Libretro core is hardware rendered. Must use post-shaded recording as well."
+    )
+MSG_HASH(
+    MSG_INFLATED_CHECKSUM_DID_NOT_MATCH_CRC32,
+    "Inflated checksum did not match CRC32."
+    )
+MSG_HASH(
+    MSG_INPUT_CHEAT,
+    "Εισαγωγή Απάτης"
+    )
+MSG_HASH(
+    MSG_INPUT_CHEAT_FILENAME,
+    "Input Cheat Filename"
+    )
+MSG_HASH(
+    MSG_INPUT_PRESET_FILENAME,
+    "Input Preset Filename"
+    )
+MSG_HASH(
+    MSG_INPUT_RENAME_ENTRY,
+    "Rename Title"
+    )
+MSG_HASH(
+    MSG_INTERFACE,
+    "Αντάπτορας Δικτύου"
+    )
+MSG_HASH(
+    MSG_INTERNAL_STORAGE,
+    "Εσωτερική Μνήμη Αποθήκευσης"
+    )
+MSG_HASH(
+    MSG_REMOVABLE_STORAGE,
+    "Αφαιρούμενο Μέσο Αποθήκευσης"
+    )
+MSG_HASH(
+    MSG_INVALID_NICKNAME_SIZE,
+    "Μη έγκυρο μέγεθος ψευδώνυμου."
+    )
+MSG_HASH(
+    MSG_IN_BYTES,
+    "σε bytes"
+    )
+MSG_HASH(
+    MSG_IN_GIGABYTES,
+    "σε gigabytes"
+    )
+MSG_HASH(
+    MSG_IN_MEGABYTES,
+    "σε megabytes"
+    )
+MSG_HASH(
+    MSG_LIBRETRO_ABI_BREAK,
+    "is compiled against a different version of libretro than this libretro implementation."
+    )
+MSG_HASH(
+    MSG_LIBRETRO_FRONTEND,
+    "Frontend for libretro"
+    )
+MSG_HASH(
+    MSG_LOADED_STATE_FROM_SLOT,
+    "Loaded state from slot #%d."
+    )
+MSG_HASH(
+    MSG_LOADED_STATE_FROM_SLOT_AUTO,
+    "Loaded state from slot #-1 (auto)."
+    )
+MSG_HASH(
+    MSG_LOADING,
+    "Γίνεται φόρτωση"
+    )
+MSG_HASH(
+    MSG_FIRMWARE,
+    "One or more firmware files are missing"
+    )
+MSG_HASH(
+    MSG_LOADING_CONTENT_FILE,
+    "Loading content file"
+    )
+MSG_HASH(
+    MSG_LOADING_HISTORY_FILE,
+    "Loading history file"
+    )
+MSG_HASH(
+    MSG_LOADING_STATE,
+    "Loading state"
+    )
+MSG_HASH(
+    MSG_MEMORY,
+    "Μνήμη"
+    )
+MSG_HASH(
+    MSG_MOVIE_FILE_IS_NOT_A_VALID_BSV1_FILE,
+    "Input replay movie file is not a valid BSV1 file."
+    )
+MSG_HASH(
+    MSG_MOVIE_FORMAT_DIFFERENT_SERIALIZER_VERSION,
+    "Input replay movie format seems to have a different serializer version. Will most likely fail."
+    )
+MSG_HASH(
+    MSG_MOVIE_PLAYBACK_ENDED,
+    "Input replay movie playback ended."
+    )
+MSG_HASH(
+    MSG_MOVIE_RECORD_STOPPED,
+    "Stopping movie record."
+    )
+MSG_HASH(
+    MSG_NETPLAY_FAILED,
+    "Failed to initialize netplay."
+    )
+MSG_HASH(
+    MSG_NO_CONTENT_STARTING_DUMMY_CORE,
+    "No content, starting dummy core."
+    )
+MSG_HASH(
+    MSG_NO_SAVE_STATE_HAS_BEEN_OVERWRITTEN_YET,
+    "No save state has been overwritten yet."
+    )
+MSG_HASH(
+    MSG_NO_STATE_HAS_BEEN_LOADED_YET,
+    "No state has been loaded yet."
+    )
+MSG_HASH(
+    MSG_OVERRIDES_ERROR_SAVING,
+    "Error saving overrides."
+    )
+MSG_HASH(
+    MSG_OVERRIDES_SAVED_SUCCESSFULLY,
+    "Overrides saved successfully."
+    )
+MSG_HASH(
+    MSG_PAUSED,
+    "Παύση."
+    )
+MSG_HASH(
+    MSG_PROGRAM,
+    "RetroArch"
+    )
+MSG_HASH(
+    MSG_READING_FIRST_DATA_TRACK,
+    "Reading first data track..."
+    )
+MSG_HASH(
+    MSG_RECEIVED,
+    "ελήφθη"
+    )
+MSG_HASH(
+    MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
+    "Recording terminated due to resize."
+    )
+MSG_HASH(
+    MSG_RECORDING_TO,
+    "Εγγραφή σε"
+    )
+MSG_HASH(
+    MSG_REDIRECTING_CHEATFILE_TO,
+    "Redirecting cheat file to"
+    )
+MSG_HASH(
+    MSG_REDIRECTING_SAVEFILE_TO,
+    "Redirecting save file to"
+    )
+MSG_HASH(
+    MSG_REDIRECTING_SAVESTATE_TO,
+    "Redirecting savestate to"
+    )
+MSG_HASH(
+    MSG_REMAP_FILE_SAVED_SUCCESSFULLY,
+    "Remap file saved successfully."
+    )
+MSG_HASH(
+    MSG_REMAP_FILE_REMOVED_SUCCESSFULLY,
+    "Remap file removed successfully."
+    )
+MSG_HASH(
+    MSG_REMOVED_DISK_FROM_TRAY,
+    "Removed disk from tray."
+    )
+MSG_HASH(
+    MSG_REMOVING_TEMPORARY_CONTENT_FILE,
+    "Removing temporary content file"
+    )
+MSG_HASH(
+    MSG_RESET,
+    "Reset"
+    )
+MSG_HASH(
+    MSG_RESTARTING_RECORDING_DUE_TO_DRIVER_REINIT,
+    "Restarting recording due to driver reinit."
+    )
+MSG_HASH(
+    MSG_RESTORED_OLD_SAVE_STATE,
+    "Restored old save state."
+    )
+MSG_HASH(
+    MSG_RESTORING_DEFAULT_SHADER_PRESET_TO,
+    "Shaders: restoring default shader preset to"
+    )
+MSG_HASH(
+    MSG_REVERTING_SAVEFILE_DIRECTORY_TO,
+    "Reverting savefile directory to"
+    )
+MSG_HASH(
+    MSG_REVERTING_SAVESTATE_DIRECTORY_TO,
+    "Reverting savestate directory to"
+    )
+MSG_HASH(
+    MSG_REWINDING,
+    "Rewinding."
+    )
+MSG_HASH(
+    MSG_REWIND_INIT,
+    "Initializing rewind buffer with size"
+    )
+MSG_HASH(
+    MSG_REWIND_INIT_FAILED,
+    "Failed to initialize rewind buffer. Rewinding will be disabled."
+    )
+MSG_HASH(
+    MSG_REWIND_INIT_FAILED_THREADED_AUDIO,
+    "Implementation uses threaded audio. Cannot use rewind."
+    )
+MSG_HASH(
+    MSG_REWIND_REACHED_END,
+    "Reached end of rewind buffer."
+    )
+MSG_HASH(
+    MSG_SAVED_NEW_CONFIG_TO,
+    "Saved new config to"
+    )
+MSG_HASH(
+    MSG_SAVED_STATE_TO_SLOT,
+    "Saved state to slot #%d."
+    )
+MSG_HASH(
+    MSG_SAVED_STATE_TO_SLOT_AUTO,
+    "Saved state to slot #-1 (auto)."
+    )
+MSG_HASH(
+    MSG_SAVED_SUCCESSFULLY_TO,
+    "Saved successfully to"
+    )
+MSG_HASH(
+    MSG_SAVING_RAM_TYPE,
+    "Saving RAM type"
+    )
+MSG_HASH(
+    MSG_SAVING_STATE,
+    "Saving state"
+    )
+MSG_HASH(
+    MSG_SCANNING,
+    "Σάρωση"
+    )
+MSG_HASH(
+    MSG_SCANNING_OF_DIRECTORY_FINISHED,
+    "Η σάρωση του ευρετηρίου ολοκληρώθηκε"
+    )
+MSG_HASH(
+    MSG_SENDING_COMMAND,
+    "Αποστολή εντολής"
+    )
+MSG_HASH(
+    MSG_SEVERAL_PATCHES_ARE_EXPLICITLY_DEFINED,
+    "Several patches are explicitly defined, ignoring all..."
+    )
+MSG_HASH(
+    MSG_SHADER,
+    "Σκίαση"
+    )
+MSG_HASH(
+    MSG_SHADER_PRESET_SAVED_SUCCESSFULLY,
+    "Shader preset saved successfully."
+    )
+MSG_HASH(
+    MSG_SKIPPING_SRAM_LOAD,
+    "Skipping SRAM load."
+    )
+MSG_HASH(
+    MSG_SLOW_MOTION,
+    "Αργή κίνηση."
+    )
+MSG_HASH(
+    MSG_FAST_FORWARD,
+    "Γρήγορη κίνηση."
+    )
+MSG_HASH(
+    MSG_SLOW_MOTION_REWIND,
+    "Slow motion rewind."
+    )
+MSG_HASH(
+    MSG_SRAM_WILL_NOT_BE_SAVED,
+    "SRAM will not be saved."
+    )
+MSG_HASH(
+    MSG_STARTING_MOVIE_PLAYBACK,
+    "Starting movie playback."
+    )
+MSG_HASH(
+    MSG_STARTING_MOVIE_RECORD_TO,
+    "Starting movie record to"
+    )
+MSG_HASH(
+    MSG_STATE_SIZE,
+    "State size"
+    )
+MSG_HASH(
+    MSG_STATE_SLOT,
+    "State slot"
+    )
+MSG_HASH(
+    MSG_TAKING_SCREENSHOT,
+    "Taking screenshot."
+    )
+MSG_HASH(
+    MSG_TO,
+    "to"
+    )
+MSG_HASH(
+    MSG_UNDID_LOAD_STATE,
+    "Undid load state."
+    )
+MSG_HASH(
+    MSG_UNDOING_SAVE_STATE,
+    "Undoing save state"
+    )
+MSG_HASH(
+    MSG_UNKNOWN,
+    "Άγνωστο"
+    )
+MSG_HASH(
+    MSG_UNPAUSED,
+    "Unpaused."
+    )
+MSG_HASH(
+    MSG_UNRECOGNIZED_COMMAND,
+    "Unrecognized command"
+    )
+MSG_HASH(
+    MSG_USING_CORE_NAME_FOR_NEW_CONFIG,
+    "Using core name for new config."
+    )
+MSG_HASH(
+    MSG_USING_LIBRETRO_DUMMY_CORE_RECORDING_SKIPPED,
+    "Using libretro dummy core. Skipping recording."
+    )
+MSG_HASH(
+    MSG_VALUE_CONNECT_DEVICE_FROM_A_VALID_PORT,
+    "Connect device from a valid port."
+    )
+MSG_HASH(
+    MSG_VALUE_DISCONNECTING_DEVICE_FROM_PORT,
+    "Disconnecting device from port"
+    )
+MSG_HASH(
+    MSG_VALUE_REBOOTING,
+    "Επανεκκίνηση..."
+    )
+MSG_HASH(
+    MSG_VALUE_SHUTTING_DOWN,
+    "Τερματισμός λειτουργίας..."
+    )
+MSG_HASH(
+    MSG_VERSION_OF_LIBRETRO_API,
+    "Έκδοση του libretro API"
+    )
+MSG_HASH(
+    MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
+    "Viewport size calculation failed! Will continue using raw data. This will probably not work right ..."
+    )
+MSG_HASH(
+    MSG_VIRTUAL_DISK_TRAY,
+    "virtual disk tray."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_LATENCY,
+    "Επιθυμητή καθυστέρηση ήχου σε milliseconds. Ίσως να μην τηρηθεί εάν ο οδηγός ήχου δεν μπορεί να παρέχει την επιλεγμένη καθυστέρηση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_MUTE,
+    "Σίγαση/κατάργηση σίγασης ήχου."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_RATE_CONTROL_DELTA,
+    "Helps smooth out imperfections in timing when synchronizing audio and video. Be aware that if disabled, proper synchronization is nearly impossible to obtain."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CAMERA_ALLOW,
+    "Allow or disallow camera access by cores."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LOCATION_ALLOW,
+    "Allow or disallow location services access by cores."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_MAX_USERS,
+    "Μέγιστος αριθμός χρηστών που υποστηρίζεται από το RetroArch."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_POLL_TYPE_BEHAVIOR,
+    "Επιρροή του πως γίνεται η συγκέντρωση εισόδου μέσα στο RetroArch. Ο ορισμός σε 'Νωρίς' ή 'Αργά' μπορεί να έχει ως αποτέλεσμα μικρότερη καθυστέρηση με τις ρυθμίσεις σας."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_ALL_USERS_CONTROL_MENU,
+    "Επιτρέπει σε οποιονδήποτε χρήστη να χειριστεί το μενού. Εάν απενεργοποιηθεί, μόνο ο Χρήστης 1 μπορεί να χειριστει το μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_VOLUME,
+    "Ένταση ήχου (σε dB). Το 0 είναι η φυσιολογική ένταση και δεν εφαρμόζεται gain."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_WASAPI_EXCLUSIVE_MODE,
+    "Allow the WASAPI driver to take exclusive control of the audio device. If disabled, it will use shared mode instead."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_WASAPI_FLOAT_FORMAT,
+    "Use float format for the WASAPI driver, if supported by your audio device."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_WASAPI_SH_BUFFER_LENGTH,
+    "The intermediate buffer length (in frames) when using the WASAPI driver in shared mode."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_SYNC,
+    "Συγχρονισμός ήχου. Προτείνεται."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_AXIS_THRESHOLD,
+    "Πόσο μακριά ένας άξωνας πρέπει να γείρει ώστε να οδηγήσει σε πάτημα κουμπιού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_BIND_TIMEOUT,
+    "Χρόνος αναμονής σε δευτερόλεπτα μέχρι την συνέχιση στην επόμενη σύνδεση πλήκτρων."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_BIND_HOLD,
+    "Δευτερόλεπτα τα οποία χρειάζεται να κρατήσετε πατημένο κάποιο κουμπί μέχρι την σύνδεση του."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_TURBO_PERIOD,
+    "Describes the period when turbo-enabled buttons are toggled. Numbers are described in frames."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_DUTY_CYCLE,
+    "Describes how long the period of a turbo-enabled button should be. Numbers are described in frames."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_VSYNC,
+    "Συγχρονίζει την έξοδο βίντεο της κάρτας γραφικών με τον ρυθμό ανανέωσης της οθόνης. Προτείνεται."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_ALLOW_ROTATE,
+    "Allow cores to set rotation. When disabled, rotation requests are ignored. Useful for setups where one manually rotates the screen."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DUMMY_ON_CORE_SHUTDOWN,
+    "Some cores might have a shutdown feature. If enabled, it will prevent the core from shutting RetroArch down. Instead, it loads a dummy core."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHECK_FOR_MISSING_FIRMWARE,
+    "Check if all the required firmware is present before attempting to load content."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE,
+    "Ο κάθετος ρυθμός ανανέωσης της οθόνης. Χρησιμοποιείται για τον υπολογισμό του κατάλληλου ρυθμού εισαγωγής ήχου.\n"
+    "ΣΗΜΕΙΩΣΗ: Αυτή η επιλογή αγνοείται εάν έχετε ενεργοποιήσει το 'Threaded Video'."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_ENABLE,
+    "Ενεργοποίηση εξόδου ήχου."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_MAX_TIMING_SKEW,
+    "The maximum change in audio input rate. Increasing this enables very large changes in timing at the cost of an inaccurate audio pitch (e.g., running PAL cores on NTSC displays)."
+    )
+MSG_HASH(
+    MSG_FAILED,
+    "failed"
+    )
+MSG_HASH(
+    MSG_SUCCEEDED,
+    "succeeded"
+    )
+MSG_HASH(
+    MSG_DEVICE_NOT_CONFIGURED,
+    "not configured"
+    )
+MSG_HASH(
+    MSG_DEVICE_NOT_CONFIGURED_FALLBACK,
+    "not configured, using fallback"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST,
+    "Database Cursor List"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_DEVELOPER,
+    "Database - Filter : Developer"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_PUBLISHER,
+    "Database - Filter : Publisher"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISABLED,
+    "Disabled"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ENABLED,
+    "Enabled"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_PATH,
+    "Content History Path"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_ORIGIN,
+    "Database - Filter : Origin"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_FRANCHISE,
+    "Database - Filter : Franchise"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_ESRB_RATING,
+    "Database - Filter : ESRB Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_ELSPA_RATING,
+    "Database - Filter : ELSPA Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_PEGI_RATING,
+    "Database - Filter : PEGI Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_CERO_RATING,
+    "Database - Filter : CERO Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_BBFC_RATING,
+    "Database - Filter : BBFC Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_MAX_USERS,
+    "Database - Filter : Max Users"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_RELEASEDATE_BY_MONTH,
+    "Database - Filter : Releasedate By Month"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_RELEASEDATE_BY_YEAR,
+    "Database - Filter : Releasedate By Year"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_EDGE_MAGAZINE_ISSUE,
+    "Database - Filter : Edge Magazine Issue"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_EDGE_MAGAZINE_RATING,
+    "Database - Filter : Edge Magazine Rating"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DATABASE_CURSOR_LIST_ENTRY_DATABASE_INFO,
+    "Πληροφορίες Βάσης Δεδομένων"
+    )
+MSG_HASH(
+    MSG_WIFI_SCAN_COMPLETE,
+    "Η σάρωση του Wi-Fi ολοκληρώθηκε."
+    )
+MSG_HASH(
+    MSG_SCANNING_WIRELESS_NETWORKS,
+    "Σάρωση ασύρματων δικτύων..."
+    )
+MSG_HASH(
+    MSG_NETPLAY_LAN_SCAN_COMPLETE,
+    "Οκληρώθηκε η σάρωση Netplay."
+    )
+MSG_HASH(
+    MSG_NETPLAY_LAN_SCANNING,
+    "Σάρωση για οικοδεσπότες netplay..."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE,
+    "Παύση παιχνιδιού όταν το RetroArch δεν είναι το ενεργό παράθυρο."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION,
+    "Enable or disable composition."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE,
+    "Ενεργοποίηση ή απενεργοποίηση λίστας πρόσφατων για παιχνίδια, εικόνες, μουσική και βίντεο."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE,
+    "Περιορισμός καταχωρήσεων στην λίστα πρόσφατων για παιχνίδια, εικόνες, μουσική και βίντεο."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS,
+    "Ενοποιημένος Χειρισμός Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS,
+    "Χρήση του ίδιου χειρισμού για το μενού και το παιχνίδι. Εφαρμόζεται στο πληκτρολόγιο."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_FONT_ENABLE,
+    "Εμφάνιση μηνυμάτων οθόνης."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETWORK_USER_REMOTE_ENABLE,
+    "User %d Remote Enable"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BATTERY_LEVEL_ENABLE,
+    "Εμφάνιση επιπέδου μπαταρίας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SELECT_FILE,
+    "Επιλογή Αρχείου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SELECT_FROM_COLLECTION,
+    "Επιλογή Από Συλλογή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FILTER,
+    "Φίλτρα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SCALE,
+    "Κλίμακα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_START_WHEN_LOADED,
+    "Netplay will start when content is loaded."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_LOAD_CONTENT_MANUALLY,
+    "Couldn't find a suitable core or content file, load manually."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BROWSE_URL_LIST,
+    "Browse URL"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BROWSE_URL,
+    "URL Path"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BROWSE_START,
+    "Έναρξη"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
+    "Bokeh"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SNOWFLAKE,
+    "Χιονονιφάδα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_REFRESH_ROOMS,
+    "Ανανέωση Λίστας Δωματίων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME,
+    "Ψευδώνυμο: %s"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME_LAN,
+    "Ψευδώνυμο (lan): %s"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND,
+    "Βρέθηκε συμβατό περιεχόμενο"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_CROP_OVERSCAN,
+    "Αφαιρεί μερικά pixel γύρω από την εικόνα όπου εθιμικά οι προγραμματιστές άφηναν κενά ή και που περιέχουν άχρηστα pixel."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SMOOTH,
+    "Προσθέτει μία μικρή θολούρα στην εικόνα ώστε να αφαιρέσει τις σκληρές γωνίες των pixel. Αυτή η επιλογή έχει πολύ μικρή επιρροή στην επίδοση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_FILTER,
+    "Εφαρμόστε ένα φίλτρο βίντεο που λειτουργεί με τον επεξεργαστή.\n"
+    "ΣΗΜΕΙΩΣΗ: Μπορεί να έχει μεγάλο κόστος στην επίδοση. Μερικά φίλτρα βίντεο μπορεί να δουλεύουν μόνο με πυρήνες που χρησιμοποιούν 32bit ή 16bit χρώμα."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEEVOS_USERNAME,
+    "Εισάγεται το όνομα χρήστη του λογαριασμού σας στο RetroAchievements."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEEVOS_PASSWORD,
+    "Εισάγεται τον κωδικό πρόσβασης του λογαριασμού σας στο RetroAchievements."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_NICKNAME,
+    "Εισάγεται το όνομα χρήστη σας εδώ. Αυτό θα χρησιμοποιηθεί για συνεδρίες netplay ανάμεσα σε άλλα πράγματα."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_POST_FILTER_RECORD,
+    "Capture the image after filters (but not shaders) are applied. Your video will look as fancy as what you see on your screen."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_LIST,
+    "Επιλέξτε ποιον πυρήνα θα χρησιμοποιήστε."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LOAD_CONTENT_LIST,
+    "Επιλέξτε ποιο περιεχόμενο θα ξεκινήσετε."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETWORK_INFORMATION,
+    "Εμφάνιση ανταπτόρων δικτύου και τις συσχετιζόμενες διευθύνσεις IP."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SYSTEM_INFORMATION,
+    "Εμφάνιση πληροφοριών για την συγκεκριμένη συσκευή."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUIT_RETROARCH,
+    "Έξοδος από το πρόγραμμα."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH,
+    "Ορίστε το προτιμώμενο πλάτος του παραθύρου απεικόνισης. Αφήνοντας το στο 0 θα επιχειρηθεί η κλίμακα του παραθύρου να είναι όσο το δυνατόν μεγαλύτερη."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT,
+    "Ορίστε το προτιμώμενο ύψος του παραθύρου απεικόνισης. Αφήνοντας το στο 0 θα επιχειρηθεί η κλίμακα του παραθύρου να είναι όσο το δυνατόν μεγαλύτερη."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_X,
+    "Set the custom width size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_Y,
+    "Set the custom height size for the non-windowed fullscreen mode. Leaving it at 0 will use the desktop resolution"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X,
+    "Specify custom X axis position for onscreen text."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_Y,
+    "Specify custom Y axis position for onscreen text."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_FONT_SIZE,
+    "Specify the font size in points."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_OVERLAY_HIDE_IN_MENU,
+    "Απόκρυψη του επικαλλύματος μέσα στο μενού και εμφάνιση του ξανά με την έξοδο από το μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS,
+    "Εμφάνιση εισαγωγών πληκτρολογίου/χειριστηρίου στο επικάλλυμα οθόνης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_OVERLAY_SHOW_PHYSICAL_INPUTS_PORT,
+    "Επιλογή της θύρας για όταν είναι ενεργοποιημένη η επιλογή 'Εμφάνιση Εισαγωγών Στην Οθόνη'"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_COLLECTION_LIST,
+    "Το σαρωμένο περιεχόμενο θα εμφανίζεται εδώ."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SCALE_INTEGER,
+    "Αλλαγή κλίμακας βίντεο σε ακέραια βήματα. Το βασικό μέγεθος εξαρτάται από την γεωμετρία και την κλίμακα οθόνης του συστήματος. Εάν η 'Εξαναγκασμένη Κλίμακα' δεν έχει οριστεί, οι άξωνες X/Y θα αλλάζουν κλίμακα ξεχωριστά."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_GPU_SCREENSHOT,
+    "Screenshots output of GPU shaded material if available."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_ROTATION,
+    "Forces a certain rotation of the screen. The rotation is added to rotations which the core sets."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_FORCE_SRGB_DISABLE,
+    "Forcibly disable sRGB FBO support. Some Intel OpenGL drivers on Windows have video problems with sRGB FBO support if this is enabled. Enabling this can work around it."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN,
+    "Έναρξη σε πλήρη οθόνη. Μπορεί να αλλάξει κατά την εκτέλεση. Μπορεί να παρακαμπτεί από έναν διακόπτη γραμμής τερματικού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_WINDOWED_FULLSCREEN,
+    "Εάν χρησιμοποιηθεί πλήρης οθόνη προτιμήστε την κατάσταση παραθύρου πλήρης οθόνης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_GPU_RECORD,
+    "Records output of GPU shaded material if available."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVESTATE_AUTO_INDEX,
+    "When making a savestate, save state index is automatically increased before it is saved. When loading content, the index will be set to the highest existing index."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_BLOCK_SRAM_OVERWRITE,
+    "Block Save RAM from being overwritten when loading save states. Might potentially lead to buggy games."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_FASTFORWARD_RATIO,
+    "The maximum rate at which content will be run when using fast forward (e.g., 5.0x for 60 fps content = 300 fps cap). If set to 0.0x, fastforward ratio is unlimited (no FPS cap)."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SLOWMOTION_RATIO,
+    "When in slow motion, content will slow down by the factor specified/set."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RUN_AHEAD_ENABLED,
+    "Run core logic one or more frames ahead then load the state back to reduce perceived input lag."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RUN_AHEAD_FRAMES,
+    "The number of frames to run ahead. Causes gameplay issues such as jitter if you exceed the number of lag frames internal to the game."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RUN_AHEAD_SECONDARY_INSTANCE,
+    "Use a second instance of the RetroArch core to run ahead. Prevents audio problems due to loading state."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RUN_AHEAD_HIDE_WARNINGS,
+    "Hides the warning message that appears when using RunAhead and the core does not support savestates."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_REWIND_ENABLE,
+    "Ενεργοποίηση επιστροφής. Η επίδοση θα πέσει κατά το παιχνίδι."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_APPLY_AFTER_TOGGLE,
+    "Apply cheat immediately after toggling."
+)
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_APPLY_AFTER_LOAD,
+    "Auto-apply cheats when game loads."
+)
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_REPEAT_COUNT,
+    "The number of times the cheat will be applied.  Use with the other two Iteration options to affect large areas of memory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_ADDRESS,
+    "After each 'Number of Iterations' the Memory Address will be increased by this number times the 'Memory Search Size'."
+)
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_VALUE,
+    "After each 'Number of Iterations' the Value will be increased by this amount."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_REWIND_GRANULARITY,
+    "When rewinding a defined number of frames, you can rewind several frames at a time, increasing the rewind speed."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_REWIND_BUFFER_SIZE,
+    "The amount of memory (in MB) to reserve for the rewind buffer.  Increasing this will increase the amount of rewind history."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_REWIND_BUFFER_SIZE_STEP,
+    "Each time you increase or decrease the rewind buffer size value via this UI it will change by this amount"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_IDX,
+    "Index position in list."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_ADDRESS_BIT_POSITION,
+    "Address bitmask when Memory Search Size < 8-bit."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_MATCH_IDX,
+    "Select the match to view."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_START_OR_CONT,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_START_OR_RESTART,
+    "Αριστερά/Δεξιά για αλλαγή μεγέθους bit"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_SEARCH_EXACT,
+    "Αριστερά/Δεξιά για αλλαγή τιμής"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_SEARCH_LT,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_SEARCH_GT,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_SEARCH_LTE,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_SEARCH_GTE,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_SEARCH_EQ,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_SEARCH_NEQ,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_SEARCH_EQPLUS,
+    "Αριστερά/Δεξιά για αλλαγή τιμής"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_SEARCH_EQMINUS,
+    "Αριστερά/Δεξιά για αλλαγή τιμής"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_ADD_MATCHES,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_VIEW_MATCHES,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_CREATE_OPTION,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_DELETE_OPTION,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_ADD_NEW_TOP,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_ADD_NEW_BOTTOM,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_DELETE_ALL,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_RELOAD_CHEATS,
+    ""
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_BIG_ENDIAN,
+    "Big endian  : 258 = 0x0102,\n"
+    "Little endian : 258 = 0x0201"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LIBRETRO_LOG_LEVEL,
+    "Sets log level for cores. If a log level issued by a core is below this value, it is ignored."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_PERFCNT_ENABLE,
+    "Enable performance counters for RetroArch (and cores)."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVESTATE_AUTO_SAVE,
+    "Automatically makes a savestate at the end of RetroArch's runtime. RetroArch will automatically load this savestate if 'Auto Load State' is enabled."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVESTATE_AUTO_LOAD,
+    "Automatically load the auto save state on startup."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVESTATE_THUMBNAIL_ENABLE,
+    "Show thumbnails of save states inside the menu."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUTOSAVE_INTERVAL,
+    "Autosaves the non-volatile Save RAM at a regular interval. This is disabled by default unless set otherwise. The interval is measured in seconds. A value of 0 disables autosave."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_REMAP_BINDS_ENABLE,
+    "If enabled, overrides the input binds with the remapped binds set for the current core."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_AUTODETECT_ENABLE,
+    "Enable input auto-detection. Will attempt to autoconfigure joypads, Plug-and-Play style."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_INPUT_SWAP_OK_CANCEL,
+    "Εναλλαγή πλήτρκων για Επιβεβαίωση/Ακύρωση. Απενεργοποιημένο είναι ο Ιαπωνικός προσανατολισμός, ενεργοποιημένος είναι ο δυτικός προσανατολισμός."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_PAUSE_LIBRETRO,
+    "Εάν απενεργοποιηθεί το περιεχόμενο θα συνεχίσει να τρέχει στο παρασκήνιο όταν το μενού του RetroArch είναι ανοικτό."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_DRIVER,
+    "Οδηγός βίντεο προς χρήση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_DRIVER,
+    "Οδηγός ήχου προς χρήση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_DRIVER,
+    "Οδηγός Εισόδου προς χρήση. Ανάλογα με τον οδηγό βίντεο, ίσως αλλάξει αναγκαστικά ο οδηγός εισαγωγής."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_JOYPAD_DRIVER,
+    "Οδηγός Joypad προς χρήση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_RESAMPLER_DRIVER,
+    "Οδηγός Επαναδειγματολήπτη Ήχου προς χρήση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CAMERA_DRIVER,
+    "Οδηγός Κάμερας προς χρήση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LOCATION_DRIVER,
+    "Οδηγός Τοποθεσίας προς χρήση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_DRIVER,
+    "Οδηγός Μενού προς χρήση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RECORD_DRIVER,
+    "Οδηγός Εγγραφής προς χρήση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIDI_DRIVER,
+    "Οδηγός MIDI προς χρήση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_WIFI_DRIVER,
+    "Οδηγός Wi-Fi προς χρήση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
+    "Filter files being shown in filebrowser by supported extensions."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_WALLPAPER,
+    "Select an image to set as menu wallpaper."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DYNAMIC_WALLPAPER,
+    "Dynamically load a new wallpaper depending on context."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_DEVICE,
+    "Παράκαμψη της προκαθορισμένης συσκευής ήχου που χρησιμοποιεί ο οδηγός ήχου. Αυτή η επιλογή εξαρτάται από τον οδηγό."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_DSP_PLUGIN,
+    "Πρόσθετο ήχου DSP που επεξεργάζεται τον ήχο πριν αποσταλεί στον οδηγό."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_OUTPUT_RATE,
+    "Audio output sample rate."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OVERLAY_OPACITY,
+    "Διαφάνεια όλων των στοιχείων του επικαλλύματος."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OVERLAY_SCALE,
+    "Κλίμακα όλων των στοιχείων του επικαλλύματος."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_OVERLAY_ENABLE,
+    "Ενεργοποίηση του επικαλλύματος."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OVERLAY_PRESET,
+    "Επιλογή ενός επικαλλύματος από τον περιηγητή αρχείων."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_IP_ADDRESS,
+    "The address of the host to connect to."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_TCP_UDP_PORT,
+    "The port of the host IP address. Can be either a TCP or UDP port."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_PASSWORD,
+    "The password for connecting to the netplay host. Used only in host mode."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_PUBLIC_ANNOUNCE,
+    "Whether to announce netplay games publicly. If unset, clients must manually connect rather than using the public lobby."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_SPECTATE_PASSWORD,
+    "The password for connecting to the netplay host with only spectator privileges. Used only in host mode."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_START_AS_SPECTATOR,
+    "Whether to start netplay in spectator mode."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_ALLOW_SLAVES,
+    "Whether to allow connections in slave mode. Slave-mode clients require very little processing power on either side, but will suffer significantly from network latency."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_REQUIRE_SLAVES,
+    "Whether to disallow connections not in slave mode. Not recommended except for very fast networks with very weak machines."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_STATELESS_MODE,
+    "Whether to run netplay in a mode not requiring save states. If set to true, a very fast network is required, but no rewinding is performed, so there will be no netplay jitter."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_CHECK_FRAMES,
+    "The frequency in frames with which netplay will verify that the host and client are in sync."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_NAT_TRAVERSAL,
+    "When hosting, attempt to listen for connections from the public Internet, using UPnP or similar technologies to escape LANs."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_STDIN_CMD_ENABLE,
+    "Enable stdin command interface."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MOUSE_ENABLE,
+    "Enable mouse controls inside the menu."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_POINTER_ENABLE,
+    "Enable touch controls inside the menu."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_THUMBNAILS,
+    "Type of thumbnail to display."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LEFT_THUMBNAILS,
+    "Type of thumbnail to display at the left."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_XMB_VERTICAL_THUMBNAILS,
+    "Display the left thumbnail under the right one, on the right side of the screen."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_TIMEDATE_ENABLE,
+    "Εμφάνιση τρέχουσας ημερομηνίας ή και ώρας μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_BATTERY_LEVEL_ENABLE,
+    "Εμφάνιση τρέχουσας μπαταρίας μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NAVIGATION_WRAPAROUND,
+    "Wrap-around to beginning and/or end if boundary of list is reached horizontally or vertically."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_ENABLE_HOST,
+    "Ενεργοποιεί το netplay ως οικοδεσπότης (εξυπηρετητής)."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_ENABLE_CLIENT,
+    "Ενεργοποιεί το netplay ως πελάτης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_DISCONNECT,
+    "Αποσυνδέει μία ενεργή σύνδεση Netplay."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SCAN_DIRECTORY,
+    "Σαρώνει ένα ευρετήριο για συμβατά αρχεία και τα προσθέτει στην συλλογή."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SCAN_FILE,
+    "Σαρώνει ένα συμβατό αρχείο και το προσθέτει στην συλλογή."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SWAP_INTERVAL,
+    "Χρησιμοποιεί ένα προτιμώμενο διάστημα αλλαγής για το Vsync. Ορίστε αυτό ώστε να μειώσεται στο μισό τον ρυθμό ανανέωσης της οθόνης αποτελεσματικά."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE,
+    "Sort save files in folders named after the core used."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE,
+    "Sort save states in folders named after the core used."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_REQUEST_DEVICE_I,
+    "Request to play with the given input device."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL,
+    "URL to core updater directory on the Libretro buildbot."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_BUILDBOT_ASSETS_URL,
+    "URL to assets updater directory on the Libretro buildbot."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE,
+    "After downloading, automatically extract files contained in the downloaded archives."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_REFRESH_ROOMS,
+    "Σάρωση για νέα δωμάτια."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DELETE_ENTRY,
+    "Κατάργηση αυτής της καταχώρησης από την συλλογή."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INFORMATION,
+    "View more information about the content."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ADD_TO_FAVORITES,
+    "Προσθήκη καταχώρησης στα αγαπημένα."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ADD_TO_FAVORITES_PLAYLIST,
+    "Προσθήκη καταχώρησης στα αγαπημένα."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RUN,
+    "Έναρξη περιεχομένου."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_FILE_BROWSER_SETTINGS,
+    "Προσαρμογή ρυθμίσεων εξερευνητή αρχείου."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUTO_REMAPS_ENABLE,
+    "Enable customized controls by default at startup."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUTO_OVERRIDES_ENABLE,
+    "Enable customized configuration by default at startup."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_GAME_SPECIFIC_OPTIONS,
+    "Enable customized core options by default at startup."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_ENABLE,
+    "Εμφανίζει το όνομα του τρέχων πυρήνα μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DATABASE_MANAGER,
+    "Προβολή βάσεων δεδομένων."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CURSOR_MANAGER,
+    "Προβολή προηγούμενων αναζητήσεων."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_TAKE_SCREENSHOT,
+    "Καταγράφει μία εικόνα της οθόνης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CLOSE_CONTENT,
+    "Κλείνει το τρέχον περιεχόμενο. Οποιεσδήποτε μη αποθηκευμένες αλλαγές μπορεί να χαθούν."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LOAD_STATE,
+    "Φόρτωση μίας κατάστασης από την τρέχουσα θέση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVE_STATE,
+    "Αποθήκευση μίας κατάστασης στην τρέχουσα θέση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RESUME,
+    "Συνέχιση εκτέλεσης του τρέχοντος περιεχομένου και έξοδος από το Γρήγορο Μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RESUME_CONTENT,
+    "Συνέχιση εκτέλεσης του τρέχοντος περιεχομένου και έξοδος από το Γρήγορο Μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_STATE_SLOT,
+    "Αλλάζει την τρέχουσα επιλεγμένη θέση κατάστασης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_UNDO_LOAD_STATE,
+    "Εάν μία κατάσταση φορτώθηκε, το περιεχόμενο θα επιστρέψει στην κατάσταση πριν την φόρτωση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_UNDO_SAVE_STATE,
+    "Εάν μία κατάσταση αντικαταστάθηκε, το περιεχόμενο θα επιστρέψει στην προηγούμενη κατάσταση αποθήκευσης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ACCOUNTS_RETRO_ACHIEVEMENTS,
+    "Υπηρεσία RetroAchievements. Για περισσότερες πληροφορίες επισκεφθείτε το http://retroachievements.org"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ACCOUNTS_LIST,
+    "Διαχειρίζεται τους τρέχοντες διαμορφωμένους λογαριασμούς."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_META_REWIND,
+    "Διαχειρίζεται τις ρυθμίσεις επαναφοράς."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_DETAILS,
+    "Manages cheat details settings."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_META_CHEAT_SEARCH,
+    "Start or continue a cheat code search."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RESTART_CONTENT,
+    "Επανεκκινεί το περιεχόμενο από την αρχή."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
+    "Saves an override configuration file which will apply for all content loaded with this core. Will take precedence over the main configuration."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR,
+    "Saves an override configuration file which will apply for all content loaded from the same directory as the current file. Will take precedence over the main configuration."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
+    "Saves an override configuration file which will apply for the current content only. Will take precedence over the main configuration."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_CHEAT_OPTIONS,
+    "Στήσιμο κωδικών απάτης."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SHADER_OPTIONS,
+    "Στήσιμο σκιάσεων για την οπτική βελτίωση της εικόνας."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_INPUT_REMAPPING_OPTIONS,
+    "Αλλαγή χειρισμών για το τρέχον εκτελούμενο περιεχόμενο."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_OPTIONS,
+    "Αλλαγή επιλογών για το τρέχον εκτελούμενο περιεχόμενο."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SHOW_ADVANCED_SETTINGS,
+    "Show advanced settings for power users (hidden by default)."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_THREADED_DATA_RUNLOOP_ENABLE,
+    "Perform tasks on a separate thread."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_REMOVE,
+    "Επιτρέψτε στον χρήστη να καταργεί τις καταχωρήσεις από την συλλογή."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SYSTEM_DIRECTORY,
+    "Sets the System directory. Cores can query for this directory to load BIOSes, system-specific configs, etc."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RGUI_BROWSER_DIRECTORY,
+    "Sets start directory for the filebrowser."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_DIR,
+    "Usually set by developers who bundle libretro/RetroArch apps to point to assets."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DYNAMIC_WALLPAPERS_DIRECTORY,
+    "Directory to store wallpapers dynamically loaded by the menu depending on context."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_THUMBNAILS_DIRECTORY,
+    "Supplementary thumbnails (boxarts/misc. images, etc.) are stored here."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RGUI_CONFIG_DIRECTORY,
+    "Sets start directory for menu configuration browser."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_INPUT_LATENCY_FRAMES_MIN,
+    "The number of frames of input latency for netplay to use to hide network latency. Reduces jitter and makes netplay less CPU-intensive, at the expense of noticeable input lag."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_INPUT_LATENCY_FRAMES_RANGE,
+    "The range of frames of input latency that may be used to hide network latency. Reduces jitter and makes netplay less CPU-intensive, at the expense of unpredictable input lag."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DISK_CYCLE_TRAY_STATUS,
+    "Cycle the current disk. If the disk is inserted, it will eject the disk. If the disk has not been inserted, it will be inserted. "
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DISK_INDEX,
+    "Change the disk index."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DISK_OPTIONS,
+    "Disk image management."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DISK_IMAGE_APPEND,
+    "Select a disk image to insert."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_ENUM_THROTTLE_FRAMERATE,
+    "Makes sure the framerate is capped while inside the menu."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VRR_RUNLOOP_ENABLE,
+    "No deviation from core requested timing. Use for Variable Refresh Rate screens, G-Sync, FreeSync."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_XMB_LAYOUT,
+    "Select a different layout for the XMB interface."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_XMB_THEME,
+    "Select a different theme for the icon. Changes will take effect after you restart the program."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_XMB_SHADOWS_ENABLE,
+    "Enable drop shadows for all icons. This will have a minor performance hit."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MATERIALUI_MENU_COLOR_THEME,
+    "Select a different background color gradient theme."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_WALLPAPER_OPACITY,
+    "Modify the opacity of the background wallpaper."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_XMB_MENU_COLOR_THEME,
+    "Select a different background color gradient theme."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE,
+    "Select an animated background effect. Can be GPU-intensive depending on the effect. If performance is unsatisfactory, either turn this off or revert to a simpler effect."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_XMB_FONT,
+    "Select a different main font to be used by the menu."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_FAVORITES,
+    "Προβολή καρτέλας αγαπημένων μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_IMAGES,
+    "Προβολή καρτέλας εικόνων μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_MUSIC,
+    "Προβολή καρτέλας μουσικής μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_VIDEO,
+    "Προβολή καρτέλας βίντεο μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_NETPLAY,
+    "Προβολή καρτέλας netplay μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS,
+    "Προβολή καρτέλας ρυθμίσεων μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_HISTORY,
+    "Προβολή καρτέλας πρόσφατου ιστορικού μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_ADD,
+    "Προβολή καρτέλας εισαγωγής περιεχομένου μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_PLAYLISTS,
+    "Προβολή καρτέλας λίστας αναπαραγωγής μέσα στο μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN,
+    "Προβολή οθόνης εκκίνησης στο μενού. Τίθεται αυτόματα σε αρνητικό μετά την πρώτη εκκίνηση του προγράμματος."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MATERIALUI_MENU_HEADER_OPACITY,
+    "Modify the opacity of the header graphic."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MATERIALUI_MENU_FOOTER_OPACITY,
+    "Modify the opacity of the footer graphic."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_ENABLE,
+    "The menu normally scales itself dynamically. If you want to set a specific scaling size instead, enable this."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
+    "Set the custom scaling size here.\n"
+    "NOTE: You have to enable 'DPI Override' for this scaling size to take effect."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
+    "Save all downloaded files to this directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_INPUT_REMAPPING_DIRECTORY,
+    "Save all remapped controls to this directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LIBRETRO_DIR_PATH,
+    "Directory where the program searches for content/cores."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_LIBRETRO_INFO_PATH,
+    "Application/core information files are stored here."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_JOYPAD_AUTOCONFIG_DIR,
+    "If a joypad is plugged in, that joypad will be autoconfigured if a config file corresponding to it is present inside this directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_PLAYLIST_DIRECTORY,
+    "Save all collections to this directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CACHE_DIRECTORY,
+    "If set to a directory, content which is temporarily extracted (e.g. from archives) will be extracted to this directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CURSOR_DIRECTORY,
+    "Saved queries are stored to this directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_DATABASE_DIRECTORY,
+    "Databases are stored to this directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ASSETS_DIRECTORY,
+    "This location is queried by default when menu interfaces try to look for loadable assets, etc."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVEFILE_DIRECTORY,
+    "Save all save files to this directory. If not set, will try to save inside the content file's working directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SAVESTATE_DIRECTORY,
+    "Save all save states to this directory. If not set, will try to save inside the content file's working directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SCREENSHOT_DIRECTORY,
+    "Directory to dump screenshots to."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OVERLAY_DIRECTORY,
+    "Ορίζει ένα ευρετήριο όπου τα επικαλλύματα αποθηκεύονται για εύκολη πρόσβαση."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_DATABASE_PATH,
+    "Τα αρχεία απάτης αποθηκεύονται εδώ."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_FILTER_DIR,
+    "Directory where audio DSP filter files are kept."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_FILTER_DIR,
+    "Directory where CPU-based video filter files are kept."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SHADER_DIR,
+    "Defines a directory where GPU-based video shader files are kept for easy access."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RECORDING_OUTPUT_DIRECTORY,
+    "Recordings will be dumped to this directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RECORDING_CONFIG_DIRECTORY,
+    "Recording configurations will be kept here."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_FONT_PATH,
+    "Select a different font for onscreen notifications."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SHADER_APPLY_CHANGES,
+    "Changes to the shader configuration will take effect immediately. Use this if you changed the amount of shader passes, filtering, FBO scale, etc."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SHADER_NUM_PASSES,
+    "Increase or decrease the amount of shader pipeline passes. You can bind a separate shader to each pipeline pass and configure its scale and filtering."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET,
+    "Load a shader preset. The shader pipeline will be automatically set-up."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_SAVE_AS,
+    "Save the current shader settings as a new shader preset."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_SAVE_CORE,
+    "Save the current shader settings as the default settings for this application/core."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_SAVE_PARENT,
+    "Save the current shader settings as the default settings for all files in the current content directory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_SAVE_GAME,
+    "Save the current shader settings as the default settings for the content."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SHADER_PARAMETERS,
+    "Modifies the current shader directly. Changes will not be saved to the preset file."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_SHADER_PRESET_PARAMETERS,
+    "Modifies the shader preset itself currently used in the menu."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_NUM_PASSES,
+    "Increase or decrease the amount of cheats."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_APPLY_CHANGES,
+    "Cheat changes will take effect immediately."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_START_SEARCH,
+    "Start search for a new cheat.  Number of bits can be changed."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_CONTINUE_SEARCH,
+    "Continue search for a new cheat."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_FILE_LOAD,
+    "Load a cheat file and replace existing cheats."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_FILE_LOAD_APPEND,
+    "Load a cheat file and append to existing cheats."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_FILE_SAVE_AS,
+    "Save current cheats as a save file."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SETTINGS,
+    "Γρήγορα πρόσβαση σε όλες τις σχετικές ρυθμίσεις παιχνιδιού."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_INFORMATION,
+    "View information pertaining to the application/core."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_ASPECT_RATIO,
+    "Floating point value for video aspect ratio (width / height), used if the Aspect Ratio is set to 'Config'."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT,
+    "Προτιμώμενο ύψος οπτικής γωνίας το οποίο χρησιμοποιείται εάν η Αναλογία Οθόνης είναι ορισμένη ως 'Προτιμώμενη'."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH,
+    "Προτιμώμενο πλάτος οπτικής γωνίας το οποίο χρησιμοποιείται εάν η Αναλογία Οθόνης είναι ορισμένη ως 'Προτιμώμενη'."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_X,
+    "Προτιμώμενη απόκλειση οπτικής γωνίας για τον ορισμό της θέσης του άξωνα X της οπτικής γωνίας. Αυτό αγνοείται εάν έχεται ενεργοποιήσει την 'Ακέραια Κλίμακα'. Τότε θα κεντραριστεί αυτόματα."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
+    "Προτιμώμενη απόκλειση οπτικής γωνίας για τον ορισμό της θέσης του άξωνα Y της οπτικής γωνίας. Αυτό αγνοείται εάν έχεται ενεργοποιήσει την 'Ακέραια Κλίμακα'. Τότε θα κεντραριστεί αυτόματα."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_USE_MITM_SERVER,
+    "Χρήση Εξυπηρετητή Αναμετάδοσης"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_USE_MITM_SERVER,
+    "Forward netplay connections through a man-in-the-middle server. Useful if the host is behind a firewall or has NAT/UPnP problems."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NETPLAY_MITM_SERVER,
+    "Τοποθεσία Εξυπηρετητή Αναμετάδοσης"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_NETPLAY_MITM_SERVER,
+    "Choose a specific relay server to use. Geographically closer locations tend to have lower latency."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ADD_TO_MIXER,
+    "Προσθήκη στον μίκτη"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ADD_TO_MIXER_AND_PLAY,
+    "Προσθήκη στον μίκτη και αναπαραγωγή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ADD_TO_MIXER_AND_COLLECTION,
+    "Προσθήκη στον μίκτη"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ADD_TO_MIXER_AND_COLLECTION_AND_PLAY,
+    "Προσθήκη στον μίκτη και αναπαραγωγή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FILTER_BY_CURRENT_CORE,
+    "Φιλτράρισμα με βάση τον τρέχων πυρήνα"
+    )
+MSG_HASH(
+    MSG_AUDIO_MIXER_VOLUME,
+    "Γενική ένταση μίκτη ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_MIXER_VOLUME,
+    "Γενική ένταση μίκτη ήχου (σε dB). Το 0 είναι η φυσιολογική ένταση και δεν εφαρμόζεται gain." /*Need a good translation for gain if there's any*/
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_MIXER_VOLUME,
+    "Επίπεδο Έντασης Μίκτη Ήχου (dB)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_MIXER_MUTE,
+    "Σίγαση Μίκτη Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_MIXER_MUTE,
+    "Σίγαση/κατάργηση σίγασης μίκτη ήχου."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SHOW_ONLINE_UPDATER,
+    "Προβολή Διαδικτυακού Ενημερωτή"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SHOW_ONLINE_UPDATER,
+    "Εμφάνιση/απόκρυψη της επιλογής 'Διαδικτυακού Ενημερωτή'."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_VIEWS_SETTINGS,
+    "Προβολές"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_VIEWS_SETTINGS,
+    "Προβολή ή απόκρυψη στοιχείων στην οθόνη του μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SHOW_CORE_UPDATER,
+    "Προβολή Ενημερωτή Πυρήνων"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SHOW_CORE_UPDATER,
+    "Εμφάνιση/απόκρυψη της ικανότητας ενημέρωσης πυρήνων (και πληροφοριακών αρχείων πυρήνων)."
+    )
+MSG_HASH(
+    MSG_PREPARING_FOR_CONTENT_SCAN,
+    "Προετοιμασία για σάρωση περιεχομένου..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CORE_DELETE,
+    "Διαγραφή πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CORE_DELETE,
+    "Κατάργηση αυτού του πυρήνα από τον δίσκο."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_FRAMEBUFFER_OPACITY,
+    "Framebuffer Opacity"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY,
+    "Modify the opacity of the framebuffer."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES,
+    "Αγαπημένα"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_GOTO_FAVORITES,
+    "Περιεχόμενο που έχετε προσθέσει στα 'Αγαπημένα' θα εμφανίζεται εδώ."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_GOTO_MUSIC,
+    "Μουσική"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_GOTO_MUSIC,
+    "Μουσική που έχει προηγουμένως αναπαραχθεί θα εμφανίζονται εδώ."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_GOTO_IMAGES,
+    "Εικόνα"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_GOTO_IMAGES,
+    "Εικόνες που έχουν προηγουμένως προβληθεί θα εμφανίζονται εδώ."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_GOTO_VIDEO,
+    "Βίντεο"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_GOTO_VIDEO,
+    "Βίντεο που έχουν προηγουμένως αναπαραχθεί θα εμφανίζονται εδώ."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE,
+    "Εικονίδια Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE,
+    "Ενεργοποίηση/Απενεργοποίηση των εικονιδίων που εμφανίζονται στα αριστερά των καταχωρήσεων του μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS,
+    "Ενεργοποίηση Καρτέλας Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD,
+    "Ορισμός Κωδικού Για Την Ενεργοποίηση Της Καρτέλας Ρυθμίσεων"
+    )
+MSG_HASH(
+    MSG_INPUT_ENABLE_SETTINGS_PASSWORD,
+    "Εισαγωγή Κωδικού"
+    )
+MSG_HASH(
+    MSG_INPUT_ENABLE_SETTINGS_PASSWORD_OK,
+    "Σωστός κωδικός."
+    )
+MSG_HASH(
+    MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK,
+    "Λανθασμένος κωδικός."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS,
+    "Ενεργοποιεί την καρτέλα Ρυθμίσεις. Χρειάζεται επανεκκίνηση για να εμφανιστεί η καρτέλα."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD,
+    "Supplying a password when hiding the settings tab makes it possible to later restore it from the menu, by going to the Main Menu tab, selecting Enable Settings Tab and entering the password."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_PLAYLIST_ENTRY_RENAME,
+    "Επιτρέψτε στον χρήστη να μετονομάζει τις καταχωρήσεις στην συλλογή."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_PLAYLIST_ENTRY_RENAME,
+    "Επίτρεψη μετονομασίας καταχωρήσεων"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RENAME_ENTRY,
+    "Μετονομασία του τίτλου αυτής της καταχώρησης."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RENAME_ENTRY,
+    "Μετονομασία"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CORE,
+    "Προβολή Φόρτωσης Πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CORE,
+    "Εμφάνιση/απόκρυψη της επιλογής 'Φόρτωση Πυρήνα'."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SHOW_LOAD_CONTENT,
+    "Προβολή Φόρτωσης Περιεχομένου"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SHOW_LOAD_CONTENT,
+    "Εμφάνιση/απόκρυψη της επιλογής 'Φόρτωση Περιεχομένου'."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION,
+    "Προβολή Πληροφοριών"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION,
+    "Εμφάνιση/απόκρυψη της επιλογής 'Πληροφορίες'."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SHOW_CONFIGURATIONS,
+    "Προβολή Διαμορφώσεων"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SHOW_CONFIGURATIONS,
+    "Εμφάνιση/απόκρυψη της επιλογής 'Διαμορφώσεις'."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP,
+    "Προβολή Βοήθειας"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SHOW_HELP,
+    "Εμφάνιση/απόκρυψη της επιλογής 'Βοήθεια'."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SHOW_QUIT_RETROARCH,
+    "Προβολή Εξόδου RetroArch"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SHOW_QUIT_RETROARCH,
+    "Εμφάνιση/απόκρυψη της επιλογής 'Έξοδος από RetroArch'."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SHOW_REBOOT,
+    "Προβολή Επανεκκίνησης"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SHOW_REBOOT,
+    "Εμφάνιση/απόκρυψη της επιλογής 'Επανεκκίνηση'."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_SHOW_SHUTDOWN,
+    "Show Shutdown"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_SHOW_SHUTDOWN,
+    "Show/hide the 'Shutdown' option."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_VIEWS_SETTINGS,
+    "Γρήγορο Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_VIEWS_SETTINGS,
+    "Show or hide elements on the Quick Menu screen."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_TAKE_SCREENSHOT,
+    "Show Take Screenshot"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_TAKE_SCREENSHOT,
+    "Show/hide the 'Take Screenshot' option."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SAVE_LOAD_STATE,
+    "Show Save/Load State"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_SAVE_LOAD_STATE,
+    "Show/hide the options for saving/loading state."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_UNDO_SAVE_LOAD_STATE,
+    "Show Undo Save/Load State"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_UNDO_SAVE_LOAD_STATE,
+    "Show/hide the options for undoing save/load state."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_ADD_TO_FAVORITES,
+    "Show Add to Favorites"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_ADD_TO_FAVORITES,
+    "Show/hide the 'Add to Favorites' option."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_OPTIONS,
+    "Show Options"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_OPTIONS,
+    "Show/hide the 'Options' option."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_CONTROLS,
+    "Show Controls"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_CONTROLS,
+    "Show/hide the 'Controls' option."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_CHEATS,
+    "Show Cheats"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_CHEATS,
+    "Show/hide the 'Cheats' option."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SHADERS,
+    "Show Shaders"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_SHADERS,
+    "Show/hide the 'Shaders' option."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SAVE_CORE_OVERRIDES,
+    "Show Save Core Overrides"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_SAVE_CORE_OVERRIDES,
+    "Show/hide the 'Save Core Overrides' option."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_SAVE_GAME_OVERRIDES,
+    "Show Save Game Overrides"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_SAVE_GAME_OVERRIDES,
+    "Show/hide the 'Save Game Overrides' option."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_SHOW_INFORMATION,
+    "Show Information"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_SHOW_INFORMATION,
+    "Show/hide the 'Information' option."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_ENABLE,
+    "Notification Background Enable"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_RED,
+    "Notification Background Red Color"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_GREEN,
+    "Notification Background Green Color"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_BLUE,
+    "Notification Background Blue Color"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_BGCOLOR_OPACITY,
+    "Notification Background Opacity"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_DISABLE_KIOSK_MODE,
+    "Disable Kiosk Mode"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_DISABLE_KIOSK_MODE,
+    "Disables kiosk mode. A restart is required for the change to take full effect."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_ENABLE_KIOSK_MODE,
+    "Ενεργοποίηση Λειτουργίας Κιόσκι"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_ENABLE_KIOSK_MODE,
+    "Protects the setup by hiding all configuration related settings."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_KIOSK_MODE_PASSWORD,
+    "Set Password For Disabling Kiosk Mode"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_KIOSK_MODE_PASSWORD,
+    "Supplying a password when enabling kiosk mode makes it possible to later disable it from the menu, by going to the Main Menu, selecting Disable Kiosk Mode and entering the password."
+    )
+MSG_HASH(
+    MSG_INPUT_KIOSK_MODE_PASSWORD,
+    "Εισαγωγή Κωδικού"
+    )
+MSG_HASH(
+    MSG_INPUT_KIOSK_MODE_PASSWORD_OK,
+    "Σωστός κωδικός."
+    )
+MSG_HASH(
+    MSG_INPUT_KIOSK_MODE_PASSWORD_NOK,
+    "Λανθασμένος κωδικός."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_COLOR_RED,
+    "Notification Red Color"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_COLOR_GREEN,
+    "Notification Green Color"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_COLOR_BLUE,
+    "Notification Blue Color"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FRAMECOUNT_SHOW,
+    "Show frame count on FPS display"
+    )
+MSG_HASH(
+    MSG_CONFIG_OVERRIDE_LOADED,
+    "Configuration override loaded."
+    )
+MSG_HASH(
+    MSG_GAME_REMAP_FILE_LOADED,
+    "Game remap file loaded."
+    )
+MSG_HASH(
+    MSG_CORE_REMAP_FILE_LOADED,
+    "Core remap file loaded."
+    )
+MSG_HASH(
+    MSG_RUNAHEAD_CORE_DOES_NOT_SUPPORT_SAVESTATES,
+    "RunAhead has been disabled because this core does not support save states."
+    )
+MSG_HASH(
+    MSG_RUNAHEAD_FAILED_TO_SAVE_STATE,
+    "Failed to save state.  RunAhead has been disabled."
+    )
+MSG_HASH(
+    MSG_RUNAHEAD_FAILED_TO_LOAD_STATE,
+    "Failed to load state.  RunAhead has been disabled."
+    )
+MSG_HASH(
+    MSG_RUNAHEAD_FAILED_TO_CREATE_SECONDARY_INSTANCE,
+    "Failed to create second instance.  RunAhead will now use only one instance."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUTOMATICALLY_ADD_CONTENT_TO_PLAYLIST,
+    "Automatically add content to playlist"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUTOMATICALLY_ADD_CONTENT_TO_PLAYLIST,
+    "Automatically scans loaded content so they appear inside playlists."
+    )
+MSG_HASH(
+    MSG_SCANNING_OF_FILE_FINISHED,
+    "Scanning of file finished"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_OPACITY,
+    "Διαφάνεια Παραθύρου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_QUALITY,
+    "Ποιότητα Επαναδειγματολήπτη Ήχου"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_RESAMPLER_QUALITY,
+    "Ελαττώστε αυτή την τιμή για καλύτερη επίδοση/χαμηλότερη καθυστέρηση αντί ποιότητας ήχου, αυξήστε εάν θέλετε καλύτερη ποιότητα με κόστος στην επίδοση/χαμηλότερη καθυστέρηση."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHADER_WATCH_FOR_CHANGES,
+    "Watch shader files for changes"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SHADER_WATCH_FOR_CHANGES,
+    "Auto-apply changes made to shader files on disk."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_SHOW_DECORATIONS,
+    "Εμφάνιση Διακοσμητικών Παραθύρου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
+    "Εμφάνιση Στατιστικών"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_STATISTICS_SHOW,
+    "Εμφάνιση τεχνικών στατιστικών στην οθόνη."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_ENABLE,
+    "Enable border filler"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_RGUI_BORDER_FILLER_THICKNESS_ENABLE,
+    "Enable border filler thickness"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_RGUI_BACKGROUND_FILLER_THICKNESS_ENABLE,
+    "Enable background filler thickness"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION,
+    "Για οθόνες CRT μόνο. Προσπαθεί να χρησιμοποιήσει την ακριβή ανάλυση πυρήνα/παιχνιδιού και ρυθμού ανανέωσης."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CRT_SWITCH_RESOLUTION,
+    "CRT SwitchRes"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_SUPER,
+    "Switch among native and ultrawide super resolutions."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CRT_SWITCH_RESOLUTION_SUPER,
+    "Σούπερ Ανάλυση CRT"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_REWIND,
+    "Προβολή Ρυθμίσεων Επιστροφής"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_REWIND,
+    "Εμφάνιση/απόκρυψη επιλογών Επιστροφής."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_LATENCY,
+    "Εμφάνιση/απόκρυψη επιλογών Καθυστέρησης."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_LATENCY,
+    "Προβολή Ρυθμίσεων Καθυστέρησης"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CONTENT_SHOW_OVERLAYS,
+    "Εμφάνιση/απόκρυψη επιλογών Επικαλλυμάτων."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_OVERLAYS,
+    "Προβολή Ρυθμίσεων Επικαλλυμάτων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE_MENU,
+    "Ενεργοποίηση ήχου μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_ENABLE_MENU,
+    "Ενεργοποίηση ή απενεργοποίηση ήχου μενού."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_AUDIO_MIXER_SETTINGS,
+    "Ρυθμίσεις Μίκτη"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_AUDIO_MIXER_SETTINGS,
+    "Εμφάνιση και/ή επεξεργασία ρυθμίσεων μίκτη."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_INFO,
+    "Πληροφορίες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_FILE,
+    "&File"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_FILE_LOAD_CORE,
+    "&Load Core..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_FILE_UNLOAD_CORE,
+    "&Unload Core"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_FILE_EXIT,
+    "E&xit"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_EDIT,
+    "&Edit"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_EDIT_SEARCH,
+    "&Search"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW,
+    "&View"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_CLOSED_DOCKS,
+    "Closed Docks"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_SHADER_PARAMS,
+    "Shader Parameters"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS,
+    "&Options..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_SAVE_DOCK_POSITIONS,
+    "Remember dock positions:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_SAVE_GEOMETRY,
+    "Remember window geometry:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_SAVE_LAST_TAB,
+    "Remember last content browser tab:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_THEME,
+    "Θέμα:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_THEME_SYSTEM_DEFAULT,
+    "<System Default>"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_THEME_DARK,
+    "Σκούρο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_THEME_CUSTOM,
+    "Custom..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_TITLE,
+    "Επιλογές"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_TOOLS,
+    "&Tools"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_HELP,
+    "&Help"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT,
+    "Σχετικά με το RetroArch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_DOCUMENTATION,
+    "Εγχειρίδιο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_LOAD_CUSTOM_CORE,
+    "Load Custom Core..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_LOAD_CORE,
+    "Φόρτωση Πυρήνα΄"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_LOADING_CORE,
+    "Φόρτωση Πυρήνα..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_NAME,
+    "Όνομα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CORE_VERSION,
+    "Έκδοση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_TAB_PLAYLISTS,
+    "Λίστες Αναπαραγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_TAB_FILE_BROWSER,
+    "File Browser"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_TAB_FILE_BROWSER_TOP,
+    "Top"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_TAB_FILE_BROWSER_UP,
+    "Up"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_DOCK_CONTENT_BROWSER,
+    "Content Browser"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_THUMBNAIL_BOXART,
+    "Boxart"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_THUMBNAIL_SCREENSHOT,
+    "Screenshot"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_THUMBNAIL_TITLE_SCREEN,
+    "Title Screen"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_ALL_PLAYLISTS,
+    "All Playlists"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CORE,
+    "Core"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CORE_INFO,
+    "Core Info"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CORE_SELECTION_ASK,
+    "<Ask me>"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_INFORMATION,
+    "Information"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_WARNING,
+    "Warning"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_ERROR,
+    "Error"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_NETWORK_ERROR,
+    "Network Error"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_RESTART_TO_TAKE_EFFECT,
+    "Please restart the program for the changes to take effect."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_LOG,
+    "Log"
+    )
+#ifdef HAVE_QT
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_SCAN_FINISHED,
+    "Scan Finished.<br><br>\n"
+    "In order for content to be correctly scanned, you must:\n"
+    "<ul><li>have a compatible core already downloaded</li>\n"
+    "<li>have \"Core Info Files\" updated via Online Updater</li>\n"
+    "<li>have \"Databases\" updated via Online Updater</li>\n"
+    "<li>restart RetroArch if any of the above was just done</li></ul>\n"
+    "Finally, the content must match existing databases from <a href=\"https://docs.libretro.com/guides/roms-playlists-thumbnails/#sources\">here</a>. If it is still not working, consider <a href=\"https://www.github.com/libretro/RetroArch/issues\">submitting a bug report</a>."
+    )
+#endif
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SHOW_WIMP,
+    "Εμφάνιση Μενού Επιφάνεις Εργασίας"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SHOW_WIMP,
+    "Opens the desktop menu if closed."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_DONT_SHOW_AGAIN,
+    "Don't show this again"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_STOP,
+    "Στοπ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_ASSOCIATE_CORE,
+    "Associate Core"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_HIDDEN_PLAYLISTS,
+    "Hidden Playlists"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_HIDE,
+    "Hide"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_HIGHLIGHT_COLOR,
+    "Highlight color:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CHOOSE,
+    "&Choose..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_SELECT_COLOR,
+    "Select Color"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_SELECT_THEME,
+    "Select Theme"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CUSTOM_THEME,
+    "Custom Theme"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_FILE_PATH_IS_BLANK,
+    "File path is blank."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_FILE_IS_EMPTY,
+    "File is empty."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_FILE_READ_OPEN_FAILED,
+    "Could not open file for reading."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_FILE_WRITE_OPEN_FAILED,
+    "Could not open file for writing."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_FILE_DOES_NOT_EXIST,
+    "File does not exist."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_SUGGEST_LOADED_CORE_FIRST,
+    "Suggest loaded core first:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_ZOOM,
+    "Zoom"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_VIEW,
+    "View"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_VIEW_TYPE_ICONS,
+    "Icons"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_VIEW_TYPE_LIST,
+    "List"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS,
+    "Overrides"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS,
+    "Options for overriding the global configuration."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY,
+    "Will start playback of the audio stream. Once finished, it will remove the current audio stream from memory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED,
+    "Will start playback of the audio stream. Once finished, it will loop and play the track again from the beginning."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL,
+    "Will start playback of the audio stream. Once finished, it will jump to the next audio stream in sequential order and repeat this behavior. Useful as an album playback mode."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP,
+    "This will stop playback of the audio stream, but not remove it from memory. You can start playing it again by selecting 'Play'."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE,
+    "This will stop playback of the audio stream and remove it entirely from memory."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME,
+    "Adjust the volume of the audio stream."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ADD_TO_MIXER,
+    "Add this audio track to an available audio stream slot. If no slots are currently available, it will be ignored."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ADD_TO_MIXER_AND_PLAY,
+    "Add this audio track to an available audio stream slot and play it. If no slots are currently available, it will be ignored."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY,
+    "Αναπαραγωγή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY_LOOPED,
+    "Αναπαραγωγή (Looped)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY_SEQUENTIAL,
+    "Αναπαραγωγή (Sequential)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIXER_ACTION_STOP,
+    "Στοπ"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIXER_ACTION_REMOVE,
+    "Κατάργηση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIXER_ACTION_VOLUME,
+    "Ένταση"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST_OK_CURRENT_CORE,
+    "Τρέχων πυρήνας"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
+    "Clear"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ACHIEVEMENT_PAUSE,
+    "Pause achievements for current session (This action will enable savestates, cheats, rewind, pause, and slow-motion)."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_ACHIEVEMENT_RESUME,
+    "Resume achievements for current session (This action will disable savestates, cheats, rewind, pause, and slow-motion and reset the current game)."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
+    "In-Menu"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME,
+    "In-Game"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME_PAUSED,
+    "In-Game (Paused)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PLAYING,
+    "Playing"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PAUSED,
+    "Paused"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
+    "Ενεργοποίηση Discord Rich Presence"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
+    "Ενεργοποίηση ή απενεργοποίηση υποστήριξης Discord Rich Presence.\n"
+    "ΣΗΜΕΙΩΣΗ: Δεν θα δουλέψει με την έκδοση του περιηγητή, μόνο με την τοπικά εγκατεστημένη."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIDI_INPUT,
+    "Είσοδος"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIDI_INPUT,
+    "Επιλογή συσκευής εισόδου."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIDI_OUTPUT,
+    "Έξοδος"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIDI_OUTPUT,
+    "Επιλογή συσκευής εξόδου."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MIDI_VOLUME,
+    "Ένταση"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MIDI_VOLUME,
+    "Ορισμός έντασης εξόδου (%)."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS,
+    "Διαχείριση Ενέργειας"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS,
+    "Αλλαγή ρυθμίσεων διαχείρισης ενέργειας."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SUSTAINED_PERFORMANCE_MODE,
+    "Κατάσταση Συνεχούς Επίδοσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_MPV_SUPPORT,
+    "Υποστήριξη mpv"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_IDX,
+    "Index"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_MATCH_IDX,
+    "View Match #"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_MATCH,
+    "Match Address: %08X Mask: %02X"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_COPY_MATCH,
+    "Create Code Match #"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_DELETE_MATCH,
+    "Delete Match #"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_BROWSE_MEMORY,
+    "Browse Address: %08X"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_DESC,
+    "Πληροφορίες"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_STATE,
+    "Ενεργοποιημένο"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_CODE,
+    "Κωδικός"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_HANDLER,
+    "Handler"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_MEMORY_SEARCH_SIZE,
+    "Memory Search Size"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_TYPE,
+    "Τύπος"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_VALUE,
+    "Τιμή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_ADDRESS,
+    "Memory Address"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_ADDRESS_BIT_POSITION,
+    "Memory Address Mask"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_RUMBLE_TYPE,
+    "Rumble When Memory"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_RUMBLE_VALUE,
+    "Rumble Value"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_RUMBLE_PORT,
+    "Rumble Port"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_RUMBLE_PRIMARY_STRENGTH,
+    "Rumble Primary Strength"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_RUMBLE_PRIMARY_DURATION,
+    "Rumble Primary Duration (ms)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_RUMBLE_SECONDARY_STRENGTH,
+    "Rumble Secondary Strength"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_RUMBLE_SECONDARY_DURATION,
+    "Rumble Secondary Duration (ms)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_COUNT,
+    "Number of Iterations"
+)
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_VALUE,
+    "Value Increase Each Iteration"
+)
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_ADDRESS,
+    "Address Increase Each Iteration"
+)
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_ADD_NEW_AFTER,
+    "Add New Cheat After This One"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_ADD_NEW_BEFORE,
+    "Add New Cheat Before This One"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_COPY_AFTER,
+    "Copy This Cheat After"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_COPY_BEFORE,
+    "Copy This Cheat Before"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_DELETE,
+    "Delete This Cheat"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_HANDLER_TYPE_EMU,
+    "Emulator"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_HANDLER_TYPE_RETRO,
+    "RetroArch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_TYPE_DISABLED,
+    "<Disabled>"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_TYPE_SET_TO_VALUE,
+    "Set To Value"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_TYPE_INCREASE_VALUE,
+    "Increase By Value"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_TYPE_DECREASE_VALUE,
+    "Decrease By Value"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_TYPE_RUN_NEXT_IF_EQ,
+    "Run next cheat if value = memory"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_TYPE_RUN_NEXT_IF_NEQ,
+    "Run next cheat if value != memory"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_TYPE_RUN_NEXT_IF_LT,
+    "Run next cheat if value < memory"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_TYPE_RUN_NEXT_IF_GT,
+    "Run next cheat if value > memory"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_DISABLED,
+    "<Disabled>"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_CHANGES,
+    "Changes"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_DOES_NOT_CHANGE,
+    "Does Not Change"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_INCREASE,
+    "Increases"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_DECREASE,
+    "Decreases"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_EQ_VALUE,
+    "= Rumble Value"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_NEQ_VALUE,
+    "!= Rumble Value"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_LT_VALUE,
+    "< Rumble Value"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_GT_VALUE,
+    "> Rumble Value"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_INCREASE_BY_VALUE,
+    "Increases by Rumble Value"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_DECREASE_BY_VALUE,
+    "Decreases by Rumble Value"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_1,
+    "1-bit, max value = 0x01"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_2,
+    "2-bit, max value = 0x03"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_4,
+    "4-bit, max value = 0x0F"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_8,
+    "8-bit, max value = 0xFF"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_16,
+    "16-bit, max value = 0xFFFF"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_32,
+    "32-bit, max value = 0xFFFFFFFF"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_0,
+    "1"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_1,
+    "2"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_2,
+    "3"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_3,
+    "4"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_4,
+    "5"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_5,
+    "6"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_6,
+    "7"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_7,
+    "8"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_8,
+    "9"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_9,
+    "10"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_10,
+    "11"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_11,
+    "12"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_12,
+    "13"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_13,
+    "14"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_14,
+    "15"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_15,
+    "16"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_PORT_16,
+    "All"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_START_OR_CONT,
+    "Start or Continue Cheat Search"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_START_OR_RESTART,
+    "Start or Restart Cheat Search"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SEARCH_EXACT,
+    "Search Memory For Values"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SEARCH_LT,
+    "Search Memory For Values"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SEARCH_GT,
+    "Search Memory For Values"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SEARCH_EQ,
+    "Search Memory For Values"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SEARCH_GTE,
+    "Search Memory For Values"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SEARCH_LTE,
+    "Search Memory For Values"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SEARCH_NEQ,
+    "Search Memory For Values"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SEARCH_EQPLUS,
+    "Search Memory For Values"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_SEARCH_EQMINUS,
+    "Search Memory For Values"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_ADD_MATCHES,
+    "Add the %u Matches to Your List"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_VIEW_MATCHES,
+    "View the List of %u Matches"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_CREATE_OPTION,
+    "Create Code From This Match"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_DELETE_OPTION,
+    "Delete This Match"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_ADD_NEW_TOP,
+    "Add New Code to Top"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_ADD_NEW_BOTTOM,
+    "Add New Code to Bottom"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_DELETE_ALL,
+    "Delete All Codes"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_RELOAD_CHEATS,
+    "Reload Game-Specific Cheats"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_SEARCH_EXACT_VAL,
+    "Equal to %u (%X)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_SEARCH_LT_VAL,
+    "Less Than Before"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_SEARCH_GT_VAL,
+    "Greater Than Before"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_SEARCH_LTE_VAL,
+    "Less Than or Equal To Before"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_SEARCH_GTE_VAL,
+    "Greater Than or Equal To Before"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_SEARCH_EQ_VAL,
+    "Equal to Before"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_SEARCH_NEQ_VAL,
+    "Not Equal to Before"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_SEARCH_EQPLUS_VAL,
+    "Equal to Before+%u (%X)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_SEARCH_EQMINUS_VAL,
+    "Equal to Before-%u (%X)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_CHEAT_SEARCH_SETTINGS,
+    "Start or Continue Cheat Search"
+    )
+MSG_HASH(
+    MSG_CHEAT_INIT_SUCCESS,
+    "Successfully started cheat search"
+    )
+MSG_HASH(
+    MSG_CHEAT_INIT_FAIL,
+    "Failed to start cheat search"
+    )
+MSG_HASH(
+    MSG_CHEAT_SEARCH_NOT_INITIALIZED,
+    "Searching has not been initialized/started"
+    )
+MSG_HASH(
+    MSG_CHEAT_SEARCH_FOUND_MATCHES,
+    "New match count = %u"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_BIG_ENDIAN,
+    "Big Endian"
+    )
+MSG_HASH(
+    MSG_CHEAT_SEARCH_ADDED_MATCHES_SUCCESS,
+    "Added %u matches"
+    )
+MSG_HASH(
+    MSG_CHEAT_SEARCH_ADDED_MATCHES_FAIL,
+    "Failed to add matches"
+    )
+MSG_HASH(
+    MSG_CHEAT_SEARCH_ADD_MATCH_SUCCESS,
+    "Created code from match"
+    )
+MSG_HASH(
+    MSG_CHEAT_SEARCH_ADD_MATCH_FAIL,
+    "Failed to create code"
+    )
+MSG_HASH(
+    MSG_CHEAT_SEARCH_DELETE_MATCH_SUCCESS,
+    "Deleted match"
+    )
+MSG_HASH(
+    MSG_CHEAT_SEARCH_ADDED_MATCHES_TOO_MANY,
+    "Not enough room.  The total number of cheats you can have is 100."
+    )
+MSG_HASH(
+    MSG_CHEAT_ADD_TOP_SUCCESS,
+    "New cheat added to top of list."
+    )
+MSG_HASH(
+    MSG_CHEAT_ADD_BOTTOM_SUCCESS,
+    "New cheat added to bottom of list."
+    )
+MSG_HASH(
+    MSG_CHEAT_DELETE_ALL_INSTRUCTIONS,
+    "Press right five times to delete all cheats."
+    )
+MSG_HASH(
+    MSG_CHEAT_DELETE_ALL_SUCCESS,
+    "All cheats deleted."
+    )
+MSG_HASH(
+    MSG_CHEAT_ADD_BEFORE_SUCCESS,
+    "New cheat added before this one."
+    )
+MSG_HASH(
+    MSG_CHEAT_ADD_AFTER_SUCCESS,
+    "New cheat added after this one."
+    )
+MSG_HASH(
+    MSG_CHEAT_COPY_BEFORE_SUCCESS,
+    "Cheat copied before this one."
+    )
+MSG_HASH(
+    MSG_CHEAT_COPY_AFTER_SUCCESS,
+    "Cheat copied after this one."
+    )
+MSG_HASH(
+    MSG_CHEAT_DELETE_SUCCESS,
+    "Cheat deleted."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_PROGRESS,
+    "Progress:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_ALL_PLAYLISTS_LIST_MAX_COUNT,
+    "\"All Playlists\" max list entries:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_ALL_PLAYLISTS_GRID_MAX_COUNT,
+    "\"All Playlists\" max grid entries:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_SHOW_HIDDEN_FILES,
+    "Εμφάνιση κρυφών αρχείων και φακέλων:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_NEW_PLAYLIST,
+    "Νέα Λίστα Αναπαραγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_ENTER_NEW_PLAYLIST_NAME,
+    "Please enter the new playlist name:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_DELETE_PLAYLIST,
+    "Διαγραφή Λίστας Αναπαραγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_RENAME_PLAYLIST,
+    "Μετονομασία Λίστας Αναπαραγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CONFIRM_DELETE_PLAYLIST,
+    "Are you sure you want to delete the playlist \"%1\"?"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_QUESTION,
+    "Question"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_COULD_NOT_DELETE_FILE,
+    "Could not delete file."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_COULD_NOT_RENAME_FILE,
+    "Could not rename file."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_GATHERING_LIST_OF_FILES,
+    "Gathering list of files..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_ADDING_FILES_TO_PLAYLIST,
+    "Adding files to playlist..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_PLAYLIST_ENTRY,
+    "Playlist Entry"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_PLAYLIST_ENTRY_NAME,
+    "Όνομα:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_PLAYLIST_ENTRY_PATH,
+    "Path:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_PLAYLIST_ENTRY_CORE,
+    "Πυρήνας:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_PLAYLIST_ENTRY_DATABASE,
+    "Database:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_PLAYLIST_ENTRY_EXTENSIONS,
+    "Extensions:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_PLAYLIST_ENTRY_EXTENSIONS_PLACEHOLDER,
+    "(space-separated; includes all by default)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_PLAYLIST_ENTRY_FILTER_INSIDE_ARCHIVES,
+    "Filter inside archives"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_FOR_THUMBNAILS,
+    "(used to find thumbnails)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CONFIRM_DELETE_PLAYLIST_ITEM,
+    "Are you sure you want to delete the item \"%1\"?"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CANNOT_ADD_TO_ALL_PLAYLISTS,
+    "Please choose a single playlist first."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_DELETE,
+    "Delete"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_ADD_ENTRY,
+    "Add Entry..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_ADD_FILES,
+    "Add File(s)..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_ADD_FOLDER,
+    "Add Folder..."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_EDIT,
+    "Edit"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_SELECT_FILES,
+    "Select Files"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_SELECT_FOLDER,
+    "Select Folder"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_FIELD_MULTIPLE,
+    "<multiple>"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_COULD_NOT_UPDATE_PLAYLIST_ENTRY,
+    "Error updating playlist entry."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_PLEASE_FILL_OUT_REQUIRED_FIELDS,
+    "Please fill out all required fields."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_UPDATE_RETROARCH_NIGHTLY,
+    "Update RetroArch (nightly)"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_UPDATE_RETROARCH_FINISHED,
+    "RetroArch updated successfully. Please restart the application for the changes to take effect."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_UPDATE_RETROARCH_FAILED,
+    "Update failed."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT_CONTRIBUTORS,
+    "Contributors"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CURRENT_SHADER,
+    "Current shader"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MOVE_DOWN,
+    "Move Down"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MOVE_UP,
+    "Move Up"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_LOAD,
+    "Load"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_SAVE,
+    "Save"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_REMOVE,
+    "Remove"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_APPLY,
+    "Apply"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_SHADER_ADD_PASS,
+    "Add Pass"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_SHADER_CLEAR_ALL_PASSES,
+    "Clear All Passes"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_SHADER_NO_PASSES,
+    "No shader passes."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_RESET_PASS,
+    "Reset Pass"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_RESET_ALL_PASSES,
+    "Reset All Passes"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_RESET_PARAMETER,
+    "Reset Parameter"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_DOWNLOAD_THUMBNAIL,
+    "Download thumbnail"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_DOWNLOAD_ALREADY_IN_PROGRESS,
+    "A download is already in progress."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_STARTUP_PLAYLIST,
+    "Start on playlist:"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_DOWNLOAD_ALL_THUMBNAILS,
+    "Λήψη Όλων των Σκίτσων"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_DOWNLOAD_ALL_THUMBNAILS_ENTIRE_SYSTEM,
+    "Όλο το Σύστημα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_DOWNLOAD_ALL_THUMBNAILS_THIS_PLAYLIST,
+    "Αυτή η Λίστα Αναπαραγωγής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_THUMBNAIL_PACK_DOWNLOADED_SUCCESSFULLY,
+    "Επιτυχής λήψη σκίτσων."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_DOWNLOAD_PLAYLIST_THUMBNAIL_PROGRESS,
+    "Πέτυχαν: %1 Απέτυχαν: %2"
+    )
+MSG_HASH(
+    MSG_DEVICE_CONFIGURED_IN_PORT,
+    "Διαμορφώθηκε στην θύρα:"
+    )
+MSG_HASH(
+    MSG_FAILED_TO_SET_DISK,
+    "Αποτυχία ορισμού δίσκου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_CORE_OPTIONS,
+    "Επιλογές Πυρήνα"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_ADAPTIVE_VSYNC,
+    "Προσαρμοστικό Vsync"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_VIDEO_ADAPTIVE_VSYNC,
+    "Το V-Sync είναι ενεργοποιημένο μέχρι η επίδοση να πέσει κάτω από τον στόχο ρυθμού ανανέωσης. Μπορεί να μειώσει τα κολλήματα όταν η επίδοση πέφτει χαμηλότερα από τον κανονικό χρόνο και μπορεί να είναι πιο αποδοτικό ενεργειακά."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CRT_SWITCHRES_SETTINGS,
+    "CRT SwitchRes"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
+    "Εξαγωγή ντόπιων, χαμηλής ανάλυσης σημάτων για χρήση με οθόνες CRT."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
+    "Εναλλάξτε μεταξύ αυτών των επιλογών εάν η εικόνα δεν είναι σωστά κεντραρισμένη στην οθόνη."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
+    "Κεντράρισμα Άξωνα Χ"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE,
+    "Χρήση προσαρμοσμένου ρυθμού ανανέωσης προσδιορισμένου στο αρχείο διαμόρφωσης εάν χρειάζεται."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE,
+    "Χρήση Προσαρμοσμένου Ρυθμού Ανανέωσης"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_OUTPUT_DISPLAY_ID,
+    "Επιλέξτε την θύρα εξόδου που είναι συνδεδεμένη με την οθόνη CRT."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CRT_SWITCH_RESOLUTION_OUTPUT_DISPLAY_ID,
+    "ID Οθόνης Εξόδου"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_START_RECORDING,
+    "Έναρξη Εγγραφής"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_START_RECORDING,
+    "Ξεκινάει την εγγραφή."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_STOP_RECORDING,
+    "Τέλος Εγγραφής"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_STOP_RECORDING,
+    "Σταματάει την εγγραφή."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_START_STREAMING,
+    "Έναρξη Απευθείας Μετάδοσης"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_START_STREAMING,
+    "Ξεκινάει την απευθείας μετάδοση."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QUICK_MENU_STOP_STREAMING,
+    "Τέλος Απευθείας Μετάδοσης"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_QUICK_MENU_STOP_STREAMING,
+    "Σταματάει την απευθείας μετάδοση."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,
+    "Εγγραφή"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,
+    "Απευθείας Μετάδοση"
+    )
+MSG_HASH(
+    MSG_CHEEVOS_HARDCORE_MODE_DISABLED,
+    "A savestate was loaded, Achievements Hardcore Mode disabled for the current session. Restart to enable hardcore mode."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_RECORD_QUALITY,
+    "Ποιότητα Εγγραφής"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_STREAM_QUALITY,
+    "Ποιότητα Απευθείας Μετάδοσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STREAMING_URL,
+    "Σύνδεσμος Απευθείας Μετάδοσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT,
+    "Θύρα UDP Απευθείας Μετάδοσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH,
+    "Twitch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE,
+    "YouTube"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_TWITCH_STREAM_KEY,
+    "Κλειδί Απευθείας Μετάδοσης Twitch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_YOUTUBE_STREAM_KEY,
+    "Κλειδί Απευθείας Μετάδοσης YouTube"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STREAMING_MODE,
+    "Μέσο Απευθείας Μετάδοσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STREAMING_TITLE,
+    "Τίτλος Απευθείας Μετάδοσης"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
+    "Χωριστά Joy-Con"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
+    "Επαναφορά Προεπιλογών"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
+    "Επαναφορά της τρέχουσας διαμόρφωσης στις προεπιλεγμένες ρυθμίσεις."
+    )
+
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+    "Χρώμα Θέματος Μενού"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h
index 763b4cf48e..c28eff54ef 100644
--- a/intl/msg_hash_eo.h
+++ b/intl/msg_hash_eo.h
@@ -1492,6 +1492,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "Crop Overscan (Reload)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "Disable Desktop Composition")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "3DS Fundo Ekrano")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "Video Driver")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -3325,3 +3327,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Reset the current configuration to default values."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "Menu Color Theme")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h
index 6c40ffa0c1..19ac3b8b90 100644
--- a/intl/msg_hash_es.h
+++ b/intl/msg_hash_es.h
@@ -1,3 +1,29 @@
+#ifdef HAVE_LAKKA_SWITCH
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
+    "GPU Overclock"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
+    "Acelera el procesador de video"
+    )
+ MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SWITCH_BACKLIGHT_CONTROL,
+    "Brillo de pantalla"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SWITCH_BACKLIGHT_CONTROL,
+    "Ajusta el brillo de la pantalla"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
+    "CPU Overclock"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SWITCH_CPU_PROFILE,
+    "Acelera el procesador"
+    )
+#endif
 MSG_HASH(
     MSG_COMPILER,
     "Compilador"
@@ -8,7 +34,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MSG_NATIVE,
-    "Native")
+    "Nativo")
 MSG_HASH(
     MSG_DEVICE_DISCONNECTED_FROM_PORT,
     "Dispositivo desconectado del puerto"
@@ -1489,6 +1515,10 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LANG_ARABIC,
     "Árabe"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_GREEK,
+    "Griego"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,
     "Analógico izquierdo"
@@ -2880,6 +2910,14 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
     "Mostrar fecha y hora"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE,
+    "Estilo de fecha y hora"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_TIMEDATE_STYLE,
+    "Cambia la forma en que se muestra la fecha y hora"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_TITLE_COLOR,
     "Color de títulos del menú"
@@ -3028,6 +3066,10 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
     "Desactivar composición de escritorio"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+    "Pantalla inferior 3DS"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
     "Controlador de video"
@@ -4926,6 +4968,19 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_CHEAT_APPLY_AFTER_LOAD,
     "Auto-aplicar los trucos después que el juego cargue"
     )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_REPEAT_COUNT,
+    "La cantidad de veces que el truco será aplicado.\n"
+    "Usar junto a las otras dos optionces de iteración para afectar regiones grandes de memoria"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_ADDRESS,
+    "Después de cada 'Número de iteraciones' la dirección de memoria será incrementada este número multiplicado por 'Tamaño de búsqueda de memoria'"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_VALUE,
+    "Después de cada 'Número de iteraciones' el Valor será incrementado esta cantidad"
+    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_REWIND_GRANULARITY,
     "Rebobinar un determinado número de frames a la vez, para aumentar la velocidad del rebobinado"
@@ -6374,7 +6429,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_THEME_SYSTEM_DEFAULT,
-    "<Por defeco>"
+    "<Por defecto>"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QT_MENU_VIEW_OPTIONS_THEME_DARK,
@@ -6833,6 +6888,18 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CHEAT_RUMBLE_SECONDARY_DURATION,
     "Duración (ms) de la vibración secundaria"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_COUNT,
+    "Número de iteraciones"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_VALUE,
+    "Incrementar Valor cada iteración"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_ADDRESS,
+    "Incrementar Dirección cada iteración"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CHEAT_ADD_NEW_AFTER,
     "Agregar nuevo truco después de este"
@@ -7603,13 +7670,81 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
-    "Split Joy-Con"
+    "Joy-Con separados"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
-    "Reset To Defaults"
+    "Restablecer configuraciones"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
-    "Reset the current configuration to default values."
+    "Cambia la configuración acutal a los valores por defecto"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+    "Tema de color del menú"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Blanco Básico"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Negro Básico"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Seleccione un color diferente"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+    "Usar los colores del sistema"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+    "Preferir los colores del sistema operativo si están disponibles"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_LOWEST,
+    "Muy Baja"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_LOWER,
+    "Baja"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_NORMAL,
+    "Normal"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_HIGHER,
+    "Alta"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_HIGHEST,
+    "Ultra"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No hay música disponibles"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No hay videos disponibles"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No hay imágenes disponibles"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No hay favoritos disponibles"
+    )
+MSG_HASH(
+    MSG_MISSING_ASSETS,
+    "ADVERTENCIA: Faltan recursos, use el Actualizador si está disponible"
+    )
\ No newline at end of file
diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h
index 772a6a0c57..2d9a560a34 100644
--- a/intl/msg_hash_fr.h
+++ b/intl/msg_hash_fr.h
@@ -1607,6 +1607,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "Tronquer l'overscan (Reload)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "Désactiver le compositeur de bureau")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "Écran inférieur 3DS")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "Pilote vidéo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -3484,3 +3486,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Reset the current configuration to default values."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "Couleur du thème du menu")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h
index 6cad54ff30..fe7be6d34a 100644
--- a/intl/msg_hash_it.h
+++ b/intl/msg_hash_it.h
@@ -1637,6 +1637,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "Crop Overscan (Ricarica)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "Disattiva composizione del Desktop")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "3DS Bottom Screen")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "Driver Video")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -3544,3 +3546,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Reimposta la configurazione corrente ai valori predefiniti."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "Colore del tema di Menu ")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Bianco Basic "
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Nero Basic"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Seleziona un tema con colorazione diversa."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Usa la colorazione preferita di sistema")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Utilizza la colorazione dei temi del sistema operativo (se presente) - impostazioni del tema di override.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Molto Basso")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Basso")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normale")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Alto")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Molto Alto")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "Nessuna musica disponibile"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "Nessun video disponibile."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "Nessuna immagine disponibile."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "Nessun preferito disponibile."
+    )
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index cd9030d9ce..813efe054a 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -152,11 +152,11 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_MENU_SETTINGS,
-      "メニューの外観に関係する設定を変更する。"
+      "メニューの外観に関係する設定を変更します。"
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_LATENCY_SETTINGS,
-      "ビデオやオーディオ、入力の遅延に関係する設定を変更します。"
+      "ビデオやオーディオ、入力の遅延に関係する設定を\n変更します。"
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC,
@@ -244,7 +244,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST,
-      "設定ファイル"
+      "メイン設定ファイル"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ADD_TAB,
@@ -344,7 +344,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE,
-      "オーバーライドファイルを自動的にロード"
+      "優先設定ファイルを自動的にロード"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE,
@@ -546,7 +546,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIG,
-      "コンフィグ"
+      "メイン設定ファイル"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIGURATIONS,
@@ -554,7 +554,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS,
-      "設定"
+      "設定ファイル"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT,
@@ -721,7 +721,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS,
       "Frontend Counters")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS,
-      "コンテンツ特定のコア設定を自動的にロード")
+      "コンテンツごとのコア設定を自動的にロード")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE,
       "Create game-options file")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE,
@@ -1480,7 +1480,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_THUMBNAIL_ENABLE,
       "ステートセーブのサムネイル")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG,
-      "現在の設定を保存")
+      "現在のメイン設定を保存")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
       "コアの優先を保存")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR,
@@ -1488,7 +1488,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
       "ゲームの優先を保存")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG,
-      "新しい設定を保存")
+      "新しいメイン設定を保存")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_STATE,
       "ステートセーブ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS,
@@ -1786,7 +1786,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_SLANG_SHADERS,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_USER,
       "ユーザー")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS,
-      "ユーザーインタフェース")
+      "ユーザーインターフェース")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_LANGUAGE,
       "言語")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_SETTINGS,
@@ -1811,6 +1811,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "オーバースキャンをクロップ（再起動が必要）")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "デスクトップコンポジションを無効")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "3DSボトム画面")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "ビデオのドライバ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -1850,7 +1852,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y,
       "OSDメッセージのY位置")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX,
-      "モニタのインデックス")
+      "モニターの識別番号")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_POST_FILTER_RECORD,
       "事後フィルターの録画を有効")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE,
@@ -1898,9 +1900,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_THREADED,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VFILTER,
       "非フリッカー")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_HEIGHT,
-      "カスタムビューポートの縦幅")
+      "カスタムビューポートの高さ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
-      "カスタムビューポートの横幅")
+      "カスタムビューポートの幅")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X,
       "カスタムビューポートのX位置")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
@@ -1912,20 +1914,20 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN,
       "ウィンドウフルスクリーンモード")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_WIDTH,
-      "ウィンドウの横幅")
+      "ウィンドウの幅")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_HEIGHT,
-      "ウィンドウの縦幅")
+      "ウィンドウの高さ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_X,
-      "フルスクリーンの横幅")
+      "フルスクリーンの幅")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_Y,
-      "フルスクリーンの縦幅")
+      "フルスクリーンの高さ")
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_X,
-      "非ウィンドウフルスクリーンモードの横幅サイズを指定します。0を指定すると、デスクトップ解像度を使用します。"
+      "フルスクリーンモード時の幅を指定します。0を指定\nすると、デスクトップ解像度が適用されます。\nウィンドウフルスクリーンモードを使用している場合、\n幅はデスクトップ解像度で固定されます。"
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN_Y,
-      "非ウィンドウフルスクリーンモードの縦幅サイズを指定します。0を指定すると、デスクトップ解像度を使用します。"
+      "フルスクリーンモード時の高さを指定します。0を指定\nすると、デスクトップ解像度が適用されます。\nウィンドウフルスクリーンモードを使用している場合、\n高さはデスクトップ解像度で固定されます。"
       )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_DRIVER,
       "Wi-Fiのドライバ")
@@ -2026,57 +2028,57 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_TEST_UNOFFICIAL,
 MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_HARDCORE_MODE_ENABLE,
       "ステートセーブやチート、巻き戻し、早送り、一時停止、スローモーションをすべてのゲームで無効する。")
 MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS,
-      "システムのドライバを変更する。")
+      "システムのドライバを変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS,
-      "実績に関係する設定を変更する。")
+      "実績に関係する設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_SETTINGS,
-      "コアの設定を変更する。")
+      "コアの設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_RECORDING_SETTINGS,
-      "録画の設定を変更する。")
+      "録画の設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONSCREEN_DISPLAY_SETTINGS,
-      "OSDオーバーレイ、キーボードオーバーレイ、OSDメッセージの設定を変更する。")
+      "OSDオーバーレイやキーボードオーバーレイ、\nOSDメッセージの設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS,
-      "巻き戻しや早送り、スローモーションの設定を変更する。")
+      "巻き戻しや早送り、スローモーションの設定を\n変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
-      "保存に関係する設定を変更する。")
+      "保存に関係する設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS,
-      "ログの設定を変更する。")
+      "ログの設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS,
-      "ユーザーインタフェースの設定を変更する。")
+      "ユーザーインターフェースの設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_USER_SETTINGS,
-      "アカウントやユーザー名、言語を変更する。")
+      "アカウントやユーザー名、ユーザーインターフェースの\n言語を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS,
-      "プライバシー設定を変更する。")
+      "プライバシーの設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS,
-      "このシステムの初期ディレクトリーを変更する。")
+      "システムの動作に関係するファイルが格納される\n初期ディレクトリを変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS,
-      "プレイリストの設定を変更する。")
+      "プレイリストの設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_NETWORK_SETTINGS,
-      "ネットワークの設定を変更する。")
+      "ネットワークの設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
-      "コンテンツをスキャンしてデータベースに登録する。")
+      "コンテンツをスキャンしてデータベースに登録します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
-      "オーディオ出力の設定を変更する。")
+      "オーディオ出力の設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
       "Bluetoothを有効する。")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
       "終了時に設定を自動的に保存する。")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
-      "コンフィグファイルのデフォルト設定を変更する。")
+      "設定ファイルのデフォルト設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST,
-      "コンフィグファイルを管理と作成する。")
+      "メイン設定ファイルの作成と管理を行います。")
 MSG_HASH(MENU_ENUM_SUBLABEL_CPU_CORES,
       "CPUのコア数")
 MSG_HASH(MENU_ENUM_SUBLABEL_FPS_SHOW,
       "画面に現在のフレームレートを表示する。")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS,
-      "ホットキー設定を変更する。")
+      "ホットキーの設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
       "同時押しでメニューに切り替え")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_SETTINGS,
-      "ゲームパッド、キーボード、マウスの設定を変更する。")
+      "ゲームパッドやキーボード、マウスの設定を変更\nします。")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_USER_BINDS,
-      "このユーザーの入力設定を変更する。")
+      "このユーザーの入力設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_LOG_VERBOSITY,
       "端末にログすることを有効と無効。")
 MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY,
@@ -2084,9 +2086,9 @@ MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY,
 MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_LAN_SCAN_SETTINGS,
       "ローカルネットワーク上のネットプレイホストをスキャンして接続する。")
 MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
-      "コア、ネットワーク、システムの詳細を表示する。\nデータベースとカーソルのマネジャーを表示する。")
+      "コアやネットワーク、システムの詳細および、\nデータベース、カーソルのマネージャーを\n表示します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
-      "RetroArchにアドオン、コンポーネント、コンテンツをダウンロードする。")
+      "RetroArchにアドオンやコンポーネント、コンテンツを\nダウンロードします。")
 MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
       "フォルダのネットワーク共有を有効する。")
 MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
@@ -2096,11 +2098,11 @@ MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
 MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
       "SSHでのアクセスを有効する。")
 MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
-      "システムのスクリーンセーバーをアクティブになることを予防する。")
+      "システムのスクリーンセーバーの起動を防止します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
-      "コアのビューポートサイズを基準にしたウィンドウサイズを指定します。横幅と縦幅が一定の固定ウィンドウサイズを指定することもできます(下の項目)。")
+      "コアが出力するビューポートサイズを基準に\nウィンドウをスケールします。下の項目では、一定の\n幅と高さが適用される固定ウィンドウサイズを\n設定できます。")
 MSG_HASH(MENU_ENUM_SUBLABEL_USER_LANGUAGE,
-      "インタフェースの言語を変更する。")
+      "ユーザーインターフェースの言語を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION,
       "フレームの間に黒フレームを挿入する。60Hzコンテンツを120Hz画面でやることを役に立つ。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY,
@@ -2110,17 +2112,17 @@ MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES,
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
       "指定するバッファーモードをビデオドライバに伝える。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MONITOR_INDEX,
-      "希望する画面を選択する。")
+      "フルスクリーン画面を表示するモニターの識別番号を\n選択します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_AUTO,
       "画面の正確な推定のリフレッシュレート")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_POLLED,
       "ディスプレイドライバーによって提供されたリフレッシュレート")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_SETTINGS,
-      "ビデオ出力の設定を変更する。")
+      "ビデオ出力の設定を変更します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_WIFI_SETTINGS,
       "無線ネットワークを検索して接続する。")
 MSG_HASH(MENU_ENUM_SUBLABEL_HELP_LIST,
-      "RetroArchの使い方について学ぶ。")
+      "RetroArchの基本的な使い方についてのヘルプを表示\nします。")
 MSG_HASH(MENU_ENUM_SUBLABEL_CHEAT_APPLY_CHANGES,
       "チートの変更点を今すぐに適用する。")
 MSG_HASH(MSG_ADDED_TO_FAVORITES,
@@ -2446,7 +2448,7 @@ MSG_HASH(MSG_REWIND_INIT_FAILED_THREADED_AUDIO,
 MSG_HASH(MSG_REWIND_REACHED_END,
       "巻き戻しバッファの終わりに達しました")
 MSG_HASH(MSG_SAVED_NEW_CONFIG_TO,
-      "新しいコンフィグを保存しました to")
+      "新しいメイン設定ファイルを保存しました to")
 MSG_HASH(MSG_SAVED_STATE_TO_SLOT,
       "スロット%dにステートセーブしました")
 MSG_HASH(MSG_SAVED_STATE_TO_SLOT_AUTO,
@@ -2522,7 +2524,7 @@ MSG_HASH(MSG_VIRTUAL_DISK_TRAY,
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_LATENCY,
       "ミリ秒でのオーディオ遅延。ドライバ対応による。")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_MUTE,
-      "オーディオを消音する。")
+      "オーディオを消音します。")
 MSG_HASH(
       MENU_ENUM_SUBLABEL_AUDIO_RATE_CONTROL_DELTA,
       "Helps smooth out imperfections in timing when synchronizing audio and video at the same time. Be aware that if disabled, proper synchronization is nearly impossible to obtain."
@@ -2587,7 +2589,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_AUDIO_ENABLE,
-   "オーディオ出力を有効にする。"
+   "オーディオ出力を有効にします。"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_AUDIO_MAX_TIMING_SKEW,
@@ -2723,11 +2725,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME_LAN,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND,
       "対応するコンテンツが見つかりました")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_CROP_OVERSCAN,
-      "開発者によって慣例的に空白にされていたイメージの端にあるいくつかのピクセルを切り取ります。 不正確なピクセルを含むこともあります。")
+      "コンテンツの開発者によって慣例的に空白にされていた\nイメージの端にあるいくつかのピクセルを\n切り取ります。不正確なピクセルを含むことも\nあります。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_SMOOTH,
-      "画像にわずかなぼかしを加えて、ピクセルのエッジを柔らかくします。このオプションは、パフォーマンスにはほとんど影響しません。")
+      "イメージにわずかなぼかしを加えて、ピクセルの輪郭の\n硬さを和らげます。このオプションは\nパフォーマンスにはほとんど影響しません。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FILTER,
-      "CPUベースのビデオフィルターを適用します。備考: パフォーマンスを多く消費するかもしれません。一部のビデオフィルターは、32bitまたは16bitカラーを使用するコアでのみ動作する可能性があります。")
+      "CPUベースのビデオフィルターを適用します。\n一部のビデオフィルターは、コアによっては動作しない\n可能性があります。また、パフォーマンスに大きく\n影響します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_USERNAME,
       "RetroAchievementsアカウントのユーザー名")
 MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_PASSWORD,
@@ -2737,34 +2739,44 @@ MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_NICKNAME,
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_POST_FILTER_RECORD,
       "Capture the image after filters (but not shaders) are applied. Your video will look as fancy as what you see on your screen.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_LIST,
-      "使用するコアを選択する。")
+      "使用するコアを選択します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_CONTENT_LIST,
-      "起動するコンテンツを選択する。")
+      "起動するコンテンツを選択します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_NETWORK_INFORMATION,
       "ネットワークインタフェースとIPアドレスを表示する。")
 MSG_HASH(MENU_ENUM_SUBLABEL_SYSTEM_INFORMATION,
       "デバイス特定の仕様")
 MSG_HASH(MENU_ENUM_SUBLABEL_QUIT_RETROARCH,
-      "アプリを終了する。")
+      "RetroArchを終了します。")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_ASPECT_RATIO,
+      "アスペクト比が「コンフィグ」に設定されている場合に\n使用されるアスペクト比の浮動小数点値（幅/高さ）\nです。")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_HEIGHT,
+      "アスペクト比が「カスタム」に設定されている場合に\n使用されるカスタムビューポートの高さです。")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH,
+      "アスペクト比が「カスタム」に設定されている場合に\n使用されるカスタムビューポートの幅です。")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_X,
+      "ビューポートのX軸位置を定義するために使用される\nカスタムビューポートのオフセット値です。\n「整数スケール」が有効になっている場合は無視され、\nビューポートは自動的に中央寄せされます。")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
+      "ビューポートのY軸位置を定義するために使用される\nカスタムビューポートのオフセット値です。\n「整数スケール」が有効になっている場合は無視され、\nビューポートは自動的に中央寄せされます。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH,
-      "ディスプレイのカスタムビデオ横幅を指定します。0を指定すると可能な限りウィンドウをスケールします。")
+      "ウィンドウの幅を指定します。0を指定すると\n可能な限りウィンドウをスケールします。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT,
-      "ディスプレイのカスタムビデオ縦幅を指定します。0を指定すると可能な限りウィンドウをスケールします。")
+      "ウィンドウの高さを指定します。0を指定すると\n可能な限りウィンドウをスケールします。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_X,
-      "OSDのカスタムX軸を指定する。")
+      "OSDのカスタムX軸位置を指定します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_MESSAGE_POS_Y,
-      "OSDのカスタムY軸を指定する。")
+      "OSDのカスタムY軸位置を指定します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FONT_SIZE,
       "ポイントでのフォントサイズ")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_OVERLAY_HIDE_IN_MENU,
       "メニュー表示中はオーバーレイを隠し、メニューを閉じたときに再表示する。")
 MSG_HASH(
       MENU_ENUM_SUBLABEL_CONTENT_COLLECTION_LIST,
-      "スキャンされたコンテンツがここに表示されます。"
+      "スキャンしたコンテンツを表示します。"
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_SCALE_INTEGER,
-      "ビデオのスケールを整数に限定します。基礎サイズはシステムによって報告されたジオメトリとアスペクト比に依存します。「強制アスペクト比」が指定されていない場合、横幅と縦幅はそれぞれ独立して整数でスケールされます。"
+      "ビデオのスケールを整数に限定します。基礎サイズは\nシステムが提供するジオメトリとアスペクト比に依存\nします。「強制アスペクト比」が指定されていない\n場合、幅と高さはそれぞれ整数でスケールされます。"
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_GPU_SCREENSHOT,
@@ -2776,15 +2788,15 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_FORCE_SRGB_DISABLE,
-      "sRGB FBOの対応を強制的に無効にします。sRGB FBOの対応が有効になっている一部のWindows用Intel Open GLドライバはビデオ問題を有します。この機能を有効にすることで問題を回避できます。"
+      "sRGB FBOの対応を強制的に無効にすることで、一部の\nWindows用Intel OpenGLドライバで発生するビデオの\n問題を回避します。"
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_FULLSCREEN,
-      "フルスクリーンで起動する。実行時にも切り替えできる。"
+      "フルスクリーンで起動します。実行時にも切り替え\n可能です。"
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_WINDOWED_FULLSCREEN,
-      "フルスクリーンであればウィンドウフルスクリーンモードを使用する。"
+      "ウィンドウフルスクリーンモードを使用します。"
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_GPU_RECORD,
@@ -2912,7 +2924,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_AUDIO_DEVICE,
-      "オーディオドライバーが使用する標準オーディオデバイスをオーバーライドする。\nこの設定はドライバーに依存する。"
+      "オーディオドライバーが使用する\n標準オーディオデバイスをオーバーライドします。\nこの設定はドライバーに依存します。"
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_AUDIO_DSP_PLUGIN,
@@ -3000,24 +3012,24 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_NETPLAY_ENABLE_HOST,
-      "ネットプレイをホスト(サーバー)モードで有効にします。"
+      "ネットプレイをホスト (サーバー) モードで有効に\nします。"
       )
 MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_ENABLE_CLIENT,
       "ネットプレイをクライアントモードで有効にします。")
 MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_DISCONNECT,
       "アクティブなネットプレイ接続を切断する。")
 MSG_HASH(MENU_ENUM_SUBLABEL_SCAN_DIRECTORY,
-      "対応ファイルをフォルダからスキャンしてコレクションに追加します。")
+      "フォルダ内のすべての対応ファイルをスキャンして\nコレクションに追加します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_SCAN_FILE,
-      "対応ファイルをスキャンしてコレクションに追加します。")
+      "対応ファイルをスキャンしてコレクションに追加\nします。")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_SWAP_INTERVAL,
       "Uses a custom swap interval for Vsync. Set this to effectively halve monitor refresh rate."
       )
 MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE,
-      "使用したコアの名前に基づいてセーブファイルをフォルダごとに分類します。"
+      "使用したコアの名前に基づいてセーブファイルを\nフォルダごとに分類します。"
       )
 MSG_HASH(MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE,
-      "使用したコアの名前に基づいてステートセーブをフォルダごとに分類します。"
+      "使用したコアの名前に基づいてステートセーブを\nフォルダごとに分類します。"
       )
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_UPDATER_BUILDBOT_URL,
       "URL to core updater directory on the Libretro buildbot.")
@@ -3116,7 +3128,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_THUMBNAILS_DIRECTORY,
       "サムネイルファイルの保存フォルダ"
       )
 MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_CONFIG_DIRECTORY,
-      "設定ファイルブラウザーの初期ディレクトリを指定する。")
+      "設定ファイルブラウザの初期ディレクトリを指定します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_INPUT_LATENCY_FRAMES_MIN,
       "The number of frames of input latency for netplay to use to hide network latency. This reduces jitter and makes netplay less CPU-intensive, at the expense of noticeable input lag.")
 MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_INPUT_LATENCY_FRAMES_RANGE,
@@ -3264,7 +3276,7 @@ MSG_HASH(
       "オーディオミキサーを消音"
       )
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_MIXER_MUTE,
-      "ミキサーオーディオを消音/消音解除にする。")
+      "ミキサーオーディオを消音します。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_ONLINE_UPDATER,
       "オンラインアップデーターを表示")
 MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_ONLINE_UPDATER,
@@ -3286,7 +3298,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_DELETE,
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_DELETE,
       "コアをハードディスクから削除する。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RENAME_ENTRY,
-      "エントリーの名前を変更する")
+      "エントリーの名前を変更")
 MSG_HASH(MENU_ENUM_SUBLABEL_RENAME_ENTRY,
       "このエントリーのタイトルを変更します。")
 MSG_HASH(MENU_ENUM_LABEL_RENAME_ENTRY,
@@ -3298,19 +3310,19 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES,
       "お気に入り")
 MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES,
-      "「お気に入りに追加」したコンテンツがここに表示されます。")
+      "お気に入りに追加したコンテンツを表示します。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC,
       "音楽")
 MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC,
-      "再生した音楽がここに表示されます。")
+      "再生した音楽を表示します。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES,
       "画像")
 MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES,
-      "表示した画像がここに表示されます。")
+      "表示した画像を表示します。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO,
       "ビデオ")
 MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO,
-      "再生したビデオがここに表示されます。")
+      "再生したビデオ表示します。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE,
       "メニューのアイコン")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE,
@@ -3346,9 +3358,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_INFORMATION,
 MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_INFORMATION,
       "「情報」オプションを表示/非表示にする。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_CONFIGURATIONS,
-      "「設定ファイル」を表示")
+      "「メイン設定ファイル」を表示")
 MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_CONFIGURATIONS,
-      "「設定ファイル」オプションを表示/非表示にする。")
+      "「メイン設定ファイル」オプションを表示/非表示にする。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP,
       "「ヘルプ」を表示")
 MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_HELP,
@@ -3484,7 +3496,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_OPACITY,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_QUALITY,
       "オーディオリサンプラーの音質")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_RESAMPLER_QUALITY,
-      "オーディオ品質よりもパフォーマンス/遅延を優先する場合は低い設定を、パフォーマンス/遅延よりもオーディオ品質を優先する場合は高い設定を選択します。")
+      "オーディオ品質よりもパフォーマンス/遅延を優先する\n場合は低い設定を、パフォーマンス/遅延よりも\nオーディオ品質を優先する場合は高い設定を選択\nします。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_WATCH_FOR_CHANGES,
       "シェーダーファイルの変更を監視")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_SHOW_DECORATIONS,
@@ -3522,11 +3534,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_OVERLAYS,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE_MENU,
       "メニューのオーディオを有効")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_ENABLE_MENU,
-      "メニューの音を有効または無効にする。")
+      "メニューのオーディオ出力を有効にします。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AUDIO_MIXER_SETTINGS,
       "ミキサー設定")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_MIXER_SETTINGS,
-      "オーディオミキサー設定を表示/編集する。")
+      "オーディオミキサーの設定を表示/編集します。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_INFO,
       "詳細")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_FILE,
@@ -3676,29 +3688,29 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_VIEW_TYPE_LIST,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS,
       "オーバーライド")
 MSG_HASH(MENU_ENUM_SUBLABEL_QUICK_MENU_OVERRIDE_OPTIONS,
-      "グローバル設定をオーバーライドするための設定です。")
+      "メイン設定をオーバーライドするための設定です。")
 MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY,
-      "オーディオストリームの再生を開始します。再生が終わると、現在のオーディオストリームはメモリから取り除かれます。")
+      "オーディオストリームの再生を開始します。再生が\n終わると、現在のオーディオストリームはメモリから\n取り除かれます。")
 MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_LOOPED,
-      "オーディオストリームの再生を開始します。再生が終わると、トラックは最初から繰り返して再生されます。")
+      "オーディオストリームの再生を開始します。再生が\n終わると、トラックは最初から繰り返して再生\nされます。")
 MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_PLAY_SEQUENTIAL,
-      "オーディオストリームの再生を開始します。再生が終わると、順番に次のオーディオストリームに\n移り、それを繰り返します。アルバム再生モードとして便利です。")
+      "オーディオストリームの再生を開始します。再生が\n終わると、順番に次のオーディオストリームに移り、\nそれを繰り返します。アルバム再生モードとして\n便利です。")
 MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_STOP,
-      "オーディオストリームの再生を停止します。メモリからは取り除かれず、「再生」を選択することで再び再生を開始できます。")
+      "オーディオストリームの再生を停止します。\nメモリからは取り除かれず、「再生」を選択する\nことで再び再生を開始できます。")
 MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_REMOVE,
-      "オーディオストリームの再生を停止してメモリから完全に取り除きます。")
+      "オーディオストリームの再生を停止してメモリから\n完全に取り除きます。")
 MSG_HASH(MENU_ENUM_SUBLABEL_MIXER_ACTION_VOLUME,
       "オーディオストリームの音量を調整します。")
 MSG_HASH(MENU_ENUM_SUBLABEL_ADD_TO_MIXER,
-      "このオーディオトラックを使用可能なオーディオストリームスロットに追加します。空きスロットが存在しない場合は無視されます。")
+      "このオーディオトラックを使用可能な\nオーディオストリームスロットに追加します。\n空きスロットが存在しない場合は無視されます。")
 MSG_HASH(MENU_ENUM_SUBLABEL_ADD_TO_MIXER_AND_PLAY,
-      "このオーディオトラックを使用可能なオーディオストリームスロットに追加して再生します。空きスロットが存在しない場合は無視されます。")
+      "このオーディオトラックを使用可能な\nオーディオストリームスロットに追加して再生します。\n空きスロットが存在しない場合は無視されます。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY,
       "再生")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY_LOOPED,
-      "再生(ループ)")
+      "再生（ループ）")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY_SEQUENTIAL,
-      "再生(順番に)")
+      "再生（順番に）")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_STOP,
       "一時停止")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_REMOVE,
@@ -3736,7 +3748,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MIDI_VOLUME,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS,
       "電源管理")
 MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS,
-      "電源に関係する設定を変更する。")
+      "電源に関係する設定を変更します。")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SUSTAINED_PERFORMANCE_MODE,
       "パフォーマンス維持モード")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_MPV_SUPPORT,
@@ -3877,7 +3889,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
-    "Output native, low-resolution signals for use with CRT displays."
+    "CRTディスプレイで利用するためのネイティブな\n低解像度信号を出力します。"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
@@ -3889,7 +3901,7 @@ MSG_HASH(
     )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE,
-      "設定ファイルで指定されたカスタムリフレッシュレートを使用します。")
+      "設定ファイルで定義されたカスタムリフレッシュレートを使用します。")
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE,
       "カスタムリフレッシュレートを使用")
@@ -3905,7 +3917,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_QUICK_MENU_START_RECORDING,
-    "録画を開始する。"
+    "録画を開始します。"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QUICK_MENU_STOP_RECORDING,
@@ -3913,7 +3925,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_QUICK_MENU_STOP_RECORDING,
-    "録画を停止する。"
+    "録画を停止します。"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QUICK_MENU_START_STREAMING,
@@ -3921,7 +3933,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_QUICK_MENU_START_STREAMING,
-    "ストリーミングを開始する。"
+    "ストリーミングを開始します。"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QUICK_MENU_STOP_STREAMING,
@@ -3929,7 +3941,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_QUICK_MENU_STOP_STREAMING,
-    "ストリーミングを停止する。"
+    "ストリーミングを停止します。"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,
@@ -3983,3 +3995,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "現在の設定をデフォルトの値に戻します。"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "メニューの色テーマ")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h
index dab570bc6b..60b669cbfb 100644
--- a/intl/msg_hash_ko.h
+++ b/intl/msg_hash_ko.h
@@ -1587,6 +1587,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "오버스캔 잘라내기(재시작)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "데스크탑 구성요소 사용안함")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "3DS 하단 화면")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "비디오 드라이버")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -3445,3 +3447,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Reset the current configuration to default values."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "메뉴 테마 색상")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
index 1be69e735f..9ac9cf2db7 100644
--- a/intl/msg_hash_lbl.h
+++ b/intl/msg_hash_lbl.h
@@ -257,6 +257,8 @@ MSG_HASH(MENU_ENUM_LABEL_DATABASE_MANAGER_LIST,
       "database_manager_list")
 MSG_HASH(MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST,
       "deferred_dropdown_box_list")
+MSG_HASH(MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_SPECIAL,
+      "deferred_dropdown_box_list_special")
 MSG_HASH(MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_LIST,
       "deferred_configurations_list")
 MSG_HASH(MENU_ENUM_LABEL_DEFERRED_PLAYLIST_LIST,
@@ -643,6 +645,8 @@ MSG_HASH(MENU_ENUM_LABEL_MAIN_MENU,
       "main_menu")
 MSG_HASH(MENU_ENUM_LABEL_MANAGEMENT,
       "database_settings")
+MSG_HASH(MENU_ENUM_LABEL_OZONE_MENU_COLOR_THEME,
+      "ozone_menu_color_theme")
 MSG_HASH(MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME,
       "materialui_menu_color_theme")
 MSG_HASH(MENU_ENUM_LABEL_MATERIALUI_MENU_FOOTER_OPACITY,
@@ -1723,3 +1727,15 @@ MSG_HASH(MENU_ENUM_LABEL_STREAMING_TITLE,
       "streaming_title")
 MSG_HASH(MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG,
       "reset_to_default_config")
+MSG_HASH(MENU_ENUM_LABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "menu_use_preferred_system_color_theme")
+MSG_HASH(MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE,
+      "no_music")
+MSG_HASH(MENU_ENUM_LABEL_NO_VIDEOS_AVAILABLE,
+      "no_videos")
+MSG_HASH(MENU_ENUM_LABEL_NO_IMAGES_AVAILABLE,
+      "no_images")
+MSG_HASH(MENU_ENUM_LABEL_NO_FAVORITES_AVAILABLE,
+      "no_favorites")
+MSG_HASH(MENU_ENUM_LABEL_VIDEO_3DS_LCD_BOTTOM,
+      "video_3ds_lcd_bottom")
diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h
index d33ee6965c..b32f6d954e 100644
--- a/intl/msg_hash_nl.h
+++ b/intl/msg_hash_nl.h
@@ -107,7 +107,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST_END,
-      "Accounts List Endpoint"
+      "Accounts Lijst Eindpunt"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ACCOUNTS_RETRO_ACHIEVEMENTS,
@@ -180,7 +180,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_MUTE,
-      "Audio Mute"
+      "Geluid uitzetten"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE,
@@ -220,7 +220,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE,
-      "Load Shader Presets Automatically"
+      "Laad Shader Presets Automatisch"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK,
@@ -486,9 +486,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE,
       "<Niets>")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND,
-      "Directory niet gevonden.")
+      "Map niet gevonden.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS,
-      "Directory")
+      "Map")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS,
       "Disk Cycle Tray Status")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND,
@@ -527,6 +527,10 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_FALSE,
       "Niet waar")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FASTFORWARD_RATIO,
       "Maximale afspeelsnelheid")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_FAVORITES_TAB,
+    "Favorieten"
+    )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FPS_SHOW,
       "Framerate weergeven")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE,
@@ -704,7 +708,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_HORIZ_WHEEL_DOWN,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
       "Keyboard Gamepad Mapping Type")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS,
-      "Maximaal Aantal Gebruikers")
+      "Maximum Aantal Gebruikers")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
       "Menu Schakelaar Gamepad Combo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,
@@ -750,15 +754,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,
       "Reset game")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,
-      "Rewind")
+      "Terugspoelen")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,
       "Save state")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,
-      "Take screenshot")
+      "Schermafdruk maken")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,
-      "Next shader")
+      "Volgende shader")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,
-      "Previous shader")
+      "Vorige shader")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION_HOLD_KEY,
       "Slow motion")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,
@@ -774,7 +778,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
       "Verberg Overlay In Menu")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR,
-      "Poll Type Behavior")
+      "Poll Type Gedrag")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_EARLY,
       "Vroeg")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE,
@@ -844,7 +848,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_VIETNAMESE,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_ARABIC,
       "Arabic")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,
-      "Linkse Analoog Stick")
+      "Linkse Analoge Stick")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH,
       "Core")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH,
@@ -936,9 +940,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "Connect to Netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
-      "Begin hosting")
+      "Begin met hosten")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
-      "Eindig netplay host")
+      "Stop met hosten")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "Server Adres")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_MODE,
@@ -990,7 +994,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_ITEMS,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS,
       "Geen prestatie tellers.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PLAYLISTS,
-      "No playlists.")
+      "Geen afspeellijsten.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE,
       "Geen afspeellijst items beschikbaar.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND,
@@ -1054,9 +1058,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_PRESENT,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS,
       "Privacy")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH,
-      "Sluit RetroArch")
+      "RetroArch Afsluiten")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG,
-      "Analog supported")
+      "Analoge besturing ondersteund")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_BBFC_RATING,
       "BBFC Rating")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CERO_RATING,
@@ -1173,7 +1177,15 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN,
       "Start Scherm Weergeven")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
-      "Rechtse Analog Stick")
+      "Rechtse Analoge Stick")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ADD_TO_FAVORITES,
+    "Toevoegen aan Favorieten"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_ADD_TO_FAVORITES_PLAYLIST,
+    "Toevoegen aan Favorieten"
+    )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
       "Run")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
@@ -1490,6 +1502,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "Overscan Afsnijden (Herladen Vereist)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "Desktop Compositie Deactiveren")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "3DS onderste scherm")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "Video Driver")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -1533,7 +1547,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_POST_FILTER_RECORD,
       "Post Filter Opname Activeren")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE,
-      "Vertical Refresh Rate")
+      "Verticale Refresh Rate")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO,
       "Geschatte Scherm Framerate")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_POLLED,
@@ -1589,9 +1603,9 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN,
       "Windowed Fullscreen Mode")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_WIDTH,
-      "Window Width")
+      "Window Breedte")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_HEIGHT,
-      "Window Height")
+      "Window Hoogte")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_DRIVER,
       "Wi-Fi Driver")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
@@ -1599,11 +1613,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR,
       "Menu Alpha Factor")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_RED,
-      "Menu Font Red Color")
+      "Menu Font Rode Kleur")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_GREEN,
-      "Menu Font Green Color")
+      "Menu Font Groene Kleur")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FONT_COLOR_BLUE,
-      "Menu Font Blue Color")
+      "Menu Font Blauwe Kleur")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_FONT,
       "Menu Font")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM,
@@ -1809,13 +1823,13 @@ MSG_HASH(MSG_COMPILED_AGAINST_API,
 MSG_HASH(MSG_CONFIG_DIRECTORY_NOT_SET,
       "Config directory not set. Cannot save new config.")
 MSG_HASH(MSG_CONNECTED_TO,
-      "Connected to")
+      "Verbonden met")
 MSG_HASH(MSG_CONTENT_CRC32S_DIFFER,
       "Content CRC32s differ. Cannot use different games.")
 MSG_HASH(MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT,
       "Content loading skipped. Implementation will load it on its own.")
 MSG_HASH(MSG_CORE_DOES_NOT_SUPPORT_SAVESTATES,
-      "Core does not support save states.")
+      "Core heeft geen save state ondersteuning.")
 MSG_HASH(MSG_CORE_OPTIONS_FILE_CREATED_SUCCESSFULLY,
       "Core options file created successfully.")
 MSG_HASH(MSG_COULD_NOT_FIND_ANY_NEXT_DRIVER,
@@ -1847,7 +1861,7 @@ MSG_HASH(MSG_DID_NOT_FIND_A_VALID_CONTENT_PATCH,
 MSG_HASH(MSG_DISCONNECT_DEVICE_FROM_A_VALID_PORT,
       "Disconnect device from a valid port.")
 MSG_HASH(MSG_DISK_CLOSED,
-      "Closed")
+      "Gesloten")
 MSG_HASH(MSG_DISK_EJECTED,
       "Ejected")
 MSG_HASH(MSG_DOWNLOADING,
@@ -1855,15 +1869,15 @@ MSG_HASH(MSG_DOWNLOADING,
 MSG_HASH(MSG_DOWNLOAD_FAILED,
       "Download mislukt")
 MSG_HASH(MSG_ERROR,
-      "Error")
+      "Fout")
 MSG_HASH(MSG_ERROR_LIBRETRO_CORE_REQUIRES_CONTENT,
       "Libretro core heeft inhoud nodig, maar dat werd niet gegeven.")
 MSG_HASH(MSG_ERROR_LIBRETRO_CORE_REQUIRES_SPECIAL_CONTENT,
       "Libretro core heeft speciaal inhoud nodig, maar dat werd niet gegeven.")
 MSG_HASH(MSG_ERROR_PARSING_ARGUMENTS,
-      "Error parsing arguments.")
+      "Fout opgetreden tijdens het verwerken van de argumenten.")
 MSG_HASH(MSG_ERROR_SAVING_CORE_OPTIONS_FILE,
-      "Error saving core options file.")
+      "Fout opgetreden tijdens het opslaan van core opties bestand.")
 MSG_HASH(MSG_ERROR_SAVING_REMAP_FILE,
       "Fout is opgetreden tijdens het opslaan van remap bestand.")
 MSG_HASH(MSG_ERROR_SAVING_SHADER_PRESET,
@@ -1875,7 +1889,7 @@ MSG_HASH(MSG_EXTRACTING,
 MSG_HASH(MSG_EXTRACTING_FILE,
       "Uitpakken van bestand")
 MSG_HASH(MSG_FAILED_SAVING_CONFIG_TO,
-      "Fout is opgetrijdens tijdens het opslaan van configuratie naar ")
+      "Fout is opgetreden tijdens het opslaan van configuratie naar ")
 MSG_HASH(MSG_FAILED_TO,
       "Failed to")
 MSG_HASH(MSG_FAILED_TO_ACCEPT_INCOMING_SPECTATOR,
@@ -1961,7 +1975,7 @@ MSG_HASH(MSG_FOUND_FIRST_DATA_TRACK_ON_FILE,
 MSG_HASH(MSG_FOUND_LAST_STATE_SLOT,
       "Found last state slot")
 MSG_HASH(MSG_FOUND_SHADER,
-      "Found shader")
+      "Shader gevonden")
 MSG_HASH(MSG_FRAMES,
       "Frames")
 MSG_HASH(MSG_GAME_SPECIFIC_CORE_OPTIONS_FOUND_AT,
@@ -2073,7 +2087,7 @@ MSG_HASH(MSG_REVERTING_SAVEFILE_DIRECTORY_TO,
 MSG_HASH(MSG_REVERTING_SAVESTATE_DIRECTORY_TO,
       "Reverting savestate directory to")
 MSG_HASH(MSG_REWINDING,
-      "Rewinding.")
+      "Terugspoelen.")
 MSG_HASH(MSG_REWIND_INIT,
       "Initializing rewind buffer with size")
 MSG_HASH(MSG_REWIND_INIT_FAILED,
@@ -2081,7 +2095,7 @@ MSG_HASH(MSG_REWIND_INIT_FAILED,
 MSG_HASH(MSG_REWIND_INIT_FAILED_THREADED_AUDIO,
       "Implementation uses threaded audio. Cannot use rewind.")
 MSG_HASH(MSG_REWIND_REACHED_END,
-      "Reached end of rewind buffer.")
+      "Einde bereikt van terugspoel buffer.")
 MSG_HASH(MSG_SAVED_NEW_CONFIG_TO,
       "Saved new config to")
 MSG_HASH(MSG_SAVED_STATE_TO_SLOT,
@@ -2111,7 +2125,7 @@ MSG_HASH(MSG_SKIPPING_SRAM_LOAD,
 MSG_HASH(MSG_SLOW_MOTION,
       "Slow motion.")
 MSG_HASH(MSG_FAST_FORWARD,
-      "Snel vooruit.")
+      "Vooruitspoelen.")
 MSG_HASH(MSG_SLOW_MOTION_REWIND,
       "Slow motion rewind.")
 MSG_HASH(MSG_SRAM_WILL_NOT_BE_SAVED,
@@ -2338,7 +2352,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SNOWFLAKE,
       "Sneeuwvlok")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_REFRESH_ROOMS,
-      "Refresh Room List")
+      "Room Lijst Vernieuwen")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME,
       "Nickname: %s")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME_LAN,
@@ -2356,7 +2370,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_USERNAME,
 MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_PASSWORD,
       "Input the password of your Retro Achievements account.")
 MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_NICKNAME,
-      "Input your user name here. This will be used for netplay sessions, among other things.")
+      "Voer hier je gebruikersnaam in. Dit zal o.a. gebruikt worden voor netplay sessies.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_POST_FILTER_RECORD,
       "Capture the image after filters (but not shaders) are applied. Your video will look as fancy as what you see on your screen.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_LIST,
@@ -2366,7 +2380,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_CONTENT_LIST,
 MSG_HASH(MENU_ENUM_SUBLABEL_NETWORK_INFORMATION,
       "Show network interface(s) and associated IP addresses.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SYSTEM_INFORMATION,
-      "Show information specific to the device.")
+      "Laat apparaat-specifieke informatie zien.")
 MSG_HASH(MENU_ENUM_SUBLABEL_QUIT_RETROARCH,
       "Sluit het programma af.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH,
@@ -2387,7 +2401,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_OVERLAY_HIDE_IN_MENU,
       "Hide the overlay while inside the menu, and show it again when exiting the menu.")
 MSG_HASH(
       MENU_ENUM_SUBLABEL_CONTENT_COLLECTION_LIST,
-      "Scanned content will appear here."
+      "Gescande inhoud zal hier getoond worden."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_SCALE_INTEGER,
@@ -2547,19 +2561,19 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_OVERLAY_OPACITY,
-      "Opacity of all UI elements of the overlay."
+      "Doorzichtigheid van alle UI elementen van de overlay."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_OVERLAY_SCALE,
-      "Scale of all UI elements of the overlay."
+      "Schalering van alle UI elements van de overlay."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_INPUT_OVERLAY_ENABLE,
-      "Enable the overlay."
+      "Activeer de overlay."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_OVERLAY_PRESET,
-      "Select an overlay from the file browser."
+      "Selecteer een overlay d.m.v. bestands beheerder."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_NETPLAY_IP_ADDRESS,
@@ -2888,7 +2902,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_CHEAT_APPLY_CHANGES,
       "Cheat changes will take effect immediately.")
 MSG_HASH(
       MENU_ENUM_SUBLABEL_CHEAT_FILE_LOAD,
-      "Load a cheat file."
+      "Laad een cheat bestand."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_CHEAT_FILE_SAVE_AS,
@@ -2932,7 +2946,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_MIXER_VOLUME,
-      "Audio Mixer Volume Level (dB)"
+      "Audio Mixer Volume Niveau (dB)"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_MIXER_MUTE,
@@ -2951,27 +2965,27 @@ MSG_HASH(MENU_ENUM_SUBLABEL_MENU_SHOW_CORE_UPDATER,
 MSG_HASH(MSG_PREPARING_FOR_CONTENT_SCAN,
       "Preparing for content scan...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_DELETE,
-      "Delete core")
+      "Verwijder core")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_DELETE,
-      "Remove this core from disk.")
+      "Verwijder deze core permanent.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RENAME_ENTRY,
       "Rename the title of the entry.")
 MSG_HASH(MENU_ENUM_LABEL_RENAME_ENTRY,
       "Rename")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_FRAMEBUFFER_OPACITY,
-      "Framebuffer Opacity")
+      "Framebuffer Doorzichtigheid")
 MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY,
       "Modify the opacity of the framebuffer.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_FAVORITES,
-      "Favorites")
+      "Favorieten")
 MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_FAVORITES,
       "Content which you have added to 'Favorites' will appear here.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_MUSIC,
-      "Music")
+      "Muziek")
 MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_MUSIC,
       "Music which has been previously played will appear here.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_IMAGES,
-      "Image")
+      "Afbeeldingen")
 MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_IMAGES,
       "Images which have been previously viewed will appear here.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO,
@@ -2979,7 +2993,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_GOTO_VIDEO,
 MSG_HASH(MENU_ENUM_SUBLABEL_GOTO_VIDEO,
       "Videos which have been previously played will appear here.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_ICONS_ENABLE,
-      "Menu Icons")
+      "Menu Iconen")
 MSG_HASH(MENU_ENUM_SUBLABEL_MATERIALUI_ICONS_ENABLE,
       "Enable/disable the menu icons shown at the lefthand side of the menu entries.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS,
@@ -2987,11 +3001,11 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MAIN_MENU_ENABLE_SETTINGS,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SHOW_SETTINGS_PASSWORD,
       "Set Password For Enabling Settings Tab")
 MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD,
-      "Enter Password")
+      "Voer wachtwoord in")
 MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_OK,
-      "Password correct.")
+      "Wachtwoord is correct.")
 MSG_HASH(MSG_INPUT_ENABLE_SETTINGS_PASSWORD_NOK,
-      "Password incorrect.")
+      "Wachtwoord is incorrect.")
 MSG_HASH(MENU_ENUM_SUBLABEL_XMB_MAIN_MENU_ENABLE_SETTINGS,
       "Enables the Settings tab. A restart is required for the tab to appear.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SHOW_SETTINGS_PASSWORD,
@@ -3093,7 +3107,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_KIOSK_MODE_PASSWORD,
 MSG_HASH(MENU_ENUM_SUBLABEL_MENU_KIOSK_MODE_PASSWORD,
       "Supplying a password when enabling kiosk mode makes it possible to later disable it from the menu, by going to the Main Menu, selecting Disable Kiosk Mode and entering the password.")
 MSG_HASH(MSG_INPUT_KIOSK_MODE_PASSWORD,
-      "Enter Password")
+      "Voer Wachtwoord In")
 MSG_HASH(MSG_INPUT_KIOSK_MODE_PASSWORD_OK,
       "Wachtwoord correct.")
 MSG_HASH(MSG_INPUT_KIOSK_MODE_PASSWORD_NOK,
@@ -3105,7 +3119,7 @@ MSG_HASH(MENU_ENUM_SUBLABEL_AUTOMATICALLY_ADD_CONTENT_TO_PLAYLIST,
 MSG_HASH(MSG_SCANNING_OF_FILE_FINISHED,
       "Scanning of file finished")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_QUALITY,
-      "Audio Resampler Quality")
+      "Audio Resampler Kwaliteit")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_RESAMPLER_QUALITY,
       "Lower this value to favor performance/lower latency over audio quality, increase if you want better audio quality at the expense of performance/lower latency.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_STATISTICS_SHOW,
@@ -3142,7 +3156,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE_MENU,
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_ENABLE_MENU,
       "Enable or disable menu sound.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_AUDIO_MIXER_SETTINGS,
-      "Mixer Settings")
+      "Mixer Instellingen")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_MIXER_SETTINGS,
       "View and/or modify audio mixer settings.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_QUICK_MENU_OVERRIDE_OPTIONS,
@@ -3168,17 +3182,17 @@ MSG_HASH(MENU_ENUM_SUBLABEL_ADD_TO_MIXER_AND_PLAY,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY,
       "Play")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY_LOOPED,
-      "Play (Looped)")
+      "Afspelen (Loop)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_PLAY_SEQUENTIAL,
-      "Play (Sequential)")
+      "Afspelen (Sequentieel)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_STOP,
       "Stop")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_REMOVE,
-      "Remove")
+      "Verwijderen")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MIXER_ACTION_VOLUME,
       "Volume")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DETECT_CORE_LIST_OK_CURRENT_CORE,
-      "Current core")
+      "Huidige core")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_SEARCH_CLEAR,
       "Clear")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
@@ -3186,21 +3200,21 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME,
       "In-Game")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_IN_GAME_PAUSED,
-      "In-Game (Paused)")
+      "In-Game (Gepauzeerd)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PLAYING,
-      "Playing")
+      "Afspelen")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DISCORD_STATUS_PAUSED,
-      "Paused")
+      "Gepauzeerd")
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
-      "Enable Discord"
+      "Discord Inschakelen"
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
       "Enable or disable Discord support. Will not work with the browser version, only native desktop client."
       )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS,
-      "Power Management")
+      "Energiebeheer")
 MSG_HASH(MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS,
       "Change power management settings.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SUSTAINED_PERFORMANCE_MODE,
@@ -3229,7 +3243,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
-    "X-Axis Centering"
+    "X-As Centering"
     )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE,
@@ -3245,19 +3259,19 @@ MSG_HASH(
       "Output Display ID")
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QUICK_MENU_START_RECORDING,
-    "Start Recording"
+    "Start Opname"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_QUICK_MENU_START_RECORDING,
-    "Starts recording."
+    "Start met opnemen."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QUICK_MENU_STOP_RECORDING,
-    "Stop Recording"
+    "Stop Opname"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_QUICK_MENU_STOP_RECORDING,
-    "Stops recording."
+    "Stop met opnemen."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QUICK_MENU_START_STREAMING,
@@ -3306,16 +3320,64 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_YOUTUBE_STREAM_KEY,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_STREAMING_MODE,
       "Streaming Mode")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_STREAMING_TITLE,
-      "Title of Stream")
+      "Titel van Stream")
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
     "Split Joy-Con"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
-    "Reset To Defaults"
+    "Fabrieksinstellingen resetten"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
-    "Reset the current configuration to default values."
+    "Reset de instellingen aar fabrieksinstellingen."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "Oke"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "Menu Kleur Thema")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Wit"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Zwart"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Laagst")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lager")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normaal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Hoger")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Hoogst")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "Geen muziek beschikbaar."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "Geen videos beschikbaar."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "Geen afbeeldingen beschikbaar."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "Geen favorieten beschikbaar."
     )
diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h
index 26ed0fd143..882a39f1bc 100644
--- a/intl/msg_hash_pl.h
+++ b/intl/msg_hash_pl.h
@@ -1741,6 +1741,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "Przytnij Overscan (Przeładuj)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "Wyłącz kompozycję pulpitu")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "Dolny ekran 3DS")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "Sterownik wideo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -3705,11 +3707,11 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_RECORD_QUALITY,
-    "Record Quality"
+    "Jakość rekordu"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_STREAM_QUALITY,
-    "Stream Quality"
+    "Jakość strumienia"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_STREAMING_URL,
@@ -3717,7 +3719,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT,
-    "UDP Stream Port"
+    "Port Strumienia UDP"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH,
@@ -3728,22 +3730,70 @@ MSG_HASH(
     "YouTube"
     )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_TWITCH_STREAM_KEY,
-      "Twitch Stream Key")
+      "Klucz strumienia Twitch")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_YOUTUBE_STREAM_KEY,
-      "YouTube Stream Key")
+      "Klucz strumienia YouTube")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_STREAMING_MODE,
-      "Streaming Mode")
+      "Tryb przesyłania strumieniowego")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_STREAMING_TITLE,
-      "Title of Stream")
+      "Tytuł strumienia")
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
-    "Split Joy-Con"
+    "Podziel Joy-Con"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
-    "Reset To Defaults"
+    "Przywróć domyślne"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
-    "Reset the current configuration to default values."
+    "Zresetuj bieżącą konfigurację do wartości domyślnych."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "Kolor menu")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "podstawowy odcień bieli"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "podstawowy odcień czerni"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Wybierz inny motyw koloru."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Użyj preferowanego motywu kolorystycznego systemu")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Użyj motywu kolorystycznego systemu operacyjnego (jeśli jest dostępny) - zastępuje ustawienia kompozycji.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Najniższa")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Niższa")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normalna")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Wyższa")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Najwyższa")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "Brak muzyki."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "Brak filmów."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "Brak zdjęć."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "Brak ulubionych."
     )
diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h
index ec0cb6b929..adcad4badf 100644
--- a/intl/msg_hash_pt_br.h
+++ b/intl/msg_hash_pt_br.h
@@ -1,3 +1,29 @@
+#ifdef HAVE_LAKKA_SWITCH
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SWITCH_GPU_PROFILE,
+    "Overclock da GPU"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SWITCH_GPU_PROFILE,
+    "Faz um Overclock ou underclock na CPU do Switch"
+    )
+ MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SWITCH_BACKLIGHT_CONTROL,
+    "Brilho da tela"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SWITCH_BACKLIGHT_CONTROL,
+    "Aumentar ou diminuir o brilho da tela do Switch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_SWITCH_CPU_PROFILE,
+    "Overclock da CPU"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_SWITCH_CPU_PROFILE,
+    "Faz um Overclock na CPU do Switch"
+    )
+#endif
 MSG_HASH(
     MSG_COMPILER,
     "Compilador"
@@ -8,7 +34,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MSG_NATIVE,
-    "Native")
+    "Nativo")
 MSG_HASH(
     MSG_DEVICE_DISCONNECTED_FROM_PORT,
     "Dispositivo desconectado da porta"
@@ -235,7 +261,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST,
-    "Configurações"
+    "Arquivo de Configuração"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_ADD_TAB,
@@ -1489,6 +1515,10 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LANG_ARABIC,
     "Árabe"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_GREEK,
+    "Grego"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,
     "Analógico Esquerdo"
@@ -2160,6 +2190,10 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RECORD_CONFIG,
     "Carregar Configuração de Gravação..."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STREAM_CONFIG,
+    "Configuração de Transmissão Personalizada"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RECORD_DRIVER,
     "Driver de Gravação"
@@ -2876,6 +2910,46 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
     "Exibir data e hora"
     )
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE,
+       "Estilo da data / hora"
+    )
+MSG_HASH(
+     MENU_ENUM_SUBLABEL_TIMEDATE_STYLE,
+     "Altera o estilo da data atual ou como a hora é mostrada dentro do menu."
+    )
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS,
+     "YYYY-MM-DD HH:MM:SS"
+    )
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM,
+     "YYYY-MM-DD HH:MM"
+    )
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY,
+     "MM-DD-YYYY HH:MM"
+    )
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS,
+     "HH:MM:SS"
+    )
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM,
+     "HH:MM"
+    )
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DM_HM,
+     "DD/MM HH:MM"
+    )
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM,
+     "MM/DD HH:MM"
+    )
+ MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_AM_PM,
+     "HH:MM:SS (AM/PM)"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_TITLE_COLOR,
     "Cor do título do menu"
@@ -3024,6 +3098,10 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
     "Desativar Composição da Área de Trabalho"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+    "Tela Inferior 3DS"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
     "Driver de Vídeo"
@@ -4542,7 +4620,8 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE,
-    "Taxa de atualização vertical da sua tela. Utilizado para calcular uma taxa de saída de áudio adequada. OBS: Isto será ignorado se a função 'Vídeo Paralelizado' estiver habilitada."
+    "Taxa de atualização vertical da sua tela. Utilizado para calcular uma taxa de saída de áudio adequada.\n"
+    "OBS: Isto será ignorado se a função 'Vídeo Paralelizado' estiver habilitada."
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_AUDIO_ENABLE,
@@ -4766,7 +4845,8 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_VIDEO_FILTER,
-    "Aplica um filtro de vídeo processado pela CPU. OBS: Pode vir a um alto custo de desempenho. Alguns filtros de vídeo podem funcionar apenas para núcleos que usam cores de 32 bits ou 16 bits."
+    "Aplica um filtro de vídeo processado pela CPU.\n"
+    "OBS: Pode vir a um alto custo de desempenho. Alguns filtros de vídeo podem funcionar apenas para núcleos que usam cores de 32 bits ou 16 bits."
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CHEEVOS_USERNAME,
@@ -4920,6 +5000,19 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_CHEAT_APPLY_AFTER_LOAD,
     "Aplicar trapaças automaticamente quando o jogo for carregado."
 )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_REPEAT_COUNT,
+    "O número de vezes que a trapaça será aplicada.\n"
+    "Use com as outras duas opções de iteração para afetar grandes áreas da memória."
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_ADDRESS,
+    "Após cada 'Número de Iterações', o Endereço de Memória será aumentado pelo número de vezes do 'Tamanho da Pesquisa da Memória'."
+)
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_VALUE,
+    "Após cada Número de Iterações, o Valor será aumentado por esse valor."
+    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_REWIND_GRANULARITY,
     "Ao definir um número de quadros para o rebobinamento, você pode retroceder vários quadros de uma só vez, aumentando a velocidade da função."
@@ -5022,7 +5115,8 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CHEAT_BIG_ENDIAN,
-    "Big endian  : 258 = 0x0102,\nLittle endian : 258 = 0x0201"
+    "Big endian  : 258 = 0x0102,\n"
+    "Little endian : 258 = 0x0201"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_LIBRETRO_LOG_LEVEL,
@@ -5570,7 +5664,8 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_DPI_OVERRIDE_VALUE,
-    "Define o tamanho do dimensionamento personalizado aqui. OBS: Você deve habilitar a função 'Redefinição de DPI' para que este dimensionamento tenha efeito."
+    "Define o tamanho do dimensionamento personalizado aqui.\n"
+    "OBS: Você deve habilitar a função 'Redefinição de DPI' para que este dimensionamento tenha efeito."
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CORE_ASSETS_DIRECTORY,
@@ -5922,7 +6017,8 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_PLAYLIST_ENTRY_RENAME,
-    "Permitir renomear itens"    )
+    "Permitir renomear itens"
+    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_RENAME_ENTRY,
     "Renomear o título do item."
@@ -5957,11 +6053,11 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_MENU_SHOW_CONFIGURATIONS,
-    "Exibir Configurações"
+    "Exibir Arquivo de Configuração"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_MENU_SHOW_CONFIGURATIONS,
-    "Exibir/ocultar a opção 'Configurações'."
+    "Exibir/ocultar a opção 'Arquivo de Configuração'."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP,
@@ -6257,7 +6353,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_SUPER,
-    "Switch among native and ultrawide super resolutions."
+    "Alterna entre resoluções nativas e ultrawide."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CRT_SWITCH_RESOLUTION_SUPER,
@@ -6498,6 +6594,7 @@ MSG_HASH(
     "<li>reiniciar o RetroArch caso alguma das situações acima tenha sido feita</li></ul>\n"
     "E finalmente, o conteúdo deve corresponder as bases de dados existentes <a href=\"https://docs.libretro.com/guides/roms-playlists-thumbnails/#sources\">aqui</a>. Se ainda não estiver funcionando, considere <a href=\"https://www.github.com/libretro/RetroArch/issues\">enviar um relatório de erro</a>."
     )
+#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_SHOW_WIMP,
     "Exibir Menu Desktop"
@@ -6506,7 +6603,6 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_SHOW_WIMP,
     "Abre o menu desktop se estiver fechado."
     )
-#endif
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QT_DONT_SHOW_AGAIN,
     "Não mostrar isto novamente"
@@ -6688,12 +6784,13 @@ MSG_HASH(
     "Pausado"
     )
 MSG_HASH(
-     MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
+    MENU_ENUM_LABEL_VALUE_DISCORD_ALLOW,
     "Habilitar o Discord"
-     )
+    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_DISCORD_ALLOW,
-    "Habilitar ou desabilitar o suporte ao Discord. Não funcionará com a versão do navegador, apenas o cliente nativo de desktop."
+    "Habilitar ou desabilitar o suporte ao Discord.\n"
+    "Não funcionará com a versão do navegador, apenas o cliente nativo de desktop."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_MIDI_INPUT,
@@ -6823,6 +6920,18 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CHEAT_RUMBLE_SECONDARY_DURATION,
     "Duração (ms) da Vibração Secundária"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_COUNT,
+    "Número de Iterações"
+)
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_VALUE,
+    "Aumento de Valor em Cada Iteração"
+)
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_ADDRESS,
+    "Aumento de Endereço em Cada Iteração"
+)
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CHEAT_ADD_NEW_AFTER,
     "Adicionar Nova Trapaça Depois Desta"
@@ -6919,6 +7028,14 @@ MSG_HASH(
     MENU_ENUM_LABEL_RUMBLE_TYPE_GT_VALUE,
     "Maior Ao Valor da Vibração"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_INCREASE_BY_VALUE,
+    "Aumenta o Valor da Vibração"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_RUMBLE_TYPE_DECREASE_BY_VALUE,
+    "Diminui o Valor da Vibração"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_CHEAT_MEMORY_SIZE_1,
     "1-bit, valor máx. = 0x01"
@@ -7235,6 +7352,10 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QT_DELETE_PLAYLIST,
     "Excluir Lista de Reprodução"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_QT_RENAME_PLAYLIST,
+    "Renomear Lista de Reprodução"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QT_CONFIRM_DELETE_PLAYLIST,
     "Tem certeza de que deseja excluir a lista de reprodução \"%1\"?"
@@ -7457,87 +7578,103 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_ADAPTIVE_VSYNC,
-    "Adaptive Vsync"
+    "Vsync Adaptativo"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_VIDEO_ADAPTIVE_VSYNC,
-    "V-Sync is enabled until performance falls below the target refresh rate. Can minimize stuttering when performance falls below realtime, and can be more energy efficient."
+    "O V-Sync é ativado até o desempenho ficar abaixo da taxa de atualização desejada. Pode minimizar as travadas quando o desempenho cai abaixo do tempo real e pode ser mais eficiente em termos energéticos."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CRT_SWITCHRES_SETTINGS,
-    "CRT SwitchRes"
+    "SwitchRes CRT"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CRT_SWITCHRES_SETTINGS,
-    "Output native, low-resolution signals for use with CRT displays."
+    "Saída nativa, sinais de baixa resolução para uso com monitores CRT."
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CRT_SWITCH_X_AXIS_CENTERING,
-    "Cycle through these options if the image is not centered properly on the display."
+    "Alterne entre essas opções se a imagem não estiver centralizada corretamente no visor."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CRT_SWITCH_X_AXIS_CENTERING,
-    "X-Axis Centering"
+    "Centralização do Eixo-X"
     )
 MSG_HASH(
-      MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE,
-      "Use a custom refresh rate specified in the config file if needed.")
+    MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE,
+    "Use uma taxa de atualização personalizada especificada no arquivo de configuração, se necessário."
+    )
 MSG_HASH(
-      MENU_ENUM_LABEL_VALUE_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE,
-      "Use Custom Refresh Rate")
+    MENU_ENUM_LABEL_VALUE_CRT_SWITCH_RESOLUTION_USE_CUSTOM_REFRESH_RATE,
+    "Usar Taxa de Atualização Personalizada"
+    )
 MSG_HASH(
-      MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_OUTPUT_DISPLAY_ID,
-      "Select the output port connected to the CRT display.")
+    MENU_ENUM_SUBLABEL_CRT_SWITCH_RESOLUTION_OUTPUT_DISPLAY_ID,
+    "Selecione a porta de saída conectada ao monitor CRT."
+    )
 MSG_HASH(
-      MENU_ENUM_LABEL_VALUE_CRT_SWITCH_RESOLUTION_OUTPUT_DISPLAY_ID,
-      "Output Display ID")
+    MENU_ENUM_LABEL_VALUE_CRT_SWITCH_RESOLUTION_OUTPUT_DISPLAY_ID,
+    "ID da Saída de Exibição"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QUICK_MENU_START_RECORDING,
-    "Start Recording"
+    "Iniciar Gravação"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_QUICK_MENU_START_RECORDING,
-    "Starts recording."
+    "Inicia a gravação."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QUICK_MENU_STOP_RECORDING,
-    "Stop Recording"
+    "Parar Gravação"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_QUICK_MENU_STOP_RECORDING,
-    "Stops recording."
+    "Para a gravação."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QUICK_MENU_START_STREAMING,
-    "Start Streaming"
+    "Iniciar Transmissão"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_QUICK_MENU_START_STREAMING,
-    "Starts streaming."
+    "Inicia a transmissão."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_QUICK_MENU_STOP_STREAMING,
-    "Stop Streaming"
+    "Parar Transmissão"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_QUICK_MENU_STOP_STREAMING,
-    "Stops streaming."
+    "Para a transmissão."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_RECORDING_TOGGLE,
+    "Alternar gravação"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_INPUT_META_STREAMING_TOGGLE,
+    "Alternar transmissão"
+    )
+MSG_HASH(
+    MSG_CHEEVOS_HARDCORE_MODE_DISABLED,
+    "Um estado do jogo foi carregado, Conquistas no Modo Hardcore foram desativadas para a sessão atual. Reinicie para ativar o modo hardcore."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_RECORD_QUALITY,
-    "Record Quality"
+    "Qualidade da Gravação"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_STREAM_QUALITY,
-    "Stream Quality"
+    "Qualidade da Transmissão"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_STREAMING_URL,
-    "Streaming URL"
+    "URL da Transmissão"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_UDP_STREAM_PORT,
-    "UDP Stream Port"
+    "Porta da Transmissão UDP"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_ACCOUNTS_TWITCH,
@@ -7547,23 +7684,99 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_ACCOUNTS_YOUTUBE,
     "YouTube"
     )
-MSG_HASH(MENU_ENUM_LABEL_VALUE_TWITCH_STREAM_KEY,
-      "Twitch Stream Key")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_YOUTUBE_STREAM_KEY,
-      "YouTube Stream Key")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_STREAMING_MODE,
-      "Streaming Mode")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_STREAMING_TITLE,
-      "Title of Stream")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_TWITCH_STREAM_KEY,
+    "Chave da Transmissão do Twitch"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_YOUTUBE_STREAM_KEY,
+    "Chave da Transmissão do YouTube"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STREAMING_MODE,
+    "Modo de Transmissão"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_STREAMING_TITLE,
+    "Título da Transmissão"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_INPUT_SPLIT_JOYCON,
     "Split Joy-Con"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG,
-    "Reset To Defaults"
+    "Restaurar aos Padrões"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
-    "Reset the current configuration to default values."
+    "Restaura a configuração atual para os valores padrão."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+    "Tema de Cor do Menu"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Branco Básico"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Preto Básico"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Selecione um tema de cor diferente"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+    "Use a cor preferida do tema do sistema"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+    "Usar a cor do tema do seu sistema operacional (se houver) - substitui as configurações do tema."
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_LOWEST,
+    "Muito baixa"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_LOWER,
+    "Baixa"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_NORMAL,
+    "Normal"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_HIGHER,
+    "Alta"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_HIGHEST,
+    "Muito alta"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "Nenhuma música disponível."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "Nenhum vídeo disponível."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "Nenhuma imagem disponível."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "Não há favoritos disponíveis."
+    )
+MSG_HASH(
+    MSG_MISSING_ASSETS,
+    "Aviso: Recursos ausentes, use o Atualizador Online se disponível"
+    )
\ No newline at end of file
diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h
index 63b4a10704..056b071dca 100644
--- a/intl/msg_hash_pt_pt.h
+++ b/intl/msg_hash_pt_pt.h
@@ -1579,6 +1579,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "Cortar sobreexploração (recarregar)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "Desativar composição do ambiente de trabalho")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "Tela Inferior 3DS")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "Controlador de vídeo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -3411,3 +3413,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Reset the current configuration to default values."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "Tema da cor do menu")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h
index 40e25890a3..51bb95d1de 100644
--- a/intl/msg_hash_ru.h
+++ b/intl/msg_hash_ru.h
@@ -1616,6 +1616,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "Обрезка обрезки (перезагрузка)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "Отключить компоновку рабочего стола")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "Нижний экран 3DS")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "Видеодрайвер")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -3614,3 +3616,51 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Reset the current configuration to default values."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+      "Цветовая тема меню")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index a3a118a1d1..9a4ae85a39 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -261,7 +261,7 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST,
-    "Configurations"
+    "Configuration File"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_ADD_TAB,
@@ -1515,6 +1515,10 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LANG_ARABIC,
     "Arabic"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_LANG_GREEK,
+    "Greek"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,
     "Left Analog"
@@ -2906,45 +2910,45 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
     "Show date / time"
     )
-    MSG_HASH(
-       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE,
-       "Style of date / time"
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE,
+     "Style of date / time"
     )
-    MSG_HASH(
-       MENU_ENUM_SUBLABEL_TIMEDATE_STYLE,
-       "Changes the style current date and/or time is shown inside the menu."
+MSG_HASH(
+     MENU_ENUM_SUBLABEL_TIMEDATE_STYLE,
+     "Changes the style current date and/or time is shown inside the menu."
     )
-    MSG_HASH(
-       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS,
-       "YYYY-MM-DD HH:MM:SS"
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HMS,
+     "YYYY-MM-DD HH:MM:SS"
     )
-    MSG_HASH(
-       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM,
-       "YYYY-MM-DD HH:MM"
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_YMD_HM,
+     "YYYY-MM-DD HH:MM"
     )
-    MSG_HASH(
-       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY,
-       "MM-DD-YYYY HH:MM"
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MDYYYY,
+     "MM-DD-YYYY HH:MM"
     )
-    MSG_HASH(
-       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS,
-       "HH:MM:SS"
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HMS,
+     "HH:MM:SS"
     )
-    MSG_HASH(
-       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM,
-       "HH:MM"
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_HM,
+     "HH:MM"
     )
-    MSG_HASH(
-       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DM_HM,
-       "DD/MM HH:MM"
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_DM_HM,
+     "DD/MM HH:MM"
     )
-    MSG_HASH(
-       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM,
-       "MM/DD HH:MM"
+MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_MD_HM,
+     "MM/DD HH:MM"
     )
-    MSG_HASH(
-       MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_AM_PM,
-       "HH:MM:SS (AM/PM)"
+ MSG_HASH(
+     MENU_ENUM_LABEL_VALUE_TIMEDATE_STYLE_AM_PM,
+     "HH:MM:SS (AM/PM)"
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_TITLE_COLOR,
@@ -3094,6 +3098,10 @@ MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
     "Disable Desktop Composition"
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+    "3DS Bottom Screen"
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
     "Video Driver"
@@ -4987,19 +4995,20 @@ MSG_HASH(
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CHEAT_APPLY_AFTER_TOGGLE,
     "Apply cheat immediately after toggling."
-)
+    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CHEAT_APPLY_AFTER_LOAD,
     "Auto-apply cheats when game loads."
-)
+    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CHEAT_REPEAT_COUNT,
-    "The number of times the cheat will be applied.  Use with the other two Iteration options to affect large areas of memory."
+    "The number of times the cheat will be applied.\n"
+    "Use with the other two Iteration options to affect large areas of memory."
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_ADDRESS,
     "After each 'Number of Iterations' the Memory Address will be increased by this number times the 'Memory Search Size'."
-)
+    )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_CHEAT_REPEAT_ADD_TO_VALUE,
     "After each 'Number of Iterations' the Value will be increased by this amount."
@@ -6044,11 +6053,11 @@ MSG_HASH(
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_MENU_SHOW_CONFIGURATIONS,
-    "Show Configurations"
+    "Show Configuration File"
     )
 MSG_HASH(
     MENU_ENUM_SUBLABEL_MENU_SHOW_CONFIGURATIONS,
-    "Show/hide the 'Configurations' option."
+    "Show/hide the 'Configuration File' option."
     )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_MENU_SHOW_HELP,
@@ -6914,15 +6923,15 @@ MSG_HASH(
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_COUNT,
     "Number of Iterations"
-)
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_VALUE,
     "Value Increase Each Iteration"
-)
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CHEAT_REPEAT_ADD_TO_ADDRESS,
     "Address Increase Each Iteration"
-)
+    )
 MSG_HASH(
     MENU_ENUM_LABEL_VALUE_CHEAT_ADD_NEW_AFTER,
     "Add New Cheat After This One"
@@ -7703,3 +7712,71 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Reset the current configuration to default values."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+    "Menu Color Theme"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+    "Use preferred system color theme"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+    "Use your operating system's color theme (if any) - overrides theme settings."
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_LOWEST,
+    "Lowest"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_LOWER,
+    "Lower"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_NORMAL,
+    "Normal"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_HIGHER,
+    "Higher"
+    )
+MSG_HASH(
+    MSG_RESAMPLER_QUALITY_HIGHEST,
+    "Highest"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
+MSG_HASH(
+    MSG_MISSING_ASSETS,
+    "Warning: Missing assets, use the Online Updater if available"
+    )
\ No newline at end of file
diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h
index d03dd162d4..56937789be 100644
--- a/intl/msg_hash_vn.h
+++ b/intl/msg_hash_vn.h
@@ -1605,6 +1605,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN,
       "Crop Overscan (Reload)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION,
       "Disable Desktop Composition")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+      "Màn hình dưới 3DS")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER,
       "Video Driver")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
@@ -3482,3 +3484,53 @@ MSG_HASH(
     MENU_ENUM_SUBLABEL_RESET_TO_DEFAULT_CONFIG,
     "Reset the current configuration to default values."
     )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
+    "OK"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+    "Menu Color Theme"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+    "Basic White"
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+    "Basic Black"
+    )
+MSG_HASH(
+    MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME,
+    "Select a different color theme."
+    )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use preferred system color theme")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+      "Use your operating system's color theme (if any) - overrides theme settings.")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWEST,
+      "Lowest")
+MSG_HASH(MSG_RESAMPLER_QUALITY_LOWER,
+      "Lower")
+MSG_HASH(MSG_RESAMPLER_QUALITY_NORMAL,
+      "Normal")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHER,
+      "Higher")
+MSG_HASH(MSG_RESAMPLER_QUALITY_HIGHEST,
+      "Highest")
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE,
+    "No music available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE,
+    "No videos available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE,
+    "No images available."
+    )
+MSG_HASH(
+    MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE,
+    "No favorites available."
+    )
diff --git a/libretro-common/encodings/encoding_crc32.c b/libretro-common/encodings/encoding_crc32.c
index 4775e76357..9724f3eff7 100644
--- a/libretro-common/encodings/encoding_crc32.c
+++ b/libretro-common/encodings/encoding_crc32.c
@@ -23,6 +23,8 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <encodings/crc32.h>
+#include <streams/file_stream.h>
+#include <stdlib.h>
 
 static const uint32_t crc32_table[256] = {
   0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
@@ -88,3 +90,51 @@ uint32_t encoding_crc32(uint32_t crc, const uint8_t *buf, size_t len)
 
    return crc ^ 0xffffffff;
 }
+
+#define CRC32_BUFFER_SIZE 1048576
+#define CRC32_MAX_MB 64
+
+/**
+ * Calculate a CRC32 from the first part of the given file.
+ * "first part" being the first (CRC32_BUFFER_SIZE * CRC32_MAX_MB)
+ * bytes.
+ *
+ * Returns: the crc32, or 0 if there was an error.
+ */
+uint32_t file_crc32(uint32_t crc, const char *path)
+{
+   unsigned i;
+   RFILE *file        = NULL;
+   unsigned char *buf = NULL;
+   if (!path)
+      return 0;
+
+   file = filestream_open(path, RETRO_VFS_FILE_ACCESS_READ, 0);
+   if (!file)
+      goto error;
+
+   buf = (unsigned char*)malloc(CRC32_BUFFER_SIZE);
+   if (!buf)
+      goto error;
+
+   for(i = 0; i < CRC32_MAX_MB; i++)
+   {
+      int nread = filestream_read(file, buf, CRC32_BUFFER_SIZE);
+      if (nread < 0)
+         goto error;
+
+      crc = encoding_crc32(crc, buf, nread);
+      if (filestream_eof(file))
+         break;
+   }
+   free(buf);
+   filestream_close(file);
+   return crc;
+
+error:
+   if (buf)
+      free(buf);
+   if (file)
+      filestream_close(file);
+   return 0;
+}
diff --git a/libretro-common/features/features_cpu.c b/libretro-common/features/features_cpu.c
index fdefe92714..1a04ce07c5 100644
--- a/libretro-common/features/features_cpu.c
+++ b/libretro-common/features/features_cpu.c
@@ -65,6 +65,12 @@
 #include <psp2/rtc.h>
 #endif
 
+#if defined(PS2)
+#include <kernel.h>
+#include <timer.h>
+#include <SDL/SDL.h>
+#endif
+
 #if defined(__PSL1GHT__)
 #include <sys/time.h>
 #elif defined(__CELLOS_LV2__)
@@ -184,6 +190,8 @@ retro_perf_tick_t cpu_features_get_perf_counter(void)
    sceRtcGetCurrentTick((uint64_t*)&time_ticks);
 #elif defined(VITA)
    sceRtcGetCurrentTick((SceRtcTick*)&time_ticks);
+#elif defined(PS2)
+   time_ticks = SDL_GetTicks()*294912; // 294,912MHZ / 1000 msecs
 #elif defined(_3DS)
    time_ticks = svcGetSystemTick();
 #elif defined(WIIU)
@@ -232,6 +240,8 @@ retro_time_t cpu_features_get_time_usec(void)
    return tv.tv_sec * INT64_C(1000000) + (tv.tv_nsec + 500) / 1000;
 #elif defined(EMSCRIPTEN)
    return emscripten_get_now() * 1000;
+#elif defined(PS2)
+      return SDL_GetTicks()*1000;
 #elif defined(__mips__) || defined(DJGPP)
    struct timeval tv;
    gettimeofday(&tv,NULL);
@@ -479,7 +489,7 @@ unsigned cpu_features_get_core_amount(void)
    return sysinfo.dwNumberOfProcessors;
 #elif defined(GEKKO)
    return 1;
-#elif defined(PSP)
+#elif defined(PSP) || defined(PS2)
    return 1;
 #elif defined(VITA)
    return 4;
@@ -787,7 +797,7 @@ uint64_t cpu_features_get(void)
    cpu |= RETRO_SIMD_VMX;
 #elif defined(XBOX360)
    cpu |= RETRO_SIMD_VMX128;
-#elif defined(PSP)
+#elif defined(PSP) || defined(PS2)
    cpu |= RETRO_SIMD_VFPU;
 #elif defined(GEKKO)
    cpu |= RETRO_SIMD_PS;
diff --git a/libretro-common/file/config_file.c b/libretro-common/file/config_file.c
index 7dd671b662..846fa2c6fc 100644
--- a/libretro-common/file/config_file.c
+++ b/libretro-common/file/config_file.c
@@ -406,6 +406,7 @@ static config_file_t *config_file_new_internal(
    conf->path                     = NULL;
    conf->entries                  = NULL;
    conf->tail                     = NULL;
+   conf->last                     = NULL;
    conf->includes                 = NULL;
    conf->include_depth            = 0;
    conf->guaranteed_no_duplicates = false ;
@@ -558,6 +559,7 @@ config_file_t *config_file_new_from_string(const char *from_string)
    conf->path                     = NULL;
    conf->entries                  = NULL;
    conf->tail                     = NULL;
+   conf->last                     = NULL;
    conf->includes                 = NULL;
    conf->include_depth            = 0;
    conf->guaranteed_no_duplicates = false ;
@@ -842,7 +844,7 @@ bool config_get_bool(config_file_t *conf, const char *key, bool *in)
 
 void config_set_string(config_file_t *conf, const char *key, const char *val)
 {
-   struct config_entry_list *last  = conf->entries;
+   struct config_entry_list *last  = (conf->guaranteed_no_duplicates && conf->last) ? conf->last : conf->entries;
    struct config_entry_list *entry = conf->guaranteed_no_duplicates?NULL:config_get_entry(conf, key, &last);
 
    if (entry && !entry->readonly)
@@ -868,6 +870,9 @@ void config_set_string(config_file_t *conf, const char *key, const char *val)
       last->next    = entry;
    else
       conf->entries = entry;
+
+   conf->last = entry ;
+
 }
 
 void config_unset(config_file_t *conf, const char *key)
diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
index 2e90537210..1e910f4ec1 100644
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@@ -79,6 +79,11 @@
 #include <pspkernel.h>
 #endif
 
+#if defined(PS2)
+#include <fileXio_rpc.h>
+#include <fileXio.h>
+#endif
+
 #if defined(__CELLOS_LV2__)
 #include <cell/cell_fs.h>
 #endif
@@ -122,7 +127,19 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
       return false;
    }
    free(tmp);
+#elif defined(PS2)
+   iox_stat_t buf;
+   char *tmp  = strdup(path);
+   size_t len = strlen(tmp);
+   if (tmp[len-1] == '/')
+      tmp[len-1]='\0';
 
+   if (fileXioGetStat(tmp, &buf) < 0)
+   {
+      free(tmp);
+      return false;
+   }
+   free(tmp);
 #elif defined(__CELLOS_LV2__)
     CellFsStat buf;
     if (cellFsStat(path, &buf) < 0)
@@ -167,13 +184,18 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
 #endif
 
    if (size)
+#if defined(PS2)
+      *size = (int32_t)buf.size;
+#else
       *size = (int32_t)buf.st_size;
-
+#endif
    switch (mode)
    {
       case IS_DIRECTORY:
 #if defined(VITA) || defined(PSP)
          return FIO_S_ISDIR(buf.st_mode);
+#elif defined(PS2)
+         return FIO_S_ISDIR(buf.mode);
 #elif defined(__CELLOS_LV2__)
          return ((buf.st_mode & S_IFMT) == S_IFDIR);
 #elif defined(_WIN32)
@@ -182,7 +204,7 @@ static bool path_stat(const char *path, enum stat_mode mode, int32_t *size)
          return S_ISDIR(buf.st_mode);
 #endif
       case IS_CHARACTER_SPECIAL:
-#if defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__) || defined(_WIN32)
+#if defined(VITA) || defined(PSP) || defined(PS2) || defined(__CELLOS_LV2__) || defined(_WIN32)
          return false;
 #else
          return S_ISCHR(buf.st_mode);
@@ -230,7 +252,7 @@ static bool path_mkdir_error(int ret)
 {
 #if defined(VITA)
    return (ret == SCE_ERROR_ERRNO_EEXIST);
-#elif defined(PSP) || defined(_3DS) || defined(WIIU) || defined(SWITCH)
+#elif defined(PSP) || defined(PS2) || defined(_3DS) || defined(WIIU) || defined(SWITCH)
    return (ret == -1);
 #else
    return (ret < 0 && errno == EEXIST);
@@ -299,6 +321,8 @@ bool path_mkdir(const char *dir)
       int ret = mkdir(dir, 0755);
 #elif defined(VITA) || defined(PSP)
       int ret = sceIoMkdir(dir, 0777);
+#elif defined(PS2)
+      int ret =fileXioMkdir(dir, 0777);
 #elif defined(__QNX__)
       int ret = mkdir(dir, 0777);
 #else
diff --git a/libretro-common/file/retro_dirent.c b/libretro-common/file/retro_dirent.c
index 0b6ecad246..561c1b055a 100644
--- a/libretro-common/file/retro_dirent.c
+++ b/libretro-common/file/retro_dirent.c
@@ -49,11 +49,14 @@
 #elif defined(VITA)
 #  include <psp2/io/fcntl.h>
 #  include <psp2/io/dirent.h>
-#include <psp2/io/stat.h>
+#  include <psp2/io/stat.h>
 #else
 #  if defined(PSP)
 #    include <pspiofilemgr.h>
 #  endif
+#  if defined(PS2)
+#    include <fileXio_rpc.h>
+#  endif
 #  include <sys/types.h>
 #  include <sys/stat.h>
 #  include <dirent.h>
@@ -64,7 +67,7 @@
 #include <cell/cell_fs.h>
 #endif
 
-#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP)
+#if (defined(__CELLOS_LV2__) && !defined(__PSL1GHT__)) || defined(__QNX__) || defined(PSP) || defined(PS2)
 #include <unistd.h> /* stat() is defined here */
 #endif
 
@@ -88,6 +91,9 @@ struct RDIR
 #elif defined(VITA) || defined(PSP)
    SceUID directory;
    SceIoDirent entry;
+#elif defined(PS2)
+   int directory;
+   iox_dirent_t entry;
 #elif defined(__CELLOS_LV2__)
    CellFsErrno error;
    int directory;
@@ -146,6 +152,8 @@ struct RDIR *retro_opendir(const char *name)
 
 #elif defined(VITA) || defined(PSP)
    rdir->directory = sceIoDopen(name);
+#elif defined(PS2)
+   rdir->directory = fileXioDopen(name);
 #elif defined(_3DS)
    rdir->directory = !string_is_empty(name) ? opendir(name) : NULL;
    rdir->entry     = NULL;
@@ -167,7 +175,7 @@ bool retro_dirent_error(struct RDIR *rdir)
 {
 #if defined(_WIN32)
    return (rdir->directory == INVALID_HANDLE_VALUE);
-#elif defined(VITA) || defined(PSP)
+#elif defined(VITA) || defined(PSP) || defined(PS2)
    return (rdir->directory < 0);
 #elif defined(__CELLOS_LV2__)
    return (rdir->error != CELL_FS_SUCCEEDED);
@@ -190,6 +198,11 @@ int retro_readdir(struct RDIR *rdir)
    return (rdir->directory != INVALID_HANDLE_VALUE);
 #elif defined(VITA) || defined(PSP)
    return (sceIoDread(rdir->directory, &rdir->entry) > 0);
+#elif defined(PS2)
+   iox_dirent_t record;
+   int ret = fileXioDread(rdir->directory, &record);
+   rdir->entry = record;
+   return ( ret > 0);
 #elif defined(__CELLOS_LV2__)
    uint64_t nread;
    rdir->error = cellFsReaddir(rdir->directory, &rdir->entry, &nread);
@@ -220,6 +233,8 @@ const char *retro_dirent_get_name(struct RDIR *rdir)
    return (char*)rdir->entry.cFileName;
 #elif defined(VITA) || defined(PSP) || defined(__CELLOS_LV2__)
    return rdir->entry.d_name;
+#elif defined(PS2)
+   return rdir->entry.name;
 #else
 
    return rdir->entry->d_name;
@@ -249,6 +264,9 @@ bool retro_dirent_is_dir(struct RDIR *rdir, const char *path)
 #elif defined(VITA)
    return SCE_S_ISDIR(entry->d_stat.st_mode);
 #endif
+#elif defined(PS2)
+   const iox_dirent_t *entry = (const iox_dirent_t*)&rdir->entry;
+   return FIO_S_ISDIR(entry->stat.mode);
 #elif defined(__CELLOS_LV2__)
    CellFsDirent *entry = (CellFsDirent*)&rdir->entry;
    return (entry->d_type == CELL_FS_TYPE_DIRECTORY);
@@ -289,6 +307,8 @@ void retro_closedir(struct RDIR *rdir)
       FindClose(rdir->directory);
 #elif defined(VITA) || defined(PSP)
    sceIoDclose(rdir->directory);
+#elif defined(PS2)
+   fileXioDclose(rdir->directory);
 #elif defined(__CELLOS_LV2__)
    rdir->error = cellFsClosedir(rdir->directory);
 #else
diff --git a/libretro-common/glsym/glgen.py b/libretro-common/glsym/glgen.py
index 898dcb3a10..a599e5574d 100755
--- a/libretro-common/glsym/glgen.py
+++ b/libretro-common/glsym/glgen.py
@@ -33,6 +33,25 @@ def noext(sym):
          return False
    return True
 
+def fix_multiline_functions(lines):
+   fixed_lines = []
+   temp_lines = []
+   for line in lines:
+      if line.count('(') > line.count(')'):
+         temp_lines.append(line)
+      else:
+         if len(temp_lines) > 0:
+            if line.count(')') > line.count('('):
+               temp_lines.append(line)
+               fixed_line = re.sub(' +',' ', ''.join(temp_lines).replace('\n','').replace('\t',''))
+               fixed_lines.append(fixed_line)
+               temp_lines = []
+            else:
+               temp_lines.append(line)
+         else:
+            fixed_lines.append(line)
+   return fixed_lines
+
 def find_gl_symbols(lines):
    typedefs = []
    syms = []
@@ -68,7 +87,7 @@ if __name__ == '__main__':
          banned_ext.append(banned)
 
    with open(sys.argv[1], 'r') as f:
-      lines = f.readlines()
+      lines = fix_multiline_functions(f.readlines())
       typedefs, syms = find_gl_symbols(lines)
 
       overrides = generate_defines(syms)
diff --git a/libretro-common/glsym/rglgen.py b/libretro-common/glsym/rglgen.py
index 897d8cbeae..8d35e0bdf7 100755
--- a/libretro-common/glsym/rglgen.py
+++ b/libretro-common/glsym/rglgen.py
@@ -33,6 +33,25 @@ def noext(sym):
          return False
    return True
 
+def fix_multiline_functions(lines):
+   fixed_lines = []
+   temp_lines = []
+   for line in lines:
+      if line.count('(') > line.count(')'):
+         temp_lines.append(line)
+      else:
+         if len(temp_lines) > 0:
+            if line.count(')') > line.count('('):
+               temp_lines.append(line)
+               fixed_line = re.sub(' +',' ', ''.join(temp_lines).replace('\n','').replace('\t',''))
+               fixed_lines.append(fixed_line)
+               temp_lines = []
+            else:
+               temp_lines.append(line)
+         else:
+            fixed_lines.append(line)
+   return fixed_lines
+
 def find_gl_symbols(lines):
    typedefs = []
    syms = []
@@ -68,7 +87,7 @@ if __name__ == '__main__':
          banned_ext.append(banned)
 
    with open(sys.argv[1], 'r') as f:
-      lines = f.readlines()
+      lines = fix_multiline_functions(f.readlines())
       typedefs, syms = find_gl_symbols(lines)
 
       overrides = generate_defines(syms)
diff --git a/libretro-common/glsym/xglgen.py b/libretro-common/glsym/xglgen.py
index 9fae01b119..6539b4f6db 100644
--- a/libretro-common/glsym/xglgen.py
+++ b/libretro-common/glsym/xglgen.py
@@ -33,6 +33,25 @@ def noext(sym):
          return False
    return True
 
+def fix_multiline_functions(lines):
+   fixed_lines = []
+   temp_lines = []
+   for line in lines:
+      if line.count('(') > line.count(')'):
+         temp_lines.append(line)
+      else:
+         if len(temp_lines) > 0:
+            if line.count(')') > line.count('('):
+               temp_lines.append(line)
+               fixed_line = re.sub(' +',' ', ''.join(temp_lines).replace('\n','').replace('\t',''))
+               fixed_lines.append(fixed_line)
+               temp_lines = []
+            else:
+               temp_lines.append(line)
+         else:
+            fixed_lines.append(line)
+   return fixed_lines
+
 def find_gl_symbols(lines):
    typedefs = []
    syms = []
@@ -69,7 +88,7 @@ if __name__ == '__main__':
          banned_ext.append(banned)
 
    with open(sys.argv[1], 'r') as f:
-      lines = f.readlines()
+      lines = fix_multiline_functions(f.readlines())
       typedefs, syms = find_gl_symbols(lines)
 
       overrides = generate_defines(syms)
diff --git a/libretro-common/include/compat/intrinsics.h b/libretro-common/include/compat/intrinsics.h
index 3fc7d92918..f9e39dd97b 100644
--- a/libretro-common/include/compat/intrinsics.h
+++ b/libretro-common/include/compat/intrinsics.h
@@ -41,7 +41,7 @@ RETRO_BEGIN_DECLS
 /* Count Leading Zero, unsigned 16bit input value */
 static INLINE unsigned compat_clz_u16(uint16_t val)
 {
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(PS2)
    return __builtin_clz(val << 16 | 0x8000);
 #else
    unsigned ret = 0;
diff --git a/libretro-common/include/compat/posix_string.h b/libretro-common/include/compat/posix_string.h
index 9f56322ab9..46c14413c5 100644
--- a/libretro-common/include/compat/posix_string.h
+++ b/libretro-common/include/compat/posix_string.h
@@ -29,6 +29,10 @@
 #include <compat/msvc.h>
 #endif
 
+#if defined(PS2)
+#include <compat_ctype.h>
+#endif
+
 RETRO_BEGIN_DECLS
 
 #ifdef _WIN32
diff --git a/libretro-common/include/compat/strcasestr.h b/libretro-common/include/compat/strcasestr.h
index f849593b0f..02f28d0192 100644
--- a/libretro-common/include/compat/strcasestr.h
+++ b/libretro-common/include/compat/strcasestr.h
@@ -25,6 +25,10 @@
 
 #include <string.h>
 
+#if defined(PS2)
+#include <compat_ctype.h>
+#endif
+
 #if defined(RARCH_INTERNAL) && defined(HAVE_CONFIG_H)
 #include "../../../config.h"
 #endif
diff --git a/libretro-common/include/encodings/crc32.h b/libretro-common/include/encodings/crc32.h
index 76fbb5475e..25e926276f 100644
--- a/libretro-common/include/encodings/crc32.h
+++ b/libretro-common/include/encodings/crc32.h
@@ -31,6 +31,7 @@
 RETRO_BEGIN_DECLS
 
 uint32_t encoding_crc32(uint32_t crc, const uint8_t *buf, size_t len);
+uint32_t file_crc32(uint32_t crc, const char *path);
 
 RETRO_END_DECLS
 
diff --git a/libretro-common/include/file/config_file.h b/libretro-common/include/file/config_file.h
index e55430472d..d2d5b026f7 100644
--- a/libretro-common/include/file/config_file.h
+++ b/libretro-common/include/file/config_file.h
@@ -57,6 +57,7 @@ struct config_file
    char *path;
    struct config_entry_list *entries;
    struct config_entry_list *tail;
+   struct config_entry_list *last;
    unsigned include_depth;
    bool guaranteed_no_duplicates;
 
diff --git a/libretro-common/include/libretro.h b/libretro-common/include/libretro.h
index c2cbba6769..4e1a9785ba 100644
--- a/libretro-common/include/libretro.h
+++ b/libretro-common/include/libretro.h
@@ -128,7 +128,8 @@ extern "C" {
 
 /* LIGHTGUN device is similar to Guncon-2 for PlayStation 2.
  * It reports X/Y coordinates in screen space (similar to the pointer)
- * in the range [-0x8000, 0x7fff] in both axes, with zero being center.
+ * in the range [-0x8000, 0x7fff] in both axes, with zero being center and
+ * -0x8000 being out of bounds.
  * As well as reporting on/off screen state. It features a trigger,
  * start/select buttons, auxiliary action buttons and a
  * directional pad. A forced off-screen shot can be requested for
@@ -139,7 +140,8 @@ extern "C" {
 /* The ANALOG device is an extension to JOYPAD (RetroPad).
  * Similar to DualShock2 it adds two analog sticks and all buttons can
  * be analog. This is treated as a separate device type as it returns
- * axis values in the full analog range of [-0x8000, 0x7fff].
+ * axis values in the full analog range of [-0x7fff, 0x7fff],
+ * although some devices may return -0x8000.
  * Positive X axis is right. Positive Y axis is down.
  * Buttons are returned in the range [0, 0x7fff].
  * Only use ANALOG type when polling for analog values.
@@ -271,6 +273,7 @@ enum retro_language
    RETRO_LANGUAGE_POLISH              = 14,
    RETRO_LANGUAGE_VIETNAMESE          = 15,
    RETRO_LANGUAGE_ARABIC              = 16,
+   RETRO_LANGUAGE_GREEK               = 17,
    RETRO_LANGUAGE_LAST,
 
    /* Ensure sizeof(enum) == sizeof(int) */
@@ -1289,14 +1292,17 @@ struct retro_hw_render_context_negotiation_interface
  * dependence */
 #define RETRO_SERIALIZATION_QUIRK_PLATFORM_DEPENDENT (1 << 6)
 
-#define RETRO_MEMDESC_CONST     (1 << 0)   /* The frontend will never change this memory area once retro_load_game has returned. */
-#define RETRO_MEMDESC_BIGENDIAN (1 << 1)   /* The memory area contains big endian data. Default is little endian. */
-#define RETRO_MEMDESC_ALIGN_2   (1 << 16)  /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */
-#define RETRO_MEMDESC_ALIGN_4   (2 << 16)
-#define RETRO_MEMDESC_ALIGN_8   (3 << 16)
-#define RETRO_MEMDESC_MINSIZE_2 (1 << 24)  /* All memory in this region is accessed at least 2 bytes at the time. */
-#define RETRO_MEMDESC_MINSIZE_4 (2 << 24)
-#define RETRO_MEMDESC_MINSIZE_8 (3 << 24)
+#define RETRO_MEMDESC_CONST      (1 << 0)   /* The frontend will never change this memory area once retro_load_game has returned. */
+#define RETRO_MEMDESC_BIGENDIAN  (1 << 1)   /* The memory area contains big endian data. Default is little endian. */
+#define RETRO_MEMDESC_SYSTEM_RAM (1 << 2)   /* The memory area is system RAM.  This is main RAM of the gaming system. */
+#define RETRO_MEMDESC_SAVE_RAM   (1 << 3)   /* The memory area is save RAM. This RAM is usually found on a game cartridge, backed up by a battery. */
+#define RETRO_MEMDESC_VIDEO_RAM  (1 << 4)   /* The memory area is video RAM (VRAM) */
+#define RETRO_MEMDESC_ALIGN_2    (1 << 16)  /* All memory access in this area is aligned to their own size, or 2, whichever is smaller. */
+#define RETRO_MEMDESC_ALIGN_4    (2 << 16)
+#define RETRO_MEMDESC_ALIGN_8    (3 << 16)
+#define RETRO_MEMDESC_MINSIZE_2  (1 << 24)  /* All memory in this region is accessed at least 2 bytes at the time. */
+#define RETRO_MEMDESC_MINSIZE_4  (2 << 24)
+#define RETRO_MEMDESC_MINSIZE_8  (3 << 24)
 struct retro_memory_descriptor
 {
    uint64_t flags;
diff --git a/libretro-common/include/memmap.h b/libretro-common/include/memmap.h
index 2bedd5c926..e1d75c39fc 100644
--- a/libretro-common/include/memmap.h
+++ b/libretro-common/include/memmap.h
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#if defined(__CELLOS_LV2__) || defined(PSP) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS) || defined(WIIU) || defined(SWITCH)
+#if defined(__CELLOS_LV2__) || defined(PSP) || defined(PS2) || defined(GEKKO) || defined(VITA) || defined(_XBOX) || defined(_3DS) || defined(WIIU) || defined(SWITCH)
 /* No mman available */
 #elif defined(_WIN32) && !defined(_XBOX)
 #include <windows.h>
diff --git a/libretro-common/include/retro_environment.h b/libretro-common/include/retro_environment.h
index 0a40593e31..e220c1529b 100644
--- a/libretro-common/include/retro_environment.h
+++ b/libretro-common/include/retro_environment.h
@@ -103,4 +103,4 @@ printf("This is C++, version %d.\n", __cplusplus);
 
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/libretro-common/include/retro_miscellaneous.h b/libretro-common/include/retro_miscellaneous.h
index 2fd97d54c1..5972c1796f 100644
--- a/libretro-common/include/retro_miscellaneous.h
+++ b/libretro-common/include/retro_miscellaneous.h
@@ -77,7 +77,7 @@ static INLINE bool bits_any_set(uint32_t* ptr, uint32_t count)
 #ifndef PATH_MAX_LENGTH
 #if defined(__CELLOS_LV2__)
 #define PATH_MAX_LENGTH CELL_FS_MAX_FS_PATH_LENGTH
-#elif defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(GEKKO)|| defined(WIIU)
+#elif defined(_XBOX1) || defined(_3DS) || defined(PSP) || defined(PS2) || defined(GEKKO)|| defined(WIIU)
 #define PATH_MAX_LENGTH 512
 #else
 #define PATH_MAX_LENGTH 4096
diff --git a/libretro-common/include/retro_timers.h b/libretro-common/include/retro_timers.h
index 6c164e65d0..d11e67e7c2 100644
--- a/libretro-common/include/retro_timers.h
+++ b/libretro-common/include/retro_timers.h
@@ -37,6 +37,8 @@
 #include <pspthreadman.h>
 #elif defined(VITA)
 #include <psp2/kernel/threadmgr.h>
+#elif defined(PS2)
+#include <SDL/SDL_timer.h>
 #elif defined(_3DS)
 #include <3ds.h>
 #else
@@ -89,6 +91,8 @@ static INLINE void retro_sleep(unsigned msec)
    sys_timer_usleep(1000 * msec);
 #elif defined(PSP) || defined(VITA)
    sceKernelDelayThread(1000 * msec);
+#elif defined(PS2)
+   SDL_Delay(msec);
 #elif defined(_3DS)
    svcSleepThread(1000000 * (s64)msec);
 #elif defined(__WINRT__)
diff --git a/libretro-common/include/streams/file_stream_transforms.h b/libretro-common/include/streams/file_stream_transforms.h
index 17c17580e9..9cf15c599d 100644
--- a/libretro-common/include/streams/file_stream_transforms.h
+++ b/libretro-common/include/streams/file_stream_transforms.h
@@ -47,6 +47,7 @@ RETRO_BEGIN_DECLS
 #undef fprintf
 #undef ferror
 #undef feof
+#undef fscanf
 
 #define fopen rfopen
 #define fclose rfclose
@@ -61,6 +62,7 @@ RETRO_BEGIN_DECLS
 #define fprintf rfprintf
 #define ferror rferror
 #define feof rfeof
+#define fscanf rfscanf
 
 #endif
 
@@ -92,6 +94,8 @@ int rferror(RFILE* stream);
 
 int rfeof(RFILE* stream);
 
+int rfscanf(RFILE * stream, const char * format, ...);
+
 RETRO_END_DECLS
 
 #endif
diff --git a/libretro-common/net/net_compat.c b/libretro-common/net/net_compat.c
index 86c1381221..ea45743596 100644
--- a/libretro-common/net/net_compat.c
+++ b/libretro-common/net/net_compat.c
@@ -183,6 +183,16 @@ int getaddrinfo_retro(const char *node, const char *service,
 #endif
    }
 
+#if defined(WIIU)
+   if (node == NULL) {
+      /* Wii U's socket library chokes on NULL node */
+      if (hints->ai_flags & AI_PASSIVE)
+         node = "0.0.0.0";
+      else
+         node = "127.0.0.1";
+   }
+#endif
+
 #ifdef HAVE_SOCKET_LEGACY
    info = (struct addrinfo*)calloc(1, sizeof(*info));
    if (!info)
diff --git a/libretro-common/net/net_ifinfo.c b/libretro-common/net/net_ifinfo.c
index 77c5971171..55be3c90e9 100644
--- a/libretro-common/net/net_ifinfo.c
+++ b/libretro-common/net/net_ifinfo.c
@@ -38,9 +38,11 @@
 #ifdef WANT_IFADDRS
 #include <compat/ifaddrs.h>
 #else
+#ifndef HAVE_LIBNX
 #include <ifaddrs.h>
 #endif
 #endif
+#endif
 
 #include <net/net_ifinfo.h>
 
@@ -71,10 +73,77 @@ void net_ifinfo_free(net_ifinfo_t *list)
    free(list->entries);
 }
 
+#ifdef HAVE_LIBNX
+static void convert_ip(char *dst, size_t size, uint32_t ip, bool inverted)
+{
+   unsigned char bytes[4];
+   bytes[0] = ip & 0xFF;
+   bytes[1] = (ip >> 8) & 0xFF;
+   bytes[2] = (ip >> 16) & 0xFF;
+   bytes[3] = (ip >> 24) & 0xFF;
+
+   if (inverted)
+      snprintf(dst, size, "%d.%d.%d.%d", bytes[0], bytes[1], bytes[2], bytes[3]);
+   else
+      snprintf(dst, size, "%d.%d.%d.%d", bytes[3], bytes[2], bytes[1], bytes[0]);
+}
+#endif
+
 bool net_ifinfo_new(net_ifinfo_t *list)
 {
    unsigned k              = 0;
-#if defined(_WIN32) && !defined(_XBOX)
+#ifdef HAVE_LIBNX
+   uint32_t id;
+   Result rc;
+
+   char hostname[128];
+   struct net_ifinfo_entry *ptr = NULL;
+
+   memset(list, 0, sizeof(net_ifinfo_t));
+
+   /* loopback */
+   convert_ip(hostname, sizeof(hostname), INADDR_LOOPBACK, false);
+
+   ptr = (struct net_ifinfo_entry*)
+         realloc(list->entries, (k+1) * sizeof(struct net_ifinfo_entry));
+
+   if (!ptr)
+      goto error;
+
+   list->entries          = ptr;
+
+   list->entries[k].name  = strdup("lo");
+   list->entries[k].host  = strdup(hostname);
+   list->size             = k + 1;
+
+   k++;
+
+   /*
+      actual interface
+      can be wlan or eth (with a wiiu adapter)
+      so we just use "switch" as a name 
+   */
+   rc = nifmGetCurrentIpAddress(&id);
+
+   if (!R_SUCCEEDED(rc)) /* not connected to any network */
+      return true;
+
+   convert_ip(hostname, sizeof(hostname), id, true);
+
+   ptr = (struct net_ifinfo_entry*)
+         realloc(list->entries, (k+1) * sizeof(struct net_ifinfo_entry));
+
+   if (!ptr)
+      goto error;
+
+   list->entries          = ptr;
+
+   list->entries[k].name  = strdup("switch");
+   list->entries[k].host  = strdup(hostname);
+   list->size             = k + 1;
+
+   return true;
+#elif defined(_WIN32) && !defined(_XBOX)
    PIP_ADAPTER_ADDRESSES adapter_addresses = NULL, aa = NULL;
    PIP_ADAPTER_UNICAST_ADDRESS ua = NULL;
 #ifdef _WIN32_WINNT_WINXP
@@ -173,7 +242,7 @@ error:
 #ifdef _WIN32
    if (adapter_addresses)
       free(adapter_addresses);
-#else
+#elif !defined(HAVE_LIBNX)
    freeifaddrs(ifaddr);
 #endif
    net_ifinfo_free(list);
diff --git a/libretro-common/net/net_natt.c b/libretro-common/net/net_natt.c
index 14dbdeeb8b..eca2a65500 100644
--- a/libretro-common/net/net_natt.c
+++ b/libretro-common/net/net_natt.c
@@ -184,7 +184,7 @@ static bool natt_open_port(struct natt_status *status,
 bool natt_open_port_any(struct natt_status *status,
       uint16_t port, enum socket_protocol proto)
 {
-#if !defined(HAVE_SOCKET_LEGACY) && !defined(WIIU) && !defined(SWITCH)
+#if !defined(HAVE_SOCKET_LEGACY) && (!defined(SWITCH) || defined(SWITCH) && defined(HAVE_LIBNX))
    size_t i;
    char port_str[6];
    struct net_ifinfo list;
diff --git a/libretro-common/rthreads/rthreads.c b/libretro-common/rthreads/rthreads.c
index b5db30d788..50251bc768 100644
--- a/libretro-common/rthreads/rthreads.c
+++ b/libretro-common/rthreads/rthreads.c
@@ -166,7 +166,7 @@ sthread_t *sthread_create(void (*thread_func)(void*), void *userdata)
 }
 
 /* TODO/FIXME - this needs to be implemented for Switch/3DS */
-#if !defined(SWITCH) && !defined(USE_WIN32_THREADS) && !defined(_3DS) && !defined(GEKKO)
+#if !defined(SWITCH) && !defined(USE_WIN32_THREADS) && !defined(_3DS) && !defined(GEKKO) && !defined(__HAIKU__)
 #define HAVE_THREAD_ATTR
 #endif
 
@@ -852,6 +852,10 @@ bool scond_wait_timeout(scond_t *cond, slock_t *lock, int64_t timeout_us)
    sys_time_get_current_time(&s, &n);
    now.tv_sec  = s;
    now.tv_nsec = n;
+#elif defined(PS2)
+   int tickUS = cpu_ticks()/295.0;
+   now.tv_sec = tickUS/1000000;
+   now.tv_nsec = tickUS * 1000;
 #elif defined(__mips__) || defined(VITA) || defined(_3DS)
    struct timeval tm;
 
diff --git a/libretro-common/streams/file_stream_transforms.c b/libretro-common/streams/file_stream_transforms.c
index fc1e1bd160..5a82f88c73 100644
--- a/libretro-common/streams/file_stream_transforms.c
+++ b/libretro-common/streams/file_stream_transforms.c
@@ -109,7 +109,7 @@ char *rfgets(char *buffer, int maxCount, RFILE* stream)
 
 int rfgetc(RFILE* stream)
 {
-	return filestream_getc(stream);
+   return filestream_getc(stream);
 }
 
 int64_t rfwrite(void const* buffer,
@@ -131,11 +131,11 @@ int64_t rfflush(RFILE * stream)
 int rfprintf(RFILE * stream, const char * format, ...)
 {
    int result;
-	va_list vl;
-	va_start(vl, format);
-	result = filestream_vprintf(stream, format, vl);
-	va_end(vl);
-	return result;
+   va_list vl;
+   va_start(vl, format);
+   result = filestream_vprintf(stream, format, vl);
+   va_end(vl);
+   return result;
 }
 
 int rferror(RFILE* stream)
@@ -147,3 +147,13 @@ int rfeof(RFILE* stream)
 {
    return filestream_eof(stream);
 }
+
+int rfscanf(RFILE * stream, const char * format, ...)
+{
+   int result;
+   va_list vl;
+   va_start(vl, format);
+   result = filestream_scanf(stream, format, vl);
+   va_end(vl);
+   return result;
+}
diff --git a/libretro-common/vfs/vfs_implementation.c b/libretro-common/vfs/vfs_implementation.c
index 3443381bc7..0213c06091 100644
--- a/libretro-common/vfs/vfs_implementation.c
+++ b/libretro-common/vfs/vfs_implementation.c
@@ -47,6 +47,9 @@
 #  if defined(PSP)
 #    include <pspiofilemgr.h>
 #  endif
+#  if defined(PS2)
+#    include <fileXio_rpc.h>
+#  endif
 #  include <sys/types.h>
 #  include <sys/stat.h>
 #  if !defined(VITA)
@@ -125,6 +128,8 @@ int64_t retro_vfs_file_seek_internal(libretro_vfs_implementation_file *stream, i
       return _fseeki64(stream->fp, offset, whence);
 #elif defined(__CELLOS_LV2__) || defined(_MSC_VER) && _MSC_VER <= 1310
       return fseek(stream->fp, (long)offset, whence);
+#elif defined(PS2)
+      return fioLseek(fileno(stream->fp), (off_t)offset, whence);
 #else
       return fseeko(stream->fp, (off_t)offset, whence);
 #endif
@@ -231,7 +236,9 @@ libretro_vfs_implementation_file *retro_vfs_file_open_impl(const char *path, uns
          mode_str = "wb";
 
          flags    = O_WRONLY | O_CREAT | O_TRUNC;
-#ifndef _WIN32
+#if defined(PS2)
+         flags   |= FIO_S_IRUSR | FIO_S_IWUSR;
+#elif !defined(_WIN32)
          flags   |= S_IRUSR | S_IWUSR;
 #else
          flags   |= O_BINARY;
@@ -242,7 +249,9 @@ libretro_vfs_implementation_file *retro_vfs_file_open_impl(const char *path, uns
          mode_str = "w+b";
 
          flags    = O_RDWR | O_CREAT | O_TRUNC;
-#ifndef _WIN32
+#if defined(PS2)
+         flags   |= FIO_S_IRUSR | FIO_S_IWUSR;
+#elif !defined(_WIN32)
          flags   |= S_IRUSR | S_IWUSR;
 #else
          flags   |= O_BINARY;
@@ -254,7 +263,9 @@ libretro_vfs_implementation_file *retro_vfs_file_open_impl(const char *path, uns
          mode_str = "r+b";
 
          flags    = O_RDWR;
-#ifndef _WIN32
+#if defined(PS2)
+         flags   |= FIO_S_IRUSR | FIO_S_IWUSR;
+#elif !defined(_WIN32)
          flags   |= S_IRUSR | S_IWUSR;
 #else
          flags   |= O_BINARY;
@@ -391,7 +402,7 @@ int64_t retro_vfs_file_truncate_impl(libretro_vfs_implementation_file *stream, i
 #ifdef _WIN32
    if(_chsize(_fileno(stream->fp), length) != 0)
       return -1;
-#elif !defined(VITA) && !defined(PSP) && (!defined(SWITCH) || defined(HAVE_LIBNX))
+#elif !defined(VITA) && !defined(PSP) && !defined(PS2) && (!defined(SWITCH) || defined(HAVE_LIBNX))
    if(ftruncate(fileno(stream->fp), length) != 0)
       return -1;
 #endif
diff --git a/libretro-db/Makefile b/libretro-db/Makefile
index 1a8824662c..6960cf1478 100644
--- a/libretro-db/Makefile
+++ b/libretro-db/Makefile
@@ -13,7 +13,10 @@ endif
 
 LIBRETRO_COMMON_C = \
 			 $(LIBRETRO_COMM_DIR)/streams/file_stream.c \
-			 $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c
+			 $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.c \
+			 $(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \
+			 $(LIBRETRO_COMM_DIR)/compat/compat_strl.c \
+			 $(LIBRETRO_COMM_DIR)/compat/fopen_utf8.c
 
 C_CONVERTER_C = \
 			 $(LIBRETRODB_DIR)/rmsgpack.c \
@@ -25,9 +28,7 @@ C_CONVERTER_C = \
 			 $(LIBRETRO_COMM_DIR)/hash/rhash.c \
 			 $(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.c \
 			 $(LIBRETRO_COMM_DIR)/string/stdstring.c \
-			 $(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \
-			 $(LIBRETRO_COMMON_C) \
-			 $(LIBRETRO_COMM_DIR)/compat/compat_strl.c
+			 $(LIBRETRO_COMMON_C)
 
 C_CONVERTER_OBJS := $(C_CONVERTER_C:.c=.o)
 
@@ -40,9 +41,7 @@ RARCHDB_TOOL_C = \
 			 $(LIBRETRODB_DIR)/libretrodb.c \
 			 $(LIBRETRO_COMM_DIR)/compat/compat_fnmatch.c \
 			 $(LIBRETRO_COMM_DIR)/string/stdstring.c \
-			 $(LIBRETRO_COMM_DIR)/encodings/encoding_utf.c \
-			 $(LIBRETRO_COMMON_C) \
-			 $(LIBRETRO_COMM_DIR)/compat/compat_strl.c
+			 $(LIBRETRO_COMMON_C)
 
 RARCHDB_TOOL_OBJS := $(RARCHDB_TOOL_C:.c=.o)
 
diff --git a/libretro-db/README.md b/libretro-db/README.md
index 463bc9145e..0f43ef0803 100644
--- a/libretro-db/README.md
+++ b/libretro-db/README.md
@@ -5,11 +5,67 @@ Mainly to be used by retroarch
 # Usage
 Files specified later in the chain **will override** earlier ones if the same key exists multiple times.
 
-To list out the content of a db `libretrodb_tool <db file> list`
-To create an index `libretrodb_tool <db file> create-index <index name> <field name>`
-To find an entry with an index `libretrodb_tool <db file> find <index name> <value>`
+* To list out the content of a db `libretrodb_tool <db file> list`
+* To create an index `libretrodb_tool <db file> create-index <index name> <field name>`
+* To find an entry with an index `libretrodb_tool <db file> find <index name> <value>`
 
-# lua converters
+# Compiling a single database with `c_converter`
+```
+git clone git@github.com:libretro/libretro-super.git
+cd libretro-super
+./libretro-fetch.sh retroarch
+cd retroarch
+./configure
+cd libretro-db
+c_converter "NAME_OF_RDB_FILE.rdb" "NAME_OF_SOURCE_DAT.dat"
+```
+
+# Compiling all databases with libretro-build-database.sh
+**This approach builds and uses the `c_converter` program to compile the databases**
+
+```
+git clone git@github.com:libretro/libretro-super.git
+cd libretro-super
+./libretro-fetch.sh retroarch
+cd retroarch
+./configure
+cd ..
+./libretro-build-database.sh
+```
+
+# Lua DAT file converter
+To convert a dat file use:
+~~~
+dat_converter <db file> <dat file>
+~~~
+If you want to merge multiple dat files you need to run:
+~~~
+dat_converter <db file> <match key> <dat file> ...
+~~~
+for example:
+~~~
+dat_converter snes.rdb rom.crc snes1.dat snes2.dat
+~~~
+
+# Query examples
+Some examples of queries you can use with libretrodbtool:
+
+1) Glob pattern matching
+Usecase : Search for all games starting with 'Street Fighter' in the 'name' field (glob pattern matching)
+
+`libretrodb_tool <db file> find "{'name':glob('Street Fighter*')}"`
+
+2) Combined number matching query
+Usecase: Search for all games released on October 1995.
+
+`libretrodb_tool <db file> find "{'releasemonth':10,'releaseyear':1995}"`
+
+3) Names only search
+Usecase: Search for all games released on October 1995, wont print checksums, filename or rom size, only the game name.
+
+`libretrodb_tool <db file> get-names "{'releasemonth':10,'releaseyear':1995}"`
+
+# Writing Lua converters
 In order to write you own converter you must have a lua file that implements the following functions:
 
 ~~~.lua
@@ -33,51 +89,3 @@ function get_value()
 	}
 end
 ~~~
-
-# dat file converter
-To convert a dat file use:
-
-~~~
-dat_converter <db file> <dat file>
-~~~
-
-If you want to merge multiple dat files you need to run:
-
-~~~
-dat_converter <db file> <match key> <dat file> ...
-~~~
-
-for example:
-
-~~~
-dat_converter snes.rdb rom.crc snes1.dat snes2.dat
-~~~
-
-# Query examples
-Some examples of queries you can use with libretrodbtool:
-
-1) Glob pattern matching
-Usecase : Search for all games starting with 'Street Fighter' in the 'name' field (glob pattern matching)
-
-`libretrodb_tool <db file> find "{'name':glob('Street Fighter*')}"`
-
-2) Combined number matching query
-Usecase: Search for all games released on October 1995.
-
-`libretrodb_tool <db file> find "{'releasemonth':10,'releaseyear':1995}"`
-
-3) Names only search
-Usecase: Search for all games released on October 1995, wont print checksums, filename or rom size, only the game name.
-
-`libretrodb_tool <db file> get-names "{'releasemonth':10,'releaseyear':1995}"`
-
-# Compiling the Database
-
-Use [libretro-super](https://github.com/libretro/libretro-super) to compile the entire database:
-
-```
-git clone git@github.com:libretro/libretro-super.git
-cd libretro-super
-./libretro-fetch.sh retroarch
-./libretro-build-database.sh
-```
diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index 5a58463b6b..9e979d09f2 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -108,7 +108,7 @@ void cheat_manager_set_code(unsigned i, const char *str)
       return;
 
    if (!string_is_empty(str))
-      strcpy(cheat_manager_state.cheats[i].code,str) ;
+      strcpy(cheat_manager_state.cheats[i].code,str);
 
    cheat_manager_state.cheats[i].state    = true;
 }
@@ -127,31 +127,31 @@ bool cheat_manager_save(const char *path, const char *cheat_database, bool overw
    unsigned i;
    char buf[PATH_MAX_LENGTH];
    char cheats_file[PATH_MAX_LENGTH];
-   config_file_t *conf               = NULL;
+   config_file_t *conf         = NULL;
    unsigned int* data_ptrs[16] = { NULL};
-   char* keys[16] = {
-         "cheat%u_handler",
-         "cheat%u_memory_search_size",
-         "cheat%u_cheat_type",
-         "cheat%u_value",
-         "cheat%u_address",
-         "cheat%u_address_bit_position",
-         "cheat%u_rumble_type",
-         "cheat%u_rumble_value",
-         "cheat%u_rumble_port",
-         "cheat%u_rumble_primary_strength",
-         "cheat%u_rumble_primary_duration",
-         "cheat%u_rumble_secondary_strength",
-         "cheat%u_rumble_secondary_duration",
-         "cheat%u_repeat_count",
-         "cheat%u_repeat_add_to_value",
-         "cheat%u_repeat_add_to_address",
+   char* keys[16]              = {
+         (char*)"cheat%u_handler",
+         (char*)"cheat%u_memory_search_size",
+         (char*)"cheat%u_cheat_type",
+         (char*)"cheat%u_value",
+         (char*)"cheat%u_address",
+         (char*)"cheat%u_address_bit_position",
+         (char*)"cheat%u_rumble_type",
+         (char*)"cheat%u_rumble_value",
+         (char*)"cheat%u_rumble_port",
+         (char*)"cheat%u_rumble_primary_strength",
+         (char*)"cheat%u_rumble_primary_duration",
+         (char*)"cheat%u_rumble_secondary_strength",
+         (char*)"cheat%u_rumble_secondary_duration",
+         (char*)"cheat%u_repeat_count",
+         (char*)"cheat%u_repeat_add_to_value",
+         (char*)"cheat%u_repeat_add_to_address"
    };
 
    buf[0] = cheats_file[0] = '\0';
 
-   if ( (!cheat_manager_state.cheats) || cheat_manager_state.size==0 )
-      return false ;
+   if ((!cheat_manager_state.cheats) || cheat_manager_state.size==0)
+      return false;
 
    if (!cheat_database)
       strlcpy(cheats_file, path, sizeof(cheats_file));
@@ -161,7 +161,7 @@ bool cheat_manager_save(const char *path, const char *cheat_database, bool overw
 
       fill_pathname_noext(cheats_file, buf, ".cht", sizeof(cheats_file));
    }
-   if ( !overwrite )
+   if (!overwrite)
       conf = config_file_new(cheats_file);
    else
       conf = config_file_new(NULL);
@@ -172,7 +172,7 @@ bool cheat_manager_save(const char *path, const char *cheat_database, bool overw
    if (!conf)
       return false;
 
-   conf->guaranteed_no_duplicates = true ;
+   conf->guaranteed_no_duplicates = true;
 
    config_set_int(conf, "cheats", cheat_manager_state.size);
 
@@ -235,49 +235,45 @@ bool cheat_manager_save(const char *path, const char *cheat_database, bool overw
 
 bool cheat_manager_copy_idx_to_working(unsigned idx)
 {
-   if ( (!cheat_manager_state.cheats) || (cheat_manager_state.size < idx+1))
-   {
+   if ((!cheat_manager_state.cheats) || (cheat_manager_state.size < idx+1))
       return false;
-   }
 
-   memcpy(&(cheat_manager_state.working_cheat), &(cheat_manager_state.cheats[idx]), sizeof(struct item_cheat)) ;
-   if ( cheat_manager_state.cheats[idx].desc != NULL )
-      strlcpy(cheat_manager_state.working_desc, cheat_manager_state.cheats[idx].desc, CHEAT_DESC_SCRATCH_SIZE) ;
+   memcpy(&(cheat_manager_state.working_cheat), &(cheat_manager_state.cheats[idx]), sizeof(struct item_cheat));
+   if (cheat_manager_state.cheats[idx].desc)
+      strlcpy(cheat_manager_state.working_desc, cheat_manager_state.cheats[idx].desc, CHEAT_DESC_SCRATCH_SIZE);
    else
-      cheat_manager_state.working_desc[0] = '\0' ;
+      cheat_manager_state.working_desc[0] = '\0';
 
-   if ( cheat_manager_state.cheats[idx].code != NULL )
-      strlcpy(cheat_manager_state.working_code, cheat_manager_state.cheats[idx].code, CHEAT_CODE_SCRATCH_SIZE) ;
+   if (cheat_manager_state.cheats[idx].code)
+      strlcpy(cheat_manager_state.working_code, cheat_manager_state.cheats[idx].code, CHEAT_CODE_SCRATCH_SIZE);
    else
-      cheat_manager_state.working_code[0] = '\0' ;
+      cheat_manager_state.working_code[0] = '\0';
 
-   return true ;
+   return true;
 }
 bool cheat_manager_copy_working_to_idx(unsigned idx)
 {
-   if ( (!cheat_manager_state.cheats) || (cheat_manager_state.size < idx+1))
-   {
+   if ((!cheat_manager_state.cheats) || (cheat_manager_state.size < idx+1))
       return false;
-   }
 
-   memcpy(&(cheat_manager_state.cheats[idx]), &(cheat_manager_state.working_cheat), sizeof(struct item_cheat)) ;
-   if ( cheat_manager_state.cheats[idx].desc != NULL )
-      free(cheat_manager_state.cheats[idx].desc) ;
+   memcpy(&(cheat_manager_state.cheats[idx]), &(cheat_manager_state.working_cheat), sizeof(struct item_cheat));
+   if (cheat_manager_state.cheats[idx].desc)
+      free(cheat_manager_state.cheats[idx].desc);
 
-   cheat_manager_state.cheats[idx].desc = strdup(cheat_manager_state.working_desc) ;
+   cheat_manager_state.cheats[idx].desc = strdup(cheat_manager_state.working_desc);
 
-   if ( cheat_manager_state.cheats[idx].code != NULL )
-      free(cheat_manager_state.cheats[idx].code) ;
+   if (cheat_manager_state.cheats[idx].code)
+      free(cheat_manager_state.cheats[idx].code);
 
-   cheat_manager_state.cheats[idx].code = strdup(cheat_manager_state.working_code) ;
-   return true ;
+   cheat_manager_state.cheats[idx].code = strdup(cheat_manager_state.working_code);
+   return true;
 }
 static void cheat_manager_new(unsigned size)
 {
    unsigned i;
 
 
-   cheat_manager_free() ;
+   cheat_manager_free();
 
    cheat_manager_state.buf_size = size;
    cheat_manager_state.size     = size;
@@ -290,66 +286,65 @@ static void cheat_manager_new(unsigned size)
       cheat_manager_state.buf_size = 0;
       cheat_manager_state.size = 0;
       cheat_manager_state.cheats = NULL;
-      return ;
+      return;
    }
 
    for (i = 0; i < cheat_manager_state.size; i++)
    {
-      cheat_manager_state.cheats[i].desc = NULL ;
-      cheat_manager_state.cheats[i].code = NULL ;
+      cheat_manager_state.cheats[i].desc = NULL;
+      cheat_manager_state.cheats[i].code = NULL;
       cheat_manager_state.cheats[i].state  = false;
       cheat_manager_state.cheats[i].repeat_count = 1;
       cheat_manager_state.cheats[i].repeat_add_to_value = 0;
       cheat_manager_state.cheats[i].repeat_add_to_address = 1;
    }
 
-   return ;
+   return;
 }
 
 void cheat_manager_load_cb_first_pass(char *key, char *value)
 {
-   errno = 0 ;
+   errno = 0;
 
    if (string_is_equal(key, "cheats"))
    {
       cheat_manager_state.loading_cheat_size = (unsigned)strtoul(value, NULL, 0);
 
       if (errno != 0)
-         cheat_manager_state.loading_cheat_size = 0 ;
+         cheat_manager_state.loading_cheat_size = 0;
    }
 }
 
 void cheat_manager_load_cb_second_pass(char *key, char *value)
 {
-   char cheat_num_str[20] ;
-   unsigned cheat_num ;
-   unsigned cheat_idx ;
-   int idx = 0 ;
-   int key_length ;
-   errno = 0 ;
+   char cheat_num_str[20];
+   unsigned cheat_num;
+   unsigned cheat_idx;
+   unsigned idx      = 5;
+   size_t key_length = 0;
+   errno = 0;
 
    if (strncmp(key, "cheat", 5) != 0)
-      return ;
+      return;
 
-   idx = 5 ;
-   key_length = strlen(key) ;
+   key_length = strlen((const char*)key);
 
    while (idx < key_length &&  key[idx] >= '0' && key[idx] <= '9' && idx < 24)
    {
-      cheat_num_str[idx-5] = key[idx] ;
-      idx++ ;
+      cheat_num_str[idx-5] = key[idx];
+      idx++;
    }
 
-   cheat_num_str[idx-5] = '\0' ;
+   cheat_num_str[idx-5] = '\0';
 
-   cheat_num = (unsigned)strtoul(cheat_num_str, NULL, 0); ;
+   cheat_num = (unsigned)strtoul(cheat_num_str, NULL, 0);
 
    if (cheat_num+cheat_manager_state.loading_cheat_offset >= cheat_manager_state.size)
-      return ;
+      return;
 
-   key = key+idx+1 ;
+   key = key+idx+1;
 
-   cheat_idx = cheat_num+cheat_manager_state.loading_cheat_offset ;
+   cheat_idx = cheat_num+cheat_manager_state.loading_cheat_offset;
 
    if (string_is_equal(key, "address"))
       cheat_manager_state.cheats[cheat_idx].address = (unsigned)strtoul(value, NULL, 0);
@@ -360,9 +355,9 @@ void cheat_manager_load_cb_second_pass(char *key, char *value)
    else if (string_is_equal(key, "cheat_type"))
       cheat_manager_state.cheats[cheat_idx].cheat_type = (unsigned)strtoul(value, NULL, 0);
    else if (string_is_equal(key, "code"))
-      cheat_manager_state.cheats[cheat_idx].code = strdup(value) ;
+      cheat_manager_state.cheats[cheat_idx].code = strdup(value);
    else if (string_is_equal(key, "desc"))
-      cheat_manager_state.cheats[cheat_idx].desc = strdup(value) ;
+      cheat_manager_state.cheats[cheat_idx].desc = strdup(value);
    else if (string_is_equal(key, "enable"))
       cheat_manager_state.cheats[cheat_idx].state = (string_is_equal(value,"true") || string_is_equal(value,"1"));
    else if (string_is_equal(key, "handler"))
@@ -401,61 +396,57 @@ bool cheat_manager_load(const char *path, bool append)
    config_file_cb_t cb;
    config_file_t *conf = NULL;
 
-   cb.config_file_new_entry_cb = cheat_manager_load_cb_first_pass ;
+   cb.config_file_new_entry_cb = cheat_manager_load_cb_first_pass;
 
-   cheat_manager_state.loading_cheat_size = 0 ;
+   cheat_manager_state.loading_cheat_size = 0;
 
    conf = config_file_new_with_callback(path, &cb);
 
    if (!conf)
       return false;
 
-   cheats = cheat_manager_state.loading_cheat_size  ;
+   cheats = cheat_manager_state.loading_cheat_size;
 
    if (cheats == 0)
       goto error;
 
-   config_file_free(conf) ;
-   conf = NULL ;
+   config_file_free(conf);
+   conf = NULL;
 
 
-   cheat_manager_alloc_if_empty() ;
+   cheat_manager_alloc_if_empty();
 
-   if ( append )
+   if (append)
    {
-      orig_size = cheat_manager_get_size() ;
-      if ( orig_size == 0)
-      {
+      orig_size = cheat_manager_get_size();
+      if (orig_size == 0)
          cheat_manager_new(cheats);
-      }
       else
       {
-         cheats = cheats + orig_size ;
-         if (cheat_manager_realloc(cheats, CHEAT_HANDLER_TYPE_EMU))
-         {
-         }
+         cheats = cheats + orig_size;
+         if (cheat_manager_realloc(cheats, CHEAT_HANDLER_TYPE_EMU)) { }
       }
    }
    else
    {
-      orig_size = 0 ;
+      orig_size = 0;
       cheat_manager_new(cheats);
    }
 
 
    for (i = orig_size; i < cheats; i++)
    {
-      cheat_manager_state.cheats[i].idx = i ;
-      cheat_manager_state.cheats[i].desc = NULL ;
-      cheat_manager_state.cheats[i].code = NULL ;
-      cheat_manager_state.cheats[i].state = false ;
-      cheat_manager_state.cheats[i].big_endian = false ;
-      cheat_manager_state.cheats[i].cheat_type = CHEAT_TYPE_SET_TO_VALUE ;
+      cheat_manager_state.cheats[i].idx                = i;
+      cheat_manager_state.cheats[i].desc               = NULL;
+      cheat_manager_state.cheats[i].code               = NULL;
+      cheat_manager_state.cheats[i].state              = false;
+      cheat_manager_state.cheats[i].big_endian         = false;
+      cheat_manager_state.cheats[i].cheat_type         = CHEAT_TYPE_SET_TO_VALUE;
       cheat_manager_state.cheats[i].memory_search_size = 3;
    }
 
-   cheat_manager_state.loading_cheat_offset = orig_size ;
-   cb.config_file_new_entry_cb = cheat_manager_load_cb_second_pass ;
+   cheat_manager_state.loading_cheat_offset = orig_size;
+   cb.config_file_new_entry_cb = cheat_manager_load_cb_second_pass;
    conf = config_file_new_with_callback(path, &cb);
 
    if (!conf)
@@ -474,26 +465,26 @@ error:
 bool cheat_manager_realloc(unsigned new_size, unsigned default_handler)
 {
    unsigned i;
-   unsigned orig_size ;
+   unsigned orig_size;
 
 
    if (!cheat_manager_state.cheats)
    {
       cheat_manager_state.cheats = (struct item_cheat*)
          calloc(new_size, sizeof(struct item_cheat));
-      orig_size = 0 ;
+      orig_size = 0;
    }
    else
    {
-      orig_size = cheat_manager_state.size ;
+      orig_size = cheat_manager_state.size;
 
       /* if size is decreasing, free the items that will be lost */
       for (i = new_size; i < orig_size; i++)
       {
-         if ( cheat_manager_state.cheats[i].code != NULL )
-            free(cheat_manager_state.cheats[i].code) ;
-         if ( cheat_manager_state.cheats[i].desc != NULL )
-            free(cheat_manager_state.cheats[i].desc) ;
+         if (cheat_manager_state.cheats[i].code)
+            free(cheat_manager_state.cheats[i].code);
+         if (cheat_manager_state.cheats[i].desc)
+            free(cheat_manager_state.cheats[i].desc);
       }
 
       cheat_manager_state.cheats = (struct item_cheat*)
@@ -512,14 +503,14 @@ bool cheat_manager_realloc(unsigned new_size, unsigned default_handler)
 
    for (i = orig_size; i < cheat_manager_state.size; i++)
    {
-      memset(&(cheat_manager_state.cheats[i]), 0, sizeof(cheat_manager_state.cheats[i])) ;
-      cheat_manager_state.cheats[i].state   = false;
-      cheat_manager_state.cheats[i].handler = default_handler;
-      cheat_manager_state.cheats[i].cheat_type = CHEAT_TYPE_SET_TO_VALUE ;
-      cheat_manager_state.cheats[i].memory_search_size = 3;
-      cheat_manager_state.cheats[i].idx = i;
-      cheat_manager_state.cheats[i].repeat_count = 1;
-      cheat_manager_state.cheats[i].repeat_add_to_value = 0;
+      memset(&(cheat_manager_state.cheats[i]), 0, sizeof(cheat_manager_state.cheats[i]));
+      cheat_manager_state.cheats[i].state                 = false;
+      cheat_manager_state.cheats[i].handler               = default_handler;
+      cheat_manager_state.cheats[i].cheat_type            = CHEAT_TYPE_SET_TO_VALUE;
+      cheat_manager_state.cheats[i].memory_search_size    = 3;
+      cheat_manager_state.cheats[i].idx                   = i;
+      cheat_manager_state.cheats[i].repeat_count          = 1;
+      cheat_manager_state.cheats[i].repeat_add_to_value   = 0;
       cheat_manager_state.cheats[i].repeat_add_to_address = 1;
    }
 
@@ -528,37 +519,45 @@ bool cheat_manager_realloc(unsigned new_size, unsigned default_handler)
 
 void cheat_manager_free(void)
 {
-   unsigned i = 0 ;
+   unsigned i = 0;
 
    if (cheat_manager_state.cheats)
    {
       for (i = 0; i < cheat_manager_state.size; i++)
       {
-         if ( cheat_manager_state.cheats[i].desc != NULL )
-            free(cheat_manager_state.cheats[i].desc) ;
-         if ( cheat_manager_state.cheats[i].code != NULL )
-            free(cheat_manager_state.cheats[i].code) ;
+         if (cheat_manager_state.cheats[i].desc)
+            free(cheat_manager_state.cheats[i].desc);
+         if (cheat_manager_state.cheats[i].code)
+            free(cheat_manager_state.cheats[i].code);
       }
 
       free(cheat_manager_state.cheats);
    }
 
-   if ( cheat_manager_state.prev_memory_buf )
-      free(cheat_manager_state.prev_memory_buf) ;
+   if (cheat_manager_state.prev_memory_buf)
+      free(cheat_manager_state.prev_memory_buf);
 
-   if ( cheat_manager_state.matches )
-      free(cheat_manager_state.matches) ;
+   if (cheat_manager_state.matches)
+      free(cheat_manager_state.matches);
 
-   cheat_manager_state.cheats = NULL ;
-   cheat_manager_state.size = 0 ;
-   cheat_manager_state.buf_size = 0 ;
-   cheat_manager_state.prev_memory_buf = NULL ;
-   cheat_manager_state.curr_memory_buf = NULL ;
-   cheat_manager_state.matches = NULL ;
-   cheat_manager_state.total_memory_size = 0 ;
-   cheat_manager_state.actual_memory_size = 0 ;
-   cheat_manager_state.memory_initialized = false ;
-   cheat_manager_state.memory_search_initialized = false ;
+   if (cheat_manager_state.memory_buf_list)
+      free(cheat_manager_state.memory_buf_list);
+
+   if (cheat_manager_state.memory_size_list)
+      free(cheat_manager_state.memory_size_list);
+
+   cheat_manager_state.cheats                    = NULL;
+   cheat_manager_state.size                      = 0;
+   cheat_manager_state.buf_size                  = 0;
+   cheat_manager_state.prev_memory_buf           = NULL;
+   cheat_manager_state.curr_memory_buf           = NULL;
+   cheat_manager_state.memory_buf_list           = NULL;
+   cheat_manager_state.memory_size_list          = NULL;
+   cheat_manager_state.matches                   = NULL;
+   cheat_manager_state.num_memory_buffers        = 0;
+   cheat_manager_state.total_memory_size         = 0;
+   cheat_manager_state.memory_initialized        = false;
+   cheat_manager_state.memory_search_initialized = false;
 
 }
 
@@ -573,7 +572,7 @@ void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx)
          handle_idx, handle->cheats[handle_idx].state ? "ON" : "OFF",
          (handle->cheats[handle_idx].desc!=NULL) ?
          (handle->cheats[handle_idx].desc) : (handle->cheats[handle_idx].code)
-         );
+       );
    runloop_msg_queue_push(msg, 1, 180, true);
    RARCH_LOG("%s\n", msg);
 }
@@ -581,14 +580,14 @@ void cheat_manager_update(cheat_manager_t *handle, unsigned handle_idx)
 void cheat_manager_toggle_index(unsigned i)
 {
    settings_t *settings                     = config_get_ptr();
-   if (!cheat_manager_state.cheats || cheat_manager_state.size == 0 )
+   if (!cheat_manager_state.cheats || cheat_manager_state.size == 0)
       return;
 
    cheat_manager_state.cheats[i].state = !cheat_manager_state.cheats[i].state;
    cheat_manager_update(&cheat_manager_state, i);
 
    if (!settings)
-      return ;
+      return;
 
    if (settings->bools.apply_cheats_after_toggle)
       cheat_manager_apply_cheats();
@@ -657,18 +656,18 @@ bool cheat_manager_get_game_specific_filename(char * cheat_filename, size_t max_
    struct retro_system_info system_info;
 
    if (!settings || !global || !cheat_filename)
-      return false ;
-
-   if ( !core_get_system_info(&system_info) )
-      return false ;
+      return false;
 
+   if (!core_get_system_info(&system_info))
+      return false;
 
    core_name                  = system_info.library_name;
    game_name                  = path_basename(global->name.cheatfile);
 
-   if ( string_is_empty(settings->paths.path_cheat_database)  ||
-         string_is_empty(core_name)  || string_is_empty(game_name) )
-      return false ;
+   if (string_is_empty(settings->paths.path_cheat_database)  ||
+       string_is_empty(core_name)                            || 
+       string_is_empty(game_name))
+      return false;
 
    cheat_filename[0] = '\0';
    strlcat(cheat_filename, settings->paths.path_cheat_database, max_length);
@@ -681,23 +680,23 @@ bool cheat_manager_get_game_specific_filename(char * cheat_filename, size_t max_
 
    strlcat(cheat_filename, game_name, max_length);
 
-   return true ;
+   return true;
 
 }
 void cheat_manager_load_game_specific_cheats()
 {
-   char cheat_file[PATH_MAX_LENGTH] ;
+   char cheat_file[PATH_MAX_LENGTH];
 
-   if (cheat_manager_get_game_specific_filename(cheat_file, PATH_MAX_LENGTH) )
-      cheat_manager_load(cheat_file,true) ;
+   if (cheat_manager_get_game_specific_filename(cheat_file, PATH_MAX_LENGTH))
+      cheat_manager_load(cheat_file,true);
 
 }
 void cheat_manager_save_game_specific_cheats()
 {
-   char cheat_file[PATH_MAX_LENGTH] ;
+   char cheat_file[PATH_MAX_LENGTH];
 
-   if (cheat_manager_get_game_specific_filename(cheat_file, PATH_MAX_LENGTH) )
-      cheat_manager_save(cheat_file, NULL, true) ;
+   if (cheat_manager_get_game_specific_filename(cheat_file, PATH_MAX_LENGTH))
+      cheat_manager_save(cheat_file, NULL, true);
 
 }
 
@@ -708,49 +707,120 @@ void cheat_manager_state_free(void)
 
 bool cheat_manager_alloc_if_empty(void)
 {
-
    if (!cheat_manager_state.cheats)
-   {
       cheat_manager_new(0);
-   }
 
    return true;
 }
 
 int cheat_manager_initialize_memory(rarch_setting_t *setting, bool wraparound)
 {
+   unsigned i;
    retro_ctx_memory_info_t meminfo;
-   bool refresh                  = false;
-   bool is_search_initialization = (setting != NULL);
+   bool refresh                           = false;
+   bool is_search_initialization          = (setting != NULL);
+   rarch_system_info_t *system            = runloop_get_system_info();
+   unsigned offset                        = 0;
 
-   meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
-   if (!core_get_memory(&meminfo))
+   cheat_manager_state.num_memory_buffers = 0;
+   cheat_manager_state.total_memory_size  = 0;
+   cheat_manager_state.curr_memory_buf    = NULL;
+
+   if (cheat_manager_state.memory_buf_list)
    {
-      runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_INIT_FAIL), 1, 180, true);
-      return 0;
+      free(cheat_manager_state.memory_buf_list);
+      cheat_manager_state.memory_buf_list = NULL;
    }
 
-   if ( meminfo.size == 0 )
+   if (cheat_manager_state.memory_size_list)
    {
-      return 0 ;
+      free(cheat_manager_state.memory_size_list);
+      cheat_manager_state.memory_size_list = NULL;
    }
-   cheat_manager_state.actual_memory_size = (unsigned)meminfo.size;
-   cheat_manager_state.curr_memory_buf    = meminfo.data;
-   cheat_manager_state.total_memory_size  = (unsigned)meminfo.size;
+
+   if (system && system->mmaps.num_descriptors > 0)
+   {
+      for (i = 0; i < system->mmaps.num_descriptors; i++)
+      {
+         if ((system->mmaps.descriptors[i].core.flags & RETRO_MEMDESC_SYSTEM_RAM) != 0 &&
+               system->mmaps.descriptors[i].core.ptr &&
+               system->mmaps.descriptors[i].core.len > 0)
+         {
+            cheat_manager_state.num_memory_buffers++;
+
+            if (!cheat_manager_state.memory_buf_list)
+               cheat_manager_state.memory_buf_list = (uint8_t**)calloc(1, sizeof(uint8_t *));
+            else
+               cheat_manager_state.memory_buf_list = (uint8_t**)realloc(cheat_manager_state.memory_buf_list, sizeof(uint8_t *) * cheat_manager_state.num_memory_buffers);
+
+            if (!cheat_manager_state.memory_size_list)
+               cheat_manager_state.memory_size_list = (unsigned*)calloc(1, sizeof(unsigned));
+            else
+               cheat_manager_state.memory_size_list = (unsigned*)realloc(cheat_manager_state.memory_size_list, sizeof(unsigned) * cheat_manager_state.num_memory_buffers);
+
+            cheat_manager_state.memory_buf_list[cheat_manager_state.num_memory_buffers-1] = (uint8_t*)system->mmaps.descriptors[i].core.ptr;
+            cheat_manager_state.memory_size_list[cheat_manager_state.num_memory_buffers-1] = system->mmaps.descriptors[i].core.len;
+            cheat_manager_state.total_memory_size += system->mmaps.descriptors[i].core.len;
+
+            if (!cheat_manager_state.curr_memory_buf)
+               cheat_manager_state.curr_memory_buf = (uint8_t*)system->mmaps.descriptors[i].core.ptr;
+         }
+      }
+   }
+
+   if (cheat_manager_state.num_memory_buffers == 0)
+   {
+      meminfo.id = RETRO_MEMORY_SYSTEM_RAM;
+      if (!core_get_memory(&meminfo))
+      {
+         runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_INIT_FAIL), 1, 180, true);
+         return 0;
+      }
+
+      if (meminfo.size == 0)
+         return 0;
+
+      cheat_manager_state.memory_buf_list     = (uint8_t**)
+         calloc(1, sizeof(uint8_t *));
+      cheat_manager_state.memory_size_list    = (unsigned*)
+         calloc(1, sizeof(unsigned));
+      cheat_manager_state.num_memory_buffers  = 1;
+      cheat_manager_state.memory_buf_list[0]  = (uint8_t*)meminfo.data;
+      cheat_manager_state.memory_size_list[0] = (unsigned)meminfo.size;
+      cheat_manager_state.total_memory_size   = (unsigned)meminfo.size;
+      cheat_manager_state.curr_memory_buf     = (uint8_t*)meminfo.data;
+
+   }
+
    cheat_manager_state.num_matches        = (cheat_manager_state.total_memory_size*8)/((int)pow(2,cheat_manager_state.search_bit_size));
+
    /* Ensure we're aligned on 4-byte boundary */
 #if 0
    if (meminfo.size % 4 > 0)
       cheat_manager_state.total_memory_size = cheat_manager_state.total_memory_size + (4 - (meminfo.size%4));
 #endif
+
    if (is_search_initialization)
    {
+      if (cheat_manager_state.prev_memory_buf)
+      {
+         free(cheat_manager_state.prev_memory_buf);
+         cheat_manager_state.prev_memory_buf  = NULL;
+      }
+
       cheat_manager_state.prev_memory_buf = (uint8_t*) calloc(cheat_manager_state.total_memory_size, sizeof(uint8_t));
       if (!cheat_manager_state.prev_memory_buf)
       {
          runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_INIT_FAIL), 1, 180, true);
          return 0;
       }
+
+      if (cheat_manager_state.matches)
+      {
+         free(cheat_manager_state.matches);
+         cheat_manager_state.matches  = NULL;
+      }
+
       cheat_manager_state.matches = (uint8_t*) calloc(cheat_manager_state.total_memory_size, sizeof(uint8_t));
       if (!cheat_manager_state.matches)
       {
@@ -761,7 +831,15 @@ int cheat_manager_initialize_memory(rarch_setting_t *setting, bool wraparound)
       }
 
       memset(cheat_manager_state.matches, 0xFF, cheat_manager_state.total_memory_size);
-      memcpy(cheat_manager_state.prev_memory_buf, cheat_manager_state.curr_memory_buf, cheat_manager_state.actual_memory_size);
+
+      offset = 0;
+
+      for (i = 0; i < cheat_manager_state.num_memory_buffers; i++)
+      {
+         memcpy(cheat_manager_state.prev_memory_buf+offset, cheat_manager_state.memory_buf_list[i], cheat_manager_state.memory_size_list[i]);
+         offset += cheat_manager_state.memory_size_list[i];
+      }
+
       cheat_manager_state.memory_search_initialized = true;
    }
 
@@ -781,90 +859,97 @@ int cheat_manager_initialize_memory(rarch_setting_t *setting, bool wraparound)
    return 0;
 }
 
+static unsigned translate_address(unsigned address, unsigned char **curr)
+{
+   unsigned offset = 0;
+   unsigned i = 0;
+
+   for (i = 0; i < cheat_manager_state.num_memory_buffers; i++)
+   {
+      if ((address >= offset) && (address < offset+cheat_manager_state.memory_size_list[i]))
+      {
+         *curr = cheat_manager_state.memory_buf_list[i];
+         break;
+      }
+      else
+         offset += cheat_manager_state.memory_size_list[i];
+   }
+
+   return offset;
+}
+
 static void cheat_manager_setup_search_meta(unsigned int bitsize, unsigned int *bytes_per_item, unsigned int *mask, unsigned int *bits)
 {
    switch( bitsize)
    {
       case 0 :
-      {
-         *bytes_per_item = 1 ;
-         *bits = 1 ;
-         *mask = 0x01 ;
-         break ;
-      }
+         *bytes_per_item = 1;
+         *bits = 1;
+         *mask = 0x01;
+         break;
       case 1 :
-      {
-         *bytes_per_item = 1 ;
-         *bits = 2 ;
-         *mask = 0x03 ;
-         break ;
-      }
+         *bytes_per_item = 1;
+         *bits = 2;
+         *mask = 0x03;
+         break;
       case 2 :
-      {
-         *bytes_per_item = 1 ;
-         *bits = 4 ;
-         *mask = 0x0F ;
-         break ;
-      }
+         *bytes_per_item = 1;
+         *bits = 4;
+         *mask = 0x0F;
+         break;
       case 3 :
-      {
-         *bytes_per_item = 1 ;
-         *bits = 8 ;
-         *mask = 0xFF ;
-         break ;
-      }
+         *bytes_per_item = 1;
+         *bits = 8;
+         *mask = 0xFF;
+         break;
       case 4 :
-      {
-         *bytes_per_item = 2 ;
-         *bits = 8 ;
-         *mask = 0xFFFF ;
-         break ;
-      }
+         *bytes_per_item = 2;
+         *bits = 8;
+         *mask = 0xFFFF;
+         break;
       case 5 :
-      {
-         *bytes_per_item = 4 ;
-         *bits = 8 ;
-         *mask = 0xFFFFFFFF ;
-         break ;
-      }
+         *bytes_per_item = 4;
+         *bits = 8;
+         *mask = 0xFFFFFFFF;
+         break;
    }
 }
 
 int cheat_manager_search_exact(rarch_setting_t *setting, bool wraparound)
 {
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_EXACT) ;
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_EXACT);
 }
 int cheat_manager_search_lt(rarch_setting_t *setting, bool wraparound)
 {
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_LT) ;
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_LT);
 }
 int cheat_manager_search_gt(rarch_setting_t *setting, bool wraparound)
 {
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_GT) ;
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_GT);
 }
 int cheat_manager_search_lte(rarch_setting_t *setting, bool wraparound)
 {
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_LTE) ;
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_LTE);
 }
 int cheat_manager_search_gte(rarch_setting_t *setting, bool wraparound)
 {
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_GTE) ;
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_GTE);
 }
 int cheat_manager_search_eq(rarch_setting_t *setting, bool wraparound)
 {
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQ) ;
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQ);
 }
 int cheat_manager_search_neq(rarch_setting_t *setting, bool wraparound)
 {
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_NEQ) ;
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_NEQ);
 }
 int cheat_manager_search_eqplus(rarch_setting_t *setting, bool wraparound)
 {
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQPLUS) ;
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQPLUS);
 }
 int cheat_manager_search_eqminus(rarch_setting_t *setting, bool wraparound)
 {
-   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQMINUS) ;
+   return cheat_manager_search(CHEAT_SEARCH_TYPE_EQMINUS);
 }
 
 int cheat_manager_search(enum cheat_search_type search_type)
@@ -878,114 +963,118 @@ int cheat_manager_search(enum cheat_search_type search_type)
    unsigned int mask           = 0;
    unsigned int bytes_per_item = 1;
    unsigned int bits           = 8;
+   unsigned int offset         = 0;
+   unsigned int i              = 0;
    bool refresh                = false;
 
-   if (!cheat_manager_state.curr_memory_buf)
+   if (cheat_manager_state.num_memory_buffers == 0)
    {
       runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_NOT_INITIALIZED), 1, 180, true);
-      return 0 ;
+      return 0;
    }
 
 
-   cheat_manager_setup_search_meta(cheat_manager_state.search_bit_size, &bytes_per_item, &mask, &bits) ;
+   cheat_manager_setup_search_meta(cheat_manager_state.search_bit_size, &bytes_per_item, &mask, &bits);
 
    /* little endian FF000000 = 256 */
-   for (idx = 0 ; idx < cheat_manager_state.total_memory_size ; idx = idx + bytes_per_item)
+   for (idx = 0; idx < cheat_manager_state.total_memory_size; idx = idx + bytes_per_item)
    {
       unsigned byte_part;
 
+      offset = translate_address(idx, &curr);
+
       switch (bytes_per_item)
       {
          case 2 :
-         {
             curr_val = cheat_manager_state.big_endian ?
-                  (*(curr+idx)*256) + *(curr+idx+1) :
-                  *(curr+idx) + (*(curr+idx+1)*256) ;
+                  (*(curr+idx-offset)*256) + *(curr+idx+1-offset) :
+                  *(curr+idx-offset) + (*(curr+idx+1-offset)*256);
             prev_val = cheat_manager_state.big_endian ?
                   (*(prev+idx)*256) + *(prev+idx+1) :
-                  *(prev+idx) + (*(prev+idx+1)*256) ;
-            break ;
-         }
+                  *(prev+idx) + (*(prev+idx+1)*256);
+            break;
          case 4 :
-         {
             curr_val = cheat_manager_state.big_endian ?
-                  (*(curr+idx)*256*256*256) + (*(curr+idx+1)*256*256) + (*(curr+idx+2)*256) + *(curr+idx+3) :
-                  *(curr+idx) + (*(curr+idx+1)*256) + (*(curr+idx+2)*256*256) + (*(curr+idx+3)*256*256*256) ;
+                  (*(curr+idx-offset)*256*256*256) + (*(curr+idx+1-offset)*256*256) + (*(curr+idx+2-offset)*256) + *(curr+idx+3-offset) :
+                  *(curr+idx-offset) + (*(curr+idx+1-offset)*256) + (*(curr+idx+2-offset)*256*256) + (*(curr+idx+3-offset)*256*256*256);
             prev_val = cheat_manager_state.big_endian ?
                   (*(prev+idx)*256*256*256) + (*(prev+idx+1)*256*256) + (*(prev+idx+2)*256) + *(prev+idx+3) :
-                  *(prev+idx) + (*(prev+idx+1)*256) + (*(prev+idx+2)*256*256) + (*(prev+idx+3)*256*256*256) ;
-            break ;
-         }
+                  *(prev+idx) + (*(prev+idx+1)*256) + (*(prev+idx+2)*256*256) + (*(prev+idx+3)*256*256*256);
+            break;
          case 1 :
          default :
-         {
-            curr_val = *(curr+idx) ;
-            prev_val = *(prev+idx) ;
-            break ;
-         }
+            curr_val = *(curr-offset+idx);
+            prev_val = *(prev+idx);
+            break;
       }
 
-      for (byte_part = 0 ; byte_part < 8/bits ; byte_part++)
+      for (byte_part = 0; byte_part < 8/bits; byte_part++)
       {
-         unsigned int curr_subval = (curr_val >> (byte_part*bits) ) & mask ;
-         unsigned int prev_subval = (prev_val >> (byte_part*bits) ) & mask ;
-         unsigned int prev_match ;
+         unsigned int curr_subval = (curr_val >> (byte_part*bits)) & mask;
+         unsigned int prev_subval = (prev_val >> (byte_part*bits)) & mask;
+         unsigned int prev_match;
 
-         if (bits < 8 )
-            prev_match = *(cheat_manager_state.matches+idx) & (mask << (byte_part*bits)) ;
+         if (bits < 8)
+            prev_match = *(cheat_manager_state.matches+idx) & (mask << (byte_part*bits));
          else
-            prev_match = *(cheat_manager_state.matches+idx) ;
+            prev_match = *(cheat_manager_state.matches+idx);
 
          if (prev_match > 0)
          {
-            bool match = false ;
+            bool match = false;
             switch (search_type)
             {
                case CHEAT_SEARCH_TYPE_EXACT :
-                  match = ( curr_subval == cheat_manager_state.search_exact_value) ;
+                  match = (curr_subval == cheat_manager_state.search_exact_value);
                   break;
                case CHEAT_SEARCH_TYPE_LT :
-                  match = ( curr_subval < prev_subval) ;
+                  match = (curr_subval < prev_subval);
                   break;
                case CHEAT_SEARCH_TYPE_GT :
-                  match = ( curr_subval > prev_subval) ;
+                  match = (curr_subval > prev_subval);
                   break;
                case CHEAT_SEARCH_TYPE_LTE :
-                  match = ( curr_subval <= prev_subval) ;
+                  match = (curr_subval <= prev_subval);
                   break;
                case CHEAT_SEARCH_TYPE_GTE :
-                  match = ( curr_subval >= prev_subval) ;
+                  match = (curr_subval >= prev_subval);
                   break;
                case CHEAT_SEARCH_TYPE_EQ :
-                  match = ( curr_subval == prev_subval) ;
+                  match = (curr_subval == prev_subval);
                   break;
                case CHEAT_SEARCH_TYPE_NEQ :
-                  match = ( curr_subval != prev_subval) ;
+                  match = (curr_subval != prev_subval);
                   break;
                case CHEAT_SEARCH_TYPE_EQPLUS :
-                  match = ( curr_subval == prev_subval+cheat_manager_state.search_eqplus_value) ;
+                  match = (curr_subval == prev_subval+cheat_manager_state.search_eqplus_value);
                   break;
                case CHEAT_SEARCH_TYPE_EQMINUS :
-                  match = ( curr_subval == prev_subval-cheat_manager_state.search_eqminus_value) ;
+                  match = (curr_subval == prev_subval-cheat_manager_state.search_eqminus_value);
                   break;
             }
-            if (!match )
+            if (!match)
             {
-               if ( bits < 8 )
+               if (bits < 8)
                   *(cheat_manager_state.matches+idx) = *(cheat_manager_state.matches+idx) &
-                        (( ~(mask << (byte_part*bits))) & 0xFF );
+                        (( ~(mask << (byte_part*bits))) & 0xFF);
                else
-                  memset(cheat_manager_state.matches+idx,0,bytes_per_item) ;
-               if ( cheat_manager_state.num_matches > 0 )
-                  cheat_manager_state.num_matches-- ;
+                  memset(cheat_manager_state.matches+idx,0,bytes_per_item);
+               if (cheat_manager_state.num_matches > 0)
+                  cheat_manager_state.num_matches--;
             }
          }
       }
    }
 
-   memcpy(cheat_manager_state.prev_memory_buf, cheat_manager_state.curr_memory_buf, cheat_manager_state.actual_memory_size);
+   offset = 0;
 
-   snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_CHEAT_SEARCH_FOUND_MATCHES), cheat_manager_state.num_matches) ;
+   for (i = 0; i < cheat_manager_state.num_memory_buffers; i++)
+   {
+      memcpy(cheat_manager_state.prev_memory_buf+offset, cheat_manager_state.memory_buf_list[i], cheat_manager_state.memory_size_list[i]);
+      offset += cheat_manager_state.memory_size_list[i];
+   }
+
+   snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_CHEAT_SEARCH_FOUND_MATCHES), cheat_manager_state.num_matches);
    msg[sizeof(msg) - 1] = 0;
 
    runloop_msg_queue_push(msg, 1, 180, true);
@@ -994,7 +1083,7 @@ int cheat_manager_search(enum cheat_search_type search_type)
    menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
    menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
 #endif
-   return 0 ;
+   return 0;
 }
 
 bool cheat_manager_add_new_code(unsigned int memory_search_size, unsigned int address, unsigned int address_mask,
@@ -1002,16 +1091,16 @@ bool cheat_manager_add_new_code(unsigned int memory_search_size, unsigned int ad
 {
    int new_size = cheat_manager_get_size() + 1;
 
-   if ( !cheat_manager_realloc(new_size, CHEAT_HANDLER_TYPE_RETRO) )
-      return false ;
+   if (!cheat_manager_realloc(new_size, CHEAT_HANDLER_TYPE_RETRO))
+      return false;
 
-   cheat_manager_state.cheats[cheat_manager_state.size-1].address = address ;
-   cheat_manager_state.cheats[cheat_manager_state.size-1].address_mask = address_mask ;
-   cheat_manager_state.cheats[cheat_manager_state.size-1].memory_search_size = memory_search_size ;
-   cheat_manager_state.cheats[cheat_manager_state.size-1].value = value ;
-   cheat_manager_state.cheats[cheat_manager_state.size-1].big_endian = big_endian ;
+   cheat_manager_state.cheats[cheat_manager_state.size-1].address            = address;
+   cheat_manager_state.cheats[cheat_manager_state.size-1].address_mask       = address_mask;
+   cheat_manager_state.cheats[cheat_manager_state.size-1].memory_search_size = memory_search_size;
+   cheat_manager_state.cheats[cheat_manager_state.size-1].value              = value;
+   cheat_manager_state.cheats[cheat_manager_state.size-1].big_endian         = big_endian;
 
-   return true ;
+   return true;
 }
 int cheat_manager_add_matches(const char *path,
       const char *label, unsigned type, size_t menuidx, size_t entry_idx)
@@ -1025,71 +1114,74 @@ int cheat_manager_add_matches(const char *path,
    unsigned int bits           = 8;
    unsigned int curr_val       = 0;
    unsigned int num_added      = 0;
-   unsigned char         *curr = cheat_manager_state.curr_memory_buf;
+   unsigned int offset         = 0;
+   unsigned char *curr         = cheat_manager_state.curr_memory_buf;
 
-   if ( cheat_manager_state.num_matches + cheat_manager_state.size > 100 )
+   if (cheat_manager_state.num_matches + cheat_manager_state.size > 100)
    {
       runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_ADDED_MATCHES_TOO_MANY), 1, 180, true);
-      return 0 ;
+      return 0;
    }
-   cheat_manager_setup_search_meta(cheat_manager_state.search_bit_size, &bytes_per_item, &mask, &bits) ;
+   cheat_manager_setup_search_meta(cheat_manager_state.search_bit_size, &bytes_per_item, &mask, &bits);
 
-   for (idx = 0 ; idx < cheat_manager_state.total_memory_size ; idx = idx + bytes_per_item)
+   for (idx = 0; idx < cheat_manager_state.total_memory_size; idx = idx + bytes_per_item)
    {
-      switch ( bytes_per_item )
+      offset = translate_address(idx, &curr);
+
+      switch (bytes_per_item)
       {
          case 2 :
             curr_val = cheat_manager_state.big_endian ?
-                  (*(curr+idx)*256) + *(curr+idx+1) :
-                  *(curr+idx) + (*(curr+idx+1)*256) ;
-            break ;
+                  (*(curr+idx-offset)*256) + *(curr+idx+1-offset) :
+                  *(curr+idx-offset) + (*(curr+idx+1-offset)*256);
+            break;
          case 4 :
             curr_val = cheat_manager_state.big_endian ?
-                  (*(curr+idx)*256*256*256) + (*(curr+idx+1)*256*256) + (*(curr+idx+2)*256) + *(curr+idx+3) :
-                  *(curr+idx) + (*(curr+idx+1)*256) + (*(curr+idx+2)*256*256) + (*(curr+idx+3)*256*256*256) ;
-            break ;
+                  (*(curr+idx-offset)*256*256*256) + (*(curr+idx+1-offset)*256*256) + (*(curr+idx+2-offset)*256) + *(curr+idx+3-offset) :
+                  *(curr+idx-offset) + (*(curr+idx+1-offset)*256) + (*(curr+idx+2-offset)*256*256) + (*(curr+idx+3-offset)*256*256*256);
+            break;
          case 1 :
          default :
-            curr_val = *(curr+idx) ;
-            break ;
+            curr_val = *(curr-offset+idx);
+            break;
       }
-      for (byte_part = 0 ; byte_part < 8/bits ; byte_part++)
+      for (byte_part = 0; byte_part < 8/bits; byte_part++)
       {
          unsigned int prev_match;
 
-         if (bits < 8 )
+         if (bits < 8)
          {
-            prev_match = *(cheat_manager_state.matches+idx) & (mask << (byte_part*bits)) ;
+            prev_match = *(cheat_manager_state.matches+idx) & (mask << (byte_part*bits));
             if (prev_match)
             {
                if (!cheat_manager_add_new_code(cheat_manager_state.search_bit_size, idx, (mask << (byte_part*bits)),
-                     cheat_manager_state.big_endian, curr_val) )
+                     cheat_manager_state.big_endian, curr_val))
                {
                   runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_ADDED_MATCHES_FAIL), 1, 180, true);
-                  return 0 ;
+                  return 0;
                }
-               num_added++ ;
+               num_added++;
             }
          }
          else
          {
-            prev_match = *(cheat_manager_state.matches+idx) ;
+            prev_match = *(cheat_manager_state.matches+idx);
             if (prev_match)
             {
                if (!cheat_manager_add_new_code(cheat_manager_state.search_bit_size, idx, 0xFF,
                      cheat_manager_state.big_endian, curr_val))
                {
                   runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_ADDED_MATCHES_FAIL), 1, 180, true);
-                  return 0 ;
+                  return 0;
                }
-               num_added++ ;
+               num_added++;
             }
          }
 
       }
    }
 
-   snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_CHEAT_SEARCH_ADDED_MATCHES_SUCCESS), cheat_manager_state.num_matches) ;
+   snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_CHEAT_SEARCH_ADDED_MATCHES_SUCCESS), cheat_manager_state.num_matches);
    msg[sizeof(msg) - 1] = 0;
 
    runloop_msg_queue_push(msg, 1, 180, true);
@@ -1111,38 +1203,38 @@ void cheat_manager_apply_rumble(struct item_cheat *cheat, unsigned int curr_valu
       case RUMBLE_TYPE_DISABLED:
          return;
       case RUMBLE_TYPE_CHANGES:
-         rumble = (curr_value != cheat->rumble_prev_value) ;
-         break ;
+         rumble = (curr_value != cheat->rumble_prev_value);
+         break;
       case RUMBLE_TYPE_DOES_NOT_CHANGE:
-         rumble = (curr_value == cheat->rumble_prev_value) ;
-         break ;
+         rumble = (curr_value == cheat->rumble_prev_value);
+         break;
       case RUMBLE_TYPE_INCREASE:
-         rumble = (curr_value > cheat->rumble_prev_value) ;
-         break ;
+         rumble = (curr_value > cheat->rumble_prev_value);
+         break;
       case RUMBLE_TYPE_DECREASE:
-         rumble = (curr_value < cheat->rumble_prev_value) ;
-         break ;
+         rumble = (curr_value < cheat->rumble_prev_value);
+         break;
       case RUMBLE_TYPE_EQ_VALUE:
-         rumble = (curr_value == cheat->rumble_value) ;
-         break ;
+         rumble = (curr_value == cheat->rumble_value);
+         break;
       case RUMBLE_TYPE_NEQ_VALUE:
-         rumble = (curr_value != cheat->rumble_value) ;
-         break ;
+         rumble = (curr_value != cheat->rumble_value);
+         break;
       case RUMBLE_TYPE_LT_VALUE:
-         rumble = (curr_value < cheat->rumble_value) ;
-         break ;
+         rumble = (curr_value < cheat->rumble_value);
+         break;
       case RUMBLE_TYPE_GT_VALUE:
-         rumble = (curr_value > cheat->rumble_value) ;
+         rumble = (curr_value > cheat->rumble_value);
          break;
       case RUMBLE_TYPE_INCREASE_BY_VALUE:
-         rumble = (curr_value == cheat->rumble_prev_value + cheat->rumble_value) ;
-         break ;
+         rumble = (curr_value == cheat->rumble_prev_value + cheat->rumble_value);
+         break;
       case RUMBLE_TYPE_DECREASE_BY_VALUE:
-         rumble = (curr_value == cheat->rumble_prev_value - cheat->rumble_value) ;
-         break ;
+         rumble = (curr_value == cheat->rumble_prev_value - cheat->rumble_value);
+         break;
    }
 
-   cheat->rumble_prev_value = curr_value ;
+   cheat->rumble_prev_value = curr_value;
 
    /* Give the emulator enough time 
     * to initialize, load state, etc */
@@ -1150,19 +1242,19 @@ void cheat_manager_apply_rumble(struct item_cheat *cheat, unsigned int curr_valu
    {
       if (rumble)
       {
-         cheat->rumble_primary_end_time = cpu_features_get_time_usec() + (cheat->rumble_primary_duration*1000) ;
-         cheat->rumble_secondary_end_time = cpu_features_get_time_usec() + (cheat->rumble_secondary_duration*1000) ;
+         cheat->rumble_primary_end_time = cpu_features_get_time_usec() + (cheat->rumble_primary_duration*1000);
+         cheat->rumble_secondary_end_time = cpu_features_get_time_usec() + (cheat->rumble_secondary_duration*1000);
          input_driver_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_STRONG, cheat->rumble_primary_strength);
          input_driver_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_WEAK, cheat->rumble_secondary_strength);
       }
    }
    else
    {
-      cheat->rumble_initialized++ ;
+      cheat->rumble_initialized++;
       return;
    }
 
-   if (cheat->rumble_primary_end_time <= cpu_features_get_time_usec() )
+   if (cheat->rumble_primary_end_time <= cpu_features_get_time_usec())
    {
       if (cheat->rumble_primary_end_time != 0)
          input_driver_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_STRONG, 0);
@@ -1177,17 +1269,16 @@ void cheat_manager_apply_rumble(struct item_cheat *cheat, unsigned int curr_valu
    {
       if (cheat->rumble_secondary_end_time != 0)
          input_driver_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_WEAK, 0);
-      cheat->rumble_secondary_end_time = 0 ;
+      cheat->rumble_secondary_end_time = 0;
    }
    else
-   {
       input_driver_set_rumble_state(cheat->rumble_port, RETRO_RUMBLE_WEAK, cheat->rumble_secondary_strength);
-   }
 }
 
 void cheat_manager_apply_retro_cheats(void)
 {
    unsigned i;
+   unsigned int offset;
    unsigned int mask           = 0;
    unsigned int bytes_per_item = 1;
    unsigned int bits           = 8;
@@ -1197,19 +1288,19 @@ void cheat_manager_apply_retro_cheats(void)
    if ((!cheat_manager_state.cheats))
       return;
 
-   for (i = 0 ; i < cheat_manager_state.size ; i++ )
+   for (i = 0; i < cheat_manager_state.size; i++)
    {
       unsigned char *curr;
       unsigned int    idx;
       bool set_value            = false;
       unsigned int value_to_set = 0;
-      unsigned int repeat_iter = 0 ;
-      unsigned int address_mask = cheat_manager_state.cheats[i].address_mask ;
+      unsigned int repeat_iter  = 0;
+      unsigned int address_mask = cheat_manager_state.cheats[i].address_mask;
 
       if (cheat_manager_state.cheats[i].handler != CHEAT_HANDLER_TYPE_RETRO || !cheat_manager_state.cheats[i].state)
-         continue ;
+         continue;
       if (!cheat_manager_state.memory_initialized)
-         cheat_manager_initialize_memory(NULL, false) ;
+         cheat_manager_initialize_memory(NULL, false);
 
       /* If we're still not initialized, something 
        * must have gone wrong - just bail */
@@ -1218,156 +1309,152 @@ void cheat_manager_apply_retro_cheats(void)
 
       if (!run_cheat)
       {
-         run_cheat = true ;
-         continue ;
+         run_cheat = true;
+         continue;
       }
-      cheat_manager_setup_search_meta(cheat_manager_state.cheats[i].memory_search_size, &bytes_per_item, &mask, &bits) ;
+      cheat_manager_setup_search_meta(cheat_manager_state.cheats[i].memory_search_size, &bytes_per_item, &mask, &bits);
       
-      curr = cheat_manager_state.curr_memory_buf ;
-      idx  = cheat_manager_state.cheats[i].address ;
+      curr = cheat_manager_state.curr_memory_buf;
+      idx  = cheat_manager_state.cheats[i].address;
+
+      offset = translate_address(idx, &curr);
 
       switch (bytes_per_item)
       {
          case 2 :
-         {
             curr_val = cheat_manager_state.big_endian ?
-                  (*(curr+idx)*256) + *(curr+idx+1) :
-                  *(curr+idx) + (*(curr+idx+1)*256) ;
-            break ;
-         }
+               (*(curr+idx-offset)*256) + *(curr+idx+1-offset) :
+               *(curr+idx-offset) + (*(curr+idx+1-offset)*256);
+            break;
          case 4 :
-         {
             curr_val = cheat_manager_state.big_endian ?
-                  (*(curr+idx)*256*256*256) + (*(curr+idx+1)*256*256) + (*(curr+idx+2)*256) + *(curr+idx+3) :
-                  *(curr+idx) + (*(curr+idx+1)*256) + (*(curr+idx+2)*256*256) + (*(curr+idx+3)*256*256*256) ;
-            break ;
-         }
+               (*(curr+idx-offset)*256*256*256) + (*(curr+idx+1-offset)*256*256) + (*(curr+idx+2-offset)*256) + *(curr+idx+3-offset) :
+               *(curr+idx-offset) + (*(curr+idx+1-offset)*256) + (*(curr+idx+2-offset)*256*256) + (*(curr+idx+3-offset)*256*256*256);
+            break;
          case 1 :
          default :
-         {
-            curr_val = *(curr+idx) ;
-            break ;
-         }
+            curr_val = *(curr+idx-offset);
+            break;
       }
 
-      cheat_manager_apply_rumble(&cheat_manager_state.cheats[i], curr_val) ;
+      cheat_manager_apply_rumble(&cheat_manager_state.cheats[i], curr_val);
 
-      switch (cheat_manager_state.cheats[i].cheat_type )
+      switch (cheat_manager_state.cheats[i].cheat_type)
       {
          case CHEAT_TYPE_SET_TO_VALUE :
-            set_value = true ;
-            value_to_set = cheat_manager_state.cheats[i].value ;
-            break ;
+            set_value = true;
+            value_to_set = cheat_manager_state.cheats[i].value;
+            break;
          case CHEAT_TYPE_INCREASE_VALUE:
-            set_value = true ;
-            value_to_set = curr_val + cheat_manager_state.cheats[i].value ;
+            set_value = true;
+            value_to_set = curr_val + cheat_manager_state.cheats[i].value;
             break;
          case CHEAT_TYPE_DECREASE_VALUE:
-            set_value = true ;
-            value_to_set = curr_val - cheat_manager_state.cheats[i].value ;
+            set_value = true;
+            value_to_set = curr_val - cheat_manager_state.cheats[i].value;
             break;
          case CHEAT_TYPE_RUN_NEXT_IF_EQ:
             if (!(curr_val == cheat_manager_state.cheats[i].value))
-               run_cheat = false ;
+               run_cheat = false;
             break;
          case CHEAT_TYPE_RUN_NEXT_IF_NEQ:
-            if (!(curr_val != cheat_manager_state.cheats[i].value ))
-               run_cheat = false ;
+            if (!(curr_val != cheat_manager_state.cheats[i].value))
+               run_cheat = false;
             break;
          case CHEAT_TYPE_RUN_NEXT_IF_LT:
             if (!(cheat_manager_state.cheats[i].value <  curr_val))
-               run_cheat = false ;
+               run_cheat = false;
             break;
          case CHEAT_TYPE_RUN_NEXT_IF_GT:
             if (!(cheat_manager_state.cheats[i].value > curr_val))
-               run_cheat = false ;
+               run_cheat = false;
             break;
 
       }
       if (set_value)
       {
-         for ( repeat_iter = 1 ; repeat_iter <= cheat_manager_state.cheats[i].repeat_count ; repeat_iter++)
+         for (repeat_iter = 1; repeat_iter <= cheat_manager_state.cheats[i].repeat_count; repeat_iter++)
          {
             switch (bytes_per_item)
             {
                case 2 :
                   if  (cheat_manager_state.cheats[i].big_endian)
                   {
-                     *(curr+idx)   = (value_to_set >> 8) & 0xFF ;
-                     *(curr+idx+1) =  value_to_set & 0xFF ;
+                     *(curr+idx-offset)   = (value_to_set >> 8) & 0xFF;
+                     *(curr+idx+1-offset) =  value_to_set & 0xFF;
                   }
                   else
                   {
-                     *(curr+idx)   =  value_to_set & 0xFF ;
-                     *(curr+idx+1) = (value_to_set >> 8) & 0xFF ;
+                     *(curr+idx-offset)   =  value_to_set & 0xFF;
+                     *(curr+idx+1-offset) = (value_to_set >> 8) & 0xFF;
 
                   }
-                  break ;
+                  break;
                case 4 :
                   if  (cheat_manager_state.cheats[i].big_endian)
                   {
-                     *(curr+idx)   = (value_to_set >> 24) & 0xFF ;
-                     *(curr+idx+1) = (value_to_set >> 16) & 0xFF ;
-                     *(curr+idx+2) = (value_to_set >> 8) & 0xFF ;
-                     *(curr+idx+3) =  value_to_set & 0xFF ;
+                     *(curr+idx-offset)   = (value_to_set >> 24) & 0xFF;
+                     *(curr+idx+1-offset) = (value_to_set >> 16) & 0xFF;
+                     *(curr+idx+2-offset) = (value_to_set >> 8) & 0xFF;
+                     *(curr+idx+3-offset) =  value_to_set & 0xFF;
                   }
                   else
                   {
-                     *(curr+idx)   =  value_to_set & 0xFF ;
-                     *(curr+idx+1) = (value_to_set >> 8) & 0xFF ;
-                     *(curr+idx+2) = (value_to_set >> 16) & 0xFF ;
-                     *(curr+idx+3) = (value_to_set >> 24) & 0xFF ;
+                     *(curr+idx-offset)   =  value_to_set & 0xFF;
+                     *(curr+idx+1-offset) = (value_to_set >> 8) & 0xFF;
+                     *(curr+idx+2-offset) = (value_to_set >> 16) & 0xFF;
+                     *(curr+idx+3-offset) = (value_to_set >> 24) & 0xFF;
 
                   }
-                  break ;
+                  break;
                case 1 :
                   if (bits < 8)
                   {
                      unsigned bitpos;
-                     unsigned char val = *(curr+idx);
+                     unsigned char val = *(curr+idx-offset);
 
-                     for (bitpos = 0 ; bitpos < 8 ; bitpos++)
+                     for (bitpos = 0; bitpos < 8; bitpos++)
                      {
-                        if ((address_mask>>bitpos)&0x01 )
+                        if ((address_mask>>bitpos)&0x01)
                         {
-                           mask = (~(1<<bitpos)&0xFF) ;
+                           mask = (~(1<<bitpos)&0xFF);
                            /* Clear current bit value */
-                           val = val & mask ;
+                           val = val & mask;
                            /* Inject cheat bit value */
-                           val = val | (((value_to_set>>bitpos)&0x01)<<bitpos) ;
+                           val = val | (((value_to_set>>bitpos)&0x01)<<bitpos);
                         }
                      }
-                     *(curr+idx) = val ;
+                     *(curr+idx-offset) = val;
                   }
                   else
-                     *(curr+idx)   =  value_to_set & 0xFF;
-                  break ;
+                     *(curr+idx-offset)   =  value_to_set & 0xFF;
+                  break;
                default :
-                  *(curr+idx)   =  value_to_set & 0xFF ;
-                  break ;
+                  *(curr+idx-offset)   =  value_to_set & 0xFF;
+                  break;
             }
-            value_to_set += cheat_manager_state.cheats[i].repeat_add_to_value ;
-            value_to_set = value_to_set%mask ;
+            value_to_set += cheat_manager_state.cheats[i].repeat_add_to_value;
+            value_to_set = value_to_set%mask;
 
-            if ( bits < 8 )
+            if (bits < 8)
             {
-               unsigned int bit_iter ;
-               for ( bit_iter = 0 ; bit_iter < cheat_manager_state.cheats[i].repeat_add_to_address ; bit_iter++)
+               unsigned int bit_iter;
+               for (bit_iter = 0; bit_iter < cheat_manager_state.cheats[i].repeat_add_to_address; bit_iter++)
                {
-                  address_mask = (address_mask<<mask)&0xFF ;
-                  if ( address_mask == 0 )
+                  address_mask = (address_mask<<mask)&0xFF;
+                  if (address_mask == 0)
                   {
-                     address_mask = mask ;
-                     idx++ ;
+                     address_mask = mask;
+                     idx++;
                   }
                }
             }
             else
-            {
-               idx += (cheat_manager_state.cheats[i].repeat_add_to_address*bytes_per_item) ;
-            }
+               idx += (cheat_manager_state.cheats[i].repeat_add_to_address*bytes_per_item);
 
-            idx = idx%cheat_manager_state.total_memory_size ;
+            idx = idx%cheat_manager_state.total_memory_size;
+
+            offset = translate_address(idx, &curr);
          }
       }
    }
@@ -1378,75 +1465,78 @@ void cheat_manager_match_action(enum cheat_match_action_type match_action, unsig
    unsigned int byte_part;
    unsigned int idx;
    unsigned int start_idx;
-   unsigned int mask = 0 ;
-   unsigned int bytes_per_item = 1 ;
-   unsigned int bits = 8 ;
-   unsigned int curr_val = 0 ;
-   unsigned int prev_val = 0 ;
-   unsigned char *curr = cheat_manager_state.curr_memory_buf ;
-   unsigned char *prev = cheat_manager_state.prev_memory_buf ;
+   unsigned int mask           = 0;
+   unsigned int bytes_per_item = 1;
+   unsigned int bits           = 8;
+   unsigned int curr_val       = 0;
+   unsigned int prev_val       = 0;
+   unsigned int offset         = 0;
+   unsigned char *curr         = cheat_manager_state.curr_memory_buf;
+   unsigned char *prev         = cheat_manager_state.prev_memory_buf;
    unsigned int curr_match_idx = 0;
 
    if (target_match_idx > cheat_manager_state.num_matches-1)
       return;
 
-   if (!curr)
+   if (cheat_manager_state.num_memory_buffers == 0)
       return;
 
    cheat_manager_setup_search_meta(cheat_manager_state.search_bit_size, &bytes_per_item, &mask, &bits);
 
    if (match_action == CHEAT_MATCH_ACTION_TYPE_BROWSE)
-      start_idx = *address ;
+      start_idx = *address;
    else
-      start_idx = 0 ;
+      start_idx = 0;
 
-   for (idx = start_idx ; idx < cheat_manager_state.total_memory_size ; idx = idx + bytes_per_item)
+   for (idx = start_idx; idx < cheat_manager_state.total_memory_size; idx = idx + bytes_per_item)
    {
-      switch (bytes_per_item )
+      offset = translate_address(idx, &curr);
+
+      switch (bytes_per_item)
       {
          case 2 :
             curr_val = cheat_manager_state.big_endian ?
-                  (*(curr+idx)*256) + *(curr+idx+1) :
-                  *(curr+idx) + (*(curr+idx+1)*256) ;
-            if (prev != NULL)
+                  (*(curr+idx-offset)*256) + *(curr+idx+1-offset) :
+                  *(curr+idx-offset) + (*(curr+idx+1-offset)*256);
+            if (prev)
                prev_val = cheat_manager_state.big_endian ?
                      (*(prev+idx)*256) + *(prev+idx+1) :
-                     *(prev+idx) + (*(prev+idx+1)*256) ;
-            break ;
+                     *(prev+idx) + (*(prev+idx+1)*256);
+            break;
          case 4 :
             curr_val = cheat_manager_state.big_endian ?
-                  (*(curr+idx)*256*256*256) + (*(curr+idx+1)*256*256) + (*(curr+idx+2)*256) + *(curr+idx+3) :
-                  *(curr+idx) + (*(curr+idx+1)*256) + (*(curr+idx+2)*256*256) + (*(curr+idx+3)*256*256*256) ;
-            if (prev != NULL)
+                  (*(curr+idx-offset)*256*256*256) + (*(curr+idx+1-offset)*256*256) + (*(curr+idx+2-offset)*256) + *(curr+idx+3-offset) :
+                  *(curr+idx-offset) + (*(curr+idx+1-offset)*256) + (*(curr+idx+2-offset)*256*256) + (*(curr+idx+3-offset)*256*256*256);
+            if (prev)
                prev_val = cheat_manager_state.big_endian ?
                      (*(prev+idx)*256*256*256) + (*(prev+idx+1)*256*256) + (*(prev+idx+2)*256) + *(prev+idx+3) :
-                     *(prev+idx) + (*(prev+idx+1)*256) + (*(prev+idx+2)*256*256) + (*(prev+idx+3)*256*256*256) ;
-            break ;
+                     *(prev+idx) + (*(prev+idx+1)*256) + (*(prev+idx+2)*256*256) + (*(prev+idx+3)*256*256*256);
+            break;
          case 1 :
          default :
-            curr_val = *(curr+idx) ;
-            if (prev != NULL)
-               prev_val = *(prev+idx) ;
-            break ;
+            curr_val = *(curr+idx-offset);
+            if (prev)
+               prev_val = *(prev+idx);
+            break;
       }
 
       if (match_action == CHEAT_MATCH_ACTION_TYPE_BROWSE)
       {
          *curr_value = curr_val;
          *prev_value = prev_val;
-         return ;
+         return;
       }
 
       if (!prev)
          return;
 
-      for (byte_part = 0 ; byte_part < 8/bits ; byte_part++)
+      for (byte_part = 0; byte_part < 8/bits; byte_part++)
       {
-         unsigned int prev_match ;
+         unsigned int prev_match;
 
-         if (bits < 8 )
+         if (bits < 8)
          {
-            prev_match = *(cheat_manager_state.matches+idx) & (mask << (byte_part*bits)) ;
+            prev_match = *(cheat_manager_state.matches+idx) & (mask << (byte_part*bits));
             if (prev_match)
             {
                if (target_match_idx == curr_match_idx)
@@ -1454,39 +1544,39 @@ void cheat_manager_match_action(enum cheat_match_action_type match_action, unsig
                   switch (match_action)
                   {
                      case CHEAT_MATCH_ACTION_TYPE_BROWSE :
-                        return ;
+                        return;
                      case CHEAT_MATCH_ACTION_TYPE_VIEW :
-                        *address = idx ;
-                        *address_mask = (mask << (byte_part*bits)) ;
-                        *curr_value = curr_val ;
-                        *prev_value = prev_val ;
+                        *address      = idx;
+                        *address_mask = (mask << (byte_part*bits));
+                        *curr_value   = curr_val;
+                        *prev_value   = prev_val;
                         return;
                      case CHEAT_MATCH_ACTION_TYPE_COPY :
                         if (!cheat_manager_add_new_code(cheat_manager_state.search_bit_size, idx, (mask << (byte_part*bits)),
-                                 cheat_manager_state.big_endian, curr_val) )
+                                 cheat_manager_state.big_endian, curr_val))
                            runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_ADD_MATCH_FAIL), 1, 180, true);
                         else
                            runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_ADD_MATCH_SUCCESS), 1, 180, true);
-                        return ;
+                        return;
                      case CHEAT_MATCH_ACTION_TYPE_DELETE :
                         if (bits < 8)
                            *(cheat_manager_state.matches+idx) = *(cheat_manager_state.matches+idx) &
-                              (( ~(mask << (byte_part*bits))) & 0xFF );
+                              (( ~(mask << (byte_part*bits))) & 0xFF);
                         else
-                           memset(cheat_manager_state.matches+idx,0,bytes_per_item) ;
-                        if ( cheat_manager_state.num_matches > 0 )
-                           cheat_manager_state.num_matches-- ;
+                           memset(cheat_manager_state.matches+idx,0,bytes_per_item);
+                        if (cheat_manager_state.num_matches > 0)
+                           cheat_manager_state.num_matches--;
                         runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_DELETE_MATCH_SUCCESS), 1, 180, true);
                         return;
                   }
                   return;
                }
-               curr_match_idx++ ;
+               curr_match_idx++;
             }
          }
          else
          {
-            prev_match = *(cheat_manager_state.matches+idx) ;
+            prev_match = *(cheat_manager_state.matches+idx);
             if (prev_match)
             {
                if (target_match_idx == curr_match_idx)
@@ -1494,33 +1584,33 @@ void cheat_manager_match_action(enum cheat_match_action_type match_action, unsig
                   switch (match_action)
                   {
                      case CHEAT_MATCH_ACTION_TYPE_BROWSE :
-                        return ;
+                        return;
                      case CHEAT_MATCH_ACTION_TYPE_VIEW :
-                        *address = idx ;
-                        *address_mask = 0xFF ;
-                        *curr_value = curr_val ;
-                        *prev_value = prev_val ;
-                        return ;
+                        *address = idx;
+                        *address_mask = 0xFF;
+                        *curr_value = curr_val;
+                        *prev_value = prev_val;
+                        return;
                      case CHEAT_MATCH_ACTION_TYPE_COPY :
-                        if ( !cheat_manager_add_new_code(cheat_manager_state.search_bit_size, idx, 0xFF,
-                                 cheat_manager_state.big_endian, curr_val) )
+                        if (!cheat_manager_add_new_code(cheat_manager_state.search_bit_size, idx, 0xFF,
+                                 cheat_manager_state.big_endian, curr_val))
                            runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_ADD_MATCH_FAIL), 1, 180, true);
                         else
                            runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_ADD_MATCH_SUCCESS), 1, 180, true);
-                        return ;
+                        return;
                      case CHEAT_MATCH_ACTION_TYPE_DELETE :
-                        if ( bits < 8 )
+                        if (bits < 8)
                            *(cheat_manager_state.matches+idx) = *(cheat_manager_state.matches+idx) &
-                              (( ~(mask << (byte_part*bits))) & 0xFF );
+                              (( ~(mask << (byte_part*bits))) & 0xFF);
                         else
-                           memset(cheat_manager_state.matches+idx,0,bytes_per_item) ;
-                        if ( cheat_manager_state.num_matches > 0 )
-                           cheat_manager_state.num_matches-- ;
+                           memset(cheat_manager_state.matches+idx,0,bytes_per_item);
+                        if (cheat_manager_state.num_matches > 0)
+                           cheat_manager_state.num_matches--;
                         runloop_msg_queue_push(msg_hash_to_str(MSG_CHEAT_SEARCH_DELETE_MATCH_SUCCESS), 1, 180, true);
-                        return ;
+                        return;
                   }
                }
-               curr_match_idx++ ;
+               curr_match_idx++;
             }
          }
 
@@ -1530,8 +1620,8 @@ void cheat_manager_match_action(enum cheat_match_action_type match_action, unsig
 int cheat_manager_copy_match(rarch_setting_t *setting, bool wraparound)
 {
    cheat_manager_match_action(CHEAT_MATCH_ACTION_TYPE_COPY,
-	   cheat_manager_state.match_idx, NULL, NULL, NULL, NULL) ;
-   return 0 ;
+	   cheat_manager_state.match_idx, NULL, NULL, NULL, NULL);
+   return 0;
 }
 
 int cheat_manager_delete_match(rarch_setting_t *setting, bool wraparound)
diff --git a/managers/cheat_manager.h b/managers/cheat_manager.h
index 1e0737bcbc..e941036a07 100644
--- a/managers/cheat_manager.h
+++ b/managers/cheat_manager.h
@@ -159,10 +159,12 @@ struct cheat_manager
    unsigned size;
    unsigned buf_size;
    unsigned total_memory_size ;
-   unsigned actual_memory_size ;
    uint8_t *curr_memory_buf ;
    uint8_t *prev_memory_buf ;
    uint8_t *matches ;
+   uint8_t **memory_buf_list ;
+   unsigned *memory_size_list ;
+   unsigned num_memory_buffers ;
    struct item_cheat working_cheat;
    unsigned match_idx ;
    unsigned match_action ;
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index c7258c52cf..39fd92b9ff 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -349,8 +349,6 @@ static int general_push(menu_displaylist_info_t *info,
    char                      *newstring2 = NULL;
    core_info_list_t           *list      = NULL;
    menu_handle_t                  *menu  = NULL;
-   rarch_system_info_t           *system = runloop_get_system_info();
-   struct retro_system_info *system_menu = &system->info;
 
    if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
       return menu_cbs_exit();
@@ -406,32 +404,35 @@ static int general_push(menu_displaylist_info_t *info,
    switch (id)
    {
       case PUSH_ARCHIVE_OPEN:
-
-         if (system_menu && system_menu->valid_extensions)
          {
-            if (*system_menu->valid_extensions)
-               strlcpy(newstring2, system_menu->valid_extensions,
+            struct retro_system_info *system      = runloop_get_libretro_system_info();
+            if (system && system->valid_extensions)
+            {
+               if (*system->valid_extensions)
+                  strlcpy(newstring2, system->valid_extensions,
+                        PATH_MAX_LENGTH * sizeof(char));
+            }
+            else
+            {
+               strlcpy(newstring2, system->valid_extensions,
                      PATH_MAX_LENGTH * sizeof(char));
-         }
-         else
-         {
-            strlcpy(newstring2, system->valid_extensions,
-                  PATH_MAX_LENGTH * sizeof(char));
+            }
          }
          break;
       case PUSH_DEFAULT:
          {
-            bool new_exts_allocated = false;
-            char *new_exts          = NULL;
+            bool new_exts_allocated               = false;
+            char *new_exts                        = NULL;
+            struct retro_system_info *system      = runloop_get_libretro_system_info();
 
             if (menu_setting_get_browser_selection_type(info->setting) == ST_DIR)
             {
             }
-            else if (system_menu && system_menu->valid_extensions)
+            else if (system && system->valid_extensions)
             {
-               if (*system_menu->valid_extensions)
+               if (*system->valid_extensions)
                {
-                  new_exts           = strdup(system_menu->valid_extensions);
+                  new_exts           = strdup(system->valid_extensions);
                   new_exts_allocated = true;
                }
             }
@@ -478,16 +479,17 @@ static int general_push(menu_displaylist_info_t *info,
             size_t path_size                 = PATH_MAX_LENGTH * sizeof(char);
             char *newstring                  = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
             struct string_list *str_list2    = string_list_new();
+            struct retro_system_info *system = runloop_get_libretro_system_info();
 
             newstring[0]                     = '\0';
             attr.i                           = 0;
 
-            if (system_menu && system_menu->valid_extensions)
+            if (system && system->valid_extensions)
             {
-               if (!string_is_empty(system_menu->valid_extensions))
+               if (!string_is_empty(system->valid_extensions))
                {
                   unsigned x;
-                  struct string_list *str_list    = string_split(system_menu->valid_extensions, "|");
+                  struct string_list *str_list    = string_split(system->valid_extensions, "|");
 
                   for (x = 0; x < str_list->size; x++)
                   {
@@ -610,6 +612,7 @@ generic_deferred_push_clear_general(deferred_music_history_list, PUSH_DEFAULT, D
 generic_deferred_push_clear_general(deferred_image_history_list, PUSH_DEFAULT, DISPLAYLIST_IMAGES_HISTORY)
 generic_deferred_push_clear_general(deferred_video_history_list, PUSH_DEFAULT, DISPLAYLIST_VIDEO_HISTORY)
 generic_deferred_push_clear_general(deferred_push_dropdown_box_list, PUSH_DEFAULT, DISPLAYLIST_DROPDOWN_LIST)
+generic_deferred_push_clear_general(deferred_push_dropdown_box_list_special, PUSH_DEFAULT, DISPLAYLIST_DROPDOWN_LIST_SPECIAL)
 
 static int menu_cbs_init_bind_deferred_push_compare_label(
       menu_file_list_cbs_t *cbs,
@@ -625,6 +628,11 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
       BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_dropdown_box_list);
       return 0;
    }
+   else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_SPECIAL)))
+   {
+      BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_dropdown_box_list_special);
+      return 0;
+   }
    else if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_BROWSE_URL_LIST)))
    {
       BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_browse_url_list);
@@ -1341,6 +1349,9 @@ static int menu_cbs_init_bind_deferred_push_compare_label(
             case MENU_LABEL_RECORD_CONFIG:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_record_configfile);
                break;
+            case MENU_LABEL_STREAM_CONFIG:
+               BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_stream_configfile);
+               break;
             case MENU_LABEL_NETPLAY:
                BIND_ACTION_DEFERRED_PUSH(cbs, deferred_push_netplay);
                break;
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 0795677572..a5ccd31733 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -1091,11 +1091,6 @@ static void menu_action_setting_disp_set_label_core_option_create(
       const char *path,
       char *s2, size_t len2)
 {
-   rarch_system_info_t *system = runloop_get_system_info();
-
-   if (!system)
-      return;
-
    *s = '\0';
    *w = 19;
 
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index d6fe477c11..577e7d993e 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -148,6 +148,8 @@ static enum msg_hash_enums action_ok_dl_to_enum(unsigned lbl)
    {
       case ACTION_OK_DL_DROPDOWN_BOX_LIST:
          return MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST;
+      case ACTION_OK_DL_DROPDOWN_BOX_LIST_SPECIAL:
+         return MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_SPECIAL;
       case ACTION_OK_DL_MIXER_STREAM_SETTINGS_LIST:
          return MENU_ENUM_LABEL_DEFERRED_MIXER_STREAM_SETTINGS_LIST;
       case ACTION_OK_DL_ACCOUNTS_LIST:
@@ -312,6 +314,15 @@ int generic_action_ok_displaylist_push(const char *path,
          info.enum_idx      = MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST;
          dl_type            = DISPLAYLIST_GENERIC;
          break;
+      case ACTION_OK_DL_DROPDOWN_BOX_LIST_SPECIAL:
+         info.type          = type;
+         info.directory_ptr = idx;
+         info_path          = path;
+         info_label         = msg_hash_to_str(
+               MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_SPECIAL);
+         info.enum_idx      = MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_SPECIAL;
+         dl_type            = DISPLAYLIST_GENERIC;
+         break;
       case ACTION_OK_DL_USER_BINDS_LIST:
          info.type          = type;
          info.directory_ptr = idx;
@@ -477,12 +488,14 @@ int generic_action_ok_displaylist_push(const char *path,
          dl_type            = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
          break;
       case ACTION_OK_DL_STREAM_CONFIGFILE:
-         filebrowser_clear_type();
-         info.type          = type;
-         info.directory_ptr = idx;
-         info_path          = settings->paths.path_stream_config;
-         info_label         = label;
-         dl_type            = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
+         {
+            global_t  *global  = global_get_ptr();
+            info.type          = type;
+            info.directory_ptr = idx;
+            info_path          = global->record.config_dir;
+            info_label         = label;
+            dl_type            = DISPLAYLIST_FILE_BROWSER_SELECT_FILE;
+         }
          break;
       case ACTION_OK_DL_RECORD_CONFIGFILE:
          filebrowser_clear_type();
@@ -1302,20 +1315,22 @@ static int generic_action_ok(const char *path,
          break;
       case ACTION_OK_LOAD_STREAM_CONFIGFILE:
          {
-            settings_t *settings            = config_get_ptr();
+            settings_t *settings = config_get_ptr();
             flush_char       = msg_hash_to_str(flush_id);
-            strlcpy(settings->paths.path_stream_config, action_path,
-                  sizeof(settings->paths.path_stream_config));
+
+            if (settings)
+               strlcpy(settings->paths.path_stream_config, action_path,
+                     sizeof(settings->paths.path_stream_config));
          }
          break;
       case ACTION_OK_LOAD_RECORD_CONFIGFILE:
          {
-            global_t *global = global_get_ptr();
+            settings_t *settings = config_get_ptr();
             flush_char       = msg_hash_to_str(flush_id);
 
-            if (global)
-               strlcpy(global->record.config, action_path,
-                     sizeof(global->record.config));
+            if (settings)
+               strlcpy(settings->paths.path_record_config, action_path,
+                     sizeof(settings->paths.path_record_config));
          }
          break;
       case ACTION_OK_LOAD_REMAPPING_FILE:
@@ -2207,15 +2222,12 @@ static int generic_action_ok_shader_preset_save(const char *path,
    char directory[PATH_MAX_LENGTH];
    char file[PATH_MAX_LENGTH];
    char tmp[PATH_MAX_LENGTH];
-   settings_t *settings            = config_get_ptr();
-   const char *core_name           = NULL;
-   rarch_system_info_t *info       = runloop_get_system_info();
+   settings_t *settings             = config_get_ptr();
+   struct retro_system_info *system = runloop_get_libretro_system_info();
+   const char *core_name            = system ? system->library_name : NULL;
 
    directory[0] = file[0] = tmp[0] = '\0';
 
-   if (info)
-      core_name           = info->info.library_name;
-
    if (!string_is_empty(core_name))
    {
       fill_pathname_join(
@@ -2292,15 +2304,12 @@ static int generic_action_ok_remap_file_operation(const char *path,
    char directory[PATH_MAX_LENGTH];
    char file[PATH_MAX_LENGTH];
    char content_dir[PATH_MAX_LENGTH];
-   settings_t *settings            = config_get_ptr();
-   const char *core_name           = NULL;
-   rarch_system_info_t *info       = runloop_get_system_info();
+   settings_t *settings             = config_get_ptr();
+   struct retro_system_info *system = runloop_get_libretro_system_info();
+   const char *core_name            = system ? system->library_name : NULL;
 
    directory[0] = file[0]          = '\0';
 
-   if (info)
-      core_name           = info->info.library_name;
-
    if (!string_is_empty(core_name))
       fill_pathname_join(
             directory,
@@ -4262,6 +4271,89 @@ int action_ok_push_filebrowser_list_file_select(const char *path,
          entry_idx, ACTION_OK_DL_FILE_BROWSER_SELECT_DIR);
 }
 
+/* TODO/FIXME */
+static int action_ok_push_dropdown_setting_core_options_item_special(const char *path,
+      const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   core_option_manager_t *coreopts = NULL;
+   int core_option_idx             = (int)atoi(label);
+
+   rarch_ctl(RARCH_CTL_CORE_OPTIONS_LIST_GET, &coreopts);
+
+   if (!coreopts)
+      return -1;
+
+   core_option_manager_set_val(coreopts, core_option_idx, idx);
+   return action_cancel_pop_default(NULL, NULL, 0, 0);
+}
+
+/* TODO/FIXME */
+static int action_ok_push_dropdown_setting_string_options_item_special(const char *path,
+      const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   enum msg_hash_enums enum_idx = (enum msg_hash_enums)atoi(label);
+   rarch_setting_t     *setting = menu_setting_find_enum(enum_idx);
+
+   if (!setting)
+      return -1;
+
+   strlcpy(setting->value.target.string, path,
+         setting->size);
+   return action_cancel_pop_default(NULL, NULL, 0, 0);
+}
+
+/* TODO/FIXME */
+static int action_ok_push_dropdown_setting_int_item_special(const char *path,
+      const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   enum msg_hash_enums enum_idx = (enum msg_hash_enums)atoi(label);
+   rarch_setting_t     *setting = menu_setting_find_enum(enum_idx);
+
+   if (!setting)
+      return -1;
+
+   *setting->value.target.integer = (int32_t)(idx + setting->offset_by);
+   return action_cancel_pop_default(NULL, NULL, 0, 0);
+}
+
+/* TODO/FIXME */
+static int action_ok_push_dropdown_setting_float_item_special(const char *path,
+      const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   enum msg_hash_enums enum_idx = (enum msg_hash_enums)atoi(label);
+   rarch_setting_t     *setting = menu_setting_find_enum(enum_idx);
+   float val                    = (float)atof(path);
+
+   if (!setting)
+      return -1;
+
+   *setting->value.target.fraction = (float)val;
+   return action_cancel_pop_default(NULL, NULL, 0, 0);
+}
+
+static int action_ok_push_dropdown_setting_uint_item_special(const char *path,
+      const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   unsigned value;
+   enum msg_hash_enums enum_idx = (enum msg_hash_enums)atoi(label);
+   rarch_setting_t     *setting = menu_setting_find_enum(enum_idx);
+
+   if (!setting)
+      return -1;
+
+   value = (unsigned)(idx + setting->offset_by);
+
+   if (!string_is_empty(path))
+   {
+      unsigned path_value = atoi(path);
+      if (path_value != value)
+         value = path_value;
+   }
+
+   *setting->value.target.unsigned_integer = value;
+   return action_cancel_pop_default(NULL, NULL, 0, 0);
+}
+
 static int action_ok_push_dropdown_setting_core_options_item(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
@@ -4321,13 +4413,25 @@ static int action_ok_push_dropdown_setting_float_item(const char *path,
 static int action_ok_push_dropdown_setting_uint_item(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
+   unsigned value;
    enum msg_hash_enums enum_idx = (enum msg_hash_enums)atoi(label);
    rarch_setting_t     *setting = menu_setting_find_enum(enum_idx);
 
    if (!setting)
       return -1;
 
-   *setting->value.target.unsigned_integer = (unsigned)(idx + setting->offset_by);
+   value = (unsigned)(idx + setting->offset_by);
+
+#if 0
+   if (!string_is_empty(path))
+   {
+      unsigned path_value = atoi(path);
+      if (path_value != value)
+         value = path_value;
+   }
+#endif
+
+   *setting->value.target.unsigned_integer = value;
    return action_cancel_pop_default(NULL, NULL, 0, 0);
 }
 
@@ -5288,6 +5392,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_LABEL_RECORD_CONFIG:
             BIND_ACTION_OK(cbs, action_ok_record_configfile);
             break;
+         case MENU_LABEL_STREAM_CONFIG:
+            BIND_ACTION_OK(cbs, action_ok_stream_configfile);
+            break;
 #ifdef HAVE_NETWORKING
          case MENU_LABEL_UPDATE_LAKKA:
             BIND_ACTION_OK(cbs, action_ok_lakka_list);
@@ -5430,6 +5537,21 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
          case MENU_SETTING_DROPDOWN_SETTING_UINT_ITEM:
             BIND_ACTION_OK(cbs, action_ok_push_dropdown_setting_uint_item);
             break;
+         case MENU_SETTING_DROPDOWN_SETTING_CORE_OPTIONS_ITEM_SPECIAL:
+            BIND_ACTION_OK(cbs, action_ok_push_dropdown_setting_core_options_item_special);
+            break;
+         case MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM_SPECIAL:
+            BIND_ACTION_OK(cbs, action_ok_push_dropdown_setting_string_options_item_special);
+            break;
+         case MENU_SETTING_DROPDOWN_SETTING_INT_ITEM_SPECIAL:
+            BIND_ACTION_OK(cbs, action_ok_push_dropdown_setting_int_item_special);
+            break;
+         case MENU_SETTING_DROPDOWN_SETTING_FLOAT_ITEM_SPECIAL:
+            BIND_ACTION_OK(cbs, action_ok_push_dropdown_setting_float_item_special);
+            break;
+         case MENU_SETTING_DROPDOWN_SETTING_UINT_ITEM_SPECIAL:
+            BIND_ACTION_OK(cbs, action_ok_push_dropdown_setting_uint_item_special);
+            break;
          case MENU_SETTING_DROPDOWN_ITEM:
             BIND_ACTION_OK(cbs, action_ok_push_dropdown_item);
             break;
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index 8953602cbd..c4ff5f6cf5 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -374,6 +374,8 @@ default_sublabel_macro(action_bind_sublabel_xmb_icon_theme,
 default_sublabel_macro(action_bind_sublabel_xmb_shadows_enable,                    MENU_ENUM_SUBLABEL_XMB_SHADOWS_ENABLE)
 default_sublabel_macro(action_bind_sublabel_xmb_vertical_thumbnails,               MENU_ENUM_SUBLABEL_XMB_VERTICAL_THUMBNAILS)
 default_sublabel_macro(action_bind_sublabel_menu_color_theme,                      MENU_ENUM_SUBLABEL_MATERIALUI_MENU_COLOR_THEME)
+default_sublabel_macro(action_bind_sublabel_ozone_menu_color_theme,                MENU_ENUM_SUBLABEL_OZONE_MENU_COLOR_THEME)
+default_sublabel_macro(action_bind_sublabel_menu_use_preferred_system_color_theme, MENU_ENUM_SUBLABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME)
 default_sublabel_macro(action_bind_sublabel_menu_wallpaper_opacity,                MENU_ENUM_SUBLABEL_MENU_WALLPAPER_OPACITY)
 default_sublabel_macro(action_bind_sublabel_menu_framebuffer_opacity,              MENU_ENUM_SUBLABEL_MENU_FRAMEBUFFER_OPACITY)
 default_sublabel_macro(action_bind_sublabel_menu_ribbon_enable,                    MENU_ENUM_SUBLABEL_XMB_RIBBON_ENABLE)
@@ -1075,6 +1077,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_MENU_WALLPAPER_OPACITY:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_wallpaper_opacity);
             break;
+         case MENU_ENUM_LABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_use_preferred_system_color_theme);
+            break;
+         case MENU_ENUM_LABEL_OZONE_MENU_COLOR_THEME:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_ozone_menu_color_theme);
+            break;
          case MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME:
          case MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_menu_color_theme);
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index e9d53a9b41..de5b97afa9 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -1245,6 +1245,12 @@ int menu_cbs_init_bind_title(menu_file_list_cbs_t *cbs,
          BIND_ACTION_GET_TITLE(cbs, action_get_title_dropdown_item);
          return 0;
    }
+   if (string_is_equal(label,
+            msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_SPECIAL)))
+   {
+         BIND_ACTION_GET_TITLE(cbs, action_get_title_dropdown_item);
+         return 0;
+   }
    if (string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RPL_ENTRY_ACTIONS)))
    {
       BIND_ACTION_GET_TITLE(cbs, action_get_quick_menu_views_settings_list);
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 5d09674ade..cc6b7deede 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -183,14 +183,6 @@ typedef struct materialui_handle
 
 } materialui_handle_t;
 
-static void hex32_to_rgba_normalized(uint32_t hex, float* rgba, float alpha)
-{
-   rgba[0] = rgba[4] = rgba[8]  = rgba[12] = ((hex >> 16) & 0xFF) * (1.0f / 255.0f); /* r */
-   rgba[1] = rgba[5] = rgba[9]  = rgba[13] = ((hex >> 8 ) & 0xFF) * (1.0f / 255.0f); /* g */
-   rgba[2] = rgba[6] = rgba[10] = rgba[14] = ((hex >> 0 ) & 0xFF) * (1.0f / 255.0f); /* b */
-   rgba[3] = rgba[7] = rgba[11] = rgba[15] = alpha;
-}
-
 static const char *materialui_texture_path(unsigned id)
 {
    switch (id)
@@ -567,7 +559,7 @@ static void materialui_render_messagebox(materialui_handle_t *mui,
                mui->font, msg,
                x - longest_width/2.0,
                y + i * line_height + mui->font->size / 3,
-               width, height, font_color, TEXT_ALIGN_LEFT, 1.0f, false, 0);
+               width, height, font_color, TEXT_ALIGN_LEFT, 1.0f, false, 0, false);
 
    }
 
@@ -576,7 +568,8 @@ static void materialui_render_messagebox(materialui_handle_t *mui,
             mui->textures.list[MUI_TEXTURE_KEY_HOVER],
             mui->font,
             video_info,
-            menu_event_get_osk_grid(), menu_event_get_osk_ptr());
+            menu_event_get_osk_grid(), menu_event_get_osk_ptr(),
+            0xffffffff);
 
 end:
    if (list)
@@ -650,7 +643,6 @@ static void materialui_compute_entries_box(materialui_handle_t* mui, int width)
 static void materialui_render(void *data, bool is_idle)
 {
    menu_animation_ctx_delta_t delta;
-   float delta_time;
    unsigned bottom, width, height, header_height;
    size_t        i             = 0;
    materialui_handle_t *mui    = (materialui_handle_t*)data;
@@ -669,9 +661,7 @@ static void materialui_render(void *data, bool is_idle)
       mui->need_compute = false;
    }
 
-   menu_animation_ctl(MENU_ANIMATION_CTL_DELTA_TIME, &delta_time);
-
-   delta.current = delta_time;
+   delta.current = menu_animation_get_delta_time();
 
    if (menu_animation_get_ideal_delta_time(&delta))
       menu_animation_update(delta.ideal);
@@ -874,7 +864,7 @@ static void materialui_render_label_value(
                mui->margin + icon_margin,
                y + (scale_factor / 4) + mui->font->size,
                width, height, sublabel_color, TEXT_ALIGN_LEFT,
-               1.0f, false, 0);
+               1.0f, false, 0, false);
       }
       free(sublabel_str);
    }
@@ -882,13 +872,13 @@ static void materialui_render_label_value(
    menu_display_draw_text(mui->font, label_str,
          mui->margin + icon_margin,
          y + (scale_factor / 5),
-         width, height, color, TEXT_ALIGN_LEFT, 1.0f, false, 0);
+         width, height, color, TEXT_ALIGN_LEFT, 1.0f, false, 0, false);
 
    if (do_draw_text)
       menu_display_draw_text(mui->font, value_str,
             width - mui->margin,
             y + (scale_factor / 5),
-            width, height, color, TEXT_ALIGN_RIGHT, 1.0f, false, 0);
+            width, height, color, TEXT_ALIGN_RIGHT, 1.0f, false, 0, false);
 
    if (texture_switch2)
       materialui_draw_icon(video_info,
@@ -1027,23 +1017,13 @@ static size_t materialui_list_get_size(void *data, enum menu_list_type type)
 static int materialui_get_core_title(char *s, size_t len)
 {
    settings_t *settings              = config_get_ptr();
-   rarch_system_info_t *info         = runloop_get_system_info();
-   struct retro_system_info *system  = &info->info;
-
-   const char *core_name             = system->library_name;
-   const char *core_version          = system->library_version;
+   struct retro_system_info *system  = runloop_get_libretro_system_info();
+   const char *core_name             = system ? system->library_name : NULL;
+   const char *core_version          = system ? system->library_version : NULL;
 
    if (!settings->bools.menu_core_enable)
       return -1;
 
-   if (info)
-   {
-      if (string_is_empty(core_name))
-         core_name = info->info.library_name;
-      if (!core_version)
-         core_version = info->info.library_version;
-   }
-
    if (string_is_empty(core_name))
       core_name    = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE);
    if (!core_version)
@@ -1582,7 +1562,7 @@ static void materialui_frame(void *data, video_frame_info_t *video_info)
       menu_display_draw_text(mui->font, title_buf,
             title_margin,
             header_height / 2 + mui->font->size / 3,
-            width, height, font_header_color, TEXT_ALIGN_LEFT, 1.0f, false, 0);
+            width, height, font_header_color, TEXT_ALIGN_LEFT, 1.0f, false, 0, false);
 
    materialui_draw_scrollbar(mui, video_info, width, height, &grey_bg[0]);
 
@@ -2074,7 +2054,7 @@ static int materialui_list_push(void *data, void *userdata,
                      msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
             {
                entry.enum_idx      = MENU_ENUM_LABEL_CONTENT_SETTINGS;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
 #ifndef HAVE_DYNAMIC
@@ -2084,39 +2064,39 @@ static int materialui_list_push(void *data, void *userdata,
                if (settings->bools.menu_show_load_core)
                {
                   entry.enum_idx      = MENU_ENUM_LABEL_CORE_LIST;
-                  menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+                  menu_displaylist_setting(&entry);
                }
             }
 
             if (system->load_no_content)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_START_CORE;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.menu_show_load_content)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_LOAD_CONTENT_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.menu_content_show_history)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_LOAD_CONTENT_HISTORY;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
 #if defined(HAVE_NETWORKING)
 #ifdef HAVE_LAKKA
             entry.enum_idx      = MENU_ENUM_LABEL_UPDATE_LAKKA;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
 #else
             {
                settings_t *settings      = config_get_ptr();
                if (settings->bools.menu_show_online_updater)
                {
                   entry.enum_idx      = MENU_ENUM_LABEL_ONLINE_UPDATER;
-                  menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+                  menu_displaylist_setting(&entry);
                }
             }
 #endif
@@ -2124,44 +2104,44 @@ static int materialui_list_push(void *data, void *userdata,
             if (settings->bools.menu_content_show_netplay)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_NETPLAY;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 #endif
             if (settings->bools.menu_show_information)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_INFORMATION_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 #ifndef HAVE_DYNAMIC
             entry.enum_idx      = MENU_ENUM_LABEL_RESTART_RETROARCH;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
 #endif
             if (settings->bools.menu_show_configurations)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_CONFIGURATIONS_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.menu_show_help)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_HELP_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 #if !defined(IOS)
             entry.enum_idx      = MENU_ENUM_LABEL_QUIT_RETROARCH;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
 #endif
 #if defined(HAVE_LAKKA)
             if (settings->bools.menu_show_reboot)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_REBOOT;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.menu_show_shutdown)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_SHUTDOWN;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 #endif
             info->need_push    = true;
@@ -2752,7 +2732,7 @@ static void materialui_list_clear(file_list_t *list)
       subject.count = 2;
       subject.data  = subjects;
 
-      menu_animation_ctl(MENU_ANIMATION_CTL_KILL_BY_SUBJECT, &subject);
+      menu_animation_kill_by_subject(&subject);
 
       file_list_free_userdata(list, i);
    }
diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
new file mode 100644
index 0000000000..556b59fe20
--- /dev/null
+++ b/menu/drivers/ozone/ozone.c
@@ -0,0 +1,1856 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *  Copyright (C) 2018      - Alfredo Monclús
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ozone.h"
+#include "ozone_display.h"
+#include "ozone_theme.h"
+#include "ozone_texture.h"
+#include "ozone_sidebar.h"
+
+#include <file/file_path.h>
+#include <string/stdstring.h>
+#include <encodings/utf.h>
+#include <streams/file_stream.h>
+#include <features/features_cpu.h>
+#include <formats/image.h>
+
+#include "../menu_generic.h"
+
+#include "../../menu_driver.h"
+#include "../../menu_animation.h"
+#include "../../menu_input.h"
+
+#include "../../widgets/menu_input_dialog.h"
+#include "../../widgets/menu_osk.h"
+
+#include "../../../configuration.h"
+#include "../../../content.h"
+#include "../../../core_info.h"
+#include "../../../core.h"
+#include "../../../verbosity.h"
+#include "../../../tasks/tasks_internal.h"
+
+ozone_node_t *ozone_alloc_node()
+{
+   ozone_node_t *node = (ozone_node_t*)malloc(sizeof(*node));
+
+   node->height         = 0;
+   node->position_y     = 0;
+   node->console_name   = NULL;
+   node->icon           = 0;
+   node->content_icon   = 0;
+
+   return node;
+}
+
+size_t ozone_list_get_size(void *data, enum menu_list_type type)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) data;
+
+   if (!ozone)
+      return 0;
+
+   switch (type)
+   {
+      case MENU_LIST_PLAIN:
+         return menu_entries_get_stack_size(0);
+      case MENU_LIST_HORIZONTAL:
+         if (ozone && ozone->horizontal_list)
+            return file_list_get_size(ozone->horizontal_list);
+         break;
+      case MENU_LIST_TABS:
+         return ozone->system_tab_end;
+   }
+
+   return 0;
+}
+
+static void ozone_free_node(ozone_node_t *node)
+{
+   if (!node)
+      return;
+
+   if (node->console_name)
+      free(node->console_name);
+
+   free(node);
+}
+
+void ozone_free_list_nodes(file_list_t *list, bool actiondata)
+{
+   unsigned i, size = (unsigned)file_list_get_size(list);
+
+   for (i = 0; i < size; ++i)
+   {
+      ozone_free_node((ozone_node_t*)file_list_get_userdata_at_offset(list, i));
+
+      /* file_list_set_userdata() doesn't accept NULL */
+      list->list[i].userdata = NULL;
+
+      if (actiondata)
+         file_list_free_actiondata(list, i);
+   }
+}
+
+static void *ozone_init(void **userdata, bool video_is_threaded) 
+{
+   bool fallback_color_theme           = false;
+   unsigned width, height, color_theme = 0;
+   ozone_handle_t *ozone               = NULL;
+   settings_t *settings                = config_get_ptr();
+   menu_handle_t *menu                 = (menu_handle_t*)calloc(1, sizeof(*menu));
+
+   if (!menu)
+      return false;
+
+   if (!menu_display_init_first_driver(video_is_threaded))
+      goto error;
+
+   video_driver_get_size(&width, &height);
+
+   ozone = (ozone_handle_t*)calloc(1, sizeof(ozone_handle_t));
+
+   if (!ozone)
+      goto error;
+
+   *userdata = ozone;
+
+   ozone->selection_buf_old = (file_list_t*)calloc(1, sizeof(file_list_t));
+
+   ozone->draw_sidebar              = true;
+   ozone->sidebar_offset            = 0;
+   ozone->pending_message           = NULL;
+   ozone->is_playlist               = false;
+   ozone->categories_selection_ptr  = 0;
+   ozone->pending_message           = NULL;
+
+   ozone->system_tab_end                = 0;
+   ozone->tabs[ozone->system_tab_end]     = OZONE_SYSTEM_TAB_MAIN;
+   if (settings->bools.menu_content_show_settings && !settings->bools.kiosk_mode_enable)
+      ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_SETTINGS;
+   if (settings->bools.menu_content_show_favorites)
+      ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_FAVORITES;
+   if (settings->bools.menu_content_show_history)
+      ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_HISTORY;
+#ifdef HAVE_IMAGEVIEWER
+   if (settings->bools.menu_content_show_images)
+      ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_IMAGES;
+#endif
+   if (settings->bools.menu_content_show_music)
+      ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_MUSIC;
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
+   if (settings->bools.menu_content_show_video)
+      ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_VIDEO;
+#endif
+#ifdef HAVE_NETWORKING
+   if (settings->bools.menu_content_show_netplay)
+      ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_NETPLAY;
+#endif
+#ifdef HAVE_LIBRETRODB
+   if (settings->bools.menu_content_show_add && !settings->bools.kiosk_mode_enable)
+      ozone->tabs[++ozone->system_tab_end] = OZONE_SYSTEM_TAB_ADD;
+#endif
+
+   menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL);
+
+   menu_display_set_width(width);
+   menu_display_set_height(height);
+
+   menu_display_allocate_white_texture();
+
+   ozone->horizontal_list = (file_list_t*)calloc(1, sizeof(file_list_t));
+
+   if (ozone->horizontal_list)
+      ozone_init_horizontal_list(ozone);
+
+   /* Theme */
+   if (settings->bools.menu_use_preferred_system_color_theme)
+   {
+#ifdef HAVE_LIBNX
+      if (R_SUCCEEDED(setsysInitialize())) 
+      {
+         ColorSetId theme;
+         setsysGetColorSetId(&theme);
+         color_theme = (theme == ColorSetId_Dark) ? 1 : 0;
+         ozone_set_color_theme(ozone, color_theme);
+         settings->uints.menu_ozone_color_theme = color_theme;
+         settings->bools.menu_preferred_system_color_theme_set = true;
+         setsysExit();
+      }
+      else
+         fallback_color_theme = true;
+#endif
+   }
+   else
+      fallback_color_theme = true;
+
+   if (fallback_color_theme)
+   {
+      color_theme = settings->uints.menu_ozone_color_theme;
+      ozone_set_color_theme(ozone, color_theme);
+   }
+   
+   ozone->need_compute                 = false;
+   ozone->animations.scroll_y          = 0.0f;
+   ozone->animations.scroll_y_sidebar  = 0.0f;
+
+   /* Assets path */
+   fill_pathname_join(
+      ozone->assets_path,
+      settings->paths.directory_assets,
+      "ozone",
+      sizeof(ozone->assets_path)
+   );
+
+   /* PNG path */
+   fill_pathname_join(
+      ozone->png_path,
+      ozone->assets_path,
+      "png",
+      sizeof(ozone->png_path)
+   );
+
+   /* Icons path */
+   fill_pathname_join(
+      ozone->icons_path,
+      ozone->png_path,
+      "icons",
+      sizeof(ozone->icons_path)
+   );
+
+   /* Sidebar path */
+   fill_pathname_join(
+      ozone->tab_path,
+      ozone->png_path,
+      "sidebar",
+      sizeof(ozone->tab_path)
+   );
+
+   last_use_preferred_system_color_theme = settings->bools.menu_use_preferred_system_color_theme;
+
+   return menu;
+
+error:
+   if (ozone->horizontal_list)
+   {
+      ozone_free_list_nodes(ozone->horizontal_list, false);
+      file_list_free(ozone->horizontal_list);
+   }
+   ozone->horizontal_list = NULL;
+
+   if (menu)
+      free(menu);
+
+   return NULL;
+}
+
+static void ozone_free(void *data)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) data;
+
+   if (ozone)
+   {
+      video_coord_array_free(&ozone->raster_blocks.footer.carr);
+      video_coord_array_free(&ozone->raster_blocks.title.carr);
+      video_coord_array_free(&ozone->raster_blocks.time.carr);
+      video_coord_array_free(&ozone->raster_blocks.entries_label.carr);
+      video_coord_array_free(&ozone->raster_blocks.entries_sublabel.carr);
+      video_coord_array_free(&ozone->raster_blocks.sidebar.carr);
+
+      font_driver_bind_block(NULL, NULL);
+
+      if (ozone->selection_buf_old)
+      {
+         ozone_free_list_nodes(ozone->selection_buf_old, false);
+         file_list_free(ozone->selection_buf_old);
+      }
+
+      if (ozone->horizontal_list)
+      {
+         ozone_free_list_nodes(ozone->horizontal_list, false);
+         file_list_free(ozone->horizontal_list);
+      }
+
+      if (!string_is_empty(ozone->pending_message))
+         free(ozone->pending_message);
+   }
+}
+
+static void ozone_context_reset(void *data, bool is_threaded)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) data;
+
+   if (ozone)
+   {
+      ozone->has_all_assets = true;
+
+      /* Fonts init */
+      unsigned i;
+      unsigned size;
+      char font_path[PATH_MAX_LENGTH];
+
+      fill_pathname_join(font_path, ozone->assets_path, "regular.ttf", sizeof(font_path));
+      ozone->fonts.footer = menu_display_font_file(font_path, FONT_SIZE_FOOTER, is_threaded);
+      ozone->fonts.entries_label = menu_display_font_file(font_path, FONT_SIZE_ENTRIES_LABEL, is_threaded);
+      ozone->fonts.entries_sublabel = menu_display_font_file(font_path, FONT_SIZE_ENTRIES_SUBLABEL, is_threaded);
+      ozone->fonts.time = menu_display_font_file(font_path, FONT_SIZE_TIME, is_threaded);
+      ozone->fonts.sidebar = menu_display_font_file(font_path, FONT_SIZE_SIDEBAR, is_threaded);
+
+      fill_pathname_join(font_path, ozone->assets_path, "bold.ttf", sizeof(font_path));
+      ozone->fonts.title = menu_display_font_file(font_path, FONT_SIZE_TITLE, is_threaded);
+
+      if (
+         !ozone->fonts.footer           ||
+         !ozone->fonts.entries_label    ||
+         !ozone->fonts.entries_sublabel ||
+         !ozone->fonts.time             ||
+         !ozone->fonts.sidebar          ||
+         !ozone->fonts.title
+      )
+      {
+         ozone->has_all_assets = false;
+      }
+
+      /* Naive font size */
+      ozone->title_font_glyph_width = FONT_SIZE_TITLE * 3/4;
+      ozone->entry_font_glyph_width = FONT_SIZE_ENTRIES_LABEL * 3/4;
+      ozone->sublabel_font_glyph_width = FONT_SIZE_ENTRIES_SUBLABEL * 3/4;
+
+      /* More realistic font size */
+      size = font_driver_get_message_width(ozone->fonts.title, "a", 1, 1);
+      if (size)
+         ozone->title_font_glyph_width = size;
+      size = font_driver_get_message_width(ozone->fonts.entries_label, "a", 1, 1);
+      if (size)
+         ozone->entry_font_glyph_width = size;
+      size = font_driver_get_message_width(ozone->fonts.entries_sublabel, "a", 1, 1);
+      if (size)
+         ozone->sublabel_font_glyph_width = size;
+
+      /* Textures init */
+      for (i = 0; i < OZONE_TEXTURE_LAST; i++)
+      {
+         char filename[PATH_MAX_LENGTH];
+         strlcpy(filename, OZONE_TEXTURES_FILES[i], sizeof(filename));
+         strlcat(filename, ".png", sizeof(filename));
+
+         if (!menu_display_reset_textures_list(filename, ozone->png_path, &ozone->textures[i], TEXTURE_FILTER_MIPMAP_LINEAR))
+            ozone->has_all_assets = false;
+      }
+
+      /* Sidebar textures */
+      for (i = 0; i < OZONE_TAB_TEXTURE_LAST; i++)
+      {
+         char filename[PATH_MAX_LENGTH];
+         strlcpy(filename, OZONE_TAB_TEXTURES_FILES[i], sizeof(filename));
+         strlcat(filename, ".png", sizeof(filename));
+
+         if (!menu_display_reset_textures_list(filename, ozone->tab_path, &ozone->tab_textures[i], TEXTURE_FILTER_MIPMAP_LINEAR))
+            ozone->has_all_assets = false;
+      }
+
+      /* Theme textures */
+      if (!ozone_reset_theme_textures(ozone))
+         ozone->has_all_assets = false;
+
+      /* Icons textures init */
+      for (i = 0; i < OZONE_ENTRIES_ICONS_TEXTURE_LAST; i++)
+         if (!menu_display_reset_textures_list(ozone_entries_icon_texture_path(ozone, i), ozone->icons_path, &ozone->icons_textures[i], TEXTURE_FILTER_MIPMAP_LINEAR))
+            ozone->has_all_assets = false;
+
+      menu_display_allocate_white_texture();
+
+      /* Horizontal list */
+      ozone_context_reset_horizontal_list(ozone);
+
+      /* State reset */
+      ozone->frame_count                  = 0;
+      ozone->fade_direction               = false;
+      ozone->cursor_in_sidebar            = false;
+      ozone->cursor_in_sidebar_old        = false;
+      ozone->draw_old_list                = false;
+      ozone->messagebox_state             = false;
+      ozone->messagebox_state_old         = false;
+
+      /* Animations */
+      ozone->animations.cursor_alpha   = 1.0f;
+      ozone->animations.scroll_y       = 0.0f;
+      ozone->animations.list_alpha     = 1.0f;
+
+      /* Missing assets message */
+      if (!ozone->has_all_assets)
+      {
+         RARCH_WARN("[OZONE] Assets missing\n");
+         runloop_msg_queue_push(msg_hash_to_str(MSG_MISSING_ASSETS), 1, 256, false);
+      }
+      ozone_restart_cursor_animation(ozone);
+   }
+}
+
+static void ozone_collapse_end(void *userdata)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) userdata;
+   ozone->draw_sidebar = false;
+}
+
+static void ozone_context_destroy(void *data)
+{
+   unsigned i;
+   ozone_handle_t *ozone = (ozone_handle_t*) data;
+
+   if (!ozone)
+      return;
+
+   /* Theme */
+   ozone_unload_theme_textures(ozone);
+
+   /* Icons */
+   for (i = 0; i < OZONE_ENTRIES_ICONS_TEXTURE_LAST; i++)
+      video_driver_texture_unload(&ozone->icons_textures[i]);
+
+   /* Textures */
+   for (i = 0; i < OZONE_TEXTURE_LAST; i++)
+      video_driver_texture_unload(&ozone->textures[i]);
+   
+   /* Icons */
+   for (i = 0; i < OZONE_TAB_TEXTURE_LAST; i++)
+      video_driver_texture_unload(&ozone->tab_textures[i]);
+
+   video_driver_texture_unload(&menu_display_white_texture);
+
+   menu_display_font_free(ozone->fonts.footer);
+   menu_display_font_free(ozone->fonts.title);
+   menu_display_font_free(ozone->fonts.time);
+   menu_display_font_free(ozone->fonts.entries_label);
+   menu_display_font_free(ozone->fonts.entries_sublabel);
+   menu_display_font_free(ozone->fonts.sidebar);
+
+   ozone->fonts.footer = NULL;
+   ozone->fonts.title = NULL;
+   ozone->fonts.time = NULL;
+   ozone->fonts.entries_label = NULL;
+   ozone->fonts.entries_sublabel = NULL;
+   ozone->fonts.sidebar = NULL;
+
+   menu_animation_ctx_tag tag = (uintptr_t) &ozone_default_theme;
+   menu_animation_kill_by_tag(&tag);
+
+   /* Horizontal list */
+   ozone_context_destroy_horizontal_list(ozone);
+}
+
+static void *ozone_list_get_entry(void *data,
+      enum menu_list_type type, unsigned i)
+{
+   size_t list_size        = 0;
+   ozone_handle_t* ozone   = (ozone_handle_t*) data;
+
+   switch (type)
+   {
+      case MENU_LIST_PLAIN:
+         {
+            file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
+            list_size  = menu_entries_get_stack_size(0);
+            if (i < list_size)
+               return (void*)&menu_stack->list[i];
+         }
+         break;
+      case MENU_LIST_HORIZONTAL:
+         if (ozone && ozone->horizontal_list)
+            list_size = file_list_get_size(ozone->horizontal_list);
+         if (i < list_size)
+            return (void*)&ozone->horizontal_list->list[i];
+         break;
+      default:
+         break;
+   }
+
+   return NULL;
+}
+
+static int ozone_list_push(void *data, void *userdata,
+      menu_displaylist_info_t *info, unsigned type)
+{
+   menu_displaylist_ctx_parse_entry_t entry;
+   int ret                = -1;
+   unsigned i             = 0;
+   core_info_list_t *list = NULL;
+   menu_handle_t *menu    = (menu_handle_t*)data;
+
+   switch (type)
+   {
+      case DISPLAYLIST_LOAD_CONTENT_LIST:
+         {
+            settings_t *settings = config_get_ptr();
+
+            menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
+
+            menu_entries_append_enum(info->list,
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FAVORITES),
+                  msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES),
+                  MENU_ENUM_LABEL_FAVORITES,
+                  MENU_SETTING_ACTION, 0, 0);
+
+            core_info_get_list(&list);
+            if (core_info_list_num_info_files(list))
+            {
+               menu_entries_append_enum(info->list,
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST),
+                     msg_hash_to_str(MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST),
+                     MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST,
+                     MENU_SETTING_ACTION, 0, 0);
+            }
+
+#ifdef HAVE_LIBRETRODB
+            menu_entries_append_enum(info->list,
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST),
+                  msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST),
+                  MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST,
+                  MENU_SETTING_ACTION, 0, 0);
+#endif
+
+            if (frontend_driver_parse_drive_list(info->list, true) != 0)
+               menu_entries_append_enum(info->list, "/",
+                     msg_hash_to_str(MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR),
+                     MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR,
+                     MENU_SETTING_ACTION, 0, 0);
+
+            if (!settings->bools.kiosk_mode_enable)
+            {
+               menu_entries_append_enum(info->list,
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS),
+                     msg_hash_to_str(MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS),
+                     MENU_ENUM_LABEL_MENU_FILE_BROWSER_SETTINGS,
+                     MENU_SETTING_ACTION, 0, 0);
+            }
+
+            info->need_push    = true;
+            info->need_refresh = true;
+            ret = 0;
+         }
+         break;
+      case DISPLAYLIST_MAIN_MENU:
+         {
+            settings_t   *settings      = config_get_ptr();
+            rarch_system_info_t *system = runloop_get_system_info();
+            menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
+
+            entry.data            = menu;
+            entry.info            = info;
+            entry.parse_type      = PARSE_ACTION;
+            entry.add_empty_entry = false;
+
+            if (!string_is_empty(system->info.library_name) &&
+                  !string_is_equal(system->info.library_name,
+                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_CONTENT_SETTINGS;
+               menu_displaylist_setting(&entry);
+            }
+
+            if (system->load_no_content)
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_START_CORE;
+               menu_displaylist_setting(&entry);
+            }
+
+#ifndef HAVE_DYNAMIC
+            if (frontend_driver_has_fork())
+#endif
+            {
+               if (settings->bools.menu_show_load_core)
+               {
+                  entry.enum_idx   = MENU_ENUM_LABEL_CORE_LIST;
+                  menu_displaylist_setting(&entry);
+               }
+            }
+
+            if (settings->bools.menu_show_load_content)
+            {
+               const struct retro_subsystem_info* subsystem = NULL;
+
+               entry.enum_idx      = MENU_ENUM_LABEL_LOAD_CONTENT_LIST;
+               menu_displaylist_setting(&entry);
+
+               subsystem           = system->subsystem.data;
+
+               if (subsystem)
+               {
+                  for (i = 0; i < (unsigned)system->subsystem.size; i++, subsystem++)
+                  {
+                     char s[PATH_MAX_LENGTH];
+                     if (content_get_subsystem() == i)
+                     {
+                        if (content_get_subsystem_rom_id() < subsystem->num_roms)
+                        {
+                           snprintf(s, sizeof(s),
+                                 "Load %s %s",
+                                 subsystem->desc,
+                                 i == content_get_subsystem()
+                                 ? "\u2605" : " ");
+                           menu_entries_append_enum(info->list,
+                                 s,
+                                 msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_ADD),
+                                 MENU_ENUM_LABEL_SUBSYSTEM_ADD,
+                                 MENU_SETTINGS_SUBSYSTEM_ADD + i, 0, 0);
+                        }
+                        else
+                        {
+                           snprintf(s, sizeof(s),
+                                 "Start %s %s",
+                                 subsystem->desc,
+                                 i == content_get_subsystem()
+                                 ? "\u2605" : " ");
+                           menu_entries_append_enum(info->list,
+                                 s,
+                                 msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_LOAD),
+                                 MENU_ENUM_LABEL_SUBSYSTEM_LOAD,
+                                 MENU_SETTINGS_SUBSYSTEM_LOAD, 0, 0);
+                        }
+                     }
+                     else
+                     {
+                        snprintf(s, sizeof(s),
+                              "Load %s %s",
+                              subsystem->desc,
+                              i == content_get_subsystem()
+                              ? "\u2605" : " ");
+                        menu_entries_append_enum(info->list,
+                              s,
+                              msg_hash_to_str(MENU_ENUM_LABEL_SUBSYSTEM_ADD),
+                              MENU_ENUM_LABEL_SUBSYSTEM_ADD,
+                              MENU_SETTINGS_SUBSYSTEM_ADD + i, 0, 0);
+                     }
+                  }
+               }
+            }
+
+            entry.enum_idx      = MENU_ENUM_LABEL_ADD_CONTENT_LIST;
+            menu_displaylist_setting(&entry);
+#ifdef HAVE_QT
+            if (settings->bools.desktop_menu_enable)
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_SHOW_WIMP;
+               menu_displaylist_setting(&entry);
+            }
+#endif
+#if defined(HAVE_NETWORKING)
+            if (settings->bools.menu_show_online_updater && !settings->bools.kiosk_mode_enable)
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_ONLINE_UPDATER;
+               menu_displaylist_setting(&entry);
+            }
+#endif
+            if (!settings->bools.menu_content_show_settings && !string_is_empty(settings->paths.menu_content_show_settings_password))
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS;
+               menu_displaylist_setting(&entry);
+            }
+
+            if (settings->bools.kiosk_mode_enable && !string_is_empty(settings->paths.kiosk_mode_password))
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_MENU_DISABLE_KIOSK_MODE;
+               menu_displaylist_setting(&entry);
+            }
+
+            if (settings->bools.menu_show_information)
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_INFORMATION_LIST;
+               menu_displaylist_setting(&entry);
+            }
+
+#ifdef HAVE_LAKKA_SWITCH
+            entry.enum_idx      = MENU_ENUM_LABEL_SWITCH_CPU_PROFILE;
+            menu_displaylist_setting(&entry);
+
+            entry.enum_idx      = MENU_ENUM_LABEL_SWITCH_GPU_PROFILE;
+            menu_displaylist_setting(&entry);
+
+            entry.enum_idx      = MENU_ENUM_LABEL_SWITCH_BACKLIGHT_CONTROL;
+            menu_displaylist_setting(&entry);
+#endif
+
+#ifndef HAVE_DYNAMIC
+            entry.enum_idx      = MENU_ENUM_LABEL_RESTART_RETROARCH;
+            menu_displaylist_setting(&entry);
+#endif
+
+            if (settings->bools.menu_show_configurations && !settings->bools.kiosk_mode_enable)
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_CONFIGURATIONS_LIST;
+               menu_displaylist_setting(&entry);
+            }
+
+            if (settings->bools.menu_show_help)
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_HELP_LIST;
+               menu_displaylist_setting(&entry);
+            }
+
+#if !defined(IOS)
+            if (settings->bools.menu_show_quit_retroarch)
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_QUIT_RETROARCH;
+               menu_displaylist_setting(&entry);
+            }
+#endif
+
+            if (settings->bools.menu_show_reboot)
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_REBOOT;
+               menu_displaylist_setting(&entry);
+            }
+
+            if (settings->bools.menu_show_shutdown)
+            {
+               entry.enum_idx      = MENU_ENUM_LABEL_SHUTDOWN;
+               menu_displaylist_setting(&entry);
+            }
+
+            info->need_push    = true;
+            ret = 0;
+         }
+         break;
+   }
+   return ret;
+}
+
+static size_t ozone_list_get_selection(void *data)
+{
+   ozone_handle_t *ozone      = (ozone_handle_t*)data;
+
+   if (!ozone)
+      return 0;
+
+   return ozone->categories_selection_ptr;
+}
+
+static void ozone_list_clear(file_list_t *list)
+{
+   menu_animation_ctx_tag tag = (uintptr_t)list;
+   menu_animation_kill_by_tag(&tag);
+
+   ozone_free_list_nodes(list, false);
+}
+
+static void ozone_list_free(file_list_t *list, size_t a, size_t b)
+{
+   ozone_list_clear(list);
+}
+
+/* Compute new scroll position
+ * If the center of the currently selected entry is not in the middle
+ * And if we can scroll so that it's in the middle
+ * Then scroll
+ */
+static void ozone_update_scroll(ozone_handle_t *ozone, bool allow_animation, ozone_node_t *node)
+{
+   file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
+   menu_animation_ctx_tag tag = (uintptr_t) selection_buf;
+   menu_animation_ctx_entry_t entry;
+   float new_scroll = 0, entries_middle;
+   float bottom_boundary, current_selection_middle_onscreen;
+   unsigned video_info_height;
+
+   video_driver_get_size(NULL, &video_info_height);
+
+   current_selection_middle_onscreen    = ENTRIES_START_Y + ozone->animations.scroll_y + node->position_y + node->height / 2;
+   bottom_boundary                      = video_info_height - 87 - 78;
+   entries_middle                       = video_info_height/2;
+
+   if (current_selection_middle_onscreen != entries_middle)
+      new_scroll = ozone->animations.scroll_y - (current_selection_middle_onscreen - entries_middle);
+   
+   if (new_scroll + ozone->entries_height < bottom_boundary)
+      new_scroll = -(78 + ozone->entries_height - bottom_boundary);
+
+   if (new_scroll > 0)
+      new_scroll = 0;
+   
+   if (allow_animation)
+   {
+      /* Cursor animation */
+      ozone->animations.cursor_alpha = 0.0f;
+
+      entry.cb = NULL;
+      entry.duration = ANIMATION_CURSOR_DURATION;
+      entry.easing_enum = EASING_OUT_QUAD;
+      entry.subject = &ozone->animations.cursor_alpha;
+      entry.tag = tag;
+      entry.target_value = 1.0f;
+      entry.userdata = NULL;
+
+      menu_animation_push(&entry);
+
+      /* Scroll animation */
+      entry.cb = NULL;
+      entry.duration = ANIMATION_CURSOR_DURATION;
+      entry.easing_enum = EASING_OUT_QUAD;
+      entry.subject = &ozone->animations.scroll_y;
+      entry.tag = tag;
+      entry.target_value = new_scroll;
+      entry.userdata = NULL;
+
+      menu_animation_push(&entry);
+   }
+   else
+   {
+      ozone->selection_old = ozone->selection;
+      ozone->animations.cursor_alpha = 1.0f;
+      ozone->animations.scroll_y = new_scroll;
+   }
+}
+
+static unsigned ozone_count_lines(const char *str)
+{
+   unsigned c     = 0;
+   unsigned lines = 1;
+
+   for (c = 0; str[c]; c++)
+      lines += (str[c] == '\n');
+   return lines;
+}
+
+static void ozone_compute_entries_position(ozone_handle_t *ozone)
+{
+   /* Compute entries height and adjust scrolling if needed */
+   unsigned video_info_height;
+   unsigned video_info_width;
+   size_t i, entries_end;
+   file_list_t *selection_buf = NULL;
+
+   menu_entries_ctl(MENU_ENTRIES_CTL_START_GET, &i);
+
+   entries_end   = menu_entries_get_size();
+   selection_buf = menu_entries_get_selection_buf_ptr(0);
+
+   video_driver_get_size(&video_info_width, &video_info_height);
+
+   ozone->entries_height = 0;
+
+   for (i = 0; i < entries_end; i++)
+   {
+      /* Entry */
+      menu_entry_t entry;
+      ozone_node_t *node     = NULL;
+      
+      menu_entry_init(&entry);
+      menu_entry_get(&entry, 0, (unsigned)i, NULL, true);
+
+      /* Empty playlist detection:
+         only one item which icon is
+         OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO */
+      if (ozone->is_playlist && entries_end == 1)
+      {
+         menu_texture_item tex = ozone_entries_icon_get_texture(ozone, entry.enum_idx, entry.type, false);
+         ozone->empty_playlist = tex == ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO];
+      }
+      else
+      {
+         ozone->empty_playlist = false;
+      }
+
+      /* Cache node */
+      node = (ozone_node_t*)file_list_get_userdata_at_offset(selection_buf, i);
+
+      if (!node)
+         continue;
+
+      node->height = (entry.sublabel ? 100 : 60-8);
+      node->wrap   = false;
+
+      if (entry.sublabel)
+      {
+         char *sublabel_str = menu_entry_get_sublabel(&entry);
+
+         word_wrap(sublabel_str, sublabel_str, (video_info_width - 548) / ozone->sublabel_font_glyph_width, false);
+
+         unsigned lines = ozone_count_lines(sublabel_str);
+
+         if (lines > 1)
+         {
+            node->height += lines * 15;
+            node->wrap = true;
+         }
+
+         free(sublabel_str);
+      }
+
+      node->position_y = ozone->entries_height;
+
+      ozone->entries_height += node->height;
+
+      menu_entry_free(&entry);
+   }
+
+   /* Update scrolling */
+   ozone->selection = menu_navigation_get_selection();
+   ozone_update_scroll(ozone, false, (ozone_node_t*) file_list_get_userdata_at_offset(selection_buf, ozone->selection));
+}
+
+static void ozone_render(void *data, bool is_idle)
+{
+   size_t i;
+   menu_animation_ctx_delta_t delta;
+   unsigned end                     = (unsigned)menu_entries_get_size();
+   ozone_handle_t *ozone            = (ozone_handle_t*)data;
+   if (!data)
+      return;
+   
+   if (ozone->need_compute)
+   {
+      ozone_compute_entries_position(ozone);
+      ozone->need_compute = false;
+   }
+
+   ozone->selection = menu_navigation_get_selection();
+
+   delta.current = menu_animation_get_delta_time();
+
+   if (menu_animation_get_ideal_delta_time(&delta))
+      menu_animation_update(delta.ideal);
+
+   /* TODO Handle pointer & mouse */
+
+   menu_entries_ctl(MENU_ENTRIES_CTL_START_GET, &i);
+
+   if (i >= end)
+   {
+      i = 0;
+      menu_entries_ctl(MENU_ENTRIES_CTL_SET_START, &i);
+   }
+
+   menu_animation_ctl(MENU_ANIMATION_CTL_CLEAR_ACTIVE, NULL);
+}
+
+static void ozone_draw_header(ozone_handle_t *ozone, video_frame_info_t *video_info)
+{
+   char title[255];
+   menu_animation_ctx_ticker_t ticker;
+   settings_t *settings     = config_get_ptr();
+   unsigned timedate_offset = 0;
+
+   /* Separator */
+   menu_display_draw_quad(video_info, 30, 87, video_info->width - 60, 1, video_info->width, video_info->height, ozone->theme->header_footer_separator);
+
+   /* Title */
+   ticker.s = title;
+   ticker.len = (video_info->width - 128 - 47 - 130) / ozone->title_font_glyph_width;
+   ticker.idx = ozone->frame_count / 20;
+   ticker.str = ozone->title;
+   ticker.selected = true;
+
+   menu_animation_ticker(&ticker);
+
+   ozone_draw_text(video_info, ozone, title, 128, 20 + FONT_SIZE_TITLE, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.title, ozone->theme->text_rgba, false);
+
+   /* Icon */
+   menu_display_blend_begin(video_info);
+   ozone_draw_icon(video_info, 60, 60, ozone->textures[OZONE_TEXTURE_RETROARCH], 47, 14, video_info->width, video_info->height, 0, 1, ozone->theme->entries_icon);
+   menu_display_blend_end(video_info);
+
+   /* Battery */
+   if (video_info->battery_level_enable)
+   {
+      char msg[12];
+      static retro_time_t last_time  = 0;
+      bool charging                  = false;
+      retro_time_t current_time      = cpu_features_get_time_usec();
+      int percent                    = 0;
+      enum frontend_powerstate state = get_last_powerstate(&percent);
+
+      if (state == FRONTEND_POWERSTATE_CHARGING)
+         charging = true;
+
+      if (current_time - last_time >= INTERVAL_BATTERY_LEVEL_CHECK)
+      {
+         last_time = current_time;
+         task_push_get_powerstate();
+      }
+
+      *msg = '\0';
+
+      if (percent > 0)
+      {
+         timedate_offset = 95;
+
+         snprintf(msg, sizeof(msg), "%d%%", percent);
+
+         ozone_draw_text(video_info, ozone, msg, video_info->width - 85, 30 + FONT_SIZE_TIME, TEXT_ALIGN_RIGHT, video_info->width, video_info->height, ozone->fonts.time, ozone->theme->text_rgba, false);
+
+         menu_display_blend_begin(video_info);
+         ozone_draw_icon(video_info, 92, 92, ozone->icons_textures[charging ? OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_CHARGING : OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_FULL], video_info->width - 60 - 56, 30 - 28, video_info->width, video_info->height, 0, 1, ozone->theme->entries_icon);
+         menu_display_blend_end(video_info);
+      }
+   }
+
+   /* Timedate */
+   if (video_info->timedate_enable)
+   {
+      menu_display_ctx_datetime_t datetime;
+      char timedate[255];
+
+      timedate[0] = '\0';
+
+      datetime.s = timedate;
+      datetime.time_mode = settings->uints.menu_timedate_style;
+      datetime.len = sizeof(timedate);
+
+      menu_display_timedate(&datetime);
+
+      ozone_draw_text(video_info, ozone, timedate, video_info->width - 87 - timedate_offset, 30 + FONT_SIZE_TIME, TEXT_ALIGN_RIGHT, video_info->width, video_info->height, ozone->fonts.time, ozone->theme->text_rgba, false);
+
+      menu_display_blend_begin(video_info);
+      ozone_draw_icon(video_info, 92, 92, ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CLOCK], video_info->width - 60 - 56 - timedate_offset, 30 - 28, video_info->width, video_info->height, 0, 1, ozone->theme->entries_icon);
+      menu_display_blend_end(video_info);
+   }
+}
+
+static void ozone_draw_footer(ozone_handle_t *ozone, video_frame_info_t *video_info, settings_t *settings)
+{
+   char core_title[255];
+   /* Separator */
+   menu_display_draw_quad(video_info, 23, video_info->height - 78, video_info->width - 60, 1, video_info->width, video_info->height, ozone->theme->header_footer_separator);
+
+   /* Core title or Switch icon */
+   if (settings->bools.menu_core_enable && menu_entries_get_core_title(core_title, sizeof(core_title)) == 0)
+      ozone_draw_text(video_info, ozone, core_title, 59, video_info->height - 49 + FONT_SIZE_FOOTER, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.footer, ozone->theme->text_rgba, false);
+   else
+      ozone_draw_icon(video_info, 69, 30, ozone->theme->textures[OZONE_THEME_TEXTURE_SWITCH], 59, video_info->height - 52, video_info->width,video_info->height, 0, 1, NULL);
+
+   /* Buttons */
+
+   {
+      unsigned back_width  = 215;
+      unsigned back_height = 49;
+      unsigned ok_width    = 96;
+      unsigned ok_height   = 49;
+      bool do_swap         = video_info->input_menu_swap_ok_cancel_buttons;
+
+      if (do_swap)
+      {
+         back_width  = 96;
+         back_height = 49;
+         ok_width    = 215;
+         ok_height   = 49;
+      }
+
+      menu_display_blend_begin(video_info);
+
+      if (do_swap)
+      {
+         ozone_draw_icon(video_info, 25, 25, ozone->theme->textures[OZONE_THEME_TEXTURE_BUTTON_B], video_info->width - 133, video_info->height - 49, video_info->width,video_info->height, 0, 1, NULL);
+         ozone_draw_icon(video_info, 25, 25, ozone->theme->textures[OZONE_THEME_TEXTURE_BUTTON_A], video_info->width - 251, video_info->height - 49, video_info->width,video_info->height, 0, 1, NULL);
+      }
+      else
+      {
+         ozone_draw_icon(video_info, 25, 25, ozone->theme->textures[OZONE_THEME_TEXTURE_BUTTON_B], video_info->width - 251, video_info->height - 49, video_info->width,video_info->height, 0, 1, NULL);
+         ozone_draw_icon(video_info, 25, 25, ozone->theme->textures[OZONE_THEME_TEXTURE_BUTTON_A], video_info->width - 133, video_info->height - 49, video_info->width,video_info->height, 0, 1, NULL);
+      }
+
+      menu_display_blend_end(video_info);
+
+      ozone_draw_text(video_info, ozone,
+            do_swap ? 
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK) :
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK),
+            video_info->width - back_width, video_info->height - back_height + FONT_SIZE_FOOTER, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.footer, ozone->theme->text_rgba, false);
+      ozone_draw_text(video_info, ozone,
+            do_swap ? 
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK) :
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK),
+            video_info->width - ok_width, video_info->height - ok_height + FONT_SIZE_FOOTER, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.footer, ozone->theme->text_rgba, false);
+   }
+
+   menu_display_blend_end(video_info);
+}
+
+static void ozone_selection_changed(ozone_handle_t *ozone, bool allow_animation)
+{
+   file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
+   menu_animation_ctx_tag tag = (uintptr_t) selection_buf;
+
+   size_t new_selection = menu_navigation_get_selection();
+   ozone_node_t *node = (ozone_node_t*) file_list_get_userdata_at_offset(selection_buf, new_selection);
+
+   if (!node)
+      return;
+
+   if (ozone->selection != new_selection)
+   {
+      ozone->selection_old = ozone->selection;
+      ozone->selection = new_selection;
+
+      ozone->cursor_in_sidebar_old = ozone->cursor_in_sidebar;
+
+      menu_animation_kill_by_tag(&tag);
+
+      ozone_update_scroll(ozone, allow_animation, node);
+   }
+}
+
+static void ozone_navigation_clear(void *data, bool pending_push)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*)data;
+   if (!pending_push)
+      ozone_selection_changed(ozone, true);
+}
+
+static void ozone_navigation_pointer_changed(void *data)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*)data;
+   ozone_selection_changed(ozone, true);
+}
+
+static void ozone_navigation_set(void *data, bool scroll)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*)data;
+   ozone_selection_changed(ozone, true);
+}
+
+static void ozone_navigation_alphabet(void *data, size_t *unused)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*)data;
+   ozone_selection_changed(ozone, true);
+}
+
+static void ozone_messagebox_fadeout_cb(void *userdata)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) userdata;
+
+   free(ozone->pending_message);
+   ozone->pending_message = NULL;
+
+   ozone->should_draw_messagebox = false;
+}
+
+static void ozone_frame(void *data, video_frame_info_t *video_info)
+{
+   ozone_handle_t* ozone                  = (ozone_handle_t*) data;
+   settings_t  *settings                  = config_get_ptr();
+   unsigned color_theme                   = video_info->ozone_color_theme;
+   menu_animation_ctx_tag messagebox_tag  = (uintptr_t)ozone->pending_message;
+   bool draw_osk                          = menu_input_dialog_get_display_kb();
+   static bool draw_osk_old               = false;
+
+   menu_animation_ctx_entry_t entry;
+
+   if (!ozone)
+      return;
+
+   /* OSK Fade detection */
+   if (draw_osk != draw_osk_old)
+   {
+      draw_osk_old = draw_osk;
+      if (!draw_osk)
+      {
+         ozone->should_draw_messagebox       = false;
+         ozone->messagebox_state             = false;
+         ozone->messagebox_state_old         = false;
+         ozone->animations.messagebox_alpha  = 0.0f;
+      }
+   }
+
+   /* Change theme on the fly */
+   if (color_theme != last_color_theme || last_use_preferred_system_color_theme != settings->bools.menu_use_preferred_system_color_theme)
+   {
+      if (!settings->bools.menu_use_preferred_system_color_theme)
+         ozone_set_color_theme(ozone, color_theme);
+      else
+      {
+         video_info->ozone_color_theme = ozone_get_system_theme();
+         ozone_set_color_theme(ozone, video_info->ozone_color_theme);
+      }
+
+      last_use_preferred_system_color_theme = settings->bools.menu_use_preferred_system_color_theme;
+   }
+
+   ozone->frame_count++;
+
+   menu_display_set_viewport(video_info->width, video_info->height);
+
+   /* Clear text */
+   font_driver_bind_block(ozone->fonts.footer,  &ozone->raster_blocks.footer);
+   font_driver_bind_block(ozone->fonts.title,  &ozone->raster_blocks.title);
+   font_driver_bind_block(ozone->fonts.time,  &ozone->raster_blocks.time);
+   font_driver_bind_block(ozone->fonts.entries_label,  &ozone->raster_blocks.entries_label);
+   font_driver_bind_block(ozone->fonts.entries_sublabel,  &ozone->raster_blocks.entries_sublabel);
+   font_driver_bind_block(ozone->fonts.sidebar,  &ozone->raster_blocks.sidebar);
+
+   ozone->raster_blocks.footer.carr.coords.vertices = 0;
+   ozone->raster_blocks.title.carr.coords.vertices = 0;
+   ozone->raster_blocks.time.carr.coords.vertices = 0;
+   ozone->raster_blocks.entries_label.carr.coords.vertices = 0;
+   ozone->raster_blocks.entries_sublabel.carr.coords.vertices = 0;
+   ozone->raster_blocks.sidebar.carr.coords.vertices = 0;
+
+   /* Background */
+   menu_display_draw_quad(video_info, 
+      0, 0, video_info->width, video_info->height, 
+      video_info->width, video_info->height, 
+      !video_info->libretro_running ? ozone->theme->background : ozone->theme->background_libretro_running
+   );
+
+   /* Header, footer */
+   ozone_draw_header(ozone, video_info);
+   ozone_draw_footer(ozone, video_info, settings);
+
+   /* Sidebar */
+   ozone_draw_sidebar(ozone, video_info);
+
+   /* Menu entries */
+   menu_display_scissor_begin(video_info, ozone->sidebar_offset + 408, 87, video_info->width - 408 + (-ozone->sidebar_offset), video_info->height - 87 - 78);
+
+   /* Current list */
+   ozone_draw_entries(ozone,
+      video_info,
+      ozone->selection,
+      ozone->selection_old,
+      menu_entries_get_selection_buf_ptr(0),
+      ozone->animations.list_alpha,
+      ozone->animations.scroll_y,
+      ozone->is_playlist
+   );
+   
+   /* Old list */
+   if (ozone->draw_old_list)
+      ozone_draw_entries(ozone,
+         video_info,
+         ozone->selection_old_list,
+         ozone->selection_old_list,
+         ozone->selection_buf_old,
+         ozone->animations.list_alpha,
+         ozone->scroll_old,
+         ozone->is_playlist_old
+      );
+
+   menu_display_scissor_end(video_info);
+
+   /* Flush first layer of text */
+   font_driver_flush(video_info->width, video_info->height, ozone->fonts.footer, video_info);
+   font_driver_flush(video_info->width, video_info->height, ozone->fonts.title, video_info);
+   font_driver_flush(video_info->width, video_info->height, ozone->fonts.time, video_info);
+
+   font_driver_bind_block(ozone->fonts.footer, NULL);
+   font_driver_bind_block(ozone->fonts.title, NULL);
+   font_driver_bind_block(ozone->fonts.time, NULL);
+   font_driver_bind_block(ozone->fonts.entries_label, NULL);
+
+   /* Message box & OSK - second layer of text */
+   ozone->raster_blocks.footer.carr.coords.vertices = 0;
+   ozone->raster_blocks.entries_label.carr.coords.vertices = 0;
+
+   if (ozone->should_draw_messagebox || draw_osk)
+   {
+      /* Fade in animation */
+      if (ozone->messagebox_state_old != ozone->messagebox_state && ozone->messagebox_state)
+      {
+         ozone->messagebox_state_old = ozone->messagebox_state;
+
+         menu_animation_kill_by_tag(&messagebox_tag);
+         ozone->animations.messagebox_alpha = 0.0f;
+
+         entry.cb = NULL;
+         entry.duration = ANIMATION_PUSH_ENTRY_DURATION;
+         entry.easing_enum = EASING_OUT_QUAD;
+         entry.subject = &ozone->animations.messagebox_alpha;
+         entry.tag = messagebox_tag;
+         entry.target_value = 1.0f;
+         entry.userdata = NULL;
+
+         menu_animation_push(&entry);
+      }
+      /* Fade out animation */
+      else if (ozone->messagebox_state_old != ozone->messagebox_state && !ozone->messagebox_state)
+      {
+         ozone->messagebox_state_old = ozone->messagebox_state;
+         ozone->messagebox_state = false;
+
+         menu_animation_kill_by_tag(&messagebox_tag);
+         ozone->animations.messagebox_alpha = 1.0f;
+
+         entry.cb = ozone_messagebox_fadeout_cb;
+         entry.duration = ANIMATION_PUSH_ENTRY_DURATION;
+         entry.easing_enum = EASING_OUT_QUAD;
+         entry.subject = &ozone->animations.messagebox_alpha;
+         entry.tag = messagebox_tag;
+         entry.target_value = 0.0f;
+         entry.userdata = ozone;
+
+         menu_animation_push(&entry);
+      }
+
+      ozone_draw_backdrop(video_info, fmin(ozone->animations.messagebox_alpha, 0.75f));
+
+      if (draw_osk)
+      {
+         const char *label = menu_input_dialog_get_label_buffer();
+         const char *str   = menu_input_dialog_get_buffer();
+
+         ozone_draw_osk(ozone, video_info, label, str);
+      }
+      else
+      {
+         ozone_draw_messagebox(ozone, video_info, ozone->pending_message);
+      }
+   }
+
+   font_driver_flush(video_info->width, video_info->height, ozone->fonts.footer, video_info);
+   font_driver_flush(video_info->width, video_info->height, ozone->fonts.entries_label, video_info);
+
+   menu_display_unset_viewport(video_info->width, video_info->height);
+}
+
+static void ozone_set_header(ozone_handle_t *ozone)
+{
+   if (ozone->categories_selection_ptr <= ozone->system_tab_end)
+   {
+      menu_entries_get_title(ozone->title, sizeof(ozone->title));
+   }
+   else if (ozone->horizontal_list)
+   {
+      ozone_node_t *node = (ozone_node_t*) file_list_get_userdata_at_offset(ozone->horizontal_list, ozone->categories_selection_ptr - ozone->system_tab_end-1);
+
+      if (node && node->console_name)
+         strlcpy(ozone->title, node->console_name, sizeof(ozone->title));
+   }
+}
+
+static void ozone_animation_end(void *userdata)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) userdata;
+   ozone->draw_old_list = false;
+}
+
+static void ozone_list_open(ozone_handle_t *ozone)
+{
+   struct menu_animation_ctx_entry entry;
+
+   ozone->draw_old_list = true;
+
+   /* Left/right animation */
+   ozone->animations.list_alpha = 0.0f;
+
+   entry.cb = ozone_animation_end;
+   entry.duration = ANIMATION_PUSH_ENTRY_DURATION;
+   entry.easing_enum = EASING_OUT_QUAD;
+   entry.subject = &ozone->animations.list_alpha;
+   entry.tag = (uintptr_t) NULL;
+   entry.target_value = 1.0f;
+   entry.userdata = ozone;
+
+   menu_animation_push(&entry);
+
+   /* Sidebar animation */
+   if (ozone->depth == 1)
+   {
+      ozone->draw_sidebar = true;
+
+      entry.cb = NULL;
+      entry.duration = ANIMATION_PUSH_ENTRY_DURATION;
+      entry.easing_enum = EASING_OUT_QUAD;
+      entry.subject = &ozone->sidebar_offset;
+      entry.tag = (uintptr_t) NULL;
+      entry.target_value = 0.0f;
+      entry.userdata = NULL;
+
+      menu_animation_push(&entry);
+   }
+   else if (ozone->depth > 1)
+   {
+      struct menu_animation_ctx_entry entry;
+
+      entry.cb = ozone_collapse_end;
+      entry.duration = ANIMATION_PUSH_ENTRY_DURATION;
+      entry.easing_enum = EASING_OUT_QUAD;
+      entry.subject = &ozone->sidebar_offset;
+      entry.tag = (uintptr_t) NULL;
+      entry.target_value = -408.0f;
+      entry.userdata = (void*) ozone;
+
+      menu_animation_push(&entry);
+   }
+}
+
+static void ozone_populate_entries(void *data, const char *path, const char *label, unsigned k)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) data;
+
+   if (!ozone)
+      return;
+
+   ozone_set_header(ozone);
+
+   if (menu_driver_ctl(RARCH_MENU_CTL_IS_PREVENT_POPULATE, NULL))
+   {
+      menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL);
+
+      /* TODO Update thumbnails */
+      ozone_selection_changed(ozone, false);
+      return;
+   }
+
+   ozone->need_compute = true;
+
+   int new_depth = (int)ozone_list_get_size(ozone, MENU_LIST_PLAIN);
+
+   ozone->fade_direction   = new_depth <= ozone->depth;
+   ozone->depth            = new_depth;
+   ozone->is_playlist      = ozone_is_playlist(ozone);
+
+   if (ozone->categories_selection_ptr == ozone->categories_active_idx_old)
+   {
+      ozone_list_open(ozone);
+   }
+}
+
+static int ozone_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_action action)
+{
+   int new_selection;
+   enum menu_action new_action;
+   menu_animation_ctx_tag tag;
+
+   file_list_t *selection_buf    = NULL;
+   ozone_handle_t *ozone         = (ozone_handle_t*) userdata;
+   unsigned horizontal_list_size = 0;
+
+   if (ozone->horizontal_list)
+      horizontal_list_size = ozone->horizontal_list->size;
+
+   ozone->messagebox_state = false || menu_input_dialog_get_display_kb();
+
+   if (!ozone)
+      return generic_menu_iterate(menu, userdata, action);
+      
+   selection_buf              = menu_entries_get_selection_buf_ptr(0);
+   tag                        = (uintptr_t)selection_buf;
+   new_action                 = action;
+
+   /* Inputs override */
+   switch (action)
+   {
+      case MENU_ACTION_DOWN:
+         if (!ozone->cursor_in_sidebar)
+            break;
+
+         tag = (uintptr_t)ozone;
+
+         new_selection = (ozone->categories_selection_ptr + 1);
+
+         if (new_selection >= ozone->system_tab_end + horizontal_list_size + 1)
+            new_selection = 0;
+
+         ozone_sidebar_goto(ozone, new_selection);
+
+         new_action = MENU_ACTION_NOOP;
+         break;
+      case MENU_ACTION_UP:
+         if (!ozone->cursor_in_sidebar)
+            break;
+
+         tag = (uintptr_t)ozone;
+
+         new_selection = ozone->categories_selection_ptr - 1;
+         
+         if (new_selection < 0)
+            new_selection = horizontal_list_size + ozone->system_tab_end;
+
+         ozone_sidebar_goto(ozone, new_selection);
+
+         new_action = MENU_ACTION_NOOP;
+         break;
+      case MENU_ACTION_LEFT:
+         if (ozone->cursor_in_sidebar)
+         {
+            new_action = MENU_ACTION_NOOP;
+            break;
+         }
+         else if (ozone->depth > 1)
+            break;
+
+         ozone_go_to_sidebar(ozone, tag);
+
+         new_action = MENU_ACTION_NOOP;
+         break;
+      case MENU_ACTION_RIGHT:
+         if (!ozone->cursor_in_sidebar)
+         {
+            if (ozone->depth == 1)
+               new_action = MENU_ACTION_NOOP;
+            break;
+         }
+
+         ozone_leave_sidebar(ozone, tag);
+
+         new_action = MENU_ACTION_NOOP;
+         break;
+      case MENU_ACTION_OK:
+         if (ozone->cursor_in_sidebar)
+         {
+            ozone_leave_sidebar(ozone, tag);
+            new_action = MENU_ACTION_NOOP;
+            break;
+         }
+
+         break;
+      case MENU_ACTION_CANCEL:
+         if (ozone->cursor_in_sidebar)
+         {
+            /* Go back to main menu tab */
+            if (ozone->categories_selection_ptr != 0)
+               ozone_sidebar_goto(ozone, 0);
+
+            new_action = MENU_ACTION_NOOP;
+            break;
+         }
+
+         if (menu_entries_get_stack_size(0) == 1)
+         {
+            ozone_go_to_sidebar(ozone, tag);
+            new_action = MENU_ACTION_NOOP;
+         }
+         break;
+      default:
+         break;
+   }
+
+   return generic_menu_iterate(menu, userdata, new_action);
+}
+
+/* TODO Fancy toggle animation */
+
+static void ozone_toggle(void *userdata, bool menu_on)
+{
+   bool tmp              = false;
+   ozone_handle_t *ozone = (ozone_handle_t*) userdata;
+
+   if (!ozone)
+      return;
+
+   tmp = !menu_entries_ctl(MENU_ENTRIES_CTL_NEEDS_REFRESH, NULL);
+
+   if (tmp)
+      menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
+   else
+      menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL);
+
+   if (ozone->depth == 1)
+   {
+      ozone->draw_sidebar = true;
+      ozone->sidebar_offset = 0.0f;
+   }
+}
+
+static bool ozone_menu_init_list(void *data)
+{
+   menu_displaylist_info_t info;
+
+   file_list_t *menu_stack      = menu_entries_get_menu_stack_ptr(0);
+   file_list_t *selection_buf   = menu_entries_get_selection_buf_ptr(0);
+
+   menu_displaylist_info_init(&info);
+
+   info.label                   = strdup(
+         msg_hash_to_str(MENU_ENUM_LABEL_MAIN_MENU));
+   info.exts                    =
+      strdup(file_path_str(FILE_PATH_LPL_EXTENSION_NO_DOT));
+   info.type_default            = FILE_TYPE_PLAIN;
+   info.enum_idx                = MENU_ENUM_LABEL_MAIN_MENU;
+
+   menu_entries_append_enum(menu_stack, info.path,
+         info.label,
+         MENU_ENUM_LABEL_MAIN_MENU,
+         info.type, info.flags, 0);
+
+   info.list  = selection_buf;
+
+   if (!menu_displaylist_ctl(DISPLAYLIST_MAIN_MENU, &info))
+      goto error;
+
+   info.need_push = true;
+
+   if (!menu_displaylist_process(&info))
+      goto error;
+
+   menu_displaylist_info_free(&info);
+   return true;
+
+error:
+   menu_displaylist_info_free(&info);
+   return false;
+}
+
+static ozone_node_t *ozone_copy_node(const ozone_node_t *old_node)
+{
+   ozone_node_t *new_node = (ozone_node_t*)malloc(sizeof(*new_node));
+
+   *new_node            = *old_node;
+
+   return new_node;
+}
+
+static void ozone_list_insert(void *userdata,
+      file_list_t *list,
+      const char *path,
+      const char *fullpath,
+      const char *label,
+      size_t list_size,
+      unsigned type)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) userdata;
+   ozone_node_t *node = NULL;
+   int i = (int)list_size;
+
+   if (!ozone || !list)
+      return;
+
+   ozone->need_compute = true;
+
+   node = (ozone_node_t*)file_list_get_userdata_at_offset(list, i);
+
+   if (!node)
+      node = ozone_alloc_node();
+
+   if (!node)
+   {
+      RARCH_ERR("ozone node could not be allocated.\n");
+      return;
+   }
+
+   file_list_set_userdata(list, i, node);
+}
+
+static void ozone_list_deep_copy(const file_list_t *src, file_list_t *dst,
+      size_t first, size_t last)
+{
+   size_t i, j = 0;
+   menu_animation_ctx_tag tag = (uintptr_t)dst;
+
+   menu_animation_kill_by_tag(&tag);
+
+   /* use true here because file_list_copy() doesn't free actiondata */
+   ozone_free_list_nodes(dst, true);
+
+   file_list_clear(dst);
+   file_list_reserve(dst, (last + 1) - first);
+
+   for (i = first; i <= last; ++i)
+   {
+      struct item_file *d = &dst->list[j];
+      struct item_file *s = &src->list[i];
+      void     *src_udata = s->userdata;
+      void     *src_adata = s->actiondata;
+
+      *d       = *s;
+      d->alt   = string_is_empty(d->alt)   ? NULL : strdup(d->alt);
+      d->path  = string_is_empty(d->path)  ? NULL : strdup(d->path);
+      d->label = string_is_empty(d->label) ? NULL : strdup(d->label);
+
+      if (src_udata)
+         file_list_set_userdata(dst, j, (void*)ozone_copy_node((const ozone_node_t*)src_udata));
+
+      if (src_adata)
+      {
+         void *data = malloc(sizeof(menu_file_list_cbs_t));
+         memcpy(data, src_adata, sizeof(menu_file_list_cbs_t));
+         file_list_set_actiondata(dst, j, data);
+      }
+
+      ++j;
+   }
+
+   dst->size = j;
+}
+
+static void ozone_list_cache(void *data,
+      enum menu_list_type type, unsigned action)
+{
+   size_t y, entries_end;
+   unsigned i;
+   unsigned video_info_height;
+   float bottom_boundary;
+   ozone_node_t *first_node;
+   unsigned first             = 0;
+   unsigned last              = 0;
+   file_list_t *selection_buf = NULL;
+   ozone_handle_t *ozone      = (ozone_handle_t*)data;
+
+   if (!ozone)
+      return;
+
+   ozone->need_compute        = true;
+   ozone->selection_old_list  = ozone->selection;
+   ozone->scroll_old          = ozone->animations.scroll_y;
+   ozone->is_playlist_old     = ozone->is_playlist;
+
+   /* Deep copy visible elements */
+   video_driver_get_size(NULL, &video_info_height);
+   y                          = ENTRIES_START_Y;
+   entries_end                = menu_entries_get_size();
+   selection_buf              = menu_entries_get_selection_buf_ptr(0);
+   bottom_boundary            = video_info_height - 87 - 78;
+
+   for (i = 0; i < entries_end; i++)
+   {      
+      ozone_node_t *node = (ozone_node_t*) file_list_get_userdata_at_offset(selection_buf, i);
+
+      if (!node)
+         continue;
+
+      if (y + ozone->animations.scroll_y + node->height + 20 < ENTRIES_START_Y)
+      {
+         first++;
+         goto text_iterate;
+      }
+      else if (y + ozone->animations.scroll_y - node->height - 20 > bottom_boundary)
+         goto text_iterate;
+
+      last++;
+text_iterate:
+      y += node->height;
+   }
+
+   last -= 1;
+   last += first;
+
+   first_node = (ozone_node_t*) file_list_get_userdata_at_offset(selection_buf, first);
+   ozone->old_list_offset_y = first_node->position_y;
+
+   ozone_list_deep_copy(selection_buf, ozone->selection_buf_old, first, last);
+}
+
+static int ozone_environ_cb(enum menu_environ_cb type, void *data, void *userdata)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) userdata;
+
+   if (!ozone)
+      return -1;
+
+   switch (type)
+   {
+      case MENU_ENVIRON_RESET_HORIZONTAL_LIST:
+         if (!ozone)
+            return -1;
+
+         ozone_refresh_horizontal_list(ozone);
+         break;
+      default:
+         return -1;
+   }
+
+   return 0;
+}
+
+static void ozone_messagebox(void *data, const char *message)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) data;
+
+   if (!ozone || string_is_empty(message))
+      return;
+
+   if (ozone->pending_message)
+   {
+      free(ozone->pending_message);
+      ozone->pending_message = NULL;
+   }
+
+   ozone->pending_message = strdup(message);
+   ozone->messagebox_state = true || menu_input_dialog_get_display_kb();
+   ozone->should_draw_messagebox = true;
+}
+
+static int ozone_deferred_push_content_actions(menu_displaylist_info_t *info)
+{
+   if (!menu_displaylist_ctl(
+            DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS, info))
+      return -1;
+   menu_displaylist_process(info);
+   menu_displaylist_info_free(info);
+   return 0;
+}
+
+static int ozone_list_bind_init_compare_label(menu_file_list_cbs_t *cbs)
+{
+   if (cbs && cbs->enum_idx != MSG_UNKNOWN)
+   {
+      switch (cbs->enum_idx)
+      {
+         case MENU_ENUM_LABEL_CONTENT_ACTIONS:
+            cbs->action_deferred_push = ozone_deferred_push_content_actions;
+            break;
+         default:
+            return -1;
+      }
+   }
+
+   return 0;
+}
+
+static int ozone_list_bind_init(menu_file_list_cbs_t *cbs,
+      const char *path, const char *label, unsigned type, size_t idx)
+{
+   if (ozone_list_bind_init_compare_label(cbs) == 0)
+      return 0;
+
+   return -1;
+}
+
+menu_ctx_driver_t menu_ctx_ozone = {
+   NULL,                         /* set_texture */
+   ozone_messagebox,
+   ozone_menu_iterate,
+   ozone_render,
+   ozone_frame,
+   ozone_init,
+   ozone_free,
+   ozone_context_reset,
+   ozone_context_destroy,
+   ozone_populate_entries,
+   ozone_toggle,
+   ozone_navigation_clear,
+   ozone_navigation_pointer_changed,
+   ozone_navigation_pointer_changed,
+   ozone_navigation_set,
+   ozone_navigation_pointer_changed,
+   ozone_navigation_alphabet,
+   ozone_navigation_alphabet,
+   ozone_menu_init_list,
+   ozone_list_insert,
+   NULL,                         /* list_prepend */
+   ozone_list_free,
+   ozone_list_clear,
+   ozone_list_cache,
+   ozone_list_push,
+   ozone_list_get_selection,
+   ozone_list_get_size,
+   ozone_list_get_entry,
+   NULL,                         /* list_set_selection */
+   ozone_list_bind_init,         /* bind_init */
+   NULL,                         /* load_image */
+   "ozone",
+   ozone_environ_cb,
+   NULL,                         /* pointer_tap */
+   NULL,                         /* update_thumbnail_path */
+   NULL,                         /* update_thumbnail_image */
+   NULL,                         /* set_thumbnail_system */
+   NULL,                         /* set_thumbnail_content */
+   menu_display_osk_ptr_at_pos,
+   NULL,                         /* update_savestate_thumbnail_path */
+   NULL                          /* update_savestate_thumbnail_image */
+};
diff --git a/menu/drivers/ozone/ozone.h b/menu/drivers/ozone/ozone.h
new file mode 100644
index 0000000000..5438714485
--- /dev/null
+++ b/menu/drivers/ozone/ozone.h
@@ -0,0 +1,210 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _OZONE_H
+#define _OZONE_H
+
+typedef struct ozone_handle ozone_handle_t;
+
+#include "ozone_theme.h"
+#include "ozone_sidebar.h"
+
+#include <retro_miscellaneous.h>
+
+#include "../../menu_driver.h"
+#include "../../../retroarch.h"
+
+#define FONT_SIZE_FOOTER 18
+#define FONT_SIZE_TITLE 36
+#define FONT_SIZE_TIME 22
+#define FONT_SIZE_ENTRIES_LABEL 24
+#define FONT_SIZE_ENTRIES_SUBLABEL 18
+#define FONT_SIZE_SIDEBAR 24
+
+#define ANIMATION_PUSH_ENTRY_DURATION 10
+#define ANIMATION_CURSOR_DURATION 8
+#define ANIMATION_CURSOR_PULSE 30
+
+#define ENTRIES_START_Y 127
+
+#define INTERVAL_BATTERY_LEVEL_CHECK (30 * 1000000)
+#define INTERVAL_OSK_CURSOR (0.5f * 1000000)
+
+typedef struct ozone_handle
+{
+   uint64_t frame_count;
+
+   struct 
+   {
+      font_data_t *footer;
+      font_data_t *title;
+      font_data_t *time;
+      font_data_t *entries_label;
+      font_data_t *entries_sublabel;
+      font_data_t *sidebar;
+   } fonts;
+
+   struct
+   {
+      video_font_raster_block_t footer;
+      video_font_raster_block_t title;
+      video_font_raster_block_t time;
+      video_font_raster_block_t entries_label;
+      video_font_raster_block_t entries_sublabel;
+      video_font_raster_block_t sidebar;
+   } raster_blocks;
+
+   menu_texture_item textures[OZONE_THEME_TEXTURE_LAST];
+   menu_texture_item icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_LAST];
+   menu_texture_item tab_textures[OZONE_TAB_TEXTURE_LAST];
+
+   char title[PATH_MAX_LENGTH];
+
+   char assets_path[PATH_MAX_LENGTH];
+   char png_path[PATH_MAX_LENGTH];
+   char icons_path[PATH_MAX_LENGTH];
+   char tab_path[PATH_MAX_LENGTH];
+
+   uint8_t system_tab_end;
+   uint8_t tabs[OZONE_SYSTEM_TAB_LAST];
+
+   size_t categories_selection_ptr; /* active tab id  */
+   size_t categories_active_idx_old;
+
+   bool cursor_in_sidebar;
+   bool cursor_in_sidebar_old;
+
+   struct
+   {
+      float cursor_alpha;
+      float scroll_y;
+      float scroll_y_sidebar;
+
+      float list_alpha;
+
+      float messagebox_alpha;
+   } animations;
+
+   bool fade_direction; /* false = left to right, true = right to left */
+
+   size_t selection; /* currently selected entry */
+   size_t selection_old; /* previously selected entry (for fancy animation) */
+   size_t selection_old_list;
+
+   unsigned entries_height;
+
+   int depth;
+
+   bool draw_sidebar;
+   float sidebar_offset;
+
+   unsigned title_font_glyph_width;
+   unsigned entry_font_glyph_width;
+   unsigned sublabel_font_glyph_width;
+
+   ozone_theme_t *theme;
+
+   struct {
+      float selection_border[16];
+      float selection[16];
+      float entries_border[16];
+      float entries_icon[16];
+      float entries_checkmark[16];
+      float cursor_alpha[16];
+
+      unsigned cursor_state; /* 0 -> 1 -> 0 -> 1 [...] */
+      float cursor_border[16];
+      float message_background[16];
+   } theme_dynamic;
+
+   bool need_compute;
+
+   file_list_t *selection_buf_old;
+
+   bool draw_old_list;
+   float scroll_old;
+
+   char *pending_message;
+   bool has_all_assets;
+
+   bool is_playlist;
+   bool is_playlist_old;
+
+   bool empty_playlist;
+
+   bool osk_cursor; /* true = display it, false = don't */
+   bool messagebox_state;
+   bool messagebox_state_old;
+   bool should_draw_messagebox;
+
+   unsigned old_list_offset_y;
+
+   file_list_t *horizontal_list; /* console tabs */
+} ozone_handle_t;
+
+/* If you change this struct, also
+   change ozone_alloc_node and
+   ozone_copy_node */
+typedef struct ozone_node
+{
+   /* Entries */
+   unsigned height;
+   unsigned position_y;
+   bool wrap;
+
+   /* Console tabs */
+   char *console_name;
+   uintptr_t icon;
+   uintptr_t content_icon;
+} ozone_node_t;
+
+void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_info,
+   unsigned selection, unsigned selection_old,
+   file_list_t *selection_buf, float alpha, float scroll_y,
+   bool is_playlist);
+
+void ozone_draw_sidebar(ozone_handle_t *ozone, video_frame_info_t *video_info);
+
+void ozone_change_tab(ozone_handle_t *ozone, 
+      enum msg_hash_enums tab, 
+      enum menu_settings_type type);
+
+void ozone_sidebar_goto(ozone_handle_t *ozone, unsigned new_selection);
+
+unsigned ozone_get_sidebar_height(ozone_handle_t *ozone);
+
+unsigned ozone_get_selected_sidebar_y_position(ozone_handle_t *ozone);
+
+void ozone_leave_sidebar(ozone_handle_t *ozone, uintptr_t tag);
+
+void ozone_go_to_sidebar(ozone_handle_t *ozone, uintptr_t tag);
+
+void ozone_refresh_horizontal_list(ozone_handle_t *ozone);
+
+void ozone_init_horizontal_list(ozone_handle_t *ozone);
+
+void ozone_context_destroy_horizontal_list(ozone_handle_t *ozone);
+
+void ozone_context_reset_horizontal_list(ozone_handle_t *ozone);
+
+ozone_node_t *ozone_alloc_node();
+
+size_t ozone_list_get_size(void *data, enum menu_list_type type);
+
+void ozone_free_list_nodes(file_list_t *list, bool actiondata);
+
+bool ozone_is_playlist(ozone_handle_t *ozone);
+
+#endif
\ No newline at end of file
diff --git a/menu/drivers/ozone/ozone_display.c b/menu/drivers/ozone/ozone_display.c
new file mode 100644
index 0000000000..a435af7d14
--- /dev/null
+++ b/menu/drivers/ozone/ozone_display.c
@@ -0,0 +1,430 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *  Copyright (C) 2018      - Alfredo Monclús
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ozone.h"
+#include "ozone_display.h"
+#include "ozone_theme.h"
+
+#include <string/stdstring.h>
+#include <file/file_path.h>
+#include <encodings/utf.h>
+#include <lists/string_list.h>
+#include <features/features_cpu.h>
+
+#include "../../menu_input.h"
+#include "../../menu_animation.h"
+
+#include "../../widgets/menu_input_dialog.h"
+#include "../../widgets/menu_osk.h"
+
+static void ozone_cursor_animation_cb(void *userdata);
+
+static void ozone_animate_cursor(ozone_handle_t *ozone, float *dst, float *target)
+{
+   menu_animation_ctx_entry_t entry;
+   int i;
+
+   entry.easing_enum = EASING_OUT_QUAD;
+   entry.tag = (uintptr_t) &ozone_default_theme;
+   entry.duration = ANIMATION_CURSOR_PULSE;
+   entry.userdata = ozone;
+
+   for (i = 0; i < 16; i++)
+   {
+      if (i == 3 || i == 7 || i == 11 || i == 15)
+         continue;
+
+      if (i == 14)
+         entry.cb = ozone_cursor_animation_cb;
+      else
+         entry.cb = NULL;
+
+      entry.subject        = &dst[i];
+      entry.target_value   = target[i];
+
+      menu_animation_push(&entry);
+   }
+}
+
+static void ozone_cursor_animation_cb(void *userdata)
+{
+   ozone_handle_t *ozone = (ozone_handle_t*) userdata;
+
+   float *target = NULL;
+
+   switch (ozone->theme_dynamic.cursor_state)
+   {
+      case 0:
+         target = ozone->theme->cursor_border_1;
+         break;
+      case 1:
+         target = ozone->theme->cursor_border_0;
+         break;
+   }
+
+   ozone->theme_dynamic.cursor_state = (ozone->theme_dynamic.cursor_state + 1) % 2;
+
+   ozone_animate_cursor(ozone, ozone->theme_dynamic.cursor_border, target);
+}
+
+void ozone_restart_cursor_animation(ozone_handle_t *ozone)
+{
+   menu_animation_ctx_tag tag = (uintptr_t) &ozone_default_theme;
+
+   if (!ozone->has_all_assets)
+      return;
+
+   ozone->theme_dynamic.cursor_state = 1;
+   memcpy(ozone->theme_dynamic.cursor_border, ozone->theme->cursor_border_0, sizeof(ozone->theme_dynamic.cursor_border));
+   menu_animation_kill_by_tag(&tag);
+
+   ozone_animate_cursor(ozone, ozone->theme_dynamic.cursor_border, ozone->theme->cursor_border_1);
+}
+
+void ozone_draw_text(
+      video_frame_info_t *video_info,
+      ozone_handle_t *ozone,
+      const char *str, float x,
+      float y,
+      enum text_alignment text_align,
+      unsigned width, unsigned height, font_data_t* font,
+      uint32_t color,
+      bool draw_outside)
+{
+   if ((color & 0x000000FF) == 0)
+      return;
+
+   menu_display_draw_text(font, str, x, y,
+         width, height, color, text_align, 1.0f,
+         false,
+         1.0, draw_outside);
+}
+
+static void ozone_draw_cursor_slice(ozone_handle_t *ozone,
+      video_frame_info_t *video_info,
+      int x_offset,
+      unsigned width, unsigned height,
+      size_t y, float alpha)
+{
+   ozone_color_alpha(ozone->theme_dynamic.cursor_alpha, alpha);
+   ozone_color_alpha(ozone->theme_dynamic.cursor_border, alpha);
+
+   menu_display_blend_begin(video_info);
+
+   /* Cursor without border */
+   menu_display_draw_texture_slice(
+      video_info,
+      x_offset - 14,
+      y + 8,
+      80, 80,
+      width + 3 + 28 - 4,
+      height + 20,
+      video_info->width, video_info->height,
+      ozone->theme_dynamic.cursor_alpha,
+      20, 1.0,
+      ozone->theme->textures[OZONE_THEME_TEXTURE_CURSOR_NO_BORDER]
+   );
+
+   /* Tainted border */
+   menu_display_draw_texture_slice(
+      video_info,
+      x_offset - 14,
+      y + 8,
+      80, 80,
+      width + 3 + 28 - 4,
+      height + 20,
+      video_info->width, video_info->height,
+      ozone->theme_dynamic.cursor_border,
+      20, 1.0,
+      ozone->textures[OZONE_TEXTURE_CURSOR_BORDER]
+   );
+
+   menu_display_blend_end(video_info);
+}
+
+static void ozone_draw_cursor_fallback(ozone_handle_t *ozone,
+      video_frame_info_t *video_info,
+      int x_offset,
+      unsigned width, unsigned height,
+      size_t y, float alpha)
+{
+   ozone_color_alpha(ozone->theme_dynamic.selection_border, alpha);
+   ozone_color_alpha(ozone->theme_dynamic.selection, alpha);
+   
+   /* Fill */
+   menu_display_draw_quad(video_info, x_offset, y, width, height - 5, video_info->width, video_info->height, ozone->theme_dynamic.selection);
+
+   /* Borders (can't do one single quad because of alpha) */
+
+   /* Top */
+   menu_display_draw_quad(video_info, x_offset - 3, y - 3, width + 6, 3, video_info->width, video_info->height, ozone->theme_dynamic.selection_border);
+
+   /* Bottom */
+   menu_display_draw_quad(video_info, x_offset - 3, y + height - 5, width + 6, 3, video_info->width, video_info->height, ozone->theme_dynamic.selection_border);
+
+   /* Left */
+   menu_display_draw_quad(video_info, x_offset - 3, y, 3, height - 5, video_info->width, video_info->height, ozone->theme_dynamic.selection_border);
+
+   /* Right */
+   menu_display_draw_quad(video_info, x_offset + width, y, 3, height - 5, video_info->width, video_info->height, ozone->theme_dynamic.selection_border);
+}
+
+void ozone_draw_cursor(ozone_handle_t *ozone,
+      video_frame_info_t *video_info,
+      int x_offset,
+      unsigned width, unsigned height,
+      size_t y, float alpha)
+{
+   if (ozone->has_all_assets)
+      ozone_draw_cursor_slice(ozone, video_info, x_offset, width, height, y, alpha);
+   else
+      ozone_draw_cursor_fallback(ozone, video_info, x_offset, width, height, y, alpha);
+}
+
+void ozone_color_alpha(float *color, float alpha)
+{
+   color[3] = color[7] = color[11] = color[15] = alpha;
+}
+
+void ozone_draw_icon(
+      video_frame_info_t *video_info,
+      unsigned icon_width,
+      unsigned icon_height,
+      uintptr_t texture,
+      float x, float y,
+      unsigned width, unsigned height,
+      float rotation, float scale_factor,
+      float *color)
+{
+   menu_display_ctx_rotate_draw_t rotate_draw;
+   menu_display_ctx_draw_t draw;
+   struct video_coords coords;
+   math_matrix_4x4 mymat;
+
+   rotate_draw.matrix       = &mymat;
+   rotate_draw.rotation     = rotation;
+   rotate_draw.scale_x      = scale_factor;
+   rotate_draw.scale_y      = scale_factor;
+   rotate_draw.scale_z      = 1;
+   rotate_draw.scale_enable = true;
+
+   menu_display_rotate_z(&rotate_draw, video_info);
+
+   coords.vertices      = 4;
+   coords.vertex        = NULL;
+   coords.tex_coord     = NULL;
+   coords.lut_tex_coord = NULL;
+   coords.color         = color ? (const float*)color : ozone_pure_white;
+
+   draw.x               = x;
+   draw.y               = height - y - icon_height;
+   draw.width           = icon_width;
+   draw.height          = icon_height;
+   draw.scale_factor    = scale_factor;
+   draw.rotation        = rotation;
+   draw.coords          = &coords;
+   draw.matrix_data     = &mymat;
+   draw.texture         = texture;
+   draw.prim_type       = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
+   draw.pipeline.id     = 0;
+
+   menu_display_draw(&draw, video_info);
+}
+
+void ozone_draw_backdrop(video_frame_info_t *video_info, float alpha)
+{
+   /* TODO Replace this backdrop by a blur shader on the whole screen if available */
+   ozone_color_alpha(ozone_backdrop, alpha);
+   menu_display_draw_quad(video_info, 0, 0, video_info->width, video_info->height, video_info->width, video_info->height, ozone_backdrop);
+}
+
+void ozone_draw_osk(ozone_handle_t *ozone,
+      video_frame_info_t *video_info,
+      const char *label, const char *str)
+{
+   int i;
+   const char *text;
+   char message[2048];
+   unsigned text_color;
+   struct string_list *list;
+
+   unsigned margin         = 75;
+   unsigned padding        = 10;
+   unsigned bottom_end     = video_info->height/2;
+   unsigned y_offset       = 0;
+   bool draw_placeholder   = string_is_empty(str);
+
+   retro_time_t current_time      = cpu_features_get_time_usec();
+   static retro_time_t last_time  = 0;
+
+   if (current_time - last_time >= INTERVAL_OSK_CURSOR)
+   {
+      ozone->osk_cursor = !ozone->osk_cursor;
+      last_time = current_time;
+   }
+
+   /* Border */
+   /* Top */
+   menu_display_draw_quad(video_info, margin, margin, video_info->width - margin*2, 1, video_info->width, video_info->height, ozone->theme->entries_border);
+
+   /* Bottom */
+   menu_display_draw_quad(video_info, margin, bottom_end - margin, video_info->width - margin*2, 1, video_info->width, video_info->height, ozone->theme->entries_border);
+
+   /* Left */
+   menu_display_draw_quad(video_info, margin, margin, 1, bottom_end - margin*2, video_info->width, video_info->height, ozone->theme->entries_border);
+
+   /* Right */
+   menu_display_draw_quad(video_info, video_info->width - margin, margin, 1, bottom_end - margin*2, video_info->width, video_info->height, ozone->theme->entries_border);
+
+   /* Backdrop */
+   /* TODO Remove the backdrop if blur shader is available */
+   menu_display_draw_quad(video_info, margin + 1, margin + 1, video_info->width - margin*2 - 2, bottom_end - margin*2 - 2, video_info->width, video_info->height, ozone_osk_backdrop);
+
+   /* Placeholder & text*/
+   if (!draw_placeholder)
+   {
+      text        = str;
+      text_color  = 0xffffffff;
+   }
+   else
+   {
+      text        = label;
+      text_color  = ozone_theme_light.text_sublabel_rgba;
+   }
+
+   word_wrap(message, text, (video_info->width - margin*2 - padding*2) / ozone->entry_font_glyph_width, true);
+
+   list = string_split(message, "\n");
+
+   for (i = 0; i < list->size; i++)
+   {
+      const char *msg = list->elems[i].data;
+
+      ozone_draw_text(video_info, ozone, msg, margin + padding * 2, margin + padding + FONT_SIZE_ENTRIES_LABEL + y_offset, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.entries_label, text_color, false);
+
+      /* Cursor */
+      if (i == list->size - 1)
+      {
+         if (ozone->osk_cursor)
+         {
+            unsigned cursor_x = draw_placeholder ? 0 : font_driver_get_message_width(ozone->fonts.entries_label, msg, (unsigned)strlen(msg), 1);
+            menu_display_draw_quad(video_info, margin + padding*2 + cursor_x, margin + padding + y_offset + 3, 1, 25, video_info->width, video_info->height, ozone_pure_white);
+         }
+      }
+      else
+      {
+         y_offset += 25;
+      }
+   }
+
+   /* Keyboard */
+   menu_display_draw_keyboard(
+            ozone->theme->textures[OZONE_THEME_TEXTURE_CURSOR_STATIC],
+            ozone->fonts.entries_label,
+            video_info,
+            menu_event_get_osk_grid(),
+            menu_event_get_osk_ptr(),
+            ozone->theme->text_rgba);
+
+   string_list_free(list);
+}
+
+void ozone_draw_messagebox(ozone_handle_t *ozone,
+      video_frame_info_t *video_info,
+      const char *message)
+{
+   unsigned i, y_position;
+   int x, y, longest = 0, longest_width = 0;
+   float line_height        = 0;
+   unsigned width           = video_info->width;
+   unsigned height          = video_info->height;
+   struct string_list *list = !string_is_empty(message)
+      ? string_split(message, "\n") : NULL;
+
+   if (!list || !ozone || !ozone->fonts.footer)
+   {
+      if (list)
+         string_list_free(list);
+      return;
+   }
+
+   if (list->elems == 0)
+      goto end;
+
+   line_height      = 25;
+
+   y_position       = height / 2;
+   if (menu_input_dialog_get_display_kb())
+      y_position    = height / 4;
+
+   x                = width  / 2;
+   y                = y_position - (list->size-1) * line_height / 2;
+
+   /* find the longest line width */
+   for (i = 0; i < list->size; i++)
+   {
+      const char *msg  = list->elems[i].data;
+      int len          = (int)utf8len(msg);
+
+      if (len > longest)
+      {
+         longest       = len;
+         longest_width = font_driver_get_message_width(
+               ozone->fonts.footer, msg, (unsigned)strlen(msg), 1);
+      }
+   }
+
+   ozone_color_alpha(ozone->theme_dynamic.message_background, ozone->animations.messagebox_alpha);
+
+   menu_display_blend_begin(video_info);
+
+   if (ozone->has_all_assets) /* avoid drawing a black box if there's no assets */
+      menu_display_draw_texture_slice(
+         video_info,
+         x - longest_width/2 - 48,
+         y + 16 - 48,
+         256, 256,
+         longest_width + 48 * 2,
+         line_height * list->size + 48 * 2,
+         width, height,
+         ozone->theme_dynamic.message_background,
+         16, 1.0,
+         ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_DIALOG_SLICE]
+      );
+
+   for (i = 0; i < list->size; i++)
+   {
+      const char *msg = list->elems[i].data;
+
+      if (msg)
+         ozone_draw_text(video_info, ozone,
+            msg,
+            x - longest_width/2.0,
+            y + (i+0.75) * line_height,
+            TEXT_ALIGN_LEFT,
+            width, height,
+            ozone->fonts.footer,
+            COLOR_TEXT_ALPHA(ozone->theme->text_rgba, (uint32_t)(ozone->animations.messagebox_alpha*255.0f)),
+            false
+         );
+   }
+
+end:
+   string_list_free(list);
+}
\ No newline at end of file
diff --git a/menu/drivers/ozone/ozone_display.h b/menu/drivers/ozone/ozone_display.h
new file mode 100644
index 0000000000..4693a1d856
--- /dev/null
+++ b/menu/drivers/ozone/ozone_display.h
@@ -0,0 +1,62 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *  Copyright (C) 2018      - Alfredo Monclús
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ozone.h"
+
+#include "../../menu_driver.h"
+
+void ozone_draw_text(
+      video_frame_info_t *video_info,
+      ozone_handle_t *ozone,
+      const char *str, float x,
+      float y,
+      enum text_alignment text_align,
+      unsigned width, unsigned height, font_data_t* font,
+      uint32_t color,
+      bool draw_outside);
+
+void ozone_draw_cursor(ozone_handle_t *ozone,
+      video_frame_info_t *video_info,
+      int x_offset,
+      unsigned width, unsigned height,
+      size_t y, float alpha);
+
+void ozone_color_alpha(float *color, float alpha);
+
+void ozone_draw_icon(
+      video_frame_info_t *video_info,
+      unsigned icon_width,
+      unsigned icon_height,
+      uintptr_t texture,
+      float x, float y,
+      unsigned width, unsigned height,
+      float rotation, float scale_factor,
+      float *color);
+
+void ozone_restart_cursor_animation(ozone_handle_t *ozone);
+
+void ozone_draw_backdrop(video_frame_info_t *video_info, float alpha);
+
+void ozone_draw_osk(ozone_handle_t *ozone,
+      video_frame_info_t *video_info,
+      const char *label, const char *str);
+
+void ozone_draw_messagebox(ozone_handle_t *ozone,
+      video_frame_info_t *video_info,
+      const char *message);
\ No newline at end of file
diff --git a/menu/drivers/ozone/ozone_entries.c b/menu/drivers/ozone/ozone_entries.c
new file mode 100644
index 0000000000..7fb8ba0814
--- /dev/null
+++ b/menu/drivers/ozone/ozone_entries.c
@@ -0,0 +1,309 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *  Copyright (C) 2018      - Alfredo Monclús
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ozone.h"
+#include "ozone_texture.h"
+#include "ozone_display.h"
+
+#include <string/stdstring.h>
+#include <encodings/utf.h>
+
+#include "../../menu_driver.h"
+#include "../../menu_animation.h"
+
+static void ozone_draw_entry_value(ozone_handle_t *ozone, 
+      video_frame_info_t *video_info,
+      char *value,
+      unsigned x, unsigned y,
+      uint32_t alpha_uint32,
+      menu_entry_t *entry)
+{
+   bool switch_is_on = true;
+   bool do_draw_text = false;
+
+   if (!entry->checked && string_is_empty(value))
+      return;
+
+   /* check icon */
+   if (entry->checked)
+   {
+      menu_display_blend_begin(video_info);
+      ozone_draw_icon(video_info, 30, 30, ozone->theme->textures[OZONE_THEME_TEXTURE_CHECK], x - 20, y - 22, video_info->width, video_info->height, 0, 1, ozone->theme_dynamic.entries_checkmark);
+      menu_display_blend_end(video_info);
+      return;
+   }
+
+   /* text value */
+   if (string_is_equal(value, msg_hash_to_str(MENU_ENUM_LABEL_DISABLED)) ||
+         (string_is_equal(value, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))))
+   {
+      switch_is_on = false;
+      do_draw_text = false;
+   }
+   else if (string_is_equal(value, msg_hash_to_str(MENU_ENUM_LABEL_ENABLED)) ||
+         (string_is_equal(value, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON))))
+   {
+      switch_is_on = true;
+      do_draw_text = false;
+   }
+   else
+   {
+      if (!string_is_empty(entry->value))
+      {
+         if (
+               string_is_equal(entry->value, "...")     ||
+               string_is_equal(entry->value, "(PRESET)")  ||
+               string_is_equal(entry->value, "(SHADER)")  ||
+               string_is_equal(entry->value, "(COMP)")  ||
+               string_is_equal(entry->value, "(CORE)")  ||
+               string_is_equal(entry->value, "(MOVIE)") ||
+               string_is_equal(entry->value, "(MUSIC)") ||
+               string_is_equal(entry->value, "(DIR)")   ||
+               string_is_equal(entry->value, "(RDB)")   ||
+               string_is_equal(entry->value, "(CURSOR)")||
+               string_is_equal(entry->value, "(CFILE)") ||
+               string_is_equal(entry->value, "(FILE)")  ||
+               string_is_equal(entry->value, "(IMAGE)")
+            )
+         {
+            return;
+         }
+         else
+            do_draw_text = true;
+      }
+      else
+         do_draw_text = true;
+   }
+
+   if (do_draw_text)
+   {
+      ozone_draw_text(video_info, ozone, value, x, y, TEXT_ALIGN_RIGHT, video_info->width, video_info->height, ozone->fonts.entries_label, COLOR_TEXT_ALPHA(ozone->theme->text_selected_rgba, alpha_uint32), false);
+   }
+   else
+   {
+      ozone_draw_text(video_info, ozone, (switch_is_on ? msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ON) : msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF)),
+               x, y, TEXT_ALIGN_RIGHT, video_info->width, video_info->height, ozone->fonts.entries_label,
+               COLOR_TEXT_ALPHA(switch_is_on ? ozone->theme->text_selected_rgba : ozone->theme->text_sublabel_rgba, alpha_uint32), false);
+   }
+}
+
+void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_info,
+   unsigned selection, unsigned selection_old,
+   file_list_t *selection_buf, float alpha, float scroll_y,
+   bool is_playlist)
+{
+   bool old_list;
+   uint32_t alpha_uint32;
+   size_t i, y, entries_end;
+   float sidebar_offset, bottom_boundary, invert, alpha_anim;
+   unsigned video_info_height, video_info_width, entry_width, button_height;
+   int x_offset            = 22;
+   size_t selection_y      = 0;
+   size_t old_selection_y  = 0;
+
+   menu_entries_ctl(MENU_ENTRIES_CTL_START_GET, &i);
+
+   entries_end    = file_list_get_size(selection_buf);
+   old_list       = selection_buf == ozone->selection_buf_old;
+   y              = ENTRIES_START_Y;
+   sidebar_offset = ozone->sidebar_offset / 2.0f;
+   entry_width    = video_info->width - 548;
+   button_height  = 52; /* height of the button (entry minus sublabel) */
+
+   video_driver_get_size(&video_info_width, &video_info_height);
+
+   bottom_boundary = video_info_height - 87 - 78;
+   invert          = (ozone->fade_direction) ? -1 : 1;
+   alpha_anim      = old_list ? alpha : 1.0f - alpha;
+
+   if (old_list)
+      alpha = 1.0f - alpha;
+
+   if (alpha != 1.0f)
+   {    
+      if (old_list)
+         x_offset += invert * -(alpha_anim * 120); /* left */
+      else
+         x_offset += invert * (alpha_anim * 120);  /* right */
+   }
+
+   x_offset     += (int) sidebar_offset;
+   alpha_uint32  = (uint32_t)(alpha*255.0f);
+
+   /* Borders layer */
+   for (i = 0; i < entries_end; i++)
+   {
+      bool entry_selected     = selection == i;
+      bool entry_old_selected = selection_old == i;
+      ozone_node_t *node      = NULL;
+      if (entry_selected)
+         selection_y = y;
+      
+      if (entry_old_selected)
+         old_selection_y = y;
+
+      node                    = (ozone_node_t*) file_list_get_userdata_at_offset(selection_buf, i);
+
+      if (!node || ozone->empty_playlist)
+         goto border_iterate;
+
+      if (y + scroll_y + node->height + 20 < ENTRIES_START_Y)
+         goto border_iterate;
+      else if (y + scroll_y - node->height - 20 > bottom_boundary)
+         goto border_iterate;
+
+      ozone_color_alpha(ozone->theme_dynamic.entries_border, alpha);
+      ozone_color_alpha(ozone->theme_dynamic.entries_checkmark, alpha);
+
+      /* Borders */
+      menu_display_draw_quad(video_info, x_offset + 456-3, y - 3 + scroll_y, entry_width + 10 - 3 -1, 1, video_info->width, video_info->height, ozone->theme_dynamic.entries_border);
+      menu_display_draw_quad(video_info, x_offset + 456-3, y - 3 + button_height + scroll_y, entry_width + 10 - 3-1, 1, video_info->width, video_info->height, ozone->theme_dynamic.entries_border);
+
+border_iterate:
+      y += node->height;
+   }
+
+   /* Cursor(s) layer - current */
+   if (!ozone->cursor_in_sidebar)
+      ozone_draw_cursor(ozone, video_info, x_offset + 456, entry_width, button_height, selection_y + scroll_y, ozone->animations.cursor_alpha * alpha);
+
+   /* Old*/
+   if (!ozone->cursor_in_sidebar_old)
+      ozone_draw_cursor(ozone, video_info, x_offset + 456, entry_width, button_height, old_selection_y + scroll_y, (1-ozone->animations.cursor_alpha) * alpha);
+
+   /* Icons + text */
+   y = ENTRIES_START_Y;
+
+   if (old_list)
+      y += ozone->old_list_offset_y;
+
+   for (i = 0; i < entries_end; i++)
+   {
+      menu_texture_item tex;
+      menu_entry_t entry;
+      menu_animation_ctx_ticker_t ticker;
+      char entry_value[255];
+      char rich_label[255];
+      char entry_value_ticker[255];
+      char *sublabel_str;
+      ozone_node_t *node      = NULL;
+      char *entry_rich_label  = NULL;
+      bool entry_selected     = false;
+      int text_offset         = -40;
+      float *icon_color       = NULL;
+
+      entry_value[0]         = '\0';
+      entry_selected         = selection == i;
+      node                   = (ozone_node_t*) file_list_get_userdata_at_offset(selection_buf, i);
+
+      menu_entry_init(&entry);
+      menu_entry_get(&entry, 0, (unsigned)i, selection_buf, true);
+      menu_entry_get_value(&entry, entry_value, sizeof(entry_value));
+
+      if (!node)
+         continue;
+
+      if (y + scroll_y + node->height + 20 < ENTRIES_START_Y)
+         goto icons_iterate;
+      else if (y + scroll_y - node->height - 20 > bottom_boundary)
+         goto icons_iterate;
+
+      /* Prepare text */
+      entry_rich_label = menu_entry_get_rich_label(&entry);
+
+      ticker.idx = ozone->frame_count / 20;
+      ticker.s = rich_label;
+      ticker.str = entry_rich_label;
+      ticker.selected = entry_selected && !ozone->cursor_in_sidebar;
+      ticker.len = (entry_width - 60 - text_offset) / ozone->entry_font_glyph_width;
+
+      menu_animation_ticker(&ticker);
+
+      if (ozone->empty_playlist)
+      {
+         unsigned text_width = font_driver_get_message_width(ozone->fonts.entries_label, rich_label, (unsigned)strlen(rich_label), 1);
+         x_offset = (video_info_width - 408 - 162)/2 - text_width/2;
+         y = video_info_height/2 - 60;
+      }
+
+      sublabel_str = menu_entry_get_sublabel(&entry);
+
+      if (node->wrap)
+         word_wrap(sublabel_str, sublabel_str, (video_info->width - 548) / ozone->sublabel_font_glyph_width, false);
+
+      /* Icon */
+      tex = ozone_entries_icon_get_texture(ozone, entry.enum_idx, entry.type, entry_selected);
+      if (tex != ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SUBSETTING])
+      {
+         uintptr_t texture = tex;
+
+         /* Console specific icons */
+         if (entry.type == FILE_TYPE_RPL_ENTRY && ozone->horizontal_list && ozone->categories_selection_ptr > ozone->system_tab_end)
+         {
+            ozone_node_t *sidebar_node = (ozone_node_t*) file_list_get_userdata_at_offset(ozone->horizontal_list, ozone->categories_selection_ptr - ozone->system_tab_end-1);
+
+            if (!sidebar_node || !sidebar_node->content_icon)
+               texture = tex;
+            else
+               texture = sidebar_node->content_icon;
+         }
+
+         /* Cheevos badges should not be recolored */
+         if (!(
+            (entry.type >= MENU_SETTINGS_CHEEVOS_START) &&
+            (entry.type < MENU_SETTINGS_NETPLAY_ROOMS_START)
+         ))
+         {
+            icon_color = ozone->theme_dynamic.entries_icon;
+            ozone_color_alpha(ozone->theme_dynamic.entries_icon, alpha);
+         }
+
+         menu_display_blend_begin(video_info);
+         ozone_draw_icon(video_info, 46, 46, texture, x_offset + 451+5+10, y + scroll_y, video_info->width, video_info->height, 0, 1, icon_color);
+         menu_display_blend_end(video_info);
+
+         text_offset = 0;
+      }
+
+      /* Draw text */
+      ozone_draw_text(video_info, ozone, rich_label, text_offset + x_offset + 521, y + FONT_SIZE_ENTRIES_LABEL + 8 - 1 + scroll_y, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.entries_label, COLOR_TEXT_ALPHA(ozone->theme->text_rgba, alpha_uint32), false);
+      ozone_draw_text(video_info, ozone, sublabel_str, x_offset + 470, y + FONT_SIZE_ENTRIES_SUBLABEL + 80 - 20 - 3 + scroll_y, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.entries_sublabel, COLOR_TEXT_ALPHA(ozone->theme->text_sublabel_rgba, alpha_uint32), false);
+
+      /* Value */
+      ticker.idx = ozone->frame_count / 20;
+      ticker.s = entry_value_ticker;
+      ticker.str = entry_value;
+      ticker.selected = entry_selected && !ozone->cursor_in_sidebar;
+      ticker.len = (entry_width - 60 - ((int)utf8len(entry_rich_label) * ozone->entry_font_glyph_width)) / ozone->entry_font_glyph_width;
+
+      menu_animation_ticker(&ticker);
+      ozone_draw_entry_value(ozone, video_info, entry_value_ticker, x_offset + 426 + entry_width, y + FONT_SIZE_ENTRIES_LABEL + 8 - 1 + scroll_y,alpha_uint32, &entry);
+      
+      free(entry_rich_label);
+      free(sublabel_str);
+
+icons_iterate:
+      y += node->height;
+      menu_entry_free(&entry);
+   }
+
+   /* Text layer */
+   font_driver_flush(video_info->width, video_info->height, ozone->fonts.entries_label, video_info);
+   font_driver_flush(video_info->width, video_info->height, ozone->fonts.entries_sublabel, video_info);
+}
\ No newline at end of file
diff --git a/menu/drivers/ozone/ozone_sidebar.c b/menu/drivers/ozone/ozone_sidebar.c
new file mode 100644
index 0000000000..aeb7c7163b
--- /dev/null
+++ b/menu/drivers/ozone/ozone_sidebar.c
@@ -0,0 +1,654 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *  Copyright (C) 2018      - Alfredo Monclús
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/* TODO Fluid sidebar width ? */
+
+#include "ozone.h"
+#include "ozone_theme.h"
+#include "ozone_display.h"
+#include "ozone_sidebar.h"
+
+#include <string/stdstring.h>
+#include <file/file_path.h>
+#include <streams/file_stream.h>
+
+#include "../../menu_animation.h"
+
+#include "../../../configuration.h"
+
+enum msg_hash_enums ozone_system_tabs_value[OZONE_SYSTEM_TAB_LAST] = {
+   MENU_ENUM_LABEL_VALUE_MAIN_MENU,
+   MENU_ENUM_LABEL_VALUE_SETTINGS_TAB,
+   MENU_ENUM_LABEL_VALUE_HISTORY_TAB,
+   MENU_ENUM_LABEL_VALUE_FAVORITES_TAB,
+   MENU_ENUM_LABEL_VALUE_MUSIC_TAB,
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
+   MENU_ENUM_LABEL_VALUE_VIDEO_TAB,
+#endif
+#ifdef HAVE_IMAGEVIEWER
+   MENU_ENUM_LABEL_VALUE_IMAGES_TAB,
+#endif
+#ifdef HAVE_NETWORKING
+   MENU_ENUM_LABEL_VALUE_NETPLAY_TAB,
+#endif
+   MENU_ENUM_LABEL_VALUE_ADD_TAB
+};
+
+enum menu_settings_type ozone_system_tabs_type[OZONE_SYSTEM_TAB_LAST] = {
+   MENU_SETTINGS,
+   MENU_SETTINGS_TAB,
+   MENU_HISTORY_TAB,
+   MENU_FAVORITES_TAB,
+   MENU_MUSIC_TAB,
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
+   MENU_VIDEO_TAB,
+#endif
+#ifdef HAVE_IMAGEVIEWER
+   MENU_IMAGES_TAB,
+#endif
+#ifdef HAVE_NETWORKING
+   MENU_NETPLAY_TAB,
+#endif
+   MENU_ADD_TAB
+};
+
+enum msg_hash_enums ozone_system_tabs_idx[OZONE_SYSTEM_TAB_LAST] = {
+   MENU_ENUM_LABEL_MAIN_MENU,
+   MENU_ENUM_LABEL_SETTINGS_TAB,
+   MENU_ENUM_LABEL_HISTORY_TAB,
+   MENU_ENUM_LABEL_FAVORITES_TAB,
+   MENU_ENUM_LABEL_MUSIC_TAB,
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
+   MENU_ENUM_LABEL_VIDEO_TAB,
+#endif
+#ifdef HAVE_IMAGEVIEWER
+   MENU_ENUM_LABEL_IMAGES_TAB,
+#endif
+#ifdef HAVE_NETWORKING
+   MENU_ENUM_LABEL_NETPLAY_TAB,
+#endif
+   MENU_ENUM_LABEL_ADD_TAB
+};
+
+unsigned ozone_system_tabs_icons[OZONE_SYSTEM_TAB_LAST] = {
+   OZONE_TAB_TEXTURE_MAIN_MENU,
+   OZONE_TAB_TEXTURE_SETTINGS,
+   OZONE_TAB_TEXTURE_HISTORY,
+   OZONE_TAB_TEXTURE_FAVORITES,
+   OZONE_TAB_TEXTURE_MUSIC,
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
+   OZONE_TAB_TEXTURE_VIDEO,
+#endif
+#ifdef HAVE_IMAGEVIEWER
+   OZONE_TAB_TEXTURE_IMAGE,
+#endif
+#ifdef HAVE_NETWORKING
+   OZONE_TAB_TEXTURE_NETWORK,
+#endif
+   OZONE_TAB_TEXTURE_SCAN_CONTENT
+};
+
+void ozone_draw_sidebar(ozone_handle_t *ozone, video_frame_info_t *video_info)
+{
+   size_t y;
+   unsigned i, sidebar_height;
+   char console_title[255];
+   menu_animation_ctx_ticker_t ticker;
+
+   unsigned selection_y          = 0;
+   unsigned selection_old_y      = 0;
+   unsigned horizontal_list_size = 0;
+
+   if (!ozone->draw_sidebar)
+      return;
+
+   if (ozone->horizontal_list)
+      horizontal_list_size = ozone->horizontal_list->size;
+
+   menu_display_scissor_begin(video_info, 0, 87, 408, video_info->height - 87 - 78);
+
+   /* Background */
+   sidebar_height = video_info->height - 87 - 55 - 78;
+
+   if (!video_info->libretro_running)
+   {
+      menu_display_draw_quad(video_info, ozone->sidebar_offset, 88, 408, 55/2, video_info->width, video_info->height, ozone->theme->sidebar_top_gradient);
+      menu_display_draw_quad(video_info, ozone->sidebar_offset, 88 + 55/2, 408, sidebar_height, video_info->width, video_info->height, ozone->theme->sidebar_background);
+      menu_display_draw_quad(video_info, ozone->sidebar_offset, 55*2 + sidebar_height, 408, 55/2 + 1, video_info->width, video_info->height, ozone->theme->sidebar_bottom_gradient);
+   }
+
+   /* Tabs */
+   /* y offset computation */
+   y = ENTRIES_START_Y - 10;
+   for (i = 0; i < ozone->system_tab_end + horizontal_list_size + 1; i++)
+   {
+      if (i == ozone->categories_selection_ptr)
+      {
+         selection_y = y;
+         if (ozone->categories_selection_ptr > ozone->system_tab_end)
+            selection_y += 30;
+      }
+
+      if (i == ozone->categories_active_idx_old)
+      {
+         selection_old_y = y;
+         if (ozone->categories_active_idx_old > ozone->system_tab_end)
+            selection_old_y += 30;
+      }
+
+      y += 65;
+   }
+
+   /* Cursor */
+   if (ozone->cursor_in_sidebar)
+      ozone_draw_cursor(ozone, video_info, ozone->sidebar_offset + 41, 408 - 81, 52, selection_y-8 + ozone->animations.scroll_y_sidebar, ozone->animations.cursor_alpha);
+
+   if (ozone->cursor_in_sidebar_old)
+      ozone_draw_cursor(ozone, video_info, ozone->sidebar_offset + 41, 408 - 81, 52, selection_old_y-8 + ozone->animations.scroll_y_sidebar, 1-ozone->animations.cursor_alpha);
+
+   /* Menu tabs */
+   y = ENTRIES_START_Y - 10;
+   menu_display_blend_begin(video_info);
+
+   for (i = 0; i < ozone->system_tab_end+1; i++)
+   {
+      enum msg_hash_enums value_idx;
+      const char *title = NULL;
+      bool     selected = (ozone->categories_selection_ptr == i);
+      unsigned     icon = ozone_system_tabs_icons[ozone->tabs[i]];
+
+      /* Icon */
+      ozone_draw_icon(video_info, 40, 40, ozone->tab_textures[icon], ozone->sidebar_offset + 41 + 10, y - 5 + ozone->animations.scroll_y_sidebar, video_info->width, video_info->height, 0, 1, (selected ? ozone->theme->text_selected : ozone->theme->entries_icon));
+
+      value_idx = ozone_system_tabs_value[ozone->tabs[i]];
+      title     = msg_hash_to_str(value_idx);
+
+      /* Text */
+      ozone_draw_text(video_info, ozone, title, ozone->sidebar_offset + 115 - 10, y + FONT_SIZE_SIDEBAR + ozone->animations.scroll_y_sidebar, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.sidebar, (selected ? ozone->theme->text_selected_rgba : ozone->theme->text_rgba), true);
+
+      y += 65;
+   }
+
+   menu_display_blend_end(video_info);
+
+   /* Console tabs */
+   if (horizontal_list_size > 0)
+   {
+      menu_display_draw_quad(video_info, ozone->sidebar_offset + 41 + 10, y - 5 + ozone->animations.scroll_y_sidebar, 408-81, 1, video_info->width, video_info->height, ozone->theme->entries_border);
+
+      y += 30;
+
+      menu_display_blend_begin(video_info);
+
+      for (i = 0; i < horizontal_list_size; i++)
+      {
+         bool selected = (ozone->categories_selection_ptr == ozone->system_tab_end + 1 + i);
+
+         ozone_node_t *node = (ozone_node_t*) file_list_get_userdata_at_offset(ozone->horizontal_list, i);
+
+         if (!node)
+            goto console_iterate;
+
+         /* Icon */
+         ozone_draw_icon(video_info, 40, 40, node->icon, ozone->sidebar_offset + 41 + 10, y - 5 + ozone->animations.scroll_y_sidebar, video_info->width, video_info->height, 0, 1, (selected ? ozone->theme->text_selected : ozone->theme->entries_icon));
+
+         /* Text */
+         ticker.idx        = ozone->frame_count / 20;
+         ticker.len        = 19;
+         ticker.s          = console_title;
+         ticker.selected   = selected;
+         ticker.str        = node->console_name;
+
+         menu_animation_ticker(&ticker);
+
+         ozone_draw_text(video_info, ozone, console_title, ozone->sidebar_offset + 115 - 10, y + FONT_SIZE_SIDEBAR + ozone->animations.scroll_y_sidebar, TEXT_ALIGN_LEFT, video_info->width, video_info->height, ozone->fonts.sidebar, (selected ? ozone->theme->text_selected_rgba : ozone->theme->text_rgba), true);
+
+console_iterate:
+         y += 65;
+      }
+
+      menu_display_blend_end(video_info);
+
+   }
+
+   font_driver_flush(video_info->width, video_info->height, ozone->fonts.sidebar, video_info);
+   ozone->raster_blocks.sidebar.carr.coords.vertices = 0;
+
+   menu_display_scissor_end(video_info);
+}
+
+void ozone_go_to_sidebar(ozone_handle_t *ozone, uintptr_t tag)
+{
+   struct menu_animation_ctx_entry entry;
+
+   ozone->selection_old           = ozone->selection;
+   ozone->cursor_in_sidebar_old   = ozone->cursor_in_sidebar;
+   ozone->cursor_in_sidebar       = true;
+   
+   /* Cursor animation */
+   ozone->animations.cursor_alpha = 0.0f;
+
+   entry.cb = NULL;
+   entry.duration = ANIMATION_CURSOR_DURATION;
+   entry.easing_enum = EASING_OUT_QUAD;
+   entry.subject = &ozone->animations.cursor_alpha;
+   entry.tag = tag;
+   entry.target_value = 1.0f;
+   entry.userdata = NULL;
+
+   menu_animation_push(&entry);
+}
+
+void ozone_leave_sidebar(ozone_handle_t *ozone, uintptr_t tag)
+{
+   struct menu_animation_ctx_entry entry;
+
+   if (ozone->empty_playlist)
+      return;
+
+   ozone->categories_active_idx_old = ozone->categories_selection_ptr;
+   ozone->cursor_in_sidebar_old     = ozone->cursor_in_sidebar;
+   ozone->cursor_in_sidebar         = false;
+   
+   /* Cursor animation */
+   ozone->animations.cursor_alpha   = 0.0f;
+
+   entry.cb = NULL;
+   entry.duration = ANIMATION_CURSOR_DURATION;
+   entry.easing_enum = EASING_OUT_QUAD;
+   entry.subject = &ozone->animations.cursor_alpha;
+   entry.tag = tag;
+   entry.target_value = 1.0f;
+   entry.userdata = NULL;
+
+   menu_animation_push(&entry);
+}
+
+unsigned ozone_get_selected_sidebar_y_position(ozone_handle_t *ozone)
+{
+   return ozone->categories_selection_ptr * 65 + (ozone->categories_selection_ptr > ozone->system_tab_end ? 30 : 0);
+}
+
+unsigned ozone_get_sidebar_height(ozone_handle_t *ozone)
+{
+   return (ozone->system_tab_end + 1 + (ozone->horizontal_list ? ozone->horizontal_list->size : 0)) * 65
+      + (ozone->horizontal_list && ozone->horizontal_list->size > 0 ? 30 : 0);
+}
+
+void ozone_sidebar_goto(ozone_handle_t *ozone, unsigned new_selection)
+{
+   unsigned video_info_height;
+
+   video_driver_get_size(NULL, &video_info_height);
+
+   struct menu_animation_ctx_entry entry;
+
+   menu_animation_ctx_tag tag = (uintptr_t)ozone;
+
+   if (ozone->categories_selection_ptr != new_selection)
+   {
+      ozone->categories_active_idx_old = ozone->categories_selection_ptr;
+      ozone->categories_selection_ptr = new_selection;
+
+      ozone->cursor_in_sidebar_old = ozone->cursor_in_sidebar;
+
+      menu_animation_kill_by_tag(&tag);
+   }
+
+   /* Cursor animation */
+   ozone->animations.cursor_alpha = 0.0f;
+
+   entry.cb = NULL;
+   entry.duration = ANIMATION_CURSOR_DURATION;
+   entry.easing_enum = EASING_OUT_QUAD;
+   entry.subject = &ozone->animations.cursor_alpha;
+   entry.tag = tag;
+   entry.target_value = 1.0f;
+   entry.userdata = NULL;
+
+   menu_animation_push(&entry);
+
+   /* Scroll animation */
+   float new_scroll                             = 0;
+   float selected_position_y                    = ozone_get_selected_sidebar_y_position(ozone);
+   float current_selection_middle_onscreen      = ENTRIES_START_Y - 10 + ozone->animations.scroll_y_sidebar + selected_position_y + 65 / 2;
+   float bottom_boundary                        = video_info_height - 87 - 78;
+   float entries_middle                         = video_info_height/2;
+   float entries_height                         = ozone_get_sidebar_height(ozone);
+
+   if (current_selection_middle_onscreen != entries_middle)
+      new_scroll = ozone->animations.scroll_y_sidebar - (current_selection_middle_onscreen - entries_middle);
+
+   if (new_scroll + entries_height < bottom_boundary)
+      new_scroll = -(30 + entries_height - bottom_boundary);
+
+   if (new_scroll > 0)
+      new_scroll = 0;
+
+   entry.cb = NULL;
+   entry.duration = ANIMATION_CURSOR_DURATION;
+   entry.easing_enum = EASING_OUT_QUAD;
+   entry.subject = &ozone->animations.scroll_y_sidebar;
+   entry.tag = tag;
+   entry.target_value = new_scroll;
+   entry.userdata = NULL;
+
+   menu_animation_push(&entry);
+
+   if (new_selection > ozone->system_tab_end)
+   {
+      ozone_change_tab(ozone, MENU_ENUM_LABEL_HORIZONTAL_MENU, MENU_SETTING_HORIZONTAL_MENU);
+   }
+   else
+   {
+      ozone_change_tab(ozone, ozone_system_tabs_idx[ozone->tabs[new_selection]], ozone_system_tabs_type[ozone->tabs[new_selection]]);
+   }
+}
+
+
+void ozone_change_tab(ozone_handle_t *ozone, 
+      enum msg_hash_enums tab, 
+      enum menu_settings_type type)
+{
+   file_list_t *menu_stack = menu_entries_get_menu_stack_ptr(0);
+   size_t stack_size;
+   menu_ctx_list_t list_info;
+   file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
+   size_t selection = menu_navigation_get_selection();
+   menu_file_list_cbs_t *cbs = selection_buf ?
+      (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf,
+            selection) : NULL;
+
+   list_info.type = MENU_LIST_HORIZONTAL;
+   list_info.action = MENU_ACTION_LEFT;
+
+   stack_size = menu_stack->size;
+
+   if (menu_stack->list[stack_size - 1].label)
+      free(menu_stack->list[stack_size - 1].label);
+   menu_stack->list[stack_size - 1].label = NULL;
+   
+   menu_stack->list[stack_size - 1].label =
+      strdup(msg_hash_to_str(tab));
+   menu_stack->list[stack_size - 1].type =
+      type;
+
+   menu_driver_list_cache(&list_info);
+
+   if (cbs && cbs->action_content_list_switch)
+      cbs->action_content_list_switch(selection_buf, menu_stack, "", "", 0);
+}
+
+void ozone_init_horizontal_list(ozone_handle_t *ozone)
+{
+   menu_displaylist_info_t info;
+   settings_t *settings         = config_get_ptr();
+
+   menu_displaylist_info_init(&info);
+
+   info.list                    = ozone->horizontal_list;
+   info.path                    = strdup(
+         settings->paths.directory_playlist);
+   info.label                   = strdup(
+         msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST));
+   info.exts                    = strdup(
+         file_path_str(FILE_PATH_LPL_EXTENSION_NO_DOT));
+   info.type_default            = FILE_TYPE_PLAIN;
+   info.enum_idx                = MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST;
+
+   if (settings->bools.menu_content_show_playlists && !string_is_empty(info.path))
+   {
+      if (menu_displaylist_ctl(DISPLAYLIST_DATABASE_PLAYLISTS_HORIZONTAL, &info))
+      {
+         size_t i;
+         for (i = 0; i < ozone->horizontal_list->size; i++)
+         {
+            ozone_node_t *node = ozone_alloc_node();
+            file_list_set_userdata(ozone->horizontal_list, i, node);
+         }
+
+         menu_displaylist_process(&info);
+      }
+   }
+
+   menu_displaylist_info_free(&info);
+}
+
+void ozone_refresh_horizontal_list(ozone_handle_t *ozone)
+{
+   ozone_context_destroy_horizontal_list(ozone);
+   if (ozone->horizontal_list)
+   {
+      ozone_free_list_nodes(ozone->horizontal_list, false);
+      file_list_free(ozone->horizontal_list);
+   }
+   ozone->horizontal_list = NULL;
+
+   menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
+
+   ozone->horizontal_list         = (file_list_t*)
+      calloc(1, sizeof(file_list_t));
+
+   if (ozone->horizontal_list)
+      ozone_init_horizontal_list(ozone);
+
+   ozone_context_reset_horizontal_list(ozone);
+}
+
+void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
+{
+   unsigned i;
+   const char *title;
+   char title_noext[255];
+
+   size_t list_size  = ozone_list_get_size(ozone, MENU_LIST_HORIZONTAL);
+
+   for (i = 0; i < list_size; i++)
+   {
+      const char *path     = NULL;
+      ozone_node_t *node   = (ozone_node_t*)file_list_get_userdata_at_offset(ozone->horizontal_list, i);
+
+      if (!node)
+      {
+         node = ozone_alloc_node();
+         if (!node)
+            continue;
+      }
+
+      file_list_get_at_offset(ozone->horizontal_list, i,
+            &path, NULL, NULL, NULL);
+
+      if (!path)
+         continue;
+
+      if (!strstr(path, file_path_str(FILE_PATH_LPL_EXTENSION)))
+         continue;
+
+      {
+         struct texture_image ti;
+         char *sysname             = (char*)
+            malloc(PATH_MAX_LENGTH * sizeof(char));
+         char *texturepath         = (char*)
+            malloc(PATH_MAX_LENGTH * sizeof(char));
+         char *content_texturepath = (char*)
+            malloc(PATH_MAX_LENGTH * sizeof(char));
+         char *icons_path          = (char*)
+            malloc(PATH_MAX_LENGTH * sizeof(char));
+
+         strlcpy(icons_path, ozone->icons_path, PATH_MAX_LENGTH * sizeof(char));
+
+         sysname[0] = texturepath[0] = content_texturepath[0] = '\0';
+
+         fill_pathname_base_noext(sysname, path,
+               PATH_MAX_LENGTH * sizeof(char));
+
+         fill_pathname_join_concat(texturepath, icons_path, sysname,
+               file_path_str(FILE_PATH_PNG_EXTENSION),
+               PATH_MAX_LENGTH * sizeof(char));
+
+         /* If the playlist icon doesn't exist return default */
+
+         if (!filestream_exists(texturepath))
+               fill_pathname_join_concat(texturepath, icons_path, "default",
+               file_path_str(FILE_PATH_PNG_EXTENSION),
+               PATH_MAX_LENGTH * sizeof(char));
+
+         ti.width         = 0;
+         ti.height        = 0;
+         ti.pixels        = NULL;
+         ti.supports_rgba = video_driver_supports_rgba();
+
+         if (image_texture_load(&ti, texturepath))
+         {
+            if(ti.pixels)
+            {
+               video_driver_texture_unload(&node->icon);
+               video_driver_texture_load(&ti,
+                     TEXTURE_FILTER_MIPMAP_LINEAR, &node->icon);
+            }
+
+            image_texture_free(&ti);
+         }
+
+         fill_pathname_join_delim(sysname, sysname,
+               file_path_str(FILE_PATH_CONTENT_BASENAME), '-',
+               PATH_MAX_LENGTH * sizeof(char));
+         strlcat(content_texturepath, icons_path, PATH_MAX_LENGTH * sizeof(char));
+
+         strlcat(content_texturepath, path_default_slash(), PATH_MAX_LENGTH * sizeof(char));
+         strlcat(content_texturepath, sysname, PATH_MAX_LENGTH * sizeof(char));
+
+         /* If the content icon doesn't exist return default-content */
+         if (!filestream_exists(content_texturepath))
+         {
+            strlcat(icons_path, path_default_slash(), PATH_MAX_LENGTH * sizeof(char));
+            strlcat(icons_path, "default", PATH_MAX_LENGTH * sizeof(char));
+            fill_pathname_join_delim(content_texturepath, icons_path,
+                  file_path_str(FILE_PATH_CONTENT_BASENAME), '-',
+                  PATH_MAX_LENGTH * sizeof(char));
+         }
+
+         if (image_texture_load(&ti, content_texturepath))
+         {
+            if(ti.pixels)
+            {
+               video_driver_texture_unload(&node->content_icon);
+               video_driver_texture_load(&ti,
+                     TEXTURE_FILTER_MIPMAP_LINEAR, &node->content_icon);
+            }
+
+            image_texture_free(&ti);
+         }
+
+         /* Console name */
+         menu_entries_get_at_offset(
+            ozone->horizontal_list,
+            i,
+            &title, NULL, NULL, NULL, NULL);
+
+         fill_pathname_base_noext(title_noext, title, sizeof(title_noext));
+
+         /* Format : "Vendor - Console"
+            Remove everything before the hyphen
+            and the subsequent space */
+         char *chr         = title_noext;
+         bool hyphen_found = false;
+
+         while (true)
+         {
+            if (*chr == '-')
+            {
+               hyphen_found = true;
+               break;
+            }
+            else if (*chr == '\0')
+               break;
+
+            chr++;
+         }
+
+         if (hyphen_found)
+            chr += 2;
+         else
+            chr = title_noext;
+
+         node->console_name = strdup(chr);
+
+         free(sysname);
+         free(texturepath);
+         free(content_texturepath);
+         free(icons_path);
+      }
+   }
+}
+
+void ozone_context_destroy_horizontal_list(ozone_handle_t *ozone)
+{
+   unsigned i;
+   size_t list_size = ozone_list_get_size(ozone, MENU_LIST_HORIZONTAL);
+
+   for (i = 0; i < list_size; i++)
+   {
+      const char *path = NULL;
+      ozone_node_t *node = (ozone_node_t*)file_list_get_userdata_at_offset(ozone->horizontal_list, i);
+
+      if (!node)
+         continue;
+
+      file_list_get_at_offset(ozone->horizontal_list, i,
+            &path, NULL, NULL, NULL);
+
+      if (!path || !strstr(path, file_path_str(FILE_PATH_LPL_EXTENSION)))
+         continue;
+
+      video_driver_texture_unload(&node->icon);
+      video_driver_texture_unload(&node->content_icon);
+   }
+}
+
+bool ozone_is_playlist(ozone_handle_t *ozone)
+{
+   bool is_playlist;
+
+   switch (ozone->categories_selection_ptr)
+   {
+      case OZONE_SYSTEM_TAB_MAIN:
+      case OZONE_SYSTEM_TAB_SETTINGS:
+      case OZONE_SYSTEM_TAB_ADD:
+         is_playlist = false;
+         break;
+      case OZONE_SYSTEM_TAB_HISTORY:
+      case OZONE_SYSTEM_TAB_FAVORITES:
+      case OZONE_SYSTEM_TAB_MUSIC:
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
+      case OZONE_SYSTEM_TAB_VIDEO:
+#endif
+#ifdef HAVE_IMAGEVIEWER
+      case OZONE_SYSTEM_TAB_IMAGES:
+#endif
+#ifdef HAVE_NETWORKING
+      case OZONE_SYSTEM_TAB_NETPLAY:
+#endif
+      default:
+         is_playlist = true;
+         break;
+   }
+
+   return is_playlist && ozone->depth == 1;
+}
\ No newline at end of file
diff --git a/menu/drivers/ozone/ozone_sidebar.h b/menu/drivers/ozone/ozone_sidebar.h
new file mode 100644
index 0000000000..08c5aba2b8
--- /dev/null
+++ b/menu/drivers/ozone/ozone_sidebar.h
@@ -0,0 +1,55 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *  Copyright (C) 2018      - Alfredo Monclús
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _OZONE_SIDEBAR_H
+#define _OZONE_SIDEBAR_H
+
+#include "ozone_texture.h"
+
+enum
+{
+   OZONE_SYSTEM_TAB_MAIN = 0,
+   OZONE_SYSTEM_TAB_SETTINGS,
+   OZONE_SYSTEM_TAB_HISTORY,
+   OZONE_SYSTEM_TAB_FAVORITES,
+   OZONE_SYSTEM_TAB_MUSIC,
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
+   OZONE_SYSTEM_TAB_VIDEO,
+#endif
+#ifdef HAVE_IMAGEVIEWER
+   OZONE_SYSTEM_TAB_IMAGES,
+#endif
+#ifdef HAVE_NETWORKING
+   OZONE_SYSTEM_TAB_NETPLAY,
+#endif
+   OZONE_SYSTEM_TAB_ADD,
+
+   /* End of this enum - use the last one to determine num of possible tabs */
+   OZONE_SYSTEM_TAB_LAST
+};
+
+extern enum msg_hash_enums ozone_system_tabs_value[OZONE_SYSTEM_TAB_LAST];
+
+extern enum menu_settings_type ozone_system_tabs_type[OZONE_SYSTEM_TAB_LAST];
+
+extern enum msg_hash_enums ozone_system_tabs_idx[OZONE_SYSTEM_TAB_LAST];
+
+extern unsigned ozone_system_tabs_icons[OZONE_SYSTEM_TAB_LAST];
+
+#endif
\ No newline at end of file
diff --git a/menu/drivers/ozone/ozone_texture.c b/menu/drivers/ozone/ozone_texture.c
new file mode 100644
index 0000000000..19b0654be7
--- /dev/null
+++ b/menu/drivers/ozone/ozone_texture.c
@@ -0,0 +1,824 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *  Copyright (C) 2018      - Alfredo Monclús
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ozone.h"
+#include "ozone_texture.h"
+
+#include <streams/file_stream.h>
+#include <file/file_path.h>
+
+#include "../../menu_driver.h"
+
+#include "../../../cheevos/badges.h"
+
+menu_texture_item ozone_entries_icon_get_texture(ozone_handle_t *ozone,
+      enum msg_hash_enums enum_idx, unsigned type, bool active)
+{
+   switch (enum_idx)
+   {
+      case MENU_ENUM_LABEL_CORE_OPTIONS:
+      case MENU_ENUM_LABEL_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE_OPTIONS];
+      case MENU_ENUM_LABEL_ADD_TO_FAVORITES:
+      case MENU_ENUM_LABEL_ADD_TO_FAVORITES_PLAYLIST:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ADD_FAVORITE];
+      case MENU_ENUM_LABEL_RESET_CORE_ASSOCIATION:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_UNDO];
+      case MENU_ENUM_LABEL_CORE_INPUT_REMAPPING_OPTIONS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_REMAPPING_OPTIONS];
+      case MENU_ENUM_LABEL_CORE_CHEAT_OPTIONS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CHEAT_OPTIONS];
+      case MENU_ENUM_LABEL_DISK_OPTIONS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_DISK_OPTIONS];
+      case MENU_ENUM_LABEL_SHADER_OPTIONS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SHADER_OPTIONS];
+      case MENU_ENUM_LABEL_ACHIEVEMENT_LIST:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ACHIEVEMENT_LIST];
+      case MENU_ENUM_LABEL_ACHIEVEMENT_LIST_HARDCORE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ACHIEVEMENT_LIST];
+      case MENU_ENUM_LABEL_SAVE_STATE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SAVESTATE];
+      case MENU_ENUM_LABEL_LOAD_STATE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_LOADSTATE];
+      case MENU_ENUM_LABEL_PARENT_DIRECTORY:
+      case MENU_ENUM_LABEL_UNDO_LOAD_STATE:
+      case MENU_ENUM_LABEL_UNDO_SAVE_STATE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_UNDO];
+      case MENU_ENUM_LABEL_TAKE_SCREENSHOT:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SCREENSHOT];
+      case MENU_ENUM_LABEL_DELETE_ENTRY:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CLOSE];
+      case MENU_ENUM_LABEL_RESTART_CONTENT:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RELOAD];
+      case MENU_ENUM_LABEL_RENAME_ENTRY:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RENAME];
+      case MENU_ENUM_LABEL_RESUME_CONTENT:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RESUME];
+      case MENU_ENUM_LABEL_FAVORITES:
+      case MENU_ENUM_LABEL_DOWNLOADED_FILE_DETECT_CORE_LIST:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FOLDER];
+      case MENU_ENUM_LABEL_FILE_DETECT_CORE_LIST_PUSH_DIR:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RDB];
+
+
+      /* Menu collection submenus*/
+      case MENU_ENUM_LABEL_CONTENT_COLLECTION_LIST:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ZIP];
+      case MENU_ENUM_LABEL_GOTO_FAVORITES:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FAVORITE];
+      case MENU_ENUM_LABEL_GOTO_IMAGES:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_IMAGE];
+      case MENU_ENUM_LABEL_GOTO_VIDEO:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_MOVIE];
+      case MENU_ENUM_LABEL_GOTO_MUSIC:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_MUSIC];
+
+      /* Menu icons */
+      case MENU_ENUM_LABEL_CONTENT_SETTINGS:
+      case MENU_ENUM_LABEL_UPDATE_ASSETS:
+      case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME:
+      case MENU_ENUM_LABEL_REMAP_FILE_SAVE_GAME:
+      case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_QUICKMENU];
+      case MENU_ENUM_LABEL_START_CORE:
+      case MENU_ENUM_LABEL_CHEAT_START_OR_CONT:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RUN];
+      case MENU_ENUM_LABEL_CORE_LIST:
+      case MENU_ENUM_LABEL_CORE_SETTINGS:
+      case MENU_ENUM_LABEL_CORE_UPDATER_LIST:
+      case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE:
+      case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE:
+      case MENU_ENUM_LABEL_REMAP_FILE_SAVE_CORE:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE];
+      case MENU_ENUM_LABEL_LOAD_CONTENT_LIST:
+      case MENU_ENUM_LABEL_SCAN_FILE:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FILE];
+      case MENU_ENUM_LABEL_ONLINE_UPDATER:
+      case MENU_ENUM_LABEL_UPDATER_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_UPDATER];
+      case MENU_ENUM_LABEL_UPDATE_LAKKA:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_MAIN_MENU];
+      case MENU_ENUM_LABEL_UPDATE_CHEATS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CHEAT_OPTIONS];
+      case MENU_ENUM_LABEL_THUMBNAILS_UPDATER_LIST:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_IMAGE];
+      case MENU_ENUM_LABEL_UPDATE_OVERLAYS:
+      case MENU_ENUM_LABEL_ONSCREEN_OVERLAY_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_OVERLAY];
+      case MENU_ENUM_LABEL_UPDATE_CG_SHADERS:
+      case MENU_ENUM_LABEL_UPDATE_GLSL_SHADERS:
+      case MENU_ENUM_LABEL_UPDATE_SLANG_SHADERS:
+      case MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE:
+      case MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SHADER_OPTIONS];
+      case MENU_ENUM_LABEL_INFORMATION:
+      case MENU_ENUM_LABEL_INFORMATION_LIST:
+      case MENU_ENUM_LABEL_SYSTEM_INFORMATION:
+      case MENU_ENUM_LABEL_UPDATE_CORE_INFO_FILES:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INFO];
+      case MENU_ENUM_LABEL_UPDATE_DATABASES:
+      case MENU_ENUM_LABEL_DATABASE_MANAGER_LIST:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RDB];
+      case MENU_ENUM_LABEL_CURSOR_MANAGER_LIST:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CURSOR];
+      case MENU_ENUM_LABEL_HELP_LIST:
+      case MENU_ENUM_LABEL_HELP_CONTROLS:
+      case MENU_ENUM_LABEL_HELP_LOADING_CONTENT:
+      case MENU_ENUM_LABEL_HELP_SCANNING_CONTENT:
+      case MENU_ENUM_LABEL_HELP_WHAT_IS_A_CORE:
+      case MENU_ENUM_LABEL_HELP_CHANGE_VIRTUAL_GAMEPAD:
+      case MENU_ENUM_LABEL_HELP_AUDIO_VIDEO_TROUBLESHOOTING:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_HELP];
+      case MENU_ENUM_LABEL_QUIT_RETROARCH:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_EXIT];
+      /* Settings icons*/
+      case MENU_ENUM_LABEL_DRIVER_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_DRIVERS];
+      case MENU_ENUM_LABEL_VIDEO_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_VIDEO];
+      case MENU_ENUM_LABEL_AUDIO_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_AUDIO];
+      case MENU_ENUM_LABEL_AUDIO_MIXER_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_MIXER];
+      case MENU_ENUM_LABEL_INPUT_SETTINGS:
+      case MENU_ENUM_LABEL_UPDATE_AUTOCONFIG_PROFILES:
+      case MENU_ENUM_LABEL_INPUT_USER_1_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_2_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_3_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_4_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_5_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_6_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_7_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_8_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_9_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_10_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_11_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_12_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_13_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_14_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_15_BINDS:
+      case MENU_ENUM_LABEL_INPUT_USER_16_BINDS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SETTINGS];
+      case MENU_ENUM_LABEL_LATENCY_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_LATENCY];
+      case MENU_ENUM_LABEL_SAVING_SETTINGS:
+      case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG:
+      case MENU_ENUM_LABEL_SAVE_NEW_CONFIG:
+      case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT:
+      case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS:
+      case MENU_ENUM_LABEL_CHEAT_FILE_SAVE_AS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SAVING];
+      case MENU_ENUM_LABEL_LOGGING_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_LOG];
+      case MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FRAMESKIP];
+      case MENU_ENUM_LABEL_QUICK_MENU_START_RECORDING:
+      case MENU_ENUM_LABEL_RECORDING_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RECORD];
+      case MENU_ENUM_LABEL_QUICK_MENU_START_STREAMING:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_STREAM];
+      case MENU_ENUM_LABEL_QUICK_MENU_STOP_STREAMING:
+      case MENU_ENUM_LABEL_QUICK_MENU_STOP_RECORDING:
+      case MENU_ENUM_LABEL_CHEAT_DELETE_ALL:
+      case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_CORE:
+      case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_GAME:
+      case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_CONTENT_DIR:
+      case MENU_ENUM_LABEL_CORE_DELETE:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CLOSE];
+      case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_OSD];
+      case MENU_ENUM_LABEL_SHOW_WIMP:
+      case MENU_ENUM_LABEL_USER_INTERFACE_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_UI];
+#ifdef HAVE_LAKKA_SWITCH
+      case MENU_ENUM_LABEL_SWITCH_GPU_PROFILE:
+      case MENU_ENUM_LABEL_SWITCH_CPU_PROFILE:
+#endif
+      case MENU_ENUM_LABEL_POWER_MANAGEMENT_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_POWER];
+      case MENU_ENUM_LABEL_RETRO_ACHIEVEMENTS_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ACHIEVEMENTS];
+      case MENU_ENUM_LABEL_NETWORK_INFORMATION:
+      case MENU_ENUM_LABEL_NETWORK_SETTINGS:
+      case MENU_ENUM_LABEL_WIFI_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_NETWORK];
+      case MENU_ENUM_LABEL_PLAYLIST_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_PLAYLIST];
+      case MENU_ENUM_LABEL_USER_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_USER];
+      case MENU_ENUM_LABEL_DIRECTORY_SETTINGS:
+      case MENU_ENUM_LABEL_SCAN_DIRECTORY:
+      case MENU_ENUM_LABEL_REMAP_FILE_SAVE_CONTENT_DIR:
+      case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR:
+      case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FOLDER];
+      case MENU_ENUM_LABEL_PRIVACY_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_PRIVACY];
+
+      case MENU_ENUM_LABEL_REWIND_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_REWIND];
+      case MENU_ENUM_LABEL_QUICK_MENU_OVERRIDE_OPTIONS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_OVERRIDE];
+      case MENU_ENUM_LABEL_ONSCREEN_NOTIFICATIONS_SETTINGS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_NOTIFICATIONS];
+#ifdef HAVE_NETWORKING
+      case MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RUN];
+      case MENU_ENUM_LABEL_NETPLAY_DISCONNECT:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CLOSE];
+      case MENU_ENUM_LABEL_NETPLAY_ENABLE_CLIENT:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ROOM];
+      case MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RELOAD];
+#endif
+      case MENU_ENUM_LABEL_REBOOT:
+      case MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG:
+      case MENU_ENUM_LABEL_CHEAT_RELOAD_CHEATS:
+      case MENU_ENUM_LABEL_RESTART_RETROARCH:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RELOAD];
+      case MENU_ENUM_LABEL_SHUTDOWN:
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SHUTDOWN];
+      case MENU_ENUM_LABEL_CONFIGURATIONS:
+      case MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS:
+      case MENU_ENUM_LABEL_REMAP_FILE_LOAD:
+      case MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE:
+      case MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE:
+      case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET:
+      case MENU_ENUM_LABEL_CHEAT_FILE_LOAD:
+      case MENU_ENUM_LABEL_CHEAT_FILE_LOAD_APPEND:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_LOADSTATE];
+      case MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES:
+      case MENU_ENUM_LABEL_SHADER_APPLY_CHANGES:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CHECKMARK];
+      default:
+            break;
+   }
+
+   switch(type)
+   {
+      case FILE_TYPE_DIRECTORY:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FOLDER];
+      case FILE_TYPE_PLAIN:
+      case FILE_TYPE_IN_CARCHIVE:
+      case FILE_TYPE_RPL_ENTRY:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FILE];
+      case FILE_TYPE_SHADER:
+      case FILE_TYPE_SHADER_PRESET:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SHADER_OPTIONS];
+      case FILE_TYPE_CARCHIVE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ZIP];
+      case FILE_TYPE_MUSIC:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_MUSIC];
+      case FILE_TYPE_IMAGE:
+      case FILE_TYPE_IMAGEVIEWER:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_IMAGE];
+      case FILE_TYPE_MOVIE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_MOVIE];
+      case FILE_TYPE_CORE:
+      case FILE_TYPE_DIRECT_LOAD:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE];
+      case FILE_TYPE_RDB:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RDB];
+      case FILE_TYPE_CURSOR:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CURSOR];
+      case FILE_TYPE_PLAYLIST_ENTRY:
+      case MENU_SETTING_ACTION_RUN:
+      case MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RUN];
+      case MENU_SETTING_ACTION_CLOSE:
+      case MENU_SETTING_ACTION_DELETE_ENTRY:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CLOSE];
+      case MENU_SETTING_ACTION_SAVESTATE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SAVESTATE];
+      case MENU_SETTING_ACTION_LOADSTATE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_LOADSTATE];
+      case FILE_TYPE_RDB_ENTRY:
+      case MENU_SETTING_ACTION_CORE_INFORMATION:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO];
+      case MENU_SETTING_ACTION_CORE_OPTIONS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE_OPTIONS];
+      case MENU_SETTING_ACTION_CORE_INPUT_REMAPPING_OPTIONS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_REMAPPING_OPTIONS];
+      case MENU_SETTING_ACTION_CORE_CHEAT_OPTIONS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CHEAT_OPTIONS];
+      case MENU_SETTING_ACTION_CORE_DISK_OPTIONS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_DISK_OPTIONS];
+      case MENU_SETTING_ACTION_CORE_SHADER_OPTIONS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SHADER_OPTIONS];
+      case MENU_SETTING_ACTION_SCREENSHOT:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SCREENSHOT];
+      case MENU_SETTING_ACTION_RESET:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RELOAD];
+      case MENU_SETTING_ACTION_PAUSE_ACHIEVEMENTS:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RESUME];
+
+      case MENU_SETTING_GROUP:
+#ifdef HAVE_LAKKA_SWITCH
+      case MENU_SET_SWITCH_BRIGHTNESS:
+#endif
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SETTING];
+      case MENU_INFO_MESSAGE:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO];
+      case MENU_WIFI:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_WIFI];
+#ifdef HAVE_NETWORKING
+      case MENU_ROOM:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ROOM];
+      case MENU_ROOM_LAN:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ROOM_LAN];
+      case MENU_ROOM_RELAY:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ROOM_RELAY];
+#endif
+      case MENU_SETTING_ACTION:
+         return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SETTING];
+   }
+
+#ifdef HAVE_CHEEVOS
+   if (
+         (type >= MENU_SETTINGS_CHEEVOS_START) &&
+         (type < MENU_SETTINGS_NETPLAY_ROOMS_START)
+      )
+   {
+      int new_id = type - MENU_SETTINGS_CHEEVOS_START;
+      if (get_badge_texture(new_id) != 0)
+         return get_badge_texture(new_id);
+      /* Should be replaced with placeholder badge icon. */
+      return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_ACHIEVEMENTS];
+   }
+#endif
+
+   if (
+         (type >= MENU_SETTINGS_INPUT_BEGIN) &&
+         (type <= MENU_SETTINGS_INPUT_DESC_END)
+      )
+      {
+         unsigned input_id;
+         if (type < MENU_SETTINGS_INPUT_DESC_BEGIN)
+         {
+            input_id = MENU_SETTINGS_INPUT_BEGIN;
+            if ( type == input_id + 2)
+               return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SETTINGS];
+            if ( type == input_id + 4)
+               return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RELOAD];
+            if ( type == input_id + 5)
+               return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SAVING];
+            input_id = input_id + 7;
+         }
+         else
+         {
+            input_id = MENU_SETTINGS_INPUT_DESC_BEGIN;
+            while (type > (input_id + 23))
+            {
+               input_id = (input_id + 24) ;
+            }
+         }
+         if ( type == input_id )
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_D];
+         if ( type == (input_id + 1))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_L];
+         if ( type == (input_id + 2))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SELECT];
+         if ( type == (input_id + 3))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_START];
+         if ( type == (input_id + 4))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_U];
+         if ( type == (input_id + 5))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_D];
+         if ( type == (input_id + 6))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_L];
+         if ( type == (input_id + 7))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_R];
+         if ( type == (input_id + 8))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_R];
+         if ( type == (input_id + 9))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_U];
+         if ( type == (input_id + 10))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LB];
+         if ( type == (input_id + 11))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RB];
+         if ( type == (input_id + 12))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LT];
+         if ( type == (input_id + 13))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RT];
+         if ( type == (input_id + 14))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_P];
+         if ( type == (input_id + 15))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_P];
+         if ( type == (input_id + 16))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_R];
+         if ( type == (input_id + 17))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_L];
+         if ( type == (input_id + 18))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_D];
+         if ( type == (input_id + 19))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_U];
+         if ( type == (input_id + 20))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_R];
+         if ( type == (input_id + 21))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_L];
+         if ( type == (input_id + 22))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_D];
+         if ( type == (input_id + 23))
+            return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_U];
+      }
+   return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SUBSETTING];
+}
+
+const char *ozone_entries_icon_texture_path(ozone_handle_t *ozone, unsigned id)
+{
+   char icon_fullpath[255];
+   char *icon_name         = NULL;
+
+switch (id)
+   {
+      case OZONE_ENTRIES_ICONS_TEXTURE_MAIN_MENU:
+#if defined(HAVE_LAKKA)
+         icon_name = "lakka.png";
+         break;
+#else
+         icon_name = "retroarch.png";
+         break;
+#endif
+      case OZONE_ENTRIES_ICONS_TEXTURE_SETTINGS:
+         icon_name = "settings.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_HISTORY:
+         icon_name = "history.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_FAVORITES:
+         icon_name = "favorites.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_ADD_FAVORITE:
+         icon_name = "add-favorite.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_MUSICS:
+         icon_name = "musics.png";
+         break;
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
+      case OZONE_ENTRIES_ICONS_TEXTURE_MOVIES:
+         icon_name = "movies.png";
+         break;
+#endif
+#ifdef HAVE_IMAGEVIEWER
+      case OZONE_ENTRIES_ICONS_TEXTURE_IMAGES:
+         icon_name = "images.png";
+         break;
+#endif
+      case OZONE_ENTRIES_ICONS_TEXTURE_SETTING:
+         icon_name = "setting.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_SUBSETTING:
+         icon_name = "subsetting.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_ARROW:
+         icon_name = "arrow.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_RUN:
+         icon_name = "run.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_CLOSE:
+         icon_name = "close.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_RESUME:
+         icon_name = "resume.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_CLOCK:
+         icon_name = "clock.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_FULL:
+         icon_name = "battery-full.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_CHARGING:
+         icon_name = "battery-charging.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_POINTER:
+         icon_name = "pointer.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_SAVESTATE:
+         icon_name = "savestate.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_LOADSTATE:
+         icon_name = "loadstate.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_UNDO:
+         icon_name = "undo.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO:
+         icon_name = "core-infos.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_WIFI:
+         icon_name = "wifi.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_CORE_OPTIONS:
+         icon_name = "core-options.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_REMAPPING_OPTIONS:
+         icon_name = "core-input-remapping-options.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_CHEAT_OPTIONS:
+         icon_name = "core-cheat-options.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_DISK_OPTIONS:
+         icon_name = "core-disk-options.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_SHADER_OPTIONS:
+         icon_name = "core-shader-options.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_ACHIEVEMENT_LIST:
+         icon_name = "achievement-list.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_SCREENSHOT:
+         icon_name = "screenshot.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_RELOAD:
+         icon_name = "reload.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_RENAME:
+         icon_name = "rename.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_FILE:
+         icon_name = "file.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_FOLDER:
+         icon_name = "folder.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_ZIP:
+         icon_name = "zip.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_MUSIC:
+         icon_name = "music.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_FAVORITE:
+         icon_name = "favorites-content.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_IMAGE:
+         icon_name = "image.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_MOVIE:
+         icon_name = "movie.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_CORE:
+         icon_name = "core.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_RDB:
+         icon_name = "database.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_CURSOR:
+         icon_name = "cursor.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_SWITCH_ON:
+         icon_name = "on.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_SWITCH_OFF:
+         icon_name = "off.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_ADD:
+         icon_name = "add.png";
+         break;
+#ifdef HAVE_NETWORKING
+      case OZONE_ENTRIES_ICONS_TEXTURE_NETPLAY:
+         icon_name = "netplay.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_ROOM:
+         icon_name = "menu_room.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_ROOM_LAN:
+         icon_name = "menu_room_lan.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_ROOM_RELAY:
+         icon_name = "menu_room_relay.png";
+         break;
+#endif
+      case OZONE_ENTRIES_ICONS_TEXTURE_KEY:
+         icon_name = "key.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_KEY_HOVER:
+         icon_name = "key-hover.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_DIALOG_SLICE:
+         icon_name = "dialog-slice.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_ACHIEVEMENTS:
+         icon_name = "menu_achievements.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_AUDIO:
+         icon_name = "menu_audio.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_DRIVERS:
+         icon_name = "menu_drivers.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_EXIT:
+         icon_name = "menu_exit.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_FRAMESKIP:
+         icon_name = "menu_frameskip.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_HELP:
+         icon_name = "menu_help.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INFO:
+         icon_name = "menu_info.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SETTINGS:
+         icon_name = "Libretro - Pad.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_LATENCY:
+         icon_name = "menu_latency.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_NETWORK:
+         icon_name = "menu_network.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_POWER:
+         icon_name = "menu_power.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_RECORD:
+         icon_name = "menu_record.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_SAVING:
+         icon_name = "menu_saving.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_UPDATER:
+         icon_name = "menu_updater.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_VIDEO:
+         icon_name = "menu_video.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_MIXER:
+         icon_name = "menu_mixer.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_LOG:
+         icon_name = "menu_log.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_OSD:
+         icon_name = "menu_osd.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_UI:
+         icon_name = "menu_ui.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_USER:
+         icon_name = "menu_user.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_PRIVACY:
+         icon_name = "menu_privacy.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_PLAYLIST:
+         icon_name = "menu_playlist.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_QUICKMENU:
+         icon_name = "menu_quickmenu.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_REWIND:
+         icon_name = "menu_rewind.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_OVERLAY:
+         icon_name = "menu_overlay.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_OVERRIDE:
+         icon_name = "menu_override.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_NOTIFICATIONS:
+         icon_name = "menu_notifications.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_STREAM:
+         icon_name = "menu_stream.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_SHUTDOWN:
+         icon_name = "menu_shutdown.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_U:
+         icon_name = "input_DPAD-U.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_D:
+         icon_name = "input_DPAD-D.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_L:
+         icon_name = "input_DPAD-L.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_R:
+         icon_name = "input_DPAD-R.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_U:
+         icon_name = "input_STCK-U.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_D:
+         icon_name = "input_STCK-D.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_L:
+         icon_name = "input_STCK-L.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_R:
+         icon_name = "input_STCK-R.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_P:
+         icon_name = "input_STCK-P.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_U:
+         icon_name = "input_BTN-U.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_D:
+         icon_name = "input_BTN-D.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_L:
+         icon_name = "input_BTN-L.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_R:
+         icon_name = "input_BTN-R.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LB:
+         icon_name = "input_LB.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RB:
+         icon_name = "input_RB.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LT:
+         icon_name = "input_LT.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RT:
+         icon_name = "input_RT.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SELECT:
+         icon_name = "input_SELECT.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_INPUT_START:
+         icon_name = "input_START.png";
+         break;
+      case OZONE_ENTRIES_ICONS_TEXTURE_CHECKMARK:
+         icon_name = "menu_check.png";
+         break;
+   }
+
+   fill_pathname_join(
+      icon_fullpath,
+      ozone->icons_path,
+      icon_name,
+      sizeof(icon_fullpath)
+   );
+
+   if (!filestream_exists(icon_fullpath))
+   {
+      return "subsetting.png";
+   }
+   else
+      return  icon_name;
+}
+
+void ozone_unload_theme_textures(ozone_handle_t *ozone)
+{
+   int i;
+   int j;
+
+   for (j = 0; j < ozone_themes_count; j++)
+   {
+      ozone_theme_t *theme = ozone_themes[j];
+      for (i = 0; i < OZONE_THEME_TEXTURE_LAST; i++)
+            video_driver_texture_unload(&theme->textures[i]);
+   }
+}
+
+bool ozone_reset_theme_textures(ozone_handle_t *ozone)
+{
+   int i;
+   int j;
+   char theme_path[255];
+   bool result = true;
+
+   for (j = 0; j < ozone_themes_count; j++)
+   {
+      ozone_theme_t *theme = ozone_themes[j];
+
+      fill_pathname_join(
+         theme_path,
+         ozone->png_path,
+         theme->name,
+         sizeof(theme_path)
+      );
+
+      for (i = 0; i < OZONE_THEME_TEXTURE_LAST; i++)
+      {
+         char filename[PATH_MAX_LENGTH];
+         strlcpy(filename, OZONE_THEME_TEXTURES_FILES[i], sizeof(filename));
+         strlcat(filename, ".png", sizeof(filename));
+
+         if (!menu_display_reset_textures_list(filename, theme_path, &theme->textures[i], TEXTURE_FILTER_MIPMAP_LINEAR))
+            result = false;
+      }
+   }
+
+   return result;
+}
\ No newline at end of file
diff --git a/menu/drivers/ozone/ozone_texture.h b/menu/drivers/ozone/ozone_texture.h
new file mode 100644
index 0000000000..0ef5828667
--- /dev/null
+++ b/menu/drivers/ozone/ozone_texture.h
@@ -0,0 +1,207 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2017 - Jean-André Santoni
+ *  Copyright (C) 2016-2017 - Brad Parker
+ *  Copyright (C) 2018      - Alfredo Monclús
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _OZONE_TEXTURE_H
+#define _OZONE_TEXTURE_H
+
+#include "ozone.h"
+#include "ozone_texture.h"
+
+#include "../../menu_driver.h"
+
+enum OZONE_TEXTURE {
+   OZONE_TEXTURE_RETROARCH = 0,
+   OZONE_TEXTURE_CURSOR_BORDER,
+
+   OZONE_TEXTURE_LAST
+};
+
+static char *OZONE_TEXTURES_FILES[OZONE_TEXTURE_LAST] = {
+   "retroarch",
+   "cursor_border"
+};
+
+enum OZONE_THEME_TEXTURES {
+   OZONE_THEME_TEXTURE_BUTTON_A = 0,
+   OZONE_THEME_TEXTURE_BUTTON_B,
+   OZONE_THEME_TEXTURE_SWITCH,
+   OZONE_THEME_TEXTURE_CHECK,
+
+   OZONE_THEME_TEXTURE_CURSOR_NO_BORDER,
+   OZONE_THEME_TEXTURE_CURSOR_STATIC,
+
+   OZONE_THEME_TEXTURE_LAST
+};
+
+static char *OZONE_THEME_TEXTURES_FILES[OZONE_THEME_TEXTURE_LAST] = {
+   "button_a",
+   "button_b",
+   "switch",
+   "check",
+   "cursor_noborder",
+   "cursor_static"
+};
+
+enum OZONE_TAB_TEXTURES {
+   OZONE_TAB_TEXTURE_MAIN_MENU = 0,
+   OZONE_TAB_TEXTURE_SETTINGS,
+   OZONE_TAB_TEXTURE_HISTORY,
+   OZONE_TAB_TEXTURE_FAVORITES,
+   OZONE_TAB_TEXTURE_MUSIC,
+   OZONE_TAB_TEXTURE_VIDEO,
+   OZONE_TAB_TEXTURE_IMAGE,
+   OZONE_TAB_TEXTURE_NETWORK,
+   OZONE_TAB_TEXTURE_SCAN_CONTENT,
+
+   OZONE_TAB_TEXTURE_LAST
+};
+
+static char *OZONE_TAB_TEXTURES_FILES[OZONE_TAB_TEXTURE_LAST] = {
+   "retroarch",
+   "settings",
+   "history",
+   "favorites",
+   "music",
+   "video",
+   "image",
+   "netplay",
+   "add"
+};
+
+enum
+{
+   OZONE_ENTRIES_ICONS_TEXTURE_MAIN_MENU = 0,
+   OZONE_ENTRIES_ICONS_TEXTURE_SETTINGS,
+   OZONE_ENTRIES_ICONS_TEXTURE_HISTORY,
+   OZONE_ENTRIES_ICONS_TEXTURE_FAVORITES,
+   OZONE_ENTRIES_ICONS_TEXTURE_MUSICS,
+#if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
+   OZONE_ENTRIES_ICONS_TEXTURE_MOVIES,
+#endif
+#ifdef HAVE_NETWORKING
+   OZONE_ENTRIES_ICONS_TEXTURE_NETPLAY,
+   OZONE_ENTRIES_ICONS_TEXTURE_ROOM,
+   OZONE_ENTRIES_ICONS_TEXTURE_ROOM_LAN,
+   OZONE_ENTRIES_ICONS_TEXTURE_ROOM_RELAY,
+#endif
+#ifdef HAVE_IMAGEVIEWER
+   OZONE_ENTRIES_ICONS_TEXTURE_IMAGES,
+#endif
+   OZONE_ENTRIES_ICONS_TEXTURE_SETTING,
+   OZONE_ENTRIES_ICONS_TEXTURE_SUBSETTING,
+   OZONE_ENTRIES_ICONS_TEXTURE_ARROW,
+   OZONE_ENTRIES_ICONS_TEXTURE_RUN,
+   OZONE_ENTRIES_ICONS_TEXTURE_CLOSE,
+   OZONE_ENTRIES_ICONS_TEXTURE_RESUME,
+   OZONE_ENTRIES_ICONS_TEXTURE_SAVESTATE,
+   OZONE_ENTRIES_ICONS_TEXTURE_LOADSTATE,
+   OZONE_ENTRIES_ICONS_TEXTURE_UNDO,
+   OZONE_ENTRIES_ICONS_TEXTURE_CORE_INFO,
+   OZONE_ENTRIES_ICONS_TEXTURE_WIFI,
+   OZONE_ENTRIES_ICONS_TEXTURE_CORE_OPTIONS,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_REMAPPING_OPTIONS,
+   OZONE_ENTRIES_ICONS_TEXTURE_CHEAT_OPTIONS,
+   OZONE_ENTRIES_ICONS_TEXTURE_DISK_OPTIONS,
+   OZONE_ENTRIES_ICONS_TEXTURE_SHADER_OPTIONS,
+   OZONE_ENTRIES_ICONS_TEXTURE_ACHIEVEMENT_LIST,
+   OZONE_ENTRIES_ICONS_TEXTURE_SCREENSHOT,
+   OZONE_ENTRIES_ICONS_TEXTURE_RELOAD,
+   OZONE_ENTRIES_ICONS_TEXTURE_RENAME,
+   OZONE_ENTRIES_ICONS_TEXTURE_FILE,
+   OZONE_ENTRIES_ICONS_TEXTURE_FOLDER,
+   OZONE_ENTRIES_ICONS_TEXTURE_ZIP,
+   OZONE_ENTRIES_ICONS_TEXTURE_FAVORITE,
+   OZONE_ENTRIES_ICONS_TEXTURE_ADD_FAVORITE,
+   OZONE_ENTRIES_ICONS_TEXTURE_MUSIC,
+   OZONE_ENTRIES_ICONS_TEXTURE_IMAGE,
+   OZONE_ENTRIES_ICONS_TEXTURE_MOVIE,
+   OZONE_ENTRIES_ICONS_TEXTURE_CORE,
+   OZONE_ENTRIES_ICONS_TEXTURE_RDB,
+   OZONE_ENTRIES_ICONS_TEXTURE_CURSOR,
+   OZONE_ENTRIES_ICONS_TEXTURE_SWITCH_ON,
+   OZONE_ENTRIES_ICONS_TEXTURE_SWITCH_OFF,
+   OZONE_ENTRIES_ICONS_TEXTURE_CLOCK,
+   OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_FULL,
+   OZONE_ENTRIES_ICONS_TEXTURE_BATTERY_CHARGING,
+   OZONE_ENTRIES_ICONS_TEXTURE_POINTER,
+   OZONE_ENTRIES_ICONS_TEXTURE_ADD,
+   OZONE_ENTRIES_ICONS_TEXTURE_KEY,
+   OZONE_ENTRIES_ICONS_TEXTURE_KEY_HOVER,
+   OZONE_ENTRIES_ICONS_TEXTURE_DIALOG_SLICE,
+   OZONE_ENTRIES_ICONS_TEXTURE_ACHIEVEMENTS,
+   OZONE_ENTRIES_ICONS_TEXTURE_AUDIO,
+   OZONE_ENTRIES_ICONS_TEXTURE_EXIT,
+   OZONE_ENTRIES_ICONS_TEXTURE_FRAMESKIP,
+   OZONE_ENTRIES_ICONS_TEXTURE_INFO,
+   OZONE_ENTRIES_ICONS_TEXTURE_HELP,
+   OZONE_ENTRIES_ICONS_TEXTURE_NETWORK,
+   OZONE_ENTRIES_ICONS_TEXTURE_POWER,
+   OZONE_ENTRIES_ICONS_TEXTURE_SAVING,
+   OZONE_ENTRIES_ICONS_TEXTURE_UPDATER,
+   OZONE_ENTRIES_ICONS_TEXTURE_VIDEO,
+   OZONE_ENTRIES_ICONS_TEXTURE_RECORD,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SETTINGS,
+   OZONE_ENTRIES_ICONS_TEXTURE_MIXER,
+   OZONE_ENTRIES_ICONS_TEXTURE_LOG,
+   OZONE_ENTRIES_ICONS_TEXTURE_OSD,
+   OZONE_ENTRIES_ICONS_TEXTURE_UI,
+   OZONE_ENTRIES_ICONS_TEXTURE_USER,
+   OZONE_ENTRIES_ICONS_TEXTURE_PRIVACY,
+   OZONE_ENTRIES_ICONS_TEXTURE_LATENCY,
+   OZONE_ENTRIES_ICONS_TEXTURE_DRIVERS,
+   OZONE_ENTRIES_ICONS_TEXTURE_PLAYLIST,
+   OZONE_ENTRIES_ICONS_TEXTURE_QUICKMENU,
+   OZONE_ENTRIES_ICONS_TEXTURE_REWIND,
+   OZONE_ENTRIES_ICONS_TEXTURE_OVERLAY,
+   OZONE_ENTRIES_ICONS_TEXTURE_OVERRIDE,
+   OZONE_ENTRIES_ICONS_TEXTURE_NOTIFICATIONS,
+   OZONE_ENTRIES_ICONS_TEXTURE_STREAM,
+   OZONE_ENTRIES_ICONS_TEXTURE_SHUTDOWN,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_U,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_D,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_L,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_DPAD_R,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_U,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_D,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_L,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_R,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_STCK_P,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SELECT,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_START,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_U,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_D,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_L,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_BTN_R,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LB,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RB,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_LT,
+   OZONE_ENTRIES_ICONS_TEXTURE_INPUT_RT,
+   OZONE_ENTRIES_ICONS_TEXTURE_CHECKMARK,
+   OZONE_ENTRIES_ICONS_TEXTURE_LAST
+};
+
+const char *ozone_entries_icon_texture_path(ozone_handle_t *ozone, unsigned id);
+
+menu_texture_item ozone_entries_icon_get_texture(ozone_handle_t *ozone,
+      enum msg_hash_enums enum_idx, unsigned type, bool active);
+
+bool ozone_reset_theme_textures(ozone_handle_t *ozone);
+void ozone_unload_theme_textures(ozone_handle_t *ozone);
+
+#endif
\ No newline at end of file
diff --git a/menu/drivers/ozone/ozone_theme.c b/menu/drivers/ozone/ozone_theme.c
new file mode 100644
index 0000000000..fa9478fa82
--- /dev/null
+++ b/menu/drivers/ozone/ozone_theme.c
@@ -0,0 +1,136 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2018 - Daniel De Matteis
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "ozone.h"
+#include "ozone_theme.h"
+#include "ozone_display.h"
+
+ozone_theme_t ozone_theme_light = {
+   COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00),
+   ozone_background_libretro_running_light,
+
+   COLOR_HEX_TO_FLOAT(0x2B2B2B, 1.00),
+   COLOR_HEX_TO_FLOAT(0x333333, 1.00),
+   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00),
+   COLOR_HEX_TO_FLOAT(0x10BEC5, 1.00),
+   COLOR_HEX_TO_FLOAT(0xCDCDCD, 1.00),
+   COLOR_HEX_TO_FLOAT(0x333333, 1.00),
+   COLOR_HEX_TO_FLOAT(0x374CFF, 1.00),
+   COLOR_HEX_TO_FLOAT(0xF0F0F0, 1.00),
+
+   0x333333FF,
+   0x374CFFFF,
+   0x878787FF,
+
+   ozone_sidebar_background_light,
+   ozone_sidebar_gradient_top_light,
+   ozone_sidebar_gradient_bottom_light,
+
+   ozone_border_0_light,
+   ozone_border_1_light,
+
+   {0},
+
+   "light"
+};
+
+ozone_theme_t ozone_theme_dark = {
+   COLOR_HEX_TO_FLOAT(0x2D2D2D, 1.00),
+   ozone_background_libretro_running_dark,
+
+   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00),
+   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00),
+   COLOR_HEX_TO_FLOAT(0x212227, 1.00),
+   COLOR_HEX_TO_FLOAT(0x2DA3CB, 1.00),
+   COLOR_HEX_TO_FLOAT(0x51514F, 1.00),
+   COLOR_HEX_TO_FLOAT(0xFFFFFF, 1.00),
+   COLOR_HEX_TO_FLOAT(0x00D9AE, 1.00),
+   COLOR_HEX_TO_FLOAT(0x464646, 1.00),
+
+   0xFFFFFFFF,
+   0x00FFC5FF,
+   0x9F9FA1FF,
+
+   ozone_sidebar_background_dark,
+   ozone_sidebar_gradient_top_dark,
+   ozone_sidebar_gradient_bottom_dark,
+
+   ozone_border_0_dark,
+   ozone_border_1_dark,
+
+   {0},
+
+   "dark"
+};
+
+ozone_theme_t *ozone_themes[] = {
+   &ozone_theme_light,
+   &ozone_theme_dark
+};
+
+unsigned ozone_themes_count                 = sizeof(ozone_themes) / sizeof(ozone_themes[0]);
+unsigned last_color_theme                   = 0;
+bool last_use_preferred_system_color_theme  = false;
+ozone_theme_t *ozone_default_theme          = &ozone_theme_light; /* also used as a tag for cursor animation */
+
+void ozone_set_color_theme(ozone_handle_t *ozone, unsigned color_theme)
+{
+   ozone_theme_t *theme = ozone_default_theme;
+
+   if (!ozone)
+      return;
+
+   switch (color_theme)
+   {
+      case 1:
+         theme = &ozone_theme_dark;
+         break;
+      case 0:
+      default:
+         break;
+   }
+
+   ozone->theme = theme;
+
+   memcpy(ozone->theme_dynamic.selection_border, ozone->theme->selection_border, sizeof(ozone->theme_dynamic.selection_border));
+   memcpy(ozone->theme_dynamic.selection, ozone->theme->selection, sizeof(ozone->theme_dynamic.selection));
+   memcpy(ozone->theme_dynamic.entries_border, ozone->theme->entries_border, sizeof(ozone->theme_dynamic.entries_border));
+   memcpy(ozone->theme_dynamic.entries_icon, ozone->theme->entries_icon, sizeof(ozone->theme_dynamic.entries_icon));
+   memcpy(ozone->theme_dynamic.entries_checkmark, ozone_pure_white, sizeof(ozone->theme_dynamic.entries_checkmark));
+   memcpy(ozone->theme_dynamic.cursor_alpha, ozone_pure_white, sizeof(ozone->theme_dynamic.cursor_alpha));
+   memcpy(ozone->theme_dynamic.message_background, ozone->theme->message_background, sizeof(ozone->theme_dynamic.message_background));
+
+   ozone_restart_cursor_animation(ozone);
+
+   last_color_theme = color_theme;
+}
+
+unsigned ozone_get_system_theme()
+{
+   unsigned ret = 0;
+#ifdef HAVE_LIBNX
+   if (R_SUCCEEDED(setsysInitialize())) 
+   {
+      ColorSetId theme;
+      setsysGetColorSetId(&theme);
+      ret = (theme == ColorSetId_Dark) ? 1 : 0;
+      setsysExit();
+   }
+
+   return ret;
+#endif
+   return 0;
+}
\ No newline at end of file
diff --git a/menu/drivers/ozone/ozone_theme.h b/menu/drivers/ozone/ozone_theme.h
new file mode 100644
index 0000000000..09425e0dac
--- /dev/null
+++ b/menu/drivers/ozone/ozone_theme.h
@@ -0,0 +1,171 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2018 - Daniel De Matteis
+ *  Copyright (C) 2018      - natinusala
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _OZONE_THEME_H
+#define _OZONE_THEME_H
+
+#include "ozone.h"
+#include "ozone_texture.h"
+
+#include "../../../retroarch.h"
+
+#define HEX_R(hex) ((hex >> 16) & 0xFF) * (1.0f / 255.0f)
+#define HEX_G(hex) ((hex >> 8 ) & 0xFF) * (1.0f / 255.0f)
+#define HEX_B(hex) ((hex >> 0 ) & 0xFF) * (1.0f / 255.0f)
+
+#define COLOR_HEX_TO_FLOAT(hex, alpha) { \
+   HEX_R(hex), HEX_G(hex), HEX_B(hex), alpha, \
+   HEX_R(hex), HEX_G(hex), HEX_B(hex), alpha, \
+   HEX_R(hex), HEX_G(hex), HEX_B(hex), alpha, \
+   HEX_R(hex), HEX_G(hex), HEX_B(hex), alpha  \
+}
+
+#define COLOR_TEXT_ALPHA(color, alpha) (color & 0xFFFFFF00) | alpha
+
+static float ozone_pure_white[16] = {
+      1.00, 1.00, 1.00, 1.00,
+      1.00, 1.00, 1.00, 1.00,
+      1.00, 1.00, 1.00, 1.00,
+      1.00, 1.00, 1.00, 1.00,
+};
+
+static float ozone_backdrop[16] = {
+      0.00, 0.00, 0.00, 0.75,
+      0.00, 0.00, 0.00, 0.75,
+      0.00, 0.00, 0.00, 0.75,
+      0.00, 0.00, 0.00, 0.75,
+};
+
+static float ozone_osk_backdrop[16] = {
+      0.00, 0.00, 0.00, 0.15,
+      0.00, 0.00, 0.00, 0.15,
+      0.00, 0.00, 0.00, 0.15,
+      0.00, 0.00, 0.00, 0.15,
+};
+
+static float ozone_sidebar_background_light[16] = {
+      0.94, 0.94, 0.94, 1.00,
+      0.94, 0.94, 0.94, 1.00,
+      0.94, 0.94, 0.94, 1.00,
+      0.94, 0.94, 0.94, 1.00,
+};
+
+static float ozone_sidebar_gradient_top_light[16] = {
+      0.94, 0.94, 0.94, 1.00,
+      0.94, 0.94, 0.94, 1.00,
+      0.922, 0.922, 0.922, 1.00,
+      0.922, 0.922, 0.922, 1.00,
+};
+
+static float ozone_sidebar_gradient_bottom_light[16] = {
+      0.922, 0.922, 0.922, 1.00,
+      0.922, 0.922, 0.922, 1.00,
+      0.94, 0.94, 0.94, 1.00,
+      0.94, 0.94, 0.94, 1.00,
+};
+
+static float ozone_sidebar_background_dark[16] = {
+      0.2, 0.2, 0.2, 1.00,
+      0.2, 0.2, 0.2, 1.00,
+      0.2, 0.2, 0.2, 1.00,
+      0.2, 0.2, 0.2, 1.00,
+};
+
+static float ozone_sidebar_gradient_top_dark[16] = {
+      0.2, 0.2, 0.2, 1.00,
+      0.2, 0.2, 0.2, 1.00,      
+      0.18, 0.18, 0.18, 1.00,
+      0.18, 0.18, 0.18, 1.00,
+};
+
+static float ozone_sidebar_gradient_bottom_dark[16] = {
+      0.18, 0.18, 0.18, 1.00,
+      0.18, 0.18, 0.18, 1.00,
+      0.2, 0.2, 0.2, 1.00,
+      0.2, 0.2, 0.2, 1.00,
+};
+
+static float ozone_border_0_light[16] = COLOR_HEX_TO_FLOAT(0x50EFD9, 1.00);
+static float ozone_border_1_light[16] = COLOR_HEX_TO_FLOAT(0x0DB6D5, 1.00);
+
+static float ozone_border_0_dark[16] = COLOR_HEX_TO_FLOAT(0x198AC6, 1.00);
+static float ozone_border_1_dark[16] = COLOR_HEX_TO_FLOAT(0x89F1F2, 1.00);
+
+static float ozone_background_libretro_running_light[16] = {
+   0.690, 0.690, 0.690, 0.75,
+   0.690, 0.690, 0.690, 0.75,
+   0.922, 0.922, 0.922, 1.0,
+   0.922, 0.922, 0.922, 1.0
+};
+
+static float ozone_background_libretro_running_dark[16] = {
+   0.176, 0.176, 0.176, 0.75,
+   0.176, 0.176, 0.176, 0.75,
+   0.178, 0.178, 0.178, 1.0,
+   0.178, 0.178, 0.178, 1.0,
+};
+
+typedef struct ozone_theme
+{
+   /* Background color */
+   float background[16];
+   float *background_libretro_running;
+
+   /* Float colors for quads and icons */
+   float header_footer_separator[16];
+   float text[16];
+   float selection[16];
+   float selection_border[16];
+   float entries_border[16];
+   float entries_icon[16];
+   float text_selected[16];
+   float message_background[16];
+
+   /* RGBA colors for text */
+   uint32_t text_rgba;
+   uint32_t text_selected_rgba;
+   uint32_t text_sublabel_rgba;
+
+   /* Sidebar color */
+   float *sidebar_background;
+   float *sidebar_top_gradient;
+   float *sidebar_bottom_gradient;
+
+   /* 
+      Fancy cursor colors
+   */
+   float *cursor_border_0;
+   float *cursor_border_1;
+
+   menu_texture_item textures[OZONE_THEME_TEXTURE_LAST];
+
+   const char *name;
+} ozone_theme_t;
+
+extern ozone_theme_t ozone_theme_light;
+extern ozone_theme_t ozone_theme_dark;
+
+extern ozone_theme_t *ozone_themes[];
+
+extern unsigned ozone_themes_count;
+extern unsigned last_color_theme;
+extern bool last_use_preferred_system_color_theme;
+extern ozone_theme_t *ozone_default_theme;
+
+void ozone_set_color_theme(ozone_handle_t *ozone, unsigned color_theme);
+unsigned ozone_get_system_theme();
+
+#endif
\ No newline at end of file
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 346be1ab5d..16e2996a9f 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -73,6 +73,10 @@ static uint16_t *rgui_framebuf_data      = NULL;
 #define HOVER_COLOR(settings)    ((3 << 0) | (10 << 4) | (3 << 8) | (7 << 12))
 #define NORMAL_COLOR(settings)   0x7FFF
 #define TITLE_COLOR(settings)    HOVER_COLOR(settings)
+#elif defined(PS2)
+#define HOVER_COLOR(settings)    0x03E0
+#define NORMAL_COLOR(settings)   0x7FFF
+#define TITLE_COLOR(settings)    HOVER_COLOR(settings)
 #else
 #define HOVER_COLOR(settings)    (argb32_to_rgba4444(settings->uints.menu_entry_hover_color))
 #define NORMAL_COLOR(settings)   (argb32_to_rgba4444(settings->uints.menu_entry_normal_color))
@@ -94,7 +98,9 @@ static uint16_t rgui_gray_filler(rgui_t *rgui, unsigned x, unsigned y)
    unsigned shft        = (rgui->bg_thickness ? 1 : 0);
    unsigned col         = (((x >> shft) + (y >> shft)) & 1) + 1;
 #if defined(GEKKO) || defined(PSP)
-   return (6 << 12) | (col << 8) | (col << 4) | (col << 0);
+      return (6 << 12) | (col << 8) | (col << 4) | (col << 0);
+#elif defined(PS2)
+      return (0 << 15) | (col << 12) | (col << 7) | (col << 2);
 #elif defined(HAVE_LIBNX) && !defined(HAVE_OPENGL)
    return (((31 * (54)) / 255) << 11) |
            (((63 * (54)) / 255) << 5) |
@@ -110,6 +116,8 @@ static uint16_t rgui_green_filler(rgui_t *rgui, unsigned x, unsigned y)
    unsigned col         = (((x >> shft) + (y >> shft)) & 1) + 1;
 #if defined(GEKKO) || defined(PSP)
    return (6 << 12) | (col << 8) | (col << 5) | (col << 0);
+#elif defined(PS2)
+   return (0 << 15) | (col << 12) | (col << 8) | (col << 2);
 #elif defined(HAVE_LIBNX) && !defined(HAVE_OPENGL)
     return (((31 * (54)) / 255) << 11) |
            (((63 * (109)) / 255) << 5) |
diff --git a/menu/drivers/stripes.c b/menu/drivers/stripes.c
index c466ed5599..be2abdd1e5 100755
--- a/menu/drivers/stripes.c
+++ b/menu/drivers/stripes.c
@@ -668,7 +668,7 @@ static void stripes_draw_text(
    menu_display_draw_text(font, str, x, y,
          width, height, color, text_align, scale_factor,
          video_info->xmb_shadows_enable,
-         stripes->shadow_offset);
+         stripes->shadow_offset, false);
 }
 
 static void stripes_messagebox(void *data, const char *message)
@@ -742,7 +742,7 @@ static void stripes_render_keyboard(
             width/2.0 - (11*ptr_width)/2.0 + (i % 11) * ptr_width + ptr_width/2.0,
             height/2.0 + ptr_height + line_y + stripes->font->size / 3,
             width, height, 0xffffffff, TEXT_ALIGN_CENTER, 1.0f,
-            false, 0);
+            false, 0, false);
    }
 }
 
@@ -778,7 +778,7 @@ static int stripes_osk_ptr_at_pos(void *data, int x, int y, unsigned width, unsi
 
 static void stripes_render_messagebox_internal(
       video_frame_info_t *video_info,
-      stripes_handle_t *stripes, const char *message, float* stripes_coord_white)
+      stripes_handle_t *stripes, const char *message)
 {
    unsigned i, y_position;
    int x, y, longest = 0, longest_width = 0;
@@ -831,7 +831,7 @@ static void stripes_render_messagebox_internal(
          longest_width + stripes->margins_dialog * 2,
          line_height * list->size + stripes->margins_dialog * 2,
          width, height,
-         &stripes_coord_white[0],
+         NULL,
          stripes->margins_slice, 1.0,
          stripes->textures.list[STRIPES_TEXTURE_DIALOG_SLICE]);
 
@@ -843,7 +843,7 @@ static void stripes_render_messagebox_internal(
          menu_display_draw_text(stripes->font, msg,
                x - longest_width/2.0,
                y + (i+0.75) * line_height,
-               width, height, 0x444444ff, TEXT_ALIGN_LEFT, 1.0f, false, 0);
+               width, height, 0x444444ff, TEXT_ALIGN_LEFT, 1.0f, false, 0, false);
    }
 
    if (menu_input_dialog_get_display_kb())
@@ -897,7 +897,7 @@ static void stripes_update_thumbnail_path(void *data, unsigned i, char pos)
    }
    else if (filebrowser_get_type() != FILEBROWSER_NONE)
    {
-      stripes->thumbnail              = 0;
+      video_driver_texture_unload(&stripes->thumbnail);
       goto end;
    }
 
@@ -921,7 +921,7 @@ static void stripes_update_thumbnail_path(void *data, unsigned i, char pos)
          }
          else
          {
-            stripes->left_thumbnail              = 0;
+            video_driver_texture_unload(&stripes->left_thumbnail);
             goto end;
          }
       }
@@ -1075,7 +1075,7 @@ static void stripes_update_thumbnail_image(void *data)
             task_push_image_load(stripes->thumbnail_file_path,
                   menu_display_handle_thumbnail_upload, NULL);
          else
-            stripes->thumbnail = 0;
+            video_driver_texture_unload(&stripes->thumbnail);
 
          free(stripes->thumbnail_file_path);
          stripes->thumbnail_file_path = NULL;
@@ -1087,7 +1087,7 @@ static void stripes_update_thumbnail_image(void *data)
             task_push_image_load(stripes->left_thumbnail_file_path,
                   menu_display_handle_left_thumbnail_upload, NULL);
          else
-            stripes->left_thumbnail = 0;
+            video_driver_texture_unload(&stripes->left_thumbnail);
 
          free(stripes->left_thumbnail_file_path);
          stripes->left_thumbnail_file_path = NULL;
@@ -1136,7 +1136,7 @@ static void stripes_update_savestate_thumbnail_image(void *data)
       task_push_image_load(stripes->savestate_thumbnail_file_path,
             menu_display_handle_savestate_thumbnail_upload, NULL);
    else
-      stripes->savestate_thumbnail = 0;
+      video_driver_texture_unload(&stripes->savestate_thumbnail);
 }
 
 static unsigned stripes_get_system_tab(stripes_handle_t *stripes, unsigned i)
@@ -1177,7 +1177,7 @@ static void stripes_selection_pointer_changed(
 
    tag       = (uintptr_t)selection_buf;
 
-   menu_animation_ctl(MENU_ANIMATION_CTL_KILL_BY_TAG, &tag);
+   menu_animation_kill_by_tag(&tag);
    menu_entries_ctl(MENU_ENTRIES_CTL_SET_START, &num);
 
    for (i = 0; i < end; i++)
@@ -2657,7 +2657,6 @@ static void stripes_draw_items(
 static void stripes_render(void *data, bool is_idle)
 {
    size_t i;
-   float delta_time;
    menu_animation_ctx_delta_t delta;
    settings_t   *settings   = config_get_ptr();
    stripes_handle_t *stripes        = (stripes_handle_t*)data;
@@ -2668,9 +2667,7 @@ static void stripes_render(void *data, bool is_idle)
    if (!stripes)
       return;
 
-   menu_animation_ctl(MENU_ANIMATION_CTL_DELTA_TIME, &delta_time);
-
-   delta.current = delta_time;
+   delta.current = menu_animation_get_delta_time();
 
    if (menu_animation_get_ideal_delta_time(&delta))
       menu_animation_update(delta.ideal);
@@ -3015,7 +3012,7 @@ static void stripes_frame(void *data, video_frame_info_t *video_info)
    {
       stripes_draw_dark_layer(stripes, video_info, width, height);
       stripes_render_messagebox_internal(
-            video_info, stripes, msg, &stripes_coord_white[0]);
+            video_info, stripes, msg);
    }
 
    /* Cursor image */
@@ -3830,7 +3827,7 @@ static void stripes_list_clear(file_list_t *list)
 {
    menu_animation_ctx_tag tag = (uintptr_t)list;
 
-   menu_animation_ctl(MENU_ANIMATION_CTL_KILL_BY_TAG, &tag);
+   menu_animation_kill_by_tag(&tag);
 
    stripes_free_list_nodes(list, false);
 }
@@ -3846,7 +3843,7 @@ static void stripes_list_deep_copy(const file_list_t *src, file_list_t *dst,
    size_t i, j = 0;
    menu_animation_ctx_tag tag = (uintptr_t)dst;
 
-   menu_animation_ctl(MENU_ANIMATION_CTL_KILL_BY_TAG, &tag);
+   menu_animation_kill_by_tag(&tag);
 
    /* use true here because file_list_copy() doesn't free actiondata */
    stripes_free_list_nodes(dst, true);
@@ -4209,13 +4206,13 @@ static int stripes_list_push(void *data, void *userdata,
                      msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
             {
                entry.enum_idx      = MENU_ENUM_LABEL_CONTENT_SETTINGS;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (system->load_no_content)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_START_CORE;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
 #ifndef HAVE_DYNAMIC
@@ -4225,7 +4222,7 @@ static int stripes_list_push(void *data, void *userdata,
                if (settings->bools.menu_show_load_core)
                {
                   entry.enum_idx   = MENU_ENUM_LABEL_CORE_LIST;
-                  menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+                  menu_displaylist_setting(&entry);
                }
             }
 
@@ -4234,7 +4231,7 @@ static int stripes_list_push(void *data, void *userdata,
                const struct retro_subsystem_info* subsystem = NULL;
 
                entry.enum_idx      = MENU_ENUM_LABEL_LOAD_CONTENT_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
 
                subsystem           = system->subsystem.data;
 
@@ -4290,68 +4287,68 @@ static int stripes_list_push(void *data, void *userdata,
             }
 
             entry.enum_idx      = MENU_ENUM_LABEL_ADD_CONTENT_LIST;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
 #if defined(HAVE_NETWORKING)
             {
                settings_t *settings      = config_get_ptr();
                if (settings->bools.menu_show_online_updater && !settings->bools.kiosk_mode_enable)
                {
                   entry.enum_idx      = MENU_ENUM_LABEL_ONLINE_UPDATER;
-                  menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+                  menu_displaylist_setting(&entry);
                }
             }
 #endif
             if (!settings->bools.menu_content_show_settings && !string_is_empty(settings->paths.menu_content_show_settings_password))
             {
                entry.enum_idx      = MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.kiosk_mode_enable && !string_is_empty(settings->paths.kiosk_mode_password))
             {
                entry.enum_idx      = MENU_ENUM_LABEL_MENU_DISABLE_KIOSK_MODE;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.menu_show_information)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_INFORMATION_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
 #ifndef HAVE_DYNAMIC
             entry.enum_idx      = MENU_ENUM_LABEL_RESTART_RETROARCH;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
 #endif
 
             if (settings->bools.menu_show_configurations && !settings->bools.kiosk_mode_enable)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_CONFIGURATIONS_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.menu_show_help)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_HELP_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
 #if !defined(IOS)
             if (settings->bools.menu_show_quit_retroarch)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_QUIT_RETROARCH;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 #endif
 
             if (settings->bools.menu_show_reboot)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_REBOOT;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             entry.enum_idx      = MENU_ENUM_LABEL_SHUTDOWN;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
             info->need_push    = true;
             ret = 0;
          }
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 1f0b9a92d3..9993d46512 100755
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -164,7 +164,7 @@ enum
    XMB_TEXTURE_UPDATER,
    XMB_TEXTURE_VIDEO,
    XMB_TEXTURE_RECORD,
-   XMB_TEXTURE_INPUT,
+   XMB_TEXTURE_INPUT_SETTINGS,
    XMB_TEXTURE_MIXER,
    XMB_TEXTURE_LOG,
    XMB_TEXTURE_OSD,
@@ -180,6 +180,27 @@ enum
    XMB_TEXTURE_OVERRIDE,
    XMB_TEXTURE_NOTIFICATIONS,
    XMB_TEXTURE_STREAM,
+   XMB_TEXTURE_SHUTDOWN,
+   XMB_TEXTURE_INPUT_DPAD_U,
+   XMB_TEXTURE_INPUT_DPAD_D,
+   XMB_TEXTURE_INPUT_DPAD_L,
+   XMB_TEXTURE_INPUT_DPAD_R,
+   XMB_TEXTURE_INPUT_STCK_U,
+   XMB_TEXTURE_INPUT_STCK_D,
+   XMB_TEXTURE_INPUT_STCK_L,
+   XMB_TEXTURE_INPUT_STCK_R,
+   XMB_TEXTURE_INPUT_STCK_P,
+   XMB_TEXTURE_INPUT_SELECT,
+   XMB_TEXTURE_INPUT_START,
+   XMB_TEXTURE_INPUT_BTN_U,
+   XMB_TEXTURE_INPUT_BTN_D,
+   XMB_TEXTURE_INPUT_BTN_L,
+   XMB_TEXTURE_INPUT_BTN_R,
+   XMB_TEXTURE_INPUT_LB,
+   XMB_TEXTURE_INPUT_RB,
+   XMB_TEXTURE_INPUT_LT,
+   XMB_TEXTURE_INPUT_RT,
+   XMB_TEXTURE_CHECKMARK,
    XMB_TEXTURE_LAST
 };
 
@@ -812,7 +833,7 @@ static void xmb_draw_text(
    menu_display_draw_text(font, str, x, y,
          width, height, color, text_align, scale_factor,
          video_info->xmb_shadows_enable,
-         xmb->shadow_offset);
+         xmb->shadow_offset, false);
 }
 
 static void xmb_messagebox(void *data, const char *message)
@@ -827,7 +848,7 @@ static void xmb_messagebox(void *data, const char *message)
 
 static void xmb_render_messagebox_internal(
       video_frame_info_t *video_info,
-      xmb_handle_t *xmb, const char *message, float* coord_white)
+      xmb_handle_t *xmb, const char *message)
 {
    unsigned i, y_position;
    int x, y, longest = 0, longest_width = 0;
@@ -880,7 +901,7 @@ static void xmb_render_messagebox_internal(
          longest_width + xmb->margins_dialog * 2,
          line_height * list->size + xmb->margins_dialog * 2,
          width, height,
-         &coord_white[0],
+         NULL,
          xmb->margins_slice, 1.0,
          xmb->textures.list[XMB_TEXTURE_DIALOG_SLICE]);
 
@@ -892,7 +913,7 @@ static void xmb_render_messagebox_internal(
          menu_display_draw_text(xmb->font, msg,
                x - longest_width/2.0,
                y + (i+0.75) * line_height,
-               width, height, 0x444444ff, TEXT_ALIGN_LEFT, 1.0f, false, 0);
+               width, height, 0x444444ff, TEXT_ALIGN_LEFT, 1.0f, false, 0, false);
    }
 
    if (menu_input_dialog_get_display_kb())
@@ -901,7 +922,8 @@ static void xmb_render_messagebox_internal(
             xmb->font,
             video_info,
             menu_event_get_osk_grid(),
-            menu_event_get_osk_ptr());
+            menu_event_get_osk_ptr(),
+            0xffffffff);
 
 end:
    string_list_free(list);
@@ -948,7 +970,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i, char pos)
    }
    else if (filebrowser_get_type() != FILEBROWSER_NONE)
    {
-      xmb->thumbnail              = 0;
+      video_driver_texture_unload(&xmb->thumbnail);
       goto end;
    }
 
@@ -976,7 +998,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i, char pos)
                      sizeof(new_path));
          }
          else
-            xmb->left_thumbnail              = 0;
+            video_driver_texture_unload(&xmb->left_thumbnail);
          goto end;
       }
    }
@@ -1129,7 +1151,7 @@ static void xmb_update_thumbnail_image(void *data)
          task_push_image_load(xmb->thumbnail_file_path,
                menu_display_handle_thumbnail_upload, NULL);
       else
-         xmb->thumbnail = 0;
+         video_driver_texture_unload(&xmb->thumbnail);
 
       free(xmb->thumbnail_file_path);
       xmb->thumbnail_file_path = NULL;
@@ -1141,7 +1163,7 @@ static void xmb_update_thumbnail_image(void *data)
          task_push_image_load(xmb->left_thumbnail_file_path,
                menu_display_handle_left_thumbnail_upload, NULL);
       else
-         xmb->left_thumbnail = 0;
+         video_driver_texture_unload(&xmb->left_thumbnail);
 
       free(xmb->left_thumbnail_file_path);
       xmb->left_thumbnail_file_path = NULL;
@@ -1190,7 +1212,7 @@ static void xmb_update_savestate_thumbnail_image(void *data)
       task_push_image_load(xmb->savestate_thumbnail_file_path,
             menu_display_handle_savestate_thumbnail_upload, NULL);
    else
-      xmb->savestate_thumbnail = 0;
+      video_driver_texture_unload(&xmb->savestate_thumbnail);
 }
 
 static unsigned xmb_get_system_tab(xmb_handle_t *xmb, unsigned i)
@@ -1231,7 +1253,7 @@ static void xmb_selection_pointer_changed(
 
    tag       = (uintptr_t)selection_buf;
 
-   menu_animation_ctl(MENU_ANIMATION_CTL_KILL_BY_TAG, &tag);
+   menu_animation_kill_by_tag(&tag);
    menu_entries_ctl(MENU_ENTRIES_CTL_SET_START, &num);
 
    for (i = 0; i < end; i++)
@@ -2231,7 +2253,7 @@ static void xmb_populate_entries(void *data,
 
 static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
       xmb_node_t *core_node, xmb_node_t *node,
-      enum msg_hash_enums enum_idx, unsigned type, bool active)
+      enum msg_hash_enums enum_idx, unsigned type, bool active, bool checked)
 {
    switch (enum_idx)
    {
@@ -2304,12 +2326,19 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
                   /* Menu icons */
                   case MENU_ENUM_LABEL_CONTENT_SETTINGS:
                   case MENU_ENUM_LABEL_UPDATE_ASSETS:
+                  case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME:
+                  case MENU_ENUM_LABEL_REMAP_FILE_SAVE_GAME:
+                  case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_GAME:
                      return xmb->textures.list[XMB_TEXTURE_QUICKMENU];
                   case MENU_ENUM_LABEL_START_CORE:
+                  case MENU_ENUM_LABEL_CHEAT_START_OR_CONT:
                      return xmb->textures.list[XMB_TEXTURE_RUN];
                   case MENU_ENUM_LABEL_CORE_LIST:
                   case MENU_ENUM_LABEL_CORE_SETTINGS:
                   case MENU_ENUM_LABEL_CORE_UPDATER_LIST:
+                  case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_CORE:
+                  case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE:
+                  case MENU_ENUM_LABEL_REMAP_FILE_SAVE_CORE:
                      return xmb->textures.list[XMB_TEXTURE_CORE];
                   case MENU_ENUM_LABEL_LOAD_CONTENT_LIST:
                   case MENU_ENUM_LABEL_SCAN_FILE:
@@ -2329,6 +2358,8 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
                   case MENU_ENUM_LABEL_UPDATE_CG_SHADERS:
                   case MENU_ENUM_LABEL_UPDATE_GLSL_SHADERS:
                   case MENU_ENUM_LABEL_UPDATE_SLANG_SHADERS:
+                  case MENU_ENUM_LABEL_AUTO_SHADERS_ENABLE:
+                  case MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS:
                      return xmb->textures.list[XMB_TEXTURE_SHADER_OPTIONS];
                   case MENU_ENUM_LABEL_INFORMATION:
                   case MENU_ENUM_LABEL_INFORMATION_LIST:
@@ -2361,13 +2392,31 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
                      return xmb->textures.list[XMB_TEXTURE_MIXER];
                   case MENU_ENUM_LABEL_INPUT_SETTINGS:
                   case MENU_ENUM_LABEL_UPDATE_AUTOCONFIG_PROFILES:
-                     return xmb->textures.list[XMB_TEXTURE_INPUT];
+                  case MENU_ENUM_LABEL_INPUT_USER_1_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_2_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_3_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_4_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_5_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_6_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_7_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_8_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_9_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_10_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_11_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_12_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_13_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_14_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_15_BINDS:
+                  case MENU_ENUM_LABEL_INPUT_USER_16_BINDS:
+                     return xmb->textures.list[XMB_TEXTURE_INPUT_SETTINGS];
                   case MENU_ENUM_LABEL_LATENCY_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_LATENCY];
                   case MENU_ENUM_LABEL_SAVING_SETTINGS:
-                  case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CORE:
-                  case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR:
-                  case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_GAME:
+                  case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG:
+                  case MENU_ENUM_LABEL_SAVE_NEW_CONFIG:
+                  case MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT:
+                  case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_AS:
+                  case MENU_ENUM_LABEL_CHEAT_FILE_SAVE_AS:
                      return xmb->textures.list[XMB_TEXTURE_SAVING];
                   case MENU_ENUM_LABEL_LOGGING_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_LOG];
@@ -2380,6 +2429,11 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
                      return xmb->textures.list[XMB_TEXTURE_STREAM];
                   case MENU_ENUM_LABEL_QUICK_MENU_STOP_STREAMING:
                   case MENU_ENUM_LABEL_QUICK_MENU_STOP_RECORDING:
+                  case MENU_ENUM_LABEL_CHEAT_DELETE_ALL:
+                  case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_CORE:
+                  case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_GAME:
+                  case MENU_ENUM_LABEL_REMAP_FILE_REMOVE_CONTENT_DIR:
+                  case MENU_ENUM_LABEL_CORE_DELETE:
                      return xmb->textures.list[XMB_TEXTURE_CLOSE];
                   case MENU_ENUM_LABEL_ONSCREEN_DISPLAY_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_OSD];
@@ -2396,6 +2450,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
                      return xmb->textures.list[XMB_TEXTURE_ACHIEVEMENTS];
                   case MENU_ENUM_LABEL_NETWORK_INFORMATION:
                   case MENU_ENUM_LABEL_NETWORK_SETTINGS:
+                  case MENU_ENUM_LABEL_WIFI_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_NETWORK];
                   case MENU_ENUM_LABEL_PLAYLIST_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_PLAYLIST];
@@ -2403,10 +2458,12 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
                      return xmb->textures.list[XMB_TEXTURE_USER];
                   case MENU_ENUM_LABEL_DIRECTORY_SETTINGS:
                   case MENU_ENUM_LABEL_SCAN_DIRECTORY:
+                  case MENU_ENUM_LABEL_REMAP_FILE_SAVE_CONTENT_DIR:
+                  case MENU_ENUM_LABEL_SAVE_CURRENT_CONFIG_OVERRIDE_CONTENT_DIR:
+                  case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_SAVE_PARENT:
                      return xmb->textures.list[XMB_TEXTURE_FOLDER];
                   case MENU_ENUM_LABEL_PRIVACY_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_PRIVACY];
-
                   case MENU_ENUM_LABEL_REWIND_SETTINGS:
                      return xmb->textures.list[XMB_TEXTURE_REWIND];
                   case MENU_ENUM_LABEL_QUICK_MENU_OVERRIDE_OPTIONS:
@@ -2423,6 +2480,25 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
                   case MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS:
                      return xmb->textures.list[XMB_TEXTURE_RELOAD];
 #endif
+                  case MENU_ENUM_LABEL_REBOOT:
+                  case MENU_ENUM_LABEL_RESET_TO_DEFAULT_CONFIG:
+                  case MENU_ENUM_LABEL_CHEAT_RELOAD_CHEATS:
+                  case MENU_ENUM_LABEL_RESTART_RETROARCH:
+                     return xmb->textures.list[XMB_TEXTURE_RELOAD];
+                  case MENU_ENUM_LABEL_SHUTDOWN:
+                     return xmb->textures.list[XMB_TEXTURE_SHUTDOWN];
+                  case MENU_ENUM_LABEL_CONFIGURATIONS:
+                  case MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS:
+                  case MENU_ENUM_LABEL_REMAP_FILE_LOAD:
+                  case MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE:
+                  case MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE:
+                  case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET:
+                  case MENU_ENUM_LABEL_CHEAT_FILE_LOAD:
+                  case MENU_ENUM_LABEL_CHEAT_FILE_LOAD_APPEND:
+                     return xmb->textures.list[XMB_TEXTURE_LOADSTATE];
+                  case MENU_ENUM_LABEL_CHEAT_APPLY_CHANGES:
+                  case MENU_ENUM_LABEL_SHADER_APPLY_CHANGES:
+                     return xmb->textures.list[XMB_TEXTURE_CHECKMARK];
                   default:
                      break;
                   }
@@ -2482,8 +2558,10 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
          return xmb->textures.list[XMB_TEXTURE_CURSOR];
       case FILE_TYPE_PLAYLIST_ENTRY:
       case MENU_SETTING_ACTION_RUN:
+      case MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS:
          return xmb->textures.list[XMB_TEXTURE_RUN];
       case MENU_SETTING_ACTION_CLOSE:
+      case MENU_SETTING_ACTION_DELETE_ENTRY:
          return xmb->textures.list[XMB_TEXTURE_CLOSE];
       case MENU_SETTING_ACTION_SAVESTATE:
          return xmb->textures.list[XMB_TEXTURE_SAVESTATE];
@@ -2504,14 +2582,10 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
          return xmb->textures.list[XMB_TEXTURE_SHADER_OPTIONS];
       case MENU_SETTING_ACTION_SCREENSHOT:
          return xmb->textures.list[XMB_TEXTURE_SCREENSHOT];
-      case MENU_SETTING_ACTION_DELETE_ENTRY:
-         return xmb->textures.list[XMB_TEXTURE_CLOSE];
       case MENU_SETTING_ACTION_RESET:
          return xmb->textures.list[XMB_TEXTURE_RELOAD];
       case MENU_SETTING_ACTION_PAUSE_ACHIEVEMENTS:
          return xmb->textures.list[XMB_TEXTURE_RESUME];
-      case MENU_SETTING_ACTION_RESUME_ACHIEVEMENTS:
-         return xmb->textures.list[XMB_TEXTURE_RUN];
 
       case MENU_SETTING_GROUP:
 #ifdef HAVE_LAKKA_SWITCH
@@ -2530,11 +2604,6 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
       case MENU_ROOM_RELAY:
          return xmb->textures.list[XMB_TEXTURE_ROOM_RELAY];
 #endif
-      case MENU_SETTING_ACTION:
-         if (xmb->depth <= 3)
-            return xmb->textures.list[XMB_TEXTURE_SETTING];
-      default:
-         return xmb->textures.list[XMB_TEXTURE_SUBSETTING];
    }
 
 #ifdef HAVE_CHEEVOS
@@ -2547,11 +2616,93 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
       if (get_badge_texture(new_id) != 0)
          return get_badge_texture(new_id);
       /* Should be replaced with placeholder badge icon. */
-      return xmb->textures.list[XMB_TEXTURE_SUBSETTING];
+      return xmb->textures.list[XMB_TEXTURE_ACHIEVEMENTS];
    }
 #endif
 
+   if (
+         (type >= MENU_SETTINGS_INPUT_BEGIN) &&
+         (type <= MENU_SETTINGS_INPUT_DESC_END)
+      )
+      {
+         unsigned input_id;
+         if (type < MENU_SETTINGS_INPUT_DESC_BEGIN)
+         {
+            input_id = MENU_SETTINGS_INPUT_BEGIN;
+            if ( type == input_id + 2)
+               return xmb->textures.list[XMB_TEXTURE_INPUT_SETTINGS];
+            if ( type == input_id + 4)
+               return xmb->textures.list[XMB_TEXTURE_RELOAD];
+            if ( type == input_id + 5)
+               return xmb->textures.list[XMB_TEXTURE_SAVING];
+            input_id = input_id + 7;
+         }
+         else
+         {
+            input_id = MENU_SETTINGS_INPUT_DESC_BEGIN;
+            while (type > (input_id + 23))
+            {
+               input_id = (input_id + 24) ;
+            }
+         }
+         if ( type == input_id )
+            return xmb->textures.list[XMB_TEXTURE_INPUT_BTN_D];
+         if ( type == (input_id + 1))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_BTN_L];
+         if ( type == (input_id + 2))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_SELECT];
+         if ( type == (input_id + 3))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_START];
+         if ( type == (input_id + 4))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_DPAD_U];
+         if ( type == (input_id + 5))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_DPAD_D];
+         if ( type == (input_id + 6))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_DPAD_L];
+         if ( type == (input_id + 7))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_DPAD_R];
+         if ( type == (input_id + 8))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_BTN_R];
+         if ( type == (input_id + 9))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_BTN_U];
+         if ( type == (input_id + 10))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_LB];
+         if ( type == (input_id + 11))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_RB];
+         if ( type == (input_id + 12))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_LT];
+         if ( type == (input_id + 13))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_RT];
+         if ( type == (input_id + 14))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_P];
+         if ( type == (input_id + 15))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_P];
+         if ( type == (input_id + 16))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_R];
+         if ( type == (input_id + 17))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_L];
+         if ( type == (input_id + 18))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_D];
+         if ( type == (input_id + 19))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_U];
+         if ( type == (input_id + 20))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_R];
+         if ( type == (input_id + 21))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_L];
+         if ( type == (input_id + 22))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_D];
+         if ( type == (input_id + 23))
+            return xmb->textures.list[XMB_TEXTURE_INPUT_STCK_U];
+      }
+
+   if (checked)
+      return xmb->textures.list[XMB_TEXTURE_CHECKMARK];
+
+   if (type == MENU_SETTING_ACTION)
+      return xmb->textures.list[XMB_TEXTURE_SETTING];
+
    return xmb->textures.list[XMB_TEXTURE_SUBSETTING];
+
 }
 
 static void xmb_calculate_visible_range(const xmb_handle_t *xmb,
@@ -2795,7 +2946,7 @@ static int xmb_draw_item(
       math_matrix_4x4 mymat_tmp;
       menu_display_ctx_rotate_draw_t rotate_draw;
       uintptr_t texture        = xmb_icon_get_id(xmb, core_node, node,
-            entry->enum_idx, entry_type, (i == current));
+            entry->enum_idx, entry_type, (i == current), entry->checked);
       float x                  = icon_x;
       float y                  = icon_y;
       float rotation           = 0;
@@ -2810,7 +2961,14 @@ static int xmb_draw_item(
 
       menu_display_rotate_z(&rotate_draw, video_info);
 
-      xmb_draw_icon(video_info,
+
+   if (
+        (entry->checked) ||
+        !((entry_type >= MENU_SETTING_DROPDOWN_ITEM) &&
+        (entry_type <= MENU_SETTING_DROPDOWN_SETTING_UINT_ITEM_SPECIAL))
+      )
+      {
+         xmb_draw_icon(video_info,
             xmb->icon_size,
             &mymat_tmp,
             texture,
@@ -2823,6 +2981,7 @@ static int xmb_draw_item(
             scale_factor,
             &color[0],
             xmb->shadow_offset);
+      }
    }
 
    menu_display_set_alpha(color, MIN(node->alpha, xmb->alpha));
@@ -2934,7 +3093,6 @@ static void xmb_draw_items(
 static void xmb_render(void *data, bool is_idle)
 {
    size_t i;
-   float delta_time;
    menu_animation_ctx_delta_t delta;
    settings_t   *settings   = config_get_ptr();
    xmb_handle_t *xmb        = (xmb_handle_t*)data;
@@ -2945,9 +3103,7 @@ static void xmb_render(void *data, bool is_idle)
    if (!xmb)
       return;
 
-   menu_animation_ctl(MENU_ANIMATION_CTL_DELTA_TIME, &delta_time);
-
-   delta.current = delta_time;
+   delta.current = menu_animation_get_delta_time();
 
    if (menu_animation_get_ideal_delta_time(&delta))
       menu_animation_update(delta.ideal);
@@ -3910,7 +4066,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
    {
       xmb_draw_dark_layer(xmb, video_info, width, height);
       xmb_render_messagebox_internal(
-            video_info, xmb, msg, &coord_white[0]);
+            video_info, xmb, msg);
    }
 
    /* Cursor image */
@@ -4446,254 +4602,317 @@ static const char *xmb_texture_path(unsigned id)
       case XMB_TEXTURE_MAIN_MENU:
 #if defined(HAVE_LAKKA)
          icon_name = "lakka.png";
-			break;
+         break;
 #else
          icon_name = "retroarch.png";
-			break;
+         break;
 #endif
       case XMB_TEXTURE_SETTINGS:
          icon_name = "settings.png";
-			break;
+         break;
       case XMB_TEXTURE_HISTORY:
          icon_name = "history.png";
-			break;
+         break;
       case XMB_TEXTURE_FAVORITES:
          icon_name = "favorites.png";
-			break;
+         break;
       case XMB_TEXTURE_ADD_FAVORITE:
          icon_name = "add-favorite.png";
-			break;
+         break;
       case XMB_TEXTURE_MUSICS:
          icon_name = "musics.png";
-			break;
+         break;
 #if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
       case XMB_TEXTURE_MOVIES:
          icon_name = "movies.png";
-			break;
+         break;
 #endif
 #ifdef HAVE_IMAGEVIEWER
       case XMB_TEXTURE_IMAGES:
          icon_name = "images.png";
-			break;
+         break;
 #endif
       case XMB_TEXTURE_SETTING:
          icon_name = "setting.png";
-			break;
+         break;
       case XMB_TEXTURE_SUBSETTING:
          icon_name = "subsetting.png";
-			break;
+         break;
       case XMB_TEXTURE_ARROW:
          icon_name = "arrow.png";
-			break;
+         break;
       case XMB_TEXTURE_RUN:
          icon_name = "run.png";
-			break;
+         break;
       case XMB_TEXTURE_CLOSE:
          icon_name = "close.png";
-			break;
+         break;
       case XMB_TEXTURE_RESUME:
          icon_name = "resume.png";
-			break;
+         break;
       case XMB_TEXTURE_CLOCK:
          icon_name = "clock.png";
-			break;
+         break;
       case XMB_TEXTURE_BATTERY_FULL:
          icon_name = "battery-full.png";
-			break;
+         break;
       case XMB_TEXTURE_BATTERY_CHARGING:
          icon_name = "battery-charging.png";
-			break;
+         break;
       case XMB_TEXTURE_POINTER:
          icon_name = "pointer.png";
-			break;
+         break;
       case XMB_TEXTURE_SAVESTATE:
          icon_name = "savestate.png";
-			break;
+         break;
       case XMB_TEXTURE_LOADSTATE:
          icon_name = "loadstate.png";
-			break;
+         break;
       case XMB_TEXTURE_UNDO:
          icon_name = "undo.png";
-			break;
+         break;
       case XMB_TEXTURE_CORE_INFO:
          icon_name = "core-infos.png";
-			break;
+         break;
       case XMB_TEXTURE_WIFI:
          icon_name = "wifi.png";
-			break;
+         break;
       case XMB_TEXTURE_CORE_OPTIONS:
          icon_name = "core-options.png";
-			break;
+         break;
       case XMB_TEXTURE_INPUT_REMAPPING_OPTIONS:
          icon_name = "core-input-remapping-options.png";
-			break;
+         break;
       case XMB_TEXTURE_CHEAT_OPTIONS:
          icon_name = "core-cheat-options.png";
-			break;
+         break;
       case XMB_TEXTURE_DISK_OPTIONS:
          icon_name = "core-disk-options.png";
-			break;
+         break;
       case XMB_TEXTURE_SHADER_OPTIONS:
          icon_name = "core-shader-options.png";
-			break;
+         break;
       case XMB_TEXTURE_ACHIEVEMENT_LIST:
          icon_name = "achievement-list.png";
-			break;
+         break;
       case XMB_TEXTURE_SCREENSHOT:
          icon_name = "screenshot.png";
-			break;
+         break;
       case XMB_TEXTURE_RELOAD:
          icon_name = "reload.png";
-			break;
+         break;
       case XMB_TEXTURE_RENAME:
          icon_name = "rename.png";
-			break;
+         break;
       case XMB_TEXTURE_FILE:
          icon_name = "file.png";
-			break;
+         break;
       case XMB_TEXTURE_FOLDER:
          icon_name = "folder.png";
-			break;
+         break;
       case XMB_TEXTURE_ZIP:
          icon_name = "zip.png";
-			break;
+         break;
       case XMB_TEXTURE_MUSIC:
          icon_name = "music.png";
-			break;
+         break;
       case XMB_TEXTURE_FAVORITE:
          icon_name = "favorites-content.png";
-			break;
+         break;
       case XMB_TEXTURE_IMAGE:
          icon_name = "image.png";
-			break;
+         break;
       case XMB_TEXTURE_MOVIE:
          icon_name = "movie.png";
-			break;
+         break;
       case XMB_TEXTURE_CORE:
          icon_name = "core.png";
-			break;
+         break;
       case XMB_TEXTURE_RDB:
          icon_name = "database.png";
-			break;
+         break;
       case XMB_TEXTURE_CURSOR:
          icon_name = "cursor.png";
-			break;
+         break;
       case XMB_TEXTURE_SWITCH_ON:
          icon_name = "on.png";
-			break;
+         break;
       case XMB_TEXTURE_SWITCH_OFF:
          icon_name = "off.png";
-			break;
+         break;
       case XMB_TEXTURE_ADD:
          icon_name = "add.png";
-			break;
+         break;
 #ifdef HAVE_NETWORKING
       case XMB_TEXTURE_NETPLAY:
          icon_name = "netplay.png";
-			break;
+         break;
       case XMB_TEXTURE_ROOM:
          icon_name = "menu_room.png";
-			break;
+         break;
       case XMB_TEXTURE_ROOM_LAN:
          icon_name = "menu_room_lan.png";
-			break;
+         break;
       case XMB_TEXTURE_ROOM_RELAY:
          icon_name = "menu_room_relay.png";
-			break;
+         break;
 #endif
       case XMB_TEXTURE_KEY:
          icon_name = "key.png";
-			break;
+         break;
       case XMB_TEXTURE_KEY_HOVER:
          icon_name = "key-hover.png";
-			break;
+         break;
       case XMB_TEXTURE_DIALOG_SLICE:
          icon_name = "dialog-slice.png";
-			break;
+         break;
       case XMB_TEXTURE_ACHIEVEMENTS:
          icon_name = "menu_achievements.png";
-			break;
+         break;
       case XMB_TEXTURE_AUDIO:
          icon_name = "menu_audio.png";
-			break;
+         break;
       case XMB_TEXTURE_DRIVERS:
          icon_name = "menu_drivers.png";
-			break;
+         break;
       case XMB_TEXTURE_EXIT:
          icon_name = "menu_exit.png";
-			break;
+         break;
       case XMB_TEXTURE_FRAMESKIP:
          icon_name = "menu_frameskip.png";
-			break;
+         break;
       case XMB_TEXTURE_HELP:
          icon_name = "menu_help.png";
-			break;
+         break;
       case XMB_TEXTURE_INFO:
          icon_name = "menu_info.png";
-			break;
-      case XMB_TEXTURE_INPUT:
+         break;
+      case XMB_TEXTURE_INPUT_SETTINGS:
          icon_name = "Libretro - Pad.png";
-			break;
+         break;
       case XMB_TEXTURE_LATENCY:
          icon_name = "menu_latency.png";
-			break;
+         break;
       case XMB_TEXTURE_NETWORK:
          icon_name = "menu_network.png";
-			break;
+         break;
       case XMB_TEXTURE_POWER:
          icon_name = "menu_power.png";
-			break;
+         break;
       case XMB_TEXTURE_RECORD:
          icon_name = "menu_record.png";
-			break;
+         break;
       case XMB_TEXTURE_SAVING:
          icon_name = "menu_saving.png";
-			break;
+         break;
       case XMB_TEXTURE_UPDATER:
          icon_name = "menu_updater.png";
-			break;
+         break;
       case XMB_TEXTURE_VIDEO:
          icon_name = "menu_video.png";
-			break;
+         break;
       case XMB_TEXTURE_MIXER:
          icon_name = "menu_mixer.png";
-			break;
+         break;
       case XMB_TEXTURE_LOG:
          icon_name = "menu_log.png";
-			break;
+         break;
       case XMB_TEXTURE_OSD:
          icon_name = "menu_osd.png";
-			break;
+         break;
       case XMB_TEXTURE_UI:
          icon_name = "menu_ui.png";
-			break;
+         break;
       case XMB_TEXTURE_USER:
          icon_name = "menu_user.png";
-			break;
+         break;
       case XMB_TEXTURE_PRIVACY:
          icon_name = "menu_privacy.png";
-			break;
+         break;
       case XMB_TEXTURE_PLAYLIST:
          icon_name = "menu_playlist.png";
-			break;
+         break;
       case XMB_TEXTURE_QUICKMENU:
          icon_name = "menu_quickmenu.png";
-			break;
+         break;
       case XMB_TEXTURE_REWIND:
          icon_name = "menu_rewind.png";
-			break;
+         break;
       case XMB_TEXTURE_OVERLAY:
          icon_name = "menu_overlay.png";
-			break;
+         break;
       case XMB_TEXTURE_OVERRIDE:
          icon_name = "menu_override.png";
-			break;
+         break;
       case XMB_TEXTURE_NOTIFICATIONS:
          icon_name = "menu_notifications.png";
-			break;
+         break;
       case XMB_TEXTURE_STREAM:
          icon_name = "menu_stream.png";
-			break;
+         break;
+      case XMB_TEXTURE_SHUTDOWN:
+         icon_name = "menu_shutdown.png";
+         break;
+      case XMB_TEXTURE_INPUT_DPAD_U:
+         icon_name = "input_DPAD-U.png";
+         break;
+      case XMB_TEXTURE_INPUT_DPAD_D:
+         icon_name = "input_DPAD-D.png";
+         break;
+      case XMB_TEXTURE_INPUT_DPAD_L:
+         icon_name = "input_DPAD-L.png";
+         break;
+      case XMB_TEXTURE_INPUT_DPAD_R:
+         icon_name = "input_DPAD-R.png";
+         break;
+      case XMB_TEXTURE_INPUT_STCK_U:
+         icon_name = "input_STCK-U.png";
+         break;
+      case XMB_TEXTURE_INPUT_STCK_D:
+         icon_name = "input_STCK-D.png";
+         break;
+      case XMB_TEXTURE_INPUT_STCK_L:
+         icon_name = "input_STCK-L.png";
+         break;
+      case XMB_TEXTURE_INPUT_STCK_R:
+         icon_name = "input_STCK-R.png";
+         break;
+      case XMB_TEXTURE_INPUT_STCK_P:
+         icon_name = "input_STCK-P.png";
+         break;
+      case XMB_TEXTURE_INPUT_BTN_U:
+         icon_name = "input_BTN-U.png";
+         break;
+      case XMB_TEXTURE_INPUT_BTN_D:
+         icon_name = "input_BTN-D.png";
+         break;
+      case XMB_TEXTURE_INPUT_BTN_L:
+         icon_name = "input_BTN-L.png";
+         break;
+      case XMB_TEXTURE_INPUT_BTN_R:
+         icon_name = "input_BTN-R.png";
+         break;
+      case XMB_TEXTURE_INPUT_LB:
+         icon_name = "input_LB.png";
+         break;
+      case XMB_TEXTURE_INPUT_RB:
+         icon_name = "input_RB.png";
+         break;
+      case XMB_TEXTURE_INPUT_LT:
+         icon_name = "input_LT.png";
+         break;
+      case XMB_TEXTURE_INPUT_RT:
+         icon_name = "input_RT.png";
+         break;
+      case XMB_TEXTURE_INPUT_SELECT:
+         icon_name = "input_SELECT.png";
+         break;
+      case XMB_TEXTURE_INPUT_START:
+         icon_name = "input_START.png";
+         break;
+      case XMB_TEXTURE_CHECKMARK:
+         icon_name = "menu_check.png";
+         break;
    }
 
    fill_pathname_application_special(iconpath,
@@ -4705,11 +4924,8 @@ static const char *xmb_texture_path(unsigned id)
 
    if (!filestream_exists(icon_fullpath))
    {
-      /* If the icon doesn't exist at least try to return the subsetting icon*/
-      if (id == XMB_TEXTURE_DIALOG_SLICE || id == XMB_TEXTURE_KEY_HOVER || id == XMB_TEXTURE_KEY_HOVER)
-         return NULL;
-      else
-         return "subsetting.png";
+      RARCH_WARN("[XMB] Asset missing: %s\n", icon_fullpath);
+      return NULL;
    }
    else
       return  icon_name;
@@ -4720,9 +4936,25 @@ static void xmb_context_reset_textures(
       xmb_handle_t *xmb, const char *iconpath)
 {
    unsigned i;
+   settings_t *settings = config_get_ptr();
 
    for (i = 0; i < XMB_TEXTURE_LAST; i++)
+   {
+      if (xmb_texture_path(i) == NULL)
+      {
+         /* If the icon doesn't exist at least try to return the subsetting icon*/
+         if (!(i == XMB_TEXTURE_DIALOG_SLICE || i == XMB_TEXTURE_KEY_HOVER || i == XMB_TEXTURE_KEY_HOVER))
+            menu_display_reset_textures_list(xmb_texture_path(XMB_TEXTURE_SUBSETTING), iconpath, &xmb->textures.list[i], TEXTURE_FILTER_MIPMAP_LINEAR);
+         continue;
+      }
       menu_display_reset_textures_list(xmb_texture_path(i), iconpath, &xmb->textures.list[i], TEXTURE_FILTER_MIPMAP_LINEAR);
+   }
+
+   /* Warn only if critical assets are missing, some themes are incomplete */
+   if (
+         ((xmb_texture_path(XMB_TEXTURE_SUBSETTING) == NULL)) && !(settings->uints.menu_xmb_theme == XMB_ICON_THEME_CUSTOM)
+      )
+         runloop_msg_queue_push(msg_hash_to_str(MSG_MISSING_ASSETS), 1, 256, false);
 
    menu_display_allocate_white_texture();
 
@@ -4767,6 +4999,7 @@ static void xmb_context_reset_textures(
    xmb->netplay_tab_node.alpha  = xmb->categories_active_alpha;
    xmb->netplay_tab_node.zoom   = xmb->categories_active_zoom;
 #endif
+
 }
 
 static void xmb_context_reset_background(const char *iconpath)
@@ -4930,7 +5163,7 @@ static void xmb_list_clear(file_list_t *list)
 {
    menu_animation_ctx_tag tag = (uintptr_t)list;
 
-   menu_animation_ctl(MENU_ANIMATION_CTL_KILL_BY_TAG, &tag);
+   menu_animation_kill_by_tag(&tag);
 
    xmb_free_list_nodes(list, false);
 }
@@ -4946,7 +5179,7 @@ static void xmb_list_deep_copy(const file_list_t *src, file_list_t *dst,
    size_t i, j = 0;
    menu_animation_ctx_tag tag = (uintptr_t)dst;
 
-   menu_animation_ctl(MENU_ANIMATION_CTL_KILL_BY_TAG, &tag);
+   menu_animation_kill_by_tag(&tag);
 
    /* use true here because file_list_copy() doesn't free actiondata */
    xmb_free_list_nodes(dst, true);
@@ -5196,7 +5429,7 @@ static void xmb_toggle(void *userdata, bool menu_on)
    xmb_toggle_horizontal_list(xmb);
 }
 
-static int deferred_push_content_actions(menu_displaylist_info_t *info)
+static int xmb_deferred_push_content_actions(menu_displaylist_info_t *info)
 {
    if (!menu_displaylist_ctl(
             DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS, info))
@@ -5213,7 +5446,7 @@ static int xmb_list_bind_init_compare_label(menu_file_list_cbs_t *cbs)
       switch (cbs->enum_idx)
       {
          case MENU_ENUM_LABEL_CONTENT_ACTIONS:
-            cbs->action_deferred_push = deferred_push_content_actions;
+            cbs->action_deferred_push = xmb_deferred_push_content_actions;
             break;
          default:
             return -1;
@@ -5309,13 +5542,13 @@ static int xmb_list_push(void *data, void *userdata,
                      msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
             {
                entry.enum_idx      = MENU_ENUM_LABEL_CONTENT_SETTINGS;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (system->load_no_content)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_START_CORE;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
 #ifndef HAVE_DYNAMIC
@@ -5325,7 +5558,7 @@ static int xmb_list_push(void *data, void *userdata,
                if (settings->bools.menu_show_load_core)
                {
                   entry.enum_idx   = MENU_ENUM_LABEL_CORE_LIST;
-                  menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+                  menu_displaylist_setting(&entry);
                }
             }
 
@@ -5334,7 +5567,7 @@ static int xmb_list_push(void *data, void *userdata,
                const struct retro_subsystem_info* subsystem = NULL;
 
                entry.enum_idx      = MENU_ENUM_LABEL_LOAD_CONTENT_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
 
                subsystem           = system->subsystem.data;
 
@@ -5390,85 +5623,85 @@ static int xmb_list_push(void *data, void *userdata,
             }
 
             entry.enum_idx      = MENU_ENUM_LABEL_ADD_CONTENT_LIST;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
 #ifdef HAVE_QT
             if (settings->bools.desktop_menu_enable)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_SHOW_WIMP;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 #endif
 #if defined(HAVE_NETWORKING)
             if (settings->bools.menu_show_online_updater && !settings->bools.kiosk_mode_enable)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_ONLINE_UPDATER;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 #endif
             if (!settings->bools.menu_content_show_settings && !string_is_empty(settings->paths.menu_content_show_settings_password))
             {
                entry.enum_idx      = MENU_ENUM_LABEL_XMB_MAIN_MENU_ENABLE_SETTINGS;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.kiosk_mode_enable && !string_is_empty(settings->paths.kiosk_mode_password))
             {
                entry.enum_idx      = MENU_ENUM_LABEL_MENU_DISABLE_KIOSK_MODE;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.menu_show_information)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_INFORMATION_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
 #ifdef HAVE_LAKKA_SWITCH
             entry.enum_idx      = MENU_ENUM_LABEL_SWITCH_CPU_PROFILE;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
 
             entry.enum_idx      = MENU_ENUM_LABEL_SWITCH_GPU_PROFILE;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
 
             entry.enum_idx      = MENU_ENUM_LABEL_SWITCH_BACKLIGHT_CONTROL;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
 #endif
 
 #ifndef HAVE_DYNAMIC
             entry.enum_idx      = MENU_ENUM_LABEL_RESTART_RETROARCH;
-            menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+            menu_displaylist_setting(&entry);
 #endif
 
             if (settings->bools.menu_show_configurations && !settings->bools.kiosk_mode_enable)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_CONFIGURATIONS_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.menu_show_help)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_HELP_LIST;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
 #if !defined(IOS)
             if (settings->bools.menu_show_quit_retroarch)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_QUIT_RETROARCH;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 #endif
 
             if (settings->bools.menu_show_reboot)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_REBOOT;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             if (settings->bools.menu_show_shutdown)
             {
                entry.enum_idx      = MENU_ENUM_LABEL_SHUTDOWN;
-               menu_displaylist_ctl(DISPLAYLIST_SETTING_ENUM, &entry);
+               menu_displaylist_setting(&entry);
             }
 
             info->need_push    = true;
diff --git a/menu/drivers_display/menu_display_gdi.c b/menu/drivers_display/menu_display_gdi.c
index 1c5b6e0a6e..e4b2f1f746 100644
--- a/menu/drivers_display/menu_display_gdi.c
+++ b/menu/drivers_display/menu_display_gdi.c
@@ -70,7 +70,9 @@ static void menu_display_gdi_draw(menu_display_ctx_draw_t *draw,
 
    if (gdi->memDC)
    {
+#if _WIN32_WINNT >= 0x0410 /* Win98 */
       BLENDFUNCTION blend = {0};
+#endif
 
       if (!gdi->texDC)
          gdi->texDC = CreateCompatibleDC(gdi->winDC);
@@ -90,17 +92,20 @@ static void menu_display_gdi_draw(menu_display_ctx_draw_t *draw,
 
       gdi->bmp_old = SelectObject(gdi->memDC, gdi->bmp);
 
+#if _WIN32_WINNT >= 0x0410 /* Win98 */
       blend.BlendOp = AC_SRC_OVER;
       blend.BlendFlags = 0;
       blend.SourceConstantAlpha = 255;/*clamp_8bit(draw->coords->color[3] * 255.0f);*/
       blend.AlphaFormat = AC_SRC_ALPHA;
 
+      /* AlphaBlend() is only available since Win98 */
       AlphaBlend(gdi->memDC, draw->x, video_info->height - draw->height - draw->y, draw->width, draw->height, gdi->texDC, 0, 0, draw->width, draw->height, blend);
-
       /*TransparentBlt(gdi->memDC, draw->x, video_info->height - draw->height - draw->y, draw->width, draw->height, gdi->texDC, 0, 0, draw->width, draw->height, 0);*/
+#else
+      /* Just draw without the blending */
+      StretchBlt(gdi->memDC, draw->x, video_info->height - draw->height - draw->y, draw->width, draw->height, gdi->texDC, 0, 0, draw->width, draw->height, SRCCOPY);
 
-      /* To draw without blending: */
-      /*StretchBlt(gdi->memDC, draw->x, video_info->height - draw->height - draw->y, draw->width, draw->height, gdi->texDC, 0, 0, draw->width, draw->height, SRCCOPY);*/
+#endif
 
       SelectObject(gdi->memDC, gdi->bmp_old);
       SelectObject(gdi->texDC, texture->bmp_old);
diff --git a/menu/drivers_display/menu_display_metal.m b/menu/drivers_display/menu_display_metal.m
index 237a04191b..1d7d4430a0 100644
--- a/menu/drivers_display/menu_display_metal.m
+++ b/menu/drivers_display/menu_display_metal.m
@@ -88,6 +88,25 @@ static void menu_display_metal_viewport(menu_display_ctx_draw_t *draw,
 {
 }
 
+static void menu_display_metal_scissor_begin(video_frame_info_t *video_info, int x, int y, unsigned width, unsigned height)
+{
+   MetalDriver *md = GET_DRIVER(video_info);
+   if (!md)
+      return;
+   
+   MTLScissorRect r = {.x = (NSUInteger)x, .y = (NSUInteger)y, .width = width, .height = height};
+   [md.display setScissorRect:r];
+}
+
+static void menu_display_metal_scissor_end(video_frame_info_t *video_info)
+{
+   MetalDriver *md = GET_DRIVER(video_info);
+   if (!md)
+      return;
+   
+   [md.display clearScissorRect];
+}
+
 static void menu_display_metal_restore_clear_color(void)
 {
    // nothing to do
@@ -135,7 +154,7 @@ menu_display_ctx_driver_t menu_display_ctx_metal = {
    .type                   = MENU_VIDEO_DRIVER_METAL,
    .ident                  = "menu_display_metal",
    .handles_transform      = NO,
-   .scissor_begin          = NULL,
-   .scissor_end            = NULL
+   .scissor_begin          = menu_display_metal_scissor_begin,
+   .scissor_end            = menu_display_metal_scissor_end
 };
 
diff --git a/menu/drivers_display/menu_display_vita2d.c b/menu/drivers_display/menu_display_vita2d.c
index e0edb878c1..d97b3f2437 100644
--- a/menu/drivers_display/menu_display_vita2d.c
+++ b/menu/drivers_display/menu_display_vita2d.c
@@ -247,7 +247,7 @@ menu_display_ctx_driver_t menu_display_ctx_vita2d = {
    menu_display_vita2d_get_default_tex_coords,
    menu_display_vita2d_font_init_first,
    MENU_VIDEO_DRIVER_VITA2D,
-   "menu_display_vita2d",
+   "vita2d",
    true,
    NULL,
    NULL
diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c
index 261037aa2c..e1e5ee4699 100644
--- a/menu/drivers_display/menu_display_vulkan.c
+++ b/menu/drivers_display/menu_display_vulkan.c
@@ -352,25 +352,20 @@ static void menu_display_vk_scissor_begin(video_frame_info_t *video_info,
    VkRect2D sci;
    vk_t *vk = video_info ? (vk_t*)video_info->userdata : NULL;
 
-   sci.offset.x      = x;
-   sci.offset.y      = video_info->height - y - height;
-   sci.extent.width  = width;
-   sci.extent.height = height;
-
-   vkCmdSetScissor (vk->cmd, 0, 1, &sci);
+   vk->tracker.use_scissor = true;
+   vk->tracker.scissor.offset.x = x;
+   vk->tracker.scissor.offset.y = y;
+   vk->tracker.scissor.extent.width = width;
+   vk->tracker.scissor.extent.height = height;
+   vk->tracker.dirty |= VULKAN_DIRTY_DYNAMIC_BIT;
 }
 
 static void menu_display_vk_scissor_end(video_frame_info_t *video_info)
 {
    VkRect2D sci;
    vk_t *vk = video_info ? (vk_t*)video_info->userdata : NULL;
-
-   sci.offset.x      = 0;
-   sci.offset.y      = 0;
-   sci.extent.width  = video_info->width;
-   sci.extent.height = video_info->height;
-
-   vkCmdSetScissor (vk->cmd, 0, 1, &sci);
+   vk->tracker.use_scissor = false;
+   vk->tracker.dirty |= VULKAN_DIRTY_DYNAMIC_BIT;
 }
 
 menu_display_ctx_driver_t menu_display_ctx_vulkan = {
diff --git a/menu/menu_animation.c b/menu/menu_animation.c
index 628c41013e..559aa7e5bf 100644
--- a/menu/menu_animation.c
+++ b/menu/menu_animation.c
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2014-2017 - Jean-André Santoni
- *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *  Copyright (C) 2014-2018 - Jean-André Santoni
+ *  Copyright (C) 2011-2018 - Daniel De Matteis
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
  *  of the GNU General Public License as published by the Free Software Found-
@@ -40,6 +40,7 @@ struct tween
    uintptr_t   tag;
    easing_cb   easing;
    tween_cb    cb;
+   void        *userdata;
 };
 
 struct menu_animation
@@ -326,6 +327,7 @@ bool menu_animation_push(menu_animation_ctx_entry_t *entry)
    t.subject            = entry->subject;
    t.tag                = entry->tag;
    t.cb                 = entry->cb;
+   t.userdata           = entry->userdata;
    t.easing             = NULL;
 
    switch (entry->easing_enum)
@@ -519,7 +521,7 @@ bool menu_animation_update(float delta_time)
          anim.need_defrag = true;
 
          if (tween->cb)
-            tween->cb();
+            tween->cb(tween->userdata);
       }
 
       if (tween->running_since < tween->duration)
@@ -617,6 +619,63 @@ bool menu_animation_is_active(void)
    return animation_is_active;
 }
 
+bool menu_animation_kill_by_tag(menu_animation_ctx_tag *tag)
+{
+   unsigned i;
+
+   if (!tag || *tag == (uintptr_t)-1)
+      return false;
+
+   for (i = 0; i < anim.size; ++i)
+   {
+      if (anim.list[i].tag != *tag)
+         continue;
+
+      anim.list[i].alive   = false;
+      anim.list[i].subject = NULL;
+
+      if (i < anim.first_dead)
+         anim.first_dead = i;
+
+      anim.need_defrag = true;
+   }
+
+   return true;
+}
+
+void menu_animation_kill_by_subject(menu_animation_ctx_subject_t *subject)
+{
+   unsigned i, j,  killed = 0;
+   float            **sub = (float**)subject->data;
+
+   for (i = 0; i < anim.size && killed < subject->count; ++i)
+   {
+      if (!anim.list[i].alive)
+         continue;
+
+      for (j = 0; j < subject->count; ++j)
+      {
+         if (anim.list[i].subject != sub[j])
+            continue;
+
+         anim.list[i].alive   = false;
+         anim.list[i].subject = NULL;
+
+         if (i < anim.first_dead)
+            anim.first_dead = i;
+
+         killed++;
+         anim.need_defrag = true;
+         break;
+      }
+   }
+}
+
+float menu_animation_get_delta_time(void)
+{
+   return delta_time;
+}
+
 bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
 {
    switch (state)
@@ -645,67 +704,6 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
       case MENU_ANIMATION_CTL_SET_ACTIVE:
          animation_is_active       = true;
          break;
-      case MENU_ANIMATION_CTL_DELTA_TIME:
-         {
-            float *ptr = (float*)data;
-            if (!ptr)
-               return false;
-            *ptr = delta_time;
-         }
-         break;
-      case MENU_ANIMATION_CTL_KILL_BY_TAG:
-         {
-            unsigned i;
-            menu_animation_ctx_tag *tag = (menu_animation_ctx_tag*)data;
-
-            if (!tag || *tag == (uintptr_t)-1)
-               return false;
-
-            for (i = 0; i < anim.size; ++i)
-            {
-               if (anim.list[i].tag != *tag)
-                  continue;
-
-               anim.list[i].alive   = false;
-               anim.list[i].subject = NULL;
-
-               if (i < anim.first_dead)
-                  anim.first_dead = i;
-
-               anim.need_defrag = true;
-            }
-         }
-         break;
-      case MENU_ANIMATION_CTL_KILL_BY_SUBJECT:
-         {
-            unsigned i, j,  killed = 0;
-            menu_animation_ctx_subject_t *subject =
-               (menu_animation_ctx_subject_t*)data;
-            float            **sub = (float**)subject->data;
-
-            for (i = 0; i < anim.size && killed < subject->count; ++i)
-            {
-               if (!anim.list[i].alive)
-                  continue;
-
-               for (j = 0; j < subject->count; ++j)
-               {
-                  if (anim.list[i].subject != sub[j])
-                     continue;
-
-                  anim.list[i].alive   = false;
-                  anim.list[i].subject = NULL;
-
-                  if (i < anim.first_dead)
-                     anim.first_dead = i;
-
-                  killed++;
-                  anim.need_defrag = true;
-                  break;
-               }
-            }
-         }
-         break;
       case MENU_ANIMATION_CTL_NONE:
       default:
          break;
@@ -713,3 +711,29 @@ bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data)
 
    return true;
 }
+
+void menu_timer_start(menu_timer_t *timer, menu_timer_ctx_entry_t *timer_entry)
+{
+   menu_animation_ctx_entry_t entry;
+   menu_animation_ctx_tag tag = (uintptr_t) timer;
+
+   menu_timer_kill(timer);
+
+   *timer = 0.0f;
+
+   entry.easing_enum    = EASING_LINEAR;
+   entry.tag            = tag;
+   entry.duration       = timer_entry->duration;
+   entry.target_value   = 1.0f;
+   entry.subject        = timer;
+   entry.cb             = timer_entry->cb;
+   entry.userdata       = timer_entry->userdata;
+
+   menu_animation_push(&entry);
+}
+
+void menu_timer_kill(menu_timer_t *timer)
+{
+   menu_animation_ctx_tag tag = (uintptr_t) timer;
+   menu_animation_kill_by_tag(&tag);
+}
diff --git a/menu/menu_animation.h b/menu/menu_animation.h
index 2f6c8aefbb..d1bc513489 100644
--- a/menu/menu_animation.h
+++ b/menu/menu_animation.h
@@ -26,17 +26,14 @@
 RETRO_BEGIN_DECLS
 
 typedef float (*easing_cb) (float, float, float, float);
-typedef void  (*tween_cb)  (void);
+typedef void  (*tween_cb)  (void*);
 
 enum menu_animation_ctl_state
 {
    MENU_ANIMATION_CTL_NONE = 0,
    MENU_ANIMATION_CTL_DEINIT,
    MENU_ANIMATION_CTL_CLEAR_ACTIVE,
-   MENU_ANIMATION_CTL_SET_ACTIVE,
-   MENU_ANIMATION_CTL_DELTA_TIME,
-   MENU_ANIMATION_CTL_KILL_BY_TAG,
-   MENU_ANIMATION_CTL_KILL_BY_SUBJECT
+   MENU_ANIMATION_CTL_SET_ACTIVE
 };
 
 enum menu_animation_easing_type
@@ -109,6 +106,7 @@ typedef struct menu_animation_ctx_entry
    float target_value;
    float *subject;
    tween_cb cb;
+   void *userdata;
 } menu_animation_ctx_entry_t;
 
 typedef struct menu_animation_ctx_ticker
@@ -120,6 +118,19 @@ typedef struct menu_animation_ctx_ticker
    const char *str;
 } menu_animation_ctx_ticker_t;
 
+typedef float menu_timer_t;
+
+typedef struct menu_timer_ctx_entry
+{
+   float duration;
+   tween_cb cb;
+   void *userdata;
+} menu_timer_ctx_entry_t;
+
+void menu_timer_start(menu_timer_t *timer, menu_timer_ctx_entry_t *timer_entry);
+
+void menu_timer_kill(menu_timer_t *timer);
+
 bool menu_animation_update(float delta_time);
 
 bool menu_animation_get_ideal_delta_time(menu_animation_ctx_delta_t *delta);
@@ -130,8 +141,14 @@ void menu_animation_update_time(bool timedate_enable);
 
 bool menu_animation_is_active(void);
 
+bool menu_animation_kill_by_tag(menu_animation_ctx_tag *tag);
+
+void menu_animation_kill_by_subject(menu_animation_ctx_subject_t *subject);
+
 bool menu_animation_push(menu_animation_ctx_entry_t *entry);
 
+float menu_animation_get_delta_time(void);
+
 bool menu_animation_ctl(enum menu_animation_ctl_state state, void *data);
 
 RETRO_END_DECLS
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 76482efcb9..1b69dffcd7 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -44,6 +44,7 @@ enum
 {
    ACTION_OK_DL_DEFAULT = 0,
    ACTION_OK_DL_DROPDOWN_BOX_LIST,
+   ACTION_OK_DL_DROPDOWN_BOX_LIST_SPECIAL,
    ACTION_OK_DL_OPEN_ARCHIVE,
    ACTION_OK_DL_OPEN_ARCHIVE_DETECT_CORE,
    ACTION_OK_DL_MUSIC,
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 96b64a43a2..ac59ae52a7 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1,7 +1,7 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2017 - Daniel De Matteis
- *  Copyright (C) 2014-2017 - Jean-André Santoni
- *  Copyright (C) 2015-2017 - Andrés Suárez
+ *  Copyright (C) 2014-2017 - Jean-Andr� Santoni
+ *  Copyright (C) 2015-2017 - Andr�s Su�rez
  *  Copyright (C) 2016-2017 - Brad Parker
  *
  *  RetroArch is free software: you can redistribute it and/or modify it under the terms
@@ -78,6 +78,7 @@
 #include "../frontend/frontend_driver.h"
 #include "../ui/ui_companion_driver.h"
 #include "../gfx/video_driver.h"
+#include "../gfx/video_display_server.h"
 #include "../config.features.h"
 #include "../version_git.h"
 #include "../input/input_driver.h"
@@ -97,7 +98,7 @@ static enum msg_hash_enums new_type     = MSG_UNKNOWN;
  * function pointer callback functions that don't necessarily
  * call each other. */
 
-#if !defined(HAVE_SOCKET_LEGACY) && !defined(WIIU) && !defined(SWITCH)
+#if !defined(HAVE_SOCKET_LEGACY) && (!defined(SWITCH) || defined(SWITCH) && defined(HAVE_LIBNX))
 #include <net/net_ifinfo.h>
 
 static int menu_displaylist_parse_network_info(menu_displaylist_info_t *info)
@@ -1326,13 +1327,10 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
       {
          char *content_basename = strdup(label);
 
-         if (!string_is_empty(content_basename))
-         {
-            menu_driver_set_thumbnail_content(content_basename, strlen(content_basename) + 1);
-            menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH, NULL);
-            menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE, NULL);
-            free(content_basename);
-         }
+         menu_driver_set_thumbnail_content(content_basename, strlen(content_basename) + 1);
+         menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH, NULL);
+         menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE, NULL);
+         free(content_basename);
       }
 
       if (path)
@@ -1376,6 +1374,7 @@ static int menu_displaylist_parse_playlist(menu_displaylist_info_t *info,
       else
          menu_entries_append_enum(info->list, label,
                path, MENU_ENUM_LABEL_PLAYLIST_ENTRY, FILE_TYPE_RPL_ENTRY, 0, i);
+      info->count++;
 
       free(path_copy);
       free(fill_buf);
@@ -2081,6 +2080,7 @@ static int menu_displaylist_parse_settings_internal(void *data,
       menu_displaylist_info_t *info,
       enum menu_displaylist_parse_type parse_type,
       bool add_empty_entry,
+      unsigned entry_type,
       rarch_setting_t *setting
       )
 {
@@ -2232,8 +2232,16 @@ static int menu_displaylist_parse_settings_internal(void *data,
          goto loop;
 #endif
 
+      if (
+            (entry_type >= MENU_SETTINGS_INPUT_BEGIN) &&
+            (entry_type < MENU_SETTINGS_INPUT_END)
+         )
+          entry_type = MENU_SETTINGS_INPUT_BEGIN + count;
+      if (entry_type == 0)
+          entry_type = menu_setting_set_flags(setting);
+
       menu_entries_append(info->list, short_description,
-            name, menu_setting_set_flags(setting), 0, 0);
+            name, entry_type, 0, 0);
       count++;
 
 loop:
@@ -2482,7 +2490,7 @@ loop:
    return 0;
 }
 
-#define menu_displaylist_parse_settings(data, info, info_label, parse_type, add_empty_entry) menu_displaylist_parse_settings_internal(data, info, parse_type, add_empty_entry, menu_setting_find(info_label))
+#define menu_displaylist_parse_settings(data, info, info_label, parse_type, add_empty_entry, entry_type) menu_displaylist_parse_settings_internal(data, info, parse_type, add_empty_entry, entry_type, menu_setting_find(info_label))
 
 #define menu_displaylist_parse_settings_enum(data, info, label, parse_type, add_empty_entry) menu_displaylist_parse_settings_internal_enum(data, info, parse_type, add_empty_entry, menu_setting_find_enum(label), label)
 
@@ -2935,14 +2943,14 @@ static int menu_displaylist_parse_horizontal_content_actions(
 static int menu_displaylist_parse_information_list(
       menu_displaylist_info_t *info)
 {
-   core_info_t *core_info         = NULL;
-   rarch_system_info_t *system    = runloop_get_system_info();
+   core_info_t   *core_info         = NULL;
+   struct retro_system_info *system = runloop_get_libretro_system_info();
 
    core_info_get_current_core(&core_info);
 
    if (  system &&
-         (!string_is_empty(system->info.library_name) &&
-          !string_is_equal(system->info.library_name,
+         (!string_is_empty(system->library_name) &&
+          !string_is_equal(system->library_name,
              msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE))
          )
          && core_info && core_info->config_data
@@ -3292,8 +3300,9 @@ static int menu_displaylist_parse_options_remappings(
       menu_handle_t *menu,
       menu_displaylist_info_t *info)
 {
+   unsigned device;
    unsigned p, retro_id;
-   rarch_system_info_t *system = NULL;
+   settings_t        *settings = config_get_ptr();
    unsigned max_users          = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
 
    for (p = 0; p < max_users; p++)
@@ -3310,9 +3319,9 @@ static int menu_displaylist_parse_options_remappings(
                msg_hash_to_str(MENU_ENUM_LABEL_INPUT_PLAYER_ANALOG_DPAD_MODE), val);
 
       menu_displaylist_parse_settings(menu, info,
-            key_type, PARSE_ONLY_UINT, true);
+            key_type, PARSE_ONLY_UINT, true, 0);
       menu_displaylist_parse_settings(menu, info,
-            key_analog, PARSE_ONLY_UINT, true);
+            key_analog, PARSE_ONLY_UINT, true, 0);
    }
 
    menu_entries_append_enum(info->list,
@@ -3363,76 +3372,69 @@ static int menu_displaylist_parse_options_remappings(
             MENU_SETTING_ACTION, 0, 0);
    }
 
-   system    = runloop_get_system_info();
-
-   if (system)
+   for (p = 0; p < max_users; p++)
    {
-      settings_t *settings = config_get_ptr();
-      unsigned device;
-      for (p = 0; p < max_users; p++)
+      device = settings->uints.input_libretro_device[p];
+      device &= RETRO_DEVICE_MASK;
+
+      if (device == RETRO_DEVICE_JOYPAD || device == RETRO_DEVICE_ANALOG)
       {
-         device = settings->uints.input_libretro_device[p];
-         device &= RETRO_DEVICE_MASK;
-
-         if (device == RETRO_DEVICE_JOYPAD || device == RETRO_DEVICE_ANALOG)
+         for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND + 8; retro_id++)
          {
-            for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND + 8; retro_id++)
-            {
-               char desc_label[64];
-               char descriptor[255];
-               const struct retro_keybind *auto_bind = NULL;
-               const struct retro_keybind *keybind   = NULL;
+            char desc_label[64];
+            char descriptor[255];
+            const struct retro_keybind *auto_bind = NULL;
+            const struct retro_keybind *keybind   = NULL;
 
-               keybind   = &input_config_binds[p][retro_id];
-               auto_bind = (const struct retro_keybind*)
-                  input_config_get_bind_auto(p, retro_id);
+            keybind   = &input_config_binds[p][retro_id];
+            auto_bind = (const struct retro_keybind*)
+               input_config_get_bind_auto(p, retro_id);
 
-               input_config_get_bind_string(descriptor,
+            input_config_get_bind_string(descriptor,
                   keybind, auto_bind, sizeof(descriptor));
 
-               if(!strstr(descriptor, "Auto"))
-               {
-                  const struct retro_keybind *keyptr =
-                     &input_config_binds[p][retro_id];
+            if(!strstr(descriptor, "Auto"))
+            {
+               const struct retro_keybind *keyptr =
+                  &input_config_binds[p][retro_id];
 
-                  snprintf(desc_label, sizeof(desc_label), "%s %s", msg_hash_to_str(keyptr->enum_idx), descriptor);
-                  strlcpy(descriptor, desc_label, sizeof(descriptor));
-               }
-
-               menu_entries_append_enum(info->list, descriptor, "",
-                     MSG_UNKNOWN,
-                     MENU_SETTINGS_INPUT_DESC_BEGIN +
-                     (p * (RARCH_FIRST_CUSTOM_BIND + 8)) +  retro_id, 0, 0);
+               snprintf(desc_label, sizeof(desc_label), "%s %s", msg_hash_to_str(keyptr->enum_idx), descriptor);
+               strlcpy(descriptor, desc_label, sizeof(descriptor));
             }
+
+            menu_entries_append_enum(info->list, descriptor, "",
+                  MSG_UNKNOWN,
+                  MENU_SETTINGS_INPUT_DESC_BEGIN +
+                  (p * (RARCH_FIRST_CUSTOM_BIND + 8)) +  retro_id, 0, 0);
          }
-         else if (device == RETRO_DEVICE_KEYBOARD)
+      }
+      else if (device == RETRO_DEVICE_KEYBOARD)
+      {
+         for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
          {
-            for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
-            {
-               char descriptor[255];
-               const struct retro_keybind *auto_bind = NULL;
-               const struct retro_keybind *keybind   = NULL;
+            char descriptor[255];
+            const struct retro_keybind *auto_bind = NULL;
+            const struct retro_keybind *keybind   = NULL;
 
-               keybind   = &input_config_binds[p][retro_id];
-               auto_bind = (const struct retro_keybind*)
-                  input_config_get_bind_auto(p, retro_id);
+            keybind   = &input_config_binds[p][retro_id];
+            auto_bind = (const struct retro_keybind*)
+               input_config_get_bind_auto(p, retro_id);
 
-               input_config_get_bind_string(descriptor,
+            input_config_get_bind_string(descriptor,
                   keybind, auto_bind, sizeof(descriptor));
 
-               if(!strstr(descriptor, "Auto"))
-               {
-                  const struct retro_keybind *keyptr =
-                     &input_config_binds[p][retro_id];
+            if(!strstr(descriptor, "Auto"))
+            {
+               const struct retro_keybind *keyptr =
+                  &input_config_binds[p][retro_id];
 
-                  strlcpy(descriptor, msg_hash_to_str(keyptr->enum_idx), sizeof(descriptor));
-               }
-
-               menu_entries_append_enum(info->list, descriptor, "",
-                     MSG_UNKNOWN,
-                     MENU_SETTINGS_INPUT_DESC_KBD_BEGIN +
-                     (p * RARCH_FIRST_CUSTOM_BIND) + retro_id, 0, 0);
+               strlcpy(descriptor, msg_hash_to_str(keyptr->enum_idx), sizeof(descriptor));
             }
+
+            menu_entries_append_enum(info->list, descriptor, "",
+                  MSG_UNKNOWN,
+                  MENU_SETTINGS_INPUT_DESC_KBD_BEGIN +
+                  (p * RARCH_FIRST_CUSTOM_BIND) + retro_id, 0, 0);
          }
       }
    }
@@ -4057,18 +4059,14 @@ static void menu_displaylist_parse_playlist_generic(
       int *ret)
 {
    playlist_t *playlist = NULL;
-   char *path_playlist  = NULL;
 
    menu_displaylist_set_new_playlist(menu, playlist_path);
 
    playlist             = playlist_get_cached();
-   path_playlist        = strdup(playlist_name);
 
    if (playlist)
       *ret              = menu_displaylist_parse_playlist(info,
-            playlist, path_playlist, true);
-
-   free(path_playlist);
+            playlist, playlist_name, true);
 }
 
 #ifdef HAVE_NETWORKING
@@ -4254,7 +4252,18 @@ void menu_displaylist_info_init(menu_displaylist_info_t *info)
    info->setting                  = NULL;
 }
 
-bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
+bool menu_displaylist_setting(menu_displaylist_ctx_parse_entry_t *entry)
+{
+   if (menu_displaylist_parse_settings_enum(entry->data,
+            entry->info,
+            entry->enum_idx,
+            entry->parse_type,
+            entry->add_empty_entry) == -1)
+      return false;
+   return true;
+}
+
+bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist_info_t *info)
 {
    size_t i;
    menu_ctx_displaylist_t disp_list;
@@ -4263,7 +4272,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
    bool use_filebrowser          = false;
    unsigned count                = 0;
    int ret                       = 0;
-   menu_displaylist_info_t *info = (menu_displaylist_info_t*)data;
 
    if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
       return false;
@@ -4741,6 +4749,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          info->need_push       = true;
          break;
       case DISPLAYLIST_FAVORITES:
+         info->count           = 0;
+
          {
             settings_t      *settings     = config_get_ptr();
             menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
@@ -4750,6 +4760,17 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                   &ret);
          }
 
+         if (info->count == 0)
+         {
+            menu_entries_append_enum(info->list,
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_FAVORITES_AVAILABLE),
+                  msg_hash_to_str(MENU_ENUM_LABEL_NO_FAVORITES_AVAILABLE),
+                  MENU_ENUM_LABEL_NO_FAVORITES_AVAILABLE,
+                  MENU_INFO_MESSAGE, 0, 0);
+            info->need_push_no_playlist_entries = false;
+            ret = 0;
+         }
+
          ret                   = 0;
          info->need_refresh    = true;
          info->need_push       = true;
@@ -4757,19 +4778,23 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
       case DISPLAYLIST_MUSIC_HISTORY:
          {
             settings_t      *settings     = config_get_ptr();
+            info->count                   = 0;
+
             if (settings->bools.history_list_enable)
                menu_displaylist_parse_playlist_generic(menu, info,
                      "music_history",
                      settings->paths.path_content_music_history,
                      &ret);
-            else
+
+            if (info->count == 0)
             {
                menu_entries_append_enum(info->list,
                      msg_hash_to_str(
-                        MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE),
-                     msg_hash_to_str(MENU_ENUM_LABEL_NO_HISTORY_AVAILABLE),
-                     MENU_ENUM_LABEL_NO_HISTORY_AVAILABLE,
+                        MENU_ENUM_LABEL_VALUE_NO_MUSIC_AVAILABLE),
+                     msg_hash_to_str(MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE),
+                     MENU_ENUM_LABEL_NO_MUSIC_AVAILABLE,
                      MENU_INFO_MESSAGE, 0, 0);
+               info->need_push_no_playlist_entries = false;
                ret = 0;
             }
          }
@@ -4781,6 +4806,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          }
          break;
       case DISPLAYLIST_VIDEO_HISTORY:
+         info->count           = 0;
 #if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
          {
             settings_t      *settings     = config_get_ptr();
@@ -4797,13 +4823,15 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          }
 #endif
 
-         if (count == 0)
+         if (info->count == 0)
          {
             menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE),
-                  msg_hash_to_str(MENU_ENUM_LABEL_NO_HISTORY_AVAILABLE),
-                  MENU_ENUM_LABEL_NO_HISTORY_AVAILABLE,
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_VIDEOS_AVAILABLE),
+                  msg_hash_to_str(MENU_ENUM_LABEL_NO_VIDEOS_AVAILABLE),
+                  MENU_ENUM_LABEL_NO_VIDEOS_AVAILABLE,
                   MENU_INFO_MESSAGE, 0, 0);
+            info->need_push_no_playlist_entries = false;
+            ret = 0;
          }
 
          if (ret == 0)
@@ -4834,7 +4862,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          break;
       case DISPLAYLIST_NETWORK_INFO:
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
-#if defined(HAVE_NETWORKING) && !defined(HAVE_SOCKET_LEGACY) && !defined(WIIU) && !defined(SWITCH)
+#if defined(HAVE_NETWORKING) && !defined(HAVE_SOCKET_LEGACY) && (!defined(SWITCH) || defined(SWITCH) && defined(HAVE_LIBNX))
+         network_init();
          count = menu_displaylist_parse_network_info(info);
 #endif
 
@@ -4881,8 +4910,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 
             if (cores_names_size == 0)
             {
-               rarch_system_info_t *system_info = runloop_get_system_info();
-               struct retro_system_info *system = &system_info->info;
+               struct retro_system_info *system = runloop_get_libretro_system_info();
                const char *core_name            = system ? system->library_name : NULL;
 
                if (!path_is_empty(RARCH_PATH_CORE))
@@ -4996,12 +5024,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                         0);
 
                   {
-                     const char *core_name            = NULL;
-                     rarch_system_info_t *system_info = runloop_get_system_info();
-                     struct retro_system_info *system = &system_info->info;
-
-                     if (system)
-                        core_name = system->library_name;
+                     struct retro_system_info *system = runloop_get_libretro_system_info();
+                     const char *core_name            = system ? system->library_name : NULL;
 
                      if (!string_is_empty(core_name))
                         file_list_set_alt_at_offset(info->list, 0,
@@ -5367,7 +5391,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 
          setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_BROWSE_MEMORY);
          if ( setting )
-            setting->max = cheat_manager_state.actual_memory_size>0?cheat_manager_state.actual_memory_size-1:0 ;
+            setting->max = cheat_manager_state.total_memory_size>0?cheat_manager_state.total_memory_size-1:0 ;
 
 
          menu_displaylist_parse_settings_enum(menu, info,
@@ -5571,7 +5595,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
             setting->max = cheat_manager_state.num_matches-1;
          setting = menu_setting_find_enum(MENU_ENUM_LABEL_CHEAT_BROWSE_MEMORY);
          if (setting)
-            setting->max = cheat_manager_state.actual_memory_size>0?cheat_manager_state.actual_memory_size-1:0 ;
+            setting->max = cheat_manager_state.total_memory_size>0?cheat_manager_state.total_memory_size-1:0 ;
 
          info->need_refresh = true;
          info->need_push    = true;
@@ -5956,6 +5980,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                   MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME,
                   PARSE_ONLY_UINT, false) == 0)
             count++;
+         if (menu_displaylist_parse_settings_enum(menu, info,
+                  MENU_ENUM_LABEL_OZONE_MENU_COLOR_THEME,
+                  PARSE_ONLY_UINT, false) == 0)
+            count++;
          if (menu_displaylist_parse_settings_enum(menu, info,
                   MENU_ENUM_LABEL_MATERIALUI_ICONS_ENABLE,
                   PARSE_ONLY_BOOL, false) == 0)
@@ -5972,6 +6000,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                   MENU_ENUM_LABEL_MATERIALUI_MENU_FOOTER_OPACITY,
                   PARSE_ONLY_FLOAT, false) == 0)
             count++;
+         if (menu_displaylist_parse_settings_enum(menu, info,
+                  MENU_ENUM_LABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+                  PARSE_ONLY_BOOL, false) == 0)
+            count++;
          if (menu_displaylist_parse_settings_enum(menu, info,
                   MENU_ENUM_LABEL_THUMBNAILS,
                   PARSE_ONLY_UINT, false) == 0)
@@ -6066,6 +6098,11 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_UI_COMPANION_TOGGLE,
                PARSE_ONLY_BOOL, false);
+#endif
+#ifdef _3DS
+         menu_displaylist_parse_settings_enum(menu, info,
+               MENU_ENUM_LABEL_VIDEO_3DS_LCD_BOTTOM,
+               PARSE_ONLY_BOOL, false);
 #endif
          info->need_refresh = true;
          info->need_push    = true;
@@ -6331,6 +6368,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          break;
       case DISPLAYLIST_USER_SETTINGS_LIST:
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
+         menu_displaylist_parse_settings_enum(menu, info,
+               MENU_ENUM_LABEL_PRIVACY_SETTINGS,
+               PARSE_ACTION, false);
 
          if (menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_ACCOUNTS_LIST,
@@ -6499,9 +6539,10 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          break;
       case DISPLAYLIST_VIDEO_SETTINGS_LIST:
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
-         menu_displaylist_parse_settings_enum(menu, info,
-               MENU_ENUM_LABEL_CRT_SWITCHRES_SETTINGS,
-               PARSE_ACTION, false);
+         if (!string_is_equal(video_display_server_get_ident(), "null"))
+            menu_displaylist_parse_settings_enum(menu, info,
+                  MENU_ENUM_LABEL_CRT_SWITCHRES_SETTINGS,
+                  PARSE_ACTION, false);
          menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_SUSPEND_SCREENSAVER_ENABLE,
                PARSE_ONLY_BOOL, false);
@@ -6828,7 +6869,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                      msg_hash_to_str(MENU_ENUM_LABEL_INPUT_SPLIT_JOYCON), val);
 
                menu_displaylist_parse_settings(menu, info,
-                     key_split_joycon, PARSE_ONLY_UINT, true);
+                     key_split_joycon, PARSE_ONLY_UINT, true, 0);
             }
          }
 #endif
@@ -6952,8 +6993,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                MENU_ENUM_LABEL_USER_SETTINGS,   PARSE_ACTION, false);
          ret = menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_DIRECTORY_SETTINGS,   PARSE_ACTION, false);
-         ret = menu_displaylist_parse_settings_enum(menu, info,
-               MENU_ENUM_LABEL_PRIVACY_SETTINGS,   PARSE_ACTION, false);
          info->need_push    = true;
          break;
       case DISPLAYLIST_HORIZONTAL:
@@ -7303,19 +7342,21 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
          {
             settings_t      *settings      = config_get_ptr();
-            rarch_system_info_t *system    = runloop_get_system_info();
+            rarch_system_info_t *sys_info  = runloop_get_system_info();
 
-            if (system)
+            if (sys_info)
             {
-               if (!string_is_empty(system->info.library_name) &&
-                     !string_is_equal(system->info.library_name,
+               struct retro_system_info *system = runloop_get_libretro_system_info();
+
+               if (!string_is_empty(system->library_name) &&
+                     !string_is_equal(system->library_name,
                         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
                   if (!rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
                      menu_displaylist_parse_settings_enum(menu, info,
                            MENU_ENUM_LABEL_CONTENT_SETTINGS,
                            PARSE_ACTION, false);
 
-               if (system->load_no_content)
+               if (sys_info->load_no_content)
                   menu_displaylist_parse_settings_enum(menu, info,
                         MENU_ENUM_LABEL_START_CORE, PARSE_ACTION, false);
             }
@@ -7390,19 +7431,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
             info->need_push    = true;
          }
          break;
-      case DISPLAYLIST_SETTING_ENUM:
-         {
-            menu_displaylist_ctx_parse_entry_t *entry  =
-               (menu_displaylist_ctx_parse_entry_t*)data;
-
-            if (menu_displaylist_parse_settings_enum(entry->data,
-                     entry->info,
-                     entry->enum_idx,
-                     entry->parse_type,
-                     entry->add_empty_entry) == -1)
-               return false;
-         }
-         break;
       case DISPLAYLIST_HELP:
          menu_entries_append_enum(info->list, info->path,
                info->label, MSG_UNKNOWN, info->type, info->directory_ptr, 0);
@@ -7629,7 +7657,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 
             strlcpy(lbl, temp_val, sizeof(lbl));
             ret = menu_displaylist_parse_settings(menu, info,
-                  lbl, PARSE_NONE, true);
+                  lbl, PARSE_NONE, true, MENU_SETTINGS_INPUT_BEGIN);
             info->need_refresh = true;
             info->need_push    = true;
          }
@@ -7817,6 +7845,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          }
          break;
       case DISPLAYLIST_IMAGES_HISTORY:
+         info->count           = 0;
 #ifdef HAVE_IMAGEVIEWER
          {
             settings_t *settings      = config_get_ptr();
@@ -7830,13 +7859,15 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
             }
          }
 #endif
-         if (count == 0)
+         if (info->count == 0)
          {
             menu_entries_append_enum(info->list,
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE),
-                  msg_hash_to_str(MENU_ENUM_LABEL_NO_HISTORY_AVAILABLE),
-                  MENU_ENUM_LABEL_NO_HISTORY_AVAILABLE,
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_IMAGES_AVAILABLE),
+                  msg_hash_to_str(MENU_ENUM_LABEL_NO_IMAGES_AVAILABLE),
+                  MENU_ENUM_LABEL_NO_IMAGES_AVAILABLE,
                   MENU_INFO_MESSAGE, 0, 0);
+            info->need_push_no_playlist_entries = false;
+            ret = 0;
          }
 
          ret                   = 0;
@@ -7995,6 +8026,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                      unsigned size                   = (unsigned)tmp_str_list->size;
                      unsigned i                      = atoi(tmp_str_list->elems[size-1].data);
                      struct core_option *option      = NULL;
+                     bool checked_found              = false;
+                     unsigned checked                = 0;
+                     const char *val                 = core_option_manager_get_val(coreopts, i-1);
 
                      i--;
 
@@ -8016,9 +8050,19 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                                     val_d,
                                     MENU_ENUM_LABEL_NO_ITEMS,
                                     MENU_SETTING_DROPDOWN_SETTING_CORE_OPTIONS_ITEM, k, 0);
+
+                              if (!checked_found && string_is_equal(str, val))
+                              {
+                                 checked = k;
+                                 checked_found = true;
+                              }
+
                               count++;
                            }
                         }
+
+                        if (checked_found)
+                           menu_entries_set_checked(info->list, checked, true);
                      }
                   }
                }
@@ -8040,7 +8084,9 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                            if (tmp_str_list && tmp_str_list->size > 0)
                            {
                               unsigned i;
-                              unsigned size = (unsigned)tmp_str_list->size;
+                              unsigned size        = (unsigned)tmp_str_list->size;
+                              bool checked_found   = false;
+                              unsigned checked     = 0;
 
                               for (i = 0; i < size; i++)
                               {
@@ -8051,7 +8097,16 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                                        val_d,
                                        MENU_ENUM_LABEL_NO_ITEMS,
                                        MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM, i, 0);
+
+                                 if (!checked_found && string_is_equal(tmp_str_list->elems[i].data, setting->value.target.string))
+                                 {
+                                    checked = i;
+                                    checked_found = true;
+                                 }
                               }
+
+                              if (checked_found)
+                                 menu_entries_set_checked(info->list, checked, true);
                            }
                         }
                         break;
@@ -8063,6 +8118,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                            float step             = setting->step;
                            double min             = setting->enforce_minrange ? setting->min : 0.00;
                            double max             = setting->enforce_maxrange ? setting->max : 999.00;
+                           bool checked_found     = false;
+                           unsigned checked       = 0;
 
                            if (setting->get_string_representation)
                            {
@@ -8081,6 +8138,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                                        val_d,
                                        MENU_ENUM_LABEL_NO_ITEMS,
                                        setting_type, val, 0);
+
+                                 if (!checked_found && val == orig_value)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
                               }
 
                               *setting->value.target.integer = orig_value;
@@ -8100,8 +8164,18 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                                        val_d,
                                        MENU_ENUM_LABEL_NO_ITEMS,
                                        setting_type, val, 0);
+
+                                 if (!checked_found && val == orig_value)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
                               }
                            }
+
+                           if (checked_found)
+                              menu_entries_set_checked(info->list, checked, true);
                         }
                         break;
                      case ST_FLOAT:
@@ -8112,6 +8186,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                            float step             = setting->step;
                            double min             = setting->enforce_minrange ? setting->min : 0.00;
                            double max             = setting->enforce_maxrange ? setting->max : 999.00;
+                           bool checked_found     = false;
+                           unsigned checked       = 0;
 
                            if (setting->get_string_representation)
                            {
@@ -8129,6 +8205,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                                        val_d,
                                        MENU_ENUM_LABEL_NO_ITEMS,
                                        setting_type, 0, 0);
+
+                                 if (!checked_found && fabs(i - orig_value) <= 0.01f)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
                               }
 
                               *setting->value.target.fraction = orig_value;
@@ -8147,8 +8230,18 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                                        val_d,
                                        MENU_ENUM_LABEL_NO_ITEMS,
                                        setting_type, 0, 0);
+
+                                 if (!checked_found && fabs(i - orig_value) <= 0.01f)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
                               }
                            }
+
+                           if (checked_found)
+                              menu_entries_set_checked(info->list, checked, true);
                         }
                         break;
                      case ST_UINT:
@@ -8159,6 +8252,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                            float step             = setting->step;
                            double min             = setting->enforce_minrange ? setting->min : 0.00;
                            double max             = setting->enforce_maxrange ? setting->max : 999.00;
+                           bool checked_found     = false;
+                           unsigned checked       = 0;
 
                            if (setting->get_string_representation)
                            {
@@ -8177,6 +8272,13 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                                        val_d,
                                        MENU_ENUM_LABEL_NO_ITEMS,
                                        setting_type, val, 0);
+
+                                 if (!checked_found && val == orig_value)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
                               }
 
                               *setting->value.target.unsigned_integer = orig_value;
@@ -8196,8 +8298,333 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                                        val_d,
                                        MENU_ENUM_LABEL_NO_ITEMS,
                                        setting_type, val, 0);
+
+                                 if (!checked_found && val == orig_value)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
                               }
                            }
+
+                           if (checked_found)
+                              menu_entries_set_checked(info->list, checked, true);
+                        }
+                        break;
+                     default:
+                        break;
+                  }
+               }
+            }
+
+            info->need_refresh       = true;
+            info->need_push          = true;
+         }
+         break;
+      case DISPLAYLIST_DROPDOWN_LIST_SPECIAL:
+         {
+            menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, info->list);
+
+            if (strstr(info->path, "core_option_"))
+            {
+               struct string_list *tmp_str_list = string_split(info->path, "_");
+
+               if (tmp_str_list && tmp_str_list->size > 0)
+               {
+                  core_option_manager_t *coreopts = NULL;
+
+                  rarch_ctl(RARCH_CTL_CORE_OPTIONS_LIST_GET, &coreopts);
+
+                  if (coreopts)
+                  {
+                     unsigned size                   = (unsigned)tmp_str_list->size;
+                     unsigned i                      = atoi(tmp_str_list->elems[size-1].data);
+                     struct core_option *option      = NULL;
+                     bool checked_found              = false;
+                     unsigned checked                = 0;
+                     const char *val                 = core_option_manager_get_val(coreopts, i-1);
+
+                     i--;
+
+                     option                          = (struct core_option*)&coreopts->opts[i];
+
+                     if (option)
+                     {
+                        unsigned k;
+                        for (k = 0; k < option->vals->size; k++)
+                        {
+                           const char *str = option->vals->elems[k].data;
+
+                           if (!string_is_empty(str))
+                           {
+                              char val_d[256];
+                              snprintf(val_d, sizeof(val_d), "%d", i);
+                              menu_entries_append_enum(info->list,
+                                    str,
+                                    val_d,
+                                    MENU_ENUM_LABEL_NO_ITEMS,
+                                    MENU_SETTING_DROPDOWN_SETTING_CORE_OPTIONS_ITEM_SPECIAL, k, 0);
+
+                              if (!checked_found && string_is_equal(str, val))
+                              {
+                                 checked = k;
+                                 checked_found = true;
+                              }
+
+                              count++;
+                           }
+                        }
+
+                        if (checked_found)
+                           menu_entries_set_checked(info->list, checked, true);
+                     }
+                  }
+               }
+
+            }
+            else
+            {
+               enum msg_hash_enums enum_idx = (enum msg_hash_enums)atoi(info->path);
+               rarch_setting_t     *setting = menu_setting_find_enum(enum_idx);
+
+               if (setting)
+               {
+                  switch (setting->type)
+                  {
+                     case ST_STRING_OPTIONS:
+                        {
+                           struct string_list *tmp_str_list = string_split(setting->values, "|");
+
+                           if (tmp_str_list && tmp_str_list->size > 0)
+                           {
+                              unsigned i;
+                              unsigned size        = (unsigned)tmp_str_list->size;
+                              bool checked_found   = false;
+                              unsigned checked     = 0;
+
+                              for (i = 0; i < size; i++)
+                              {
+                                 char val_d[256];
+                                 snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
+                                 menu_entries_append_enum(info->list,
+                                       tmp_str_list->elems[i].data,
+                                       val_d,
+                                       MENU_ENUM_LABEL_NO_ITEMS,
+                                       MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM_SPECIAL, i, 0);
+
+                                 if (!checked_found && string_is_equal(tmp_str_list->elems[i].data, setting->value.target.string))
+                                 {
+                                    checked = i;
+                                    checked_found = true;
+                                 }
+                              }
+
+                              if (checked_found)
+                                 menu_entries_set_checked(info->list, checked, true);
+                           }
+                        }
+                        break;
+                     case ST_INT:
+                        {
+                           float i;
+                           int32_t orig_value     = *setting->value.target.integer;
+                           unsigned setting_type  = MENU_SETTING_DROPDOWN_SETTING_INT_ITEM_SPECIAL;
+                           float step             = setting->step;
+                           double min             = setting->enforce_minrange ? setting->min : 0.00;
+                           double max             = setting->enforce_maxrange ? setting->max : 999.00;
+                           bool checked_found     = false;
+                           unsigned checked       = 0;
+
+                           if (setting->get_string_representation)
+                           {
+                              for (i = min; i <= max; i += step)
+                              {
+                                 char val_s[256], val_d[256];
+                                 int val = (int)i;
+
+                                 *setting->value.target.integer = val;
+
+                                 setting->get_string_representation(setting,
+                                       val_s, sizeof(val_s));
+                                 snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
+                                 menu_entries_append_enum(info->list,
+                                       val_s,
+                                       val_d,
+                                       MENU_ENUM_LABEL_NO_ITEMS,
+                                       setting_type, val, 0);
+
+                                 if (!checked_found && val == orig_value)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
+                              }
+
+                              *setting->value.target.integer = orig_value;
+                           }
+                           else
+                           {
+                              for (i = min; i <= max; i += step)
+                              {
+                                 char val_s[16], val_d[16];
+                                 int val = (int)i;
+
+                                 snprintf(val_s, sizeof(val_s), "%d", val);
+                                 snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
+
+                                 menu_entries_append_enum(info->list,
+                                       val_s,
+                                       val_d,
+                                       MENU_ENUM_LABEL_NO_ITEMS,
+                                       setting_type, val, 0);
+
+                                 if (!checked_found && val == orig_value)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
+                              }
+                           }
+
+                           if (checked_found)
+                              menu_entries_set_checked(info->list, checked, true);
+                        }
+                        break;
+                     case ST_FLOAT:
+                        {
+                           float i;
+                           float orig_value       = *setting->value.target.fraction;
+                           unsigned setting_type  = MENU_SETTING_DROPDOWN_SETTING_FLOAT_ITEM_SPECIAL;
+                           float step             = setting->step;
+                           double min             = setting->enforce_minrange ? setting->min : 0.00;
+                           double max             = setting->enforce_maxrange ? setting->max : 999.00;
+                           bool checked_found     = false;
+                           unsigned checked       = 0;
+
+                           if (setting->get_string_representation)
+                           {
+                              for (i = min; i <= max; i += step)
+                              {
+                                 char val_s[256], val_d[256];
+
+                                 *setting->value.target.fraction = i;
+
+                                 setting->get_string_representation(setting,
+                                       val_s, sizeof(val_s));
+                                 snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
+                                 menu_entries_append_enum(info->list,
+                                       val_s,
+                                       val_d,
+                                       MENU_ENUM_LABEL_NO_ITEMS,
+                                       setting_type, 0, 0);
+
+                                 if (!checked_found && fabs(i - orig_value) <= 0.01f)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
+                              }
+
+                              *setting->value.target.fraction = orig_value;
+                           }
+                           else
+                           {
+                              for (i = min; i <= max; i += step)
+                              {
+                                 char val_s[16], val_d[16];
+
+                                 snprintf(val_s, sizeof(val_s), "%.2f", i);
+                                 snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
+
+                                 menu_entries_append_enum(info->list,
+                                       val_s,
+                                       val_d,
+                                       MENU_ENUM_LABEL_NO_ITEMS,
+                                       setting_type, 0, 0);
+
+                                 if (!checked_found && fabs(i - orig_value) <= 0.01f)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
+                              }
+                           }
+
+                           if (checked_found)
+                              menu_entries_set_checked(info->list, checked, true);
+                        }
+                        break;
+                     case ST_UINT:
+                        {
+                           float i;
+                           unsigned orig_value    = *setting->value.target.unsigned_integer;
+                           unsigned setting_type  = MENU_SETTING_DROPDOWN_SETTING_UINT_ITEM_SPECIAL;
+                           float step             = setting->step;
+                           double min             = setting->enforce_minrange ? setting->min : 0.00;
+                           double max             = setting->enforce_maxrange ? setting->max : 999.00;
+                           bool checked_found     = false;
+                           unsigned checked       = 0;
+
+                           if (setting->get_string_representation)
+                           {
+                              for (i = min; i <= max; i += step)
+                              {
+                                 char val_s[256], val_d[256];
+                                 int val = (int)i;
+
+                                 *setting->value.target.unsigned_integer = val;
+
+                                 setting->get_string_representation(setting,
+                                       val_s, sizeof(val_s));
+                                 snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
+                                 menu_entries_append_enum(info->list,
+                                       val_s,
+                                       val_d,
+                                       MENU_ENUM_LABEL_NO_ITEMS,
+                                       setting_type, val, 0);
+
+                                 if (!checked_found && val == orig_value)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
+                              }
+
+                              *setting->value.target.unsigned_integer = orig_value;
+                           }
+                           else
+                           {
+                              for (i = min; i <= max; i += step)
+                              {
+                                 char val_s[16], val_d[16];
+                                 int val = (int)i;
+
+                                 snprintf(val_s, sizeof(val_s), "%d", val);
+                                 snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
+
+                                 menu_entries_append_enum(info->list,
+                                       val_s,
+                                       val_d,
+                                       MENU_ENUM_LABEL_NO_ITEMS,
+                                       setting_type, val, 0);
+
+                                 if (!checked_found && val == orig_value)
+                                 {
+                                    checked       = count;
+                                    checked_found = true;
+                                 }
+                                 count++;
+                              }
+                           }
+
+                           if (checked_found)
+                              menu_entries_set_checked(info->list, checked, true);
                         }
                         break;
                      default:
diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h
index 5c1ff8abaa..79b8603dbd 100644
--- a/menu/menu_displaylist.h
+++ b/menu/menu_displaylist.h
@@ -55,12 +55,12 @@ enum menu_displaylist_ctl_state
 {
    DISPLAYLIST_NONE = 0,
    DISPLAYLIST_DROPDOWN_LIST,
+   DISPLAYLIST_DROPDOWN_LIST_SPECIAL,
    DISPLAYLIST_INFO,
    DISPLAYLIST_HELP,
    DISPLAYLIST_HELP_SCREEN_LIST,
    DISPLAYLIST_MAIN_MENU,
    DISPLAYLIST_GENERIC,
-   DISPLAYLIST_SETTING_ENUM,
    DISPLAYLIST_SETTINGS_ALL,
    DISPLAYLIST_HORIZONTAL,
    DISPLAYLIST_HORIZONTAL_CONTENT_ACTIONS,
@@ -207,6 +207,8 @@ typedef struct menu_displaylist_info
    /* does the navigation index need to be cleared to 0 (first entry) ? */
    bool need_navigation_clear;
 
+   unsigned count;
+
    char *path;
    char *path_b;
    char *path_c;
@@ -245,7 +247,9 @@ void menu_displaylist_info_free(menu_displaylist_info_t *info);
 
 void menu_displaylist_info_init(menu_displaylist_info_t *info);
 
-bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data);
+bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, menu_displaylist_info_t *info);
+
+bool menu_displaylist_setting(menu_displaylist_ctx_parse_entry_t *entry);
 
 #ifdef HAVE_NETWORKING
 void netplay_refresh_rooms_menu(file_list_t *list);
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 0ec43c8325..8ca72c132e 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -76,8 +76,18 @@ typedef struct menu_ctx_load_image
    enum menu_image_type type;
 } menu_ctx_load_image_t;
 
+float osk_dark[16] =  {
+   0.00, 0.00, 0.00, 0.85,
+   0.00, 0.00, 0.00, 0.85,
+   0.00, 0.00, 0.00, 0.85,
+   0.00, 0.00, 0.00, 0.85,
+};
+
 /* Menu drivers */
 static const menu_ctx_driver_t *menu_ctx_drivers[] = {
+#if defined(HAVE_OZONE)
+   &menu_ctx_ozone,
+#endif
 #if defined(HAVE_XUI)
    &menu_ctx_xui,
 #endif
@@ -445,7 +455,6 @@ font_data_t *menu_display_font(
       bool is_threaded)
 {
    char fontpath[PATH_MAX_LENGTH];
-   font_data_t *font_data = NULL;
 
    if (!menu_disp)
       return NULL;
@@ -455,6 +464,15 @@ font_data_t *menu_display_font(
    fill_pathname_application_special(
          fontpath, sizeof(fontpath), type);
 
+   return menu_display_font_file(fontpath, font_size, is_threaded);
+}
+
+font_data_t *menu_display_font_file(char* fontpath, float font_size, bool is_threaded)
+{
+   font_data_t *font_data = NULL;
+   if (!menu_disp)
+      return NULL;
+
    if (!menu_disp->font_init_first((void**)&font_data,
             video_driver_get_ptr(false),
             fontpath, font_size, is_threaded))
@@ -982,7 +1000,7 @@ void menu_display_draw_texture_slice(
    draw.matrix_data         = &mymat;
    draw.prim_type           = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
    draw.pipeline.id         = 0;
-   coords.color             = (const float*)colors;
+   coords.color             = (const float*)(color == NULL ? colors : color);
 
    menu_display_rotate_z(&rotate_draw, video_info);
 
@@ -1149,18 +1167,18 @@ void menu_display_draw_texture_slice(
    vert_coord[2] = V_BR[0] + vert_scaled_mid_width;
    vert_coord[3] = V_BR[1] - vert_hoff - vert_scaled_mid_height;
    vert_coord[4] = V_TL[0] + vert_woff;
-   vert_coord[5] = V_TL[1] - vert_scaled_mid_height;
+   vert_coord[5] = V_TL[1] - vert_hoff - vert_scaled_mid_height;
    vert_coord[6] = V_TR[0] + vert_scaled_mid_width;
-   vert_coord[7] = V_TR[1] - vert_scaled_mid_height;
+   vert_coord[7] = V_TR[1] - vert_hoff - vert_scaled_mid_height;
 
    tex_coord[0] = T_BL[0] + tex_woff;
    tex_coord[1] = T_BL[1] + tex_hoff + tex_mid_height;
    tex_coord[2] = T_BR[0] + tex_mid_width;
    tex_coord[3] = T_BR[1] + tex_hoff + tex_mid_height;
    tex_coord[4] = T_TL[0] + tex_woff;
-   tex_coord[5] = T_TL[1] + tex_mid_height;
+   tex_coord[5] = T_TL[1] + tex_hoff + tex_mid_height;
    tex_coord[6] = T_TR[0] + tex_mid_width;
-   tex_coord[7] = T_TR[1] + tex_mid_height;
+   tex_coord[7] = T_TR[1] + tex_hoff + tex_mid_height;
 
    menu_display_draw(&draw, video_info);
 
@@ -1492,18 +1510,13 @@ void menu_display_draw_keyboard(
       uintptr_t hover_texture,
       const font_data_t *font,
       video_frame_info_t *video_info,
-      char *grid[], unsigned id)
+      char *grid[], unsigned id,
+      unsigned text_color)
 {
    unsigned i;
    int ptr_width, ptr_height;
    unsigned width    = video_info->width;
    unsigned height   = video_info->height;
-   float dark[16]    =  {
-      0.00, 0.00, 0.00, 0.85,
-      0.00, 0.00, 0.00, 0.85,
-      0.00, 0.00, 0.00, 0.85,
-      0.00, 0.00, 0.00, 0.85,
-   };
 
    float white[16]=  {
       1.00, 1.00, 1.00, 1.00,
@@ -1516,7 +1529,7 @@ void menu_display_draw_keyboard(
          video_info,
          0, height/2.0, width, height/2.0,
          width, height,
-         &dark[0]);
+         &osk_dark[0]);
 
    ptr_width  = width  / 11;
    ptr_height = height / 10;
@@ -1526,7 +1539,8 @@ void menu_display_draw_keyboard(
 
    for (i = 0; i < 44; i++)
    {
-      int line_y = (i / 11) * height / 10.0;
+      int line_y     = (i / 11) * height / 10.0;
+      unsigned color = 0xffffffff;
 
       if (i == id)
       {
@@ -1542,14 +1556,16 @@ void menu_display_draw_keyboard(
                hover_texture);
 
          menu_display_blend_end(video_info);
+
+         color = text_color;
       }
 
       menu_display_draw_text(font, grid[i],
             width/2.0 - (11*ptr_width)/2.0 + (i % 11)
             * ptr_width + ptr_width/2.0,
             height/2.0 + ptr_height + line_y + font->size / 3,
-            width, height, 0xffffffff, TEXT_ALIGN_CENTER, 1.0f,
-            false, 0);
+            width, height, color, TEXT_ALIGN_CENTER, 1.0f,
+            false, 0, false);
    }
 }
 
@@ -1559,13 +1575,15 @@ void menu_display_draw_text(
       const font_data_t *font, const char *text,
       float x, float y, int width, int height,
       uint32_t color, enum text_alignment text_align,
-      float scale, bool shadows_enable, float shadow_offset)
+      float scale, bool shadows_enable, float shadow_offset,
+      bool draw_outside)
 {
    struct font_params params;
 
    /* Don't draw outside of the screen */
-   if (     (x < -64 || x > width  + 64)
-         || (y < -64 || y > height + 64)
+   if (     ((x < -64 || x > width  + 64)
+         || (y < -64 || y > height + 64))
+         && !draw_outside
       )
       return;
 
@@ -1589,7 +1607,7 @@ void menu_display_draw_text(
    video_driver_set_osd_msg(text, &params, (void*)font);
 }
 
-void menu_display_reset_textures_list(
+bool menu_display_reset_textures_list(
       const char *texture_path, const char *iconpath,
       uintptr_t *item, enum texture_filter_type filter_type)
 {
@@ -1605,14 +1623,16 @@ void menu_display_reset_textures_list(
       fill_pathname_join(texpath, iconpath, texture_path, sizeof(texpath));
 
    if (string_is_empty(texpath) || !filestream_exists(texpath))
-      return;
+      return false;
 
    if (!image_texture_load(&ti, texpath))
-      return;
+      return false;
 
    video_driver_texture_load(&ti,
          filter_type, item);
    image_texture_free(&ti);
+
+   return true;
 }
 
 bool menu_driver_is_binding_state(void)
@@ -2626,3 +2646,11 @@ void menu_navigation_set_selection(size_t val)
 {
    menu_driver_selection_ptr = val;
 }
+
+void hex32_to_rgba_normalized(uint32_t hex, float* rgba, float alpha)
+{
+   rgba[0] = rgba[4] = rgba[8]  = rgba[12] = ((hex >> 16) & 0xFF) * (1.0f / 255.0f); /* r */
+   rgba[1] = rgba[5] = rgba[9]  = rgba[13] = ((hex >> 8 ) & 0xFF) * (1.0f / 255.0f); /* g */
+   rgba[2] = rgba[6] = rgba[10] = rgba[14] = ((hex >> 0 ) & 0xFF) * (1.0f / 255.0f); /* b */
+   rgba[3] = rgba[7] = rgba[11] = rgba[15] = alpha;
+}
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 0110f9ef21..25fc929b50 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -57,6 +57,8 @@ RETRO_BEGIN_DECLS
 #define MENU_SETTINGS_CHEEVOS_START              0x40000
 #define MENU_SETTINGS_NETPLAY_ROOMS_START        0x80000
 
+extern float osk_dark[16];
+
 enum menu_image_type
 {
    MENU_IMAGE_NONE = 0,
@@ -146,6 +148,11 @@ enum menu_settings_type
    MENU_SETTING_DROPDOWN_SETTING_FLOAT_ITEM,
    MENU_SETTING_DROPDOWN_SETTING_INT_ITEM,
    MENU_SETTING_DROPDOWN_SETTING_UINT_ITEM,
+   MENU_SETTING_DROPDOWN_SETTING_CORE_OPTIONS_ITEM_SPECIAL,
+   MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM_SPECIAL,
+   MENU_SETTING_DROPDOWN_SETTING_FLOAT_ITEM_SPECIAL,
+   MENU_SETTING_DROPDOWN_SETTING_INT_ITEM_SPECIAL,
+   MENU_SETTING_DROPDOWN_SETTING_UINT_ITEM_SPECIAL,
    MENU_SETTING_NO_ITEM,
    MENU_SETTING_DRIVER,
    MENU_SETTING_ACTION,
@@ -221,6 +228,8 @@ enum menu_settings_type
    MENU_SETTINGS_PERF_COUNTERS_END = MENU_SETTINGS_PERF_COUNTERS_BEGIN + (MAX_COUNTERS - 1),
    MENU_SETTINGS_CHEAT_BEGIN,
    MENU_SETTINGS_CHEAT_END = MENU_SETTINGS_CHEAT_BEGIN + (MAX_CHEAT_COUNTERS - 1),
+   MENU_SETTINGS_INPUT_BEGIN,
+   MENU_SETTINGS_INPUT_END = MENU_SETTINGS_INPUT_BEGIN + RARCH_CUSTOM_BIND_LIST_END,
    MENU_SETTINGS_INPUT_DESC_BEGIN,
    MENU_SETTINGS_INPUT_DESC_END = MENU_SETTINGS_INPUT_DESC_BEGIN + ((RARCH_FIRST_CUSTOM_BIND + 8) * MAX_USERS),
    MENU_SETTINGS_INPUT_DESC_KBD_BEGIN,
@@ -733,7 +742,8 @@ void menu_display_draw_keyboard(
       uintptr_t hover_texture,
       const font_data_t *font,
       video_frame_info_t *video_info,
-      char *grid[], unsigned id);
+      char *grid[], unsigned id,
+      unsigned text_color);
 
 void menu_display_draw_pipeline(menu_display_ctx_draw_t *draw,
       video_frame_info_t *video_info);
@@ -803,7 +813,8 @@ void menu_display_draw_text(
       const font_data_t *font, const char *text,
       float x, float y, int width, int height,
       uint32_t color, enum text_alignment text_align,
-      float scale_factor, bool shadows_enable, float shadow_offset);
+      float scale_factor, bool shadows_enable, float shadow_offset,
+      bool draw_outside);
 
 #define menu_display_set_alpha(color, alpha_value) (color[3] = color[7] = color[11] = color[15] = (alpha_value))
 
@@ -812,7 +823,9 @@ font_data_t *menu_display_font(
       float font_size,
       bool video_is_threaded);
 
-void menu_display_reset_textures_list(
+font_data_t *menu_display_font_file(char* fontpath, float font_size, bool is_threaded);
+
+bool menu_display_reset_textures_list(
       const char *texture_path,
       const char *iconpath,
       uintptr_t *item,
@@ -826,6 +839,8 @@ bool menu_display_driver_exists(const char *s);
 
 void menu_driver_destroy(void);
 
+void hex32_to_rgba_normalized(uint32_t hex, float* rgba, float alpha);
+
 extern uintptr_t menu_display_white_texture;
 
 extern menu_display_ctx_driver_t menu_display_ctx_gl;
@@ -846,6 +861,7 @@ extern menu_display_ctx_driver_t menu_display_ctx_switch;
 extern menu_display_ctx_driver_t menu_display_ctx_sixel;
 extern menu_display_ctx_driver_t menu_display_ctx_null;
 
+extern menu_ctx_driver_t menu_ctx_ozone;
 extern menu_ctx_driver_t menu_ctx_xui;
 extern menu_ctx_driver_t menu_ctx_rgui;
 extern menu_ctx_driver_t menu_ctx_mui;
diff --git a/menu/menu_entries.c b/menu/menu_entries.c
index 4d28437d98..d9f4bae160 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -396,15 +396,14 @@ int menu_entries_get_title(char *s, size_t len)
 
 int menu_entries_get_core_name(char *s, size_t len)
 {
-   rarch_system_info_t      *info      = runloop_get_system_info();
-   struct retro_system_info    *system = &info->info;
+   struct retro_system_info    *system = runloop_get_libretro_system_info();
    const char *core_name               = NULL;
 
    if (system)
       core_name    = system->library_name;
 
-   if (string_is_empty(core_name) && info)
-      core_name = info->info.library_name;
+   if (string_is_empty(core_name) && system)
+      core_name = system->library_name;
    if (string_is_empty(core_name))
       core_name = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE);
 
@@ -417,10 +416,9 @@ int menu_entries_get_core_name(char *s, size_t len)
  * (shown at the top of the UI). */
 int menu_entries_get_core_title(char *s, size_t len)
 {
-   const char *core_name          = NULL;
-   const char *core_version       = NULL;
-   rarch_system_info_t      *info      = runloop_get_system_info();
-   struct retro_system_info    *system = &info->info;
+   struct retro_system_info    *system = runloop_get_libretro_system_info();
+   const char *core_name               = system ? system->library_name    : NULL;
+   const char *core_version            = system ? system->library_version : NULL;
 #if _MSC_VER == 1200
    const char *extra_version = " msvc6";
 #elif _MSC_VER == 1300
@@ -445,19 +443,8 @@ int menu_entries_get_core_title(char *s, size_t len)
    const char *extra_version = "";
 #endif
 
-   if (system)
-   {
-      core_name    = system->library_name;
-      core_version = system->library_version;
-   }
-
-   if (string_is_empty(core_name) && info)
-      core_name = info->info.library_name;
    if (string_is_empty(core_name))
       core_name = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE);
-
-   if (!core_version && info)
-      core_version = info->info.library_version;
    if (!core_version)
       core_version = "";
 
@@ -500,6 +487,15 @@ error:
    return false;
 }
 
+void menu_entries_set_checked(file_list_t *list, size_t entry_idx,
+      bool checked)
+{
+   menu_file_list_cbs_t *cbs = (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(list, entry_idx);
+
+   if (cbs)
+      cbs->checked = checked;
+}
+
 void menu_entries_append(file_list_t *list, const char *path, const char *label,
       unsigned type, size_t directory_ptr, size_t entry_idx)
 {
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index c669f9b2af..6eceda628a 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -99,6 +99,8 @@ typedef struct menu_file_list_cbs
    const char *action_down_ident;
    const char *action_get_value_ident;
 
+   bool checked;
+
    rarch_setting_t *setting;
 
    int (*action_iterate)(const char *label, unsigned action);
@@ -180,6 +182,9 @@ void menu_entries_append_enum(file_list_t *list, const char *path, const char *l
 
 bool menu_entries_ctl(enum menu_entries_ctl_state state, void *data);
 
+void menu_entries_set_checked(file_list_t *list, size_t entry_idx,
+      bool checked);
+
 RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 98d1fc9ed4..1930307488 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -163,7 +163,6 @@ void menu_event_kb_set(bool down, enum retro_key key)
 unsigned menu_event(input_bits_t *p_input, input_bits_t *p_trigger_input)
 {
    menu_animation_ctx_delta_t delta;
-   float delta_time;
    /* Used for key repeat */
    static float delay_timer                = 0.0f;
    static float delay_count                = 0.0f;
@@ -236,9 +235,7 @@ unsigned menu_event(input_bits_t *p_input, input_bits_t *p_trigger_input)
       menu_driver_ctl(MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL,
             &new_scroll_accel);
 
-   menu_animation_ctl(MENU_ANIMATION_CTL_DELTA_TIME, &delta_time);
-
-   delta.current = delta_time;
+   delta.current = menu_animation_get_delta_time();
 
    if (menu_animation_get_ideal_delta_time(&delta))
       delay_count += delta.ideal;
@@ -793,7 +790,7 @@ static int menu_input_pointer_post_iterate(
          if (abs(pointer_x - start_x) > (dpi / 10)
                || abs(pointer_y - start_y) > (dpi / 10))
          {
-            float s, delta_time;
+            float s;
 
             menu_input_ctl(MENU_INPUT_CTL_SET_POINTER_DRAGGED, NULL);
             menu_input->pointer.dx            = pointer_x - pointer_old_x;
@@ -801,8 +798,6 @@ static int menu_input_pointer_post_iterate(
             pointer_old_x                     = pointer_x;
             pointer_old_y                     = pointer_y;
 
-            menu_animation_ctl(MENU_ANIMATION_CTL_DELTA_TIME, &delta_time);
-
             s = menu_input->pointer.dy;
             menu_input->pointer.accel = (accel0 + accel1 + s) / 3;
             accel0                    = accel1;
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index fbf57eab1b..b7af68fac5 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -271,6 +271,20 @@ static int setting_action_ok_video_refresh_rate_polled(rarch_setting_t *setting,
    return 0;
 }
 
+static int setting_action_ok_uint_special(rarch_setting_t *setting, bool wraparound)
+{
+   char enum_idx[16];
+   if (!setting)
+      return -1;
+
+   snprintf(enum_idx, sizeof(enum_idx), "%d", setting->enum_idx);
+
+   generic_action_ok_displaylist_push(
+         enum_idx, /* we will pass the enumeration index of the string as a path */
+         NULL, NULL, 0, 0, 0,
+         ACTION_OK_DL_DROPDOWN_BOX_LIST_SPECIAL);
+   return 0;
+}
 
 static int setting_action_ok_uint(rarch_setting_t *setting, bool wraparound)
 {
@@ -632,6 +646,7 @@ static void setting_get_string_representation_uint_xmb_layout(
    }
 }
 
+#ifdef HAVE_MATERIALUI
 static void setting_get_string_representation_uint_materialui_menu_color_theme(
       rarch_setting_t *setting,
       char *s, size_t len)
@@ -680,7 +695,9 @@ static void setting_get_string_representation_uint_materialui_menu_color_theme(
          break;
    }
 }
+#endif
 
+#ifdef HAVE_XMB
 static void setting_get_string_representation_uint_xmb_menu_color_theme(
       rarch_setting_t *setting,
       char *s, size_t len)
@@ -764,7 +781,40 @@ static void setting_get_string_representation_uint_xmb_menu_color_theme(
          break;
    }
 }
+#endif
 
+
+
+#ifdef HAVE_OZONE
+static void setting_get_string_representation_uint_ozone_menu_color_theme(
+      rarch_setting_t *setting,
+      char *s, size_t len)
+{
+   settings_t      *settings = config_get_ptr();
+   if (!setting)
+      return;
+
+   if (settings->bools.menu_preferred_system_color_theme_set)
+         strlcpy(s, "System default", len);
+
+   switch (*setting->value.target.unsigned_integer)
+   {
+      case 1:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK), len);
+         break;
+      case 0:
+      default:
+         strlcpy(s,
+               msg_hash_to_str(
+                  MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE), len);
+         break;
+   }
+}
+#endif
+
+#ifdef HAVE_SHADERPIPELINE
 static void setting_get_string_representation_uint_xmb_shader_pipeline(
       rarch_setting_t *setting,
       char *s, size_t len)
@@ -809,6 +859,7 @@ static void setting_get_string_representation_uint_xmb_shader_pipeline(
          break;
    }
 }
+#endif
 
 static void setting_get_string_representation_uint_video_monitor_index(rarch_setting_t *setting,
       char *s, size_t len)
@@ -1619,23 +1670,23 @@ static void setting_get_string_representation_uint_audio_resampler_quality(
                len);
          break;
       case RESAMPLER_QUALITY_LOWEST:
-         strlcpy(s, "Lowest",
+         strlcpy(s, msg_hash_to_str(MSG_RESAMPLER_QUALITY_LOWEST),
                len);
          break;
       case RESAMPLER_QUALITY_LOWER:
-         strlcpy(s, "Lower",
+         strlcpy(s, msg_hash_to_str(MSG_RESAMPLER_QUALITY_LOWER),
                len);
          break;
       case RESAMPLER_QUALITY_HIGHER:
-         strlcpy(s, "Higher",
+         strlcpy(s, msg_hash_to_str(MSG_RESAMPLER_QUALITY_HIGHER),
                len);
          break;
       case RESAMPLER_QUALITY_HIGHEST:
-         strlcpy(s, "Highest",
+         strlcpy(s, msg_hash_to_str(MSG_RESAMPLER_QUALITY_HIGHEST),
                len);
          break;
       case RESAMPLER_QUALITY_NORMAL:
-         strlcpy(s, "Normal",
+         strlcpy(s, msg_hash_to_str(MSG_RESAMPLER_QUALITY_NORMAL),
                len);
          break;
    }
@@ -1873,7 +1924,7 @@ static void setting_get_string_representation_uint_user_language(
    modes[RETRO_LANGUAGE_POLISH]                 = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_POLISH);
    modes[RETRO_LANGUAGE_VIETNAMESE]             = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_VIETNAMESE);
    modes[RETRO_LANGUAGE_ARABIC]                 = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_ARABIC);
-
+   modes[RETRO_LANGUAGE_GREEK]                 = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_GREEK);
    strlcpy(s, modes[*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)], len);
 }
 #endif
@@ -3526,7 +3577,7 @@ static bool setting_append_list(
                   parent_group);
          }
 
-         if (string_is_not_equal(settings->arrays.menu_driver, "xmb"))
+         if (string_is_not_equal(settings->arrays.menu_driver, "xmb") && string_is_not_equal(settings->arrays.menu_driver, "ozone"))
          {
             CONFIG_ACTION(
                   list, list_info,
@@ -3864,14 +3915,17 @@ static bool setting_append_list(
                &subgroup_info,
                parent_group);
 
-         CONFIG_ACTION(
-               list, list_info,
-               MENU_ENUM_LABEL_RECORDING_SETTINGS,
-               MENU_ENUM_LABEL_VALUE_RECORDING_SETTINGS,
-               &group_info,
-               &subgroup_info,
-               parent_group);
-         settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
+         if (string_is_not_equal(settings->arrays.record_driver, "null"))
+         {
+            CONFIG_ACTION(
+                  list, list_info,
+                  MENU_ENUM_LABEL_RECORDING_SETTINGS,
+                  MENU_ENUM_LABEL_VALUE_RECORDING_SETTINGS,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group);
+            settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
+         }
 
          CONFIG_ACTION(
                list, list_info,
@@ -4027,7 +4081,6 @@ static bool setting_append_list(
                &group_info,
                &subgroup_info,
                parent_group);
-         settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
 
          CONFIG_ACTION(
                list, list_info,
@@ -4037,14 +4090,17 @@ static bool setting_append_list(
                &subgroup_info,
                parent_group);
 
-         CONFIG_ACTION(
-               list, list_info,
-               MENU_ENUM_LABEL_MIDI_SETTINGS,
-               MENU_ENUM_LABEL_VALUE_MIDI_SETTINGS,
-               &group_info,
-               &subgroup_info,
-               parent_group);
-         settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
+         if (string_is_not_equal(settings->arrays.midi_driver, "null"))
+         {
+            CONFIG_ACTION(
+                  list, list_info,
+                  MENU_ENUM_LABEL_MIDI_SETTINGS,
+                  MENU_ENUM_LABEL_VALUE_MIDI_SETTINGS,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group);
+            settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
+         }
 
          for (user = 0; user < MAX_USERS; user++)
             setting_append_list_input_player_options(list, list_info, parent_group, user);
@@ -4985,7 +5041,7 @@ static bool setting_append_list(
                parent_group,
                general_write_handler,
                general_read_handler);
-         menu_settings_list_current_add_range(list, list_info, 0, cheat_manager_state.actual_memory_size>0?cheat_manager_state.actual_memory_size-1:0, 1, true, true);
+         menu_settings_list_current_add_range(list, list_info, 0, cheat_manager_state.total_memory_size>0?cheat_manager_state.total_memory_size-1:0, 1, true, true);
          (*list)[list_info->index - 1].action_left = &setting_uint_action_left_with_refresh;
          (*list)[list_info->index - 1].action_right = &setting_uint_action_right_with_refresh;
          (*list)[list_info->index - 1].get_string_representation = &setting_get_string_representation_uint_cheat_browse_address;
@@ -5143,7 +5199,7 @@ static bool setting_append_list(
                      parent_group,
                      general_write_handler,
                      general_read_handler);
-               (*list)[list_info->index - 1].action_ok     = &setting_action_ok_uint;
+               (*list)[list_info->index - 1].action_ok     = &setting_action_ok_uint_special;
                menu_settings_list_current_add_range(list, list_info, 0, 7680, 8, true, true);
                settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
 
@@ -5158,7 +5214,7 @@ static bool setting_append_list(
                      parent_group,
                      general_write_handler,
                      general_read_handler);
-               (*list)[list_info->index - 1].action_ok     = &setting_action_ok_uint;
+               (*list)[list_info->index - 1].action_ok     = &setting_action_ok_uint_special;
                menu_settings_list_current_add_range(list, list_info, 0, 4320, 8, true, true);
                settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
             }
@@ -5402,6 +5458,7 @@ static bool setting_append_list(
                      parent_group,
                      general_write_handler,
                      general_read_handler);
+               (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint_special;
                menu_settings_list_current_add_range(list, list_info, 0, 7680, 8, true, true);
                settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
                CONFIG_UINT(
@@ -5415,6 +5472,7 @@ static bool setting_append_list(
                      parent_group,
                      general_write_handler,
                      general_read_handler);
+               (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint_special;
                menu_settings_list_current_add_range(list, list_info, 0, 4320, 8, true, true);
                settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
                CONFIG_UINT(
@@ -6125,7 +6183,7 @@ static bool setting_append_list(
                parent_group,
                general_write_handler,
                general_read_handler);
-         (*list)[list_info->index - 1].action_ok     = &setting_action_ok_uint;
+         (*list)[list_info->index - 1].action_ok     = &setting_action_ok_uint_special;
          menu_settings_list_current_add_range(list, list_info, 1000, 192000, 100.0, true, true);
          settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
 
@@ -7612,7 +7670,7 @@ static bool setting_append_list(
                general_read_handler,
                SD_FLAG_NONE);
 
-         if (string_is_equal(settings->arrays.menu_driver, "xmb"))
+         if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone"))
          {
             CONFIG_BOOL(
                   list, list_info,
@@ -7780,8 +7838,6 @@ static bool setting_append_list(
                   general_write_handler,
                   general_read_handler);
             (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
-            (*list)[list_info->index - 1].get_string_representation =
-               &setting_get_string_representation_float_video_msg_color;
             menu_settings_list_current_add_range(list, list_info, 0, 255, 1, true, true);
             settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
 
@@ -7796,8 +7852,6 @@ static bool setting_append_list(
                   parent_group,
                   general_write_handler,
                   general_read_handler);
-            (*list)[list_info->index - 1].get_string_representation =
-               &setting_get_string_representation_float_video_msg_color;
             (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
             menu_settings_list_current_add_range(list, list_info, 0, 255, 1, true, true);
             settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
@@ -7887,6 +7941,24 @@ static bool setting_append_list(
             menu_settings_list_current_add_range(list, list_info, 0, XMB_THEME_LAST-1, 1, true, true);
        }
 #endif
+         if (string_is_equal(settings->arrays.menu_driver, "ozone"))
+         {
+            CONFIG_BOOL(
+                  list, list_info,
+                  &settings->bools.menu_use_preferred_system_color_theme,
+                  MENU_ENUM_LABEL_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+                  MENU_ENUM_LABEL_VALUE_MENU_USE_PREFERRED_SYSTEM_COLOR_THEME,
+                  menu_use_preferred_system_color_theme,
+                  MENU_ENUM_LABEL_VALUE_OFF,
+                  MENU_ENUM_LABEL_VALUE_ON,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler,
+                  SD_FLAG_NONE);
+         }
+
             CONFIG_BOOL(
                   list, list_info,
                   &settings->bools.menu_show_load_core,
@@ -8055,8 +8127,8 @@ static bool setting_append_list(
                   SD_FLAG_NONE);
 #endif
 
-#ifdef HAVE_XMB
-         if (string_is_equal(settings->arrays.menu_driver, "xmb"))
+#if defined(HAVE_XMB) || defined(HAVE_OZONE)
+         if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone"))
          {
             CONFIG_BOOL(
                   list, list_info,
@@ -8287,6 +8359,27 @@ static bool setting_append_list(
          }
 #endif
 
+#ifdef HAVE_OZONE
+         if (string_is_equal(settings->arrays.menu_driver, "ozone"))
+         {
+            CONFIG_UINT(
+                  list, list_info,
+                  &settings->uints.menu_ozone_color_theme,
+                  MENU_ENUM_LABEL_OZONE_MENU_COLOR_THEME,
+                  MENU_ENUM_LABEL_VALUE_OZONE_MENU_COLOR_THEME,
+                  0,
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler);
+            (*list)[list_info->index - 1].action_ok = &setting_action_ok_uint;
+            (*list)[list_info->index - 1].get_string_representation =
+               &setting_get_string_representation_uint_ozone_menu_color_theme;
+            menu_settings_list_current_add_range(list, list_info, 0, 1, 1, true, true);
+         }
+#endif
+
          CONFIG_BOOL(
                list, list_info,
                &settings->bools.menu_show_start_screen,
@@ -8302,7 +8395,7 @@ static bool setting_append_list(
                general_read_handler,
                SD_FLAG_ADVANCED);
 
-         if (string_is_equal(settings->arrays.menu_driver, "xmb"))
+         if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone"))
          {
             CONFIG_UINT(
                   list, list_info,
@@ -8591,6 +8684,24 @@ static bool setting_append_list(
          settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
 #endif
 
+#ifdef _3DS
+         CONFIG_BOOL(
+               list, list_info,
+               &settings->bools.video_3ds_lcd_bottom,
+               MENU_ENUM_LABEL_VIDEO_3DS_LCD_BOTTOM,
+               MENU_ENUM_LABEL_VALUE_VIDEO_3DS_LCD_BOTTOM,
+               video_3ds_lcd_bottom,
+               MENU_ENUM_LABEL_VALUE_OFF,
+               MENU_ENUM_LABEL_VALUE_ON,
+               &group_info,
+               &subgroup_info,
+               parent_group,
+               general_write_handler,
+               general_read_handler,
+               SD_FLAG_CMD_APPLY_AUTO);
+         menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT_FROM_TOGGLE);
+#endif
+
 #ifdef HAVE_NETWORKING
          CONFIG_BOOL(
                list, list_info,
@@ -9040,7 +9151,7 @@ static bool setting_append_list(
                SD_FLAG_NONE
                );
 
-         if (string_is_equal(settings->arrays.menu_driver, "xmb"))
+         if (string_is_equal(settings->arrays.menu_driver, "xmb") || string_is_equal(settings->arrays.menu_driver, "ozone"))
             CONFIG_BOOL(
                   list, list_info,
                   &settings->bools.cheevos_badges_enable,
diff --git a/menu/widgets/menu_entry.c b/menu/widgets/menu_entry.c
index 276c37139e..2ad026d4b3 100644
--- a/menu/widgets/menu_entry.c
+++ b/menu/widgets/menu_entry.c
@@ -325,6 +325,7 @@ void menu_entry_get(menu_entry_t *entry, size_t stack_idx,
       enum msg_hash_enums enum_idx  = MSG_UNKNOWN;
 
       entry->enum_idx               = cbs->enum_idx;
+      entry->checked                = cbs->checked;
 
       menu_entries_get_last_stack(NULL, &label, NULL, &enum_idx, NULL);
 
diff --git a/menu/widgets/menu_entry.h b/menu/widgets/menu_entry.h
index f3ebb6b37b..c4307bb38e 100644
--- a/menu/widgets/menu_entry.h
+++ b/menu/widgets/menu_entry.h
@@ -56,6 +56,7 @@ typedef struct menu_entry
    char *sublabel;
    char *rich_label;
    char *value;
+   bool checked;
 } menu_entry_t;
 
 enum menu_entry_type menu_entry_get_type(uint32_t i);
diff --git a/menu/widgets/menu_filebrowser.c b/menu/widgets/menu_filebrowser.c
index 635f527f2a..89fe44c091 100644
--- a/menu/widgets/menu_filebrowser.c
+++ b/menu/widgets/menu_filebrowser.c
@@ -65,7 +65,6 @@ void filebrowser_parse(menu_displaylist_info_t *info, unsigned type_data)
    unsigned files_count                 = 0;
    unsigned dirs_count                  = 0;
    settings_t *settings                 = config_get_ptr();
-   rarch_system_info_t *system          = runloop_get_system_info();
    enum menu_displaylist_ctl_state type = (enum menu_displaylist_ctl_state)
                                           type_data;
    const char *path                     = info ? info->path : NULL;
@@ -84,6 +83,7 @@ void filebrowser_parse(menu_displaylist_info_t *info, unsigned type_data)
          str_list = file_archive_get_file_list(path, info->exts);
       else
       {
+         rarch_system_info_t         *system          = runloop_get_system_info();
          const struct retro_subsystem_info *subsystem = system->subsystem.data + content_get_subsystem();
 
          if (subsystem)
@@ -94,6 +94,7 @@ void filebrowser_parse(menu_displaylist_info_t *info, unsigned type_data)
    {
       if (filebrowser_types == FILEBROWSER_SELECT_FILE_SUBSYSTEM)
       {
+         rarch_system_info_t         *system          = runloop_get_system_info();
          const struct retro_subsystem_info *subsystem = 
             system->subsystem.data + content_get_subsystem();
 
diff --git a/msg_hash.c b/msg_hash.c
index ce82ea9f4e..a9e7e7e5b2 100644
--- a/msg_hash.c
+++ b/msg_hash.c
@@ -82,6 +82,9 @@ int menu_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
       case RETRO_LANGUAGE_ARABIC:
          ret = menu_hash_get_help_ar_enum(msg, s, len);
          break;
+      case RETRO_LANGUAGE_GREEK:
+         ret = menu_hash_get_help_el_enum(msg, s, len);
+         break;
       default:
          break;
    }
@@ -151,6 +154,9 @@ const char *msg_hash_to_str(enum msg_hash_enums msg)
       case RETRO_LANGUAGE_ARABIC:
          ret = msg_hash_to_str_ar(msg);
          break;
+      case RETRO_LANGUAGE_GREEK:
+         ret = msg_hash_to_str_el(msg);
+         break;
       default:
          break;
    }
diff --git a/msg_hash.h b/msg_hash.h
index bce6ce1de8..08fba9705c 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -184,6 +184,11 @@ enum msg_hash_enums
    MSG_NETPLAY_CANNOT_PLAY,
    MSG_NETPLAY_PEER_PAUSED,
    MSG_NETPLAY_CHANGED_NICK,
+   MSG_RESAMPLER_QUALITY_LOWEST,
+   MSG_RESAMPLER_QUALITY_LOWER,
+   MSG_RESAMPLER_QUALITY_NORMAL,
+   MSG_RESAMPLER_QUALITY_HIGHER,
+   MSG_RESAMPLER_QUALITY_HIGHEST,
    MSG_ADDED_TO_FAVORITES,
    MSG_RESET_CORE_ASSOCIATION,
    MSG_CORE_ASSOCIATION_RESET,
@@ -416,6 +421,8 @@ enum msg_hash_enums
    MSG_RUNAHEAD_FAILED_TO_SAVE_STATE,
    MSG_RUNAHEAD_FAILED_TO_LOAD_STATE,
    MSG_RUNAHEAD_FAILED_TO_CREATE_SECONDARY_INSTANCE,
+   MSG_MISSING_ASSETS,
+
    MENU_LABEL(STREAMING_TITLE),
    MENU_LABEL(STREAMING_MODE),
    MENU_LABEL(VIDEO_RECORD_QUALITY),
@@ -433,6 +440,10 @@ enum msg_hash_enums
    MENU_LABEL(FILTER_BY_CURRENT_CORE),
 
    MENU_LABEL(NO_HISTORY_AVAILABLE),
+   MENU_LABEL(NO_MUSIC_AVAILABLE),
+   MENU_LABEL(NO_VIDEOS_AVAILABLE),
+   MENU_LABEL(NO_IMAGES_AVAILABLE),
+   MENU_LABEL(NO_FAVORITES_AVAILABLE),
 
    MENU_ENUM_LABEL_DISCORD_IN_MENU,
    MENU_ENUM_LABEL_VALUE_DISCORD_IN_MENU,
@@ -460,6 +471,7 @@ enum msg_hash_enums
 
    MENU_LABEL(MENU_WALLPAPER_OPACITY),
    MENU_LABEL(MENU_FRAMEBUFFER_OPACITY),
+   MENU_LABEL(MENU_USE_PREFERRED_SYSTEM_COLOR_THEME),
 
    MENU_ENUM_LABEL_VALUE_CONFIG,
    MENU_ENUM_LABEL_VALUE_OVERLAY,
@@ -467,6 +479,9 @@ enum msg_hash_enums
 
    MENU_LABEL(MATERIALUI_ICONS_ENABLE),
 
+   MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_WHITE,
+   MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_BASIC_BLACK,
+
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,
    MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI,
@@ -813,7 +828,6 @@ enum msg_hash_enums
    MENU_LABEL(XMB_LAYOUT),
    MENU_LABEL(XMB_THEME),
    MENU_LABEL(XMB_MAIN_MENU_ENABLE_SETTINGS),
-   MENU_LABEL(XMB_MENU_COLOR_THEME),
    MENU_LABEL(XMB_SHADOWS_ENABLE),
    MENU_LABEL(CONTENT_SHOW_REWIND),
    MENU_LABEL(CONTENT_SHOW_LATENCY),
@@ -835,6 +849,8 @@ enum msg_hash_enums
    MENU_LABEL(TIMEDATE_ENABLE),
    MENU_LABEL(TIMEDATE_STYLE),
    MENU_LABEL(BATTERY_LEVEL_ENABLE),
+   MENU_LABEL(XMB_MENU_COLOR_THEME),
+   MENU_LABEL(OZONE_MENU_COLOR_THEME),
    MENU_LABEL(MATERIALUI_MENU_COLOR_THEME),
    MENU_LABEL(QUICK_MENU_OVERRIDE_OPTIONS),
    MENU_LABEL(QUICK_MENU_SHOW_TAKE_SCREENSHOT),
@@ -860,6 +876,7 @@ enum msg_hash_enums
    MENU_LABEL(UI_COMPANION_TOGGLE),
    MENU_LABEL(DESKTOP_MENU_ENABLE),
    MENU_LABEL(UI_MENUBAR_ENABLE),
+   MENU_LABEL(VIDEO_3DS_LCD_BOTTOM),
 
    MENU_ENUM_LABEL_FILE_CONFIG,
    MENU_ENUM_LABEL_FILE_BROWSER_COMPRESSED_ARCHIVE,
@@ -909,6 +926,7 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP,
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN,
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM,
+   MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_OK,
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK,
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_START,
    MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO,
@@ -996,6 +1014,7 @@ enum msg_hash_enums
    MENU_LABEL(BROWSE_START),
    /* Deferred */
    MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST,
+   MENU_ENUM_LABEL_DEFERRED_DROPDOWN_BOX_LIST_SPECIAL,
    MENU_ENUM_LABEL_DEFERRED_MIXER_STREAM_SETTINGS_LIST,
    MENU_ENUM_LABEL_DEFERRED_CONFIGURATIONS_LIST,
    MENU_ENUM_LABEL_DEFERRED_FAVORITES_LIST,
@@ -1838,6 +1857,7 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_LANG_POLISH,
    MENU_ENUM_LABEL_VALUE_LANG_VIETNAMESE,
    MENU_ENUM_LABEL_VALUE_LANG_ARABIC,
+   MENU_ENUM_LABEL_VALUE_LANG_GREEK,
 
    MENU_ENUM_LABEL_VALUE_NONE,
    MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE,
@@ -2253,6 +2273,7 @@ enum msg_hash_enums
 /* Record settings */
 
 #define MENU_LABEL_RECORD_CONFIG                                               0x11c3daf9U
+#define MENU_LABEL_STREAM_CONFIG                                               0x79774b86U
 
 /* Cheat options */
 
@@ -2443,6 +2464,9 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len);
 const char *msg_hash_to_str_ar(enum msg_hash_enums msg);
 int menu_hash_get_help_ar_enum(enum msg_hash_enums msg, char *s, size_t len);
 
+const char *msg_hash_to_str_el(enum msg_hash_enums msg);
+int menu_hash_get_help_el_enum(enum msg_hash_enums msg, char *s, size_t len);
+
 int menu_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len);
 
 enum msg_file_type msg_hash_to_file_type(uint32_t hash);
diff --git a/network/netplay/netplay_discovery.c b/network/netplay/netplay_discovery.c
index 67781977c0..0b347ca548 100644
--- a/network/netplay/netplay_discovery.c
+++ b/network/netplay/netplay_discovery.c
@@ -134,7 +134,7 @@ void deinit_netplay_discovery(void)
 /* Todo: implement net_ifinfo and ntohs for consoles */
 bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state, void *data)
 {
-#ifndef RARCH_CONSOLE
+#ifdef HAVE_NETPLAYDISCOVERY
    char port_str[6];
    int ret;
    unsigned k = 0;
@@ -162,7 +162,7 @@ bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state,
 #if defined(SOL_SOCKET) && defined(SO_BROADCAST)
          if (setsockopt(lan_ad_client_fd, SOL_SOCKET, SO_BROADCAST,
                   (const char *)&canBroadcast, sizeof(canBroadcast)) < 0)
-             RARCH_WARN("[discovery] Failed to set netplay discovery port to broadcast\n");
+            RARCH_WARN("[discovery] Failed to set netplay discovery port to broadcast\n");
 #endif
 
          /* Put together the request */
@@ -238,13 +238,12 @@ error:
 bool netplay_lan_ad_server(netplay_t *netplay)
 {
 /* Todo: implement net_ifinfo and ntohs for consoles */
-#ifndef RARCH_CONSOLE
+#ifdef HAVE_NETPLAYDISCOVERY
    fd_set fds;
    int ret;
    struct timeval tmp_tv = {0};
    struct sockaddr their_addr;
    socklen_t addr_size;
-   rarch_system_info_t *info = NULL;
    unsigned k = 0;
    char reply_addr[NETPLAY_HOST_STR_LEN], port_str[6];
    struct addrinfo *our_addr, hints = {0};
@@ -255,7 +254,7 @@ bool netplay_lan_ad_server(netplay_t *netplay)
       return false;
 
    if (lan_ad_server_fd < 0 && !init_lan_ad_server_socket(netplay, RARCH_DEFAULT_PORT))
-       return false;
+      return false;
 
    /* Check for any ad queries */
    while (1)
@@ -308,11 +307,11 @@ bool netplay_lan_ad_server(netplay_t *netplay)
                if (strstr(interfaces.entries[k].host, sub) &&
                   !strstr(interfaces.entries[k].host, "127.0.0.1"))
                {
+                  struct retro_system_info *info = runloop_get_libretro_system_info();
+
                   RARCH_LOG ("[discovery] query received on common interface: %s/%s (theirs / ours) \n",
                      reply_addr, interfaces.entries[k].host);
 
-                  info = runloop_get_system_info();
-
                   /* Now build our response */
                   content_crc = content_get_crc();
 
@@ -335,9 +334,9 @@ bool netplay_lan_ad_server(netplay_t *netplay)
 
                   if (info)
                   {
-                     strlcpy(ad_packet_buffer.core, info->info.library_name,
+                     strlcpy(ad_packet_buffer.core, info->library_name,
                         NETPLAY_HOST_STR_LEN);
-                     strlcpy(ad_packet_buffer.core_version, info->info.library_version,
+                     strlcpy(ad_packet_buffer.core_version, info->library_version,
                         NETPLAY_HOST_STR_LEN);
                   }
 
diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index c0981d7067..6da9b1dee9 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -852,25 +852,25 @@ void netplay_get_architecture(char *frontend_architecture, size_t size)
 static void netplay_announce(void)
 {
    char buf [2048];
-   char url [2048]               = "http://lobby.libretro.com/add/";
-   char *username                = NULL;
-   char *corename                = NULL;
-   char *gamename                = NULL;
-   char *coreversion             = NULL;
-   char *frontend_ident          = NULL;
-   settings_t *settings          = config_get_ptr();
-   rarch_system_info_t *system   = runloop_get_system_info();
-   uint32_t content_crc          = content_get_crc();
    char frontend_architecture[PATH_MAX_LENGTH];
+   char url [2048]                  = "http://lobby.libretro.com/add/";
+   char *username                   = NULL;
+   char *corename                   = NULL;
+   char *gamename                   = NULL;
+   char *coreversion                = NULL;
+   char *frontend_ident             = NULL;
+   settings_t *settings             = config_get_ptr();
+   struct retro_system_info *system = runloop_get_libretro_system_info();
+   uint32_t content_crc             = content_get_crc();
 
    netplay_get_architecture(frontend_architecture, sizeof(frontend_architecture));
 
    net_http_urlencode(&username, settings->paths.username);
-   net_http_urlencode(&corename, system->info.library_name);
+   net_http_urlencode(&corename, system->library_name);
    net_http_urlencode(&gamename,
       !string_is_empty(path_basename(path_get(RARCH_PATH_BASENAME))) ?
       path_basename(path_get(RARCH_PATH_BASENAME)) : "N/A");
-   net_http_urlencode(&coreversion, system->info.library_version);
+   net_http_urlencode(&coreversion, system->library_version);
    net_http_urlencode(&frontend_ident, frontend_architecture);
 
    buf[0] = '\0';
diff --git a/network/netplay/netplay_handshake.c b/network/netplay/netplay_handshake.c
index 021b51d35c..7b52bbb9c9 100644
--- a/network/netplay/netplay_handshake.c
+++ b/network/netplay/netplay_handshake.c
@@ -500,20 +500,20 @@ bool netplay_handshake_info(netplay_t *netplay,
       struct netplay_connection *connection)
 {
    struct info_buf_s info_buf;
-   uint32_t      content_crc      = 0;
-   rarch_system_info_t *core_info = runloop_get_system_info();
+   uint32_t      content_crc        = 0;
+   struct retro_system_info *system = runloop_get_libretro_system_info();
 
    memset(&info_buf, 0, sizeof(info_buf));
    info_buf.cmd[0] = htonl(NETPLAY_CMD_INFO);
    info_buf.cmd[1] = htonl(sizeof(info_buf) - 2*sizeof(uint32_t));
 
    /* Get our core info */
-   if (core_info)
+   if (system)
    {
       strlcpy(info_buf.core_name,
-            core_info->info.library_name, sizeof(info_buf.core_name));
+            system->library_name, sizeof(info_buf.core_name));
       strlcpy(info_buf.core_version,
-            core_info->info.library_version, sizeof(info_buf.core_version));
+            system->library_version, sizeof(info_buf.core_version));
    }
    else
    {
@@ -836,9 +836,9 @@ bool netplay_handshake_pre_info(netplay_t *netplay,
    struct info_buf_s info_buf;
    uint32_t cmd_size;
    ssize_t recvd;
-   uint32_t content_crc           = 0;
-   const char *dmsg               = NULL;
-   rarch_system_info_t *core_info = runloop_get_system_info();
+   uint32_t content_crc             = 0;
+   const char *dmsg                 = NULL;
+   struct retro_system_info *system = runloop_get_libretro_system_info();
 
    RECV(&info_buf, sizeof(info_buf.cmd)) {}
 
@@ -876,11 +876,10 @@ bool netplay_handshake_pre_info(netplay_t *netplay,
    }
 
    /* Check the core info */
-
-   if (core_info)
+   if (system)
    {
       if (strncmp(info_buf.core_name,
-               core_info->info.library_name, sizeof(info_buf.core_name)))
+               system->library_name, sizeof(info_buf.core_name)))
       {
          /* Wrong core! */
          dmsg = msg_hash_to_str(MSG_NETPLAY_DIFFERENT_CORES);
@@ -890,7 +889,7 @@ bool netplay_handshake_pre_info(netplay_t *netplay,
          return false;
       }
       if (strncmp(info_buf.core_version,
-             core_info->info.library_version, sizeof(info_buf.core_version)))
+             system->library_version, sizeof(info_buf.core_version)))
       {
          dmsg = msg_hash_to_str(MSG_NETPLAY_DIFFERENT_CORE_VERSIONS);
          RARCH_WARN("%s\n", dmsg);
diff --git a/paths.c b/paths.c
index 7ad604b80b..b956989638 100644
--- a/paths.c
+++ b/paths.c
@@ -66,7 +66,7 @@ void path_set_redirect(void)
    global_t                *global             = global_get_ptr();
    const char *old_savefile_dir                = dir_get(RARCH_DIR_SAVEFILE);
    const char *old_savestate_dir               = dir_get(RARCH_DIR_SAVESTATE);
-   rarch_system_info_t      *info              = runloop_get_system_info();
+   struct retro_system_info *system            = runloop_get_libretro_system_info();
    settings_t *settings                        = config_get_ptr();
 
    new_savefile_dir[0] = new_savestate_dir[0]  = '\0';
@@ -76,10 +76,10 @@ void path_set_redirect(void)
    strlcpy(new_savefile_dir,  old_savefile_dir,  path_size);
    strlcpy(new_savestate_dir, old_savestate_dir, path_size);
 
-   if (info && !string_is_empty(info->info.library_name))
+   if (system && !string_is_empty(system->library_name))
    {
 #ifdef HAVE_MENU
-      if (!string_is_equal(info->info.library_name,
+      if (!string_is_equal(system->library_name,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE)))
 #endif
          check_library_name = true;
@@ -94,7 +94,7 @@ void path_set_redirect(void)
          fill_pathname_join(
                new_savefile_dir,
                old_savefile_dir,
-               info->info.library_name,
+               system->library_name,
                path_size);
 
          /* If path doesn't exist, try to create it,
@@ -121,7 +121,7 @@ void path_set_redirect(void)
          fill_pathname_join(
                new_savestate_dir,
                old_savestate_dir,
-               info->info.library_name,
+               system->library_name,
                path_size);
 
          /* If path doesn't exist, try to create it.
@@ -173,7 +173,7 @@ void path_set_redirect(void)
       {
          fill_pathname_dir(global->name.savefile,
                !string_is_empty(path_main_basename) ? path_main_basename :
-                  info ? info->info.library_name : NULL,
+                  system ? system->library_name : NULL,
                file_path_str(FILE_PATH_SRM_EXTENSION),
                sizeof(global->name.savefile));
          RARCH_LOG("%s \"%s\".\n",
@@ -185,7 +185,7 @@ void path_set_redirect(void)
       {
          fill_pathname_dir(global->name.savestate,
                !string_is_empty(path_main_basename) ? path_main_basename :
-                  info ? info->info.library_name : NULL,
+                  system ? system->library_name : NULL,
                file_path_str(FILE_PATH_STATE_EXTENSION),
                sizeof(global->name.savestate));
          RARCH_LOG("%s \"%s\".\n",
diff --git a/pkg/android/phoenix/jni/Android.mk b/pkg/android/phoenix/jni/Android.mk
index 84351cad95..2523d3b80a 100644
--- a/pkg/android/phoenix/jni/Android.mk
+++ b/pkg/android/phoenix/jni/Android.mk
@@ -72,7 +72,7 @@ else
    DEFINES += -DHAVE_OPENGLES2
 endif
 
-DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -DHAVE_KEYMAPPER -DHAVE_NETWORKGAMEPAD -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_CHD -DHAVE_RUNAHEAD -DENABLE_HLSL
+DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -DHAVE_KEYMAPPER -DHAVE_NETWORKGAMEPAD -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_CHD -DHAVE_RUNAHEAD -DENABLE_HLSL
 DEFINES += -DWANT_IFADDRS
 
 ifeq ($(HAVE_VULKAN),1)
diff --git a/pkg/android/phoenix64/jni/Android.mk b/pkg/android/phoenix64/jni/Android.mk
index 4e148617fa..95cbe81754 100644
--- a/pkg/android/phoenix64/jni/Android.mk
+++ b/pkg/android/phoenix64/jni/Android.mk
@@ -72,7 +72,7 @@ else
    DEFINES += -DHAVE_OPENGLES2
 endif
 
-DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -DHAVE_KEYMAPPER -DHAVE_NETWORKGAMEPAD -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_CHD -DHAVE_RUNAHEAD -DENABLE_HLSL
+DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETPLAYDISCOVERY -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -DHAVE_KEYMAPPER -DHAVE_NETWORKGAMEPAD -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_CHD -DHAVE_RUNAHEAD -DENABLE_HLSL
 DEFINES += -DWANT_IFADDRS
 
 ifeq ($(HAVE_VULKAN),1)
diff --git a/pkg/apple/BaseConfig.xcconfig b/pkg/apple/BaseConfig.xcconfig
index d1386170a1..9085e1a869 100644
--- a/pkg/apple/BaseConfig.xcconfig
+++ b/pkg/apple/BaseConfig.xcconfig
@@ -4,11 +4,11 @@
 //
 //  Created by Stuart Carnie on 5/10/18.
 //
-
-OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD -DHAVE_GRIFFIN -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_LROUND -DFLAC__HAS_OGG=0 -DHAVE_CHD -DHAVE_STB_VORBIS -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DHAVE_UPDATE_ASSETS -DHAVE_LANGEXTRA -DHAVE_CHEEVOS -DHAVE_IMAGEVIEWER -DHAVE_IOHIDMANAGER -DHAVE_CORETEXT -DHAVE_RGUI -DHAVE_MENU -DOSX -DHAVE_OPENGL -DHAVE_CC_RESAMPLER -DHAVE_GLSL -DINLINE=inline -D__LIBRETRO__ -DHAVE_COREAUDIO -DHAVE_DYNAMIC -DHAVE_OVERLAY -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_COCOA -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DRARCH_INTERNAL -DHAVE_THREADS -DHAVE_DYLIB -DHAVE_7ZIP -DHAVE_MATERIALUI -DHAVE_HID -DHAVE_XMB -DHAVE_SEGA -DHAVE_SHADERPIPELINE -DHAVE_MMAP -DHAVE_LIBRETRODB -DHAVE_GETOPT_LONG -DHAVE_METAL -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -DENABLE_HLSL -DGLSLANG_OSINCLUDE_UNIX -DMETAL_DEBUG
+OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD -DHAVE_GRIFFIN -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_LROUND -DFLAC__HAS_OGG=0 -DHAVE_CHD -DHAVE_STB_VORBIS -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DHAVE_UPDATE_ASSETS -DHAVE_LANGEXTRA -DRC_DISABLE_LUA -DHAVE_CHEEVOS -DHAVE_IMAGEVIEWER -DHAVE_IOHIDMANAGER -DHAVE_CORETEXT -DHAVE_RGUI -DHAVE_MENU -DOSX -DHAVE_CC_RESAMPLER -DHAVE_GLSL -DINLINE=inline -D__LIBRETRO__ -DHAVE_COREAUDIO -DHAVE_DYNAMIC -DHAVE_OVERLAY -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_THREADS -DHAVE_DYLIB -DHAVE_7ZIP -DHAVE_MATERIALUI -DHAVE_HID -DHAVE_XMB -DHAVE_SEGA -DHAVE_SHADERPIPELINE -DHAVE_MMAP -DHAVE_LIBRETRODB -DHAVE_GETOPT_LONG -DHAVE_METAL -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -DENABLE_HLSL -DGLSLANG_OSINCLUDE_UNIX -DMETAL_DEBUG -DHAVE_OPENGL -DHAVE_OZONE
 
 SRCBASE  = $(SRCROOT)/../..
 DEPS_DIR = $(SRCBASE)/deps
 HEADER_SEARCH_PATHS = $(inherited) $(SRCBASE) $(SRCBASE)/gfx/include $(SRCBASE)/libretro-common/include $(DEPS_DIR)/libFLAC/include $(DEPS_DIR)/7zip $(DEPS_DIR)/stb $(DEPS_DIR) $(DEPS_DIR)/SPIRV-Cross $(DEPS_DIR)/glslang $(DEPS_DIR)/glslang/glslang/glslang/Public $(DEPS_DIR)/glslang/glslang/glslang/MachineIndependent $(DEPS_DIR)/glslang/glslang/SPIRV $(DEPS_DIR)/glslang/glslang/glslang/OSDependent/Unix
 CLANG_CXX_LANGUAGE_STANDARD=c++11
 CLANG_ENABLE_OBJC_ARC=YES
+INFOPLIST_FILE = $(SRCROOT)/OSX/Info_Metal.plist
diff --git a/pkg/apple/Metal.xcconfig b/pkg/apple/Metal.xcconfig
index 27d22dd265..1168500099 100644
--- a/pkg/apple/Metal.xcconfig
+++ b/pkg/apple/Metal.xcconfig
@@ -5,5 +5,5 @@
 //  Created by Stuart Carnie on 5/10/18.
 //
 
-OTHER_CFLAGS = $(inherited) -DHAVE_MAIN
+OTHER_CFLAGS = $(inherited) -DHAVE_MAIN -DHAVE_COCOA_METAL
 
diff --git a/pkg/apple/OSX/Info_Metal.plist b/pkg/apple/OSX/Info_Metal.plist
new file mode 100644
index 0000000000..72c6354868
--- /dev/null
+++ b/pkg/apple/OSX/Info_Metal.plist
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeExtensions</key>
+			<array>
+				<string>*</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>All Files</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>retroarch</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.7.5</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.7.5</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2018 RetroArch. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu_Metal</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/pkg/apple/OSX/en.lproj/MainMenu.xib b/pkg/apple/OSX/en.lproj/MainMenu.xib
index b9d83c4861..111ef503b3 100644
--- a/pkg/apple/OSX/en.lproj/MainMenu.xib
+++ b/pkg/apple/OSX/en.lproj/MainMenu.xib
@@ -1,1809 +1,342 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
-	<data>
-		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">12F45</string>
-		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
-		<string key="IBDocument.AppKitVersion">1187.40</string>
-		<string key="IBDocument.HIToolboxVersion">626.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">3084</string>
-		</object>
-		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>NSCustomObject</string>
-			<string>NSMenu</string>
-			<string>NSMenuItem</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-		</object>
-		<object class="NSArray" key="IBDocument.PluginDependencies">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSCustomObject" id="1014">
-				<string key="NSClassName">FirstResponder</string>
-			</object>
-			<object class="NSCustomObject" id="1050">
-				<string key="NSClassName">NSApplication</string>
-			</object>
-			<object class="NSMenu" id="649796088">
-				<string key="NSTitle">AMainMenu</string>
-				<object class="NSMutableArray" key="NSMenuItems">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="NSMenuItem" id="694149608">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">RetroArch</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<object class="NSCustomResource" key="NSOnImage" id="35465992">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuCheckmark</string>
-						</object>
-						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">NSMenuMixedState</string>
-						</object>
-						<string key="NSAction">submenuAction:</string>
-						<reference key="NSTarget" ref="110575045"/>
-						<object class="NSMenu" key="NSSubmenu" id="110575045">
-							<string key="NSTitle">RetroArch</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="238522557">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">About RetroArch</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="304266470">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1046388886">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Services</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<reference key="NSTarget" ref="752062318"/>
-									<object class="NSMenu" key="NSSubmenu" id="752062318">
-										<string key="NSTitle">Services</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-										</object>
-										<string key="NSName">_NSServicesMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="646227648">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="755159360">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide RetroArch</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="342932134">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Hide Others</string>
-									<string key="NSKeyEquiv">h</string>
-									<int key="NSKeyEquivModMask">1572864</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="908899353">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Show All</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1056857174">
-									<reference key="NSMenu" ref="110575045"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="632727374">
-									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">Quit RetroArch</string>
-									<string key="NSKeyEquiv">q</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSAppleMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="379814623">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">File</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<reference key="NSTarget" ref="720053764"/>
-						<object class="NSMenu" key="NSSubmenu" id="720053764">
-							<string key="NSTitle">File</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="722745758">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Load Core...</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="733060596">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Load Content...</string>
-									<string key="NSKeyEquiv">o</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="1025936716">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Open Recent</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<reference key="NSTarget" ref="1065607017"/>
-									<object class="NSMenu" key="NSSubmenu" id="1065607017">
-										<string key="NSTitle">Open Recent</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="759406840">
-												<reference key="NSMenu" ref="1065607017"/>
-												<string key="NSTitle">Clear Menu</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSKeyEquivModMask">1048576</int>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-											</object>
-										</object>
-										<string key="NSName">_NSRecentDocumentsMenu</string>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="425164168">
-									<reference key="NSMenu" ref="720053764"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="776162233">
-									<reference key="NSMenu" ref="720053764"/>
-									<string key="NSTitle">Close</string>
-									<string key="NSKeyEquiv">w</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="265357942">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Command</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<reference key="NSTarget" ref="604031057"/>
-						<object class="NSMenu" key="NSSubmenu" id="604031057">
-							<string key="NSTitle">Command</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="142094220">
-									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Audio Options</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="958304575">
-										<string key="NSTitle">Audio Options</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="1064176677">
-												<reference key="NSMenu" ref="958304575"/>
-												<string key="NSTitle">Mute Toggle</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">11</int>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="191361579">
-									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Disk Options</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="79435345">
-										<string key="NSTitle">Disk Options</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="593697668">
-												<reference key="NSMenu" ref="79435345"/>
-												<string key="NSTitle">Cycle Tray</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">4</int>
-											</object>
-											<object class="NSMenuItem" id="189555851">
-												<reference key="NSMenu" ref="79435345"/>
-												<string key="NSTitle">Next Disk</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">6</int>
-											</object>
-											<object class="NSMenuItem" id="291565286">
-												<reference key="NSMenu" ref="79435345"/>
-												<string key="NSTitle">Previous Disk</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">5</int>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="140877964">
-									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Mouse Options</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="302314278">
-										<string key="NSTitle">Mouse Options</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="829216824">
-												<reference key="NSMenu" ref="302314278"/>
-												<string key="NSTitle">Mouse Grab Toggle</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">7</int>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="347361677">
-									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Save State Options</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="172285465">
-										<string key="NSTitle">Save State Options</string>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="354494807">
-												<reference key="NSMenu" ref="172285465"/>
-												<string key="NSTitle">Load State</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">2</int>
-											</object>
-											<object class="NSMenuItem" id="870739926">
-												<reference key="NSMenu" ref="172285465"/>
-												<string key="NSTitle">Save State</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">3</int>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="161299339">
-									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Reset</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<int key="NSTag">1</int>
-								</object>
-								<object class="NSMenuItem" id="330055564">
-									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Menu Toggle</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<int key="NSTag">8</int>
-								</object>
-								<object class="NSMenuItem" id="1027971327">
-									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Pause Toggle</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<int key="NSTag">9</int>
-								</object>
-								<object class="NSMenuItem" id="1013300225">
-									<reference key="NSMenu" ref="604031057"/>
-									<string key="NSTitle">Take Screenshot</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<int key="NSTag">10</int>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="1225315">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Paths</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<reference key="NSTarget" ref="715293634"/>
-						<object class="NSMenu" key="NSSubmenu" id="715293634">
-							<string key="NSTitle">Paths</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="777071989">
-									<reference key="NSMenu" ref="715293634"/>
-									<string key="NSTitle">Core Directory</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="713487014">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Window</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSKeyEquivModMask">1048576</int>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<reference key="NSTarget" ref="835318025"/>
-						<object class="NSMenu" key="NSSubmenu" id="835318025">
-							<string key="NSTitle">Window</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="1011231497">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Minimize</string>
-									<string key="NSKeyEquiv">m</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="575023229">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Zoom</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="603281520">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Windowed Scale</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<string key="NSAction">submenuAction:</string>
-									<object class="NSMenu" key="NSSubmenu" id="330271109">
-										<string key="NSTitle"/>
-										<object class="NSMutableArray" key="NSMenuItems">
-											<bool key="EncodedWithXMLCoder">YES</bool>
-											<object class="NSMenuItem" id="580918460">
-												<reference key="NSMenu" ref="330271109"/>
-												<string key="NSTitle">1x</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">10</int>
-											</object>
-											<object class="NSMenuItem" id="718801594">
-												<reference key="NSMenu" ref="330271109"/>
-												<string key="NSTitle">2x</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">11</int>
-											</object>
-											<object class="NSMenuItem" id="387472141">
-												<reference key="NSMenu" ref="330271109"/>
-												<string key="NSTitle">3x</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">12</int>
-											</object>
-											<object class="NSMenuItem" id="271634217">
-												<reference key="NSMenu" ref="330271109"/>
-												<string key="NSTitle">4x</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">13</int>
-											</object>
-											<object class="NSMenuItem" id="518813488">
-												<reference key="NSMenu" ref="330271109"/>
-												<string key="NSTitle">5x</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">14</int>
-											</object>
-											<object class="NSMenuItem" id="1040646503">
-												<reference key="NSMenu" ref="330271109"/>
-												<string key="NSTitle">6x</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">15</int>
-											</object>
-											<object class="NSMenuItem" id="310767472">
-												<reference key="NSMenu" ref="330271109"/>
-												<string key="NSTitle">7x</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">16</int>
-											</object>
-											<object class="NSMenuItem" id="975947241">
-												<reference key="NSMenu" ref="330271109"/>
-												<string key="NSTitle">8x</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">17</int>
-											</object>
-											<object class="NSMenuItem" id="997227628">
-												<reference key="NSMenu" ref="330271109"/>
-												<string key="NSTitle">9x</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">18</int>
-											</object>
-											<object class="NSMenuItem" id="522797995">
-												<reference key="NSMenu" ref="330271109"/>
-												<string key="NSTitle">10x</string>
-												<string key="NSKeyEquiv"/>
-												<int key="NSMnemonicLoc">2147483647</int>
-												<reference key="NSOnImage" ref="35465992"/>
-												<reference key="NSMixedImage" ref="502551668"/>
-												<int key="NSTag">19</int>
-											</object>
-										</object>
-									</object>
-								</object>
-								<object class="NSMenuItem" id="1065388702">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Enter Full Screen</string>
-									<string key="NSKeyEquiv">f</string>
-									<int key="NSKeyEquivModMask">1310720</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="696011883">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Toggle Exclusive Full Screen</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-									<int key="NSTag">20</int>
-								</object>
-								<object class="NSMenuItem" id="299356726">
-									<reference key="NSMenu" ref="835318025"/>
-									<bool key="NSIsDisabled">YES</bool>
-									<bool key="NSIsSeparator">YES</bool>
-									<string key="NSTitle"/>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-								<object class="NSMenuItem" id="625202149">
-									<reference key="NSMenu" ref="835318025"/>
-									<string key="NSTitle">Bring All to Front</string>
-									<string key="NSKeyEquiv"/>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSWindowsMenu</string>
-						</object>
-					</object>
-					<object class="NSMenuItem" id="448692316">
-						<reference key="NSMenu" ref="649796088"/>
-						<string key="NSTitle">Help</string>
-						<string key="NSKeyEquiv"/>
-						<int key="NSMnemonicLoc">2147483647</int>
-						<reference key="NSOnImage" ref="35465992"/>
-						<reference key="NSMixedImage" ref="502551668"/>
-						<string key="NSAction">submenuAction:</string>
-						<reference key="NSTarget" ref="992780483"/>
-						<object class="NSMenu" key="NSSubmenu" id="992780483">
-							<string key="NSTitle">Help</string>
-							<object class="NSMutableArray" key="NSMenuItems">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSMenuItem" id="105068016">
-									<reference key="NSMenu" ref="992780483"/>
-									<string key="NSTitle">RetroArch Help</string>
-									<string key="NSKeyEquiv">?</string>
-									<int key="NSKeyEquivModMask">1048576</int>
-									<int key="NSMnemonicLoc">2147483647</int>
-									<reference key="NSOnImage" ref="35465992"/>
-									<reference key="NSMixedImage" ref="502551668"/>
-								</object>
-							</object>
-							<string key="NSName">_NSHelpMenu</string>
-						</object>
-					</object>
-				</object>
-				<string key="NSName">_NSMainMenu</string>
-			</object>
-			<object class="NSWindowTemplate" id="972006081">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{335, 390}, {480, 360}}</string>
-				<int key="NSWTFlags">1954021376</int>
-				<string key="NSWindowTitle">RetroArch_OSX</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<nil key="NSViewClass"/>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<object class="NSView" key="NSWindowView" id="439893737">
-					<reference key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<string key="NSFrameSize">{480, 360}</string>
-					<reference key="NSSuperview"/>
-					<reference key="NSWindow"/>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSCustomObject" id="976324537">
-				<string key="NSClassName">RetroArch_OSX</string>
-			</object>
-		</object>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<object class="NSMutableArray" key="connectionRecords">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">terminate:</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="632727374"/>
-					</object>
-					<int key="connectionID">449</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="976324537"/>
-					</object>
-					<int key="connectionID">495</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performMiniaturize:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1011231497"/>
-					</object>
-					<int key="connectionID">37</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">arrangeInFront:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="625202149"/>
-					</object>
-					<int key="connectionID">39</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">clearRecentDocuments:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="759406840"/>
-					</object>
-					<int key="connectionID">127</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performClose:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="776162233"/>
-					</object>
-					<int key="connectionID">193</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">performZoom:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="575023229"/>
-					</object>
-					<int key="connectionID">240</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hide:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="755159360"/>
-					</object>
-					<int key="connectionID">367</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">hideOtherApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="342932134"/>
-					</object>
-					<int key="connectionID">368</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">unhideAllApplications:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="908899353"/>
-					</object>
-					<int key="connectionID">370</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showHelp:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="105068016"/>
-					</object>
-					<int key="connectionID">493</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleFullScreen:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="1065388702"/>
-					</object>
-					<int key="connectionID">593</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openDocument:</string>
-						<reference key="source" ref="1014"/>
-						<reference key="destination" ref="733060596"/>
-					</object>
-					<int key="connectionID">657</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="354494807"/>
-					</object>
-					<int key="connectionID">550</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="870739926"/>
-					</object>
-					<int key="connectionID">552</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">showCoresDirectory:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="777071989"/>
-					</object>
-					<int key="connectionID">588</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">window</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="972006081"/>
-					</object>
-					<int key="connectionID">591</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="593697668"/>
-					</object>
-					<int key="connectionID">615</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="291565286"/>
-					</object>
-					<int key="connectionID">617</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="189555851"/>
-					</object>
-					<int key="connectionID">619</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="829216824"/>
-					</object>
-					<int key="connectionID">621</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="161299339"/>
-					</object>
-					<int key="connectionID">623</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="330055564"/>
-					</object>
-					<int key="connectionID">625</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="1027971327"/>
-					</object>
-					<int key="connectionID">627</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="580918460"/>
-					</object>
-					<int key="connectionID">634</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="718801594"/>
-					</object>
-					<int key="connectionID">636</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="387472141"/>
-					</object>
-					<int key="connectionID">638</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="271634217"/>
-					</object>
-					<int key="connectionID">640</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="518813488"/>
-					</object>
-					<int key="connectionID">642</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="1040646503"/>
-					</object>
-					<int key="connectionID">644</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="310767472"/>
-					</object>
-					<int key="connectionID">646</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="975947241"/>
-					</object>
-					<int key="connectionID">648</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="997227628"/>
-					</object>
-					<int key="connectionID">650</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="522797995"/>
-					</object>
-					<int key="connectionID">652</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="696011883"/>
-					</object>
-					<int key="connectionID">655</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="1013300225"/>
-					</object>
-					<int key="connectionID">659</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">basicEvent:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="1064176677"/>
-					</object>
-					<int key="connectionID">664</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openCore:</string>
-						<reference key="source" ref="976324537"/>
-						<reference key="destination" ref="722745758"/>
-					</object>
-					<int key="connectionID">665</int>
-				</object>
-			</object>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<object class="NSArray" key="orderedObjects">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<object class="NSArray" key="object" id="0">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-						</object>
-						<reference key="children" ref="1048"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="1021"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="1014"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">First Responder</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-3</int>
-						<reference key="object" ref="1050"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Application</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">29</int>
-						<reference key="object" ref="649796088"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="713487014"/>
-							<reference ref="448692316"/>
-							<reference ref="1225315"/>
-							<reference ref="379814623"/>
-							<reference ref="694149608"/>
-							<reference ref="265357942"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="713487014"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="835318025"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">56</int>
-						<reference key="object" ref="694149608"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="110575045"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">83</int>
-						<reference key="object" ref="379814623"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="720053764"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">81</int>
-						<reference key="object" ref="720053764"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1025936716"/>
-							<reference ref="776162233"/>
-							<reference ref="425164168"/>
-							<reference ref="733060596"/>
-							<reference ref="722745758"/>
-						</object>
-						<reference key="parent" ref="379814623"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">72</int>
-						<reference key="object" ref="722745758"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">124</int>
-						<reference key="object" ref="1025936716"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1065607017"/>
-						</object>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">73</int>
-						<reference key="object" ref="776162233"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">79</int>
-						<reference key="object" ref="425164168"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">125</int>
-						<reference key="object" ref="1065607017"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="759406840"/>
-						</object>
-						<reference key="parent" ref="1025936716"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">126</int>
-						<reference key="object" ref="759406840"/>
-						<reference key="parent" ref="1065607017"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">57</int>
-						<reference key="object" ref="110575045"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="238522557"/>
-							<reference ref="755159360"/>
-							<reference ref="908899353"/>
-							<reference ref="632727374"/>
-							<reference ref="646227648"/>
-							<reference ref="304266470"/>
-							<reference ref="1046388886"/>
-							<reference ref="1056857174"/>
-							<reference ref="342932134"/>
-						</object>
-						<reference key="parent" ref="694149608"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">58</int>
-						<reference key="object" ref="238522557"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
-						<reference key="object" ref="755159360"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">150</int>
-						<reference key="object" ref="908899353"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">136</int>
-						<reference key="object" ref="632727374"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">144</int>
-						<reference key="object" ref="646227648"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">236</int>
-						<reference key="object" ref="304266470"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">131</int>
-						<reference key="object" ref="1046388886"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="752062318"/>
-						</object>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">149</int>
-						<reference key="object" ref="1056857174"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">145</int>
-						<reference key="object" ref="342932134"/>
-						<reference key="parent" ref="110575045"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">130</int>
-						<reference key="object" ref="752062318"/>
-						<reference key="parent" ref="1046388886"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">371</int>
-						<reference key="object" ref="972006081"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="439893737"/>
-						</object>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">372</int>
-						<reference key="object" ref="439893737"/>
-						<reference key="parent" ref="972006081"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">490</int>
-						<reference key="object" ref="448692316"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="992780483"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">491</int>
-						<reference key="object" ref="992780483"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="105068016"/>
-						</object>
-						<reference key="parent" ref="448692316"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">492</int>
-						<reference key="object" ref="105068016"/>
-						<reference key="parent" ref="992780483"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">494</int>
-						<reference key="object" ref="976324537"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">545</int>
-						<reference key="object" ref="265357942"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="604031057"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">546</int>
-						<reference key="object" ref="604031057"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="347361677"/>
-							<reference ref="161299339"/>
-							<reference ref="330055564"/>
-							<reference ref="1027971327"/>
-							<reference ref="1013300225"/>
-							<reference ref="142094220"/>
-							<reference ref="191361579"/>
-							<reference ref="140877964"/>
-						</object>
-						<reference key="parent" ref="265357942"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">585</int>
-						<reference key="object" ref="1225315"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="715293634"/>
-						</object>
-						<reference key="parent" ref="649796088"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">586</int>
-						<reference key="object" ref="715293634"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="777071989"/>
-						</object>
-						<reference key="parent" ref="1225315"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">587</int>
-						<reference key="object" ref="777071989"/>
-						<reference key="parent" ref="715293634"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">597</int>
-						<reference key="object" ref="191361579"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="79435345"/>
-						</object>
-						<reference key="parent" ref="604031057"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">598</int>
-						<reference key="object" ref="79435345"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="593697668"/>
-							<reference ref="189555851"/>
-							<reference ref="291565286"/>
-						</object>
-						<reference key="parent" ref="191361579"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">602</int>
-						<reference key="object" ref="140877964"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="302314278"/>
-						</object>
-						<reference key="parent" ref="604031057"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">603</int>
-						<reference key="object" ref="302314278"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="829216824"/>
-						</object>
-						<reference key="parent" ref="140877964"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">24</int>
-						<reference key="object" ref="835318025"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1065388702"/>
-							<reference ref="1011231497"/>
-							<reference ref="575023229"/>
-							<reference ref="625202149"/>
-							<reference ref="299356726"/>
-							<reference ref="603281520"/>
-							<reference ref="696011883"/>
-						</object>
-						<reference key="parent" ref="713487014"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">592</int>
-						<reference key="object" ref="1065388702"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">23</int>
-						<reference key="object" ref="1011231497"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">239</int>
-						<reference key="object" ref="575023229"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">5</int>
-						<reference key="object" ref="625202149"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">92</int>
-						<reference key="object" ref="299356726"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">612</int>
-						<reference key="object" ref="347361677"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="172285465"/>
-						</object>
-						<reference key="parent" ref="604031057"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">613</int>
-						<reference key="object" ref="172285465"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="354494807"/>
-							<reference ref="870739926"/>
-						</object>
-						<reference key="parent" ref="347361677"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">549</int>
-						<reference key="object" ref="354494807"/>
-						<reference key="parent" ref="172285465"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">551</int>
-						<reference key="object" ref="870739926"/>
-						<reference key="parent" ref="172285465"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">614</int>
-						<reference key="object" ref="593697668"/>
-						<reference key="parent" ref="79435345"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">616</int>
-						<reference key="object" ref="291565286"/>
-						<reference key="parent" ref="79435345"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">618</int>
-						<reference key="object" ref="189555851"/>
-						<reference key="parent" ref="79435345"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">620</int>
-						<reference key="object" ref="829216824"/>
-						<reference key="parent" ref="302314278"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">629</int>
-						<reference key="object" ref="603281520"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="330271109"/>
-						</object>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">630</int>
-						<reference key="object" ref="330271109"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="580918460"/>
-							<reference ref="718801594"/>
-							<reference ref="387472141"/>
-							<reference ref="271634217"/>
-							<reference ref="518813488"/>
-							<reference ref="1040646503"/>
-							<reference ref="310767472"/>
-							<reference ref="975947241"/>
-							<reference ref="997227628"/>
-							<reference ref="522797995"/>
-						</object>
-						<reference key="parent" ref="603281520"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">633</int>
-						<reference key="object" ref="580918460"/>
-						<reference key="parent" ref="330271109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">635</int>
-						<reference key="object" ref="718801594"/>
-						<reference key="parent" ref="330271109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">637</int>
-						<reference key="object" ref="387472141"/>
-						<reference key="parent" ref="330271109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">639</int>
-						<reference key="object" ref="271634217"/>
-						<reference key="parent" ref="330271109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">641</int>
-						<reference key="object" ref="518813488"/>
-						<reference key="parent" ref="330271109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">643</int>
-						<reference key="object" ref="1040646503"/>
-						<reference key="parent" ref="330271109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">645</int>
-						<reference key="object" ref="310767472"/>
-						<reference key="parent" ref="330271109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">647</int>
-						<reference key="object" ref="975947241"/>
-						<reference key="parent" ref="330271109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">649</int>
-						<reference key="object" ref="997227628"/>
-						<reference key="parent" ref="330271109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">651</int>
-						<reference key="object" ref="522797995"/>
-						<reference key="parent" ref="330271109"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">654</int>
-						<reference key="object" ref="696011883"/>
-						<reference key="parent" ref="835318025"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">622</int>
-						<reference key="object" ref="161299339"/>
-						<reference key="parent" ref="604031057"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">624</int>
-						<reference key="object" ref="330055564"/>
-						<reference key="parent" ref="604031057"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">626</int>
-						<reference key="object" ref="1027971327"/>
-						<reference key="parent" ref="604031057"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">656</int>
-						<reference key="object" ref="733060596"/>
-						<reference key="parent" ref="720053764"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">658</int>
-						<reference key="object" ref="1013300225"/>
-						<reference key="parent" ref="604031057"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">660</int>
-						<reference key="object" ref="142094220"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="958304575"/>
-						</object>
-						<reference key="parent" ref="604031057"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">661</int>
-						<reference key="object" ref="958304575"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1064176677"/>
-						</object>
-						<reference key="parent" ref="142094220"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">663</int>
-						<reference key="object" ref="1064176677"/>
-						<reference key="parent" ref="958304575"/>
-					</object>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="flattenedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="NSArray" key="dict.sortedKeys">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>-1.IBPluginDependency</string>
-					<string>-2.IBPluginDependency</string>
-					<string>-3.IBPluginDependency</string>
-					<string>124.IBPluginDependency</string>
-					<string>125.IBPluginDependency</string>
-					<string>126.IBPluginDependency</string>
-					<string>130.IBPluginDependency</string>
-					<string>131.IBPluginDependency</string>
-					<string>134.IBPluginDependency</string>
-					<string>136.IBPluginDependency</string>
-					<string>144.IBPluginDependency</string>
-					<string>145.IBPluginDependency</string>
-					<string>149.IBPluginDependency</string>
-					<string>150.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>23.IBPluginDependency</string>
-					<string>236.IBPluginDependency</string>
-					<string>239.IBPluginDependency</string>
-					<string>24.IBPluginDependency</string>
-					<string>29.IBPluginDependency</string>
-					<string>371.IBPluginDependency</string>
-					<string>371.IBWindowTemplateEditedContentRect</string>
-					<string>371.NSWindowTemplate.visibleAtLaunch</string>
-					<string>372.IBPluginDependency</string>
-					<string>490.IBPluginDependency</string>
-					<string>491.IBPluginDependency</string>
-					<string>492.IBPluginDependency</string>
-					<string>494.IBPluginDependency</string>
-					<string>5.IBPluginDependency</string>
-					<string>545.IBPluginDependency</string>
-					<string>546.IBPluginDependency</string>
-					<string>549.IBPluginDependency</string>
-					<string>551.IBPluginDependency</string>
-					<string>56.IBPluginDependency</string>
-					<string>57.IBPluginDependency</string>
-					<string>58.IBPluginDependency</string>
-					<string>585.IBPluginDependency</string>
-					<string>586.IBPluginDependency</string>
-					<string>587.IBPluginDependency</string>
-					<string>592.IBPluginDependency</string>
-					<string>597.IBPluginDependency</string>
-					<string>598.IBPluginDependency</string>
-					<string>602.IBPluginDependency</string>
-					<string>603.IBPluginDependency</string>
-					<string>612.IBPluginDependency</string>
-					<string>613.IBPluginDependency</string>
-					<string>614.IBPluginDependency</string>
-					<string>616.IBPluginDependency</string>
-					<string>618.IBPluginDependency</string>
-					<string>620.IBPluginDependency</string>
-					<string>622.IBPluginDependency</string>
-					<string>624.IBPluginDependency</string>
-					<string>626.IBPluginDependency</string>
-					<string>629.IBPluginDependency</string>
-					<string>630.IBPluginDependency</string>
-					<string>633.IBPluginDependency</string>
-					<string>635.IBPluginDependency</string>
-					<string>637.IBPluginDependency</string>
-					<string>639.IBPluginDependency</string>
-					<string>641.IBPluginDependency</string>
-					<string>643.IBPluginDependency</string>
-					<string>645.IBPluginDependency</string>
-					<string>647.IBPluginDependency</string>
-					<string>649.IBPluginDependency</string>
-					<string>651.IBPluginDependency</string>
-					<string>654.IBPluginDependency</string>
-					<string>656.IBPluginDependency</string>
-					<string>658.IBPluginDependency</string>
-					<string>660.IBPluginDependency</string>
-					<string>661.IBPluginDependency</string>
-					<string>663.IBPluginDependency</string>
-					<string>72.IBPluginDependency</string>
-					<string>73.IBPluginDependency</string>
-					<string>79.IBPluginDependency</string>
-					<string>81.IBPluginDependency</string>
-					<string>83.IBPluginDependency</string>
-					<string>92.IBPluginDependency</string>
-				</object>
-				<object class="NSArray" key="dict.values">
-					<bool key="EncodedWithXMLCoder">YES</bool>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>{{438, 199}, {480, 360}}</string>
-					<integer value="1"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-				</object>
-			</object>
-			<object class="NSMutableDictionary" key="unlocalizedProperties">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="activeLocalization"/>
-			<object class="NSMutableDictionary" key="localizations">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<reference key="dict.sortedKeys" ref="0"/>
-				<reference key="dict.values" ref="0"/>
-			</object>
-			<nil key="sourceID"/>
-			<int key="maxID">665</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<object class="IBPartialClassDescription">
-					<string key="className">RetroArch_OSX</string>
-					<string key="superclassName">NSObject</string>
-					<object class="NSMutableDictionary" key="actions">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>basicEvent:</string>
-							<string>openCore:</string>
-							<string>showCoresDirectory:</string>
-							<string>showPreferences:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-							<string>id</string>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="actionInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>basicEvent:</string>
-							<string>openCore:</string>
-							<string>showCoresDirectory:</string>
-							<string>showPreferences:</string>
-						</object>
-						<object class="NSArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBActionInfo">
-								<string key="name">basicEvent:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">openCore:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showCoresDirectory:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-							<object class="IBActionInfo">
-								<string key="name">showPreferences:</string>
-								<string key="candidateClassName">id</string>
-							</object>
-						</object>
-					</object>
-					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">window</string>
-						<string key="NS.object.0">NSWindow</string>
-					</object>
-					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">window</string>
-						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">window</string>
-							<string key="candidateClassName">NSWindow</string>
-						</object>
-					</object>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/RetroArch.h</string>
-					</object>
-				</object>
-			</object>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1050" key="NS.object.0"/>
-		</object>
-		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
-			<integer value="3000" key="NS.object.0"/>
-		</object>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>NSMenuCheckmark</string>
-				<string>NSMenuMixedState</string>
-			</object>
-			<object class="NSArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{11, 11}</string>
-				<string>{10, 3}</string>
-			</object>
-		</object>
-	</data>
-</archive>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="494" id="495"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <menu title="AMainMenu" systemMenu="main" id="29">
+            <items>
+                <menuItem title="RetroArch" id="56">
+                    <menu key="submenu" title="RetroArch" systemMenu="apple" id="57">
+                        <items>
+                            <menuItem title="About RetroArch" id="58">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="236">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Services" id="131">
+                                <menu key="submenu" title="Services" systemMenu="services" id="130"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="144">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Hide RetroArch" keyEquivalent="h" id="134">
+                                <connections>
+                                    <action selector="hide:" target="-1" id="367"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hide Others" keyEquivalent="h" id="145">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Show All" id="150">
+                                <connections>
+                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="149">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Quit RetroArch" keyEquivalent="q" id="136">
+                                <connections>
+                                    <action selector="terminate:" target="-3" id="449"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="File" id="83">
+                    <menu key="submenu" title="File" id="81">
+                        <items>
+                            <menuItem title="Load Core..." id="72">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="openCore:" target="494" id="665"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Load Content..." keyEquivalent="o" id="656">
+                                <connections>
+                                    <action selector="openDocument:" target="-1" id="657"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open Recent" id="124">
+                                <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
+                                    <items>
+                                        <menuItem title="Clear Menu" id="126">
+                                            <connections>
+                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="79">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73">
+                                <connections>
+                                    <action selector="performClose:" target="-1" id="193"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Command" id="545">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Command" id="546">
+                        <items>
+                            <menuItem title="Audio Options" id="660">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Audio Options" id="661">
+                                    <items>
+                                        <menuItem title="Mute Toggle" tag="11" id="663">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="664"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Disk Options" id="597">
+                                <menu key="submenu" title="Disk Options" id="598">
+                                    <items>
+                                        <menuItem title="Cycle Tray" tag="4" id="614">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="615"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Next Disk" tag="6" id="618">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="619"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Previous Disk" tag="5" id="616">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="617"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Mouse Options" id="602">
+                                <menu key="submenu" title="Mouse Options" id="603">
+                                    <items>
+                                        <menuItem title="Mouse Grab Toggle" tag="7" id="620">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="621"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Save State Options" id="612">
+                                <menu key="submenu" title="Save State Options" id="613">
+                                    <items>
+                                        <menuItem title="Load State" tag="2" id="549">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="550"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Save State" tag="3" id="551">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="552"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Reset" tag="1" id="622">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="basicEvent:" target="494" id="623"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Menu Toggle" tag="8" id="624">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="basicEvent:" target="494" id="625"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Pause Toggle" tag="9" id="626">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="basicEvent:" target="494" id="627"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Take Screenshot" tag="10" id="658">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="basicEvent:" target="494" id="659"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Paths" id="585">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Paths" id="586">
+                        <items>
+                            <menuItem title="Core Directory" id="587">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="showCoresDirectory:" target="494" id="588"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Window" id="19">
+                    <menu key="submenu" title="Window" systemMenu="window" id="24">
+                        <items>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23">
+                                <connections>
+                                    <action selector="performMiniaturize:" target="-1" id="37"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Zoom" id="239">
+                                <connections>
+                                    <action selector="performZoom:" target="-1" id="240"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Windowed Scale" id="629">
+                                <menu key="submenu" id="630">
+                                    <items>
+                                        <menuItem title="1x" tag="10" id="633">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="634"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="2x" tag="11" id="635">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="636"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="3x" tag="12" id="637">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="638"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="4x" tag="13" id="639">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="640"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="5x" tag="14" id="641">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="642"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="6x" tag="15" id="643">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="644"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="7x" tag="16" id="645">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="646"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="8x" tag="17" id="647">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="648"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="9x" tag="18" id="649">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="650"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="10x" tag="19" id="651">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="652"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Enter Full Screen" keyEquivalent="f" id="592">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                <connections>
+                                    <action selector="toggleFullScreen:" target="-1" id="593"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Toggle Exclusive Full Screen" tag="20" id="654">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="basicEvent:" target="494" id="655"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="92">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5">
+                                <connections>
+                                    <action selector="arrangeInFront:" target="-1" id="39"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Help" id="490">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Help" systemMenu="help" id="491">
+                        <items>
+                            <menuItem title="RetroArch Help" keyEquivalent="?" id="492">
+                                <connections>
+                                    <action selector="showHelp:" target="-1" id="493"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+            </items>
+        </menu>
+        <window title="RetroArch_OSX" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="335" y="390" width="480" height="360"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+            <view key="contentView" id="372">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </view>
+        </window>
+        <customObject id="494" customClass="RetroArch_OSX">
+            <connections>
+                <outlet property="window" destination="371" id="591"/>
+            </connections>
+        </customObject>
+    </objects>
+</document>
diff --git a/pkg/apple/OSX/en.lproj/MainMenu_Metal.xib b/pkg/apple/OSX/en.lproj/MainMenu_Metal.xib
new file mode 100644
index 0000000000..ecf5bbe58b
--- /dev/null
+++ b/pkg/apple/OSX/en.lproj/MainMenu_Metal.xib
@@ -0,0 +1,342 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="494" id="495"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <menu title="AMainMenu" systemMenu="main" id="29">
+            <items>
+                <menuItem title="RetroArch" id="56">
+                    <menu key="submenu" title="RetroArch" systemMenu="apple" id="57">
+                        <items>
+                            <menuItem title="About RetroArch" id="58">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="236">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Services" id="131">
+                                <menu key="submenu" title="Services" systemMenu="services" id="130"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="144">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Hide RetroArch" keyEquivalent="h" id="134">
+                                <connections>
+                                    <action selector="hide:" target="-1" id="367"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hide Others" keyEquivalent="h" id="145">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Show All" id="150">
+                                <connections>
+                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="149">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Quit RetroArch" keyEquivalent="q" id="136">
+                                <connections>
+                                    <action selector="terminate:" target="-3" id="449"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="File" id="83">
+                    <menu key="submenu" title="File" id="81">
+                        <items>
+                            <menuItem title="Load Core..." id="72">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="openCore:" target="494" id="665"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Load Content..." keyEquivalent="o" id="656">
+                                <connections>
+                                    <action selector="openDocument:" target="-1" id="657"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open Recent" id="124">
+                                <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
+                                    <items>
+                                        <menuItem title="Clear Menu" id="126">
+                                            <connections>
+                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="79">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73">
+                                <connections>
+                                    <action selector="performClose:" target="-1" id="193"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Command" id="545">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Command" id="546">
+                        <items>
+                            <menuItem title="Audio Options" id="660">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Audio Options" id="661">
+                                    <items>
+                                        <menuItem title="Mute Toggle" tag="11" id="663">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="664"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Disk Options" id="597">
+                                <menu key="submenu" title="Disk Options" id="598">
+                                    <items>
+                                        <menuItem title="Cycle Tray" tag="4" id="614">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="615"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Next Disk" tag="6" id="618">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="619"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Previous Disk" tag="5" id="616">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="617"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Mouse Options" id="602">
+                                <menu key="submenu" title="Mouse Options" id="603">
+                                    <items>
+                                        <menuItem title="Mouse Grab Toggle" tag="7" id="620">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="621"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Save State Options" id="612">
+                                <menu key="submenu" title="Save State Options" id="613">
+                                    <items>
+                                        <menuItem title="Load State" tag="2" id="549">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="550"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Save State" tag="3" id="551">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="552"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Reset" tag="1" id="622">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="basicEvent:" target="494" id="623"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Menu Toggle" tag="8" id="624">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="basicEvent:" target="494" id="625"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Pause Toggle" tag="9" id="626">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="basicEvent:" target="494" id="627"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Take Screenshot" tag="10" id="658">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="basicEvent:" target="494" id="659"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Paths" id="585">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Paths" id="586">
+                        <items>
+                            <menuItem title="Core Directory" id="587">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="showCoresDirectory:" target="494" id="588"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Window" id="19">
+                    <menu key="submenu" title="Window" systemMenu="window" id="24">
+                        <items>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23">
+                                <connections>
+                                    <action selector="performMiniaturize:" target="-1" id="37"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Zoom" id="239">
+                                <connections>
+                                    <action selector="performZoom:" target="-1" id="240"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Windowed Scale" id="629">
+                                <menu key="submenu" id="630">
+                                    <items>
+                                        <menuItem title="1x" tag="10" id="633">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="634"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="2x" tag="11" id="635">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="636"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="3x" tag="12" id="637">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="638"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="4x" tag="13" id="639">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="640"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="5x" tag="14" id="641">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="642"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="6x" tag="15" id="643">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="644"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="7x" tag="16" id="645">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="646"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="8x" tag="17" id="647">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="648"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="9x" tag="18" id="649">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="650"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="10x" tag="19" id="651">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="basicEvent:" target="494" id="652"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Enter Full Screen" keyEquivalent="f" id="592">
+                                <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                <connections>
+                                    <action selector="toggleFullScreen:" target="-1" id="593"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Toggle Exclusive Full Screen" tag="20" id="654">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="basicEvent:" target="494" id="655"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="92">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5">
+                                <connections>
+                                    <action selector="arrangeInFront:" target="-1" id="39"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Help" id="490">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Help" systemMenu="help" id="491">
+                        <items>
+                            <menuItem title="RetroArch Help" keyEquivalent="?" id="492">
+                                <connections>
+                                    <action selector="showHelp:" target="-1" id="493"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+            </items>
+        </menu>
+        <window title="RetroArch_OSX" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371" customClass="RAWindow">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="335" y="390" width="480" height="360"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+            <view key="contentView" id="372">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
+                <autoresizingMask key="autoresizingMask"/>
+            </view>
+        </window>
+        <customObject id="494" customClass="RetroArch_OSX">
+            <connections>
+                <outlet property="window" destination="371" id="591"/>
+            </connections>
+        </customObject>
+    </objects>
+</document>
diff --git a/pkg/apple/OSX/en.lproj/MainMenu_PPC.xib b/pkg/apple/OSX/en.lproj/MainMenu_PPC.xib
new file mode 100644
index 0000000000..b9d83c4861
--- /dev/null
+++ b/pkg/apple/OSX/en.lproj/MainMenu_PPC.xib
@@ -0,0 +1,1809 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
+	<data>
+		<int key="IBDocument.SystemTarget">1050</int>
+		<string key="IBDocument.SystemVersion">12F45</string>
+		<string key="IBDocument.InterfaceBuilderVersion">3084</string>
+		<string key="IBDocument.AppKitVersion">1187.40</string>
+		<string key="IBDocument.HIToolboxVersion">626.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">3084</string>
+		</object>
+		<object class="NSArray" key="IBDocument.IntegratedClassDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>NSCustomObject</string>
+			<string>NSMenu</string>
+			<string>NSMenuItem</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSCustomObject" id="1021">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSCustomObject" id="1014">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1050">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSMenu" id="649796088">
+				<string key="NSTitle">AMainMenu</string>
+				<object class="NSMutableArray" key="NSMenuItems">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="NSMenuItem" id="694149608">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">RetroArch</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<object class="NSCustomResource" key="NSOnImage" id="35465992">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuCheckmark</string>
+						</object>
+						<object class="NSCustomResource" key="NSMixedImage" id="502551668">
+							<string key="NSClassName">NSImage</string>
+							<string key="NSResourceName">NSMenuMixedState</string>
+						</object>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="110575045"/>
+						<object class="NSMenu" key="NSSubmenu" id="110575045">
+							<string key="NSTitle">RetroArch</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="238522557">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">About RetroArch</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="304266470">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="1046388886">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Services</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="752062318"/>
+									<object class="NSMenu" key="NSSubmenu" id="752062318">
+										<string key="NSTitle">Services</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+										</object>
+										<string key="NSName">_NSServicesMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="646227648">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="755159360">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Hide RetroArch</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="342932134">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Hide Others</string>
+									<string key="NSKeyEquiv">h</string>
+									<int key="NSKeyEquivModMask">1572864</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="908899353">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Show All</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="1056857174">
+									<reference key="NSMenu" ref="110575045"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="632727374">
+									<reference key="NSMenu" ref="110575045"/>
+									<string key="NSTitle">Quit RetroArch</string>
+									<string key="NSKeyEquiv">q</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</object>
+							<string key="NSName">_NSAppleMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="379814623">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">File</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="720053764"/>
+						<object class="NSMenu" key="NSSubmenu" id="720053764">
+							<string key="NSTitle">File</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="722745758">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Load Core...</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="733060596">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Load Content...</string>
+									<string key="NSKeyEquiv">o</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="1025936716">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Open Recent</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<reference key="NSTarget" ref="1065607017"/>
+									<object class="NSMenu" key="NSSubmenu" id="1065607017">
+										<string key="NSTitle">Open Recent</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSMenuItem" id="759406840">
+												<reference key="NSMenu" ref="1065607017"/>
+												<string key="NSTitle">Clear Menu</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSKeyEquivModMask">1048576</int>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+											</object>
+										</object>
+										<string key="NSName">_NSRecentDocumentsMenu</string>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="425164168">
+									<reference key="NSMenu" ref="720053764"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="776162233">
+									<reference key="NSMenu" ref="720053764"/>
+									<string key="NSTitle">Close</string>
+									<string key="NSKeyEquiv">w</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="265357942">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Command</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="604031057"/>
+						<object class="NSMenu" key="NSSubmenu" id="604031057">
+							<string key="NSTitle">Command</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="142094220">
+									<reference key="NSMenu" ref="604031057"/>
+									<string key="NSTitle">Audio Options</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="958304575">
+										<string key="NSTitle">Audio Options</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSMenuItem" id="1064176677">
+												<reference key="NSMenu" ref="958304575"/>
+												<string key="NSTitle">Mute Toggle</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">11</int>
+											</object>
+										</object>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="191361579">
+									<reference key="NSMenu" ref="604031057"/>
+									<string key="NSTitle">Disk Options</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="79435345">
+										<string key="NSTitle">Disk Options</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSMenuItem" id="593697668">
+												<reference key="NSMenu" ref="79435345"/>
+												<string key="NSTitle">Cycle Tray</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">4</int>
+											</object>
+											<object class="NSMenuItem" id="189555851">
+												<reference key="NSMenu" ref="79435345"/>
+												<string key="NSTitle">Next Disk</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">6</int>
+											</object>
+											<object class="NSMenuItem" id="291565286">
+												<reference key="NSMenu" ref="79435345"/>
+												<string key="NSTitle">Previous Disk</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">5</int>
+											</object>
+										</object>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="140877964">
+									<reference key="NSMenu" ref="604031057"/>
+									<string key="NSTitle">Mouse Options</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="302314278">
+										<string key="NSTitle">Mouse Options</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSMenuItem" id="829216824">
+												<reference key="NSMenu" ref="302314278"/>
+												<string key="NSTitle">Mouse Grab Toggle</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">7</int>
+											</object>
+										</object>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="347361677">
+									<reference key="NSMenu" ref="604031057"/>
+									<string key="NSTitle">Save State Options</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="172285465">
+										<string key="NSTitle">Save State Options</string>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSMenuItem" id="354494807">
+												<reference key="NSMenu" ref="172285465"/>
+												<string key="NSTitle">Load State</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">2</int>
+											</object>
+											<object class="NSMenuItem" id="870739926">
+												<reference key="NSMenu" ref="172285465"/>
+												<string key="NSTitle">Save State</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">3</int>
+											</object>
+										</object>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="161299339">
+									<reference key="NSMenu" ref="604031057"/>
+									<string key="NSTitle">Reset</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<int key="NSTag">1</int>
+								</object>
+								<object class="NSMenuItem" id="330055564">
+									<reference key="NSMenu" ref="604031057"/>
+									<string key="NSTitle">Menu Toggle</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<int key="NSTag">8</int>
+								</object>
+								<object class="NSMenuItem" id="1027971327">
+									<reference key="NSMenu" ref="604031057"/>
+									<string key="NSTitle">Pause Toggle</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<int key="NSTag">9</int>
+								</object>
+								<object class="NSMenuItem" id="1013300225">
+									<reference key="NSMenu" ref="604031057"/>
+									<string key="NSTitle">Take Screenshot</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<int key="NSTag">10</int>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="1225315">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Paths</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="715293634"/>
+						<object class="NSMenu" key="NSSubmenu" id="715293634">
+							<string key="NSTitle">Paths</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="777071989">
+									<reference key="NSMenu" ref="715293634"/>
+									<string key="NSTitle">Core Directory</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</object>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="713487014">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Window</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSKeyEquivModMask">1048576</int>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="835318025"/>
+						<object class="NSMenu" key="NSSubmenu" id="835318025">
+							<string key="NSTitle">Window</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="1011231497">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Minimize</string>
+									<string key="NSKeyEquiv">m</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="575023229">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Zoom</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="603281520">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Windowed Scale</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<string key="NSAction">submenuAction:</string>
+									<object class="NSMenu" key="NSSubmenu" id="330271109">
+										<string key="NSTitle"/>
+										<object class="NSMutableArray" key="NSMenuItems">
+											<bool key="EncodedWithXMLCoder">YES</bool>
+											<object class="NSMenuItem" id="580918460">
+												<reference key="NSMenu" ref="330271109"/>
+												<string key="NSTitle">1x</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">10</int>
+											</object>
+											<object class="NSMenuItem" id="718801594">
+												<reference key="NSMenu" ref="330271109"/>
+												<string key="NSTitle">2x</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">11</int>
+											</object>
+											<object class="NSMenuItem" id="387472141">
+												<reference key="NSMenu" ref="330271109"/>
+												<string key="NSTitle">3x</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">12</int>
+											</object>
+											<object class="NSMenuItem" id="271634217">
+												<reference key="NSMenu" ref="330271109"/>
+												<string key="NSTitle">4x</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">13</int>
+											</object>
+											<object class="NSMenuItem" id="518813488">
+												<reference key="NSMenu" ref="330271109"/>
+												<string key="NSTitle">5x</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">14</int>
+											</object>
+											<object class="NSMenuItem" id="1040646503">
+												<reference key="NSMenu" ref="330271109"/>
+												<string key="NSTitle">6x</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">15</int>
+											</object>
+											<object class="NSMenuItem" id="310767472">
+												<reference key="NSMenu" ref="330271109"/>
+												<string key="NSTitle">7x</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">16</int>
+											</object>
+											<object class="NSMenuItem" id="975947241">
+												<reference key="NSMenu" ref="330271109"/>
+												<string key="NSTitle">8x</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">17</int>
+											</object>
+											<object class="NSMenuItem" id="997227628">
+												<reference key="NSMenu" ref="330271109"/>
+												<string key="NSTitle">9x</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">18</int>
+											</object>
+											<object class="NSMenuItem" id="522797995">
+												<reference key="NSMenu" ref="330271109"/>
+												<string key="NSTitle">10x</string>
+												<string key="NSKeyEquiv"/>
+												<int key="NSMnemonicLoc">2147483647</int>
+												<reference key="NSOnImage" ref="35465992"/>
+												<reference key="NSMixedImage" ref="502551668"/>
+												<int key="NSTag">19</int>
+											</object>
+										</object>
+									</object>
+								</object>
+								<object class="NSMenuItem" id="1065388702">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Enter Full Screen</string>
+									<string key="NSKeyEquiv">f</string>
+									<int key="NSKeyEquivModMask">1310720</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="696011883">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Toggle Exclusive Full Screen</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+									<int key="NSTag">20</int>
+								</object>
+								<object class="NSMenuItem" id="299356726">
+									<reference key="NSMenu" ref="835318025"/>
+									<bool key="NSIsDisabled">YES</bool>
+									<bool key="NSIsSeparator">YES</bool>
+									<string key="NSTitle"/>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+								<object class="NSMenuItem" id="625202149">
+									<reference key="NSMenu" ref="835318025"/>
+									<string key="NSTitle">Bring All to Front</string>
+									<string key="NSKeyEquiv"/>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</object>
+							<string key="NSName">_NSWindowsMenu</string>
+						</object>
+					</object>
+					<object class="NSMenuItem" id="448692316">
+						<reference key="NSMenu" ref="649796088"/>
+						<string key="NSTitle">Help</string>
+						<string key="NSKeyEquiv"/>
+						<int key="NSMnemonicLoc">2147483647</int>
+						<reference key="NSOnImage" ref="35465992"/>
+						<reference key="NSMixedImage" ref="502551668"/>
+						<string key="NSAction">submenuAction:</string>
+						<reference key="NSTarget" ref="992780483"/>
+						<object class="NSMenu" key="NSSubmenu" id="992780483">
+							<string key="NSTitle">Help</string>
+							<object class="NSMutableArray" key="NSMenuItems">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSMenuItem" id="105068016">
+									<reference key="NSMenu" ref="992780483"/>
+									<string key="NSTitle">RetroArch Help</string>
+									<string key="NSKeyEquiv">?</string>
+									<int key="NSKeyEquivModMask">1048576</int>
+									<int key="NSMnemonicLoc">2147483647</int>
+									<reference key="NSOnImage" ref="35465992"/>
+									<reference key="NSMixedImage" ref="502551668"/>
+								</object>
+							</object>
+							<string key="NSName">_NSHelpMenu</string>
+						</object>
+					</object>
+				</object>
+				<string key="NSName">_NSMainMenu</string>
+			</object>
+			<object class="NSWindowTemplate" id="972006081">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{335, 390}, {480, 360}}</string>
+				<int key="NSWTFlags">1954021376</int>
+				<string key="NSWindowTitle">RetroArch_OSX</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="439893737">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<string key="NSFrameSize">{480, 360}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+			<object class="NSCustomObject" id="976324537">
+				<string key="NSClassName">RetroArch_OSX</string>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">terminate:</string>
+						<reference key="source" ref="1050"/>
+						<reference key="destination" ref="632727374"/>
+					</object>
+					<int key="connectionID">449</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">orderFrontStandardAboutPanel:</string>
+						<reference key="source" ref="1021"/>
+						<reference key="destination" ref="238522557"/>
+					</object>
+					<int key="connectionID">142</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1021"/>
+						<reference key="destination" ref="976324537"/>
+					</object>
+					<int key="connectionID">495</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performMiniaturize:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1011231497"/>
+					</object>
+					<int key="connectionID">37</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">arrangeInFront:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="625202149"/>
+					</object>
+					<int key="connectionID">39</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">clearRecentDocuments:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="759406840"/>
+					</object>
+					<int key="connectionID">127</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performClose:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="776162233"/>
+					</object>
+					<int key="connectionID">193</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performZoom:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="575023229"/>
+					</object>
+					<int key="connectionID">240</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hide:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="755159360"/>
+					</object>
+					<int key="connectionID">367</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">hideOtherApplications:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="342932134"/>
+					</object>
+					<int key="connectionID">368</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">unhideAllApplications:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="908899353"/>
+					</object>
+					<int key="connectionID">370</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showHelp:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="105068016"/>
+					</object>
+					<int key="connectionID">493</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleFullScreen:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="1065388702"/>
+					</object>
+					<int key="connectionID">593</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">openDocument:</string>
+						<reference key="source" ref="1014"/>
+						<reference key="destination" ref="733060596"/>
+					</object>
+					<int key="connectionID">657</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="354494807"/>
+					</object>
+					<int key="connectionID">550</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="870739926"/>
+					</object>
+					<int key="connectionID">552</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showCoresDirectory:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="777071989"/>
+					</object>
+					<int key="connectionID">588</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="972006081"/>
+					</object>
+					<int key="connectionID">591</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="593697668"/>
+					</object>
+					<int key="connectionID">615</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="291565286"/>
+					</object>
+					<int key="connectionID">617</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="189555851"/>
+					</object>
+					<int key="connectionID">619</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="829216824"/>
+					</object>
+					<int key="connectionID">621</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="161299339"/>
+					</object>
+					<int key="connectionID">623</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="330055564"/>
+					</object>
+					<int key="connectionID">625</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="1027971327"/>
+					</object>
+					<int key="connectionID">627</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="580918460"/>
+					</object>
+					<int key="connectionID">634</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="718801594"/>
+					</object>
+					<int key="connectionID">636</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="387472141"/>
+					</object>
+					<int key="connectionID">638</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="271634217"/>
+					</object>
+					<int key="connectionID">640</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="518813488"/>
+					</object>
+					<int key="connectionID">642</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="1040646503"/>
+					</object>
+					<int key="connectionID">644</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="310767472"/>
+					</object>
+					<int key="connectionID">646</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="975947241"/>
+					</object>
+					<int key="connectionID">648</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="997227628"/>
+					</object>
+					<int key="connectionID">650</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="522797995"/>
+					</object>
+					<int key="connectionID">652</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="696011883"/>
+					</object>
+					<int key="connectionID">655</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="1013300225"/>
+					</object>
+					<int key="connectionID">659</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">basicEvent:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="1064176677"/>
+					</object>
+					<int key="connectionID">664</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">openCore:</string>
+						<reference key="source" ref="976324537"/>
+						<reference key="destination" ref="722745758"/>
+					</object>
+					<int key="connectionID">665</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<object class="NSArray" key="object" id="0">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="children" ref="1048"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1021"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1014"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1050"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="649796088"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="713487014"/>
+							<reference ref="448692316"/>
+							<reference ref="1225315"/>
+							<reference ref="379814623"/>
+							<reference ref="694149608"/>
+							<reference ref="265357942"/>
+						</object>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="713487014"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="835318025"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">56</int>
+						<reference key="object" ref="694149608"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="110575045"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="379814623"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="720053764"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">81</int>
+						<reference key="object" ref="720053764"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1025936716"/>
+							<reference ref="776162233"/>
+							<reference ref="425164168"/>
+							<reference ref="733060596"/>
+							<reference ref="722745758"/>
+						</object>
+						<reference key="parent" ref="379814623"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">72</int>
+						<reference key="object" ref="722745758"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">124</int>
+						<reference key="object" ref="1025936716"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1065607017"/>
+						</object>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">73</int>
+						<reference key="object" ref="776162233"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">79</int>
+						<reference key="object" ref="425164168"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">125</int>
+						<reference key="object" ref="1065607017"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="759406840"/>
+						</object>
+						<reference key="parent" ref="1025936716"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">126</int>
+						<reference key="object" ref="759406840"/>
+						<reference key="parent" ref="1065607017"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">57</int>
+						<reference key="object" ref="110575045"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="238522557"/>
+							<reference ref="755159360"/>
+							<reference ref="908899353"/>
+							<reference ref="632727374"/>
+							<reference ref="646227648"/>
+							<reference ref="304266470"/>
+							<reference ref="1046388886"/>
+							<reference ref="1056857174"/>
+							<reference ref="342932134"/>
+						</object>
+						<reference key="parent" ref="694149608"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">58</int>
+						<reference key="object" ref="238522557"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="755159360"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">150</int>
+						<reference key="object" ref="908899353"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">136</int>
+						<reference key="object" ref="632727374"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">144</int>
+						<reference key="object" ref="646227648"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">236</int>
+						<reference key="object" ref="304266470"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">131</int>
+						<reference key="object" ref="1046388886"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="752062318"/>
+						</object>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">149</int>
+						<reference key="object" ref="1056857174"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">145</int>
+						<reference key="object" ref="342932134"/>
+						<reference key="parent" ref="110575045"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">130</int>
+						<reference key="object" ref="752062318"/>
+						<reference key="parent" ref="1046388886"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">371</int>
+						<reference key="object" ref="972006081"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="439893737"/>
+						</object>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">372</int>
+						<reference key="object" ref="439893737"/>
+						<reference key="parent" ref="972006081"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">490</int>
+						<reference key="object" ref="448692316"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="992780483"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">491</int>
+						<reference key="object" ref="992780483"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="105068016"/>
+						</object>
+						<reference key="parent" ref="448692316"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">492</int>
+						<reference key="object" ref="105068016"/>
+						<reference key="parent" ref="992780483"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">494</int>
+						<reference key="object" ref="976324537"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">545</int>
+						<reference key="object" ref="265357942"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="604031057"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">546</int>
+						<reference key="object" ref="604031057"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="347361677"/>
+							<reference ref="161299339"/>
+							<reference ref="330055564"/>
+							<reference ref="1027971327"/>
+							<reference ref="1013300225"/>
+							<reference ref="142094220"/>
+							<reference ref="191361579"/>
+							<reference ref="140877964"/>
+						</object>
+						<reference key="parent" ref="265357942"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">585</int>
+						<reference key="object" ref="1225315"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="715293634"/>
+						</object>
+						<reference key="parent" ref="649796088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">586</int>
+						<reference key="object" ref="715293634"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="777071989"/>
+						</object>
+						<reference key="parent" ref="1225315"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">587</int>
+						<reference key="object" ref="777071989"/>
+						<reference key="parent" ref="715293634"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">597</int>
+						<reference key="object" ref="191361579"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="79435345"/>
+						</object>
+						<reference key="parent" ref="604031057"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">598</int>
+						<reference key="object" ref="79435345"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="593697668"/>
+							<reference ref="189555851"/>
+							<reference ref="291565286"/>
+						</object>
+						<reference key="parent" ref="191361579"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">602</int>
+						<reference key="object" ref="140877964"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="302314278"/>
+						</object>
+						<reference key="parent" ref="604031057"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">603</int>
+						<reference key="object" ref="302314278"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="829216824"/>
+						</object>
+						<reference key="parent" ref="140877964"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="835318025"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1065388702"/>
+							<reference ref="1011231497"/>
+							<reference ref="575023229"/>
+							<reference ref="625202149"/>
+							<reference ref="299356726"/>
+							<reference ref="603281520"/>
+							<reference ref="696011883"/>
+						</object>
+						<reference key="parent" ref="713487014"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">592</int>
+						<reference key="object" ref="1065388702"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="1011231497"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">239</int>
+						<reference key="object" ref="575023229"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="625202149"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">92</int>
+						<reference key="object" ref="299356726"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">612</int>
+						<reference key="object" ref="347361677"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="172285465"/>
+						</object>
+						<reference key="parent" ref="604031057"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">613</int>
+						<reference key="object" ref="172285465"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="354494807"/>
+							<reference ref="870739926"/>
+						</object>
+						<reference key="parent" ref="347361677"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">549</int>
+						<reference key="object" ref="354494807"/>
+						<reference key="parent" ref="172285465"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">551</int>
+						<reference key="object" ref="870739926"/>
+						<reference key="parent" ref="172285465"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">614</int>
+						<reference key="object" ref="593697668"/>
+						<reference key="parent" ref="79435345"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">616</int>
+						<reference key="object" ref="291565286"/>
+						<reference key="parent" ref="79435345"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">618</int>
+						<reference key="object" ref="189555851"/>
+						<reference key="parent" ref="79435345"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">620</int>
+						<reference key="object" ref="829216824"/>
+						<reference key="parent" ref="302314278"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">629</int>
+						<reference key="object" ref="603281520"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="330271109"/>
+						</object>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">630</int>
+						<reference key="object" ref="330271109"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="580918460"/>
+							<reference ref="718801594"/>
+							<reference ref="387472141"/>
+							<reference ref="271634217"/>
+							<reference ref="518813488"/>
+							<reference ref="1040646503"/>
+							<reference ref="310767472"/>
+							<reference ref="975947241"/>
+							<reference ref="997227628"/>
+							<reference ref="522797995"/>
+						</object>
+						<reference key="parent" ref="603281520"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">633</int>
+						<reference key="object" ref="580918460"/>
+						<reference key="parent" ref="330271109"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">635</int>
+						<reference key="object" ref="718801594"/>
+						<reference key="parent" ref="330271109"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">637</int>
+						<reference key="object" ref="387472141"/>
+						<reference key="parent" ref="330271109"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">639</int>
+						<reference key="object" ref="271634217"/>
+						<reference key="parent" ref="330271109"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">641</int>
+						<reference key="object" ref="518813488"/>
+						<reference key="parent" ref="330271109"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">643</int>
+						<reference key="object" ref="1040646503"/>
+						<reference key="parent" ref="330271109"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">645</int>
+						<reference key="object" ref="310767472"/>
+						<reference key="parent" ref="330271109"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">647</int>
+						<reference key="object" ref="975947241"/>
+						<reference key="parent" ref="330271109"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">649</int>
+						<reference key="object" ref="997227628"/>
+						<reference key="parent" ref="330271109"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">651</int>
+						<reference key="object" ref="522797995"/>
+						<reference key="parent" ref="330271109"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">654</int>
+						<reference key="object" ref="696011883"/>
+						<reference key="parent" ref="835318025"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">622</int>
+						<reference key="object" ref="161299339"/>
+						<reference key="parent" ref="604031057"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">624</int>
+						<reference key="object" ref="330055564"/>
+						<reference key="parent" ref="604031057"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">626</int>
+						<reference key="object" ref="1027971327"/>
+						<reference key="parent" ref="604031057"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">656</int>
+						<reference key="object" ref="733060596"/>
+						<reference key="parent" ref="720053764"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">658</int>
+						<reference key="object" ref="1013300225"/>
+						<reference key="parent" ref="604031057"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">660</int>
+						<reference key="object" ref="142094220"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="958304575"/>
+						</object>
+						<reference key="parent" ref="604031057"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">661</int>
+						<reference key="object" ref="958304575"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1064176677"/>
+						</object>
+						<reference key="parent" ref="142094220"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">663</int>
+						<reference key="object" ref="1064176677"/>
+						<reference key="parent" ref="958304575"/>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-1.IBPluginDependency</string>
+					<string>-2.IBPluginDependency</string>
+					<string>-3.IBPluginDependency</string>
+					<string>124.IBPluginDependency</string>
+					<string>125.IBPluginDependency</string>
+					<string>126.IBPluginDependency</string>
+					<string>130.IBPluginDependency</string>
+					<string>131.IBPluginDependency</string>
+					<string>134.IBPluginDependency</string>
+					<string>136.IBPluginDependency</string>
+					<string>144.IBPluginDependency</string>
+					<string>145.IBPluginDependency</string>
+					<string>149.IBPluginDependency</string>
+					<string>150.IBPluginDependency</string>
+					<string>19.IBPluginDependency</string>
+					<string>23.IBPluginDependency</string>
+					<string>236.IBPluginDependency</string>
+					<string>239.IBPluginDependency</string>
+					<string>24.IBPluginDependency</string>
+					<string>29.IBPluginDependency</string>
+					<string>371.IBPluginDependency</string>
+					<string>371.IBWindowTemplateEditedContentRect</string>
+					<string>371.NSWindowTemplate.visibleAtLaunch</string>
+					<string>372.IBPluginDependency</string>
+					<string>490.IBPluginDependency</string>
+					<string>491.IBPluginDependency</string>
+					<string>492.IBPluginDependency</string>
+					<string>494.IBPluginDependency</string>
+					<string>5.IBPluginDependency</string>
+					<string>545.IBPluginDependency</string>
+					<string>546.IBPluginDependency</string>
+					<string>549.IBPluginDependency</string>
+					<string>551.IBPluginDependency</string>
+					<string>56.IBPluginDependency</string>
+					<string>57.IBPluginDependency</string>
+					<string>58.IBPluginDependency</string>
+					<string>585.IBPluginDependency</string>
+					<string>586.IBPluginDependency</string>
+					<string>587.IBPluginDependency</string>
+					<string>592.IBPluginDependency</string>
+					<string>597.IBPluginDependency</string>
+					<string>598.IBPluginDependency</string>
+					<string>602.IBPluginDependency</string>
+					<string>603.IBPluginDependency</string>
+					<string>612.IBPluginDependency</string>
+					<string>613.IBPluginDependency</string>
+					<string>614.IBPluginDependency</string>
+					<string>616.IBPluginDependency</string>
+					<string>618.IBPluginDependency</string>
+					<string>620.IBPluginDependency</string>
+					<string>622.IBPluginDependency</string>
+					<string>624.IBPluginDependency</string>
+					<string>626.IBPluginDependency</string>
+					<string>629.IBPluginDependency</string>
+					<string>630.IBPluginDependency</string>
+					<string>633.IBPluginDependency</string>
+					<string>635.IBPluginDependency</string>
+					<string>637.IBPluginDependency</string>
+					<string>639.IBPluginDependency</string>
+					<string>641.IBPluginDependency</string>
+					<string>643.IBPluginDependency</string>
+					<string>645.IBPluginDependency</string>
+					<string>647.IBPluginDependency</string>
+					<string>649.IBPluginDependency</string>
+					<string>651.IBPluginDependency</string>
+					<string>654.IBPluginDependency</string>
+					<string>656.IBPluginDependency</string>
+					<string>658.IBPluginDependency</string>
+					<string>660.IBPluginDependency</string>
+					<string>661.IBPluginDependency</string>
+					<string>663.IBPluginDependency</string>
+					<string>72.IBPluginDependency</string>
+					<string>73.IBPluginDependency</string>
+					<string>79.IBPluginDependency</string>
+					<string>81.IBPluginDependency</string>
+					<string>83.IBPluginDependency</string>
+					<string>92.IBPluginDependency</string>
+				</object>
+				<object class="NSArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{438, 199}, {480, 360}}</string>
+					<integer value="1"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<reference key="dict.values" ref="0"/>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<reference key="dict.sortedKeys" ref="0"/>
+				<reference key="dict.values" ref="0"/>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">665</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">RetroArch_OSX</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>basicEvent:</string>
+							<string>openCore:</string>
+							<string>showCoresDirectory:</string>
+							<string>showPreferences:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>basicEvent:</string>
+							<string>openCore:</string>
+							<string>showCoresDirectory:</string>
+							<string>showPreferences:</string>
+						</object>
+						<object class="NSArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBActionInfo">
+								<string key="name">basicEvent:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">openCore:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">showCoresDirectory:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+							<object class="IBActionInfo">
+								<string key="name">showPreferences:</string>
+								<string key="candidateClassName">id</string>
+							</object>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">window</string>
+						<string key="NS.object.0">NSWindow</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">window</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">window</string>
+							<string key="candidateClassName">NSWindow</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/RetroArch.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1050" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="3000" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>NSMenuCheckmark</string>
+				<string>NSMenuMixedState</string>
+			</object>
+			<object class="NSArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<string>{11, 11}</string>
+				<string>{10, 3}</string>
+			</object>
+		</object>
+	</data>
+</archive>
diff --git a/pkg/apple/RetroArch.xcodeproj/project.pbxproj b/pkg/apple/RetroArch.xcodeproj/project.pbxproj
index a6cb029d2c..4ecdb6839c 100644
--- a/pkg/apple/RetroArch.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch.xcodeproj/project.pbxproj
@@ -385,7 +385,7 @@
 				);
 				INFOPLIST_FILE = OSX/Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DHAVE_CG",
@@ -419,7 +419,7 @@
 				);
 				INFOPLIST_FILE = OSX/Info.plist;
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DHAVE_CG",
@@ -455,7 +455,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/OSX/Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
 				PRODUCT_NAME = RetroArch;
 			};
@@ -485,7 +485,7 @@
 				);
 				INFOPLIST_FILE = "$(SRCROOT)/OSX/Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
-				MACOSX_DEPLOYMENT_TARGET = 10.5;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
 				PRODUCT_NAME = RetroArch;
 			};
@@ -510,7 +510,7 @@
 					"-DHAVE_LROUND",
 					"-DFLAC__HAS_OGG=0",
 					"-DHAVE_CHD",
-                                        "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -547,6 +547,7 @@
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_HID",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-DHAVE_MMAP",
 					"-DHAVE_LIBRETRODB",
@@ -574,7 +575,7 @@
 					"-DHAVE_LROUND",
 					"-DFLAC__HAS_OGG=0",
 					"-DHAVE_CHD",
-                                        "-DHAVE_STB_VORBIS",
+					"-DHAVE_STB_VORBIS",
 					"-DHAVE_MINIUPNPC",
 					"-DHAVE_BUILTINMINIUPNPC",
 					"-DHAVE_UPDATE_ASSETS",
@@ -611,6 +612,7 @@
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_HID",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-DHAVE_MMAP",
 					"-DHAVE_LIBRETRODB",
diff --git a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
index 2cfc05036c..a97c52c3f8 100644
--- a/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_Metal.xcodeproj/project.pbxproj
@@ -7,19 +7,14 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0502387C2179713000789627 /* MainMenu_Metal.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9020F323D5F3C8E120D04AC /* MainMenu_Metal.xib */; };
 		05269A6220ABF20500C29F1E /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05269A6120ABF20500C29F1E /* MetalKit.framework */; };
-		053FC25E21433F2200D98D46 /* QtConcurrent.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 053FC25521433F1700D98D46 /* QtConcurrent.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		053FC26021433F2200D98D46 /* QtCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 053FC25421433F1700D98D46 /* QtCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		053FC26221433F2200D98D46 /* QtGui.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 053FC25321433F1700D98D46 /* QtGui.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
-		053FC26421433F2200D98D46 /* QtNetwork.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 053FC25621433F1800D98D46 /* QtNetwork.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		053FC26521433F2200D98D46 /* QtWidgets.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 053FC25721433F1800D98D46 /* QtWidgets.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
-		053FC26621433F2200D98D46 /* QtWidgets.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 053FC25721433F1800D98D46 /* QtWidgets.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		053FC270214340F500D98D46 /* QtGui.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 053FC25321433F1700D98D46 /* QtGui.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		053FC271214340F500D98D46 /* QtNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 053FC25621433F1800D98D46 /* QtNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		053FC272214341E000D98D46 /* QtConcurrent.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 053FC25521433F1700D98D46 /* QtConcurrent.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		053FC275214341F000D98D46 /* QtCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 053FC25421433F1700D98D46 /* QtCore.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
 		05422E3E2140C8DB00F09961 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
-		05422E3F2140C8DB00F09961 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
 		05422E402140C8DB00F09961 /* retroarch.icns in Resources */ = {isa = PBXBuildFile; fileRef = 84DD5EB71A89F1C7007336C1 /* retroarch.icns */; };
 		05422E432140C8DB00F09961 /* griffin_glslang.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05D7753420A5678400646447 /* griffin_glslang.cpp */; };
 		05422E442140C8DB00F09961 /* menu_pipeline.metal in Sources */ = {isa = PBXBuildFile; fileRef = 05770B9820E805160013DABC /* menu_pipeline.metal */; };
@@ -45,7 +40,6 @@
 		05A8E23C20A63CF50084ABDA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 05A8E23B20A63CF50084ABDA /* QuartzCore.framework */; };
 		05D7753520A567A400646447 /* griffin_cpp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05D7753320A5678300646447 /* griffin_cpp.cpp */; };
 		05D7753720A567A700646447 /* griffin_glslang.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 05D7753420A5678400646447 /* griffin_glslang.cpp */; };
-		1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1DDD58140DA1D0A300B32029 /* MainMenu.xib */; };
 		5061C8A41AE47E510080AE14 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5061C8A31AE47E510080AE14 /* libz.dylib */; };
 		509F0C9D1AA23AFC00619ECC /* griffin_objc.m in Sources */ = {isa = PBXBuildFile; fileRef = 509F0C9C1AA23AFC00619ECC /* griffin_objc.m */; };
 		840222FC1A889EE2009AB261 /* griffin.c in Sources */ = {isa = PBXBuildFile; fileRef = 840222FB1A889EE2009AB261 /* griffin.c */; };
@@ -57,6 +51,7 @@
 		84DD5EB51A89E737007336C1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84DD5EB41A89E737007336C1 /* IOKit.framework */; };
 		84DD5EB81A89F1C7007336C1 /* retroarch.icns in Resources */ = {isa = PBXBuildFile; fileRef = 84DD5EB71A89F1C7007336C1 /* retroarch.icns */; };
 		8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
+		A90209ED44A1161587F10CA4 /* MainMenu_Metal.xib in Resources */ = {isa = PBXBuildFile; fileRef = A9020F323D5F3C8E120D04AC /* MainMenu_Metal.xib */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -76,11 +71,6 @@
 			dstPath = "";
 			dstSubfolderSpec = 10;
 			files = (
-				053FC26021433F2200D98D46 /* QtCore.framework in Embed Frameworks */,
-				053FC25E21433F2200D98D46 /* QtConcurrent.framework in Embed Frameworks */,
-				053FC26621433F2200D98D46 /* QtWidgets.framework in Embed Frameworks */,
-				053FC26421433F2200D98D46 /* QtNetwork.framework in Embed Frameworks */,
-				053FC26221433F2200D98D46 /* QtGui.framework in Embed Frameworks */,
 			);
 			name = "Embed Frameworks";
 			runOnlyForDeploymentPostprocessing = 0;
@@ -301,7 +291,6 @@
 		05A8C5D220DB72F000FF7857 /* ui_companion_driver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ui_companion_driver.h; sourceTree = "<group>"; };
 		05A8C5D320DB72F000FF7857 /* ui_companion_driver.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ui_companion_driver.c; sourceTree = "<group>"; };
 		05A8C5D520DB72F000FF7857 /* video_display_server.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = video_display_server.c; sourceTree = "<group>"; };
-		05A8C5DD20DB72F000FF7857 /* macos_ctx.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = macos_ctx.m; sourceTree = "<group>"; };
 		05A8C5E720DB72F000FF7857 /* cocoa_gl_ctx.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = cocoa_gl_ctx.m; sourceTree = "<group>"; };
 		05A8C5F020DB72F000FF7857 /* gl.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = gl.c; sourceTree = "<group>"; };
 		05A8C5F720DB72F000FF7857 /* metal.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = metal.m; sourceTree = "<group>"; };
@@ -524,6 +513,8 @@
 		05D7753120A55D2700646447 /* BaseConfig.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = BaseConfig.xcconfig; sourceTree = "<group>"; };
 		05D7753320A5678300646447 /* griffin_cpp.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = griffin_cpp.cpp; path = ../../griffin/griffin_cpp.cpp; sourceTree = "<group>"; };
 		05D7753420A5678400646447 /* griffin_glslang.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = griffin_glslang.cpp; path = ../../griffin/griffin_glslang.cpp; sourceTree = "<group>"; };
+		05EFAFC22191D64200D27059 /* stripes.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = stripes.c; sourceTree = "<group>"; };
+		05EFAFC32191D64200D27059 /* ozone.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = ozone.c; sourceTree = "<group>"; };
 		05F2872F20F2BEEA00632D47 /* task_autodetect.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = task_autodetect.c; sourceTree = "<group>"; };
 		05F2873020F2BEEA00632D47 /* task_netplay_find_content.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = task_netplay_find_content.c; sourceTree = "<group>"; };
 		05F2873120F2BEEA00632D47 /* task_netplay_nat_traversal.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = task_netplay_nat_traversal.c; sourceTree = "<group>"; };
@@ -544,7 +535,6 @@
 		05F2874020F2BEEA00632D47 /* task_http.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = task_http.c; sourceTree = "<group>"; };
 		05F2874120F2BEEA00632D47 /* task_patch.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = task_patch.c; sourceTree = "<group>"; };
 		089C165DFE840E0CC02AAC07 /* InfoPlist.strings */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = InfoPlist.strings; path = OSX/en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		1DDD58150DA1D0A300B32029 /* MainMenu.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainMenu.xib; path = OSX/en.lproj/MainMenu.xib; sourceTree = "<group>"; };
 		29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
 		5061C8A31AE47E510080AE14 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		509F0C9C1AA23AFC00619ECC /* griffin_objc.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = griffin_objc.m; path = ../../griffin/griffin_objc.m; sourceTree = "<group>"; };
@@ -557,11 +547,22 @@
 		84DD5EB21A89E6C0007336C1 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = "<absolute>"; };
 		84DD5EB41A89E737007336C1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = ../../../../../../System/Library/Frameworks/IOKit.framework; sourceTree = "<group>"; };
 		84DD5EB71A89F1C7007336C1 /* retroarch.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = retroarch.icns; path = ../../media/retroarch.icns; sourceTree = "<group>"; };
-		8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = OSX/Info.plist; sourceTree = "<group>"; };
 		8D1107320486CEB800E47090 /* RetroArch.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RetroArch.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A902040DE66D42F9EE47BFE3 /* MenuDisplay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuDisplay.h; sourceTree = "<group>"; };
+		A90205DCA5102DF8D80D3F68 /* ui_cocoa_metal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ui_cocoa_metal.h; sourceTree = "<group>"; };
+		A90205FD4D5979BD8B7E4DD6 /* Info_Metal.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.info; name = Info_Metal.plist; path = OSX/Info_Metal.plist; sourceTree = "<group>"; };
+		A902065A41AEBECE594908C7 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = OSX/en.lproj/MainMenu_Metal.xib; sourceTree = "<group>"; };
 		A902070F2C43F222FD56A95A /* MenuDisplay.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuDisplay.m; sourceTree = "<group>"; };
 		A90207489289602F593626D5 /* QTConfig.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = QTConfig.xcconfig; sourceTree = "<group>"; };
+		A90208A05A895029CEC32C14 /* ui_cocoa_msg_window_metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ui_cocoa_msg_window_metal.m; sourceTree = "<group>"; };
+		A9020AF14B9A73364C6CDDA5 /* cocoa_common_metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = cocoa_common_metal.m; sourceTree = "<group>"; };
+		A9020BD6594399DDAB0E2563 /* ui_cocoatouch_metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ui_cocoatouch_metal.m; sourceTree = "<group>"; };
+		A9020C55D864F0E0C6E7DFF9 /* ui_cocoa_window_metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ui_cocoa_window_metal.m; sourceTree = "<group>"; };
+		A9020E880B5DBFD909921A8F /* cocoa_common_metal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cocoa_common_metal.h; sourceTree = "<group>"; };
+		A9020EE4BE2C6A15024A32E0 /* ui_cocoa_metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ui_cocoa_metal.m; sourceTree = "<group>"; };
+		A9020F2EEF870903107B0EA7 /* ui_cocoa_application_metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ui_cocoa_application_metal.m; sourceTree = "<group>"; };
+		A9020F48BA562B13D4789292 /* ui_cocoa_browser_window_metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ui_cocoa_browser_window_metal.m; sourceTree = "<group>"; };
+		A9020FA64527ED74C836B41D /* cocoa_gl_ctx_metal.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = cocoa_gl_ctx_metal.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -805,7 +806,9 @@
 				05A8C53320DB72F000FF7857 /* menu_generic.h */,
 				05A8C53D20DB72F000FF7857 /* nuklear.c */,
 				05A8C53E20DB72F000FF7857 /* null.c */,
+				05EFAFC32191D64200D27059 /* ozone.c */,
 				05A8C53C20DB72F000FF7857 /* rgui.c */,
+				05EFAFC22191D64200D27059 /* stripes.c */,
 				05A8C53220DB72F000FF7857 /* xmb.c */,
 				05A8C53B20DB72F000FF7857 /* xui.cpp */,
 				05A8C53F20DB72F000FF7857 /* zarch.c */,
@@ -942,6 +945,9 @@
 				05366511213F8BE5007E7EA0 /* qt */,
 				05A8C5CE20DB72F000FF7857 /* ui_cocoa.h */,
 				05A8C5BA20DB72F000FF7857 /* ui_cocoa.m */,
+				A90205DCA5102DF8D80D3F68 /* ui_cocoa_metal.h */,
+				A9020EE4BE2C6A15024A32E0 /* ui_cocoa_metal.m */,
+				A9020BD6594399DDAB0E2563 /* ui_cocoatouch_metal.m */,
 				05A8C5CF20DB72F000FF7857 /* ui_cocoatouch.m */,
 				05A8C5B920DB72F000FF7857 /* ui_null.c */,
 				05A8C5D020DB72F000FF7857 /* ui_qt.cpp */,
@@ -956,12 +962,18 @@
 		05A8C5BB20DB72F000FF7857 /* cocoa */ = {
 			isa = PBXGroup;
 			children = (
+				A9020E880B5DBFD909921A8F /* cocoa_common_metal.h */,
+				A9020AF14B9A73364C6CDDA5 /* cocoa_common_metal.m */,
 				05A8C5C220DB72F000FF7857 /* cocoa_common.h */,
 				05A8C5BD20DB72F000FF7857 /* cocoa_common.m */,
 				05A8C5BE20DB72F000FF7857 /* cocoatouch_menu.m */,
+				A9020F2EEF870903107B0EA7 /* ui_cocoa_application_metal.m */,
 				05A8C5C120DB72F000FF7857 /* ui_cocoa_application.m */,
+				A9020F48BA562B13D4789292 /* ui_cocoa_browser_window_metal.m */,
 				05A8C5BF20DB72F000FF7857 /* ui_cocoa_browser_window.m */,
+				A90208A05A895029CEC32C14 /* ui_cocoa_msg_window_metal.m */,
 				05A8C5BC20DB72F000FF7857 /* ui_cocoa_msg_window.m */,
+				A9020C55D864F0E0C6E7DFF9 /* ui_cocoa_window_metal.m */,
 				05A8C5C020DB72F000FF7857 /* ui_cocoa_window.m */,
 			);
 			path = cocoa;
@@ -1005,7 +1017,7 @@
 			isa = PBXGroup;
 			children = (
 				05A8C5E720DB72F000FF7857 /* cocoa_gl_ctx.m */,
-				05A8C5DD20DB72F000FF7857 /* macos_ctx.m */,
+				A9020FA64527ED74C836B41D /* cocoa_gl_ctx_metal.m */,
 			);
 			path = drivers_context;
 			sourceTree = "<group>";
@@ -1455,9 +1467,9 @@
 			isa = PBXGroup;
 			children = (
 				84DD5EB71A89F1C7007336C1 /* retroarch.icns */,
-				8D1107310486CEB800E47090 /* Info.plist */,
+				A90205FD4D5979BD8B7E4DD6 /* Info_Metal.plist */,
 				089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
-				1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
+				A9020F323D5F3C8E120D04AC /* MainMenu_Metal.xib */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -1574,8 +1586,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				05422E3E2140C8DB00F09961 /* InfoPlist.strings in Resources */,
-				05422E3F2140C8DB00F09961 /* MainMenu.xib in Resources */,
 				05422E402140C8DB00F09961 /* retroarch.icns in Resources */,
+				0502387C2179713000789627 /* MainMenu_Metal.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1584,8 +1596,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
-				1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
 				84DD5EB81A89F1C7007336C1 /* retroarch.icns in Resources */,
+				A90209ED44A1161587F10CA4 /* MainMenu_Metal.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -1603,7 +1615,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/zsh;
-			shellScript = "BINARY=${TARGET_BUILD_DIR}/${EXECUTABLE_PATH}\nVER=Versions/${QT_VERSION}\nfor name in {QtConcurrent,QtCore,QtWidgets,QtNetwork,QtGui}; do\n    echo updating install path for ${name}.framework\n    install_name_tool -change ${QT_FRAMEWORK_PATH}/${name}.framework/${VER}/${name} @executable_path/../Frameworks/${name}.framework/${VER}/${name} ${BINARY}\ndone";
+			shellScript = "echo \"Updating ${FULL_PRODUCT_NAME} with Qt deployment\"\n${QT_INSTALL}/bin/macdeployqt ${TARGET_BUILD_DIR}/${FULL_PRODUCT_NAME} -no-strip -verbose=1\n";
 			showEnvVarsInLog = 0;
 		};
 		053FC2782143764B00D98D46 /* ShellScript */ = {
@@ -1617,7 +1629,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "make -C ${SRCBASE} -f Makefile.apple HAVE_QT=1 MOC=${QT_INSTALL}/bin/moc generate";
+			shellScript = "make -C ${SRCBASE} -f Makefile.apple HAVE_QT=1 MOC=${QT_INSTALL}/bin/moc generate\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -1659,12 +1671,12 @@
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		1DDD58140DA1D0A300B32029 /* MainMenu.xib */ = {
+		A9020F323D5F3C8E120D04AC /* MainMenu_Metal.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
-				1DDD58150DA1D0A300B32029 /* MainMenu.xib */,
+				A902065A41AEBECE594908C7 /* en */,
 			);
-			name = MainMenu.xib;
+			name = MainMenu_Metal.xib;
 			sourceTree = "<group>";
 		};
 /* End PBXVariantGroup section */
@@ -1681,7 +1693,6 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				INFOPLIST_FILE = "$(SRCROOT)/OSX/Info.plist";
 				INSTALL_PATH = "@rpath";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1703,7 +1714,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				INFOPLIST_FILE = "$(SRCROOT)/OSX/Info.plist";
 				INSTALL_PATH = "@rpath";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -1726,7 +1736,6 @@
 				GCC_ENABLE_FIX_AND_CONTINUE = YES;
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
-				INFOPLIST_FILE = "$(SRCROOT)/OSX/Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
@@ -1744,7 +1753,6 @@
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				INFOPLIST_FILE = "$(SRCROOT)/OSX/Info.plist";
 				INSTALL_PATH = "$(HOME)/Applications";
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "libretro.${PRODUCT_NAME:rfc1034identifier}";
@@ -1804,66 +1812,6 @@
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = (
-					"$(inherited)",
-					"-DHAVE_RUNAHEAD",
-					"-DHAVE_GRIFFIN",
-					"-DHAVE_FLAC",
-					"-DHAVE_DR_FLAC",
-					"-DHAVE_DR_MP3",
-					"-DHAVE_LROUND",
-					"-DFLAC__HAS_OGG=0",
-					"-DHAVE_CHD",
-					"-DHAVE_STB_VORBIS",
-					"-DHAVE_MINIUPNPC",
-					"-DHAVE_BUILTINMINIUPNPC",
-					"-DHAVE_UPDATE_ASSETS",
-					"-DHAVE_LANGEXTRA",
-					"-DRC_DISABLE_LUA",
-					"-DHAVE_CHEEVOS",
-					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_IOHIDMANAGER",
-					"-DHAVE_CORETEXT",
-					"-DHAVE_RGUI",
-					"-DHAVE_MENU",
-					"-DOSX",
-					"-DHAVE_OPENGL",
-					"-DHAVE_CC_RESAMPLER",
-					"-DHAVE_GLSL",
-					"-DINLINE=inline",
-					"-D__LIBRETRO__",
-					"-DHAVE_COREAUDIO",
-					"-DHAVE_DYNAMIC",
-					"-DHAVE_OVERLAY",
-					"-DHAVE_ZLIB",
-					"-DHAVE_RPNG",
-					"-DHAVE_RJPEG",
-					"-DHAVE_RBMP",
-					"-DHAVE_RTGA",
-					"-DHAVE_COCOA",
-					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_NETWORKING",
-					"-DRARCH_INTERNAL",
-					"-DHAVE_THREADS",
-					"-DHAVE_DYLIB",
-					"-DHAVE_7ZIP",
-					"-DHAVE_MATERIALUI",
-					"-DHAVE_HID",
-					"-DHAVE_XMB",
-					"-DHAVE_SEGA",
-					"-DHAVE_SHADERPIPELINE",
-					"-DHAVE_MMAP",
-					"-DHAVE_LIBRETRODB",
-					"-DHAVE_GETOPT_LONG",
-					"-DHAVE_METAL",
-					"-DHAVE_SLANG",
-					"-DHAVE_GLSLANG",
-					"-DHAVE_SPIRV_CROSS",
-					"-DWANT_GLSLANG",
-					"-DENABLE_HLSL",
-					"-DGLSLANG_OSINCLUDE_UNIX",
-					"-DMETAL_DEBUG",
-				);
 				PREBINDING = NO;
 				SDKROOT = macosx;
 			};
@@ -1918,66 +1866,6 @@
 					"$(DEPS_DIR)/glslang/glslang/glslang/OSDependent/Unix",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				OTHER_CFLAGS = (
-					"$(inherited)",
-					"-DHAVE_RUNAHEAD",
-					"-DHAVE_GRIFFIN",
-					"-DHAVE_FLAC",
-					"-DHAVE_DR_FLAC",
-					"-DHAVE_DR_MP3",
-					"-DHAVE_LROUND",
-					"-DFLAC__HAS_OGG=0",
-					"-DHAVE_CHD",
-					"-DHAVE_STB_VORBIS",
-					"-DHAVE_MINIUPNPC",
-					"-DHAVE_BUILTINMINIUPNPC",
-					"-DHAVE_UPDATE_ASSETS",
-					"-DHAVE_LANGEXTRA",
-					"-DRC_DISABLE_LUA",
-					"-DHAVE_CHEEVOS",
-					"-DHAVE_IMAGEVIEWER",
-					"-DHAVE_IOHIDMANAGER",
-					"-DHAVE_CORETEXT",
-					"-DHAVE_RGUI",
-					"-DHAVE_MENU",
-					"-DOSX",
-					"-DHAVE_OPENGL",
-					"-DHAVE_CC_RESAMPLER",
-					"-DHAVE_GLSL",
-					"-DINLINE=inline",
-					"-D__LIBRETRO__",
-					"-DHAVE_COREAUDIO",
-					"-DHAVE_DYNAMIC",
-					"-DHAVE_OVERLAY",
-					"-DHAVE_ZLIB",
-					"-DHAVE_RPNG",
-					"-DHAVE_RJPEG",
-					"-DHAVE_RBMP",
-					"-DHAVE_RTGA",
-					"-DHAVE_COCOA",
-					"-DHAVE_NETWORKGAMEPAD",
-					"-DHAVE_NETWORKING",
-					"-DRARCH_INTERNAL",
-					"-DHAVE_THREADS",
-					"-DHAVE_DYLIB",
-					"-DHAVE_7ZIP",
-					"-DHAVE_MATERIALUI",
-					"-DHAVE_HID",
-					"-DHAVE_XMB",
-					"-DHAVE_SEGA",
-					"-DHAVE_SHADERPIPELINE",
-					"-DHAVE_MMAP",
-					"-DHAVE_LIBRETRODB",
-					"-DHAVE_GETOPT_LONG",
-					"-DHAVE_METAL",
-					"-DHAVE_SLANG",
-					"-DHAVE_GLSLANG",
-					"-DHAVE_SPIRV_CROSS",
-					"-DWANT_GLSLANG",
-					"-DENABLE_HLSL",
-					"-DGLSLANG_OSINCLUDE_UNIX",
-					"-DMETAL_DEBUG",
-				);
 				PREBINDING = NO;
 				SDKROOT = macosx;
 			};
diff --git a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj
index 5ed3fc21e5..d9353f870a 100644
--- a/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_PPC.xcodeproj/project.pbxproj
@@ -319,6 +319,7 @@
 					"-DHAVE_MAIN",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DRARCH_INTERNAL",
 					"-DHAVE_THREADS",
 					"-DHAVE_DYLIB",
@@ -326,6 +327,7 @@
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_HID",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-DHAVE_MMAP",
 					"-DHAVE_LIBRETRODB",
@@ -395,6 +397,7 @@
 					"-DHAVE_MAIN",
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DRARCH_INTERNAL",
 					"-DHAVE_THREADS",
 					"-DHAVE_DYLIB",
@@ -402,6 +405,7 @@
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_HID",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-DHAVE_MMAP",
 					"-DHAVE_LIBRETRODB",
diff --git a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
index a7643d2152..81a8b754a7 100644
--- a/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS10.xcodeproj/project.pbxproj
@@ -332,6 +332,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -371,6 +372,7 @@
 					"-DHAVE_FILTERS_BUILTIN",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -419,6 +421,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -459,6 +462,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -473,6 +477,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -513,6 +518,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -561,6 +567,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -633,6 +640,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
diff --git a/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj
index fbc4f7413e..fecacf79eb 100644
--- a/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS10_static.xcodeproj/project.pbxproj
@@ -341,6 +341,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -378,6 +379,7 @@
 					"-DHAVE_FILTERS_BUILTIN",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -427,6 +429,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -465,6 +468,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -480,6 +484,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -518,6 +523,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -567,6 +573,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -638,6 +645,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
diff --git a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
index d83a5f8d63..c8a7fa4b1a 100644
--- a/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS11.xcodeproj/project.pbxproj
@@ -332,6 +332,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -371,6 +372,7 @@
 					"-DHAVE_FILTERS_BUILTIN",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -420,6 +422,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -460,6 +463,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -475,6 +479,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -515,6 +520,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -564,6 +570,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -636,6 +643,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
diff --git a/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj
index c161f1728e..9338ee20d0 100644
--- a/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS11_static.xcodeproj/project.pbxproj
@@ -340,6 +340,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -377,6 +378,7 @@
 					"-DHAVE_FILTERS_BUILTIN",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -426,6 +428,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -464,6 +467,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -479,6 +483,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -517,6 +522,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -566,6 +572,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
@@ -637,6 +644,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+					"-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
 					"-DHAVE_GRIFFIN",
 					"-DHAVE_STB_VORBIS",
diff --git a/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj
index 4e542c6909..27410e395c 100644
--- a/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS6.xcodeproj/project.pbxproj
@@ -344,6 +344,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -384,6 +385,7 @@
 					"-DHAVE_FILTERS_BUILTIN",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 				);
@@ -428,6 +430,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -468,6 +471,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 				);
@@ -478,6 +482,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -518,6 +523,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 				);
@@ -561,6 +567,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -632,6 +639,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
diff --git a/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj
index 386b08d978..cbdfa26a96 100644
--- a/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS8.xcodeproj/project.pbxproj
@@ -346,6 +346,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -417,6 +418,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -494,6 +496,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -533,6 +536,7 @@
 					"-DHAVE_FILTERS_BUILTIN",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -581,6 +585,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -621,6 +626,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -634,6 +640,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -674,6 +681,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
diff --git a/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj
index c713aba2e8..cbb6e4f7f9 100644
--- a/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS9.xcodeproj/project.pbxproj
@@ -361,6 +361,7 @@
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -400,6 +401,7 @@
 					"-DHAVE_FILTERS_BUILTIN",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -446,6 +448,7 @@
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -486,6 +489,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -498,6 +502,7 @@
 					"-DHAVE_NETWORKGAMEPAD",
 					"-DHAVE_CORETEXT",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -538,6 +543,7 @@
 					"-DHAVE_7ZIP",
 					"-DHAVE_MATERIALUI",
 					"-DHAVE_XMB",
+					"-DHAVE_OZONE",
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 					"-DHAVE_MFI",
@@ -585,6 +591,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
@@ -656,6 +663,7 @@
 					"-DHAVE_CORETEXT",
 					"-DHAVE_HID",
 					"-DHAVE_NETWORKING",
+               "-DHAVE_NETPLAYDISCOVERY",
 					"-DHAVE_AVFOUNDATION",
                "-DHAVE_RUNAHEAD",
 					"-DHAVE_GRIFFIN",
diff --git a/pkg/ctr/Makefile.cores b/pkg/ctr/Makefile.cores
index 391fe18045..068a147364 100644
--- a/pkg/ctr/Makefile.cores
+++ b/pkg/ctr/Makefile.cores
@@ -287,7 +287,7 @@ else ifeq ($(LIBRETRO), pokemini)
 	APP_AUTHOR           = justburn
 	APP_PRODUCT_CODE     = RARCH-POKEMINI
 	APP_UNIQUE_ID        = 0xBAC20
-	APP_ICON             = pkg/ctr/assets/default.png
-	APP_BANNER           = pkg/ctr/assets/libretro_banner.png
+	APP_ICON             = pkg/ctr/assets/pokemini.png
+	APP_BANNER           = pkg/ctr/assets/pokemini_banner.png
 
 endif
diff --git a/pkg/ctr/assets/pokemini.png b/pkg/ctr/assets/pokemini.png
new file mode 100644
index 0000000000..e72c443777
Binary files /dev/null and b/pkg/ctr/assets/pokemini.png differ
diff --git a/pkg/ctr/assets/pokemini_banner.png b/pkg/ctr/assets/pokemini_banner.png
new file mode 100644
index 0000000000..115bc5e733
Binary files /dev/null and b/pkg/ctr/assets/pokemini_banner.png differ
diff --git a/pkg/emscripten/README.md b/pkg/emscripten/README.md
index db22617c96..54cace8981 100644
--- a/pkg/emscripten/README.md
+++ b/pkg/emscripten/README.md
@@ -31,8 +31,13 @@ I you want a self hosted version you need
 - Unzip it in the same dir you extracted the rest, inside **/assets/frontend/bundle**
 - Create an **assets/cores** dir, you can put game data in that dir so it's available under **downloads**
 - chmod +x the indexer script
-- run the indexer script (you need coffeescript) like this: ./indexer ./assets/frontend > ./assets/frontend/.index-xhr
-- run the indexer script (you need coffeescript) like this: ./indexer ./assets/cores > ./assets/cores/.index-xhr
+- run the indexer script (you need coffeescript) like this:
+```
+cd ${ROOT_WWW_PATH}/assets/frontend/bundle
+../../../indexer > .index-xhr
+cd ${ROOT_WWW_PATH}/assets/cores
+../../indexer > .index-xhr
+```
 
 That should be it, you can add more cores to the list by editing index.html
 
diff --git a/pkg/emscripten/libretro/embed.html b/pkg/emscripten/libretro/embed.html
index 788fb073af..77afd33b65 100644
--- a/pkg/emscripten/libretro/embed.html
+++ b/pkg/emscripten/libretro/embed.html
@@ -34,6 +34,7 @@
                           <a class="dropdown-item" href="." data-core="genesis_plus_gx">Genesis Plus GX</a>
                           <a class="dropdown-item" href="." data-core="nestopia">Nestopia (NES)</a>
                           <a class="dropdown-item" href="." data-core="snes9x2010">Snes9x 2010 (SNES)</a>
+                          <a class="dropdown-item" href="." data-core="theodore">Theodore (Thomson TO8/TO9)</a>
                           <a class="dropdown-item" href="." data-core="vba_next">VBA Next (Gameboy Advance)</a>
                         </div>
                         <button class="btn btn-primary disabled" id="btnRun" onclick="startRetroArch()" disabled>
diff --git a/pkg/emscripten/libretro/index.html b/pkg/emscripten/libretro/index.html
index 87293ead7e..e9c7eee5a0 100644
--- a/pkg/emscripten/libretro/index.html
+++ b/pkg/emscripten/libretro/index.html
@@ -57,6 +57,7 @@
                            <a class="dropdown-item" href="." data-core="mednafen_snes">Mednafen/Beetle SNES</a>
                            <a class="dropdown-item" href="." data-core="mednafen_vb">Mednafen/Beetle Virtual Boy</a>
                            <a class="dropdown-item" href="." data-core="mednafen_wswan">Mednafen/Beetle WonderSwan</a>
+                           <a class="dropdown-item" href="." data-core="mu">Mu</a>
                            <a class="dropdown-item" href="." data-core="mupen64plus">Mupen64 Plus</a>
                            <a class="dropdown-item" href="." data-core="nestopia">Nestopia</a>
                            <a class="dropdown-item" href="." data-core="nxengine">NX Engine</a>
@@ -71,6 +72,7 @@
                            <a class="dropdown-item" href="." data-core="snes9x">Snes9x</a>
                            <a class="dropdown-item" href="." data-core="stella">Stella</a>
                            <a class="dropdown-item" href="." data-core="tgbdual">TGB Dual</a>
+                           <a class="dropdown-item" href="." data-core="theodore">Theodore (Thomson TO8/TO9)</a>
                            <a class="dropdown-item" href="." data-core="tyrquake">TyrQuake</a>
                            <a class="dropdown-item" href="." data-core="vba_next">VBA Next</a>
                            <a class="dropdown-item" href="." data-core="vecx">Vecx</a>
diff --git a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj
index fa171bc956..7531907b67 100644
--- a/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj
+++ b/pkg/msvc/msvc-2003/RetroArch-msvc2003.vcproj
@@ -21,7 +21,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\libretro-common\include&quot;;&quot;$(SolutionDir)\..\..\libretro-common\include\compat\msvc&quot;;&quot;$(SolutionDir)\..\..\deps&quot;;&quot;$(SolutionDir)\..\..\deps\stb&quot;;&quot;$(SolutionDir)\..\..\deps\rcheevos\include&quot;;&quot;$(SolutionDir)\..\..\gfx\include&quot;"
-				PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;DEBUG;_DEBUG;__STDC_CONSTANT_MACROS"
+				PreprocessorDefinitions="_WIN32;WINVER=0x0400;_WIN32_WINNT=0x0400;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETPLAYDISCOVERY;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;HAVE_D3D;HAVE_D3D8;DEBUG;_DEBUG;__STDC_CONSTANT_MACROS"
 				MinimalRebuild="TRUE"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="5"
diff --git a/pkg/msvc/msvc-2005/RetroArch-msvc2005.vcproj b/pkg/msvc/msvc-2005/RetroArch-msvc2005.vcproj
index 0838d2ba65..ed75674de6 100644
--- a/pkg/msvc/msvc-2005/RetroArch-msvc2005.vcproj
+++ b/pkg/msvc/msvc-2005/RetroArch-msvc2005.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\libretro-common\include&quot;;&quot;$(SolutionDir)\..\..\libretro-common\include\compat\msvc&quot;;&quot;$(SolutionDir)\..\..\deps&quot;;&quot;$(SolutionDir)\..\..\deps\stb&quot;;&quot;$(SolutionDir)\..\..\deps\rcheevos\include&quot;;&quot;$(SolutionDir)\..\..\gfx\include&quot;;&quot;$(INETSDK)\Include&quot;;&quot;$(DXSDK_DIR)\Include&quot;"
-				PreprocessorDefinitions="_WIN32_WINNT=0x0410;_WIN32;RARCH_INTERNAL;HAVE_THREADS;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_SHADERPIPELINE;HAVE_OPENGL;HAVE_CC_RESAMPLER;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_RPNG;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_RTHREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS"
+				PreprocessorDefinitions="_WIN32_WINNT=0x0410;_WIN32;RARCH_INTERNAL;HAVE_THREADS;HAVE_D3D;HAVE_D3D9;HAVE_GLSL;HAVE_SHADERPIPELINE;HAVE_OPENGL;HAVE_CC_RESAMPLER;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_RPNG;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;WANT_ZLIB;HAVE_DINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_RTHREADS;HAVE_DYNAMIC;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
diff --git a/pkg/msvc/msvc-2008/RetroArch-msvc2008.vcproj b/pkg/msvc/msvc-2008/RetroArch-msvc2008.vcproj
index afaa0ce5ca..efd4191f59 100644
--- a/pkg/msvc/msvc-2008/RetroArch-msvc2008.vcproj
+++ b/pkg/msvc/msvc-2008/RetroArch-msvc2008.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\libretro-common\include&quot;;&quot;$(SolutionDir)\..\..\libretro-common\include\compat\msvc&quot;;&quot;$(SolutionDir)\..\..\deps&quot;;&quot;$(SolutionDir)\..\..\deps\rcheevos\include&quot;;&quot;$(SolutionDir)\..\..\gfx\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_RUNAHEAD;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_GLSL;HAVE_OVERLAY;HAVE_DINPUT;HAVE_XINPUT;HAVE_DYLIB;HAVE_DYNAMIC;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_RUNAHEAD;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_GLSL;HAVE_OVERLAY;HAVE_DINPUT;HAVE_XINPUT;HAVE_DYLIB;HAVE_DYNAMIC;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -118,7 +118,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\libretro-common\include&quot;;&quot;$(SolutionDir)\..\..\libretro-common\include\compat\msvc&quot;;&quot;$(SolutionDir)\..\..\deps&quot;;&quot;$(SolutionDir)\..\..\deps\rcheevos\include&quot;;&quot;$(SolutionDir)\..\..\gfx\include&quot;;&quot;$(DXSDK_DIR)Include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_RUNAHEAD;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_GLSL;HAVE_OVERLAY;HAVE_DINPUT;HAVE_XINPUT;HAVE_DYLIB;HAVE_DYNAMIC;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_RUNAHEAD;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_GLSL;HAVE_OVERLAY;HAVE_DINPUT;HAVE_XINPUT;HAVE_DYLIB;HAVE_DYNAMIC;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -193,7 +193,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\libretro-common\include&quot;;&quot;$(SolutionDir)\..\..\libretro-common\include\compat\msvc&quot;;&quot;$(SolutionDir)\..\..\deps&quot;;&quot;$(SolutionDir)\..\..\deps\rcheevos\include&quot;;&quot;$(SolutionDir)\..\..\gfx\include&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_RUNAHEAD;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DYLIB;HAVE_DYNAMIC;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_RUNAHEAD;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DYLIB;HAVE_DYNAMIC;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -269,7 +269,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="&quot;$(SolutionDir)\..\..\libretro-common\include&quot;;&quot;$(SolutionDir)\..\..\libretro-common\include\compat\msvc&quot;;&quot;$(SolutionDir)\..\..\deps&quot;;&quot;$(SolutionDir)\..\..\deps\rcheevos\include&quot;;&quot;$(SolutionDir)\..\..\gfx\include&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_RUNAHEAD;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DYLIB;HAVE_DYNAMIC;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;RC_DISABLE_LUA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_RUNAHEAD;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DYLIB;HAVE_DYNAMIC;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT;__STDC_CONSTANT_MACROS"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
diff --git a/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj b/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
index bde207b1b2..e6d615a696 100644
--- a/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
+++ b/pkg/msvc/msvc-2010/RetroArch-msvc2010.vcxproj
@@ -182,7 +182,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;RC_DISABLE_LUA;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;RC_DISABLE_LUA;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -202,7 +202,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -223,7 +223,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;RC_DISABLE_LUA;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;RC_DISABLE_LUA;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -243,7 +243,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -266,7 +266,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;RC_DISABLE_LUA;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;RC_DISABLE_LUA;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -292,7 +292,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3DX;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -319,7 +319,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;RC_DISABLE_LUA;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;RC_DISABLE_LUA;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -345,7 +345,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_CHEEVOS;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -383,4 +383,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/pkg/msvc/msvc-2012/RetroArch-msvc2012.vcxproj b/pkg/msvc/msvc-2012/RetroArch-msvc2012.vcxproj
index c4ae7da5b0..e243793e61 100644
--- a/pkg/msvc/msvc-2012/RetroArch-msvc2012.vcxproj
+++ b/pkg/msvc/msvc-2012/RetroArch-msvc2012.vcxproj
@@ -52,7 +52,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_MENU;HAVE_UPDATE_ASSETS;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_OPENGL;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_MENU;HAVE_UPDATE_ASSETS;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_OPENGL;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\deps;$(SolutionDir)\..\..\gfx\include;$(SolutionDir)\..\..\gfx\include\dxsdk;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -70,7 +70,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_MENU;HAVE_UPDATE_ASSETS;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_OPENGL;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_MENU;HAVE_UPDATE_ASSETS;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_OPENGL;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\deps;$(SolutionDir)\..\..\gfx\include;$(SolutionDir)\..\..\gfx\include\dxsdk;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
@@ -93,4 +93,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/pkg/msvc/msvc-2013/RetroArch-msvc2013.vcxproj b/pkg/msvc/msvc-2013/RetroArch-msvc2013.vcxproj
index b3d93c79db..9d8f038124 100644
--- a/pkg/msvc/msvc-2013/RetroArch-msvc2013.vcxproj
+++ b/pkg/msvc/msvc-2013/RetroArch-msvc2013.vcxproj
@@ -84,7 +84,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;WANT_GLSLANG;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_SPIRV_CROSS;RC_DISABLE_LUA;HAVE_UPDATE_ASSETS;HAVE_MENU;HAVE_SLANG;HAVE_GLSLANG;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;_DEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_OPENGL;HAVE_VULKAN;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;ENABLE_HLSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WANT_GLSLANG;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_SPIRV_CROSS;RC_DISABLE_LUA;HAVE_UPDATE_ASSETS;HAVE_MENU;HAVE_SLANG;HAVE_GLSLANG;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;_DEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_OPENGL;HAVE_VULKAN;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;ENABLE_HLSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\gfx\include\dxsdk;$(SolutionDir)\..\..\gfx\include;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\deps;$(SolutionDir)\..\..\deps\glslang;$(SolutionDir)\..\..\deps\rcheevos\include;$(SolutionDir)\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
     </ClCompile>
@@ -100,7 +100,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;WANT_GLSLANG;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_SPIRV_CROSS;RC_DISABLE_LUA;HAVE_MENU;HAVE_SLANG;HAVE_GLSLANG;HAVE_UPDATE_ASSETS;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;_DEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_OPENGL;HAVE_VULKAN;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;ENABLE_HLSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WANT_GLSLANG;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_SPIRV_CROSS;RC_DISABLE_LUA;HAVE_MENU;HAVE_SLANG;HAVE_GLSLANG;HAVE_UPDATE_ASSETS;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;_DEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_OPENGL;HAVE_VULKAN;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;ENABLE_HLSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\gfx\include\dxsdk;$(SolutionDir)\..\..\gfx\include;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\deps;$(SolutionDir)\..\..\deps\glslang;$(SolutionDir)\..\..\deps\rcheevos\include;$(SolutionDir)\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
     </ClCompile>
@@ -118,7 +118,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;WANT_GLSLANG;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_SPIRV_CROSS;RC_DISABLE_LUA;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;HAVE_MENU;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_OPENGL;HAVE_VULKAN;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_COMMAND;HAVE_NETWORK_CMD;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;ENABLE_HLSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WANT_GLSLANG;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_SPIRV_CROSS;RC_DISABLE_LUA;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;HAVE_MENU;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_OPENGL;HAVE_VULKAN;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_COMMAND;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;ENABLE_HLSL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\gfx\include\dxsdk;$(SolutionDir)\..\..\gfx\include;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\deps;$(SolutionDir)\..\..\deps\glslang;$(SolutionDir)\..\..\deps\rcheevos\include;$(SolutionDir)\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
     </ClCompile>
@@ -138,7 +138,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;WANT_GLSLANG;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_SPIRV_CROSS;RC_DISABLE_LUA;HAVE_MENU;HAVE_SLANG;HAVE_GLSLANG;HAVE_UPDATE_ASSETS;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_OPENGL;HAVE_VULKAN;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;WANT_GLSLANG;HAVE_DYNAMIC;HAVE_DYLIB;HAVE_SPIRV_CROSS;RC_DISABLE_LUA;HAVE_MENU;HAVE_SLANG;HAVE_GLSLANG;HAVE_UPDATE_ASSETS;HAVE_XMB;HAVE_SHADERPIPELINE;HAVE_RGUI;HAVE_MATERIALUI;NDEBUG;_WINDOWS;HAVE_XAUDIO;HAVE_DSOUND;HAVE_DINPUT;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_OPENGL;HAVE_VULKAN;HAVE_GLSL;HAVE_THREADS;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_RJPEG;HAVE_RPNG;HAVE_ZLIB;WANT_ZLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_OVERLAY;HAVE_7ZIP;HAVE_LIBRETRODB;HAVE_STB_FONT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(SolutionDir)\..\..\gfx\include\dxsdk;$(SolutionDir)\..\..\gfx\include;$(SolutionDir)\..\..\libretro-common\include;$(SolutionDir)\..\..\deps;$(SolutionDir)\..\..\deps\glslang;$(SolutionDir)\..\..\deps\rcheevos\include;$(SolutionDir)\..\..\deps\SPIRV-Cross;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DebugInformationFormat>OldStyle</DebugInformationFormat>
     </ClCompile>
@@ -168,4 +168,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/pkg/msvc/msvc-2015/RetroArch-msvc2015.vcxproj b/pkg/msvc/msvc-2015/RetroArch-msvc2015.vcxproj
index e7cba6c2e2..7be9b56ada 100644
--- a/pkg/msvc/msvc-2015/RetroArch-msvc2015.vcxproj
+++ b/pkg/msvc/msvc-2015/RetroArch-msvc2015.vcxproj
@@ -190,7 +190,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include\dxsdk;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -210,7 +210,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include\dxsdk;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -231,7 +231,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include\dxsdk;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -252,7 +252,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include\dxsdk;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -275,7 +275,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include\dxsdk;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -300,7 +300,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include\dxsdk;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -326,7 +326,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include\dxsdk;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -351,7 +351,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;HAVE_UPDATE_ASSETS;HAVE_SLANG;HAVE_GLSLANG;WANT_GLSLANG;HAVE_VULKAN;HAVE_SPIRV_CROSS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\gfx\include\dxsdk;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -385,4 +385,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj b/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj
index 477ca5b610..f228bad8bf 100644
--- a/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj
+++ b/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj
@@ -371,7 +371,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -391,7 +391,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -412,7 +412,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -433,7 +433,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -454,7 +454,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -474,7 +474,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -495,7 +495,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -516,7 +516,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_FBO;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_DEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -539,7 +539,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -564,7 +564,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -590,7 +590,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -616,7 +616,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;__SSE__;__i686__;HAVE_OVERLAY;HAVE_MENU;HAVE_RGUI;HAVE_GL_SYNC;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -642,7 +642,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -667,7 +667,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -693,7 +693,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -719,7 +719,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;RARCH_INTERNAL;HAVE_CC_RESAMPLER;WANT_GLSLANG;HAVE_SLANG;HAVE_GLSLANG;HAVE_SPIRV_CROSS;HAVE_UPDATE_ASSETS;HAVE_D3D;HAVE_D3D9;HAVE_D3D10;HAVE_D3D11;HAVE_D3D12;HAVE_VULKAN;ENABLE_HLSL;RC_DISABLE_LUA;HAVE_WASAPI;HAVE_CG;HAVE_GLSL;HAVE_CHEEVOS;HAVE_RUNAHEAD;HAVE_GRIFFIN;HAVE_LANGEXTRA;HAVE_FBO;HAVE_ZLIB;HAVE_QT;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;HAVE_XMB;HAVE_SHADERPIPELINE;WANT_ZLIB;NDEBUG;_WINDOWS;%(PreprocessorDefinitions);HAVE_DINPUT;HAVE_XINPUT;HAVE_XAUDIO;HAVE_DSOUND;HAVE_OPENGL;HAVE_DYLIB;HAVE_NETWORKING;HAVE_NETWORK_CMD;HAVE_NETPLAYDISCOVERY;HAVE_COMMAND;HAVE_STDIN_CMD;HAVE_THREADS;HAVE_DYNAMIC;HAVE_RPNG;HAVE_RJPEG;HAVE_RBMP;HAVE_RTGA;HAVE_IMAGEVIEWER;WANT_ZLIB;_CRT_SECURE_NO_WARNINGS;__SSE__;__SSE2__;__x86_64__;HAVE_OVERLAY;HAVE_RGUI;HAVE_GL_SYNC;HAVE_MENU;HAVE_7ZIP;HAVE_MATERIALUI;HAVE_LIBRETRODB;HAVE_STB_FONT</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(MSBuildProjectDirectory);$(MSBuildProjectDirectory)\..\..\..\;$(MSBuildProjectDirectory)\..\..\..\deps\rcheevos\include;$(CG_INC_PATH);$(MSBuildProjectDirectory)\..\..\..\deps\zlib;$(MSBuildProjectDirectory)\..\..\..\libretro-common\include;$(MSBuildProjectDirectory)\..\..\..\deps;$(MSBuildProjectDirectory)\..\..\..\deps\glslang;$(MSBuildProjectDirectory)\..\..\..\deps\SPIRV-Cross;$(MSBuildProjectDirectory)\..\..\..\deps\stb;$(MSBuildProjectDirectory)\..\..\..\gfx\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <CompileAs>CompileAsCpp</CompileAs>
@@ -908,4 +908,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/ps2/compat_ctype.c b/ps2/compat_ctype.c
new file mode 100644
index 0000000000..0c5dba835d
--- /dev/null
+++ b/ps2/compat_ctype.c
@@ -0,0 +1,427 @@
+#include <compat_ctype.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+#include <fileXio_rpc.h>
+
+#define ULLONG_MAX UINT64_C(0xffffffffffffffff)
+
+/* Do not link from libc */
+
+int islower(int c)
+{
+    if ((c < 'a') || (c > 'z'))
+        return 0;
+
+    // passed both criteria, so it
+    // is a lower case alpha char
+    return 1;
+}
+
+int tolower(int ch)
+{
+        if(ch >= 'A' && ch <= 'Z')
+                return ('a' + ch - 'A');
+        else
+                return ch;
+}
+
+int toupper(int c)
+{
+    if (islower(c))
+        c -= 32;
+
+    return c;
+}
+
+int memcmp(const void *s1, const void *s2, unsigned int length)
+{
+    const char *a = s1;
+    const char *b = s2;
+
+    while (length--) {
+        if (*a++ != *b++)
+            return 1;
+    }
+
+    return 0;
+}
+
+void * memcpy (void *dest, const void *src, size_t len)
+{
+  char *d = dest;
+  const char *s = src;
+  while (len--)
+    *d++ = *s++;
+  return dest;
+}
+
+void * memset (void *dest, int val, size_t len)
+{
+  unsigned char *ptr = dest;
+  while (len-- > 0)
+    *ptr++ = val;
+  return dest;
+}
+
+int sprintf (char *s, const char *format, ...)
+{
+  va_list arg;
+  int done;
+  va_start (arg, format);
+  done = vsprintf (s, format, arg);
+  va_end (arg);
+  return done;
+}
+
+char * strcat(char *dest, const char *src)
+{
+    size_t i,j;
+    for (i = 0; dest[i] != '\0'; i++)
+        ;
+    for (j = 0; src[j] != '\0'; j++)
+        dest[i+j] = src[j];
+    dest[i+j] = '\0';
+    return dest;
+}
+
+char *strchr(const char *string, int c)
+{
+    while (*string) {
+        if (*string == c)
+            return (char *)string;
+        string++;
+    }
+
+    if (*string == c)
+        return (char *)string;
+
+    return NULL;
+}
+
+int strcmp(const char *s1, const char *s2)
+{
+	while (*s1 == *s2++)
+		if (*s1++ == 0)
+			return (0);
+	return (*(unsigned char *)s1 - *(unsigned char *)--s2);
+}
+
+char * strcpy(char *to, const char *from)
+{
+	char *save = to;
+
+	for (; (*to = *from) != '\0'; ++from, ++to);
+	return(save);
+}
+
+size_t strcspn(const char *s1, const char *s2)
+{
+	const char *p, *spanp;
+	char c, sc;
+
+	/*
+	 * Stop as soon as we find any character from s2.  Note that there
+	 * must be a NUL in s2; it suffices to stop when we find that, too.
+	 */
+	for (p = s1;;) {
+		c = *p++;
+		spanp = s2;
+		do {
+			if ((sc = *spanp++) == c)
+				return (p - 1 - s1);
+		} while (sc != 0);
+	}
+	/* NOTREACHED */
+}
+
+size_t strlen(const char *str)
+{
+   const char *s;
+
+	for (s = str; *s; ++s)
+		;
+	return (s - str);
+}
+
+char * strncat(char *dst, const char *src, size_t n)
+{
+   if (n != 0) {
+		char *d = dst;
+		const char *s = src;
+
+		while (*d != 0)
+			d++;
+		do {
+			if ((*d = *s++) == 0)
+				break;
+			d++;
+		} while (--n != 0);
+		*d = 0;
+	}
+	return (dst);
+}
+
+int strncmp(const char *s1, const char *s2, size_t n)
+{
+   if (n == 0)
+		return (0);
+	do {
+		if (*s1 != *s2++)
+			return (*(unsigned char *)s1 - *(unsigned char *)--s2);
+		if (*s1++ == 0)
+			break;
+	} while (--n != 0);
+	return (0);
+}
+
+char * strncpy(char *dst, const char *src, size_t n)
+{
+	if (n != 0) {
+		char *d = dst;
+		const char *s = src;
+
+		do {
+			if ((*d++ = *s++) == 0) {
+				/* NUL pad the remaining n-1 bytes */
+				while (--n != 0)
+					*d++ = 0;
+				break;
+			}
+		} while (--n != 0);
+	}
+	return (dst);
+}
+
+char * strpbrk(const char *s1, const char *s2)
+{
+	const char *scanp;
+	int c, sc;
+
+	while ((c = *s1++) != 0) {
+		for (scanp = s2; (sc = *scanp++) != 0;)
+			if (sc == c)
+				return ((char *)(s1 - 1));
+	}
+	return (NULL);
+}
+
+/* Do not link to strrchr() from libc */
+char * strrchr(const char *p, int ch)
+{
+	char *save;
+
+	for (save = NULL;; ++p) {
+		if (*p == (char) ch)
+			save = (char *)p;
+		if (!*p)
+			return(save);
+	}
+	/* NOTREACHED */
+}
+
+size_t strspn(const char *s1, const char *s2)
+{
+	const char *p = s1, *spanp;
+	char c, sc;
+
+	/*
+	 * Skip any characters in s2, excluding the terminating \0.
+	 */
+cont:
+	c = *p++;
+	for (spanp = s2; (sc = *spanp++) != 0;)
+		if (sc == c)
+			goto cont;
+	return (p - 1 - s1);
+}
+
+char *strstr(const char *string, const char *substring)
+{
+    char *strpos;
+
+    if (string == 0)
+        return 0;
+
+    if (strlen(substring) == 0)
+        return (char *)string;
+
+    strpos = (char *)string;
+
+    while (*strpos != 0) {
+        if (strncmp(strpos, substring, strlen(substring)) == 0)
+            return strpos;
+
+        strpos++;
+    }
+
+    return 0;
+}
+
+size_t strnlen(const char *str, size_t maxlen)
+{
+	const char *cp;
+
+	for (cp = str; maxlen != 0 && *cp != '\0'; cp++, maxlen--)
+		;
+
+	return (size_t)(cp - str);
+}
+
+char *strtok(char *strToken, const char *strDelimit)
+{
+    static char *start;
+    static char *end;
+
+    if (strToken != NULL)
+        start = strToken;
+    else {
+        if (*end == 0)
+            return 0;
+
+        start = end;
+    }
+
+    if (*start == 0)
+        return 0;
+
+    // Strip out any leading delimiters
+    while (strchr(strDelimit, *start)) {
+        // If a character from the delimiting string
+        // then skip past it
+
+        start++;
+
+        if (*start == 0)
+            return 0;
+    }
+
+    if (*start == 0)
+        return 0;
+
+    end = start;
+
+    while (*end != 0) {
+        if (strchr(strDelimit, *end)) {
+            // if we find a delimiting character
+            // before the end of the string, then
+            // terminate the token and move the end
+            // pointer to the next character
+            *end = 0;
+            end++;
+            return start;
+        }
+        end++;
+    }
+
+    // reached the end of the string before finding a delimiter
+    // so dont move on to the next character
+    return start;
+}  
+
+char * strtok_r (char *s, const char *delim, char **save_ptr)
+{
+  char *end;
+  if (s == NULL)
+    s = *save_ptr;
+  if (*s == '\0')
+    {
+      *save_ptr = s;
+      return NULL;
+    }
+  /* Scan leading delimiters.  */
+  s += strspn (s, delim);
+  if (*s == '\0')
+    {
+      *save_ptr = s;
+      return NULL;
+    }
+  /* Find the end of the token.  */
+  end = s + strcspn (s, delim);
+  if (*end == '\0')
+    {
+      *save_ptr = end;
+      return s;
+    }
+  /* Terminate the token and make *SAVE_PTR point past it.  */
+  *end = '\0';
+  *save_ptr = end + 1;
+  return s;
+}
+
+unsigned long long strtoull(const char * __restrict nptr, char ** __restrict endptr, int base)
+{
+	const char *s;
+	unsigned long long acc;
+	char c;
+	unsigned long long cutoff;
+	int neg, any, cutlim;
+
+	/*
+	 * See strtoq for comments as to the logic used.
+	 */
+	s = nptr;
+	do {
+		c = *s++;
+	} while (isspace((unsigned char)c));
+	if (c == '-') {
+		neg = 1;
+		c = *s++;
+	} else {
+		neg = 0;
+		if (c == '+')
+			c = *s++;
+	}
+	if ((base == 0 || base == 16) &&
+	    c == '0' && (*s == 'x' || *s == 'X')) {
+		c = s[1];
+		s += 2;
+		base = 16;
+	}
+	if (base == 0)
+		base = c == '0' ? 8 : 10;
+	acc = any = 0;
+	if (base < 2 || base > 36)
+		goto noconv;
+
+	cutoff = ULLONG_MAX / base;
+	cutlim = ULLONG_MAX % base;
+	for ( ; ; c = *s++) {
+		if (c >= '0' && c <= '9')
+			c -= '0';
+		else if (c >= 'A' && c <= 'Z')
+			c -= 'A' - 10;
+		else if (c >= 'a' && c <= 'z')
+			c -= 'a' - 10;
+		else
+			break;
+		if (c >= base)
+			break;
+		if (any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
+			any = -1;
+		else {
+			any = 1;
+			acc *= base;
+			acc += c;
+		}
+	}
+	if (any < 0) {
+		acc = ULLONG_MAX;
+		errno = ERANGE;
+	} else if (!any) {
+noconv:
+		errno = EINVAL;
+	} else if (neg)
+		acc = -acc;
+	if (endptr != NULL)
+		*endptr = (char *)(any ? s - 1 : nptr);
+	return (acc);
+}
+
+//long strtol(const char *s, char **endptr, int base); FJTRUJY MISSING
+//unsigned long strtoul(const char *s, char **endptr, int base); FJTRUJY MISSING
+
+int link(const char *oldpath, const char *newpath)
+{
+	return fileXioSymlink(oldpath, newpath);
+}
diff --git a/ps2/include/compat_ctype.h b/ps2/include/compat_ctype.h
new file mode 100644
index 0000000000..1d80025c28
--- /dev/null
+++ b/ps2/include/compat_ctype.h
@@ -0,0 +1,10 @@
+#ifndef COMPAT_CTYPE_H
+#define COMPAT_CTYPE_H
+
+char *strtok_r(char *str, const char *delim, char **saveptr);
+
+unsigned long long strtoull(const char * __restrict nptr, char ** __restrict endptr, int base);
+
+int link(const char *oldpath, const char *newpath);
+
+#endif
diff --git a/ps2/include/inttypes.h b/ps2/include/inttypes.h
new file mode 100644
index 0000000000..3049fbdbba
--- /dev/null
+++ b/ps2/include/inttypes.h
@@ -0,0 +1,8 @@
+#ifndef INTTYPES_H
+#define INTTYPES_H
+
+#define PRId64 "ld"
+#define PRIu64 "lu"
+#define PRIuPTR "lu"
+
+#endif //INTTYPES_H
diff --git a/ps2/include/math.h b/ps2/include/math.h
new file mode 100644
index 0000000000..bf0071edb1
--- /dev/null
+++ b/ps2/include/math.h
@@ -0,0 +1,21 @@
+#ifndef MATH_H
+#define MATH_H
+
+#include <floatlib.h>
+#define roundf(in) (in >= 0.0f ? floorf(in + 0.5f) : ceilf(in - 0.5f))
+
+#define cos(x) ((double)cosf((float)x))
+#define pow(x, y) ((double)powf((float)x, (float)y))
+#define sin(x) ((double)sinf((float)x))
+#define ceil(x) ((double)ceilf((float)x))
+#define floor(x) ((double)floorf((float)x))
+#define sqrt(x) ((double)sqrtf((float)x))
+#define fabs(x) ((double)fabsf((float)(x)))
+
+#define fmaxf(a, b) (((a) > (b)) ? (a) : (b))
+#define fminf(a, b) (((a) < (b)) ? (a) : (b))
+
+#define exp(a) ((double)expf((float)a))
+#define log(a) ((double)logf((float)a))
+
+#endif //MATH_H
diff --git a/ps2/include/pte_types.h b/ps2/include/pte_types.h
new file mode 100644
index 0000000000..7e81156684
--- /dev/null
+++ b/ps2/include/pte_types.h
@@ -0,0 +1,26 @@
+/* pte_types.h  */
+
+#ifndef PTE_TYPES_H
+#define PTE_TYPES_H
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/timeb.h>
+#include <tcpip.h>
+
+/** UIDs are used to describe many different kernel objects. */
+typedef int SceUID;
+
+/* Misc. kernel types. */
+typedef unsigned int SceSize;
+typedef int SceSSize;
+
+typedef unsigned char SceUChar;
+typedef unsigned int SceUInt;
+
+/* File I/O types. */
+typedef int SceMode;
+typedef long SceOff;
+typedef long SceIores;
+
+#endif /* PTE_TYPES_H */
diff --git a/ps2/include/stdint.h b/ps2/include/stdint.h
new file mode 100644
index 0000000000..813efd21f8
--- /dev/null
+++ b/ps2/include/stdint.h
@@ -0,0 +1,30 @@
+#ifndef STDINT_H
+#define STDINT_H
+
+typedef unsigned long     uintptr_t;
+typedef signed long       intptr_t;
+
+typedef signed char       int8_t;
+typedef signed short      int16_t;
+typedef signed int        int32_t;
+typedef signed long       int64_t;
+typedef unsigned char     uint8_t;
+typedef unsigned short    uint16_t;
+typedef unsigned int      uint32_t;
+typedef unsigned long     uint64_t;
+
+#define	 STDIN_FILENO	0	/* standard input file descriptor */
+#define	STDOUT_FILENO	1	/* standard output file descriptor */
+#define	STDERR_FILENO	2	/* standard error file descriptor */
+
+#define INT8_C(val)  val##c
+#define INT16_C(val) val##h
+#define INT32_C(val) val##i
+#define INT64_C(val) val##l
+
+#define UINT8_C(val)  val##uc
+#define UINT16_C(val) val##uh
+#define UINT32_C(val) val##ui
+#define UINT64_C(val) val##ul
+
+#endif //STDINT_H
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index d0d94da004..a679058d35 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -518,7 +518,8 @@ if [ "$HAVE_MATERIALUI" != 'no' ] || [ "$HAVE_XMB" != 'no' ] || [ "$HAVE_ZARCH"
       HAVE_XMB=no
       HAVE_STRIPES=no
       HAVE_ZARCH=no
-      die : 'Notice: RGUI not available, MaterialUI, XMB and ZARCH will also be disabled.'
+      HAVE_OZONE=no
+      die : 'Notice: RGUI not available, MaterialUI, XMB, Ozone and ZARCH will also be disabled.'
    elif [ "$HAVE_OPENGL" = 'no' ] && [ "$HAVE_OPENGLES" = 'no' ] && [ "$HAVE_VULKAN" = 'no' ]; then
       if [ "$OS" = 'Win32' ]; then
          HAVE_SHADERPIPELINE=no
@@ -531,7 +532,8 @@ if [ "$HAVE_MATERIALUI" != 'no' ] || [ "$HAVE_XMB" != 'no' ] || [ "$HAVE_ZARCH"
          HAVE_XMB=no
          HAVE_STRIPES=no
          HAVE_ZARCH=no
-         die : 'Notice: Hardware rendering context not available, XMB, MaterialUI and ZARCH will also be disabled.'
+         HAVE_OZONE=no
+         die : 'Notice: Hardware rendering context not available, XMB, MaterialUI, Ozone and ZARCH will also be disabled.'
       fi
    fi
 fi
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 659ae20ca0..daf9206eaf 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -10,6 +10,7 @@ HAVE_LIBRETRODB=yes        # Libretrodb support
 HAVE_RGUI=yes              # RGUI menu
 HAVE_MATERIALUI=auto       # MaterialUI menu
 HAVE_XMB=auto              # XMB menu
+HAVE_OZONE=auto            # Ozone menu
 HAVE_STRIPES=no            # Stripes menu
 HAVE_ZARCH=no              # Zarch menu
 HAVE_NUKLEAR=no            # Nuklear menu
@@ -37,6 +38,7 @@ HAVE_DYLIB=auto            # Dynamic loading support
 HAVE_NETWORKING=auto       # Networking features (recommended)
 HAVE_NETWORKGAMEPAD=auto   # Networked game pad (plus baked-in core)
 C89_NETWORKGAMEPAD=no
+HAVE_NETPLAYDISCOVERY=yes  # Add netplay discovery (room creation, etc.)
 HAVE_MINIUPNPC=auto        # Mini UPnP client library (for NAT traversal)
 HAVE_BUILTINMINIUPNPC=yes  # Bake in Mini UPnP client library (for NAT traversal)
 C89_BUILTINMINIUPNPC=no
diff --git a/record/drivers/record_ffmpeg.c b/record/drivers/record_ffmpeg.c
index a4c332ac45..b181492bde 100644
--- a/record/drivers/record_ffmpeg.c
+++ b/record/drivers/record_ffmpeg.c
@@ -944,6 +944,7 @@ static void *ffmpeg_new(const struct record_params *params)
 
    if (params->preset == RECORD_CONFIG_TYPE_RECORDING_CUSTOM || params->preset == RECORD_CONFIG_TYPE_STREAMING_CUSTOM)
    {
+      RARCH_LOG("config: %s %s\n", &handle->config, params->config);
       if (!ffmpeg_init_config(&handle->config, params->config))
          goto error;
    }
diff --git a/record/record_driver.c b/record/record_driver.c
index 9b2f4afe37..9426b58e2f 100644
--- a/record/record_driver.c
+++ b/record/record_driver.c
@@ -539,7 +539,7 @@ void recording_driver_update_streaming_url(void)
          else
          {
             /* To-Do: Show input box for twitch_stream_key*/
-            RARCH_LOG("[recording] twitch streaming key empty");
+            RARCH_LOG("[recording] twitch streaming key empty\n");
          }
          break;
       }
@@ -553,7 +553,7 @@ void recording_driver_update_streaming_url(void)
          else
          {
             /* To-Do: Show input box for youtube_stream_key*/
-            RARCH_LOG("[recording] youtube streaming key empty");
+            RARCH_LOG("[recording] youtube streaming key empty\n");
          }
          break;
       }
diff --git a/retroarch.c b/retroarch.c
index ccfe66dc9f..eb14ada97e 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -1204,8 +1204,8 @@ bool retroarch_validate_game_options(char *s, size_t len, bool mkdir)
    if (string_is_empty(core_name) || string_is_empty(game_name))
       return false;
 
-   core_path                              = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-   config_directory                       = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   core_path                              = (char*)malloc(str_size);
+   config_directory                       = (char*)malloc(str_size);
    config_directory[0] = core_path[0]     = '\0';
 
    fill_pathname_application_special(config_directory,
@@ -1479,8 +1479,8 @@ void rarch_menu_running_finished(void)
  **/
 static bool rarch_game_specific_options(char **output)
 {
-   char *game_path       = (char*)malloc(8192 * sizeof(char));
    size_t game_path_size = 8192 * sizeof(char);
+   char *game_path       = (char*)malloc(game_path_size);
 
    game_path[0] ='\0';
 
@@ -1698,15 +1698,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
 
          audio_driver_unset_callback();
 
-#if 0
-         if (!string_is_empty(runloop_system.info.library_name))
-            free((void*)runloop_system.info.library_name);
-         if (!string_is_empty(runloop_system.info.library_version))
-            free((void*)runloop_system.info.library_version);
-         if (!string_is_empty(runloop_system.info.valid_extensions))
-            free((void*)runloop_system.info.valid_extensions);
-#endif
-
          runloop_system.info.library_name          = NULL;
          runloop_system.info.library_version       = NULL;
          runloop_system.info.valid_extensions      = NULL;
@@ -2060,8 +2051,7 @@ char* retroarch_get_shader_preset(void)
       return runtime_shader_preset;
    else if (!string_is_empty(settings->paths.path_shader))
       return settings->paths.path_shader;
-   else
-      return NULL;
+   return NULL;
 }
 
 bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, void *data)
@@ -3594,3 +3584,9 @@ rarch_system_info_t *runloop_get_system_info(void)
 {
    return &runloop_system;
 }
+
+struct retro_system_info *runloop_get_libretro_system_info(void)
+{
+   struct retro_system_info *system = &runloop_system.info;
+   return system;
+}
diff --git a/retroarch.h b/retroarch.h
index 596dce7d54..a3667fde88 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -387,6 +387,8 @@ bool retroarch_is_on_main_thread(void);
 
 rarch_system_info_t *runloop_get_system_info(void);
 
+struct retro_system_info *runloop_get_libretro_system_info(void);
+
 #ifdef HAVE_THREADS
 void runloop_msg_queue_lock(void);
 
diff --git a/tasks/task_content.c b/tasks/task_content.c
index c2df099419..af28c4fcac 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -386,9 +386,10 @@ static bool load_content_from_compressed_archive(
 {
    union string_list_elem_attr attributes;
    int64_t new_path_len              = 0;
-   size_t path_size                  = PATH_MAX_LENGTH * sizeof(char);
-   char *new_basedir                 = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-   char *new_path                    = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   size_t new_basedir_size           = PATH_MAX_LENGTH * sizeof(char);
+   size_t new_path_size              = PATH_MAX_LENGTH * sizeof(char);
+   char *new_basedir                 = (char*)malloc(new_basedir_size);
+   char *new_path                    = (char*)malloc(new_path_size);
    bool ret                          = false;
 
    new_path[0]                       = '\0';
@@ -399,8 +400,7 @@ static bool load_content_from_compressed_archive(
          " Now extracting to temporary directory.\n");
 
    if (!string_is_empty(content_ctx->directory_cache))
-      strlcpy(new_basedir, content_ctx->directory_cache,
-            path_size);
+      strlcpy(new_basedir, content_ctx->directory_cache, new_basedir_size);
 
    if (string_is_empty(new_basedir) || !path_is_directory(new_basedir))
    {
@@ -408,24 +408,24 @@ static bool load_content_from_compressed_archive(
             "cache directory was not set or found. "
             "Setting cache directory to directory "
             "derived by basename...\n");
-      fill_pathname_basedir(new_basedir, path,
-            path_size);
+      fill_pathname_basedir(new_basedir, path, new_basedir_size);
    }
 
    new_path[0]    = '\0';
    new_basedir[0] = '\0';
 
    fill_pathname_join(new_path, new_basedir,
-         path_basename(path), path_size);
+         path_basename(path), new_path_size);
 
    ret = file_archive_compressed_read(path,
          NULL, new_path, &new_path_len);
 
    if (!ret || new_path_len < 0)
    {
-      char *str = (char*)malloc(1024 * sizeof(char));
+      size_t path_size = 1024 * sizeof(char);
+      char *str        = (char*)malloc(path_size);
       snprintf(str,
-            1024 * sizeof(char),
+            path_size,
             "%s \"%s\".\n",
             msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE),
             path);
@@ -452,12 +452,14 @@ error:
    return false;
 }
 
+/* Try to extract all content we're going to load if appropriate. */
+
 static bool content_file_init_extract(
       struct string_list *content,
       content_information_ctx_t *content_ctx,
       const struct retro_subsystem_info *special,
-      union string_list_elem_attr *attr,
-      char **error_string
+      char **error_string,
+      union string_list_elem_attr *attr
       )
 {
    unsigned i;
@@ -478,32 +480,34 @@ static bool content_file_init_extract(
          continue;
 
       {
-         char *temp_content    = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-         const char *valid_ext = special ?
+         size_t temp_content_size = PATH_MAX_LENGTH * sizeof(char);
+         size_t new_path_size     = PATH_MAX_LENGTH * sizeof(char);
+         char *temp_content       = (char*)malloc(temp_content_size);
+         const char *valid_ext    = special ?
             special->roms[i].valid_extensions :
             content_ctx->valid_extensions;
 
-         new_path        = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+         new_path        = (char*)malloc(new_path_size);
 
          temp_content[0] = new_path[0] = '\0';
 
          if (!string_is_empty(path))
-            strlcpy(temp_content, path,
-                  PATH_MAX_LENGTH * sizeof(char));
+            strlcpy(temp_content, path, temp_content_size);
 
          if (!valid_ext || !file_archive_extract_file(
                   temp_content,
-                  PATH_MAX_LENGTH * sizeof(char),
+                  temp_content_size,
                   valid_ext,
                   !string_is_empty(content_ctx->directory_cache) ?
                   content_ctx->directory_cache : NULL,
                   new_path,
-                  PATH_MAX_LENGTH * sizeof(char)
+                  new_path_size
                   ))
          {
-            char *str = (char*)malloc(1024 * sizeof(char));
+            size_t path_size = 1024 * sizeof(char);
+            char *str        = (char*)malloc(path_size);
 
-            snprintf(str, 1024 * sizeof(char),
+            snprintf(str, path_size,
                   "%s: %s.\n",
                   msg_hash_to_str(
                      MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE),
@@ -554,7 +558,7 @@ static bool content_file_load(
    unsigned i;
    retro_ctx_load_content_info_t load_info;
    size_t msg_size = 1024 * sizeof(char);
-   char *msg       = (char*)malloc(1024 * sizeof(char));
+   char *msg       = (char*)malloc(msg_size);
 
    msg[0]          = '\0';
 
@@ -603,9 +607,6 @@ static bool content_file_load(
       }
       else
       {
-         RARCH_LOG("%s\n",
-               msg_hash_to_str(
-                  MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT));
 
 #ifdef HAVE_COMPRESSION
          if (     !content_ctx->block_extract
@@ -618,6 +619,10 @@ static bool content_file_load(
                   error_string))
             goto error;
 #endif
+         RARCH_LOG("%s\n", msg_hash_to_str(MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT));
+         content_rom_crc = file_crc32(0, path);
+         RARCH_LOG("CRC32: 0x%x .\n", (unsigned)content_rom_crc);
+
       }
    }
 
@@ -657,15 +662,16 @@ error:
 
 static const struct
 retro_subsystem_info *content_file_init_subsystem(
-      content_information_ctx_t *content_ctx,
+      const struct retro_subsystem_info *subsystem_data,
+      size_t subsystem_size,
       char **error_string,
       bool *ret)
 {
    size_t path_size                           = 1024 * sizeof(char);
-   char *msg                                  = (char*)malloc(1024 * sizeof(char));
+   char *msg                                  = (char*)malloc(path_size);
    struct string_list *subsystem              = path_get_subsystem_list();
    const struct retro_subsystem_info *special = libretro_find_subsystem_info(
-            content_ctx->subsystem.data, content_ctx->subsystem.size,
+            subsystem_data, subsystem_size,
             path_get(RARCH_PATH_SUBSYSTEM));
 
    msg[0] = '\0';
@@ -721,16 +727,16 @@ error:
    return NULL;
 }
 
-static bool content_file_init_set_attribs(
+static void content_file_init_set_attribs(
       struct string_list *content,
       const struct retro_subsystem_info *special,
       content_information_ctx_t *content_ctx,
-      char **error_string)
+      char **error_string,
+      union string_list_elem_attr *attr)
 {
-   union string_list_elem_attr attr;
    struct string_list *subsystem    = path_get_subsystem_list();
 
-   attr.i                           = 0;
+   attr->i                          = 0;
 
    if (!path_is_empty(RARCH_PATH_SUBSYSTEM) && special)
    {
@@ -738,11 +744,11 @@ static bool content_file_init_set_attribs(
 
       for (i = 0; i < subsystem->size; i++)
       {
-         attr.i            = special->roms[i].block_extract;
-         attr.i           |= special->roms[i].need_fullpath << 1;
-         attr.i           |= special->roms[i].required      << 2;
+         attr->i            = special->roms[i].block_extract;
+         attr->i           |= special->roms[i].need_fullpath << 1;
+         attr->i           |= special->roms[i].required      << 2;
 
-         string_list_append(content, subsystem->elems[i].data, attr);
+         string_list_append(content, subsystem->elems[i].data, *attr);
       }
    }
    else
@@ -752,26 +758,20 @@ static bool content_file_init_set_attribs(
 
       content_get_status(&contentless, &is_inited);
 
-      attr.i               = content_ctx->block_extract;
-      attr.i              |= content_ctx->need_fullpath << 1;
-      attr.i              |= (!contentless)  << 2;
+      attr->i               = content_ctx->block_extract;
+      attr->i              |= content_ctx->need_fullpath << 1;
+      attr->i              |= (!contentless)  << 2;
 
       if (path_is_empty(RARCH_PATH_CONTENT)
             && contentless
             && content_ctx->set_supports_no_game_enable)
-         string_list_append(content, "", attr);
+         string_list_append(content, "", *attr);
       else
       {
          if (!path_is_empty(RARCH_PATH_CONTENT))
-            string_list_append(content, path_get(RARCH_PATH_CONTENT), attr);
+            string_list_append(content, path_get(RARCH_PATH_CONTENT), *attr);
       }
    }
-
-#ifdef HAVE_COMPRESSION
-   /* Try to extract all content we're going to load if appropriate. */
-   content_file_init_extract(content, content_ctx, special, &attr, error_string);
-#endif
-   return true;
 }
 
 /**
@@ -787,17 +787,24 @@ static bool content_file_init(
       struct string_list *content,
       char **error_string)
 {
+   union string_list_elem_attr attr;
    struct retro_game_info               *info = NULL;
    bool ret                                   =
       path_is_empty(RARCH_PATH_SUBSYSTEM)
       ? true : false;
    const struct retro_subsystem_info *special =
       path_is_empty(RARCH_PATH_SUBSYSTEM)
-      ? NULL : content_file_init_subsystem(content_ctx, error_string, &ret);
-   if (  !ret ||
-         !content_file_init_set_attribs(content, special, content_ctx, error_string))
+      ? NULL : content_file_init_subsystem(content_ctx->subsystem.data,
+            content_ctx->subsystem.size, error_string, &ret);
+
+   if (!ret)
       return false;
 
+   content_file_init_set_attribs(content, special, content_ctx, error_string, &attr);
+#ifdef HAVE_COMPRESSION
+   content_file_init_extract(content, content_ctx, special, error_string, &attr);
+#endif
+
    if (content->size > 0)
       info                   = (struct retro_game_info*)
          calloc(content->size, sizeof(*info));
@@ -816,7 +823,7 @@ static bool content_file_init(
 
       free(info);
    }
-   else if (special == NULL)
+   else if (!special)
    {
       *error_string = strdup(msg_hash_to_str(MSG_ERROR_LIBRETRO_CORE_REQUIRES_CONTENT));
       ret = false;
@@ -880,34 +887,29 @@ static bool task_load_content(content_ctx_info_t *content_info,
    bool is_inited   = false;
 
    if (!content_load(content_info))
-   {
       return false;
-   }
-
-
 
    content_get_status(&contentless, &is_inited);
 
    /* Push entry to top of history playlist */
    if (is_inited || contentless)
    {
-      char *tmp                      = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
-      rarch_system_info_t *sys_info  = runloop_get_system_info();
+      size_t tmp_size                = PATH_MAX_LENGTH * sizeof(char);
+      char *tmp                      = (char*)malloc(tmp_size);
       const char *path_content       = path_get(RARCH_PATH_CONTENT);
-      struct retro_system_info *info = sys_info ? &sys_info->info : NULL;
+      struct retro_system_info *info = runloop_get_libretro_system_info();
 
       tmp[0] = '\0';
 
       if (!string_is_empty(path_content))
-         strlcpy(tmp, path_content, PATH_MAX_LENGTH * sizeof(char));
+         strlcpy(tmp, path_content, tmp_size);
 
       if (!launched_from_menu)
       {
          /* Path can be relative here.
           * Ensure we're pushing absolute path. */
          if (!string_is_empty(tmp))
-            path_resolve_realpath(tmp,
-                  PATH_MAX_LENGTH * sizeof(char));
+            path_resolve_realpath(tmp, tmp_size);
       }
 
 #ifdef HAVE_MENU
@@ -1019,7 +1021,7 @@ static bool firmware_update_status(
    bool set_missing_firmware  = false;
    core_info_t *core_info     = NULL;
    size_t s_size              = PATH_MAX_LENGTH * sizeof(char);
-   char *s                    = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   char *s                    = (char*)malloc(s_size);
 
    core_info_get_current_core(&core_info);
 
@@ -1524,6 +1526,8 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
 
    if (sys_info)
    {
+      struct retro_system_info *system        = runloop_get_libretro_system_info();
+
       content_ctx.history_list_enable         = settings->bools.history_list_enable;
       content_ctx.set_supports_no_game_enable = settings->bools.set_supports_no_game_enable;
 
@@ -1531,11 +1535,11 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
          content_ctx.directory_system         = strdup(settings->paths.directory_system);
       if (!string_is_empty(settings->paths.directory_cache))
          content_ctx.directory_cache          = strdup(settings->paths.directory_cache);
-      if (!string_is_empty(sys_info->info.valid_extensions))
-         content_ctx.valid_extensions         = strdup(sys_info->info.valid_extensions);
+      if (!string_is_empty(system->valid_extensions))
+         content_ctx.valid_extensions         = strdup(system->valid_extensions);
 
-      content_ctx.block_extract               = sys_info->info.block_extract;
-      content_ctx.need_fullpath               = sys_info->info.need_fullpath;
+      content_ctx.block_extract               = system->block_extract;
+      content_ctx.need_fullpath               = system->need_fullpath;
 
       content_ctx.subsystem.data              = sys_info->subsystem.data;
       content_ctx.subsystem.size              = sys_info->subsystem.size;
@@ -1650,7 +1654,7 @@ bool task_push_start_builtin_core(
    /* Preliminary stuff that has to be done before we
     * load the actual content. Can differ per mode. */
    retroarch_set_current_core_type(type, true);
-
+      printf("Step 1\n");
    /* Load content */
    if (!task_load_content_callback(content_info, true, false))
    {
@@ -1797,10 +1801,10 @@ void content_set_subsystem(unsigned idx)
 /* Add a rom to the subsystem rom buffer */
 void content_add_subsystem(const char* path)
 {
-   pending_subsystem_roms[pending_subsystem_rom_id] = (char*)malloc(PATH_MAX_LENGTH * sizeof(char));
+   size_t pending_size                              = PATH_MAX_LENGTH * sizeof(char);
+   pending_subsystem_roms[pending_subsystem_rom_id] = (char*)malloc(pending_size);
 
-   strlcpy(pending_subsystem_roms[pending_subsystem_rom_id], path,
-      PATH_MAX_LENGTH * sizeof(char));
+   strlcpy(pending_subsystem_roms[pending_subsystem_rom_id], path, pending_size);
    RARCH_LOG("[subsystem] subsystem id: %d subsystem ident: %s rom id: %d, rom path: %s\n",
       pending_subsystem_id, pending_subsystem_ident, pending_subsystem_rom_id,
       pending_subsystem_roms[pending_subsystem_rom_id]);
@@ -1916,6 +1920,8 @@ bool content_init(void)
 
    if (sys_info)
    {
+      struct retro_system_info *system        = runloop_get_libretro_system_info();
+
       content_ctx.history_list_enable         = settings->bools.history_list_enable;
       content_ctx.set_supports_no_game_enable = settings->bools.set_supports_no_game_enable;
 
@@ -1923,11 +1929,11 @@ bool content_init(void)
          content_ctx.directory_system         = strdup(settings->paths.directory_system);
       if (!string_is_empty(settings->paths.directory_cache))
          content_ctx.directory_cache          = strdup(settings->paths.directory_cache);
-      if (!string_is_empty(sys_info->info.valid_extensions))
-         content_ctx.valid_extensions         = strdup(sys_info->info.valid_extensions);
+      if (!string_is_empty(system->valid_extensions))
+         content_ctx.valid_extensions         = strdup(system->valid_extensions);
 
-      content_ctx.block_extract               = sys_info->info.block_extract;
-      content_ctx.need_fullpath               = sys_info->info.need_fullpath;
+      content_ctx.block_extract               = system->block_extract;
+      content_ctx.need_fullpath               = system->need_fullpath;
 
       content_ctx.subsystem.data              = sys_info->subsystem.data;
       content_ctx.subsystem.size              = sys_info->subsystem.size;
diff --git a/tasks/task_netplay_find_content.c b/tasks/task_netplay_find_content.c
index 816a9e0e2e..1f53758d41 100644
--- a/tasks/task_netplay_find_content.c
+++ b/tasks/task_netplay_find_content.c
@@ -56,8 +56,6 @@ static void netplay_crc_scan_callback(void *task_data,
 {
    netplay_crc_handle_t *state     = (netplay_crc_handle_t*)task_data;
    content_ctx_info_t content_info = {0};
-   rarch_system_info_t *info        = runloop_get_system_info();
-   struct retro_system_info *system = &info->info;
 
    if (!state)
       return;
@@ -69,6 +67,8 @@ static void netplay_crc_scan_callback(void *task_data,
    if (!string_is_empty(state->core_path) && !string_is_empty(state->content_path)
        && !state->contentless && !state->current)
    {
+      struct retro_system_info *system = runloop_get_libretro_system_info();
+
       RARCH_LOG("[lobby] loading core %s with content file %s\n",
          state->core_path, state->content_path);
 
@@ -89,13 +89,14 @@ static void netplay_crc_scan_callback(void *task_data,
    if (!string_is_empty(state->core_path) && !string_is_empty(state->content_path)
       && state->contentless)
    {
-      content_ctx_info_t content_info = {0};
+      content_ctx_info_t content_info  = {0};
+      struct retro_system_info *system = runloop_get_libretro_system_info();
 
       RARCH_LOG("[lobby] loading contentless core %s\n", state->core_path);
 
       command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);
 
-      if (!string_is_equal(info->info.library_name, state->core_name))
+      if (!string_is_equal(system->library_name, state->core_name))
          task_push_load_new_core(state->core_path, NULL,
                &content_info, CORE_TYPE_PLAIN, NULL, NULL);
 
@@ -123,184 +124,195 @@ static void netplay_crc_scan_callback(void *task_data,
    free(state);
 }
 
+static void begin_task(retro_task_t *task, const char *title) {
+   task_set_progress(task, 0);
+   task_free_title(task);
+   task_set_title(task, strdup(title));
+   task_set_finished(task, false);
+}
+
+static void finish_task(retro_task_t *task, const char *title) {
+   task_set_progress(task, 100);
+   task_free_title(task);
+   task_set_title(task, strdup(title));
+   task_set_finished(task, true);
+}
+
+static bool core_requires_content(netplay_crc_handle_t *state) {
+   return string_is_not_equal(state->content_path, "N/A");
+}
+
+/**
+ * Given a path to a content file, return the base name without the
+ * path or the file extension.
+ *
+ * e.g. /home/user/foo.rom => foo
+ */
+static void get_entry(char *entry, int len, const char *path) {
+   const char *buf = path_basename(path);
+   entry[0]    = '\0';
+
+   strlcpy(entry, buf, len);
+   path_remove_extension(entry);
+}
+
+/**
+ * Execute a search for compatible content for netplay.
+ * We prioritize a CRC match, if we have a CRC to match against.
+ * If we don't have a CRC, or if there's no CRC match found, fall
+ * back to a filename match and hope for the best.
+ */
 static void task_netplay_crc_scan_handler(retro_task_t *task)
 {
    size_t i, j;
+   char entry[PATH_MAX_LENGTH];
+   char *filename_match        = NULL;
+   bool have_crc               = false;
    netplay_crc_handle_t *state = (netplay_crc_handle_t*)task->state;
 
-   task_set_progress(task, 0);
-   task_free_title(task);
-   task_set_title(task, strdup("Looking for compatible content..."));
-   task_set_finished(task, false);
+   begin_task(task, "Looking for compatible content...");
 
+   /* start by checking cases that don't require a search */
+
+   /* the core doesn't have any content to match, so fast-succeed */
+   if(!core_requires_content(state)) {
+      state->found = true;
+      state->contentless = true;
+      task_set_data(task, state);
+      finish_task(task, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND));
+      return;
+   }
+
+   /* if this list is null, it means that RA failed to open the playlist directory */
    if (!state->lpl_list)
    {
-      task_set_progress(task, 100);
-      task_free_title(task);
-      task_set_title(task, strdup("Playlist directory not found"));
-      task_set_finished(task, true);
+      finish_task(task, "Playlist directory not found");
       free(state);
       return;
    }
 
-   if (state->lpl_list->size == 0 &&
-      string_is_not_equal(state->content_path, "N/A"))
-      goto no_playlists;
-
-   /* Core requires content */
-   if (string_is_not_equal(state->content_path, "N/A"))
-   {
-      /* CRC matching */
-      if (!string_is_equal(state->content_crc, "00000000|crc"))
-      {
-         char current[PATH_MAX_LENGTH];
-         RARCH_LOG("[lobby] testing CRC matching for: %s\n", state->content_crc);
-
-         snprintf(current, sizeof(current), "%X|crc", content_get_crc());
-         RARCH_LOG("[lobby] current content crc: %s\n", current);
-         if (string_is_equal(current, state->content_crc))
-         {
-            RARCH_LOG("[lobby] CRC match %s with currently loaded content\n", current);
-            strlcpy(state->content_path, "N/A", sizeof(state->content_path));
-            state->found = true;
-            state->current = true;
-            task_set_data(task, state);
-            task_set_progress(task, 100);
-            task_free_title(task);
-            task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)));
-            task_set_finished(task, true);
-            string_list_free(state->lpl_list);
-            return;
-         }
-         for (i = 0; i < state->lpl_list->size; i++)
-         {
-            playlist_t *playlist = NULL;
-            unsigned playlist_size = 0;
-            const char *lpl_path = state->lpl_list->elems[i].data;
-
-            if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION)))
-               continue;
-
-            playlist      = playlist_init(lpl_path, 99999);
-            playlist_size = playlist_get_size(playlist);
-
-            for (j = 0; j < playlist_size; j++)
-            {
-               const char *playlist_crc32    = NULL;
-               const char *playlist_path     = NULL;
-               playlist_get_index(playlist,
-                     j, &playlist_path, NULL, NULL, NULL, NULL, &playlist_crc32);
-
-               if (string_is_equal(playlist_crc32, state->content_crc))
-               {
-                  RARCH_LOG("[lobby] CRC match %s\n", playlist_crc32);
-                  strlcpy(state->content_path, playlist_path, sizeof(state->content_path));
-                  state->found = true;
-                  task_set_data(task, state);
-                  task_set_progress(task, 100);
-                  task_free_title(task);
-                  task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)));
-                  task_set_finished(task, true);
-                  string_list_free(state->lpl_list);
-                  free(playlist);
-                  return;
-               }
-
-               task_set_progress(task, (int)(j / playlist_size * 100.0));
-            }
-
-            free(playlist);
-         }
-         /* CRC matching failed, goto filename matching */
-         if (!state->found)
-         {
-            RARCH_LOG("[lobby] CRC matching for: %s failed\n", state->content_crc);
-            goto filename_matching;
-         }
-      }
-      /* filename matching*/
-      else
-      {
-filename_matching:
-         RARCH_LOG("[lobby] testing filename matching for: %s\n", state->content_path);
-         for (i = 0; i < state->lpl_list->size; i++)
-         {
-            playlist_t *playlist = NULL;
-            unsigned playlist_size = 0;
-            const char *lpl_path = state->lpl_list->elems[i].data;
-
-            if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION)))
-               continue;
-
-            playlist      = playlist_init(lpl_path, 99999);
-            playlist_size = playlist_get_size(playlist);
-
-            for (j = 0; j < playlist_size; j++)
-            {
-               char entry[PATH_MAX_LENGTH];
-               const char *playlist_path     = NULL;
-               const char *buf               = NULL;
-
-               playlist_get_index(playlist,
-                     j, &playlist_path, NULL, NULL, NULL, NULL, NULL);
-
-               buf         = path_basename(playlist_path);
-               entry[0]    = '\0';
-
-               strlcpy(entry, buf, sizeof(entry));
-
-               path_remove_extension(entry);
-
-               if ( !string_is_empty(entry) &&
-                     string_is_equal(entry, state->content_path) &&
-                     strstr(state->core_extensions, path_get_extension(playlist_path)))
-               {
-                  RARCH_LOG("[lobby] filename match %s\n", playlist_path);
-
-                  strlcpy(state->content_path, playlist_path, sizeof(state->content_path));
-                  state->found = true;
-                  task_set_data(task, state);
-                  task_set_progress(task, 100);
-                  task_free_title(task);
-                  task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)));
-                  task_set_finished(task, true);
-                  string_list_free(state->lpl_list);
-                  free(playlist);
-                  return;
-               }
-
-               task_set_progress(task, (int)(j / playlist_size * 100.0));
-            }
-            free(playlist);
-         }
-
-         /* filename matching failed */
-         if (!state->found)
-            RARCH_LOG("[lobby] filename matching for: %s failed\n", state->content_path);
-      }
-   }
-   /* Lobby reports core doesn't need content */
-   else
-   {
-      state->found = true;
-      state->contentless = true;
-      task_set_data(task, state);
-      task_set_progress(task, 100);
-      task_free_title(task);
-      task_set_title(task, strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND)));
-      task_set_finished(task, true);
+   /* We opened the playlist directory, but there's nothing there. Nothing to do. */
+   if(state->lpl_list->size == 0 && core_requires_content(state)) {
+      string_list_free(state->lpl_list);
+      finish_task(task, "There are no playlists available; cannot execute search");
+      command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);
+      free(state);
       return;
    }
 
-no_playlists:
+   have_crc = !string_is_equal(state->content_crc, "00000000|crc");
+
+   /* if content is already loaded and the lobby gave us a CRC, check the loaded content first */
+   if(have_crc && content_get_crc() > 0)
+   {
+      char current[PATH_MAX_LENGTH];
+
+      RARCH_LOG("[lobby] testing CRC matching for: %s\n", state->content_crc);
+
+      snprintf(current, sizeof(current), "%X|crc", content_get_crc());
+      RARCH_LOG("[lobby] current content crc: %s\n", current);
+
+      if (string_is_equal(current, state->content_crc))
+	  {
+         RARCH_LOG("[lobby] CRC match %s with currently loaded content\n", current);
+         strlcpy(state->content_path, "N/A", sizeof(state->content_path));
+         state->found = true;
+         state->current = true;
+         task_set_data(task, state);
+         finish_task(task, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND));
+         string_list_free(state->lpl_list);
+         return;
+      }
+   }
+
+   /* now let's do the search */
+   for(i = 0; i < state->lpl_list->size; i++)
+   {
+      playlist_t *playlist   = NULL;
+      unsigned playlist_size = 0;
+      const char *lpl_path   = state->lpl_list->elems[i].data;
+
+      /* skip files without .lpl file extension */
+      if (!strstr(lpl_path, file_path_str(FILE_PATH_LPL_EXTENSION)))
+         continue;
+
+      RARCH_LOG("Searching playlist: %s\n", lpl_path);
+      playlist      = playlist_init(lpl_path, 99999);
+      playlist_size = playlist_get_size(playlist);
+
+      for(j = 0; j < playlist_size; j++)
+	  {
+         const char *playlist_crc32    = NULL;
+         const char *playlist_path     = NULL;
+
+         playlist_get_index(playlist, j, &playlist_path, NULL, NULL, NULL, NULL, &playlist_crc32);
+
+         if(have_crc && string_is_equal(playlist_crc32, state->content_crc))
+		 {
+            RARCH_LOG("[lobby] CRC match %s\n", playlist_crc32);
+            strlcpy(state->content_path, playlist_path, sizeof(state->content_path));
+            state->found = true;
+            task_set_data(task, state);
+            finish_task(task, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND));
+            string_list_free(state->lpl_list);
+            free(playlist);
+            return;
+         }
+
+         get_entry(entry, sizeof(entry), playlist_path);
+
+         /* See if the filename is a match. The response depends on whether or not we are doing a CRC
+          * search.
+          *
+          * If we are doing a CRC search, we stow a copy of the filename match in filename_match, which
+          * we'll use as our match if the CRC search is exhausted without a match.
+          *
+          * Otherwise, on match we complete the task and mark it as successful immediately.
+          */
+         if(string_is_empty(filename_match) &&
+            !string_is_empty(entry) &&
+            string_is_equal(entry, state->content_path) &&
+            strstr(state->core_extensions, path_get_extension(playlist_path)))
+		 {
+            if(have_crc)
+               filename_match = strdup(playlist_path);
+            else
+			{
+               RARCH_LOG("[lobby] filename match %s\n", playlist_path);
+
+               strlcpy(state->content_path, playlist_path, sizeof(state->content_path));
+               state->found = true;
+               task_set_data(task, state);
+               finish_task(task, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND));
+               string_list_free(state->lpl_list);
+               free(playlist);
+               return;
+            }
+         }
+         task_set_progress(task, (int)(j / playlist_size * 100.0));
+      }
+
+      free(playlist);
+   }
+
+   if(filename_match != NULL)
+   {
+      RARCH_LOG("[lobby] CRC match failed; falling back to filename match %s\n", filename_match);
+
+      strlcpy(state->content_path, filename_match, sizeof(state->content_path));
+      state->found = true;
+      task_set_data(task, state);
+      finish_task(task, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND));
+      string_list_free(state->lpl_list);
+      free(filename_match);
+      return;
+   }
+
+   /* end of the line. no matches at all. */
    string_list_free(state->lpl_list);
-   task_set_progress(task, 100);
-   task_free_title(task);
-   task_set_title(task, strdup("Content not found, try manual load or disconnect from host"));
-   task_set_finished(task, true);
+   finish_task(task, "Failed to locate matching content by either CRC or filename.");
    command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);
    free(state);
-   return;
 }
 
 bool task_push_netplay_crc_scan(uint32_t crc, char* name,
diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h
index a291b769b3..be2aee7595 100644
--- a/ui/drivers/cocoa/cocoa_common.h
+++ b/ui/drivers/cocoa/cocoa_common.h
@@ -14,8 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __COCOA_COMMON_H
-#define __COCOA_COMMON_H
+#ifndef __COCOA_COMMON_METAL_H
+#define __COCOA_COMMON_METAL_H
 
 #include <Foundation/Foundation.h>
 
@@ -28,46 +28,6 @@
 #include <CoreLocation/CoreLocation.h>
 #endif
 
-typedef enum apple_view_type {
-   APPLE_VIEW_TYPE_NONE,
-   APPLE_VIEW_TYPE_OPENGL_ES,
-   APPLE_VIEW_TYPE_OPENGL,
-   APPLE_VIEW_TYPE_VULKAN,
-   APPLE_VIEW_TYPE_METAL,
-} apple_view_type_t;
-
-#ifdef HAVE_METAL
-#import <MetalKit/MetalKit.h>
-
-@interface MetalView : MTKView
-@end
-
-#endif
-
-@protocol ApplePlatform
-
-/*! @brief renderView returns the current render view based on the viewType */
-@property (readonly) id renderView;
-
-/*! @brief isActive returns true if the application has focus */
-@property (readonly) bool hasFocus;
-
-@property (readwrite) apple_view_type_t viewType;
-
-/*! @brief setVideoMode adjusts the video display to the specified mode */
-- (void)setVideoMode:(gfx_ctx_mode_t)mode;
-
-/*! @brief setCursorVisible specifies whether the cursor is visible */
-- (void)setCursorVisible:(bool)v;
-
-/*! @brief controls whether the screen saver should be disabled and
- * the displays should not sleep.
- */
-- (bool)setDisableDisplaySleep:(bool)disable;
-@end
-
-extern id<ApplePlatform> apple_platform;
-
 #if defined(HAVE_COCOATOUCH)
 #include <UIKit/UIKit.h>
 
@@ -106,7 +66,7 @@ AVCaptureAudioDataOutputSampleBufferDelegate>
 @end
 
 @interface RetroArch_iOS : UINavigationController<UIApplicationDelegate,
-UINavigationControllerDelegate, ApplePlatform>
+UINavigationControllerDelegate>
 
 @property (nonatomic) UIWindow* window;
 @property (nonatomic) NSString* documentsDirectory;
@@ -148,15 +108,4 @@ void get_ios_version(int *major, int *minor);
 #define BOXUINT(x)   [NSNumber numberWithUnsignedInt:x]
 #define BOXFLOAT(x)  [NSNumber numberWithDouble:x]
 
-#if __has_feature(objc_arc)
-#define RELEASE(x)   x = nil
-#define BRIDGE       __bridge
-#define UNSAFE_UNRETAINED __unsafe_unretained
-#else
-#define RELEASE(x)   [x release]; \
-   x = nil
-#define BRIDGE
-#define UNSAFE_UNRETAINED
-#endif
-
 #endif
diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
index 09163291c8..b356ffed58 100644
--- a/ui/drivers/cocoa/cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -43,32 +43,12 @@
 #include "../../../location/location_driver.h"
 #include "../../../camera/camera_driver.h"
 
-#ifdef HAVE_METAL
-@implementation MetalView
-
-- (void)keyDown:(NSEvent*)theEvent
-{
-}
-
-/* Stop the annoying sound when pressing a key. */
-- (BOOL)acceptsFirstResponder
-{
-   return YES;
-}
-
-- (BOOL)isFlipped
-{
-   return YES;
-}
-@end
-#endif
-
 static CocoaView* g_instance;
 
 #if defined(HAVE_COCOA)
 void *nsview_get_ptr(void)
 {
-    return (BRIDGE void *)g_instance;
+    return g_instance;
 }
 #endif
 
@@ -85,7 +65,6 @@ void *glkitview_init(void);
     cocoa_input_data_t *apple = (cocoa_input_data_t*)input_driver_get_data();
     (void)apple;
 }
-
 #endif
 
 + (CocoaView*)get
@@ -102,6 +81,9 @@ void *glkitview_init(void);
    
 #if defined(HAVE_COCOA)
    [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+   ui_window_cocoa_t cocoa_view;
+   cocoa_view.data = (CocoaView*)self;
+   
    [self registerForDraggedTypes:[NSArray arrayWithObjects:NSColorPboardType, NSFilenamesPboardType, nil]];
 #elif defined(HAVE_COCOATOUCH)
    self.view = (__bridge GLKView*)glkitview_init();
@@ -113,13 +95,10 @@ void *glkitview_init(void);
 }
 
 #if defined(HAVE_COCOA)
-- (BOOL)layer:(CALayer *)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow *)window {
-   return YES;
-}
-
 - (void)setFrame:(NSRect)frameRect
 {
    [super setFrame:frameRect];
+
    cocoagl_gfx_ctx_update();
 }
 
@@ -191,7 +170,7 @@ void *glkitview_init(void);
 {
    float width = 0.0f, height = 0.0f, tenpctw, tenpcth;
    RAScreen *screen  = (__bridge RAScreen*)get_chosen_screen();
-   UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+   UIInterfaceOrientation orientation = self.interfaceOrientation;
    CGRect screenSize = [screen bounds];
    SEL selector = NSSelectorFromString(BOXSTRING("coordinateSpace"));
     
@@ -212,40 +191,8 @@ void *glkitview_init(void);
    
    g_pause_indicator_view.frame = CGRectMake(tenpctw * 4.0f, 0.0f, tenpctw * 2.0f, tenpcth);
    [g_pause_indicator_view viewWithTag:1].frame = CGRectMake(0, 0, tenpctw * 2.0f, tenpcth);
-    
-    [self adjustViewFrameForSafeArea];
 }
 
--(void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
-    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
-    if (@available(iOS 11, *)) {
-        [coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
-            [self adjustViewFrameForSafeArea];
-        } completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
-        }];
-    }
-}
-
--(void)adjustViewFrameForSafeArea {
-    // This is for adjusting the view frame to account for the notch in iPhone X phones
-    if (@available(iOS 11, *)) {
-        RAScreen *screen  = (__bridge RAScreen*)get_chosen_screen();
-        CGRect screenSize = [screen bounds];
-        UIEdgeInsets inset = [[UIApplication sharedApplication] delegate].window.safeAreaInsets;
-        UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
-        CGRect newFrame = screenSize;
-        if ( orientation == UIInterfaceOrientationPortrait ) {
-            newFrame = CGRectMake(screenSize.origin.x, screenSize.origin.y + inset.top, screenSize.size.width, screenSize.size.height - inset.top);
-        } else if ( orientation == UIInterfaceOrientationLandscapeLeft ) {
-            newFrame = CGRectMake(screenSize.origin.x, screenSize.origin.y, screenSize.size.width - inset.right, screenSize.size.height);
-        } else if ( orientation == UIInterfaceOrientationLandscapeRight ) {
-            newFrame = CGRectMake(screenSize.origin.x + inset.left, screenSize.origin.y, screenSize.size.width - inset.left, screenSize.size.height);
-        }
-        self.view.frame = newFrame;
-    }
-}
-
-
 #define ALMOST_INVISIBLE (.021f)
 
 - (void)hidePauseButton
diff --git a/ui/drivers/cocoa/cocoa_common_metal.h b/ui/drivers/cocoa/cocoa_common_metal.h
new file mode 100644
index 0000000000..1be147c5b2
--- /dev/null
+++ b/ui/drivers/cocoa/cocoa_common_metal.h
@@ -0,0 +1,162 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2013-2014 - Jason Fetters
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __COCOA_COMMON_METAL_H
+#define __COCOA_COMMON_METAL_H
+
+#include <Foundation/Foundation.h>
+
+#ifdef HAVE_MENU
+#include "../../menu/menu_setting.h"
+#include "../../menu/menu_driver.h"
+#endif
+
+#ifdef HAVE_CORELOCATION
+#include <CoreLocation/CoreLocation.h>
+#endif
+
+typedef enum apple_view_type {
+   APPLE_VIEW_TYPE_NONE,
+   APPLE_VIEW_TYPE_OPENGL_ES,
+   APPLE_VIEW_TYPE_OPENGL,
+   APPLE_VIEW_TYPE_VULKAN,
+   APPLE_VIEW_TYPE_METAL,
+} apple_view_type_t;
+
+#ifdef HAVE_METAL
+#import <MetalKit/MetalKit.h>
+
+@interface MetalView : MTKView
+@end
+
+#endif
+
+@protocol ApplePlatform
+
+/*! @brief renderView returns the current render view based on the viewType */
+@property (readonly) id renderView;
+
+/*! @brief isActive returns true if the application has focus */
+@property (readonly) bool hasFocus;
+
+@property (readwrite) apple_view_type_t viewType;
+
+/*! @brief setVideoMode adjusts the video display to the specified mode */
+- (void)setVideoMode:(gfx_ctx_mode_t)mode;
+
+/*! @brief setCursorVisible specifies whether the cursor is visible */
+- (void)setCursorVisible:(bool)v;
+
+/*! @brief controls whether the screen saver should be disabled and
+ * the displays should not sleep.
+ */
+- (bool)setDisableDisplaySleep:(bool)disable;
+@end
+
+extern id<ApplePlatform> apple_platform;
+
+#if defined(HAVE_COCOATOUCH)
+#include <UIKit/UIKit.h>
+
+#ifdef HAVE_AVFOUNDATION
+#import <AVFoundation/AVCaptureOutput.h>
+#endif
+
+
+/*********************************************/
+/* RAMenuBase                                */
+/* A menu class that displays RAMenuItemBase */
+/* objects.                                  */
+/*********************************************/
+@interface RAMenuBase : UITableViewController
+@property (nonatomic) NSMutableArray* sections;
+@property (nonatomic) BOOL hidesHeaders;
+@property (nonatomic) RAMenuBase* last_menu;
+@property (nonatomic) UILabel *osdmessage;
+
+- (id)initWithStyle:(UITableViewStyle)style;
+- (id)itemForIndexPath:(NSIndexPath*)indexPath;
+
+@end
+
+typedef struct
+{
+   char orientations[32];
+   unsigned orientation_flags;
+   char bluetooth_mode[64];
+} apple_frontend_settings_t;
+extern apple_frontend_settings_t apple_frontend_settings;
+
+@interface CocoaView : UIViewController<CLLocationManagerDelegate,
+AVCaptureAudioDataOutputSampleBufferDelegate>
++ (CocoaView*)get;
+@end
+
+@interface RetroArch_iOS : UINavigationController<UIApplicationDelegate,
+UINavigationControllerDelegate, ApplePlatform>
+
+@property (nonatomic) UIWindow* window;
+@property (nonatomic) NSString* documentsDirectory;
+@property (nonatomic) RAMenuBase* mainmenu;
+@property (nonatomic) int menu_count;
+
++ (RetroArch_iOS*)get;
+
+- (void)showGameView;
+- (void)toggleUI;
+- (void)supportOtherAudioSessions;
+
+- (void)refreshSystemConfig;
+- (void)mainMenuPushPop: (bool)pushp;
+- (void)mainMenuRefresh;
+@end
+
+void get_ios_version(int *major, int *minor);
+
+#elif defined(HAVE_COCOA_METAL)
+#include <AppKit/AppKit.h>
+
+@interface CocoaView : NSView
+#ifdef HAVE_CORELOCATION
+<CLLocationManagerDelegate>
+#endif
+
++ (CocoaView*)get;
+#if !defined(HAVE_COCOA_METAL)
+- (void)display;
+#endif
+
+@end
+
+#endif
+
+#define BOXSTRING(x) [NSString stringWithUTF8String:x]
+#define BOXINT(x)    [NSNumber numberWithInt:x]
+#define BOXUINT(x)   [NSNumber numberWithUnsignedInt:x]
+#define BOXFLOAT(x)  [NSNumber numberWithDouble:x]
+
+#if __has_feature(objc_arc)
+#define RELEASE(x)   x = nil
+#define BRIDGE       __bridge
+#define UNSAFE_UNRETAINED __unsafe_unretained
+#else
+#define RELEASE(x)   [x release]; \
+   x = nil
+#define BRIDGE
+#define UNSAFE_UNRETAINED
+#endif
+
+#endif
diff --git a/ui/drivers/cocoa/cocoa_common_metal.m b/ui/drivers/cocoa/cocoa_common_metal.m
new file mode 100644
index 0000000000..f5ddaceb08
--- /dev/null
+++ b/ui/drivers/cocoa/cocoa_common_metal.m
@@ -0,0 +1,692 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2013-2014 - Jason Fetters
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ * 
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#import <AvailabilityMacros.h>
+#include <sys/stat.h>
+#include "cocoa_common_metal.h"
+#ifdef HAVE_COCOA_METAL
+#include "../ui_cocoa_metal.h"
+#endif
+
+#include <retro_assert.h>
+
+#include "../../../verbosity.h"
+
+/* Define compatibility symbols and categories. */
+
+#ifdef HAVE_AVFOUNDATION
+#include <AVFoundation/AVCaptureSession.h>
+#include <AVFoundation/AVCaptureDevice.h>
+#include <AVFoundation/AVCaptureOutput.h>
+#include <AVFoundation/AVCaptureInput.h>
+#include <AVFoundation/AVMediaFormat.h>
+#ifdef HAVE_OPENGLES
+#include <CoreVideo/CVOpenGLESTextureCache.h>
+#else
+#include <CoreVideo/CVOpenGLTexture.h>
+#endif
+#endif
+
+#include "../../../location/location_driver.h"
+#include "../../../camera/camera_driver.h"
+
+@implementation MetalView
+
+- (void)keyDown:(NSEvent*)theEvent
+{
+}
+
+/* Stop the annoying sound when pressing a key. */
+- (BOOL)acceptsFirstResponder
+{
+   return YES;
+}
+
+- (BOOL)isFlipped
+{
+   return YES;
+}
+@end
+
+static CocoaView* g_instance;
+
+#if defined(HAVE_COCOA_METAL)
+void *nsview_get_ptr(void)
+{
+    return (BRIDGE void *)g_instance;
+}
+#endif
+
+/* forward declarations */
+void cocoagl_gfx_ctx_update(void);
+void *glkitview_init(void);
+
+@implementation CocoaView
+
+#if defined(HAVE_COCOA_METAL)
+#include "../../../input/drivers/cocoa_input.h"
+
+- (void)scrollWheel:(NSEvent *)theEvent {
+    cocoa_input_data_t *apple = (cocoa_input_data_t*)input_driver_get_data();
+    (void)apple;
+}
+
+#endif
+
++ (CocoaView*)get
+{
+   if (!g_instance)
+      g_instance = [CocoaView new];
+   
+   return g_instance;
+}
+
+- (id)init
+{
+   self = [super init];
+   
+#if defined(HAVE_COCOA_METAL)
+   [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
+   [self registerForDraggedTypes:@[NSColorPboardType, NSFilenamesPboardType]];
+#elif defined(HAVE_COCOATOUCH)
+   self.view = (__bridge GLKView*)glkitview_init();
+   
+   [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(showPauseIndicator) name:UIApplicationWillEnterForegroundNotification object:nil];
+#endif
+   
+   return self;
+}
+
+#if defined(HAVE_COCOA_METAL)
+- (BOOL)layer:(CALayer *)layer shouldInheritContentsScale:(CGFloat)newScale fromWindow:(NSWindow *)window {
+   return YES;
+}
+
+- (void)setFrame:(NSRect)frameRect
+{
+   [super setFrame:frameRect];
+   cocoagl_gfx_ctx_update();
+}
+
+/* Stop the annoying sound when pressing a key. */
+- (BOOL)acceptsFirstResponder
+{
+   return YES;
+}
+
+- (BOOL)isFlipped
+{
+   return YES;
+}
+
+- (void)keyDown:(NSEvent*)theEvent
+{
+}
+
+- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender
+{
+    NSDragOperation sourceDragMask = [sender draggingSourceOperationMask];
+    NSPasteboard *pboard = [sender draggingPasteboard];
+    
+    if ( [[pboard types] containsObject:NSFilenamesPboardType] )
+    {
+        if (sourceDragMask & NSDragOperationCopy)
+            return NSDragOperationCopy;
+    }
+    
+    return NSDragOperationNone;
+}
+
+- (BOOL)performDragOperation:(id<NSDraggingInfo>)sender
+{
+    NSPasteboard *pboard = [sender draggingPasteboard];
+    
+    if ( [[pboard types] containsObject:NSURLPboardType])
+    {
+        NSURL *fileURL = [NSURL URLFromPasteboard:pboard];
+        NSString *s = [fileURL path];
+        if (s != nil)
+        {
+           RARCH_LOG("Drop name is: %s\n", [s UTF8String]);
+        }
+    }
+    return YES;
+}
+
+- (void)draggingExited:(id <NSDraggingInfo>)sender
+{
+    [self setNeedsDisplay: YES];
+}
+
+#elif defined(HAVE_COCOATOUCH)
+- (void)viewDidAppear:(BOOL)animated
+{
+   /* Pause Menus. */
+   [self showPauseIndicator];
+}
+
+- (void)showPauseIndicator
+{
+   g_pause_indicator_view.alpha = 1.0f;
+   [NSObject cancelPreviousPerformRequestsWithTarget:g_instance];
+   [g_instance performSelector:@selector(hidePauseButton) withObject:g_instance afterDelay:3.0f];
+}
+
+- (void)viewWillLayoutSubviews
+{
+   float width = 0.0f, height = 0.0f, tenpctw, tenpcth;
+   RAScreen *screen  = (__bridge RAScreen*)get_chosen_screen();
+   UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+   CGRect screenSize = [screen bounds];
+   SEL selector = NSSelectorFromString(BOXSTRING("coordinateSpace"));
+    
+    if ([screen respondsToSelector:selector])
+    {
+        screenSize  = [[screen coordinateSpace] bounds];
+        width       = CGRectGetWidth(screenSize);
+        height      = CGRectGetHeight(screenSize);
+    }
+    else
+    {
+        width       = ((int)orientation < 3) ? CGRectGetWidth(screenSize) : CGRectGetHeight(screenSize);
+        height      = ((int)orientation < 3) ? CGRectGetHeight(screenSize) : CGRectGetWidth(screenSize);
+    }
+   
+   tenpctw          = width  / 10.0f;
+   tenpcth          = height / 10.0f;
+   
+   g_pause_indicator_view.frame = CGRectMake(tenpctw * 4.0f, 0.0f, tenpctw * 2.0f, tenpcth);
+   [g_pause_indicator_view viewWithTag:1].frame = CGRectMake(0, 0, tenpctw * 2.0f, tenpcth);
+    
+    [self adjustViewFrameForSafeArea];
+}
+
+-(void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+    if (@available(iOS 11, *)) {
+        [coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+            [self adjustViewFrameForSafeArea];
+        } completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+        }];
+    }
+}
+
+-(void)adjustViewFrameForSafeArea {
+    // This is for adjusting the view frame to account for the notch in iPhone X phones
+    if (@available(iOS 11, *)) {
+        RAScreen *screen  = (__bridge RAScreen*)get_chosen_screen();
+        CGRect screenSize = [screen bounds];
+        UIEdgeInsets inset = [[UIApplication sharedApplication] delegate].window.safeAreaInsets;
+        UIInterfaceOrientation orientation = [[UIApplication sharedApplication] statusBarOrientation];
+        CGRect newFrame = screenSize;
+        if ( orientation == UIInterfaceOrientationPortrait ) {
+            newFrame = CGRectMake(screenSize.origin.x, screenSize.origin.y + inset.top, screenSize.size.width, screenSize.size.height - inset.top);
+        } else if ( orientation == UIInterfaceOrientationLandscapeLeft ) {
+            newFrame = CGRectMake(screenSize.origin.x, screenSize.origin.y, screenSize.size.width - inset.right, screenSize.size.height);
+        } else if ( orientation == UIInterfaceOrientationLandscapeRight ) {
+            newFrame = CGRectMake(screenSize.origin.x + inset.left, screenSize.origin.y, screenSize.size.width - inset.left, screenSize.size.height);
+        }
+        self.view.frame = newFrame;
+    }
+}
+
+
+#define ALMOST_INVISIBLE (.021f)
+
+- (void)hidePauseButton
+{
+   [UIView animateWithDuration:0.2
+      animations:^{ g_pause_indicator_view.alpha = ALMOST_INVISIBLE; }
+      completion:^(BOOL finished) { }
+   ];
+}
+
+/* NOTE: This version runs on iOS6+. */
+- (NSUInteger)supportedInterfaceOrientations
+{
+   return (NSUInteger)apple_frontend_settings.orientation_flags;
+}
+
+/* NOTE: This version runs on iOS2-iOS5, but not iOS6+. */
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+   switch (interfaceOrientation)
+   {
+      case UIInterfaceOrientationPortrait:
+         return (apple_frontend_settings.orientation_flags & UIInterfaceOrientationMaskPortrait);
+      case UIInterfaceOrientationPortraitUpsideDown:
+         return (apple_frontend_settings.orientation_flags & UIInterfaceOrientationMaskPortraitUpsideDown);
+      case UIInterfaceOrientationLandscapeLeft:
+         return (apple_frontend_settings.orientation_flags & UIInterfaceOrientationMaskLandscapeLeft);
+      case UIInterfaceOrientationLandscapeRight:
+         return (apple_frontend_settings.orientation_flags & UIInterfaceOrientationMaskLandscapeRight);
+
+      default:
+         return (apple_frontend_settings.orientation_flags & UIInterfaceOrientationMaskAll);
+   }
+   
+   return YES;
+}
+#endif
+
+#ifdef HAVE_AVFOUNDATION
+#include "../../gfx/common/gl_common.h"
+
+#ifndef GL_BGRA
+#define GL_BGRA 0x80E1
+#endif
+
+#ifdef HAVE_OPENGLES
+#define RCVOpenGLTextureCacheCreateTextureFromImage CVOpenGLESTextureCacheCreateTextureFromImage
+#define RCVOpenGLTextureGetName CVOpenGLESTextureGetName
+#define RCVOpenGLTextureCacheFlush CVOpenGLESTextureCacheFlush
+#define RCVOpenGLTextureCacheCreate CVOpenGLESTextureCacheCreate
+#define RCVOpenGLTextureRef CVOpenGLESTextureRef
+#define RCVOpenGLTextureCacheRef CVOpenGLESTextureCacheRef
+#if COREVIDEO_USE_EAGLCONTEXT_CLASS_IN_API
+#define RCVOpenGLGetCurrentContext() (CVEAGLContext)(g_context)
+#else
+#define RCVOpenGLGetCurrentContext() (__bridge void *)(g_context)
+#endif
+#else
+#define RCVOpenGLTextureCacheCreateTextureFromImage CVOpenGLTextureCacheCreateTextureFromImage
+#define RCVOpenGLTextureGetName CVOpenGLTextureGetName
+#define RCVOpenGLTextureCacheFlush CVOpenGLTextureCacheFlush
+#define RCVOpenGLTextureCacheCreate CVOpenGLTextureCacheCreate
+#define RCVOpenGLTextureRef CVOpenGLTextureRef
+#define RCVOpenGLTextureCacheRef CVOpenGLTextureCacheRef
+#define RCVOpenGLGetCurrentContext() CGLGetCurrentContext(), CGLGetPixelFormat(CGLGetCurrentContext())
+#endif
+
+static AVCaptureSession *_session;
+static NSString *_sessionPreset;
+RCVOpenGLTextureCacheRef textureCache;
+GLuint outputTexture;
+static bool newFrame = false;
+
+static void event_process_camera_frame(void *pbuf_ptr)
+{
+    CVReturn ret;
+    RCVOpenGLTextureRef renderTexture;
+    CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)pbuf_ptr;
+    size_t width                 = CVPixelBufferGetWidth(pixelBuffer);
+    size_t height                = CVPixelBufferGetHeight(pixelBuffer);
+    
+    CVPixelBufferLockBaseAddress(pixelBuffer, 0);
+    
+    (void)width;
+    (void)height;
+    
+    /*TODO - rewrite all this.
+     *
+     * create a texture from our render target.
+     * textureCache will be what you previously 
+     * made with RCVOpenGLTextureCacheCreate.
+     */
+#ifdef HAVE_OPENGLES
+    ret = RCVOpenGLTextureCacheCreateTextureFromImage(kCFAllocatorDefault,
+                                                      textureCache, pixelBuffer, NULL, GL_TEXTURE_2D,
+                                                      GL_RGBA, (GLsizei)width, (GLsizei)height,
+                                                      GL_BGRA, GL_UNSIGNED_BYTE, 0, &renderTexture);
+#else
+    ret = RCVOpenGLTextureCacheCreateTextureFromImage(kCFAllocatorDefault,
+                                                      textureCache, pixelBuffer, 0, &renderTexture);
+#endif
+
+    if (!renderTexture || ret)
+    {
+        RARCH_ERR("[apple_camera]: RCVOpenGLTextureCacheCreateTextureFromImage failed.\n");
+        return;
+    }
+    
+    outputTexture = RCVOpenGLTextureGetName(renderTexture);
+
+    gl_bind_texture(outputTexture, GL_CLAMP_TO_EDGE, GL_LINEAR, GL_LINEAR);
+    
+    CVPixelBufferUnlockBaseAddress(pixelBuffer, 0);
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"NewCameraTextureReady" object:nil];
+    newFrame = true;
+    
+    glBindTexture(GL_TEXTURE_2D, 0);
+    
+    RCVOpenGLTextureCacheFlush(textureCache, 0);
+
+    CFRelease(renderTexture);
+    CFRelease(pixelBuffer);
+
+    pixelBuffer = 0;
+}
+
+- (void)captureOutput:(AVCaptureOutput *)captureOutput
+didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
+       fromConnection:(AVCaptureConnection *)connection
+{
+    /* TODO: Don't post if event queue is full */
+    CVPixelBufferRef pixelBuffer = (CVPixelBufferRef)CVPixelBufferRetain(CMSampleBufferGetImageBuffer(sampleBuffer));
+    event_process_camera_frame(pixelBuffer);
+}
+
+/* TODO - add void param to onCameraInit so we can pass g_context. */
+- (void) onCameraInit
+{
+    NSError *error;
+    AVCaptureVideoDataOutput * dataOutput;
+    AVCaptureDeviceInput *input;
+    AVCaptureDevice *videoDevice;
+
+    CVReturn ret = RCVOpenGLTextureCacheCreate(kCFAllocatorDefault, NULL,
+    RCVOpenGLGetCurrentContext(), NULL, &textureCache);
+    (void)ret;
+    
+    /* Setup Capture Session. */
+    _session = [[AVCaptureSession alloc] init];
+    [_session beginConfiguration];
+    
+    /* TODO: dehardcode this based on device capabilities */
+    _sessionPreset = AVCaptureSessionPreset640x480;
+    
+    /* Set preset session size. */
+    [_session setSessionPreset:_sessionPreset];
+    
+    /* Creata a video device and input from that Device.  Add the input to the capture session. */
+    videoDevice = (AVCaptureDevice*)[AVCaptureDevice defaultDeviceWithMediaType:AVMediaTypeVideo];
+    if (videoDevice == nil)
+        retro_assert(0);
+    
+    /* Add the device to the session. */
+    input = (AVCaptureDeviceInput*)[AVCaptureDeviceInput deviceInputWithDevice:videoDevice error:&error];
+    
+    if (error)
+    {
+        RARCH_ERR("video device input %s\n", error.localizedDescription.UTF8String);
+        retro_assert(0);
+    }
+    
+    [_session addInput:input];
+    
+    /* Create the output for the capture session. */
+    dataOutput = (AVCaptureVideoDataOutput*)[[AVCaptureVideoDataOutput alloc] init];
+    [dataOutput setAlwaysDiscardsLateVideoFrames:NO]; /* Probably want to set this to NO when recording. */
+    
+	[dataOutput setVideoSettings:[NSDictionary dictionaryWithObject:[NSNumber numberWithInt:kCVPixelFormatType_32BGRA] forKey:(id)kCVPixelBufferPixelFormatTypeKey]];
+    
+    /* Set dispatch to be on the main thread so OpenGL can do things with the data. */
+    [dataOutput setSampleBufferDelegate:self queue:dispatch_get_main_queue()];
+    
+    [_session addOutput:dataOutput];
+    [_session commitConfiguration];
+}
+
+- (void) onCameraStart
+{
+    [_session startRunning];
+}
+
+- (void) onCameraStop
+{
+    [_session stopRunning];
+}
+
+- (void) onCameraFree
+{
+    RCVOpenGLTextureCacheFlush(textureCache, 0);
+    CFRelease(textureCache);
+}
+#endif
+
+#ifdef HAVE_CORELOCATION
+#include <CoreLocation/CoreLocation.h>
+
+static CLLocationManager *locationManager;
+static bool locationChanged;
+static CLLocationDegrees currentLatitude;
+static CLLocationDegrees currentLongitude;
+static CLLocationAccuracy currentHorizontalAccuracy;
+static CLLocationAccuracy currentVerticalAccuracy;
+
+- (bool)onLocationHasChanged
+{
+   bool hasChanged = locationChanged;
+    
+   if (hasChanged)
+      locationChanged = false;
+    
+   return hasChanged;
+}
+
+- (void)locationManager:(CLLocationManager *)manager didUpdateToLocation:(CLLocation *)newLocation fromLocation:(CLLocation *)oldLocation
+{
+    locationChanged           = true;
+    currentLatitude           = newLocation.coordinate.latitude;
+    currentLongitude          = newLocation.coordinate.longitude;
+    currentHorizontalAccuracy = newLocation.horizontalAccuracy;
+    currentVerticalAccuracy   = newLocation.verticalAccuracy;
+    RARCH_LOG("didUpdateToLocation - latitude %f, longitude %f\n", (float)currentLatitude, (float)currentLongitude);
+}
+
+- (void)locationManager:(CLLocationManager *)manager didUpdateLocations:(NSArray *)locations
+{
+    CLLocation *location      = (CLLocation*)[locations objectAtIndex:([locations count] - 1)];
+    
+    locationChanged           = true;
+    currentLatitude           = [location coordinate].latitude;
+    currentLongitude          = [location coordinate].longitude;
+    currentHorizontalAccuracy = location.horizontalAccuracy;
+    currentVerticalAccuracy   = location.verticalAccuracy;
+    RARCH_LOG("didUpdateLocations - latitude %f, longitude %f\n", (float)currentLatitude, (float)currentLongitude);
+}
+
+- (void)locationManager:(CLLocationManager *)manager didFailWithError:(NSError *)error
+{
+   RARCH_LOG("didFailWithError - %s\n", [[error localizedDescription] UTF8String]);
+}
+
+- (void)locationManagerDidPauseLocationUpdates:(CLLocationManager *)manager
+{
+   RARCH_LOG("didPauseLocationUpdates\n");
+}
+
+- (void)locationManagerDidResumeLocationUpdates:(CLLocationManager *)manager
+{
+   RARCH_LOG("didResumeLocationUpdates\n");
+}
+
+- (void)onLocationInit
+{
+    /* Create the location manager 
+     * if this object does not already have one.
+     */
+    
+    if (locationManager == nil)
+        locationManager             = [[CLLocationManager alloc] init];
+    locationManager.delegate        = self;
+    locationManager.desiredAccuracy = kCLLocationAccuracyBest;
+    locationManager.distanceFilter  = kCLDistanceFilterNone;
+    [locationManager startUpdatingLocation];
+}
+#endif
+
+@end
+
+#ifdef HAVE_AVFOUNDATION
+typedef struct apple_camera
+{
+  void *empty;
+} applecamera_t;
+
+static void *apple_camera_init(const char *device, uint64_t caps, unsigned width, unsigned height)
+{
+   applecamera_t *applecamera;
+    
+   if ((caps & (UINT64_C(1) << RETRO_CAMERA_BUFFER_OPENGL_TEXTURE)) == 0)
+   {
+      RARCH_ERR("applecamera returns OpenGL texture.\n");
+      return NULL;
+   }
+
+   applecamera = (applecamera_t*)calloc(1, sizeof(applecamera_t));
+   if (!applecamera)
+      return NULL;
+
+   [[CocoaView get] onCameraInit];
+
+   return applecamera;
+}
+
+static void apple_camera_free(void *data)
+{
+   applecamera_t *applecamera = (applecamera_t*)data;
+    
+   [[CocoaView get] onCameraFree];
+
+   if (applecamera)
+      free(applecamera);
+   applecamera = NULL;
+}
+
+static bool apple_camera_start(void *data)
+{
+   (void)data;
+
+   [[CocoaView get] onCameraStart];
+
+   return true;
+}
+
+static void apple_camera_stop(void *data)
+{
+   [[CocoaView get] onCameraStop];
+}
+
+static bool apple_camera_poll(void *data, retro_camera_frame_raw_framebuffer_t frame_raw_cb,
+      retro_camera_frame_opengl_texture_t frame_gl_cb)
+{
+
+   (void)data;
+   (void)frame_raw_cb;
+
+   if (frame_gl_cb && newFrame)
+   {
+	   /* FIXME: Identity for now. 
+       * Use proper texture matrix as returned by iOS Camera (if at all?). */
+	   static const float affine[] = {
+		   1.0f, 0.0f, 0.0f,
+		   0.0f, 1.0f, 0.0f,
+		   0.0f, 0.0f, 1.0f
+	   };
+       
+	   frame_gl_cb(outputTexture, GL_TEXTURE_2D, affine);
+       newFrame = false;
+   }
+
+   return true;
+}
+
+camera_driver_t camera_avfoundation = {
+   apple_camera_init,
+   apple_camera_free,
+   apple_camera_start,
+   apple_camera_stop,
+   apple_camera_poll,
+   "avfoundation",
+};
+#endif
+
+#ifdef HAVE_CORELOCATION
+typedef struct apple_location
+{
+	void *empty;
+} applelocation_t;
+
+static void *apple_location_init(void)
+{
+	applelocation_t *applelocation = (applelocation_t*)calloc(1, sizeof(applelocation_t));
+	if (!applelocation)
+		return NULL;
+    
+   [[CocoaView get] onLocationInit];
+	
+	return applelocation;
+}
+
+static void apple_location_set_interval(void *data, unsigned interval_update_ms, unsigned interval_distance)
+{
+   (void)data;
+	
+   locationManager.distanceFilter = interval_distance ? interval_distance : kCLDistanceFilterNone;
+}
+
+static void apple_location_free(void *data)
+{
+	applelocation_t *applelocation = (applelocation_t*)data;
+	
+   /* TODO - free location manager? */
+	
+	if (applelocation)
+		free(applelocation);
+	applelocation = NULL;
+}
+
+static bool apple_location_start(void *data)
+{
+	(void)data;
+	
+   [locationManager startUpdatingLocation];
+	return true;
+}
+
+static void apple_location_stop(void *data)
+{
+	(void)data;
+	
+   [locationManager stopUpdatingLocation];
+}
+
+static bool apple_location_get_position(void *data, double *lat, double *lon, double *horiz_accuracy,
+      double *vert_accuracy)
+{
+	(void)data;
+
+   bool ret = [[CocoaView get] onLocationHasChanged];
+
+   if (!ret)
+      goto fail;
+	
+   *lat            = currentLatitude;
+   *lon            = currentLongitude;
+   *horiz_accuracy = currentHorizontalAccuracy;
+   *vert_accuracy  = currentVerticalAccuracy;
+   return true;
+
+fail:
+   *lat            = 0.0;
+   *lon            = 0.0;
+   *horiz_accuracy = 0.0;
+   *vert_accuracy  = 0.0;
+   return false;
+}
+
+location_driver_t location_corelocation = {
+	apple_location_init,
+	apple_location_free,
+	apple_location_start,
+	apple_location_stop,
+	apple_location_get_position,
+	apple_location_set_interval,
+	"corelocation",
+};
+#endif
+
diff --git a/ui/drivers/cocoa/ui_cocoa_application.m b/ui/drivers/cocoa/ui_cocoa_application.m
index afb6740d43..14975b3c10 100644
--- a/ui/drivers/cocoa/ui_cocoa_application.m
+++ b/ui/drivers/cocoa/ui_cocoa_application.m
@@ -23,10 +23,6 @@
 #include "cocoa_common.h"
 #include "../../ui_companion_driver.h"
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
-#define NSEventMaskAny NSAnyEventMask
-#endif
-
 static void* ui_application_cocoa_initialize(void)
 {
    return NULL;
@@ -34,7 +30,7 @@ static void* ui_application_cocoa_initialize(void)
 
 static bool ui_application_cocoa_pending_events(void)
 {
-   NSEvent *event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
+   NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
    if (!event)
       return false;
    return true;
@@ -44,17 +40,12 @@ static void ui_application_cocoa_process_events(void)
 {
     while (1)
     {
-        NSEvent *event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
+        NSEvent *event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
         if (!event)
             break;
-#if __has_feature(objc_arc)
-        [NSApp sendEvent: event];
-       
-#else
         [event retain];
         [NSApp sendEvent: event];
         [event release];
-#endif
     }
 }
 
diff --git a/ui/drivers/cocoa/ui_cocoa_application_metal.m b/ui/drivers/cocoa/ui_cocoa_application_metal.m
new file mode 100644
index 0000000000..f82b08ff8b
--- /dev/null
+++ b/ui/drivers/cocoa/ui_cocoa_application_metal.m
@@ -0,0 +1,62 @@
+/* RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <boolean.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <objc/objc-runtime.h>
+#include "cocoa_common_metal.h"
+#include "../../ui_companion_driver.h"
+
+static void* ui_application_cocoa_initialize(void)
+{
+   return NULL;
+}
+
+static bool ui_application_cocoa_pending_events(void)
+{
+   NSEvent *event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
+   if (!event)
+      return false;
+   return true;
+}
+
+static void ui_application_cocoa_process_events(void)
+{
+    while (1)
+    {
+        NSEvent *event = [NSApp nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES];
+        if (!event)
+            break;
+        [NSApp sendEvent: event];
+    }
+}
+
+static void ui_application_cocoa_run(void *args)
+{
+   (void)args;
+}
+
+ui_application_t ui_application_cocoa = {
+   ui_application_cocoa_initialize,
+   ui_application_cocoa_pending_events,
+   ui_application_cocoa_process_events,
+   ui_application_cocoa_run,
+   NULL,
+   "cocoa"
+};
diff --git a/ui/drivers/cocoa/ui_cocoa_browser_window_metal.m b/ui/drivers/cocoa/ui_cocoa_browser_window_metal.m
new file mode 100644
index 0000000000..747df254a1
--- /dev/null
+++ b/ui/drivers/cocoa/ui_cocoa_browser_window_metal.m
@@ -0,0 +1,61 @@
+/* RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <boolean.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <string/stdstring.h>
+
+#include "cocoa_common_metal.h"
+
+#include "../../ui_companion_driver.h"
+
+static bool ui_browser_window_cocoa_open(ui_browser_window_state_t *state)
+{
+   NSOpenPanel *panel = [NSOpenPanel openPanel];
+   
+   if (!string_is_empty(state->filters))
+   {
+      [panel setAllowedFileTypes:@[BOXSTRING(state->filters), BOXSTRING(state->filters_title)]];
+   }
+   
+   panel.title = NSLocalizedString(BOXSTRING(state->title), BOXSTRING("open panel"));
+   panel.directoryURL = [NSURL fileURLWithPath:BOXSTRING(state->startdir)];
+   panel.canChooseDirectories = NO;
+   panel.canChooseFiles = YES;
+   panel.allowsMultipleSelection = NO;
+   panel.treatsFilePackagesAsDirectories = NO;
+   NSModalResponse result = [panel runModal];
+   if (result != NSModalResponseOK)
+       return false;
+   const char *res_path = [panel.URL.path UTF8String];
+   state->result = strdup(res_path);
+   
+   return true;
+}
+
+static bool ui_browser_window_cocoa_save(ui_browser_window_state_t *state)
+{
+   return false;
+}
+
+ui_browser_window_t ui_browser_window_cocoa = {
+   ui_browser_window_cocoa_open,
+   ui_browser_window_cocoa_save,
+   "cocoa"
+};
diff --git a/ui/drivers/cocoa/ui_cocoa_msg_window.m b/ui/drivers/cocoa/ui_cocoa_msg_window.m
index 71c83393c6..d5e4ec9713 100644
--- a/ui/drivers/cocoa/ui_cocoa_msg_window.m
+++ b/ui/drivers/cocoa/ui_cocoa_msg_window.m
@@ -25,104 +25,88 @@
 
 #include "../../ui_companion_driver.h"
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
-#define NSAlertStyleCritical        NSCriticalAlertStyle
-#define NSAlertStyleWarning         NSWarningAlertStyle
-#define NSAlertStyleInformational   NSInformationalAlertStyle
-#endif
+extern id apple_platform;
 
 static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_state *state, enum ui_msg_window_type type)
 {
-   NSInteger response;
-#if __has_feature(objc_arc)
-   NSAlert *alert = [NSAlert new];
-#else
-   NSAlert* alert = [[NSAlert new] autorelease];
-#endif
-   
-   if (!string_is_empty(state->title))
-      [alert setMessageText:BOXSTRING(state->title)];
-   [alert setInformativeText:BOXSTRING(state->text)];
-   
-   switch (state->buttons)
-   {
-      case UI_MSG_WINDOW_OK:
-         [alert addButtonWithTitle:BOXSTRING("OK")];
-         break;
-      case UI_MSG_WINDOW_YESNO:
-         [alert addButtonWithTitle:BOXSTRING("Yes")];
-         [alert addButtonWithTitle:BOXSTRING("No")];
-         break;
-      case UI_MSG_WINDOW_OKCANCEL:
-         [alert addButtonWithTitle:BOXSTRING("OK")];
-         [alert addButtonWithTitle:BOXSTRING("Cancel")];
-         break;
-      case UI_MSG_WINDOW_YESNOCANCEL:
-         [alert addButtonWithTitle:BOXSTRING("Yes")];
-         [alert addButtonWithTitle:BOXSTRING("No")];
-         [alert addButtonWithTitle:BOXSTRING("Cancel")];
-         break;
-   }
-   
-   switch (type)
-   {
-      case UI_MSG_WINDOW_TYPE_ERROR:
-         [alert setAlertStyle:NSAlertStyleCritical];
-         break;
-      case UI_MSG_WINDOW_TYPE_WARNING:
-         [alert setAlertStyle:NSAlertStyleWarning];
-         break;
-      case UI_MSG_WINDOW_TYPE_QUESTION:
-         [alert setAlertStyle:NSAlertStyleInformational];
-         break;
-      case UI_MSG_WINDOW_TYPE_INFORMATION:
-         [alert setAlertStyle:NSAlertStyleInformational];
-         break;
-   }
-
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-   [alert beginSheetModalForWindow:(BRIDGE NSWindow *)ui_companion_driver_get_main_window()
-                 completionHandler:^(NSModalResponse returnCode) {
-                    [[NSApplication sharedApplication] stopModalWithCode:returnCode];
-                 }];
-   response = [alert runModal];
-#else
-   [alert beginSheetModalForWindow:(BRIDGE NSWindow *)ui_companion_driver_get_main_window()
-                     modalDelegate:apple_platform
-                    didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
-                       contextInfo:nil];
-   response = [[NSApplication sharedApplication] runModalForWindow:[alert window]];
-#endif
-   
-   switch (state->buttons)
-   {
-      case UI_MSG_WINDOW_OK:
-         if (response == NSAlertFirstButtonReturn)
-            return UI_MSG_RESPONSE_OK;
-         break;
-      case UI_MSG_WINDOW_OKCANCEL:
-         if (response == NSAlertFirstButtonReturn)
-            return UI_MSG_RESPONSE_OK;
-         if (response == NSAlertSecondButtonReturn)
-            return UI_MSG_RESPONSE_CANCEL;
-         break;
-      case UI_MSG_WINDOW_YESNO:
-         if (response == NSAlertFirstButtonReturn)
-            return UI_MSG_RESPONSE_YES;
-         if (response == NSAlertSecondButtonReturn)
-            return UI_MSG_RESPONSE_NO;
-         break;
-      case UI_MSG_WINDOW_YESNOCANCEL:
-         if (response == NSAlertFirstButtonReturn)
-            return UI_MSG_RESPONSE_YES;
-         if (response == NSAlertSecondButtonReturn)
-            return UI_MSG_RESPONSE_NO;
-         if (response == NSAlertThirdButtonReturn)
-            return UI_MSG_RESPONSE_CANCEL;
-         break;
-   }
-   
-   return UI_MSG_RESPONSE_NA;
+    NSInteger response;
+    NSAlert* alert = [[NSAlert new] autorelease];
+    
+    if (!string_is_empty(state->title))
+        [alert setMessageText:BOXSTRING(state->title)];
+    [alert setInformativeText:BOXSTRING(state->text)];
+    
+    switch (state->buttons)
+    {
+        case UI_MSG_WINDOW_OK:
+            [alert addButtonWithTitle:BOXSTRING("OK")];
+            break;
+        case UI_MSG_WINDOW_YESNO:
+            [alert addButtonWithTitle:BOXSTRING("Yes")];
+            [alert addButtonWithTitle:BOXSTRING("No")];
+            break;
+        case UI_MSG_WINDOW_OKCANCEL:
+            [alert addButtonWithTitle:BOXSTRING("OK")];
+            [alert addButtonWithTitle:BOXSTRING("Cancel")];
+            break;
+        case UI_MSG_WINDOW_YESNOCANCEL:
+            [alert addButtonWithTitle:BOXSTRING("Yes")];
+            [alert addButtonWithTitle:BOXSTRING("No")];
+            [alert addButtonWithTitle:BOXSTRING("Cancel")];
+            break;
+    }
+    
+    switch (type)
+    {
+        case UI_MSG_WINDOW_TYPE_ERROR:
+            [alert setAlertStyle:NSCriticalAlertStyle];
+            break;
+        case UI_MSG_WINDOW_TYPE_WARNING:
+            [alert setAlertStyle:NSWarningAlertStyle];
+            break;
+        case UI_MSG_WINDOW_TYPE_QUESTION:
+            [alert setAlertStyle:NSInformationalAlertStyle];
+            break;
+        case UI_MSG_WINDOW_TYPE_INFORMATION:
+            [alert setAlertStyle:NSInformationalAlertStyle];
+            break;
+    }
+    
+    [alert beginSheetModalForWindow:ui_companion_driver_get_main_window()
+                      modalDelegate:apple_platform
+                     didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:)
+                        contextInfo:nil];
+    response = [[NSApplication sharedApplication] runModalForWindow:[alert window]];
+    
+    switch (state->buttons)
+    {
+        case UI_MSG_WINDOW_OK:
+            if (response == NSAlertFirstButtonReturn)
+                return UI_MSG_RESPONSE_OK;
+            break;
+        case UI_MSG_WINDOW_OKCANCEL:
+            if (response == NSAlertFirstButtonReturn)
+                return UI_MSG_RESPONSE_OK;
+            if (response == NSAlertSecondButtonReturn)
+                return UI_MSG_RESPONSE_CANCEL;
+            break;
+        case UI_MSG_WINDOW_YESNO:
+            if (response == NSAlertFirstButtonReturn)
+                return UI_MSG_RESPONSE_YES;
+            if (response == NSAlertSecondButtonReturn)
+                return UI_MSG_RESPONSE_NO;
+            break;
+        case UI_MSG_WINDOW_YESNOCANCEL:
+            if (response == NSAlertFirstButtonReturn)
+                return UI_MSG_RESPONSE_YES;
+            if (response == NSAlertSecondButtonReturn)
+                return UI_MSG_RESPONSE_NO;
+            if (response == NSAlertThirdButtonReturn)
+                return UI_MSG_RESPONSE_CANCEL;
+            break;
+    }
+    
+    return UI_MSG_RESPONSE_NA;
 }
 
 static enum ui_msg_window_response ui_msg_window_cocoa_error(ui_msg_window_state *state)
diff --git a/ui/drivers/cocoa/ui_cocoa_msg_window_metal.m b/ui/drivers/cocoa/ui_cocoa_msg_window_metal.m
new file mode 100644
index 0000000000..25d110b358
--- /dev/null
+++ b/ui/drivers/cocoa/ui_cocoa_msg_window_metal.m
@@ -0,0 +1,136 @@
+/* RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <boolean.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <string/stdstring.h>
+
+#include "cocoa_common_metal.h"
+
+#include "../../ui_companion_driver.h"
+
+static enum ui_msg_window_response ui_msg_window_cocoa_dialog(ui_msg_window_state *state, enum ui_msg_window_type type)
+{
+   NSModalResponse response;
+   NSAlert *alert = [NSAlert new];
+   
+   if (!string_is_empty(state->title))
+      [alert setMessageText:BOXSTRING(state->title)];
+   [alert setInformativeText:BOXSTRING(state->text)];
+   
+   switch (state->buttons)
+   {
+      case UI_MSG_WINDOW_OK:
+         [alert addButtonWithTitle:BOXSTRING("OK")];
+         break;
+      case UI_MSG_WINDOW_YESNO:
+         [alert addButtonWithTitle:BOXSTRING("Yes")];
+         [alert addButtonWithTitle:BOXSTRING("No")];
+         break;
+      case UI_MSG_WINDOW_OKCANCEL:
+         [alert addButtonWithTitle:BOXSTRING("OK")];
+         [alert addButtonWithTitle:BOXSTRING("Cancel")];
+         break;
+      case UI_MSG_WINDOW_YESNOCANCEL:
+         [alert addButtonWithTitle:BOXSTRING("Yes")];
+         [alert addButtonWithTitle:BOXSTRING("No")];
+         [alert addButtonWithTitle:BOXSTRING("Cancel")];
+         break;
+   }
+   
+   switch (type)
+   {
+      case UI_MSG_WINDOW_TYPE_ERROR:
+         [alert setAlertStyle:NSAlertStyleCritical];
+         break;
+      case UI_MSG_WINDOW_TYPE_WARNING:
+         [alert setAlertStyle:NSAlertStyleWarning];
+         break;
+      case UI_MSG_WINDOW_TYPE_QUESTION:
+         [alert setAlertStyle:NSAlertStyleInformational];
+         break;
+      case UI_MSG_WINDOW_TYPE_INFORMATION:
+         [alert setAlertStyle:NSAlertStyleInformational];
+         break;
+   }
+
+   [alert beginSheetModalForWindow:(BRIDGE NSWindow *)ui_companion_driver_get_main_window()
+                 completionHandler:^(NSModalResponse returnCode) {
+                    [[NSApplication sharedApplication] stopModalWithCode:returnCode];
+                 }];
+   response = [alert runModal];
+   
+   switch (state->buttons)
+   {
+      case UI_MSG_WINDOW_OK:
+         if (response == NSAlertFirstButtonReturn)
+            return UI_MSG_RESPONSE_OK;
+         break;
+      case UI_MSG_WINDOW_OKCANCEL:
+         if (response == NSAlertFirstButtonReturn)
+            return UI_MSG_RESPONSE_OK;
+         if (response == NSAlertSecondButtonReturn)
+            return UI_MSG_RESPONSE_CANCEL;
+         break;
+      case UI_MSG_WINDOW_YESNO:
+         if (response == NSAlertFirstButtonReturn)
+            return UI_MSG_RESPONSE_YES;
+         if (response == NSAlertSecondButtonReturn)
+            return UI_MSG_RESPONSE_NO;
+         break;
+      case UI_MSG_WINDOW_YESNOCANCEL:
+         if (response == NSAlertFirstButtonReturn)
+            return UI_MSG_RESPONSE_YES;
+         if (response == NSAlertSecondButtonReturn)
+            return UI_MSG_RESPONSE_NO;
+         if (response == NSAlertThirdButtonReturn)
+            return UI_MSG_RESPONSE_CANCEL;
+         break;
+   }
+   
+   return UI_MSG_RESPONSE_NA;
+}
+
+static enum ui_msg_window_response ui_msg_window_cocoa_error(ui_msg_window_state *state)
+{
+   return ui_msg_window_cocoa_dialog(state, UI_MSG_WINDOW_TYPE_ERROR);
+}
+
+static enum ui_msg_window_response ui_msg_window_cocoa_information(ui_msg_window_state *state)
+{
+   return ui_msg_window_cocoa_dialog(state, UI_MSG_WINDOW_TYPE_INFORMATION);
+}
+
+static enum ui_msg_window_response ui_msg_window_cocoa_question(ui_msg_window_state *state)
+{
+   return ui_msg_window_cocoa_dialog(state, UI_MSG_WINDOW_TYPE_QUESTION);
+}
+
+static enum ui_msg_window_response ui_msg_window_cocoa_warning(ui_msg_window_state *state)
+{
+   return ui_msg_window_cocoa_dialog(state, UI_MSG_WINDOW_TYPE_WARNING);
+}
+
+ui_msg_window_t ui_msg_window_cocoa = {
+   ui_msg_window_cocoa_error,
+   ui_msg_window_cocoa_information,
+   ui_msg_window_cocoa_question,
+   ui_msg_window_cocoa_warning,
+   "cocoa"
+};
diff --git a/ui/drivers/cocoa/ui_cocoa_window.m b/ui/drivers/cocoa/ui_cocoa_window.m
index 94e2a15fcc..3ec869e569 100644
--- a/ui/drivers/cocoa/ui_cocoa_window.m
+++ b/ui/drivers/cocoa/ui_cocoa_window.m
@@ -32,18 +32,15 @@ static void* ui_window_cocoa_init(void)
 
 static void ui_window_cocoa_destroy(void *data)
 {
-#if !__has_feature(objc_arc)
     ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
     CocoaView *cocoa_view    = (CocoaView*)cocoa->data;
-    // TODO(sgc): incorrect behavior
     [[cocoa_view window] release];
-#endif
 }
 
 static void ui_window_cocoa_set_focused(void *data)
 {
     ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
-    CocoaView *cocoa_view    = (BRIDGE CocoaView*)cocoa->data;
+    CocoaView *cocoa_view    = (CocoaView*)cocoa->data;
     [[cocoa_view window] makeKeyAndOrderFront:nil];
 }
 
@@ -51,7 +48,7 @@ static void ui_window_cocoa_set_visible(void *data,
         bool set_visible)
 {
     ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
-    CocoaView *cocoa_view    = (BRIDGE CocoaView*)cocoa->data;
+    CocoaView *cocoa_view    = (CocoaView*)cocoa->data;
     if (set_visible)
         [[cocoa_view window] makeKeyAndOrderFront:nil];
     else
@@ -61,7 +58,7 @@ static void ui_window_cocoa_set_visible(void *data,
 static void ui_window_cocoa_set_title(void *data, char *buf)
 {
    ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
-   CocoaView *cocoa_view    = (BRIDGE CocoaView*)cocoa->data;
+   CocoaView *cocoa_view    = (CocoaView*)cocoa->data;
    const char* const text   = buf; /* < Can't access buffer directly in the block */
    [[cocoa_view window] setTitle:[NSString stringWithCString:text encoding:NSUTF8StringEncoding]];
 }
@@ -69,7 +66,7 @@ static void ui_window_cocoa_set_title(void *data, char *buf)
 static void ui_window_cocoa_set_droppable(void *data, bool droppable)
 {
    ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
-   CocoaView *cocoa_view    = (BRIDGE CocoaView*)cocoa->data;
+   CocoaView *cocoa_view    = (CocoaView*)cocoa->data;
 
    if (droppable)
    {
@@ -84,7 +81,7 @@ static void ui_window_cocoa_set_droppable(void *data, bool droppable)
 static bool ui_window_cocoa_focused(void *data)
 {
    ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
-   CocoaView *cocoa_view    = (BRIDGE CocoaView*)cocoa->data;
+   CocoaView *cocoa_view    = (CocoaView*)cocoa->data;
    if ([[cocoa_view window] isMainWindow] == YES)
       return true;
    return false;
diff --git a/ui/drivers/cocoa/ui_cocoa_window_metal.m b/ui/drivers/cocoa/ui_cocoa_window_metal.m
new file mode 100644
index 0000000000..93feafb28e
--- /dev/null
+++ b/ui/drivers/cocoa/ui_cocoa_window_metal.m
@@ -0,0 +1,94 @@
+/* RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <boolean.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <string/stdstring.h>
+
+#include "cocoa_common_metal.h"
+#include "../ui_cocoa_metal.h"
+#include "../../ui_companion_driver.h"
+
+static void* ui_window_cocoa_init(void)
+{
+   return NULL;
+}
+
+static void ui_window_cocoa_destroy(void *data)
+{
+}
+
+static void ui_window_cocoa_set_focused(void *data)
+{
+    ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
+    CocoaView *cocoa_view    = (BRIDGE CocoaView*)cocoa->data;
+    [[cocoa_view window] makeKeyAndOrderFront:nil];
+}
+
+static void ui_window_cocoa_set_visible(void *data,
+        bool set_visible)
+{
+    ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
+    CocoaView *cocoa_view    = (BRIDGE CocoaView*)cocoa->data;
+    if (set_visible)
+        [[cocoa_view window] makeKeyAndOrderFront:nil];
+    else
+        [[cocoa_view window] orderOut:nil];
+}
+
+static void ui_window_cocoa_set_title(void *data, char *buf)
+{
+   ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
+   CocoaView *cocoa_view    = (BRIDGE CocoaView*)cocoa->data;
+   const char* const text   = buf; /* < Can't access buffer directly in the block */
+   [[cocoa_view window] setTitle:[NSString stringWithCString:text encoding:NSUTF8StringEncoding]];
+}
+
+static void ui_window_cocoa_set_droppable(void *data, bool droppable)
+{
+   ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
+   CocoaView *cocoa_view    = (BRIDGE CocoaView*)cocoa->data;
+
+   if (droppable)
+   {
+      [[cocoa_view window] registerForDraggedTypes:@[NSPasteboardTypeColor, NSPasteboardTypeFileURL]];
+   }
+   else
+   {
+      [[cocoa_view window] unregisterDraggedTypes];
+   }
+}
+
+static bool ui_window_cocoa_focused(void *data)
+{
+   ui_window_cocoa_t *cocoa = (ui_window_cocoa_t*)data;
+   CocoaView *cocoa_view    = (BRIDGE CocoaView*)cocoa->data;
+   return cocoa_view.window.isMainWindow;
+}
+
+ui_window_t ui_window_cocoa = {
+   ui_window_cocoa_init,
+   ui_window_cocoa_destroy,
+   ui_window_cocoa_set_focused,
+   ui_window_cocoa_set_visible,
+   ui_window_cocoa_set_title,
+   ui_window_cocoa_set_droppable,
+   ui_window_cocoa_focused,
+   "cocoa"
+};
diff --git a/ui/drivers/qt/coreoptionsdialog.cpp b/ui/drivers/qt/coreoptionsdialog.cpp
index d50adc84e9..8841cf05e5 100644
--- a/ui/drivers/qt/coreoptionsdialog.cpp
+++ b/ui/drivers/qt/coreoptionsdialog.cpp
@@ -222,10 +222,11 @@ void CoreOptionsDialog::buildLayout()
 
          if (settings->bools.game_specific_options)
          {
-            rarch_system_info_t *system = runloop_get_system_info();
             QString contentLabel;
             QString label;
+            rarch_system_info_t *system = runloop_get_system_info();
 
+            /* TODO/FIXME - why have this check here? system is not used */
             if (system)
                contentLabel = QFileInfo(path_get(RARCH_PATH_BASENAME)).completeBaseName();
 
diff --git a/ui/drivers/qt/shaderparamsdialog.cpp b/ui/drivers/qt/shaderparamsdialog.cpp
index 65dba88c28..332fbe64b5 100644
--- a/ui/drivers/qt/shaderparamsdialog.cpp
+++ b/ui/drivers/qt/shaderparamsdialog.cpp
@@ -724,15 +724,12 @@ void ShaderParamsDialog::saveShaderPreset(const char *path, unsigned action_type
    char directory[PATH_MAX_LENGTH];
    char file[PATH_MAX_LENGTH];
    char tmp[PATH_MAX_LENGTH];
-   settings_t *settings            = config_get_ptr();
-   const char *core_name           = NULL;
-   rarch_system_info_t *info       = runloop_get_system_info();
+   settings_t *settings             = config_get_ptr();
+   struct retro_system_info *system = runloop_get_libretro_system_info();
+   const char *core_name            = system ? system->library_name : NULL;
 
    directory[0] = file[0] = tmp[0] = '\0';
 
-   if (info)
-      core_name           = info->info.library_name;
-
    if (!string_is_empty(core_name))
    {
       fill_pathname_join(
@@ -757,17 +754,15 @@ void ShaderParamsDialog::saveShaderPreset(const char *path, unsigned action_type
             fill_pathname_join(file, directory, core_name, sizeof(file));
          break;
       case SHADER_PRESET_SAVE_GAME:
-      {
-         const char *game_name = path_basename(path_get(RARCH_PATH_BASENAME));
-         fill_pathname_join(file, directory, game_name, sizeof(file));
-         break;
-      }
+         {
+            const char *game_name = path_basename(path_get(RARCH_PATH_BASENAME));
+            fill_pathname_join(file, directory, game_name, sizeof(file));
+            break;
+         }
       case SHADER_PRESET_SAVE_PARENT:
-      {
          fill_pathname_parent_dir_name(tmp, path_get(RARCH_PATH_BASENAME), sizeof(tmp));
          fill_pathname_join(file, directory, tmp, sizeof(file));
          break;
-      }
       case SHADER_PRESET_SAVE_NORMAL:
       default:
          if (!string_is_empty(path))
@@ -821,13 +816,13 @@ void ShaderParamsDialog::onShaderClearAllPassesClicked()
 void ShaderParamsDialog::onShaderRemovePassClicked()
 {
 #ifdef HAVE_MENU
-   QAction *action = qobject_cast<QAction*>(sender());
-   QVariant passVariant;
-   struct video_shader *menu_shader = NULL;
-   struct video_shader *video_shader = NULL;
-   int pass = 0;
    int i;
-   bool ok = false;
+   QVariant passVariant;
+   QAction                   *action = qobject_cast<QAction*>(sender());
+   struct video_shader *menu_shader  = NULL;
+   struct video_shader *video_shader = NULL;
+   int pass                          = 0;
+   bool ok                           = false;
 
    getShaders(&menu_shader, &video_shader);
 
diff --git a/ui/drivers/qt/ui_qt_window.cpp b/ui/drivers/qt/ui_qt_window.cpp
index c85a89d76d..712137f68d 100644
--- a/ui/drivers/qt/ui_qt_window.cpp
+++ b/ui/drivers/qt/ui_qt_window.cpp
@@ -1,6 +1,6 @@
 /* RetroArch - A frontend for libretro.
  *  Copyright (C) 2011-2017 - Daniel De Matteis
- *  Copyright (C) 2018 - Brad Parker
+ *  Copyright (C) 2018      - Brad Parker
  *
  * RetroArch is free software: you can redistribute it and/or modify it under the terms
  * of the GNU General Public License as published by the Free Software Found-
@@ -1297,7 +1297,7 @@ QVector<QHash<QString, QString> > MainWindow::getCoreInfo()
    {
       QHash<QString, QString> hash;
 
-      hash["key"] = QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME)) + ":";
+      hash["key"]   = QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME)) + ":";
       hash["value"] = core_info->systemname;
 
       infoList.append(hash);
@@ -1307,7 +1307,7 @@ QVector<QHash<QString, QString> > MainWindow::getCoreInfo()
    {
       QHash<QString, QString> hash;
 
-      hash["key"] = QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER)) + ":";
+      hash["key"]   = QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER)) + ":";
       hash["value"] = core_info->system_manufacturer;
 
       infoList.append(hash);
@@ -2778,10 +2778,10 @@ void MainWindow::onStopClicked()
 
 void MainWindow::setCurrentCoreLabel()
 {
-   rarch_system_info_t *system = runloop_get_system_info();
-   bool update = false;
-   QString libraryName = system->info.library_name;
-   const char *no_core_str = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE);
+   bool update                      = false;
+   struct retro_system_info *system = runloop_get_libretro_system_info();
+   QString libraryName              = system->library_name;
+   const char *no_core_str          = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_CORE);
 
    if (m_statusLabel->text().isEmpty() || (m_currentCore != no_core_str && libraryName.isEmpty()))
    {
@@ -2793,8 +2793,8 @@ void MainWindow::setCurrentCoreLabel()
    {
       if (m_currentCore != libraryName && !libraryName.isEmpty())
       {
-         m_currentCore = system->info.library_name;
-         m_currentCoreVersion = (string_is_empty(system->info.library_version) ? "" : system->info.library_version);
+         m_currentCore        = system->library_name;
+         m_currentCoreVersion = (string_is_empty(system->library_version) ? "" : system->library_version);
          update = true;
       }
    }
diff --git a/ui/drivers/ui_cocoa.h b/ui/drivers/ui_cocoa.h
index 6b50692cef..11f6f5c5c0 100644
--- a/ui/drivers/ui_cocoa.h
+++ b/ui/drivers/ui_cocoa.h
@@ -36,7 +36,7 @@ typedef struct ui_application_cocoa
 
 typedef struct ui_window_cocoa
 {
-    void *data;
+    CocoaView *data;
 } ui_window_cocoa_t;
 
 RETRO_END_DECLS
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 1e86b64667..b93d748cf3 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -38,46 +38,15 @@
 #include "../../tasks/tasks_internal.h"
 #include ".././verbosity.h"
 
-#ifdef HAVE_METAL
-#import <Metal/Metal.h>
-#import <MetalKit/MetalKit.h>
-#endif
-
-#if !((defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__))))
-@interface WindowListener : NSResponder<NSWindowDelegate>
-@end
-
-@implementation WindowListener
-
-/* Similarly to SDL, we'll respond to key events by doing nothing so we don't beep.
- */
-- (void)flagsChanged:(NSEvent *)event
-{}
-
-- (void)keyDown:(NSEvent *)event
-{}
-
-- (void)keyUp:(NSEvent *)event
-{}
-
-@end
-#endif
-
-id<ApplePlatform> apple_platform;
+id apple_platform;
 
 #if (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
-@interface RetroArch_OSX : NSObject <ApplePlatform>
+@interface RetroArch_OSX : NSObject
 #else
-@interface RetroArch_OSX : NSObject <ApplePlatform, NSApplicationDelegate>
+@interface RetroArch_OSX : NSObject <NSApplicationDelegate>
 #endif
 {
-   NSWindow* _window;
-   apple_view_type_t _vt;
-   NSView* _renderView;
-   id _sleepActivity;
-#if !(defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
-   WindowListener *_listener;
-#endif
+    NSWindow* _window;
 }
 
 @property (nonatomic, retain) NSWindow IBOutlet* window;
@@ -94,31 +63,6 @@ static void app_terminate(void)
 
 @implementation RApplication
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
-#define NSEventTypeKeyDown             NSKeyDown
-#define NSEventTypeKeyUp               NSKeyUp
-#define NSEventTypeFlagsChanged        NSFlagsChanged
-#define NSEventTypeMouseMoved          NSMouseMoved
-#define NSEventTypeLeftMouseDragged    NSLeftMouseDragged
-#define NSEventTypeRightMouseDragged   NSRightMouseDragged
-#define NSEventTypeOtherMouseDragged   NSOtherMouseDragged
-#define NSEventTypeLeftMouseDown       NSLeftMouseDown
-#define NSEventTypeRightMouseDown      NSRightMouseDown
-#define NSEventTypeOtherMouseDown      NSOtherMouseDown
-#define NSEventTypeLeftMouseUp         NSLeftMouseUp
-#define NSEventTypeRightMouseUp        NSRightMouseUp
-#define NSEventTypeOtherMouseUp        NSOtherMouseUp
-#define NSEventTypeScrollWheel         NSScrollWheel
-
-// modifier flags
-#define NSEventModifierFlagCapsLock    NSAlphaShiftKeyMask
-#define NSEventModifierFlagShift       NSShiftKeyMask
-#define NSEventModifierFlagControl     NSControlKeyMask
-#define NSEventModifierFlagOption      NSAlternateKeyMask
-#define NSEventModifierFlagCommand     NSCommandKeyMask
-#define NSEventModifierFlagNumericPad  NSNumericPadKeyMask
-#endif
-
 - (void)sendEvent:(NSEvent *)event
 {
    NSEventType event_type;
@@ -127,12 +71,12 @@ static void app_terminate(void)
 
    event_type = event.type;
 
-   switch (event_type)
+   switch ((int32_t)event_type)
    {
-      case NSEventTypeKeyDown:
-      case NSEventTypeKeyUp:
+      case NSKeyDown:
+        case NSKeyUp:
          {
-            NSString* ch = event.characters;
+            NSString* ch = (NSString*)event.characters;
             uint32_t character = 0;
             uint32_t mod = 0;
 
@@ -141,29 +85,29 @@ static void app_terminate(void)
                uint32_t i;
                character = [ch characterAtIndex:0];
 
-               if (event.modifierFlags & NSEventModifierFlagCapsLock)
+               if (event.modifierFlags & NSAlphaShiftKeyMask)
                   mod |= RETROKMOD_CAPSLOCK;
-               if (event.modifierFlags & NSEventModifierFlagShift)
+               if (event.modifierFlags & NSShiftKeyMask)
                   mod |=  RETROKMOD_SHIFT;
-               if (event.modifierFlags & NSEventModifierFlagControl)
+               if (event.modifierFlags & NSControlKeyMask)
                   mod |=  RETROKMOD_CTRL;
-               if (event.modifierFlags & NSEventModifierFlagOption)
+               if (event.modifierFlags & NSAlternateKeyMask)
                   mod |= RETROKMOD_ALT;
-               if (event.modifierFlags & NSEventModifierFlagCommand)
+               if (event.modifierFlags & NSCommandKeyMask)
                   mod |= RETROKMOD_META;
-               if (event.modifierFlags & NSEventModifierFlagNumericPad)
+               if (event.modifierFlags & NSNumericPadKeyMask)
                   mod |=  RETROKMOD_NUMLOCK;
 
                for (i = 1; i < ch.length; i++)
-                  apple_input_keyboard_event(event_type == NSEventTypeKeyDown,
+                  apple_input_keyboard_event(event_type == NSKeyDown,
                         0, [ch characterAtIndex:i], mod, RETRO_DEVICE_KEYBOARD);
             }
 
-            apple_input_keyboard_event(event_type == NSEventTypeKeyDown,
+            apple_input_keyboard_event(event_type == NSKeyDown,
                   event.keyCode, character, mod, RETRO_DEVICE_KEYBOARD);
          }
          break;
-        case NSEventTypeFlagsChanged:
+        case NSFlagsChanged:
          {
             static uint32_t old_flags = 0;
             uint32_t new_flags        = event.modifierFlags;
@@ -175,10 +119,10 @@ static void app_terminate(void)
                   0, event.modifierFlags, RETRO_DEVICE_KEYBOARD);
          }
          break;
-        case NSEventTypeMouseMoved:
-        case NSEventTypeLeftMouseDragged:
-        case NSEventTypeRightMouseDragged:
-        case NSEventTypeOtherMouseDragged:
+        case NSMouseMoved:
+        case NSLeftMouseDragged:
+        case NSRightMouseDragged:
+        case NSOtherMouseDragged:
          {
             NSPoint pos;
             NSPoint mouse_pos;
@@ -187,27 +131,27 @@ static void app_terminate(void)
                return;
 
             /* Relative */
-            apple->mouse_rel_x = (int16_t)event.deltaX;
-            apple->mouse_rel_y = (int16_t)event.deltaY;
+            apple->mouse_rel_x = event.deltaX;
+            apple->mouse_rel_y = event.deltaY;
 
             /* Absolute */
-            pos = [apple_platform.renderView convertPoint:[event locationInWindow] fromView:nil];
-            apple->touches[0].screen_x = (int16_t)pos.x;
-            apple->touches[0].screen_y = (int16_t)pos.y;
+            pos = [[CocoaView get] convertPoint:[event locationInWindow] fromView:nil];
+            apple->touches[0].screen_x = pos.x;
+            apple->touches[0].screen_y = pos.y;
 
-            mouse_pos = [apple_platform.renderView convertPoint:[event locationInWindow]  fromView:nil];
+            mouse_pos = [[CocoaView get] convertPoint:[event locationInWindow]  fromView:nil];
             apple->window_pos_x = (int16_t)mouse_pos.x;
             apple->window_pos_y = (int16_t)mouse_pos.y;
          }
          break;
-        case NSEventTypeScrollWheel:
+        case NSScrollWheel:
          /* TODO/FIXME - properly implement. */
          break;
-        case NSEventTypeLeftMouseDown:
-        case NSEventTypeRightMouseDown:
-        case NSEventTypeOtherMouseDown:
+        case NSLeftMouseDown:
+        case NSRightMouseDown:
+        case NSOtherMouseDown:
          {
-            NSPoint pos = [apple_platform.renderView convertPoint:[event locationInWindow] fromView:nil];
+            NSPoint pos = [[CocoaView get] convertPoint:[event locationInWindow] fromView:nil];
             apple = (cocoa_input_data_t*)input_driver_get_data();
             if (!apple || pos.y < 0)
                return;
@@ -216,11 +160,11 @@ static void app_terminate(void)
             apple->touch_count = 1;
          }
          break;
-      case NSEventTypeLeftMouseUp:
-      case NSEventTypeRightMouseUp:
-      case NSEventTypeOtherMouseUp:
+      case NSLeftMouseUp:
+      case NSRightMouseUp:
+      case NSOtherMouseUp:
          {
-            NSPoint pos = [apple_platform.renderView convertPoint:[event locationInWindow] fromView:nil];
+            NSPoint pos = [[CocoaView get] convertPoint:[event locationInWindow] fromView:nil];
             apple = (cocoa_input_data_t*)input_driver_get_data();
             if (!apple || pos.y < 0)
                return;
@@ -228,8 +172,6 @@ static void app_terminate(void)
             apple->touch_count = 0;
          }
          break;
-      default:
-         break;
    }
 }
 
@@ -242,41 +184,33 @@ static char** waiting_argv;
 
 @synthesize window = _window;
 
-#if !__has_feature(objc_arc)
 - (void)dealloc
 {
    [_window release];
    [super dealloc];
 }
-#endif
 
 #define NS_WINDOW_COLLECTION_BEHAVIOR_FULLSCREEN_PRIMARY (1 << 17)
 
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
    unsigned i;
-   apple_platform   = self;
-
    SEL selector     = NSSelectorFromString(BOXSTRING("setCollectionBehavior:"));
    SEL fsselector   = NSSelectorFromString(BOXSTRING("toggleFullScreen:"));
+   apple_platform   = self;
 
    if ([self.window respondsToSelector:selector])
    {
        if ([self.window respondsToSelector:fsselector])
           [self.window setCollectionBehavior:NS_WINDOW_COLLECTION_BEHAVIOR_FULLSCREEN_PRIMARY];
    }
-   
-#if !(defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
-   _listener = [WindowListener new];
-#endif
-   
+
    [self.window setAcceptsMouseMovedEvents: YES];
-#if !(defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
-   [self.window setNextResponder:_listener];
-   self.window.delegate = _listener;
-#endif
-   
+
+   [[CocoaView get] setFrame: [[self.window contentView] bounds]];
    [[self.window contentView] setAutoresizesSubviews:YES];
+   [[self.window contentView] addSubview:[CocoaView get]];
+   [self.window makeFirstResponder:[CocoaView get]];
 
     for (i = 0; i < waiting_argc; i++)
     {
@@ -291,143 +225,39 @@ static char** waiting_argv;
       app_terminate();
 
    waiting_argc = 0;
-   
-   [self.window makeMainWindow];
-   [self.window makeKeyWindow];
-   
+
    [self performSelectorOnMainThread:@selector(rarch_main) withObject:nil waitUntilDone:NO];
 }
 
-#pragma mark - ApplePlatform
-
-- (void)setViewType:(apple_view_type_t)vt {
-   if (vt == _vt) {
-      return;
-   }
-   
-   RARCH_LOG("[Cocoa]: change view type: %d → %d\n", _vt, vt);
-   
-   _vt = vt;
-   if (_renderView != nil)
-   {
-      _renderView.wantsLayer = NO;
-      _renderView.layer = nil;
-      [_renderView removeFromSuperview];
-      self.window.contentView = nil;
-      _renderView = nil;
-   }
-   
-   switch (vt) {
-      case APPLE_VIEW_TYPE_VULKAN:
-      case APPLE_VIEW_TYPE_METAL:
-#if defined(HAVE_METAL) || defined(HAVE_VULKAN)
-      {
-         MetalView *v = [MetalView new];
-         v.paused = YES;
-         v.enableSetNeedsDisplay = NO;
-         _renderView = v;
-      }
-#endif
-      break;
-      
-      case APPLE_VIEW_TYPE_OPENGL:
-      {
-         _renderView = [CocoaView get];
-         break;
-      }
-      
-      case APPLE_VIEW_TYPE_NONE:
-      default:
-         return;
-   }
-   
-   _renderView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
-   [_renderView setFrame: [[self.window contentView] bounds]];
-   
-   self.window.contentView = _renderView;
-#if !(defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
-   [self.window.contentView setNextResponder:_listener];
-#endif
-}
-
-- (apple_view_type_t)viewType {
-   return _vt;
-}
-
-- (id)renderView {
-   return _renderView;
-}
-
-- (bool)hasFocus {
-   return [NSApp isActive];
-}
-
-- (void)setVideoMode:(gfx_ctx_mode_t)mode {
-#ifdef HAVE_METAL
-   BOOL isFullScreen = (self.window.styleMask & NSFullScreenWindowMask) == NSFullScreenWindowMask;
-   if (mode.fullscreen && !isFullScreen)
-   {
-      [self.window toggleFullScreen:self];
-      return;
-   }
-   
-   if (!mode.fullscreen && isFullScreen)
-   {
-      [self.window toggleFullScreen:self];
-   }
-   
-   if (mode.width > 0)
-   {
-      // HACK(sgc): ensure MTKView posts a drawable resize event
-      [self.window setContentSize:NSMakeSize(mode.width-1, mode.height)];
-   }
-   [self.window setContentSize:NSMakeSize(mode.width, mode.height)];
-#endif
-}
-
-- (void)setCursorVisible:(bool)v {
-   if (v)
-      [NSCursor unhide];
-   else
-      [NSCursor hide];
-}
-
-- (bool)setDisableDisplaySleep:(bool)disable
-{
-#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1090
-   if (disable && _sleepActivity == nil)
-   {
-      _sleepActivity = [NSProcessInfo.processInfo beginActivityWithOptions:NSActivityIdleDisplaySleepDisabled reason:@"disable screen saver"];
-   }
-   else if (!disable && _sleepActivity != nil)
-   {
-      [NSProcessInfo.processInfo endActivity:_sleepActivity];
-      _sleepActivity = nil;
-   }
-   return YES;
-#else
-   return NO;
-#endif
-
-}
-
-
 - (void) rarch_main
 {
     do
     {
        int ret;
        unsigned sleep_ms = 0;
+#ifdef HAVE_QT
+       const ui_application_t *application = &ui_application_qt;
+#else
        const ui_application_t *application = ui_companion_driver_get_application_ptr();
+#endif
        if (application)
           application->process_events();
+
        ret = runloop_iterate(&sleep_ms);
+
        if (ret == 1 && sleep_ms > 0)
           retro_sleep(sleep_ms);
+
        task_queue_check();
+
        while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.002, FALSE) == kCFRunLoopRunHandledSource);
        if (ret == -1)
+       {
+#ifdef HAVE_QT
+          ui_application_qt.quit();
+#endif
           break;
+       }
     }while(1);
 
     main_exit(NULL);
@@ -463,13 +293,9 @@ static char** waiting_argv;
 {
    if (filenames.count == 1 && [filenames objectAtIndex:0])
    {
-      rarch_system_info_t *info        = runloop_get_system_info();
-      struct retro_system_info *system = &info->info;
+      struct retro_system_info *system = runloop_get_libretro_system_info();
       NSString *__core                 = [filenames objectAtIndex:0];
-      const char *core_name            = NULL;
-
-      if (system)
-         core_name = system->library_name;
+      const char *core_name            = system ? system->library_name : NULL;
 
       if (core_name)
       {
@@ -492,7 +318,7 @@ static char** waiting_argv;
       {
          ui_msg_window_state msg_window_state;
          msg_window_state.text  = strdup("Cannot open multiple files");
-         msg_window_state.title = strdup("RetroArch");
+         msg_window_state.title = strdup(msg_hash_to_str(MSG_PROGRAM));
          msg_window->information(&msg_window_state);
 
          free(msg_window_state.text);
@@ -539,12 +365,8 @@ static void open_document_handler(ui_browser_window_state_t *state, bool result)
     if (!result)
         return;
 
-    rarch_system_info_t *info        = runloop_get_system_info();
-    struct retro_system_info *system = &info->info;
-    const char            *core_name = NULL;
-
-    if (system)
-        core_name = system->library_name;
+    struct retro_system_info *system = runloop_get_libretro_system_info();
+    const char            *core_name = system ? system->library_name : NULL;
 
     path_set(RARCH_PATH_CONTENT, state->result);
 
@@ -568,8 +390,8 @@ static void open_document_handler(ui_browser_window_state_t *state, bool result)
         settings_t *settings        = config_get_ptr();
 
         browser_state.filters       = strdup("dylib");
-        browser_state.filters_title = strdup("Core");
-        browser_state.title         = strdup("Load Core");
+        browser_state.filters_title = strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_SETTINGS));
+        browser_state.title         = strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_LIST));
         browser_state.startdir      = strdup(settings->paths.directory_libretro);
 
         bool result = browser->open(&browser_state);
@@ -595,7 +417,7 @@ static void open_document_handler(ui_browser_window_state_t *state, bool result)
         if (!startdir.length)
             startdir           = BOXSTRING("/");
 
-        browser_state.title = strdup("Load Content");
+        browser_state.title    = strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST));
         browser_state.startdir = strdup([startdir UTF8String]);
 
         bool result = browser->open(&browser_state);
@@ -740,7 +562,7 @@ static void *ui_companion_cocoa_init(void)
 static void ui_companion_cocoa_event_command(void *data, enum event_command cmd)
 {
    (void)data;
-   (void)cmd;
+   command_event(cmd, NULL);
 }
 
 static void ui_companion_cocoa_notify_list_pushed(void *data,
@@ -753,7 +575,7 @@ static void ui_companion_cocoa_notify_list_pushed(void *data,
 
 static void *ui_companion_cocoa_get_main_window(void *data)
 {
-    return (BRIDGE void *)((RetroArch_OSX*)[[NSApplication sharedApplication] delegate]).window;
+    return ((RetroArch_OSX*)[[NSApplication sharedApplication] delegate]).window;
 }
 
 ui_companion_driver_t ui_companion_cocoa = {
diff --git a/ui/drivers/ui_cocoa_metal.h b/ui/drivers/ui_cocoa_metal.h
new file mode 100644
index 0000000000..8bbe7cd8c7
--- /dev/null
+++ b/ui/drivers/ui_cocoa_metal.h
@@ -0,0 +1,44 @@
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ *  RetroArch is free software: you can redistribute it and/or modify it under the terms
+ *  of the GNU General Public License as published by the Free Software Found-
+ *  ation, either version 3 of the License, or (at your option) any later version.
+ *
+ *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ *  PURPOSE.  See the GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License along with RetroArch.
+ *  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _COCOA_METAL_UI
+#define _COCOA_METAL_UI
+
+#include <stdint.h>
+#include <stddef.h>
+
+#include <boolean.h>
+#include <retro_common_api.h>
+
+#include "cocoa/cocoa_common_metal.h"
+
+#include "../ui_companion_driver.h"
+
+RETRO_BEGIN_DECLS
+
+typedef struct ui_application_cocoa
+{
+   void *empty;
+} ui_application_cocoa_t;
+
+typedef struct ui_window_cocoa
+{
+    void *data;
+} ui_window_cocoa_t;
+
+RETRO_END_DECLS
+
+#endif
diff --git a/ui/drivers/ui_cocoa_metal.m b/ui/drivers/ui_cocoa_metal.m
new file mode 100644
index 0000000000..6dd34e15e4
--- /dev/null
+++ b/ui/drivers/ui_cocoa_metal.m
@@ -0,0 +1,713 @@
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2013-2014 - Jason Fetters
+ * Copyright (C) 2011-2017 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <objc/objc-runtime.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <boolean.h>
+#include <file/file_path.h>
+#include <string/stdstring.h>
+#include <queues/task_queue.h>
+#include <retro_timers.h>
+
+#include "cocoa/cocoa_common_metal.h"
+#include "../ui_companion_driver.h"
+#include "../../input/drivers/cocoa_input.h"
+#include "../../input/drivers_keyboard/keyboard_event_apple.h"
+#include "../../frontend/frontend.h"
+#include "../../configuration.h"
+#include "../../paths.h"
+#include "../../core.h"
+#include "../../retroarch.h"
+#include "../../tasks/tasks_internal.h"
+#include ".././verbosity.h"
+
+#import <Metal/Metal.h>
+#import <MetalKit/MetalKit.h>
+
+@interface WindowListener : NSResponder<NSWindowDelegate>
+@end
+
+@implementation WindowListener
+
+/* Similarly to SDL, we'll respond to key events by doing nothing so we don't beep.
+ */
+- (void)flagsChanged:(NSEvent *)event
+{}
+
+- (void)keyDown:(NSEvent *)event
+{}
+
+- (void)keyUp:(NSEvent *)event
+{}
+
+@end
+
+id<ApplePlatform> apple_platform;
+
+@interface RetroArch_OSX : NSObject <ApplePlatform, NSApplicationDelegate>
+{
+   NSWindow* _window;
+   apple_view_type_t _vt;
+   NSView* _renderView;
+   id _sleepActivity;
+   WindowListener *_listener;
+}
+
+@property (nonatomic, retain) NSWindow IBOutlet* window;
+
+@end
+
+static void app_terminate(void)
+{
+   [[NSApplication sharedApplication] terminate:nil];
+}
+@interface RAWindow : NSWindow
+@end
+
+@implementation RAWindow
+
+- (void)sendEvent:(NSEvent *)event {
+   [super sendEvent:event];
+   
+   cocoa_input_data_t *apple = NULL;
+   NSEventType event_type = event.type;
+
+   switch (event_type)
+   {
+      case NSEventTypeKeyDown:
+      case NSEventTypeKeyUp:
+         {
+            NSString* ch = event.characters;
+            uint32_t character = 0;
+            uint32_t mod = 0;
+
+            if (ch && ch.length != 0)
+            {
+               uint32_t i;
+               character = [ch characterAtIndex:0];
+
+               if (event.modifierFlags & NSEventModifierFlagCapsLock)
+                  mod |= RETROKMOD_CAPSLOCK;
+               if (event.modifierFlags & NSEventModifierFlagShift)
+                  mod |=  RETROKMOD_SHIFT;
+               if (event.modifierFlags & NSEventModifierFlagControl)
+                  mod |=  RETROKMOD_CTRL;
+               if (event.modifierFlags & NSEventModifierFlagOption)
+                  mod |= RETROKMOD_ALT;
+               if (event.modifierFlags & NSEventModifierFlagCommand)
+                  mod |= RETROKMOD_META;
+               if (event.modifierFlags & NSEventModifierFlagNumericPad)
+                  mod |=  RETROKMOD_NUMLOCK;
+
+               for (i = 1; i < ch.length; i++)
+                  apple_input_keyboard_event(event_type == NSEventTypeKeyDown,
+                        0, [ch characterAtIndex:i], mod, RETRO_DEVICE_KEYBOARD);
+            }
+
+            apple_input_keyboard_event(event_type == NSEventTypeKeyDown,
+                  event.keyCode, character, mod, RETRO_DEVICE_KEYBOARD);
+         }
+         break;
+        case NSEventTypeFlagsChanged:
+         {
+            static uint32_t old_flags = 0;
+            uint32_t new_flags        = event.modifierFlags;
+            bool down                 = (new_flags & old_flags) == old_flags;
+
+            old_flags                 = new_flags;
+
+            apple_input_keyboard_event(down, event.keyCode,
+                  0, event.modifierFlags, RETRO_DEVICE_KEYBOARD);
+         }
+         break;
+        case NSEventTypeMouseMoved:
+        case NSEventTypeLeftMouseDragged:
+        case NSEventTypeRightMouseDragged:
+        case NSEventTypeOtherMouseDragged:
+         {
+            NSPoint pos;
+            NSPoint mouse_pos;
+            apple                        = (cocoa_input_data_t*)input_driver_get_data();
+            if (!apple)
+               return;
+
+            /* Relative */
+            apple->mouse_rel_x = (int16_t)event.deltaX;
+            apple->mouse_rel_y = (int16_t)event.deltaY;
+
+            /* Absolute */
+            pos = [apple_platform.renderView convertPoint:[event locationInWindow] fromView:nil];
+            apple->touches[0].screen_x = (int16_t)pos.x;
+            apple->touches[0].screen_y = (int16_t)pos.y;
+
+            mouse_pos = [apple_platform.renderView convertPoint:[event locationInWindow]  fromView:nil];
+            apple->window_pos_x = (int16_t)mouse_pos.x;
+            apple->window_pos_y = (int16_t)mouse_pos.y;
+         }
+         break;
+        case NSEventTypeScrollWheel:
+         /* TODO/FIXME - properly implement. */
+         break;
+        case NSEventTypeLeftMouseDown:
+        case NSEventTypeRightMouseDown:
+        case NSEventTypeOtherMouseDown:
+         {
+            NSPoint pos = [apple_platform.renderView convertPoint:[event locationInWindow] fromView:nil];
+            apple = (cocoa_input_data_t*)input_driver_get_data();
+            if (!apple || pos.y < 0)
+               return;
+            apple->mouse_buttons |= 1 << event.buttonNumber;
+
+            apple->touch_count = 1;
+         }
+         break;
+      case NSEventTypeLeftMouseUp:
+      case NSEventTypeRightMouseUp:
+      case NSEventTypeOtherMouseUp:
+         {
+            NSPoint pos = [apple_platform.renderView convertPoint:[event locationInWindow] fromView:nil];
+            apple = (cocoa_input_data_t*)input_driver_get_data();
+            if (!apple || pos.y < 0)
+               return;
+            apple->mouse_buttons &= ~(1 << event.buttonNumber);
+            apple->touch_count = 0;
+         }
+         break;
+      default:
+         break;
+   }
+}
+
+@end
+
+static int waiting_argc;
+static char** waiting_argv;
+
+@implementation RetroArch_OSX
+
+@synthesize window = _window;
+
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+   unsigned i;
+   apple_platform   = self;
+
+   self.window.collectionBehavior = NSWindowCollectionBehaviorFullScreenPrimary;
+   
+   _listener = [WindowListener new];
+   
+   [self.window setAcceptsMouseMovedEvents: YES];
+   [self.window setNextResponder:_listener];
+   self.window.delegate = _listener;
+   
+   [[self.window contentView] setAutoresizesSubviews:YES];
+
+    for (i = 0; i < waiting_argc; i++)
+    {
+        if (string_is_equal(waiting_argv[i], "-NSDocumentRevisionsDebugMode"))
+        {
+            waiting_argv[i]   = NULL;
+            waiting_argv[i+1] = NULL;
+            waiting_argc -= 2;
+        }
+    }
+   if (rarch_main(waiting_argc, waiting_argv, NULL))
+      app_terminate();
+
+   waiting_argc = 0;
+   
+   [self.window makeMainWindow];
+   [self.window makeKeyWindow];
+   
+   [self performSelectorOnMainThread:@selector(rarch_main) withObject:nil waitUntilDone:NO];
+}
+
+#pragma mark - ApplePlatform
+
+- (void)setViewType:(apple_view_type_t)vt {
+   if (vt == _vt) {
+      return;
+   }
+   
+   RARCH_LOG("[Cocoa]: change view type: %d → %d\n", _vt, vt);
+   
+   _vt = vt;
+   if (_renderView != nil)
+   {
+      _renderView.wantsLayer = NO;
+      _renderView.layer = nil;
+      [_renderView removeFromSuperview];
+      self.window.contentView = nil;
+      _renderView = nil;
+   }
+   
+   switch (vt) {
+      case APPLE_VIEW_TYPE_VULKAN:
+      case APPLE_VIEW_TYPE_METAL:
+      {
+         MetalView *v = [MetalView new];
+         v.paused = YES;
+         v.enableSetNeedsDisplay = NO;
+         _renderView = v;
+      }
+      break;
+      
+      case APPLE_VIEW_TYPE_OPENGL:
+      {
+         _renderView = [CocoaView get];
+         break;
+      }
+      
+      case APPLE_VIEW_TYPE_NONE:
+      default:
+         return;
+   }
+   
+   _renderView.autoresizingMask = NSViewWidthSizable | NSViewHeightSizable;
+   [_renderView setFrame: [[self.window contentView] bounds]];
+   
+   self.window.contentView = _renderView;
+   self.window.contentView.nextResponder = _listener;
+}
+
+- (apple_view_type_t)viewType {
+   return _vt;
+}
+
+- (id)renderView {
+   return _renderView;
+}
+
+- (bool)hasFocus {
+   return [NSApp isActive];
+}
+
+- (void)setVideoMode:(gfx_ctx_mode_t)mode {
+   BOOL isFullScreen = (self.window.styleMask & NSWindowStyleMaskFullScreen) == NSWindowStyleMaskFullScreen;
+   if (mode.fullscreen && !isFullScreen)
+   {
+      [self.window toggleFullScreen:self];
+      return;
+   }
+   
+   if (!mode.fullscreen && isFullScreen)
+   {
+      [self.window toggleFullScreen:self];
+   }
+   
+   if (mode.width > 0)
+   {
+      // HACK(sgc): ensure MTKView posts a drawable resize event
+      [self.window setContentSize:NSMakeSize(mode.width-1, mode.height)];
+   }
+   [self.window setContentSize:NSMakeSize(mode.width, mode.height)];
+}
+
+- (void)setCursorVisible:(bool)v {
+   if (v)
+      [NSCursor unhide];
+   else
+      [NSCursor hide];
+}
+
+- (bool)setDisableDisplaySleep:(bool)disable
+{
+   if (disable && _sleepActivity == nil)
+   {
+      _sleepActivity = [NSProcessInfo.processInfo beginActivityWithOptions:NSActivityIdleDisplaySleepDisabled reason:@"disable screen saver"];
+   }
+   else if (!disable && _sleepActivity != nil)
+   {
+      [NSProcessInfo.processInfo endActivity:_sleepActivity];
+      _sleepActivity = nil;
+   }
+   return YES;
+}
+
+
+- (void) rarch_main
+{
+    do
+    {
+       int ret;
+       unsigned sleep_ms = 0;
+#ifdef HAVE_QT
+       const ui_application_t *application = &ui_application_qt;
+#else
+       const ui_application_t *application = ui_companion_driver_get_application_ptr();
+#endif
+       if (application)
+          application->process_events();
+
+       ret = runloop_iterate(&sleep_ms);
+
+       if (ret == 1 && sleep_ms > 0)
+          retro_sleep(sleep_ms);
+
+       task_queue_check();
+
+       while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.002, FALSE) == kCFRunLoopRunHandledSource);
+       if (ret == -1)
+       {
+#ifdef HAVE_QT
+          ui_application_qt.quit();
+#endif
+          break;
+       }
+    }while(1);
+
+    main_exit(NULL);
+}
+
+- (void)applicationDidBecomeActive:(NSNotification *)notification
+{
+}
+
+- (void)applicationWillResignActive:(NSNotification *)notification
+{
+}
+
+- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)theApplication
+{
+   return YES;
+}
+
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+{
+   NSApplicationTerminateReply reply = NSTerminateNow;
+
+   if (rarch_ctl(RARCH_CTL_IS_INITED, NULL))
+      reply = NSTerminateCancel;
+
+   command_event(CMD_EVENT_QUIT, NULL);
+
+   return reply;
+}
+
+
+- (void)application:(NSApplication *)sender openFiles:(NSArray *)filenames
+{
+   if (filenames.count == 1 && [filenames objectAtIndex:0])
+   {
+      struct retro_system_info *system = runloop_get_libretro_system_info();
+      NSString *__core                 = [filenames objectAtIndex:0];
+      const char *core_name            = system ? system->library_name : NULL;
+
+      if (core_name)
+      {
+         content_ctx_info_t content_info = {0};
+         task_push_load_content_with_current_core_from_companion_ui(
+               __core.UTF8String,
+               &content_info,
+               CORE_TYPE_PLAIN,
+               NULL, NULL);
+      }
+      else
+         path_set(RARCH_PATH_CONTENT, __core.UTF8String);
+
+      [sender replyToOpenOrPrint:NSApplicationDelegateReplySuccess];
+   }
+   else
+   {
+      const ui_msg_window_t *msg_window = ui_companion_driver_get_msg_window_ptr();
+      if (msg_window)
+      {
+         ui_msg_window_state msg_window_state;
+         msg_window_state.text  = strdup("Cannot open multiple files");
+         msg_window_state.title = strdup(msg_hash_to_str(MSG_PROGRAM));
+         msg_window->information(&msg_window_state);
+
+         free(msg_window_state.text);
+         free(msg_window_state.title);
+      }
+      [sender replyToOpenOrPrint:NSApplicationDelegateReplyFailure];
+   }
+}
+
+static void open_core_handler(ui_browser_window_state_t *state, bool result)
+{
+   rarch_system_info_t *info      = runloop_get_system_info();
+    if (!state)
+        return;
+    if (string_is_empty(state->result))
+        return;
+    if (!result)
+        return;
+
+    settings_t *settings = config_get_ptr();
+
+    rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, (void*)state->result);
+    ui_companion_event_command(CMD_EVENT_LOAD_CORE);
+
+    if (info && info->load_no_content
+          && settings->bools.set_supports_no_game_enable)
+    {
+        content_ctx_info_t content_info = {0};
+        path_clear(RARCH_PATH_CONTENT);
+        task_push_load_content_with_current_core_from_companion_ui(
+                NULL,
+                &content_info,
+                CORE_TYPE_PLAIN,
+                NULL, NULL);
+    }
+}
+
+static void open_document_handler(ui_browser_window_state_t *state, bool result)
+{
+    if (!state)
+        return;
+    if (string_is_empty(state->result))
+        return;
+    if (!result)
+        return;
+
+    struct retro_system_info *system = runloop_get_libretro_system_info();
+    const char            *core_name = system ? system->library_name : NULL;
+
+    path_set(RARCH_PATH_CONTENT, state->result);
+
+    if (core_name)
+    {
+        content_ctx_info_t content_info = {0};
+        task_push_load_content_with_current_core_from_companion_ui(
+                NULL,
+                &content_info,
+                CORE_TYPE_PLAIN,
+                NULL, NULL);
+    }
+}
+
+- (IBAction)openCore:(id)sender {
+    const ui_browser_window_t *browser = ui_companion_driver_get_browser_window_ptr();
+
+    if (browser)
+    {
+        ui_browser_window_state_t browser_state;
+        settings_t *settings        = config_get_ptr();
+
+        browser_state.filters       = strdup("dylib");
+        browser_state.filters_title = strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_SETTINGS));
+        browser_state.title         = strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_CORE_LIST));
+        browser_state.startdir      = strdup(settings->paths.directory_libretro);
+
+        bool result = browser->open(&browser_state);
+        open_core_handler(&browser_state, result);
+
+        free(browser_state.filters);
+        free(browser_state.filters_title);
+        free(browser_state.title);
+        free(browser_state.startdir);
+    }
+}
+
+- (void)openDocument:(id)sender
+{
+   const ui_browser_window_t *browser = ui_companion_driver_get_browser_window_ptr();
+
+    if (browser)
+    {
+        ui_browser_window_state_t browser_state = {{0}};
+        settings_t *settings  = config_get_ptr();
+        NSString *startdir    = BOXSTRING(settings->paths.directory_menu_content);
+
+        if (!startdir.length)
+            startdir           = BOXSTRING("/");
+
+        browser_state.title    = strdup(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST));
+        browser_state.startdir = strdup([startdir UTF8String]);
+
+        bool result = browser->open(&browser_state);
+        open_document_handler(&browser_state, result);
+
+        free(browser_state.startdir);
+        free(browser_state.title);
+    }
+}
+
+- (void)unloadingCore
+{
+}
+
+- (IBAction)showCoresDirectory:(id)sender
+{
+   settings_t *settings = config_get_ptr();
+   [[NSWorkspace sharedWorkspace] openFile:BOXSTRING(settings->paths.directory_libretro)];
+}
+
+- (IBAction)showPreferences:(id)sender
+{
+}
+
+- (IBAction)basicEvent:(id)sender
+{
+   enum event_command cmd;
+   unsigned sender_tag = (unsigned)[sender tag];
+
+   switch (sender_tag)
+   {
+      case 1:
+         cmd = CMD_EVENT_RESET;
+         break;
+      case 2:
+         cmd = CMD_EVENT_LOAD_STATE;
+         break;
+      case 3:
+         cmd = CMD_EVENT_SAVE_STATE;
+         break;
+      case 4:
+         cmd = CMD_EVENT_DISK_EJECT_TOGGLE;
+         break;
+      case 5:
+         cmd = CMD_EVENT_DISK_PREV;
+         break;
+      case 6:
+         cmd = CMD_EVENT_DISK_NEXT;
+         break;
+      case 7:
+         cmd = CMD_EVENT_GRAB_MOUSE_TOGGLE;
+         break;
+      case 8:
+         cmd = CMD_EVENT_MENU_TOGGLE;
+         break;
+      case 9:
+         cmd = CMD_EVENT_PAUSE_TOGGLE;
+         break;
+      case 20:
+         cmd = CMD_EVENT_FULLSCREEN_TOGGLE;
+         break;
+      default:
+         cmd = CMD_EVENT_NONE;
+         break;
+   }
+
+   if (sender_tag >= 10 && sender_tag <= 19)
+   {
+      unsigned idx = (sender_tag - (10-1));
+      rarch_ctl(RARCH_CTL_SET_WINDOWED_SCALE, &idx);
+      cmd = CMD_EVENT_RESIZE_WINDOWED_SCALE;
+   }
+
+   ui_companion_event_command(cmd);
+}
+
+- (void)alertDidEnd:(NSAlert *)alert returnCode:(int32_t)returnCode contextInfo:(void *)contextInfo
+{
+   [[NSApplication sharedApplication] stopModal];
+}
+
+@end
+
+int main(int argc, char *argv[])
+{
+   if (argc == 2)
+   {
+       if (argv[1] != '\0')
+           if (!strncmp(argv[1], "-psn", 4))
+               argc = 1;
+   }
+
+   waiting_argc = argc;
+   waiting_argv = argv;
+
+   return NSApplicationMain(argc, (const char **) argv);
+}
+
+typedef struct ui_companion_cocoa
+{
+   void *empty;
+} ui_companion_cocoa_t;
+
+static void ui_companion_cocoa_notify_content_loaded(void *data)
+{
+    (void)data;
+}
+
+static void ui_companion_cocoa_toggle(void *data, bool force)
+{
+   (void)data;
+   (void)force;
+}
+
+static int ui_companion_cocoa_iterate(void *data, unsigned action)
+{
+   (void)data;
+
+   return 0;
+}
+
+static void ui_companion_cocoa_deinit(void *data)
+{
+   ui_companion_cocoa_t *handle = (ui_companion_cocoa_t*)data;
+
+   app_terminate();
+
+   if (handle)
+      free(handle);
+}
+
+static void *ui_companion_cocoa_init(void)
+{
+   ui_companion_cocoa_t *handle = (ui_companion_cocoa_t*)calloc(1, sizeof(*handle));
+
+   if (!handle)
+      return NULL;
+
+   return handle;
+}
+
+static void ui_companion_cocoa_event_command(void *data, enum event_command cmd)
+{
+   (void)data;
+   (void)cmd;
+}
+
+static void ui_companion_cocoa_notify_list_pushed(void *data,
+    file_list_t *list, file_list_t *menu_list)
+{
+    (void)data;
+    (void)list;
+    (void)menu_list;
+}
+
+static void *ui_companion_cocoa_get_main_window(void *data)
+{
+    return (BRIDGE void *)((RetroArch_OSX*)[[NSApplication sharedApplication] delegate]).window;
+}
+
+ui_companion_driver_t ui_companion_cocoa = {
+   ui_companion_cocoa_init,
+   ui_companion_cocoa_deinit,
+   ui_companion_cocoa_iterate,
+   ui_companion_cocoa_toggle,
+   ui_companion_cocoa_event_command,
+   ui_companion_cocoa_notify_content_loaded,
+   ui_companion_cocoa_notify_list_pushed,
+   NULL, /* notify_refresh */
+   NULL, /* msg_queue_push */
+   NULL, /* render_messagebox */
+   ui_companion_cocoa_get_main_window,
+   NULL, /* log_msg */
+   &ui_browser_window_cocoa,
+   &ui_msg_window_cocoa,
+   &ui_window_cocoa,
+   &ui_application_cocoa,
+   "cocoa",
+};
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index 4e637feb21..1b3be4e623 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -41,7 +41,7 @@
 #endif
 
 static char msg_old[PATH_MAX_LENGTH];
-id<ApplePlatform> apple_platform;
+static id apple_platform;
 static CFRunLoopObserverRef iterate_observer;
 
 /* forward declaration */
@@ -239,7 +239,7 @@ enum
 // This is for iOS versions < 9.0
 - (id)_keyCommandForEvent:(UIEvent*)event
 {
-   /* This gets called twice with the same timestamp 
+   /* This gets called twice with the same timestamp
     * for each keypress, that's fine for polling
     * but is bad for business with events. */
    static double last_time_stamp;
@@ -248,7 +248,7 @@ enum
       return [super _keyCommandForEvent:event];
    last_time_stamp = event.timestamp;
    
-   /* If the _hidEvent is null, [event _keyCode] will crash. 
+   /* If the _hidEvent is null, [event _keyCode] will crash.
     * (This happens with the on screen keyboard). */
    if (event._hidEvent)
    {
@@ -299,13 +299,13 @@ enum
       handle_touch_event(event.allTouches.allObjects);
 
    get_ios_version(&major, &minor);
-    
+   
 #if __IPHONE_OS_VERSION_MAX_ALLOWED < 70000
    if ((major < 7) && [event respondsToSelector:@selector(_gsEvent)])
    {
       /* Keyboard event hack for iOS versions prior to iOS 7.
        *
-       * Derived from: 
+       * Derived from:
        * http://nacho4d-nacho4d.blogspot.com/2012/01/catching-keyboard-events-in-ios.html
        */
       const uint8_t *eventMem = objc_unretainedPointer([event performSelector:@selector(_gsEvent)]);
@@ -379,7 +379,7 @@ enum
   iterate_observer = CFRunLoopObserverCreate(0, kCFRunLoopBeforeWaiting,
                                              true, 0, rarch_draw_observer, 0);
   CFRunLoopAddObserver(CFRunLoopGetMain(), iterate_observer, kCFRunLoopCommonModes);
-    
+  
 #ifdef HAVE_MFI
     extern bool apple_gamecontroller_joypad_init(void *data);
     apple_gamecontroller_joypad_init(NULL);
@@ -430,7 +430,7 @@ enum
 {
    NSString *filename = (NSString*)url.path.lastPathComponent;
    NSError     *error = nil;
-    
+   
    [[NSFileManager defaultManager] moveItemAtPath:[url path] toPath:[self.documentsDirectory stringByAppendingPathComponent:filename] error:&error];
    
    if (error)
@@ -497,11 +497,11 @@ enum
    if (string_is_equal(apple_frontend_settings.orientations, "landscape"))
       apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskLandscape;
    else if (string_is_equal(apple_frontend_settings.orientations, "portrait"))
-      apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskPortrait 
+      apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskPortrait
          | UIInterfaceOrientationMaskPortraitUpsideDown;
 }
 
-- (void)mainMenuRefresh 
+- (void)mainMenuRefresh
 {
   [self.mainmenu reloadData];
 }
@@ -525,7 +525,7 @@ enum
         self.menu_count--;
 
         [self popViewControllerAnimated:YES];
-        self.mainmenu = self.mainmenu.last_menu;      
+        self.mainmenu = self.mainmenu.last_menu;
      }
   }
 }
@@ -593,7 +593,7 @@ static void ui_companion_cocoatouch_notify_content_loaded(void *data)
       [ap showGameView];
 }
 
-static void ui_companion_cocoatouch_toggle(void *data, bool force)
+static void ui_companion_cocoatouch_toggle(void *data)
 {
    RetroArch_iOS *ap   = (RetroArch_iOS *)apple_platform;
 
@@ -608,7 +608,7 @@ static int ui_companion_cocoatouch_iterate(void *data, unsigned action)
    RetroArch_iOS *ap  = (RetroArch_iOS*)apple_platform;
 
    (void)data;
-    
+   
    if (ap)
       [ap showPauseMenu:ap];
 
@@ -662,7 +662,7 @@ static void ui_companion_cocoatouch_notify_list_pushed(void *data,
      printf( "notify_list_pushed: old size should not be larger\n" );
 
    old_size = new_size;
-      
+   
    if (ap)
      [ap mainMenuPushPop: pushp];
 }
@@ -686,9 +686,8 @@ static void ui_companion_cocoatouch_render_messagebox(const char *msg)
    }
 }
 
-static void ui_companion_cocoatouch_msg_queue_push(void *data,
-      const char *msg,
-      unsigned priority, unsigned duration, bool flush)
+static void ui_companion_cocoatouch_msg_queue_push(const char *msg,
+   unsigned priority, unsigned duration, bool flush)
 {
    RetroArch_iOS *ap   = (RetroArch_iOS *)apple_platform;
 
diff --git a/ui/drivers/ui_cocoatouch_metal.m b/ui/drivers/ui_cocoatouch_metal.m
new file mode 100644
index 0000000000..b1c21a624a
--- /dev/null
+++ b/ui/drivers/ui_cocoatouch_metal.m
@@ -0,0 +1,719 @@
+/* RetroArch - A frontend for libretro.
+ *  Copyright (C) 2011-2016 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <stdint.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <boolean.h>
+
+#include <file/file_path.h>
+#include <queues/task_queue.h>
+#include <string/stdstring.h>
+#include <retro_timers.h>
+
+#include "cocoa/cocoa_common_metal.h"
+#include "../ui_companion_driver.h"
+#include "../../configuration.h"
+#include "../../frontend/frontend.h"
+#include "../../input/drivers/cocoa_input.h"
+#include "../../input/drivers_keyboard/keyboard_event_apple.h"
+#include "../../retroarch.h"
+#ifdef HAVE_AVFOUNDATION
+#import <AVFoundation/AVFoundation.h>
+#endif
+
+#ifdef HAVE_MENU
+#include "../../menu/menu_setting.h"
+#endif
+
+static char msg_old[PATH_MAX_LENGTH];
+id<ApplePlatform> apple_platform;
+static CFRunLoopObserverRef iterate_observer;
+
+/* forward declaration */
+static void apple_rarch_exited(void);
+
+static void rarch_enable_ui(void)
+{
+   bool boolean = true;
+#ifdef HAVE_AVFOUNDATION
+   [[RetroArch_iOS get] supportOtherAudioSessions];
+#endif
+
+   ui_companion_set_foreground(true);
+
+   rarch_ctl(RARCH_CTL_SET_PAUSED, &boolean);
+   rarch_ctl(RARCH_CTL_SET_IDLE,   &boolean);
+   rarch_menu_running();
+}
+
+static void rarch_disable_ui(void)
+{
+   bool boolean = false;
+
+   ui_companion_set_foreground(false);
+
+   rarch_ctl(RARCH_CTL_SET_PAUSED, &boolean);
+   rarch_ctl(RARCH_CTL_SET_IDLE,   &boolean);
+   rarch_menu_running_finished();
+#ifdef HAVE_AVFOUNDATION
+   [[RetroArch_iOS get] supportOtherAudioSessions];
+#endif
+}
+
+static void ui_companion_cocoatouch_event_command(
+      void *data, enum event_command cmd)
+{
+    (void)data;
+}
+
+static void rarch_draw_observer(CFRunLoopObserverRef observer,
+    CFRunLoopActivity activity, void *info)
+{
+   unsigned sleep_ms  = 0;
+   int          ret   = runloop_iterate(&sleep_ms);
+
+   if (ret == 1 && !ui_companion_is_on_foreground() && sleep_ms > 0)
+      retro_sleep(sleep_ms);
+   task_queue_check();
+
+   if (ret == -1)
+   {
+      ui_companion_cocoatouch_event_command(NULL, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG);
+      main_exit(NULL);
+      return;
+   }
+
+   if (rarch_ctl(RARCH_CTL_IS_IDLE, NULL))
+      return;
+   CFRunLoopWakeUp(CFRunLoopGetMain());
+}
+
+apple_frontend_settings_t apple_frontend_settings;
+
+void get_ios_version(int *major, int *minor)
+{
+    NSArray *decomposed_os_version = [[UIDevice currentDevice].systemVersion componentsSeparatedByString:@"."];
+    
+    if (major && decomposed_os_version.count > 0)
+        *major = (int)[decomposed_os_version[0] integerValue];
+    if (minor && decomposed_os_version.count > 1)
+        *minor = (int)[decomposed_os_version[1] integerValue];
+}
+
+extern float cocoagl_gfx_ctx_get_native_scale(void);
+
+/* Input helpers: This is kept here because it needs ObjC */
+static void handle_touch_event(NSArray* touches)
+{
+   unsigned i;
+   cocoa_input_data_t *apple = (cocoa_input_data_t*)input_driver_get_data();
+   float scale               = cocoagl_gfx_ctx_get_native_scale();
+
+   if (!apple)
+      return;
+
+   apple->touch_count = 0;
+   
+   for (i = 0; i < touches.count && (apple->touch_count < MAX_TOUCHES); i++)
+   {
+      CGPoint       coord;
+      UITouch      *touch = [touches objectAtIndex:i];
+      
+      if (touch.view != [CocoaView get].view)
+         continue;
+
+      coord = [touch locationInView:[touch view]];
+
+      if (touch.phase != UITouchPhaseEnded && touch.phase != UITouchPhaseCancelled)
+      {
+         apple->touches[apple->touch_count   ].screen_x = coord.x * scale;
+         apple->touches[apple->touch_count ++].screen_y = coord.y * scale;
+      }
+   }
+}
+
+#ifndef HAVE_APPLE_STORE
+// iO7 Keyboard support
+@interface UIEvent(iOS7Keyboard)
+@property(readonly, nonatomic) long long _keyCode;
+@property(readonly, nonatomic) _Bool _isKeyDown;
+@property(retain, nonatomic) NSString *_privateInput;
+@property(nonatomic) long long _modifierFlags;
+- (struct __IOHIDEvent { }*)_hidEvent;
+@end
+
+@interface UIApplication(iOS7Keyboard)
+- (void)handleKeyUIEvent:(UIEvent*)event;
+- (id)_keyCommandForEvent:(UIEvent*)event;
+@end
+#endif
+
+@interface RApplication : UIApplication
+@end
+
+@implementation RApplication
+
+#ifndef HAVE_APPLE_STORE
+/* Keyboard handler for iOS 7. */
+
+/* This is copied here as it isn't
+ * defined in any standard iOS header */
+enum
+{
+   NSAlphaShiftKeyMask = 1 << 16,
+   NSShiftKeyMask      = 1 << 17,
+   NSControlKeyMask    = 1 << 18,
+   NSAlternateKeyMask  = 1 << 19,
+   NSCommandKeyMask    = 1 << 20,
+   NSNumericPadKeyMask = 1 << 21,
+   NSHelpKeyMask       = 1 << 22,
+   NSFunctionKeyMask   = 1 << 23,
+   NSDeviceIndependentModifierFlagsMask = 0xffff0000U
+};
+
+// This is specifically for iOS 9, according to the private headers
+-(void)handleKeyUIEvent:(UIEvent *)event {
+    /* This gets called twice with the same timestamp
+     * for each keypress, that's fine for polling
+     * but is bad for business with events. */
+    static double last_time_stamp;
+    
+    if (last_time_stamp == event.timestamp)
+       return [super handleKeyUIEvent:event];
+    
+    last_time_stamp = event.timestamp;
+    
+    /* If the _hidEvent is null, [event _keyCode] will crash.
+     * (This happens with the on screen keyboard). */
+    if (event._hidEvent)
+    {
+        NSString       *ch = (NSString*)event._privateInput;
+        uint32_t character = 0;
+        uint32_t mod       = 0;
+        
+        mod |= (event._modifierFlags & NSAlphaShiftKeyMask) ? RETROKMOD_CAPSLOCK : 0;
+        mod |= (event._modifierFlags & NSShiftKeyMask     ) ? RETROKMOD_SHIFT    : 0;
+        mod |= (event._modifierFlags & NSControlKeyMask   ) ? RETROKMOD_CTRL     : 0;
+        mod |= (event._modifierFlags & NSAlternateKeyMask ) ? RETROKMOD_ALT      : 0;
+        mod |= (event._modifierFlags & NSCommandKeyMask   ) ? RETROKMOD_META     : 0;
+        mod |= (event._modifierFlags & NSNumericPadKeyMask) ? RETROKMOD_NUMLOCK  : 0;
+        
+        if (ch && ch.length != 0)
+        {
+            unsigned i;
+            character = [ch characterAtIndex:0];
+            
+            apple_input_keyboard_event(event._isKeyDown,
+                                       (uint32_t)event._keyCode, 0, mod,
+                                       RETRO_DEVICE_KEYBOARD);
+            
+            for (i = 1; i < ch.length; i++)
+                apple_input_keyboard_event(event._isKeyDown,
+                                           0, [ch characterAtIndex:i], mod,
+                                           RETRO_DEVICE_KEYBOARD);
+        }
+        
+        apple_input_keyboard_event(event._isKeyDown,
+                                   (uint32_t)event._keyCode, character, mod,
+                                   RETRO_DEVICE_KEYBOARD);
+    }
+    
+    [super handleKeyUIEvent:event];
+}
+
+// This is for iOS versions < 9.0
+- (id)_keyCommandForEvent:(UIEvent*)event
+{
+   /* This gets called twice with the same timestamp 
+    * for each keypress, that's fine for polling
+    * but is bad for business with events. */
+   static double last_time_stamp;
+   
+   if (last_time_stamp == event.timestamp)
+      return [super _keyCommandForEvent:event];
+   last_time_stamp = event.timestamp;
+   
+   /* If the _hidEvent is null, [event _keyCode] will crash. 
+    * (This happens with the on screen keyboard). */
+   if (event._hidEvent)
+   {
+      NSString       *ch = (NSString*)event._privateInput;
+      uint32_t character = 0;
+      uint32_t mod       = 0;
+      
+      mod |= (event._modifierFlags & NSAlphaShiftKeyMask) ? RETROKMOD_CAPSLOCK : 0;
+      mod |= (event._modifierFlags & NSShiftKeyMask     ) ? RETROKMOD_SHIFT    : 0;
+      mod |= (event._modifierFlags & NSControlKeyMask   ) ? RETROKMOD_CTRL     : 0;
+      mod |= (event._modifierFlags & NSAlternateKeyMask ) ? RETROKMOD_ALT      : 0;
+      mod |= (event._modifierFlags & NSCommandKeyMask   ) ? RETROKMOD_META     : 0;
+      mod |= (event._modifierFlags & NSNumericPadKeyMask) ? RETROKMOD_NUMLOCK  : 0;
+      
+      if (ch && ch.length != 0)
+      {
+         unsigned i;
+         character = [ch characterAtIndex:0];
+
+         apple_input_keyboard_event(event._isKeyDown,
+               (uint32_t)event._keyCode, 0, mod,
+               RETRO_DEVICE_KEYBOARD);
+         
+         for (i = 1; i < ch.length; i++)
+            apple_input_keyboard_event(event._isKeyDown,
+                  0, [ch characterAtIndex:i], mod,
+                  RETRO_DEVICE_KEYBOARD);
+      }
+      
+      apple_input_keyboard_event(event._isKeyDown,
+            (uint32_t)event._keyCode, character, mod,
+            RETRO_DEVICE_KEYBOARD);
+   }
+
+   return [super _keyCommandForEvent:event];
+}
+#endif
+
+#define GSEVENT_TYPE_KEYDOWN 10
+#define GSEVENT_TYPE_KEYUP 11
+
+- (void)sendEvent:(UIEvent *)event
+{
+   int major, minor;
+   [super sendEvent:event];
+
+   if (event.allTouches.count)
+      handle_touch_event(event.allTouches.allObjects);
+
+   get_ios_version(&major, &minor);
+    
+#if __IPHONE_OS_VERSION_MAX_ALLOWED < 70000
+   if ((major < 7) && [event respondsToSelector:@selector(_gsEvent)])
+   {
+      /* Keyboard event hack for iOS versions prior to iOS 7.
+       *
+       * Derived from: 
+       * http://nacho4d-nacho4d.blogspot.com/2012/01/catching-keyboard-events-in-ios.html
+       */
+      const uint8_t *eventMem = objc_unretainedPointer([event performSelector:@selector(_gsEvent)]);
+      int           eventType = eventMem ? *(int*)&eventMem[8] : 0;
+
+      switch (eventType)
+      {
+         case GSEVENT_TYPE_KEYDOWN:
+         case GSEVENT_TYPE_KEYUP:
+            apple_input_keyboard_event(eventType == GSEVENT_TYPE_KEYDOWN,
+                  *(uint16_t*)&eventMem[0x3C], 0, 0, RETRO_DEVICE_KEYBOARD);
+            break;
+      }
+   }
+#endif
+}
+
+@end
+
+@implementation RetroArch_iOS
+
++ (RetroArch_iOS*)get
+{
+#ifdef HAVE_AVFOUNDATION
+   /* Implicitly initializes your audio session. */
+   [(RetroArch_iOS*)[[UIApplication sharedApplication] delegate] supportOtherAudioSessions];
+#endif
+   return (RetroArch_iOS*)[[UIApplication sharedApplication] delegate];
+}
+
+-(NSString*)documentsDirectory {
+    if ( _documentsDirectory == nil ) {
+        NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+        _documentsDirectory = paths.firstObject;
+    }
+    return _documentsDirectory;
+}
+
+- (void)applicationDidFinishLaunching:(UIApplication *)application
+{
+   char arguments[]   = "retroarch";
+   char       *argv[] = {arguments,   NULL};
+   int argc           = 1;
+   apple_platform     = self;
+
+   [self setDelegate:self];
+
+#ifdef HAVE_AVFOUNDATION
+    /* Other background audio check */
+   [self supportOtherAudioSessions];
+#endif
+
+   /* Setup window */
+   self.window      = [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
+   [self.window makeKeyAndVisible];
+
+   self.mainmenu = [RAMainMenu new];
+   self.mainmenu.last_menu = self.mainmenu;
+   [self pushViewController:self.mainmenu animated:NO];
+
+   [self refreshSystemConfig];
+   [self showGameView];
+
+#ifdef HAVE_AVFOUNDATION
+   [self supportOtherAudioSessions];
+#endif
+
+   if (rarch_main(argc, argv, NULL))
+      apple_rarch_exited();
+
+  iterate_observer = CFRunLoopObserverCreate(0, kCFRunLoopBeforeWaiting,
+                                             true, 0, rarch_draw_observer, 0);
+  CFRunLoopAddObserver(CFRunLoopGetMain(), iterate_observer, kCFRunLoopCommonModes);
+    
+#ifdef HAVE_MFI
+    extern bool apple_gamecontroller_joypad_init(void *data);
+    apple_gamecontroller_joypad_init(NULL);
+#endif
+
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application
+{
+#ifdef HAVE_AVFOUNDATION
+    [self supportOtherAudioSessions];
+#endif
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application
+{
+   CFRunLoopObserverInvalidate(iterate_observer);
+   CFRelease(iterate_observer);
+   iterate_observer = NULL;
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application
+{
+   settings_t *settings = config_get_ptr();
+   
+#ifdef HAVE_AVFOUNDATION
+   [self supportOtherAudioSessions];
+#endif
+   if (settings->bools.ui_companion_start_on_boot)
+      return;
+    
+  [self showGameView];
+}
+
+- (void)applicationWillResignActive:(UIApplication *)application
+{
+#ifdef HAVE_AVFOUNDATION
+   [self supportOtherAudioSessions];
+#endif
+   dispatch_async(dispatch_get_main_queue(),
+                  ^{
+                  ui_companion_cocoatouch_event_command(NULL, CMD_EVENT_MENU_SAVE_CURRENT_CONFIG);
+                  });
+   [self showPauseMenu: self];
+}
+
+-(BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
+{
+   NSString *filename = (NSString*)url.path.lastPathComponent;
+   NSError     *error = nil;
+    
+   [[NSFileManager defaultManager] moveItemAtPath:[url path] toPath:[self.documentsDirectory stringByAppendingPathComponent:filename] error:&error];
+   
+   if (error)
+      printf("%s\n", [[error description] UTF8String]);
+   
+   return true;
+}
+
+- (void)navigationController:(UINavigationController *)navigationController willShowViewController:(UIViewController *)viewController animated:(BOOL)animated
+{
+   [self setToolbarHidden:![[viewController toolbarItems] count] animated:YES];
+   [self refreshSystemConfig];
+}
+
+- (void)showGameView
+{
+#ifdef HAVE_AVFOUNDATION
+    /* implicitly initializes your audio session */
+   [self supportOtherAudioSessions];
+#endif
+   [self popToRootViewControllerAnimated:NO];
+   [self setToolbarHidden:true animated:NO];
+   [[UIApplication sharedApplication] setStatusBarHidden:true withAnimation:UIStatusBarAnimationNone];
+   [[UIApplication sharedApplication] setIdleTimerDisabled:true];
+   [self.window setRootViewController:[CocoaView get]];
+
+   ui_companion_cocoatouch_event_command(NULL, CMD_EVENT_AUDIO_START);
+   rarch_disable_ui();
+}
+
+- (IBAction)showPauseMenu:(id)sender
+{
+#ifndef HAVE_AVFOUNDATION
+   ui_companion_cocoatouch_event_command(NULL, CMD_EVENT_AUDIO_STOP);
+#endif
+   rarch_enable_ui();
+
+   [[UIApplication sharedApplication] setStatusBarHidden:false withAnimation:UIStatusBarAnimationNone];
+   [[UIApplication sharedApplication] setIdleTimerDisabled:false];
+   [self.window setRootViewController:self];
+}
+
+
+- (void)toggleUI
+{
+   if (ui_companion_is_on_foreground())
+   {
+      [self showGameView];
+   }
+   else
+   {
+      [self showPauseMenu:self];
+   }
+#ifdef HAVE_AVFOUNDATION
+   [self supportOtherAudioSessions];
+#endif
+}
+
+- (void)refreshSystemConfig
+{
+   /* Get enabled orientations */
+   apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskAll;
+   
+   if (string_is_equal(apple_frontend_settings.orientations, "landscape"))
+      apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskLandscape;
+   else if (string_is_equal(apple_frontend_settings.orientations, "portrait"))
+      apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskPortrait 
+         | UIInterfaceOrientationMaskPortraitUpsideDown;
+}
+
+- (void)mainMenuRefresh 
+{
+  [self.mainmenu reloadData];
+}
+
+- (void)mainMenuPushPop: (bool)pushp
+{
+  if ( pushp )
+  {
+     self.menu_count++;
+     RAMenuBase* next_menu = [RAMainMenu new];
+     next_menu.last_menu = self.mainmenu;
+     self.mainmenu = next_menu;
+     [self pushViewController:self.mainmenu animated:YES];
+  }
+  else
+  {
+     if ( self.menu_count == 0 )
+        [self.mainmenu reloadData];
+     else
+     {
+        self.menu_count--;
+
+        [self popViewControllerAnimated:YES];
+        self.mainmenu = self.mainmenu.last_menu;      
+     }
+  }
+}
+
+- (void)supportOtherAudioSessions
+{
+#ifdef HAVE_AVFOUNDATION
+    /* implicitly initializes your audio session */
+    AVAudioSession *audioSession = [AVAudioSession sharedInstance];
+    [audioSession setCategory: AVAudioSessionCategoryAmbient error: nil];
+    [audioSession setActive:YES error:nil];
+#endif
+}
+
+- (void)mainMenuRenderMessageBox:(NSString *)msg
+{
+  [self.mainmenu renderMessageBox:msg];
+}
+
+@end
+
+int main(int argc, char *argv[])
+{
+   @autoreleasepool {
+      return UIApplicationMain(argc, argv, NSStringFromClass([RApplication class]), NSStringFromClass([RetroArch_iOS class]));
+   }
+}
+
+#if 0
+static void apple_display_alert(const char *message, const char *title)
+{
+   UIAlertView* alert = [[UIAlertView alloc] initWithTitle:BOXSTRING(title)
+                                             message:BOXSTRING(message)
+                                             delegate:nil
+                                             cancelButtonTitle:BOXSTRING("OK")
+                                             otherButtonTitles:nil];
+   [alert show];
+}
+#endif
+
+static void apple_rarch_exited(void)
+{
+    RetroArch_iOS *ap = (RetroArch_iOS *)apple_platform;
+    
+    if (!ap)
+        return;
+#ifdef HAVE_AVFOUNDATION
+    [ap supportOtherAudioSessions];
+#endif
+    [ap showPauseMenu:ap];
+}
+
+typedef struct ui_companion_cocoatouch
+{
+   void *empty;
+} ui_companion_cocoatouch_t;
+
+static void ui_companion_cocoatouch_notify_content_loaded(void *data)
+{
+   RetroArch_iOS *ap = (RetroArch_iOS *)apple_platform;
+
+   (void)data;
+
+   if (ap)
+      [ap showGameView];
+}
+
+static void ui_companion_cocoatouch_toggle(void *data, bool force)
+{
+   RetroArch_iOS *ap   = (RetroArch_iOS *)apple_platform;
+
+   (void)data;
+
+   if (ap)
+      [ap toggleUI];
+}
+
+static int ui_companion_cocoatouch_iterate(void *data, unsigned action)
+{
+   RetroArch_iOS *ap  = (RetroArch_iOS*)apple_platform;
+
+   (void)data;
+    
+   if (ap)
+      [ap showPauseMenu:ap];
+
+   return 0;
+}
+
+static void ui_companion_cocoatouch_deinit(void *data)
+{
+   ui_companion_cocoatouch_t *handle = (ui_companion_cocoatouch_t*)data;
+
+   apple_rarch_exited();
+
+   if (handle)
+      free(handle);
+}
+
+static void *ui_companion_cocoatouch_init(void)
+{
+   ui_companion_cocoatouch_t *handle = (ui_companion_cocoatouch_t*)
+    calloc(1, sizeof(*handle));
+
+   if (!handle)
+      return NULL;
+    
+   rarch_enable_ui();
+
+   return handle;
+}
+
+static size_t old_size = 0;
+
+static void ui_companion_cocoatouch_notify_list_pushed(void *data,
+   file_list_t *list, file_list_t *menu_list)
+{
+   RetroArch_iOS *ap   = (RetroArch_iOS *)apple_platform;
+   bool pushp          = false;
+   size_t new_size     = file_list_get_size( menu_list );
+
+   /* FIXME workaround for the double call */
+   if ( old_size == 0 )
+   {
+      old_size = new_size;
+      return;
+   }
+
+   if ( old_size == new_size )
+     pushp = false;
+   else if ( old_size < new_size )
+     pushp = true;
+   else if ( old_size > new_size )
+     printf( "notify_list_pushed: old size should not be larger\n" );
+
+   old_size = new_size;
+      
+   if (ap)
+     [ap mainMenuPushPop: pushp];
+}
+
+static void ui_companion_cocoatouch_notify_refresh(void *data)
+{
+   RetroArch_iOS *ap   = (RetroArch_iOS *)apple_platform;
+
+   if (ap)
+     [ap mainMenuRefresh];
+}
+
+static void ui_companion_cocoatouch_render_messagebox(const char *msg)
+{
+   RetroArch_iOS *ap   = (RetroArch_iOS *)apple_platform;
+
+   if (ap && !string_is_equal(msg, msg_old))
+   {
+      [ap mainMenuRenderMessageBox: [NSString stringWithUTF8String:msg]];
+      strlcpy(msg_old, msg, sizeof(msg_old));
+   }
+}
+
+static void ui_companion_cocoatouch_msg_queue_push(void *data,
+      const char *msg,
+      unsigned priority, unsigned duration, bool flush)
+{
+   RetroArch_iOS *ap   = (RetroArch_iOS *)apple_platform;
+
+   if (ap && msg)
+   {
+      [ap.mainmenu msgQueuePush: [NSString stringWithUTF8String:msg]];
+   }
+}
+
+ui_companion_driver_t ui_companion_cocoatouch = {
+   ui_companion_cocoatouch_init,
+   ui_companion_cocoatouch_deinit,
+   ui_companion_cocoatouch_iterate,
+   ui_companion_cocoatouch_toggle,
+   ui_companion_cocoatouch_event_command,
+   ui_companion_cocoatouch_notify_content_loaded,
+   ui_companion_cocoatouch_notify_list_pushed,
+   ui_companion_cocoatouch_notify_refresh,
+   ui_companion_cocoatouch_msg_queue_push,
+   ui_companion_cocoatouch_render_messagebox,
+   NULL, /* get_main_window */
+   NULL, /* log_msg */
+   &ui_browser_window_null,
+   &ui_msg_window_null,
+   &ui_window_null,
+   &ui_application_null,
+   "cocoatouch",
+};
diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c
index a866b6749b..daeae6e1d3 100644
--- a/ui/ui_companion_driver.c
+++ b/ui/ui_companion_driver.c
@@ -30,7 +30,7 @@ static const ui_companion_driver_t *ui_companion_drivers[] = {
 #if defined(_WIN32) && !defined(_XBOX)
    &ui_companion_win32,
 #endif
-#ifdef HAVE_COCOA
+#if defined(HAVE_COCOA) || defined(HAVE_COCOA_METAL)
    &ui_companion_cocoa,
 #endif
 #ifdef HAVE_COCOATOUCH
diff --git a/wiiu/include/arpa/inet.h b/wiiu/include/arpa/inet.h
index fa505565c6..2a79d9526d 100644
--- a/wiiu/include/arpa/inet.h
+++ b/wiiu/include/arpa/inet.h
@@ -6,6 +6,7 @@ extern "C" {
 #endif
 
 #include <netinet/in.h>
+#include <sys/socket.h>
 
 char *inet_ntoa(struct in_addr in);
 const char *inet_ntop(int af, const void *cp, char *buf, socklen_t len);
diff --git a/wiiu/include/ifaddrs.h b/wiiu/include/ifaddrs.h
new file mode 100644
index 0000000000..bf78a06c02
--- /dev/null
+++ b/wiiu/include/ifaddrs.h
@@ -0,0 +1,18 @@
+#ifndef _IFADDRS_H_
+#define _IFADDRS_H_
+
+#include <sys/socket.h>
+
+struct ifaddrs {
+   struct ifaddrs *ifa_next;
+   char *ifa_name;
+   unsigned int ifa_flags;
+   struct sockaddr *ifa_addr;
+   struct sockaddr *ifa_netmask;
+   struct sockaddr *ifa_dstaddr;
+   void *ifa_data;
+};
+
+int getifaddrs(struct ifaddrs **ifap);
+void freeifaddrs(struct ifaddrs *ifp);
+#endif // _IFADDRS_H_
\ No newline at end of file
diff --git a/wiiu/include/sys/socket.h b/wiiu/include/sys/socket.h
index 3486f5130f..322d6bb905 100644
--- a/wiiu/include/sys/socket.h
+++ b/wiiu/include/sys/socket.h
@@ -28,6 +28,7 @@ extern "C" {
 /* return codes */
 #define SO_SUCCESS      0
 #define SO_EWOULDBLOCK  6
+#define SO_EINVAL      11
 
 #define EWOULDBLOCK SO_EWOULDBLOCK
 #define EAGAIN SO_EWOULDBLOCK
@@ -42,11 +43,10 @@ struct sockaddr
    char        sa_data[];
 };
 
-struct sockaddr_storage
-{
-   sa_family_t ss_family;
-   char        __ss_padding[26];
-};
+/* Wii U only supports IPv4 so we make sockaddr_storage
+   be sockaddr_in for compatibility.
+ */
+#define sockaddr_storage sockaddr_in
 
 struct linger
 {
diff --git a/wiiu/net_listen.sh b/wiiu/net_listen.sh
index f023734305..ca121f4af2 100755
--- a/wiiu/net_listen.sh
+++ b/wiiu/net_listen.sh
@@ -6,7 +6,28 @@
 #
 # If you would like a logfile, pipe this script's output to tee.
 
-script_dir=$(dirname $(readlink -f $0))
+NETCAT=
+
+find_netcat()
+{
+  NETCAT=$(which netcat 2>/dev/null |grep '/')
+  if [ -z "$NETCAT" ]; then
+    NETCAT=$(which nc 2>/dev/null |grep '/')
+    if [ -z "$NETCAT" ]; then
+      echo "Failed to find either 'netcat' or 'nc'. Please install it."
+      exit 1
+    fi
+  fi
+}
+
+do_readlink()
+{
+  local exe=$1
+  echo "$(cd $(dirname $exe) && pwd)"
+}
+
+find_netcat
+script_dir=$(do_readlink $0)
 
 IP=$(which ip 2>/dev/null | grep '^/')
 IFCONFIG=$(which ifconfig 2>/dev/null | grep '^/')
@@ -54,8 +75,8 @@ echo "Listening for UDP packets on broadcast IP: $broadcast"
 while [ $exit_listen_loop -eq 0 ]; do
   echo ========= `date` =========
   if [ -z "$TS" ]; then
-    netcat -kluw 0 $broadcast $PC_DEVELOPMENT_TCP_PORT
+    $NETCAT -kluw 0 $broadcast $PC_DEVELOPMENT_TCP_PORT
   else
-    netcat -kluw 0 $broadcast $PC_DEVELOPMENT_TCP_PORT |ts '[%Y-%m-%d %H:%M:%.S]'
+    $NETCAT -kluw 0 $broadcast $PC_DEVELOPMENT_TCP_PORT |ts '[%Y-%m-%d %H:%M:%.S]'
   fi
 done
diff --git a/wiiu/system/missing_libc_functions.c b/wiiu/system/missing_libc_functions.c
index bc47266b3a..4a35405a10 100644
--- a/wiiu/system/missing_libc_functions.c
+++ b/wiiu/system/missing_libc_functions.c
@@ -5,10 +5,18 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <wiiu/os.h>
+#include <wiiu/ac.h>
+#include <wiiu/types.h>
 #include <pwd.h>
 #include <sys/reent.h>
+#include <ifaddrs.h>
 #include <errno.h>
 #include <time.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <string.h>
+
+#include <verbosity.h>
 
 /* This is usually in libogc; we can't use that on wiiu */
 int usleep(useconds_t microseconds) {
@@ -112,3 +120,124 @@ int clock_gettime(clockid_t clk_id, struct timespec* tp) {
    }
    return 0;
 }
+
+/**
+ * Implementation of getifaddrs() and freeifaddrs() for WiiU.
+ */
+
+// the Wii U doesn't define an interface name, so we'll use something generic.
+static const char *wiiu_iface_name = "eth0";
+
+/**
+ * Allocate and zeroize the hunk of memory for the ifaddrs struct and its contents; the struct will be filled
+ * out later.
+ * 
+ * returns NULL if any of the memory allocations fail.
+ */
+static struct ifaddrs *buildEmptyIfa() {
+      struct ifaddrs *result = (struct ifaddrs *)malloc(sizeof(struct ifaddrs));
+      if(result != NULL) {
+            memset(result, 0, sizeof(struct ifaddrs));
+            result->ifa_name = strdup(wiiu_iface_name);
+            result->ifa_addr = (struct sockaddr *)malloc(sizeof(struct sockaddr_in));
+            result->ifa_netmask = (struct sockaddr *)malloc(sizeof(struct sockaddr_in));
+            result->ifa_dstaddr = (struct sockaddr *)malloc(sizeof(struct sockaddr_in));
+
+            if(!result->ifa_name || !result->ifa_addr || !result->ifa_netmask || !result->ifa_dstaddr)
+                  goto error;
+
+            memset(result->ifa_addr, 0, sizeof(struct sockaddr_in));
+            result->ifa_addr->sa_family = AF_INET;
+            memset(result->ifa_netmask, 0, sizeof(struct sockaddr_in));
+            result->ifa_netmask->sa_family = AF_INET;
+            memset(result->ifa_dstaddr, 0, sizeof(struct sockaddr_in));
+            result->ifa_dstaddr->sa_family = AF_INET;
+      }
+
+      return result;
+      error:
+      freeifaddrs(result);
+      return NULL;
+}
+
+static int getAssignedAddress(struct sockaddr_in *sa) {
+      if(sa == NULL)
+            return -1;
+      ACIpAddress addr;
+      int result = ACGetAssignedAddress(&addr);
+      if(result == 0)
+            sa->sin_addr.s_addr = addr;
+
+      return result;
+}
+
+static int getAssignedSubnet(struct sockaddr_in *sa) {
+      if(sa == NULL)
+            return -1;
+
+      ACIpAddress mask;
+      int result = ACGetAssignedSubnet(&mask);
+      if(result == 0)
+            sa->sin_addr.s_addr = mask;
+
+      return result;
+}
+
+static int getBroadcastAddress(struct sockaddr_in *sa, struct sockaddr_in *addr, struct sockaddr_in *mask) {
+      if(!sa || !addr || !mask)
+            return -1;
+
+      sa->sin_addr.s_addr = addr->sin_addr.s_addr | (~mask->sin_addr.s_addr);
+      return 0;
+}
+
+static struct ifaddrs *getWiiUInterfaceAddressData(void) {
+      struct ifaddrs *result = buildEmptyIfa();
+
+      if(result != NULL) {
+            if(getAssignedAddress((struct sockaddr_in *)result->ifa_addr) < 0 ||
+               getAssignedSubnet((struct sockaddr_in *)result->ifa_netmask) < 0 ||
+               getBroadcastAddress((struct sockaddr_in *)result->ifa_dstaddr,
+               (struct sockaddr_in *)result->ifa_addr,
+               (struct sockaddr_in *)result->ifa_netmask) < 0) {
+                  goto error;
+            }
+      }
+
+      return result;
+
+      error:
+      freeifaddrs(result);
+      return NULL;
+}
+
+int getifaddrs(struct ifaddrs **ifap) {
+      if(ifap == NULL) {
+            return -1;
+      }
+      *ifap = getWiiUInterfaceAddressData();
+
+      return (*ifap == NULL) ? -1 : 0;
+}
+
+void freeifaddrs(struct ifaddrs *ifp) {
+      if(ifp != NULL) {
+            if(ifp->ifa_name) {
+                  free(ifp->ifa_name);
+                  ifp->ifa_name = NULL;
+            }
+            if(ifp->ifa_addr) {
+                  free(ifp->ifa_addr);
+                  ifp->ifa_addr = NULL;
+            }
+            if(ifp->ifa_netmask) {
+                  free(ifp->ifa_netmask);
+                  ifp->ifa_netmask = NULL;
+            }
+            if(ifp->ifa_dstaddr) {
+                  free(ifp->ifa_dstaddr);
+                  ifp->ifa_dstaddr = NULL;
+            }
+            free(ifp);
+      }
+}
\ No newline at end of file