diff --git a/CHANGES.md b/CHANGES.md
index 6b8e1c41d7..18655561a4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,5 @@
 # 1.5.1 (future)
+- AUTOSAVE/SRAM - Fix bug #3829 / #4820 (https://github.com/libretro/RetroArch/issues/3829)
 - NET: Fix bug #4703 (https://github.com/libretro/RetroArch/issues/4703)
 - ANDROID: Runtime permission checking
 - ANDROID: Improve autoconf fallback
@@ -14,8 +15,13 @@ default font
 - WINDOWS: Core mouse input should be relative again in cores
 - MISC: Various frontend optimizations.
 - VIDEO: Fix threaded video regression; tickering of menu entries would no longer work.
+- WII: Fix crashing issues which could occur with the dummy core
 - LOBBIES: Fallback to filename based matching if no CRC matches are found (for people making playlists by hand)
+- LOBBIES: GUI refinement, show stop hosting when a host has been started, show disconnect when playing as client
 - VITA: Fix slow I/O
+- VITA: Fix 30fps menu (poke into input now instead of reading the entire input buffer which apparently is slow)
+- VITA: Fix frame throttle
+- VULKAN: Unicode font rendering support. Should fix bad character encoding for French characters, etc.
 - VULKAN: Fix some crashes on loading some thumbnails
 
 # 1.5.0
diff --git a/Makefile.common b/Makefile.common
index 62a4f904c7..2a8b41c6e2 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,6 +1,7 @@
 ROOT_DIR          := .
 DEPS_DIR          := $(ROOT_DIR)/deps
 LIBRETRO_COMM_DIR := $(ROOT_DIR)/libretro-common
+WANT_WGL           = 0
 
 ifeq ($(HAVE_GL_CONTEXT),)
    HAVE_GL_CONTEXT=0
@@ -160,12 +161,12 @@ OBJ += frontend/frontend.o \
        command.o \
        msg_hash.o \
        intl/msg_hash_us.o \
-       runloop.o \
        $(LIBRETRO_COMM_DIR)/queues/task_queue.o \
        tasks/task_content.o \
        tasks/task_save.o \
        tasks/task_file_transfer.o \
        tasks/task_image.o \
+       tasks/task_audio_mixer.o \
        $(LIBRETRO_COMM_DIR)/encodings/encoding_utf.o \
        $(LIBRETRO_COMM_DIR)/encodings/encoding_crc32.o \
        $(LIBRETRO_COMM_DIR)/lists/file_list.o \
@@ -222,7 +223,6 @@ OBJ += frontend/frontend.o \
        tasks/task_powerstate.o \
        $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler.o \
        gfx/drivers_shader/shader_null.o \
-       gfx/video_shader_driver.o \
        gfx/video_shader_parse.o \
        $(LIBRETRO_COMM_DIR)/gfx/scaler/pixconv.o \
        $(LIBRETRO_COMM_DIR)/gfx/scaler/scaler_int.o \
@@ -555,7 +555,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/menu_input.o \
           menu/menu_event.o \
           menu/menu_entries.o \
-          menu/menu_navigation.o  \
           menu/menu_setting.o \
           menu/menu_shader.o \
 			 menu/widgets/menu_filebrowser.o \
@@ -583,7 +582,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
           menu/cbs/menu_cbs_up.o \
           menu/cbs/menu_cbs_down.o \
           menu/cbs/menu_cbs_contentlist_switch.o \
-          menu/menu_display.o \
           menu/menu_displaylist.o \
           menu/menu_animation.o \
           menu/drivers_display/menu_display_null.o \
@@ -757,6 +755,10 @@ ifeq ($(HAVE_PARPORT), 1)
    OBJ += input/drivers_joypad/parport_joypad.o
 endif
 
+ifneq ($(findstring Win32,$(OS)),)
+   OBJ += input/drivers/winraw_input.o
+endif
+
 # Companion UI
 
 ifneq ($(findstring Win32,$(OS)),)
@@ -769,8 +771,7 @@ endif
 
 # Video
 
-OBJ += gfx/video_context_driver.o \
-       gfx/drivers_context/gfx_null_ctx.o \
+OBJ += gfx/drivers_context/gfx_null_ctx.o \
        gfx/video_state_tracker.o
 
 ifeq ($(HAVE_KMS), 1)
@@ -872,8 +873,8 @@ endif
          GL_LIBS := -framework OpenGL
          OBJ += gfx/drivers_context/cgl_ctx.o
       else ifneq ($(findstring Win32,$(OS)),)
-         GL_LIBS := -lopengl32 -lgdi32 -lcomdlg32 -lcomctl32
-         OBJ += gfx/drivers_context/wgl_ctx.o
+         GL_LIBS := -lopengl32 -lgdi32 -lcomdlg32
+	 WANT_WGL=1
       endif
       LIBS += $(GL_LIBS)
    endif
@@ -926,6 +927,7 @@ endif
 ifeq ($(HAVE_VULKAN), 1)
    ifneq ($(findstring Win32,$(OS)),)
       GLSLANG_PLATFORM := Windows
+		WANT_WGL = 1
    else
       GLSLANG_PLATFORM := Unix
    endif
@@ -984,6 +986,10 @@ ifeq ($(HAVE_VULKAN), 1)
    DEFINES += -DHAVE_SLANG
 endif
 
+ifeq ($(WANT_WGL), 1)
+	OBJ += gfx/drivers_context/wgl_ctx.o
+LIBS += -lcomctl32
+endif
 
 ifeq ($(HAVE_OMAP), 1)
    OBJ += gfx/drivers/omap_gfx.o
diff --git a/audio/audio_driver.c b/audio/audio_driver.c
index e9a024e210..8cc65af915 100644
--- a/audio/audio_driver.c
+++ b/audio/audio_driver.c
@@ -23,7 +23,6 @@
 #include <audio/conversion/s16_to_float.h>
 #include <audio/audio_resampler.h>
 #include <audio/dsp_filter.h>
-#include <audio/audio_mixer.h>
 #include <file/file_path.h>
 #include <lists/dir_list.h>
 
@@ -41,12 +40,13 @@
 #include "../driver.h"
 #include "../configuration.h"
 #include "../retroarch.h"
-#include "../runloop.h"
 #include "../verbosity.h"
 #include "../list_special.h"
 
 #define AUDIO_BUFFER_FREE_SAMPLES_COUNT (8 * 1024)
 
+#define AUDIO_MIXER_MAX_STREAMS 8
+
 static const audio_driver_t *audio_drivers[] = {
 #ifdef HAVE_ALSA
    &audio_alsa,
@@ -116,6 +116,18 @@ static const audio_driver_t *audio_drivers[] = {
    NULL,
 };
 
+struct audio_mixer_stream
+{
+   audio_mixer_sound_t *handle;
+   audio_mixer_voice_t *voice;
+   audio_mixer_stop_cb_t stop_cb;
+   enum audio_mixer_state state;
+   float volume;
+};
+
+static unsigned audio_mixer_current_max_idx              = 0;
+static struct audio_mixer_stream audio_mixer_streams[AUDIO_MIXER_MAX_STREAMS] = {{0}};
+
 static size_t audio_driver_chunk_size                    = 0;
 static size_t audio_driver_chunk_nonblock_size           = 0;
 static size_t audio_driver_chunk_block_size              = 0;
@@ -309,17 +321,15 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
    float *samples_buf    = NULL;
    int16_t *conv_buf     = NULL;
    int16_t *rewind_buf   = NULL;
-   size_t outsamples_max = AUDIO_CHUNK_SIZE_NONBLOCKING * 2;
    size_t max_bufsamples = AUDIO_CHUNK_SIZE_NONBLOCKING * 2;
    settings_t *settings  = config_get_ptr();
+   /* Accomodate rewind since at some point we might have two full buffers. */
+   size_t outsamples_max = AUDIO_CHUNK_SIZE_NONBLOCKING * 2 * AUDIO_MAX_RATIO * 
+      settings->floats.slowmotion_ratio;
 
    convert_s16_to_float_init_simd();
    convert_float_to_s16_init_simd();
 
-   /* Accomodate rewind since at some point we might have two full buffers. */
-   outsamples_max = max_bufsamples * AUDIO_MAX_RATIO * 
-      settings->floats.slowmotion_ratio;
-
    conv_buf = (int16_t*)malloc(outsamples_max 
          * sizeof(int16_t));
    /* Used for recording even if audio isn't enabled. */
@@ -764,14 +774,12 @@ void audio_driver_monitor_adjust_system_rates(void)
 {
    float timing_skew;
    settings_t                   *settings = config_get_ptr();
-   const struct retro_system_timing *info = NULL;
    struct retro_system_av_info   *av_info = video_viewport_get_system_av_info();
    float video_refresh_rate               = settings->floats.video_refresh_rate;
    float max_timing_skew                  = settings->floats.audio_max_timing_skew;
+   const struct retro_system_timing *info = av_info ? 
+      (const struct retro_system_timing*)&av_info->timing : NULL;
    
-   if (av_info)
-      info = (const struct retro_system_timing*)&av_info->timing;
-
    if (!info || info->sample_rate <= 0.0)
       return;
 
@@ -883,10 +891,111 @@ bool audio_driver_get_devices_list(void **data)
    return true;
 }
 
+bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params)
+{
+   audio_mixer_voice_t *voice    = NULL;
+   audio_mixer_sound_t *handle   = NULL;
+   audio_mixer_stop_cb_t stop_cb = NULL;
+   bool looped                   = false;
+
+   if (audio_mixer_current_max_idx >= AUDIO_MIXER_MAX_STREAMS)
+      return false;
+
+   if (params->state == AUDIO_STREAM_STATE_NONE)
+      return false;
+
+   switch (params->type)
+   {
+      case AUDIO_MIXER_TYPE_WAV:
+         handle = audio_mixer_load_wav(params->buf, params->bufsize);
+         break;
+      case AUDIO_MIXER_TYPE_OGG:
+         handle = audio_mixer_load_ogg(params->buf, params->bufsize);
+         break;
+      case AUDIO_MIXER_TYPE_NONE:
+         return false;
+   }
+
+   if (!handle)
+      return false;
+
+   if (params->state == AUDIO_STREAM_STATE_PLAYING)
+   {
+      voice = audio_mixer_play(handle, looped, params->volume, stop_cb);
+      audio_set_bool(AUDIO_ACTION_MIXER, true);
+   }
+   else if (params->state == AUDIO_STREAM_STATE_PLAYING_LOOPED)
+   {
+      looped = true;
+      voice  = audio_mixer_play(handle, looped, params->volume, stop_cb);
+      audio_set_bool(AUDIO_ACTION_MIXER, true);
+   }
+
+   audio_mixer_streams[audio_mixer_current_max_idx].handle  = handle;
+   audio_mixer_streams[audio_mixer_current_max_idx].voice   = voice;
+   audio_mixer_streams[audio_mixer_current_max_idx].state   = params->state;
+   audio_mixer_streams[audio_mixer_current_max_idx].volume  = params->volume;
+   audio_mixer_streams[audio_mixer_current_max_idx].stop_cb = stop_cb;
+
+   audio_mixer_current_max_idx++;
+
+   return true;
+}
+
+static void audio_driver_mixer_remove_stream(unsigned i)
+{
+   audio_mixer_sound_t *handle = audio_mixer_streams[i].handle;
+   audio_mixer_voice_t *voice  = audio_mixer_streams[i].voice;
+
+   switch (audio_mixer_streams[i].state)
+   {
+      case AUDIO_STREAM_STATE_PLAYING:
+         audio_mixer_stop(voice);
+#if 0
+         /* TODO - crashes at this part */
+         if (handle)
+            audio_mixer_destroy(handle);
+#endif
+         break;
+      case AUDIO_STREAM_STATE_PLAYING_LOOPED:
+         audio_mixer_stop(voice);
+#if 0
+         /* TODO - crashes at this part */
+         if (handle)
+            audio_mixer_destroy(handle);
+#endif
+         break;
+      case AUDIO_STREAM_STATE_STOPPED:
+         if (handle)
+            audio_mixer_destroy(handle);
+         break;
+      case AUDIO_STREAM_STATE_NONE:
+         break;
+   }
+
+   audio_mixer_streams[i].state   = AUDIO_STREAM_STATE_NONE;
+   audio_mixer_streams[i].volume  = 0.0f;
+   audio_mixer_streams[i].stop_cb = NULL;
+   audio_mixer_streams[i].handle  = NULL;
+   audio_mixer_streams[i].voice   = NULL;
+}
+
+static void audio_driver_mixer_deinit(void)
+{
+   unsigned i;
+
+   audio_set_bool(AUDIO_ACTION_MIXER, false);
+
+   for (i = 0; i < AUDIO_MIXER_MAX_STREAMS; i++)
+      audio_driver_mixer_remove_stream(i);
+
+   audio_mixer_current_max_idx = 0;
+   audio_mixer_done();
+}
 
 bool audio_driver_deinit(void)
 {
-   audio_mixer_done();
+   audio_driver_mixer_deinit();
    audio_driver_free_devices_list();
    if (!audio_driver_deinit_internal())
       return false;
@@ -951,7 +1060,6 @@ bool audio_driver_has_callback(void)
 
 bool audio_driver_toggle_mute(void)
 {
-   settings_t *settings = config_get_ptr();
    bool new_mute_state  = !audio_driver_mute_enable;
    if (!audio_driver_context_audio_data)
       return false;
@@ -1053,6 +1161,19 @@ void audio_driver_destroy(void)
    current_audio         = NULL;
 }
 
+void audio_set_bool(enum audio_action action, bool val)
+{
+   switch (action)
+   {
+      case AUDIO_ACTION_MIXER:
+         audio_mixer_active = val;
+         break;
+      case AUDIO_ACTION_NONE:
+      default:
+         break;
+   }
+}
+
 void audio_set_float(enum audio_action action, float val)
 {
    switch (action)
diff --git a/audio/audio_driver.h b/audio/audio_driver.h
index d20aca26c4..56d849e705 100644
--- a/audio/audio_driver.h
+++ b/audio/audio_driver.h
@@ -22,6 +22,7 @@
 #include <sys/types.h>
 
 #include <boolean.h>
+#include <audio/audio_mixer.h>
 #include <retro_common_api.h>
 
 RETRO_BEGIN_DECLS
@@ -37,7 +38,8 @@ enum audio_action
 {
    AUDIO_ACTION_NONE = 0,
    AUDIO_ACTION_RATE_CONTROL_DELTA,
-   AUDIO_ACTION_MUTE_ENABLE
+   AUDIO_ACTION_MUTE_ENABLE,
+   AUDIO_ACTION_MIXER
 };
 
 typedef struct audio_driver
@@ -122,6 +124,24 @@ typedef struct audio_driver
    size_t (*buffer_size)(void *data);
 } audio_driver_t;
 
+enum audio_mixer_state
+{
+   AUDIO_STREAM_STATE_NONE = 0,
+   AUDIO_STREAM_STATE_STOPPED,
+   AUDIO_STREAM_STATE_PLAYING,
+   AUDIO_STREAM_STATE_PLAYING_LOOPED
+};
+
+typedef struct audio_mixer_stream_params
+{
+   float volume;
+   enum audio_mixer_type  type;
+   enum audio_mixer_state state;
+   void *buf;
+   size_t bufsize;
+   audio_mixer_stop_cb_t cb;
+} audio_mixer_stream_params_t;
+
 void audio_driver_destroy_data(void);
 
 void audio_driver_set_own_driver(void);
@@ -218,6 +238,10 @@ void audio_driver_frame_is_reverse(void);
 
 void audio_set_float(enum audio_action action, float val);
 
+void audio_set_bool(enum audio_action action, bool val);
+
+void audio_unset_bool(enum audio_action action, bool val);
+
 float *audio_get_float_ptr(enum audio_action action);
 
 bool *audio_get_bool_ptr(enum audio_action action);
@@ -226,6 +250,8 @@ bool audio_driver_deinit(void);
 
 bool audio_driver_init(void);
 
+bool audio_driver_mixer_add_stream(audio_mixer_stream_params_t *params);
+
 extern audio_driver_t audio_rsound;
 extern audio_driver_t audio_oss;
 extern audio_driver_t audio_alsa;
diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c
index 096a000179..379b579658 100644
--- a/audio/drivers/alsa.c
+++ b/audio/drivers/alsa.c
@@ -370,7 +370,7 @@ static void *alsa_device_list_new(void *data)
       /* description of device IOID - input / output identifcation
        * ("Input" or "Output"), NULL means both) */
 
-      if (!io || (memcmp(io, "Output", 6) == 0))
+      if (!io || (string_is_equal_fast(io, "Output", 6)))
          string_list_append(s, name, attr);
 
       if (name)
diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c
index ecfe61556c..e6206eb65b 100644
--- a/audio/drivers/alsathread.c
+++ b/audio/drivers/alsathread.c
@@ -370,7 +370,7 @@ static void *alsa_device_list_new(void *data)
       /* description of device IOID - input / output identifcation
        * ("Input" or "Output"), NULL means both) */
 
-      if (!io || (memcmp(io,"Output", 6) == 0))
+      if (!io || (string_is_equal_fast(io,"Output", 6)))
          string_list_append(s, name, attr);
 
       if (name)
diff --git a/audiomixer-test.diff b/audiomixer-test.diff
deleted file mode 100644
index 1581b11694..0000000000
--- a/audiomixer-test.diff
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/audio/audio_driver.c b/audio/audio_driver.c
-index 10dcbc5b3..0d2bb4d85 100644
---- a/audio/audio_driver.c
-+++ b/audio/audio_driver.c
-@@ -464,6 +464,8 @@ static bool audio_driver_init_internal(bool audio_cb_inited)
- 
-    audio_driver_free_samples_count = 0;
- 
-+   audio_mixer_init(48000);
-+
-    /* Threaded driver is initially stopped. */
-    if (
-          audio_driver_active
-@@ -597,6 +599,8 @@ static bool audio_driver_flush(const int16_t *data, size_t samples)
- 
-    audio_driver_resampler->process(audio_driver_resampler_data, &src_data);
- 
-+   audio_mixer_mix(audio_driver_output_samples_buf, src_data.output_frames);
-+
-    output_data   = audio_driver_output_samples_buf;
-    output_frames = (unsigned)src_data.output_frames;
- 
-diff --git a/runloop.c b/runloop.c
-index 0e3a8dc44..4f79b2ed7 100644
---- a/runloop.c
-+++ b/runloop.c
-@@ -1021,7 +1021,10 @@ static enum runloop_state runloop_check_state(
-       command_event(CMD_EVENT_DISK_PREV, NULL);
- 
-    if (runloop_cmd_triggered(trigger_input, RARCH_RESET))
-+   {
-       command_event(CMD_EVENT_RESET, NULL);
-+      audio_mixer_load_ogg("/home/squarepusher/SumertimeBlues.ogg");
-+   }
- 
-    cheat_manager_state_checks(
-          runloop_cmd_triggered(trigger_input, RARCH_CHEAT_INDEX_PLUS),
diff --git a/camera/camera_driver.c b/camera/camera_driver.c
index ce35c4797b..34a5a31d88 100644
--- a/camera/camera_driver.c
+++ b/camera/camera_driver.c
@@ -25,7 +25,6 @@
 #include "../configuration.h"
 #include "../driver.h"
 #include "../retroarch.h"
-#include "../runloop.h"
 #include "../list_special.h"
 #include "../verbosity.h"
 
diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index 60379436a6..5ef170ad27 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -20,6 +20,8 @@
 #include <streams/file_stream.h>
 #include <compat/strl.h>
 #include <rhash.h>
+#include <retro_miscellaneous.h>
+#include <net/net_http.h>
 #include <libretro.h>
 
 #ifdef HAVE_CONFIG_H
@@ -38,7 +40,7 @@
 #include "../configuration.h"
 #include "../performance_counters.h"
 #include "../msg_hash.h"
-#include "../runloop.h"
+#include "../retroarch.h"
 #include "../core.h"
 
 #include "../network/net_http_special.h"
@@ -283,7 +285,7 @@ typedef struct
 
 typedef struct
 {
-   unsigned (*finder)(const struct retro_game_info *, retro_time_t);
+   int label;
    const char *name;
    const uint32_t *ext_hashes;
 } cheevos_finder_t;
@@ -721,51 +723,6 @@ static uint32_t cheevos_djb2(const char* str, size_t length)
    return hash;
 }
 
-static int cheevos_http_get(const char **result, size_t *size,
-      const char *url, retro_time_t *timeout)
-{
-   const char *msg = NULL;
-
-#ifdef CHEEVOS_NO_TIMEOUT
-   int ret         = net_http_get(result, size, url, NULL);
-#else
-   int ret         = net_http_get(result, size, url, timeout);
-#endif
-
-   if (ret == NET_HTTP_GET_OK)
-   {
-      if (*result != NULL)
-      {
-         return ret;
-      }
-      
-      RARCH_ERR("CHEEVOS error during HTTP GET: ok.\n");
-      return NET_HTTP_GET_CONNECT_ERROR;
-   }
-
-   switch (ret)
-   {
-      case NET_HTTP_GET_MALFORMED_URL:
-         msg = "malformed url";
-         break;
-
-      case NET_HTTP_GET_CONNECT_ERROR:
-         msg = "connect error";
-         break;
-
-      case NET_HTTP_GET_TIMEOUT:
-         msg = "timeout";
-         break;
-
-      default:
-         msg = "unknown error";
-         break;
-   }
-
-   RARCH_ERR("CHEEVOS error during HTTP GET: %s.\n", msg);
-   return ret;
-}
-
 static int cheevos_getvalue__json_key(void *userdata,
       const char *name, size_t length)
 {
@@ -2082,67 +2039,6 @@ static void cheevos_url_encode(const char *str, char *encoded, size_t len)
    *encoded = 0;
 }
 
-static int cheevos_login(retro_time_t *timeout)
-{
-   int res;
-   char urle_user[64];
-   char urle_pwd[64];
-   char request[256];
-   const char *json             = NULL;
-   const char *username         = NULL;
-   const char *password         = NULL;
-   settings_t *settings         = config_get_ptr();
-
-   if (cheevos_locals.token[0])
-      return 0;
-
-   urle_user[0]                 = '\0';
-   urle_pwd[0]                  = '\0';
-   request[0]                   = '\0';
-
-   username                     = settings->arrays.cheevos_username;
-   password                     = settings->arrays.cheevos_password;
-
-   if (!username || !*username || !password || !*password)
-   {
-      runloop_msg_queue_push("Missing Retro Achievements account information.", 0, 5 * 60, false);
-      runloop_msg_queue_push("Please fill in your account information in Settings.", 0, 5 * 60, false);
-      RARCH_ERR("CHEEVOS username and/or password not informed.\n");
-      return -1;
-   }
-
-   cheevos_url_encode(username, urle_user, sizeof(urle_user));
-   cheevos_url_encode(password, urle_pwd, sizeof(urle_pwd));
-
-   snprintf(
-      request, sizeof(request),
-      "http://retroachievements.org/dorequest.php?r=login&u=%s&p=%s",
-      urle_user, urle_pwd
-   );
-
-   request[sizeof(request) - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-   cheevos_log_url("CHEEVOS url to login: %s\n", request);
-#endif
-
-   if (!cheevos_http_get(&json, NULL, request, timeout))
-   {
-      res = cheevos_get_value(json, CHEEVOS_JSON_KEY_TOKEN,
-            cheevos_locals.token, sizeof(cheevos_locals.token));
-
-      free((void*)json);
-
-      if (!res)
-         return 0;
-   }
-
-   runloop_msg_queue_push("Retro Achievements login error.",
-         0, 5 * 60, false);
-   RARCH_ERR("CHEEVOS error getting user token.\n");
-   return -1;
-}
-
 static void cheevos_make_unlock_url(const cheevo_t *cheevo, char* url, size_t url_size)
 {
    settings_t *settings = config_get_ptr();
@@ -2414,140 +2310,6 @@ static void cheevos_free_cheevo_set(const cheevoset_t *set)
    free((void*)set->cheevos);
 }
 
-/*****************************************************************************
-Load achievements from retroachievements.org.
-*****************************************************************************/
-
-static int cheevos_get_by_game_id(const char **json,
-      unsigned game_id, retro_time_t *timeout)
-{
-   settings_t *settings = config_get_ptr();
-
-   /* Just return OK if cheevos are disabled. */
-   if (!settings->bools.cheevos_enable)
-      return 0;
-
-   if (!cheevos_login(timeout))
-   {
-      char request[256];
-
-      request[0] = '\0';
-
-      snprintf(
-         request, sizeof(request),
-         "http://retroachievements.org/dorequest.php?r=patch&u=%s&g=%u&f=3&l=1&t=%s",
-         settings->arrays.cheevos_username,
-         game_id, cheevos_locals.token
-      );
-
-      request[sizeof(request) - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-      cheevos_log_url("CHEEVOS url to get the list of cheevos: %s\n", request);
-#endif
-
-      if (!cheevos_http_get(json, NULL, request, timeout))
-      {
-         RARCH_LOG("CHEEVOS got achievements for game id %u.\n", game_id);
-         return 0;
-      }
-
-      RARCH_ERR("CHEEVOS error getting achievements for game id %u.\n", game_id);
-   }
-
-   return -1;
-}
-
-static unsigned cheevos_get_game_id(unsigned char *hash, retro_time_t *timeout)
-{
-   int res;
-   char request[256];
-   char game_id[16];
-   const char* json  = NULL;
-
-   request[0] = '\0';
-   game_id[0] = '\0';
-
-   RARCH_LOG(
-      "CHEEVOS getting game id for hash %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
-      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]
-   );
-
-   snprintf(
-      request, sizeof(request),
-      "http://retroachievements.org/dorequest.php?r=gameid&m=%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-      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]
-   );
-
-   request[sizeof(request) - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-   cheevos_log_url("CHEEVOS url to get the game's id: %s\n", request);
-#endif
-
-   if (!cheevos_http_get(&json, NULL, request, timeout))
-   {
-      res = cheevos_get_value(json, CHEEVOS_JSON_KEY_GAMEID,
-            game_id, sizeof(game_id));
-
-      free((void*)json);
-
-      if (!res)
-      {
-         RARCH_LOG("CHEEVOS got game id %s.\n", game_id);
-         return (unsigned)strtoul(game_id, NULL, 10);
-      }
-   }
-
-   RARCH_ERR("CHEEVOS error getting game_id.\n");
-   return 0;
-}
-
-static void cheevos_make_playing_url(unsigned game_id, char* url, size_t url_size)
-{
-   settings_t *settings = config_get_ptr();
-
-   snprintf(
-      url, url_size,
-      "http://retroachievements.org/dorequest.php?r=postactivity&u=%s&t=%s&a=3&m=%u",
-      settings->arrays.cheevos_username,
-      cheevos_locals.token, game_id
-   );
-
-   url[url_size - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-   cheevos_log_url("CHEEVOS url to post the 'playing' activity: %s\n", url);
-#endif
-}
-
-static void cheevos_playing(void *task_data, void *user_data, const char *error)
-{
-   unsigned game_id = (unsigned)(uintptr_t)user_data;
-
-   if (error == NULL)
-   {
-      RARCH_LOG("CHEEVOS posted playing game %u activity.\n", game_id);
-   }
-   else
-   {
-      char url[256];
-
-      url[0] = '\0';
-
-      RARCH_ERR("CHEEVOS error posting playing game %u activity, will retry...\n", game_id);
-
-      cheevos_make_playing_url(game_id, url, sizeof(url));
-      task_push_http_transfer(url, true, NULL, cheevos_playing, (void*)(uintptr_t)game_id);
-   }
-}
-
 #ifndef CHEEVOS_DONT_DEACTIVATE
 static int cheevos_deactivate__json_index(void *userdata, unsigned int index)
 {
@@ -2606,13 +2368,9 @@ static int cheevos_deactivate__json_number(void *userdata,
 
    return 0;
 }
-#endif
 
-static int cheevos_deactivate_unlocks(unsigned game_id, retro_time_t *timeout)
+static int cheevos_deactivate_unlocks(const char* json, unsigned mode)
 {
-   /* Only call this function after the cheevos have been loaded. */
-
-#ifndef CHEEVOS_DONT_DEACTIVATE
    static const jsonsax_handlers_t handlers =
    {
       NULL,
@@ -2629,531 +2387,14 @@ static int cheevos_deactivate_unlocks(unsigned game_id, retro_time_t *timeout)
       NULL
    };
 
-   int res = 0;
    cheevos_deactivate_t ud;
-   const char* json             = NULL;
 
-   if (!cheevos_login(timeout))
-   {
-      char request[256];
-      settings_t *settings = config_get_ptr();
-
-      request[0] = '\0';
-
-      /* Deactivate achievements in softcore mode. */
-      snprintf(
-         request, sizeof(request),
-         "http://retroachievements.org/dorequest.php?r=unlocks&u=%s&t=%s&g=%u&h=0",
-         settings->arrays.cheevos_username,
-         cheevos_locals.token, game_id
-      );
-
-      request[sizeof(request) - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-      cheevos_log_url("CHEEVOS url to get the list of unlocked cheevos in softcore: %s\n", request);
+   ud.is_element = 0;
+   ud.mode = mode;
+   return jsonsax_parse(json, &handlers, (void*)&ud) != JSONSAX_OK;
+}
 #endif
 
-      if (!cheevos_http_get(&json, NULL, request, timeout))
-      {
-         ud.is_element = 0;
-         ud.mode = CHEEVOS_ACTIVE_SOFTCORE;
-         res = jsonsax_parse(json, &handlers, (void*)&ud);
-         free((void*)json);
-
-         if (res == JSONSAX_OK)
-            RARCH_LOG("CHEEVOS deactivated unlocked achievements in softcore mode.\n");
-         else
-         {
-            RARCH_ERR("CHEEVOS error deactivating unlocked achievements in softcore mode.\n");
-            res = -1;
-         }
-      }
-
-      /* Deactivate achievements in hardcore mode. */
-      snprintf(
-         request, sizeof(request),
-         "http://retroachievements.org/dorequest.php?r=unlocks&u=%s&t=%s&g=%u&h=1",
-         settings->arrays.cheevos_username,
-         cheevos_locals.token, game_id
-      );
-
-      request[sizeof(request) - 1] = 0;
-
-#ifdef CHEEVOS_LOG_URLS
-      cheevos_log_url("CHEEVOS url to get the list of unlocked cheevos in hardcore: %s\n", request);
-#endif
-
-      if (!cheevos_http_get(&json, NULL, request, timeout))
-      {
-         ud.is_element = 0;
-         ud.mode = CHEEVOS_ACTIVE_HARDCORE;
-         res = jsonsax_parse(json, &handlers, (void*)&ud);
-         free((void*)json);
-
-         if (res == JSONSAX_OK)
-            RARCH_LOG("CHEEVOS deactivated unlocked achievements in hardcore mode.\n");
-         else
-         {
-            RARCH_ERR("CHEEVOS error deactivating unlocked achievements in hardcore mode.\n");
-            res = -1;
-         }
-      }
-   }
-
-   return res;
-#else
-   RARCH_LOG("CHEEVOS cheevo deactivation is disabled\n");
-   return 0;
-#endif
-}
-
-static INLINE unsigned cheevos_next_power_of_2(unsigned n)
-{
-   n--;
-
-   n |= n >> 1;
-   n |= n >> 2;
-   n |= n >> 4;
-   n |= n >> 8;
-   n |= n >> 16;
-
-   return n + 1;
-}
-
-static size_t cheevos_eval_md5(
-      const struct retro_game_info *info,
-      size_t offset,
-      size_t max_size,
-      MD5_CTX *ctx)
-{
-   MD5_Init(ctx);
-
-   if (info->data)
-   {
-      if (max_size == 0)
-         max_size = info->size;
-
-      if (info->size - offset < max_size)
-         max_size = info->size - offset;
-
-#ifdef CHEEVOS_SIZE_LIMIT
-      if (max_size > CHEEVOS_SIZE_LIMIT)
-         max_size = CHEEVOS_SIZE_LIMIT;
-#endif
-
-      MD5_Update(ctx, (void*)((uint8_t*)info->data + offset), max_size);
-      return max_size;
-   }
-   else
-   {
-      size_t size = 0;
-      RFILE *file = filestream_open(info->path, RFILE_MODE_READ, 0);
-
-      if (!file)
-         return 0;
-      
-      size = filestream_get_size(file);
-      
-      if (max_size == 0)
-         max_size = size;
-      
-      if (size - offset < max_size)
-         max_size = size - offset;
-      
-#ifdef CHEEVOS_SIZE_LIMIT
-      if (max_size > CHEEVOS_SIZE_LIMIT)
-         max_size = CHEEVOS_SIZE_LIMIT;
-#endif
-
-      filestream_seek(file, offset, SEEK_SET);
-      size = 0;
-
-      for (;;)
-      {
-         uint8_t buffer[4096];
-         ssize_t num_read;
-         size_t to_read = sizeof(buffer);
-
-         if (to_read > max_size)
-            to_read = max_size;
-
-         num_read = filestream_read(file, (void*)buffer, to_read);
-
-         if (num_read <= 0)
-            break;
-
-         MD5_Update(ctx, (void*)buffer, num_read);
-         size += num_read;
-         
-         if (max_size != 0)
-         {
-            max_size -= num_read;
-            
-            if (max_size == 0)
-               break;
-         }
-      }
-
-      filestream_close(file);
-      return size;
-   }
-}
-
-static void cheevos_fill_md5(size_t size, char fill, MD5_CTX *ctx)
-{
-   char buffer[4096];
-
-   memset((void*)buffer, fill, sizeof(buffer));
-
-   while (size > 0)
-   {
-      size_t len = sizeof(buffer);
-
-      if (len > size)
-         len = size;
-
-      MD5_Update(ctx, (void*)buffer, len);
-      size -= len;
-   }
-}
-
-static unsigned cheevos_find_game_id_generic(
-      const struct retro_game_info *info,
-      retro_time_t timeout)
-{
-   MD5_CTX ctx;
-   retro_time_t to;
-   uint8_t hash[16];
-   size_t size      = cheevos_eval_md5(info, 0, 0, &ctx);
-
-   hash[0] = '\0';
-
-   MD5_Final(hash, &ctx);
-
-   if (!size)
-      return 0;
-
-   to = timeout;
-   return cheevos_get_game_id(hash, &to);
-}
-
-static unsigned cheevos_find_game_id_snes(
-      const struct retro_game_info *info,
-      retro_time_t timeout)
-{
-   MD5_CTX ctx;
-   uint8_t hash[16];
-   size_t count = cheevos_eval_md5(info, 0, 0, &ctx);
-
-   if (count == 0)
-   {
-      MD5_Final(hash, &ctx);
-      return 0;
-   }
-
-   if (count < CHEEVOS_EIGHT_MB)
-      cheevos_fill_md5(CHEEVOS_EIGHT_MB - count, 0, &ctx);
-   
-   MD5_Final(hash, &ctx);
-   return cheevos_get_game_id(hash, &timeout);
-}
-
-static unsigned cheevos_find_game_id_genesis(
-      const struct retro_game_info *info, retro_time_t timeout)
-{
-   MD5_CTX ctx;
-   uint8_t hash[16];
-   size_t count = cheevos_eval_md5(info, 0, 0, &ctx);
-
-   if (count == 0)
-   {
-      MD5_Final(hash, &ctx);
-      return 0;
-   }
-
-   if (count < CHEEVOS_SIX_MB)
-      cheevos_fill_md5(CHEEVOS_SIX_MB - count, 0, &ctx);
-   
-   MD5_Final(hash, &ctx);
-   return cheevos_get_game_id(hash, &timeout);
-}
-
-static unsigned cheevos_find_game_id_nes(
-      const struct retro_game_info *info,
-      retro_time_t timeout)
-{
-   /* 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. */
-   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];
-   } header;
-
-   size_t rom_size, offset, count;
-   MD5_CTX ctx;
-   uint8_t hash[16];
-
-   size_t bytes;
-   RFILE *file;
-   ssize_t num_read;
-   int mapper_no;
-   bool round;
-
-   if (info->data)
-   {
-      if (info->size < sizeof(header))
-         return 0;
-
-      memcpy((void*)&header, info->data, sizeof(header));
-   }
-   else
-   {
-      file = filestream_open(info->path, RFILE_MODE_READ, 0);
-
-      if (!file)
-         return 0;
-
-      num_read = filestream_read(file, (void*)&header, sizeof(header));
-      filestream_close(file);
-
-      if (num_read < (ssize_t)sizeof(header))
-         return 0;
-   }
-
-   if (     header.id[0] != 'N'
-         || header.id[1] != 'E'
-         || header.id[2] != 'S'
-         || header.id[3] != 0x1a)
-      return 0;
-
-   if (header.rom_size)
-      rom_size = cheevos_next_power_of_2(header.rom_size);
-   else
-      rom_size = 256;
-
-   /* from FCEU core - compute size using the cart mapper */
-   mapper_no = (header.rom_type >> 4) | (header.rom_type2 & 0xF0);
-
-   /* 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. */
-   round = mapper_no != 53 && mapper_no != 198 && mapper_no != 228;
-   bytes = (round) ? rom_size : header.rom_size;
-
-   /* from FCEU core - check if Trainer included in ROM data */
-   offset = sizeof(header) + (header.rom_type & 4 ? sizeof(header) : 0);
-
-   MD5_Init(&ctx);
-   count = cheevos_eval_md5(info, offset, 0x4000 * bytes, &ctx);
-   count = 0x4000 * bytes - count;
-   cheevos_fill_md5(count, (char)0xff, &ctx);
-   MD5_Final(hash, &ctx);
-
-   return cheevos_get_game_id(hash, &timeout);
-}
-
-bool cheevos_load(const void *data)
-{
-   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 cheevos_finder_t finders[] =
-   {
-      {cheevos_find_game_id_snes,    "SNES (8Mb padding)",      snes_exts},
-      {cheevos_find_game_id_genesis, "Genesis (6Mb padding)",   genesis_exts},
-      {cheevos_find_game_id_nes,     "NES (discards VROM)",     NULL},
-      {cheevos_find_game_id_generic, "Generic (plain content)", NULL},
-   };
-
-   struct retro_system_info sysinfo;
-   unsigned i;
-   char url[256];
-   const char *json     = NULL;
-   retro_time_t timeout = 5000000;
-   unsigned game_id     = 0;
-   settings_t *settings = config_get_ptr();
-   const struct retro_game_info *info = (const struct retro_game_info*)data;
-
-   url[0]                = '\0';
-
-   cheevos_loaded        = 0;
-
-   /* Just return OK if the core doesn't support cheevos, or info is NULL. */
-   if (!cheevos_locals.core_supports || !info)
-      return true;
-
-   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]);
-
-   RARCH_LOG("CHEEVOS system RAM: %p %u\n",
-      cheevos_locals.meminfo[0].data, cheevos_locals.meminfo[0].size);
-   RARCH_LOG("CHEEVOS save RAM:   %p %u\n",
-      cheevos_locals.meminfo[1].data, cheevos_locals.meminfo[1].size);
-   RARCH_LOG("CHEEVOS video RAM:  %p %u\n",
-      cheevos_locals.meminfo[2].data, cheevos_locals.meminfo[2].size);
-   RARCH_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 (!settings->bools.cheevos_enable)
-      return true;
-
-   /* Use the supported extensions as a hint
-    * to what method we should use. */
-   core_get_system_info(&sysinfo);
-
-   for (i = 0; i < ARRAY_SIZE(finders); i++)
-   {
-      if (finders[i].ext_hashes)
-      {
-         const char *ext = sysinfo.valid_extensions;
-
-         while (ext)
-         {
-            int j;
-            unsigned hash;
-            const char *end = strchr(ext, '|');
-
-            if (end)
-            {
-               hash = cheevos_djb2(ext, end - ext);
-               ext = end + 1;
-            }
-            else
-            {
-               hash = cheevos_djb2(ext, strlen(ext));
-               ext = NULL;
-            }
-
-            for (j = 0; finders[i].ext_hashes[j]; j++)
-            {
-               if (finders[i].ext_hashes[j] == hash)
-               {
-                  RARCH_LOG("CHEEVOS testing %s.\n", finders[i].name);
-
-                  game_id = finders[i].finder(info, 5000000);
-
-                  if (game_id)
-                     goto found;
-
-                  ext = NULL; /* force next finder */
-                  break;
-               }
-            }
-         }
-      }
-   }
-
-   for (i = 0; i < ARRAY_SIZE(finders); i++)
-   {
-      if (finders[i].ext_hashes)
-         continue;
-
-      RARCH_LOG("CHEEVOS testing %s.\n", finders[i].name);
-
-      game_id = finders[i].finder(info, 5000000);
-
-      if (game_id)
-         goto found;
-   }
-
-   RARCH_LOG("CHEEVOS this game doesn't feature achievements.\n");
-   return false;
-
-found:
-#ifdef CHEEVOS_JSON_OVERRIDE
-   {
-      FILE* file;
-      size_t size;
-
-      file = fopen(CHEEVOS_JSON_OVERRIDE, "rb");
-      fseek(file, 0, SEEK_END);
-      size = ftell(file);
-      fseek(file, 0, SEEK_SET);
-
-      json = (const char*)malloc(size);
-      fread((void*)json, 1, size, file);
-
-      fclose(file);
-   }
-#else
-   if (cheevos_get_by_game_id(&json, game_id, &timeout) == 0 && json != NULL)
-#endif
-   {
-#ifdef CHEEVOS_SAVE_JSON
-      {
-         FILE* file = fopen(CHEEVOS_SAVE_JSON, "w");
-         fwrite((void*)json, 1, strlen(json), file);
-         fclose(file);
-      }
-#endif
-      if (!settings->bools.cheevos_enable || !cheevos_parse(json))
-      {
-         cheevos_deactivate_unlocks(game_id, &timeout);
-         free((void*)json);
-         cheevos_loaded = true;
-
-         cheevos_make_playing_url(game_id, url, sizeof(url));
-         task_push_http_transfer(url, true, NULL,
-               cheevos_playing, (void*)(uintptr_t)game_id);
-         return true;
-      }
-
-      free((void*)json);
-   }
-
-   runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false);
-   RARCH_ERR("CHEEVOS error loading achievements.\n");
-   return false;
-}
-
 void cheevos_reset_game(void)
 {
    cheevo_t *cheevo    = cheevos_locals.core.cheevos;
@@ -3375,3 +2616,877 @@ bool cheevos_get_support_cheevos(void)
 {
   return cheevos_locals.core_supports;
 }
+
+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;
+
+#define CORO_VARS \
+   void *data; \
+   size_t len; \
+   const char *path; \
+   settings_t *settings; \
+   struct retro_system_info sysinfo; \
+   unsigned i; \
+   unsigned j; \
+   const char *ext; \
+   MD5_CTX md5; \
+   unsigned char hash[16]; \
+   unsigned gameid; \
+   char *json; \
+   size_t count; \
+   size_t offset; \
+   cheevos_nes_header_t header; \
+   size_t romsize, bytes; \
+   int mapper; \
+   bool round; \
+   RFILE* stream; \
+   size_t size; \
+   char url[256]; \
+   struct http_connection_t *conn; \
+   struct http_t *http;
+
+#include "coro.h"
+
+#define INFO     CORO_VAR(info)
+#define DATA     CORO_VAR(data)
+#define LEN      CORO_VAR(len)
+#define PATH     CORO_VAR(path)
+#define SETTINGS CORO_VAR(settings)
+#define SYSINFO  CORO_VAR(sysinfo)
+#define I        CORO_VAR(i)
+#define J        CORO_VAR(j)
+#define EXT      CORO_VAR(ext)
+#define MD5      CORO_VAR(md5)
+#define HASH     CORO_VAR(hash)
+#define GAMEID   CORO_VAR(gameid)
+#define JSON     CORO_VAR(json)
+#define COUNT    CORO_VAR(count)
+#define OFFSET   CORO_VAR(offset)
+#define HEADER   CORO_VAR(header)
+#define ROMSIZE  CORO_VAR(romsize)
+#define BYTES    CORO_VAR(bytes)
+#define MAPPER   CORO_VAR(mapper)
+#define ROUND    CORO_VAR(round)
+#define STREAM   CORO_VAR(stream)
+#define SIZE     CORO_VAR(size)
+#define URL      CORO_VAR(url)
+#define CONN     CORO_VAR(conn)
+#define HTTP     CORO_VAR(http)
+
+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;
+   enum
+   {
+      /* Negative values because CORO_SUB generates positive values */
+      SNES_MD5    = -1,
+      GENESIS_MD5 = -2,
+      NES_MD5     = -3,
+      GENERIC_MD5 = -4,
+      EVAL_MD5    = -5,
+      FILL_MD5    = -6,
+      GET_GAMEID  = -7,
+      GET_CHEEVOS = -8,
+      LOGIN       = -9,
+      HTTP_GET    = -10,
+      DEACTIVATE  = -11,
+      PLAYING     = -12
+   };
+   
+   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 cheevos_finder_t finders[] =
+   {
+      {SNES_MD5,    "SNES (8Mb padding)",      snes_exts},
+      {GENESIS_MD5, "Genesis (6Mb padding)",   genesis_exts},
+      {NES_MD5,     "NES (discards VROM)",     NULL},
+      {GENERIC_MD5, "Generic (plain content)", NULL},
+   };
+   
+   CORO_ENTER()
+   
+      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]);
+
+      RARCH_LOG("CHEEVOS system RAM: %p %u\n",
+         cheevos_locals.meminfo[0].data, cheevos_locals.meminfo[0].size);
+      RARCH_LOG("CHEEVOS save RAM:   %p %u\n",
+         cheevos_locals.meminfo[1].data, cheevos_locals.meminfo[1].size);
+      RARCH_LOG("CHEEVOS video RAM:  %p %u\n",
+         cheevos_locals.meminfo[2].data, cheevos_locals.meminfo[2].size);
+      RARCH_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 (!SETTINGS->bools.cheevos_enable)
+         CORO_STOP();
+      
+      /* Load the content into memory, or copy it over to our own buffer */
+      if (!DATA)
+      {
+         STREAM = filestream_open(PATH, RFILE_MODE_READ, 0);
+
+         if (!STREAM)
+            CORO_STOP();
+         
+         CORO_YIELD();
+         LEN = 0;
+         COUNT = filestream_get_size(STREAM);
+         
+         if (COUNT > CHEEVOS_SIZE_LIMIT)
+            COUNT = CHEEVOS_SIZE_LIMIT;
+         
+         DATA = malloc(COUNT);
+         
+         if (!DATA)
+         {
+            filestream_close(STREAM);
+            CORO_STOP();
+         }
+
+         for (;;)
+         {
+            buffer   = (uint8_t*)DATA + LEN;
+            to_read  = 4096;
+
+            if (to_read > COUNT)
+               to_read = COUNT;
+
+            num_read = filestream_read(STREAM, (void*)buffer, to_read);
+
+            if (num_read <= 0)
+               break;
+
+            LEN   += num_read;
+            COUNT -= num_read;
+            
+            if (COUNT == 0)
+               break;
+            
+            CORO_YIELD();
+         }
+
+         filestream_close(STREAM);
+      }
+      
+      /* Use the supported extensions as a hint
+       * to what method we should use. */
+      core_get_system_info(&SYSINFO);
+
+      for (I = 0; I < ARRAY_SIZE(finders); I++)
+      {
+         if (finders[I].ext_hashes)
+         {
+            EXT = SYSINFO.valid_extensions;
+
+            while (EXT)
+            {
+               unsigned hash;
+               end = strchr(EXT, '|');
+
+               if (end)
+               {
+                  hash = cheevos_djb2(EXT, end - EXT);
+                  EXT = end + 1;
+               }
+               else
+               {
+                  hash = cheevos_djb2(EXT, strlen(EXT));
+                  EXT = NULL;
+               }
+
+               for (J = 0; finders[I].ext_hashes[J]; J++)
+               {
+                  if (finders[I].ext_hashes[J] == hash)
+                  {
+                     RARCH_LOG("CHEEVOS testing %s.\n", finders[I].name);
+                     
+                     /*
+                      * Inputs:  INFO
+                      * Outputs: GAMEID, the game was found if it's different from 0
+                      */
+                     CORO_GOSUB(finders[I].label);
+
+                     if (GAMEID != 0)
+                        goto found;
+
+                     EXT = NULL; /* force next finder */
+                     break;
+                  }
+               }
+            }
+         }
+      }
+
+      for (I = 0; I < ARRAY_SIZE(finders); I++)
+      {
+         if (finders[I].ext_hashes)
+            continue;
+
+         RARCH_LOG("CHEEVOS testing %s.\n", finders[I].name);
+         
+         /*
+          * Inputs:  INFO
+          * Outputs: GAMEID
+          */
+         CORO_GOSUB(finders[I].label);
+
+         if (GAMEID != 0)
+            goto found;
+      }
+
+      RARCH_LOG("CHEEVOS this game doesn't feature achievements.\n");
+      CORO_STOP();
+
+      found:
+      
+#ifdef CHEEVOS_JSON_OVERRIDE
+      {
+         FILE* file;
+         size_t size;
+
+         file = fopen(CHEEVOS_JSON_OVERRIDE, "rb");
+         fseek(file, 0, SEEK_END);
+         size = ftell(file);
+         fseek(file, 0, SEEK_SET);
+
+         JSON = (const char*)malloc(size + 1);
+         fread((void*)JSON, 1, size, file);
+
+         fclose(file);
+         JSON[size] = 0;
+      }
+#else
+      CORO_GOSUB(GET_CHEEVOS);
+      
+      if (!JSON)
+      {
+         runloop_msg_queue_push("Error loading achievements.", 0, 5 * 60, false);
+         RARCH_ERR("CHEEVOS error loading achievements.\n");
+         CORO_STOP();
+      }
+   
+#endif
+
+#ifdef CHEEVOS_SAVE_JSON
+      {
+         FILE* file = fopen(CHEEVOS_SAVE_JSON, "w");
+         fwrite((void*)JSON, 1, strlen(JSON), file);
+         fclose(file);
+      }
+#endif
+      if (cheevos_parse(JSON))
+      {
+         free((void*)JSON);
+         CORO_STOP();
+      }
+      
+      free((void*)JSON);
+      cheevos_loaded = true;
+
+      /*
+       * Inputs:  GAMEID
+       * Outputs:
+       */
+      CORO_GOSUB(DEACTIVATE);
+      
+      /*
+       * Inputs:  GAMEID
+       * Outputs: 
+       */
+      CORO_GOSUB(PLAYING);
+      CORO_STOP();
+
+   /**************************************************************************
+    * Info   Tries to identify a SNES game
+    * Input  INFO the content info
+    * Output GAMEID the Retro Achievements game ID, or 0 if not found
+    *************************************************************************/
+   CORO_SUB(SNES_MD5)
+   
+      MD5_Init(&MD5);
+      
+      OFFSET = COUNT = 0;
+      CORO_GOSUB(EVAL_MD5);
+
+      if (COUNT == 0)
+      {
+         MD5_Final(HASH, &MD5);
+         GAMEID = 0;
+         CORO_RET();
+      }
+
+      if (COUNT < CHEEVOS_EIGHT_MB)
+      {
+         /*
+          * Inputs:  MD5, OFFSET, COUNT
+          * Outputs: MD5
+          */
+         OFFSET = 0;
+         COUNT = CHEEVOS_EIGHT_MB - COUNT;
+         CORO_GOSUB(FILL_MD5);
+      }
+      
+      MD5_Final(HASH, &MD5);
+      CORO_GOTO(GET_GAMEID);
+      
+   /**************************************************************************
+    * Info   Tries to identify a Genesis game
+    * Input  INFO the content info
+    * Output GAMEID the Retro Achievements game ID, or 0 if not found
+    *************************************************************************/
+   CORO_SUB(GENESIS_MD5)
+   
+      MD5_Init(&MD5);
+      
+      OFFSET = COUNT = 0;
+      CORO_GOSUB(EVAL_MD5);
+
+      if (COUNT == 0)
+      {
+         MD5_Final(HASH, &MD5);
+         GAMEID = 0;
+         CORO_RET();
+      }
+
+      if (COUNT < CHEEVOS_SIX_MB)
+      {
+         OFFSET = 0;
+         COUNT = CHEEVOS_SIX_MB - COUNT;
+         CORO_GOSUB(FILL_MD5);
+      }
+      
+      MD5_Final(HASH, &MD5);
+      CORO_GOTO(GET_GAMEID);
+   
+   /**************************************************************************
+    * Info   Tries to identify a NES game
+    * Input  INFO the content info
+    * Output 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 (LEN < sizeof(HEADER))
+      {
+         GAMEID = 0;
+         CORO_RET();
+      }
+
+      memcpy((void*)&HEADER, DATA, sizeof(HEADER));
+
+      if (     HEADER.id[0] != 'N'
+            || HEADER.id[1] != 'E'
+            || HEADER.id[2] != 'S'
+            || HEADER.id[3] != 0x1a)
+      {
+         GAMEID = 0;
+         CORO_RET();
+      }
+
+      if (HEADER.rom_size)
+         ROMSIZE = next_pow2(HEADER.rom_size);
+      else
+         ROMSIZE = 256;
+
+      /* from FCEU core - compute size using the cart mapper */
+      MAPPER = (HEADER.rom_type >> 4) | (HEADER.rom_type2 & 0xF0);
+
+      /* 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. */
+      ROUND = MAPPER != 53 && MAPPER != 198 && MAPPER != 228;
+      BYTES = (ROUND) ? ROMSIZE : HEADER.rom_size;
+
+      /* from FCEU core - check if Trainer included in ROM data */
+      MD5_Init(&MD5);
+      OFFSET = sizeof(HEADER) + (HEADER.rom_type & 4 ? sizeof(HEADER) : 0);
+      COUNT = 0x4000 * BYTES;
+      CORO_GOSUB(EVAL_MD5);
+      
+      if (COUNT < 0x4000 * BYTES)
+      {
+         OFFSET = 0xff;
+         COUNT = 0x4000 * BYTES - COUNT;
+         CORO_GOSUB(FILL_MD5);
+      }
+      
+      MD5_Final(HASH, &MD5);
+      CORO_GOTO(GET_GAMEID);
+      
+   /**************************************************************************
+    * Info   Tries to identify a "generic" game
+    * Input  INFO the content info
+    * Output GAMEID the Retro Achievements game ID, or 0 if not found
+    *************************************************************************/
+   CORO_SUB(GENERIC_MD5)
+   
+      MD5_Init(&MD5);
+      
+      OFFSET = 0;
+      COUNT = 0;
+      CORO_GOSUB(EVAL_MD5);
+
+      MD5_Final(HASH, &MD5);
+
+      if (COUNT == 0)
+         CORO_RET();
+
+      CORO_GOTO(GET_GAMEID);
+   
+   /**************************************************************************
+    * Info    Evaluates the MD5 hash
+    * Inputs  INFO, OFFSET, COUNT
+    * Outputs MD5, COUNT
+    *************************************************************************/
+   CORO_SUB(EVAL_MD5)
+   
+      if (COUNT == 0)
+         COUNT = LEN;
+
+      if (LEN - OFFSET < COUNT)
+         COUNT = LEN - OFFSET;
+
+      if (COUNT > CHEEVOS_SIZE_LIMIT)
+         COUNT = CHEEVOS_SIZE_LIMIT;
+
+      MD5_Update(&MD5, (void*)((uint8_t*)DATA + OFFSET), COUNT);
+      CORO_RET();
+      
+   /**************************************************************************
+    * Info    Updates the MD5 hash with a repeated value
+    * Inputs  OFFSET, COUNT
+    * Outputs MD5
+    *************************************************************************/
+   CORO_SUB(FILL_MD5)
+   
+      {
+         char buffer[4096];
+
+         while (COUNT > 0)
+         {
+            size_t len = sizeof(buffer);
+
+            if (len > COUNT)
+               len = COUNT;
+
+            memset((void*)buffer, OFFSET, len);
+            MD5_Update(&MD5, (void*)buffer, len);
+            COUNT -= len;
+         }
+      }
+      
+      CORO_RET();
+   
+   /**************************************************************************
+    * Info    Gets the achievements from Retro Achievements
+    * Inputs  HASH
+    * Outputs GAMEID
+    *************************************************************************/
+   CORO_SUB(GET_GAMEID)
+      
+      {
+         char gameid[16];
+         
+         RARCH_LOG(
+            "CHEEVOS getting game id for hash %02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x\n",
+            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]
+         );
+
+         snprintf(
+            URL, sizeof(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",
+            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[sizeof(URL) - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+         cheevos_log_url("CHEEVOS url to get the game's id: %s\n", URL);
+#endif
+
+         CORO_GOSUB(HTTP_GET);
+         
+         if (!JSON)
+            CORO_RET();
+         
+         if (cheevos_get_value(JSON, CHEEVOS_JSON_KEY_GAMEID, gameid, sizeof(gameid)))
+         {
+            free((void*)JSON);
+            RARCH_ERR("CHEEVOS error getting game_id.\n");
+            CORO_RET();
+         }
+
+         free((void*)JSON);
+         RARCH_LOG("CHEEVOS got game id %s.\n", gameid);
+         GAMEID = strtol(gameid, NULL, 10);
+         CORO_RET();
+      }
+      
+   /**************************************************************************
+    * Info    Gets the achievements from Retro Achievements
+    * Inputs  GAMEID
+    * Outputs JSON
+    *************************************************************************/
+   CORO_SUB(GET_CHEEVOS)
+   
+      CORO_GOSUB(LOGIN);
+   
+      snprintf(
+         URL, sizeof(URL),
+         "http://retroachievements.org/dorequest.php?r=patch&u=%s&g=%u&f=3&l=1&t=%s",
+         SETTINGS->arrays.cheevos_username,
+         GAMEID, cheevos_locals.token
+      );
+
+      URL[sizeof(URL) - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+      cheevos_log_url("CHEEVOS url to get the list of cheevos: %s\n", URL);
+#endif
+
+      CORO_GOSUB(HTTP_GET);
+      
+      if (!JSON)
+      {
+         RARCH_ERR("CHEEVOS error getting achievements for game id %u.\n", GAMEID);
+         CORO_STOP();
+      }
+      
+      RARCH_LOG("CHEEVOS got achievements for game id %u.\n", GAMEID);
+      CORO_RET();
+   
+   /**************************************************************************
+    * Info Logs in the user at Retro Achievements
+    *************************************************************************/
+   CORO_SUB(LOGIN)
+   
+      if (cheevos_locals.token[0])
+         CORO_RET();
+      
+      {
+         const char *username = SETTINGS->arrays.cheevos_username;
+         const char *password = SETTINGS->arrays.cheevos_password;
+         char urle_user[64];
+         char urle_pwd[64];
+
+         if (!username || !*username || !password || !*password)
+         {
+            runloop_msg_queue_push("Missing Retro Achievements account information.", 0, 5 * 60, false);
+            runloop_msg_queue_push("Please fill in your account information in Settings.", 0, 5 * 60, false);
+            RARCH_ERR("CHEEVOS username and/or password not informed.\n");
+            CORO_STOP();
+         }
+
+         cheevos_url_encode(username, urle_user, sizeof(urle_user));
+         cheevos_url_encode(password, urle_pwd, sizeof(urle_pwd));
+
+         snprintf(
+            URL, sizeof(URL),
+            "http://retroachievements.org/dorequest.php?r=login&u=%s&p=%s",
+            urle_user, urle_pwd
+         );
+
+         URL[sizeof(URL) - 1] = 0;
+      }
+
+#ifdef CHEEVOS_LOG_URLS
+      cheevos_log_url("CHEEVOS url to login: %s\n", URL);
+#endif
+
+      CORO_GOSUB(HTTP_GET);
+      
+      if (JSON)
+      {
+         int res = cheevos_get_value(JSON, CHEEVOS_JSON_KEY_TOKEN, cheevos_locals.token, sizeof(cheevos_locals.token));
+         free((void*)JSON);
+
+         if (!res)
+            CORO_RET();
+      }
+
+      runloop_msg_queue_push("Retro Achievements login error.", 0, 5 * 60, false);
+      RARCH_ERR("CHEEVOS error getting user token.\n");
+      CORO_STOP();
+   
+   /**************************************************************************
+    * Info    Makes a HTTP GET request
+    * Inputs  URL
+    * Outputs JSON
+    *************************************************************************/
+   CORO_SUB(HTTP_GET)
+   
+      JSON = NULL;
+      CONN = net_http_connection_new(URL, "GET", NULL);
+      
+      if (!CONN)
+         CORO_RET();
+      
+      /* Don't bother with timeouts here, it's just a string scan. */
+      while (!net_http_connection_iterate(CONN)) {}
+      
+      /* Error finishing the connection descriptor. */
+      if (!net_http_connection_done(CONN))
+      {
+         net_http_connection_free(CONN);
+         CORO_RET();
+      }
+      
+      HTTP = net_http_new(CONN);
+
+      /* Error connecting to the endpoint. */
+      if (!HTTP)
+      {
+         net_http_connection_free(CONN);
+         CORO_RET();
+      }
+
+      while (!net_http_update(HTTP, NULL, NULL))
+         CORO_YIELD();
+      
+      {
+         size_t length;
+         uint8_t *data = net_http_data(HTTP, &length, false);
+         
+         if (data)
+         {
+            JSON = (char*)malloc(length + 1);
+            
+            if (JSON)
+            {
+               memcpy((void*)JSON, (void*)data, length);
+               free(data);
+               JSON[length] = 0;
+            }
+         }
+      }
+      
+      net_http_delete(HTTP);
+      net_http_connection_free(CONN);
+      CORO_RET();
+   
+   /**************************************************************************
+    * Info    Deactivates the achievements already awarded
+    * Inputs  GAMEID
+    * Outputs 
+    *************************************************************************/
+   CORO_SUB(DEACTIVATE)
+   
+#ifndef CHEEVOS_DONT_DEACTIVATE
+      CORO_GOSUB(LOGIN);
+      
+      /* Deactivate achievements in softcore mode. */
+      snprintf(
+         URL, sizeof(URL),
+         "http://retroachievements.org/dorequest.php?r=unlocks&u=%s&t=%s&g=%u&h=0",
+         SETTINGS->arrays.cheevos_username,
+         cheevos_locals.token, GAMEID
+      );
+
+      URL[sizeof(URL) - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+      cheevos_log_url("CHEEVOS url to get the list of unlocked cheevos in softcore: %s\n", URL);
+#endif
+
+      CORO_GOSUB(HTTP_GET);
+      
+      if (!cheevos_deactivate_unlocks(JSON, CHEEVOS_ACTIVE_SOFTCORE))
+         RARCH_LOG("CHEEVOS deactivated unlocked achievements in softcore mode.\n");
+      else
+         RARCH_ERR("CHEEVOS error deactivating unlocked achievements in softcore mode.\n");
+      
+      /* Deactivate achievements in hardcore mode. */
+      snprintf(
+         URL, sizeof(URL),
+         "http://retroachievements.org/dorequest.php?r=unlocks&u=%s&t=%s&g=%u&h=1",
+         SETTINGS->arrays.cheevos_username,
+         cheevos_locals.token, GAMEID
+      );
+
+      URL[sizeof(URL) - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+      cheevos_log_url("CHEEVOS url to get the list of unlocked cheevos in hardcore: %s\n", URL);
+#endif
+      
+      CORO_GOSUB(HTTP_GET);
+
+      if (!cheevos_deactivate_unlocks(JSON, CHEEVOS_ACTIVE_HARDCORE))
+         RARCH_LOG("CHEEVOS deactivated unlocked achievements in hardcore mode.\n");
+      else
+         RARCH_ERR("CHEEVOS error deactivating unlocked achievements in hardcore mode.\n");
+      
+#endif
+      CORO_RET();
+   
+   /**************************************************************************
+    * Info    Posts the "playing" activity to Retro Achievements
+    * Inputs  GAMEID
+    * Outputs 
+    *************************************************************************/
+   CORO_SUB(PLAYING)
+
+      snprintf(
+         URL, sizeof(URL),
+         "http://retroachievements.org/dorequest.php?r=postactivity&u=%s&t=%s&a=3&m=%u",
+         SETTINGS->arrays.cheevos_username,
+         cheevos_locals.token, GAMEID
+      );
+
+      URL[sizeof(URL) - 1] = 0;
+
+#ifdef CHEEVOS_LOG_URLS
+      cheevos_log_url("CHEEVOS url to post the 'playing' activity: %s\n", URL);
+#endif
+      
+      CORO_GOSUB(HTTP_GET);
+      
+      if (!JSON)
+         CORO_GOTO(PLAYING);
+      
+      RARCH_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 (!cheevos_iterate(coro))
+   {
+      task_set_finished(task, true);
+      free(DATA);
+      free((void*)PATH);
+      free((void*)coro);
+   }
+}
+
+bool cheevos_load(const void *data)
+{
+   retro_task_t *task;
+   coro_t *coro;
+   const struct retro_game_info *info;
+   
+   cheevos_loaded = 0;
+
+   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)
+   {
+      free((void*)coro);
+      return false;
+   }
+   
+   CORO_SETUP(coro);
+   
+   info = (const struct retro_game_info*)data;
+   
+   if (info->data)
+   {
+      LEN = info->size;
+      
+      if (LEN > CHEEVOS_SIZE_LIMIT)
+         LEN = CHEEVOS_SIZE_LIMIT;
+      
+      DATA = malloc(LEN);
+      
+      if (!DATA)
+      {
+         free((void*)task);
+         free((void*)coro);
+         return false;
+      }
+      
+      memcpy(DATA, info->data, LEN);
+      PATH = NULL;
+   }
+   else
+   {
+      DATA = NULL;
+      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;
+   
+   task_queue_push(task);
+   return true;
+}
diff --git a/cheevos/coro.h b/cheevos/coro.h
new file mode 100644
index 0000000000..5aa7794cdf
--- /dev/null
+++ b/cheevos/coro.h
@@ -0,0 +1,83 @@
+#ifndef CORO_H
+#define CORO_H
+
+/*
+Released under the CC0: https://creativecommons.org/publicdomain/zero/1.0/
+*/
+
+/* Use at the beginning of the coroutine, you must have declared a variable coro_t* coro */
+#define CORO_ENTER() \
+  { \
+  CORO_again: ; \
+  switch ( coro->step ) { \
+  case CORO_BEGIN: ;
+
+/* Use to define labels which are targets to GOTO and GOSUB */
+#define CORO_SUB( x ) \
+  case x: ;
+
+/* Use at the end of the coroutine */
+#define CORO_LEAVE() \
+  } \
+  } \
+  do { return 0; } while ( 0 )
+
+/* Go to the x label */
+#define CORO_GOTO( x ) \
+  do { \
+    coro->step = ( x ); \
+    goto CORO_again; \
+  } while ( 0 )
+
+/* Go to a subroutine, execution continues until the subroutine returns via RET */
+/* x is the subroutine label, y and z are the A and B arguments */
+#define CORO_GOSUB( x ) \
+  do { \
+    coro->stack[ coro->sp++ ] = __LINE__; \
+    coro->step = ( x ); \
+    goto CORO_again; \
+    case __LINE__: ; \
+  } while ( 0 )
+
+/* Returns from a subroutine */
+#define CORO_RET() \
+  do { \
+    coro->step = coro->stack[ --coro->sp ]; \
+    goto CORO_again; \
+  } while ( 0 )
+
+/* Yields to the caller, execution continues from this point when the coroutine is resumed */
+#define CORO_YIELD() \
+  do { \
+    coro->step = __LINE__; \
+    return 1; \
+    case __LINE__: ; \
+  } while ( 0 )
+
+#define CORO_STOP() \
+  do { \
+    return 0; \
+  } while ( 0 )
+
+/* The coroutine entry point, never use 0 as a label */
+#define CORO_BEGIN 0
+
+/* Sets up a coroutine, x is a pointer to coro_t */
+#define CORO_SETUP( x ) \
+  do { \
+    ( x )->step = CORO_BEGIN; \
+    ( x )->sp = 0; \
+  } while ( 0 )
+
+#define CORO_VAR( x ) ( coro->x )
+
+/* A coroutine */
+typedef struct
+{
+  CORO_VARS
+  int step, sp;
+  int stack[ 8 ];
+}
+coro_t;
+
+#endif /* CORO_H */
diff --git a/command.c b/command.c
index f2b426a106..da186dbe08 100644
--- a/command.c
+++ b/command.c
@@ -49,7 +49,6 @@
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
 #include "menu/menu_content.h"
-#include "menu/menu_display.h"
 #include "menu/menu_shader.h"
 #include "menu/widgets/menu_dialog.h"
 #endif
@@ -87,7 +86,7 @@
 
 #include "core.h"
 #include "verbosity.h"
-#include "runloop.h"
+#include "retroarch.h"
 #include "configuration.h"
 #include "input/input_remapping.h"
 
@@ -392,14 +391,14 @@ static void command_parse_msg(command_t *handle, char *buf, enum cmd_source_t so
 #if defined(HAVE_NETWORKING) && defined(HAVE_NETWORK_CMD)
 static bool command_network_init(command_t *handle, uint16_t port)
 {
-   int fd;
    struct addrinfo *res  = NULL;
+   int fd                = socket_init((void**)&res, port,
+         NULL, SOCKET_TYPE_DATAGRAM);
 
    RARCH_LOG("%s %hu.\n",
          msg_hash_to_str(MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT),
          (unsigned short)port);
 
-   fd = socket_init((void**)&res, port, NULL, SOCKET_TYPE_DATAGRAM);
 
    if (fd < 0)
       goto error;
@@ -437,9 +436,10 @@ static bool send_udp_packet(const char *host,
    int fd                      = -1;
    bool ret                    = true;
 
-   hints.ai_socktype = SOCK_DGRAM;
+   hints.ai_socktype           = SOCK_DGRAM;
 
    snprintf(port_buf, sizeof(port_buf), "%hu", (unsigned short)port);
+
    if (getaddrinfo_retro(host, port_buf, &hints, &res) < 0)
       return false;
 
@@ -794,12 +794,6 @@ static void command_stdin_poll(command_t *handle)
 #endif
 #endif
 
-static void command_local_poll(command_t *handle)
-{
-   if (!handle->local_enable)
-      return;
-}
-
 bool command_poll(command_t *handle)
 {
    memset(handle->state, 0, sizeof(handle->state));
@@ -814,8 +808,6 @@ bool command_poll(command_t *handle)
    command_stdin_poll(handle);
 #endif
 
-   command_local_poll(handle);
-
    return true;
 }
 
@@ -1368,15 +1360,15 @@ static bool command_event_init_core(enum rarch_core_type *data)
    if (!core_init_symbols(data))
       return false;
 
-   runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_INIT, NULL);
+   rarch_ctl(RARCH_CTL_SYSTEM_INFO_INIT, NULL);
 
    /* auto overrides: apply overrides */
    if(settings->bools.auto_overrides_enable)
    {
       if (config_load_override())
-         runloop_ctl(RUNLOOP_CTL_SET_OVERRIDES_ACTIVE, NULL);
+         rarch_ctl(RARCH_CTL_SET_OVERRIDES_ACTIVE, NULL);
       else
-         runloop_ctl(RUNLOOP_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
+         rarch_ctl(RARCH_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
    }
 
    /* Auto-remap: apply shader preset files */
@@ -1395,7 +1387,7 @@ static bool command_event_init_core(enum rarch_core_type *data)
       config_load_remap();
 
    /* Per-core saves: reset redirection paths */
-   rarch_ctl(RARCH_CTL_SET_PATHS_REDIRECT, NULL);
+   path_set_redirect();
 
    if (!core_init())
       return false;
@@ -1406,20 +1398,20 @@ static bool command_event_init_core(enum rarch_core_type *data)
    if (!core_load(settings->uints.input_poll_type_behavior))
       return false;
 
-   runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL);
+   rarch_ctl(RARCH_CTL_SET_FRAME_LIMIT, NULL);
 
    return true;
 }
 
 static void command_event_disable_overrides(void)
 {
-   if (!runloop_ctl(RUNLOOP_CTL_IS_OVERRIDES_ACTIVE, NULL))
+   if (!rarch_ctl(RARCH_CTL_IS_OVERRIDES_ACTIVE, NULL))
       return;
 
    /* reload the original config */
 
    config_unload_override();
-   runloop_ctl(RUNLOOP_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
+   rarch_ctl(RARCH_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
 }
 
 static void command_event_restore_default_shader_preset(void)
@@ -1583,12 +1575,12 @@ static bool command_event_save_core_config(void)
             sizeof(config_path));
    }
 
-   if (runloop_ctl(RUNLOOP_CTL_IS_OVERRIDES_ACTIVE, NULL))
+   if (rarch_ctl(RARCH_CTL_IS_OVERRIDES_ACTIVE, NULL))
    {
       /* Overrides block config file saving,
        * make it appear as overrides weren't enabled
        * for a manual save. */
-      runloop_ctl(RUNLOOP_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
+      rarch_ctl(RARCH_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
       overrides_active = true;
    }
 
@@ -1597,9 +1589,9 @@ static bool command_event_save_core_config(void)
    runloop_msg_queue_push(msg, 1, 180, true);
 
    if (overrides_active)
-      runloop_ctl(RUNLOOP_CTL_SET_OVERRIDES_ACTIVE, NULL);
+      rarch_ctl(RARCH_CTL_SET_OVERRIDES_ACTIVE, NULL);
    else
-      runloop_ctl(RUNLOOP_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
+      rarch_ctl(RARCH_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
    return ret;
 }
 
@@ -1633,7 +1625,7 @@ static void command_event_save_current_config(enum override_type type)
 
             /* set overrides to active so the original config can be
                restored after closing content */
-            runloop_ctl(RUNLOOP_CTL_SET_OVERRIDES_ACTIVE, NULL);
+            rarch_ctl(RARCH_CTL_SET_OVERRIDES_ACTIVE, NULL);
          }
          else
          {
@@ -1762,7 +1754,7 @@ static bool command_event_resize_windowed_scale(void)
    unsigned *window_scale = NULL;
    settings_t *settings   = config_get_ptr();
 
-   if (runloop_ctl(RUNLOOP_CTL_GET_WINDOWED_SCALE, &window_scale))
+   if (rarch_ctl(RARCH_CTL_GET_WINDOWED_SCALE, &window_scale))
    {
       if (!window_scale || *window_scale == 0)
          return false;
@@ -1773,7 +1765,7 @@ static bool command_event_resize_windowed_scale(void)
    if (!settings->bools.video_fullscreen)
       command_event(CMD_EVENT_REINIT, NULL);
 
-   runloop_ctl(RUNLOOP_CTL_SET_WINDOWED_SCALE, &idx);
+   rarch_ctl(RARCH_CTL_SET_WINDOWED_SCALE, &idx);
 
    return true;
 }
@@ -1888,9 +1880,9 @@ bool command_event(enum event_command cmd, void *data)
       case CMD_EVENT_MENU_TOGGLE:
 #ifdef HAVE_MENU
          if (menu_driver_is_alive())
-            rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
+            rarch_menu_running_finished();
          else
-            rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
+            rarch_menu_running();
 #endif
          break;
       case CMD_EVENT_CONTROLLERS_INIT:
@@ -1945,7 +1937,8 @@ bool command_event(enum event_command cmd, void *data)
          }
          break;
       case CMD_EVENT_TAKE_SCREENSHOT:
-         if (!take_screenshot(path_get(RARCH_PATH_BASENAME), false))
+         if (!take_screenshot(path_get(RARCH_PATH_BASENAME), false,
+                  video_driver_cached_frame_has_valid_framebuffer()))
             return false;
          break;
       case CMD_EVENT_UNLOAD_CORE:
@@ -2056,10 +2049,9 @@ bool command_event(enum event_command cmd, void *data)
       case CMD_EVENT_AUDIO_STOP:
          return audio_driver_stop();
       case CMD_EVENT_AUDIO_START:
-         return audio_driver_start(runloop_ctl(RUNLOOP_CTL_IS_SHUTDOWN, NULL));
+         return audio_driver_start(rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL));
       case CMD_EVENT_AUDIO_MUTE_TOGGLE:
          {
-            settings_t *settings      = config_get_ptr();
             bool audio_mute_enable    = *(audio_get_bool_ptr(AUDIO_ACTION_MUTE_ENABLE));
             const char *msg           = !audio_mute_enable ?
                msg_hash_to_str(MSG_AUDIO_MUTED):
@@ -2304,7 +2296,7 @@ bool command_event(enum event_command cmd, void *data)
 #endif
          break;
       case CMD_EVENT_RESUME:
-         rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
+         rarch_menu_running_finished();
          if (ui_companion_is_on_foreground())
             ui_companion_driver_toggle();
          break;
@@ -2362,21 +2354,21 @@ bool command_event(enum event_command cmd, void *data)
          }
          break;
       case CMD_EVENT_PAUSE_TOGGLE:
-         boolean = runloop_ctl(RUNLOOP_CTL_IS_PAUSED,  NULL);
+         boolean = rarch_ctl(RARCH_CTL_IS_PAUSED,  NULL);
          boolean = !boolean;
-         runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
+         rarch_ctl(RARCH_CTL_SET_PAUSED, &boolean);
          command_event(CMD_EVENT_PAUSE_CHECKS, NULL);
          break;
       case CMD_EVENT_UNPAUSE:
          boolean = false;
 
-         runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
+         rarch_ctl(RARCH_CTL_SET_PAUSED, &boolean);
          command_event(CMD_EVENT_PAUSE_CHECKS, NULL);
          break;
       case CMD_EVENT_PAUSE:
          boolean = true;
 
-         runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
+         rarch_ctl(RARCH_CTL_SET_PAUSED, &boolean);
          command_event(CMD_EVENT_PAUSE_CHECKS, NULL);
          break;
       case CMD_EVENT_MENU_PAUSE_LIBRETRO:
@@ -2694,7 +2686,7 @@ bool command_event(enum event_command cmd, void *data)
          command_event_set_volume(-0.5f);
          break;
       case CMD_EVENT_SET_FRAME_LIMIT:
-         runloop_ctl(RUNLOOP_CTL_SET_FRAME_LIMIT, NULL);
+         rarch_ctl(RARCH_CTL_SET_FRAME_LIMIT, NULL);
          break;
       case CMD_EVENT_DISABLE_OVERRIDES:
          command_event_disable_overrides();
diff --git a/config.def.h b/config.def.h
index 00c862396d..16bb4418c3 100644
--- a/config.def.h
+++ b/config.def.h
@@ -226,7 +226,7 @@ static const bool overlay_hide_in_menu = true;
 static const bool display_keyboard_overlay = false;
 
 #ifdef HAVE_MENU
-#include "menu/menu_display.h"
+#include "menu/menu_driver.h"
 
 static bool default_block_config_read = true;
 
@@ -263,13 +263,11 @@ static float menu_footer_opacity = 1.000;
 
 static float menu_header_opacity = 1.000;
 
-#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_VULKAN)
 #if defined(HAVE_OPENGLES2) || (defined(__MACH__) && (defined(__ppc__) || defined(__ppc64__)))
 static unsigned menu_shader_pipeline = 1;
 #else
 static unsigned menu_shader_pipeline = 2;
 #endif
-#endif
 
 static bool show_advanced_settings            = false;
 static const uint32_t menu_entry_normal_color = 0xffffffff;
diff --git a/configuration.c b/configuration.c
index f309498123..29e5d6aabd 100644
--- a/configuration.c
+++ b/configuration.c
@@ -32,6 +32,7 @@
 
 #include "file_path_special.h"
 #include "audio/audio_driver.h"
+#include "input/input_driver.h"
 #include "configuration.h"
 #include "content.h"
 #include "config.def.h"
@@ -43,7 +44,6 @@
 #include "dirs.h"
 #include "paths.h"
 #include "retroarch.h"
-#include "runloop.h"
 #include "verbosity.h"
 #include "lakka.h"
 
@@ -1283,7 +1283,7 @@ static struct config_float_setting *populate_settings_float(settings_t *settings
    SETTING_FLOAT("video_font_size",          &settings->floats.video_font_size,      true, font_size, false);
    SETTING_FLOAT("fastforward_ratio",        &settings->floats.fastforward_ratio,    true, fastforward_ratio, false);
    SETTING_FLOAT("slowmotion_ratio",         &settings->floats.slowmotion_ratio,     true, slowmotion_ratio, false);
-   SETTING_FLOAT("input_axis_threshold",     &settings->floats.input_axis_threshold, true, axis_threshold, false);
+   SETTING_FLOAT("input_axis_threshold",     input_driver_get_float(INPUT_ACTION_AXIS_THRESHOLD), true, axis_threshold, false);
 
    *size = count;
 
@@ -1299,7 +1299,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("input_bind_timeout",           &settings->uints.input_bind_timeout,     true, input_bind_timeout, false);
    SETTING_UINT("input_turbo_period",           &settings->uints.input_turbo_period,     true, turbo_period, false);
    SETTING_UINT("input_duty_cycle",             &settings->uints.input_turbo_duty_cycle, true, turbo_duty_cycle, false);
-   SETTING_UINT("input_max_users",              &settings->uints.input_max_users,        true, input_max_users, false);
+   SETTING_UINT("input_max_users",              input_driver_get_uint(INPUT_ACTION_MAX_USERS),        true, input_max_users, false);
    SETTING_UINT("input_menu_toggle_gamepad_combo", &settings->uints.input_menu_toggle_gamepad_combo, true, menu_toggle_gamepad_combo, false);
    SETTING_UINT("audio_latency",                &settings->uints.audio_latency, false, 0 /* TODO */, false);
    SETTING_UINT("audio_block_frames",           &settings->uints.audio_block_frames, true, 0, false);
@@ -1332,9 +1332,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("xmb_menu_color_theme",         &settings->uints.menu_xmb_color_theme, true, xmb_theme, false);
 #endif
    SETTING_UINT("materialui_menu_color_theme",  &settings->uints.menu_materialui_color_theme, true, MATERIALUI_THEME_BLUE, false);
-#ifdef HAVE_SHADERPIPELINE
    SETTING_UINT("menu_shader_pipeline",         &settings->uints.menu_xmb_shader_pipeline, true, menu_shader_pipeline, false);
-#endif
 #endif
    SETTING_UINT("audio_out_rate",               &settings->uints.audio_out_rate, true, out_rate, false);
    SETTING_UINT("custom_viewport_width",        &custom_vp->width, false, 0 /* TODO */, false);
@@ -1354,7 +1352,7 @@ static struct config_uint_setting *populate_settings_uint(settings_t *settings,
    SETTING_UINT("netplay_input_latency_frames_range",&settings->uints.netplay_input_latency_frames_range, true, 0, false);
 #endif
 #ifdef HAVE_LANGEXTRA
-   SETTING_UINT("user_language",                &settings->uints.user_language, true, RETRO_LANGUAGE_ENGLISH, false);
+   SETTING_UINT("user_language",                msg_hash_get_uint(MSG_HASH_USER_LANGUAGE), true, RETRO_LANGUAGE_ENGLISH, false);
 #endif
    SETTING_UINT("bundle_assets_extract_version_current", &settings->uints.bundle_assets_extract_version_current, true, 0, false);
    SETTING_UINT("bundle_assets_extract_last_version",    &settings->uints.bundle_assets_extract_last_version, true, 0, false);
@@ -1507,7 +1505,7 @@ static void config_set_defaults(void)
 #endif
    settings->floats.video_scale                = scale;
 
-   if (rarch_ctl(RARCH_CTL_IS_FORCE_FULLSCREEN, NULL))
+   if (retroarch_is_forced_fullscreen())
    {
       configuration_set_bool(settings, settings->bools.video_fullscreen, true);
    }
@@ -1697,7 +1695,7 @@ static void config_set_defaults(void)
       strlcpy(settings->paths.network_buildbot_url,
             g_defaults.path.buildbot_server_url, sizeof(settings->paths.network_buildbot_url));
    if (!string_is_empty(g_defaults.path.core))
-      runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, g_defaults.path.core);
+      rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, g_defaults.path.core);
    if (!string_is_empty(g_defaults.dir.database))
       strlcpy(settings->paths.path_content_database, g_defaults.dir.database,
             sizeof(settings->paths.path_content_database));
@@ -1719,7 +1717,7 @@ static void config_set_defaults(void)
       if (string_is_empty(settings->paths.path_overlay))
             fill_pathname_join(settings->paths.path_overlay,
                   settings->paths.directory_overlay,
-                  "gamepads/retropad/retropad.cfg",
+                  "gamepads/flat/retropad.cfg",
                   sizeof(settings->paths.path_overlay));
 #endif
    }
@@ -2067,15 +2065,15 @@ static bool check_shader_compatibility(enum file_path_enum enum_idx)
 {
    settings_t *settings = config_get_ptr();
 
-   if (memcmp(settings->arrays.video_driver, "vulkan", 6) == 0)
+   if (string_is_equal_fast(settings->arrays.video_driver, "vulkan", 6))
    {
       if (enum_idx != FILE_PATH_SLANGP_EXTENSION)
          return false;
       return true;
    }
 
-   if ((memcmp(settings->arrays.video_driver, "gl", 2) == 0) || 
-       (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+   if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2) || 
+       string_is_equal_fast(settings->arrays.video_driver, "d3d", 3)
       )
    {
       if (enum_idx == FILE_PATH_SLANGP_EXTENSION)
@@ -2245,7 +2243,7 @@ static bool config_load_file(const char *path, bool set_defaults,
          *bool_settings[i].ptr = tmp;
    }
 
-   if (!rarch_ctl(RARCH_CTL_IS_FORCE_FULLSCREEN, NULL))
+   if (!retroarch_is_forced_fullscreen())
       CONFIG_GET_BOOL_BASE(conf, settings, bools.video_fullscreen, "video_fullscreen");
 
 #ifdef HAVE_NETWORKGAMEPAD
@@ -2280,9 +2278,9 @@ static bool config_load_file(const char *path, bool set_defaults,
       if (config_get_bool(conf, tmp, &tmp_bool))
       {
          if (tmp_bool)
-            runloop_ctl(RUNLOOP_CTL_SET_PERFCNT_ENABLE, NULL);
+            rarch_ctl(RARCH_CTL_SET_PERFCNT_ENABLE, NULL);
          else
-            runloop_ctl(RUNLOOP_CTL_UNSET_PERFCNT_ENABLE, NULL);
+            rarch_ctl(RARCH_CTL_UNSET_PERFCNT_ENABLE, NULL);
       }
    }
 
@@ -2504,7 +2502,7 @@ static bool config_load_file(const char *path, bool set_defaults,
 
    if (!string_is_empty(settings->paths.directory_screenshot))
    {
-      if (memcmp(settings->paths.directory_screenshot, "default", 7) == 0)
+      if (string_is_equal_fast(settings->paths.directory_screenshot, "default", 7))
          *settings->paths.directory_screenshot = '\0';
       else if (!path_is_directory(settings->paths.directory_screenshot))
       {
@@ -2522,36 +2520,36 @@ static bool config_load_file(const char *path, bool set_defaults,
       path_clear(RARCH_PATH_CORE);
    }
 
-   if (memcmp(settings->paths.path_menu_wallpaper, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.path_menu_wallpaper, "default", 7))
       *settings->paths.path_menu_wallpaper = '\0';
-   if (memcmp(settings->paths.directory_video_shader, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_video_shader, "default", 7))
       *settings->paths.directory_video_shader = '\0';
-   if (memcmp(settings->paths.directory_video_filter, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_video_filter, "default", 7))
       *settings->paths.directory_video_filter = '\0';
-   if (memcmp(settings->paths.directory_audio_filter, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_audio_filter, "default", 7))
       *settings->paths.directory_audio_filter = '\0';
-   if (memcmp(settings->paths.directory_core_assets, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_core_assets, "default", 7))
       *settings->paths.directory_core_assets = '\0';
-   if (memcmp(settings->paths.directory_assets, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_assets, "default", 7))
       *settings->paths.directory_assets = '\0';
-   if (memcmp(settings->paths.directory_dynamic_wallpapers, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_dynamic_wallpapers, "default", 7))
       *settings->paths.directory_dynamic_wallpapers = '\0';
-   if (memcmp(settings->paths.directory_thumbnails, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_thumbnails, "default", 7))
       *settings->paths.directory_thumbnails = '\0';
-   if (memcmp(settings->paths.directory_playlist, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_playlist, "default", 7))
       *settings->paths.directory_playlist = '\0';
 #ifdef HAVE_MENU
 
-   if (memcmp(settings->paths.directory_menu_content, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_menu_content, "default", 7))
       *settings->paths.directory_menu_content = '\0';
-   if (memcmp(settings->paths.directory_menu_config, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_menu_config, "default", 7))
       *settings->paths.directory_menu_config = '\0';
 #endif
 #ifdef HAVE_OVERLAY
-   if (memcmp(settings->paths.directory_overlay, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_overlay, "default", 7))
       *settings->paths.directory_overlay = '\0';
 #endif
-   if (memcmp(settings->paths.directory_system, "default", 7) == 0)
+   if (string_is_equal_fast(settings->paths.directory_system, "default", 7))
       *settings->paths.directory_system = '\0';
 
    if (settings->floats.slowmotion_ratio < 1.0f)
@@ -2575,7 +2573,7 @@ static bool config_load_file(const char *path, bool set_defaults,
    if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_SAVE_PATH, NULL) &&
          config_get_path(conf, "savefile_directory", tmp_str, sizeof(tmp_str)))
    {
-      if (memcmp(tmp_str, "default", 7) == 0)
+      if (string_is_equal_fast(tmp_str, "default", 7))
          dir_set(RARCH_DIR_SAVEFILE, g_defaults.dir.sram);
 
       else if (path_is_directory(tmp_str))
@@ -2601,7 +2599,7 @@ static bool config_load_file(const char *path, bool set_defaults,
    if (!retroarch_override_setting_is_set(RARCH_OVERRIDE_SETTING_STATE_PATH, NULL) &&
          config_get_path(conf, "savestate_directory", tmp_str, sizeof(tmp_str)))
    {
-      if (memcmp(tmp_str, "default", 7) == 0)
+      if (string_is_equal_fast(tmp_str, "default", 7))
          dir_set(RARCH_DIR_SAVESTATE, g_defaults.dir.savestate);
       else if (path_is_directory(tmp_str))
       {
@@ -3385,7 +3383,7 @@ bool config_save_file(const char *path)
    if (!conf)
       conf = config_file_new(NULL);
 
-   if (!conf || runloop_ctl(RUNLOOP_CTL_IS_OVERRIDES_ACTIVE, NULL))
+   if (!conf || rarch_ctl(RARCH_CTL_IS_OVERRIDES_ACTIVE, NULL))
    {
       if (conf)
          config_file_free(conf);
@@ -3505,7 +3503,7 @@ bool config_save_file(const char *path)
    config_set_bool(conf, "log_verbosity",
          verbosity_is_enabled());
    config_set_bool(conf, "perfcnt_enable",
-         runloop_ctl(RUNLOOP_CTL_IS_PERFCNT_ENABLE, NULL));
+         rarch_ctl(RARCH_CTL_IS_PERFCNT_ENABLE, NULL));
 
    msg_color = (((int)(settings->floats.video_msg_color_r * 255.0f) & 0xff) << 16) +
                (((int)(settings->floats.video_msg_color_g * 255.0f) & 0xff) <<  8) +
diff --git a/configuration.h b/configuration.h
index 43d71d40e2..223cc80685 100644
--- a/configuration.h
+++ b/configuration.h
@@ -231,7 +231,6 @@ typedef struct settings
       float audio_max_timing_skew;
       float audio_volume; /* dB scale. */
 
-      float input_axis_threshold;
       float input_overlay_opacity;
       float input_overlay_scale;
 
@@ -256,8 +255,6 @@ typedef struct settings
       unsigned audio_latency;
       unsigned input_remap_ids[MAX_USERS][RARCH_BIND_LIST_END];
 
-      unsigned input_max_users;
-
       /* Set by autoconfiguration in joypad_autoconfig_dir.
        * Does not override main binds. */
       unsigned input_libretro_device[MAX_USERS];
@@ -285,9 +282,6 @@ typedef struct settings
       unsigned autosave_interval;
       unsigned network_cmd_port;
       unsigned network_remote_base_port;
-#ifdef HAVE_LANGEXTRA
-      unsigned user_language;
-#endif
       unsigned video_window_x;
       unsigned video_window_y;
       unsigned video_monitor_index;
diff --git a/core_info.c b/core_info.c
index 749ae7ec55..7ab95ba2c1 100644
--- a/core_info.c
+++ b/core_info.c
@@ -27,7 +27,7 @@
 #include "config.h"
 #endif
 
-#include "runloop.h"
+#include "retroarch.h"
 #include "verbosity.h"
 
 #include "config.def.h"
@@ -507,7 +507,7 @@ static bool core_info_list_update_missing_firmware_internal(
    if (!info)
       return false;
 
-   runloop_ctl(RUNLOOP_CTL_UNSET_MISSING_BIOS, NULL);
+   rarch_ctl(RARCH_CTL_UNSET_MISSING_BIOS, NULL);
    for (i = 0; i < info->firmware_count; i++)
    {
       if (string_is_empty(info->firmware[i].path))
@@ -518,7 +518,7 @@ static bool core_info_list_update_missing_firmware_internal(
       info->firmware[i].missing = !path_file_exists(path);
       if (info->firmware[i].missing && !info->firmware[i].optional)
       {
-         runloop_ctl(RUNLOOP_CTL_SET_MISSING_BIOS, NULL);
+         rarch_ctl(RARCH_CTL_SET_MISSING_BIOS, NULL);
          RARCH_WARN("Firmware missing: %s\n", info->firmware[i].path);
       }
    }
diff --git a/database_info.h b/database_info.h
index 657eac0df2..31263952cd 100644
--- a/database_info.h
+++ b/database_info.h
@@ -132,11 +132,6 @@ database_info_handle_t *database_info_file_init(const char *path,
 
 void database_info_free(database_info_handle_t *handle);
 
-#if 0
-int database_info_build_query(
-      char *query, size_t len, const char *label, const char *path);
-#endif
-
 int database_info_build_query_enum(
       char *query, size_t len, enum database_query_type type, const char *path);
 
diff --git a/defines/psp_defines.h b/defines/psp_defines.h
index c2b65e1da9..aa8498ea80 100644
--- a/defines/psp_defines.h
+++ b/defines/psp_defines.h
@@ -106,7 +106,7 @@ int sceClibPrintf ( const char * format, ... );
 
 #if defined(VITA)
 #define CtrlSetSamplingMode(mode) sceCtrlSetSamplingModeExt(mode)
-#define CtrlPeekBufferPositive(port, pad_data, bufs) sceCtrlReadBufferPositiveExt2(port, pad_data, bufs)
+#define CtrlPeekBufferPositive(port, pad_data, bufs) sceCtrlPeekBufferPositiveExt2(port, pad_data, bufs)
 #else
 #define CtrlSetSamplingMode(mode) sceCtrlSetSamplingMode(mode)
 #define CtrlPeekBufferPositive(port, pad_data, bufs) sceCtrlPeekBufferPositive(port, pad_data, bufs)
diff --git a/dirs.c b/dirs.c
index c830af1f20..d41cc5bc6a 100644
--- a/dirs.c
+++ b/dirs.c
@@ -32,7 +32,7 @@
 #include "msg_hash.h"
 #include "paths.h"
 #include "content.h"
-#include "runloop.h"
+#include "retroarch.h"
 #include "verbosity.h"
 
 struct rarch_dir_list
diff --git a/driver.c b/driver.c
index 9ab8c2fe9a..b7024289d2 100644
--- a/driver.c
+++ b/driver.c
@@ -40,7 +40,7 @@
 #include "core.h"
 #include "core_info.h"
 #include "driver.h"
-#include "runloop.h"
+#include "retroarch.h"
 #include "verbosity.h"
 
 #define HASH_LOCATION_DRIVER           0x09189689U
@@ -202,7 +202,7 @@ bool driver_find_next(const char *label, char *s, size_t len)
 {
    int i = driver_find_index(label, s);
 
-   if (i >= 0 && (memcmp(s, "null", 4) != 0))
+   if (i >= 0 && string_is_not_equal_fast(s, "null", 4))
    {
       find_driver_nonempty(label, i + 1, s, len);
       return true;
@@ -222,7 +222,7 @@ static void driver_adjust_system_rates(void)
    if (!video_driver_get_ptr(false))
       return;
 
-   if (runloop_ctl(RUNLOOP_CTL_IS_NONBLOCK_FORCED, NULL))
+   if (rarch_ctl(RARCH_CTL_IS_NONBLOCK_FORCED, NULL))
       command_event(CMD_EVENT_VIDEO_SET_NONBLOCKING_STATE, NULL);
    else
       driver_set_nonblock_state();
@@ -247,7 +247,7 @@ void driver_set_nonblock_state(void)
       bool video_nonblock  = enable;
 
       if (     !settings->bools.video_vsync 
-            || runloop_ctl(RUNLOOP_CTL_IS_NONBLOCK_FORCED, NULL))
+            || rarch_ctl(RARCH_CTL_IS_NONBLOCK_FORCED, NULL))
          video_nonblock = true;
       video_driver_set_nonblock_state(video_nonblock);
    }
@@ -330,7 +330,7 @@ void drivers_init(int flags)
          hwr->context_reset();
       video_driver_unset_video_cache_context_ack();
 
-      runloop_ctl(RUNLOOP_CTL_SET_FRAME_TIME_LAST, NULL);
+      rarch_ctl(RARCH_CTL_SET_FRAME_TIME_LAST, NULL);
    }
 
    if (flags & DRIVER_AUDIO_MASK)
diff --git a/dynamic.c b/dynamic.c
index 9d09cde824..b8a58121dc 100644
--- a/dynamic.c
+++ b/dynamic.c
@@ -50,7 +50,7 @@
 #include "core.h"
 #include "driver.h"
 #include "performance_counters.h"
-#include "gfx/video_context_driver.h"
+#include "gfx/video_driver.h"
 
 #include "cores/internal_cores.h"
 #include "frontend/frontend_driver.h"
@@ -58,7 +58,6 @@
 #include "dirs.h"
 #include "paths.h"
 #include "retroarch.h"
-#include "runloop.h"
 #include "configuration.h"
 #include "msg_hash.h"
 #include "verbosity.h"
@@ -672,9 +671,9 @@ void uninit_libretro_sym(struct retro_core_t *current_core)
 
    memset(current_core, 0, sizeof(struct retro_core_t));
 
-   runloop_ctl(RUNLOOP_CTL_CORE_OPTIONS_DEINIT, NULL);
-   runloop_ctl(RUNLOOP_CTL_SYSTEM_INFO_FREE, NULL);
-   runloop_ctl(RUNLOOP_CTL_FRAME_TIME_FREE, NULL);
+   rarch_ctl(RARCH_CTL_CORE_OPTIONS_DEINIT, NULL);
+   rarch_ctl(RARCH_CTL_SYSTEM_INFO_FREE, NULL);
+   rarch_ctl(RARCH_CTL_FRAME_TIME_FREE, NULL);
    camera_driver_ctl(RARCH_CAMERA_CTL_UNSET_ACTIVE, NULL);
    location_driver_ctl(RARCH_LOCATION_CTL_UNSET_ACTIVE, NULL);
 
@@ -907,7 +906,7 @@ static bool dynamic_verify_hw_context(enum retro_hw_context_type type,
    switch (type)
    {
       case RETRO_HW_CONTEXT_VULKAN:
-         if (memcmp(video_ident, "vulkan", 6) != 0)
+         if (string_is_not_equal_fast(video_ident, "vulkan", 6))
             return false;
          break;
       case RETRO_HW_CONTEXT_OPENGLES2:
@@ -915,7 +914,7 @@ static bool dynamic_verify_hw_context(enum retro_hw_context_type type,
       case RETRO_HW_CONTEXT_OPENGLES_VERSION:
       case RETRO_HW_CONTEXT_OPENGL:
       case RETRO_HW_CONTEXT_OPENGL_CORE:
-         if (memcmp(video_ident, "gl", 2) != 0)
+         if (string_is_not_equal_fast(video_ident, "gl", 2))
             return false;
          break;
       default:
@@ -927,7 +926,7 @@ static bool dynamic_verify_hw_context(enum retro_hw_context_type type,
 
 static void core_performance_counter_start(struct retro_perf_counter *perf)
 {
-   if (runloop_ctl(RUNLOOP_CTL_IS_PERFCNT_ENABLE, NULL))
+   if (rarch_ctl(RARCH_CTL_IS_PERFCNT_ENABLE, NULL))
    {
       perf->call_cnt++;
       perf->start      = cpu_features_get_perf_counter();
@@ -936,7 +935,7 @@ static void core_performance_counter_start(struct retro_perf_counter *perf)
 
 static void core_performance_counter_stop(struct retro_perf_counter *perf)
 {
-   if (runloop_ctl(RUNLOOP_CTL_IS_PERFCNT_ENABLE, NULL))
+   if (rarch_ctl(RARCH_CTL_IS_PERFCNT_ENABLE, NULL))
       perf->total += cpu_features_get_perf_counter() - perf->start;
 }
 
@@ -973,7 +972,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
          break;
 
       case RETRO_ENVIRONMENT_GET_VARIABLE:
-         if (!runloop_ctl(RUNLOOP_CTL_CORE_OPTIONS_GET, data))
+         if (!rarch_ctl(RARCH_CTL_CORE_OPTIONS_GET, data))
          {
             struct retro_variable *var = (struct retro_variable*)data;
 
@@ -987,14 +986,14 @@ bool rarch_environment_cb(unsigned cmd, void *data)
          break;
 
       case RETRO_ENVIRONMENT_GET_VARIABLE_UPDATE:
-         *(bool*)data = runloop_ctl(RUNLOOP_CTL_IS_CORE_OPTION_UPDATED, NULL);
+         *(bool*)data = rarch_ctl(RARCH_CTL_IS_CORE_OPTION_UPDATED, NULL);
          break;
 
       case RETRO_ENVIRONMENT_SET_VARIABLES:
          RARCH_LOG("Environ SET_VARIABLES.\n");
 
-         runloop_ctl(RUNLOOP_CTL_CORE_OPTIONS_DEINIT, NULL);
-         runloop_ctl(RUNLOOP_CTL_CORE_OPTIONS_INIT,   data);
+         rarch_ctl(RARCH_CTL_CORE_OPTIONS_DEINIT, NULL);
+         rarch_ctl(RARCH_CTL_CORE_OPTIONS_INIT,   data);
 
          break;
 
@@ -1023,8 +1022,8 @@ bool rarch_environment_cb(unsigned cmd, void *data)
 
       case RETRO_ENVIRONMENT_SHUTDOWN:
          RARCH_LOG("Environ SHUTDOWN.\n");
-         runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN,      NULL);
-         runloop_ctl(RUNLOOP_CTL_SET_CORE_SHUTDOWN, NULL);
+         rarch_ctl(RARCH_CTL_SET_SHUTDOWN,      NULL);
+         rarch_ctl(RARCH_CTL_SET_CORE_SHUTDOWN, NULL);
          break;
 
       case RETRO_ENVIRONMENT_SET_PERFORMANCE_LEVEL:
@@ -1078,9 +1077,11 @@ bool rarch_environment_cb(unsigned cmd, void *data)
 
       case RETRO_ENVIRONMENT_GET_LANGUAGE:
 #ifdef HAVE_LANGEXTRA
-         *(unsigned *)data = settings->uints.user_language;
-         RARCH_LOG("Environ GET_LANGUAGE: \"%u\".\n",
-               settings->uints.user_language);
+         {
+            unsigned user_lang = *msg_hash_get_uint(MSG_HASH_USER_LANGUAGE);
+            *(unsigned *)data  = user_lang;
+            RARCH_LOG("Environ GET_LANGUAGE: \"%u\".\n", user_lang);
+         }
 #endif
          break;
 
@@ -1190,17 +1191,22 @@ bool rarch_environment_cb(unsigned cmd, void *data)
             }
 
             RARCH_LOG("Environ SET_INPUT_DESCRIPTORS:\n");
-            for (p = 0; p < settings->uints.input_max_users; p++)
+
             {
-               for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
+               unsigned max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
+
+               for (p = 0; p < max_users; p++)
                {
-                  const char *description = system->input_desc_btn[p][retro_id];
+                  for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND; retro_id++)
+                  {
+                     const char *description = system->input_desc_btn[p][retro_id];
 
-                  if (!description)
-                     continue;
+                     if (!description)
+                        continue;
 
-                  RARCH_LOG("\tRetroPad, User %u, Button \"%s\" => \"%s\"\n",
-                        p + 1, libretro_btn_desc[retro_id], description);
+                     RARCH_LOG("\tRetroPad, User %u, Button \"%s\" => \"%s\"\n",
+                           p + 1, libretro_btn_desc[retro_id], description);
+                  }
                }
             }
 
@@ -1217,8 +1223,8 @@ bool rarch_environment_cb(unsigned cmd, void *data)
          const struct retro_keyboard_callback *info =
             (const struct retro_keyboard_callback*)data;
 
-         runloop_ctl(RUNLOOP_CTL_FRONTEND_KEY_EVENT_GET, &frontend_key_event);
-         runloop_ctl(RUNLOOP_CTL_KEY_EVENT_GET, &key_event);
+         rarch_ctl(RARCH_CTL_FRONTEND_KEY_EVENT_GET, &frontend_key_event);
+         rarch_ctl(RARCH_CTL_KEY_EVENT_GET, &key_event);
 
          RARCH_LOG("Environ SET_KEYBOARD_CALLBACK.\n");
          if (key_event)
@@ -1305,7 +1311,7 @@ bool rarch_environment_cb(unsigned cmd, void *data)
       case RETRO_ENVIRONMENT_SET_FRAME_TIME_CALLBACK:
       {
          RARCH_LOG("Environ SET_FRAME_TIME_CALLBACK.\n");
-         runloop_ctl(RUNLOOP_CTL_SET_FRAME_TIME, data);
+         rarch_ctl(RARCH_CTL_SET_FRAME_TIME, data);
          break;
       }
 
diff --git a/file_path_special.h b/file_path_special.h
index 9a119dad7d..ef72101d49 100644
--- a/file_path_special.h
+++ b/file_path_special.h
@@ -80,6 +80,8 @@ enum file_path_enum
    FILE_PATH_AUTO_EXTENSION,
    FILE_PATH_ZIP_EXTENSION,
    FILE_PATH_7Z_EXTENSION,
+   FILE_PATH_OGG_EXTENSION,
+   FILE_PATH_WAV_EXTENSION,
    FILE_PATH_CONFIG_EXTENSION,
    FILE_PATH_CORE_INFO_EXTENSION
 };
diff --git a/file_path_str.c b/file_path_str.c
index 13d5a71706..c66af6d97a 100644
--- a/file_path_str.c
+++ b/file_path_str.c
@@ -101,6 +101,12 @@ const char *file_path_str(enum file_path_enum enum_idx)
       case FILE_PATH_PNG_EXTENSION:
          str = ".png";
          break;
+      case FILE_PATH_OGG_EXTENSION:
+         str = ".ogg";
+         break;
+      case FILE_PATH_WAV_EXTENSION:
+         str = ".wav";
+         break;
       case FILE_PATH_JPEG_EXTENSION:
          str = ".jpeg";
          break;
diff --git a/frontend/drivers/platform_darwin.m b/frontend/drivers/platform_darwin.m
index 36e0f0449f..a0787d967c 100644
--- a/frontend/drivers/platform_darwin.m
+++ b/frontend/drivers/platform_darwin.m
@@ -60,7 +60,7 @@
 #include "../../file_path_special.h"
 #include "../../configuration.h"
 #include "../../defaults.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../ui/ui_companion_driver.h"
 
diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index e1f6b66955..2bd3500e99 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -37,7 +37,6 @@
 #include "../../defaults.h"
 #include "../../content.h"
 #include "../../retroarch.h"
-#include "../../runloop.h"
 #include "../../command.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../file_path_special.h"
@@ -49,7 +48,9 @@ static void emscripten_mainloop(void)
 
    if (ret == 1 && sleep_ms > 0)
       retro_sleep(sleep_ms);
-   task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
+
+   task_queue_check();
+
    if (ret != -1)
       return;
 
diff --git a/frontend/drivers/platform_gx.c b/frontend/drivers/platform_gx.c
index 57916af632..c2002bb338 100644
--- a/frontend/drivers/platform_gx.c
+++ b/frontend/drivers/platform_gx.c
@@ -423,7 +423,7 @@ static void frontend_gx_process_args(int *argc, char *argv[])
       char path[PATH_MAX_LENGTH] = {0};
       strlcpy(path, strrchr(argv[0], '/') + 1, sizeof(path));
       if (path_file_exists(path))
-         runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, path);
+         rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, path);
    }
 #endif
 }
diff --git a/frontend/drivers/platform_linux.c b/frontend/drivers/platform_linux.c
index de796161ad..6055135f1a 100644
--- a/frontend/drivers/platform_linux.c
+++ b/frontend/drivers/platform_linux.c
@@ -62,7 +62,6 @@
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
-#include "../../menu/menu_display.h"
 #include "../../menu/menu_entries.h"
 #endif
 
@@ -384,7 +383,9 @@ static void android_app_entry(void *data)
 
       if (ret == 1 && sleep_ms > 0)
          retro_sleep(sleep_ms);
-      task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
+
+      task_queue_check();
+
       if (ret == -1)
          break;
    }while(1);
@@ -899,6 +900,9 @@ static bool next_string(char **_ptr, char **_str)
 static bool int_string(char *str, int *val)
 {
    char *endptr = NULL;
+   if (!str)
+      return false;
+
    *val = (int) strtol(str, &endptr, 0);
    return ((*str != '\0') && (*endptr == '\0'));
 }
@@ -959,7 +963,7 @@ static bool frontend_linux_powerstate_check_apm(
 
    if (!next_string(&ptr, &str))     /* remaining battery life time units */
       goto error;
-   else if (memcmp(str, "min", 3) == 0)
+   else if (string_is_equal_fast(str, "min", 3))
       battery_time *= 60;
 
    if (battery_flag == 0xFF) /* unknown state */
@@ -1205,6 +1209,26 @@ static void frontend_linux_get_os(char *s,
 #endif
 }
 
+#ifdef HAVE_LAKKA
+static void frontend_linux_get_lakka_version(char *s,
+      size_t len)
+{
+   char version[128];
+   size_t vlen;
+   FILE *command_file = popen("cat /etc/release", "r");
+
+   fgets(version, sizeof(version), command_file);
+   vlen = strlen(version);
+
+   if (vlen > 0 && version[vlen-1] == '\n')
+      version[--vlen] = '\0';
+
+   strlcpy(s, version, len);
+
+   pclose(command_file);
+}
+#endif
+
 static void frontend_linux_get_env(int *argc,
       char *argv[], void *data, void *params_data)
 {
@@ -1289,7 +1313,7 @@ static void frontend_linux_get_env(int *argc,
    if (android_app->getStringExtra && jstr)
    {
       const char *argv = (*env)->GetStringUTFChars(env, jstr, 0);
-      bool used        = (memcmp(argv, "false", 5) == 0) ? false : true;
+      bool used        = string_is_equal_fast(argv, "false", 5) ? false : true;
 
       (*env)->ReleaseStringUTFChars(env, jstr, argv);
 
@@ -2131,6 +2155,9 @@ frontend_ctx_driver_t frontend_ctx_linux = {
    frontend_linux_destroy_signal_handler_state,
    NULL,                         /* attach_console */
    NULL,                         /* detach_console */
+#ifdef HAVE_LAKKA
+   frontend_linux_get_lakka_version,    /* get_lakka_version */
+#endif
 #ifdef ANDROID
    "android"
 #else
diff --git a/frontend/drivers/platform_null.c b/frontend/drivers/platform_null.c
index d43f782817..0f5e76d6ea 100644
--- a/frontend/drivers/platform_null.c
+++ b/frontend/drivers/platform_null.c
@@ -41,5 +41,8 @@ frontend_ctx_driver_t frontend_ctx_null = {
    NULL,                         /* destroy_sighandler_state */
    NULL,                         /* attach_console */
    NULL,                         /* detach_console */
+#ifdef HAVE_LAKKA
+   NULL,                         /* get_lakka_version */
+#endif
    "null",
 };
diff --git a/frontend/drivers/platform_ps3.c b/frontend/drivers/platform_ps3.c
index b246b9286b..98584b86e8 100644
--- a/frontend/drivers/platform_ps3.c
+++ b/frontend/drivers/platform_ps3.c
@@ -91,7 +91,7 @@ static void callback_sysutil_exit(uint64_t status,
             if (frontend)
                frontend->shutdown = frontend_ps3_shutdown;
 
-            runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
+            rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL);
          }
          break;
    }
@@ -573,7 +573,7 @@ static void frontend_ps3_process_args(int *argc, char *argv[])
       char path[PATH_MAX_LENGTH] = {0};
       strlcpy(path, argv[0], sizeof(path));
       if (path_file_exists(path))
-         runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, path);
+         rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, path);
    }
 #endif
 }
diff --git a/frontend/drivers/platform_wiiu.c b/frontend/drivers/platform_wiiu.c
index c7e2e06e98..5bfcbb6367 100644
--- a/frontend/drivers/platform_wiiu.c
+++ b/frontend/drivers/platform_wiiu.c
@@ -37,7 +37,7 @@
 
 
 #include "tasks/tasks_internal.h"
-#include "runloop.h"
+#include "../../retroarch.h"
 #include <sys/socket.h>
 #include "fs/fs_utils.h"
 #include "fs/sd_fat_devoptab.h"
@@ -454,7 +454,7 @@ int main(int argc, char **argv)
       if (ret == 1 && sleep_ms > 0)
          retro_sleep(sleep_ms);
 
-      task_queue_ctl(TASK_QUEUE_CTL_WAIT, NULL);
+      task_queue_wait();
 
       if (ret == -1)
          break;
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index d62df7c9c4..f294186ceb 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -37,7 +37,7 @@
 #include "../frontend_driver.h"
 #include "../../configuration.h"
 #include "../../defaults.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 /* We only load this library once, so we let it be 
diff --git a/frontend/frontend.c b/frontend/frontend.c
index 82d7ba1f9f..c40f9381e4 100644
--- a/frontend/frontend.c
+++ b/frontend/frontend.c
@@ -36,7 +36,7 @@
 #include "../retroarch.h"
 
 #ifndef HAVE_MAIN
-#include "../runloop.h"
+#include "../retroarch.h"
 #endif
 
 /**
@@ -130,7 +130,9 @@ int rarch_main(int argc, char *argv[], void *data)
 
       if (ret == 1 && sleep_ms > 0)
          retro_sleep(sleep_ms);
-      task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
+
+      task_queue_check();
+
       if (ret == -1)
          break;
    }while(1);
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index 66683e4821..bb114ee15f 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -105,16 +105,7 @@ frontend_ctx_driver_t *frontend_ctx_find_driver(const char *ident)
  **/
 frontend_ctx_driver_t *frontend_ctx_init_first(void)
 {
-   unsigned i;
-   frontend_ctx_driver_t *frontend = NULL;
-
-   for (i = 0; frontend_ctx_drivers[i]; i++)
-   {
-      frontend = frontend_ctx_drivers[i];
-      break;
-   }
-
-   return frontend;
+   return frontend_ctx_drivers[0];
 }
 
 bool frontend_driver_get_core_extension(char *s, size_t len)
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index 14193468d4..a0e5b30ae4 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -85,6 +85,9 @@ typedef struct frontend_ctx_driver
    void (*destroy_signal_handler_state)(void);
    void (*attach_console)(void);
    void (*detach_console)(void);
+#ifdef HAVE_LAKKA
+   void (*get_lakka_version)(char *, size_t);
+#endif
 
    const char *ident;
 
diff --git a/gfx/common/egl_common.h b/gfx/common/egl_common.h
index 5e1dbc8ad1..70f48b666d 100644
--- a/gfx/common/egl_common.h
+++ b/gfx/common/egl_common.h
@@ -26,7 +26,7 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 
 #ifndef EGL_CONTEXT_FLAGS_KHR
 #define EGL_CONTEXT_FLAGS_KHR 0x30FC
diff --git a/gfx/common/gl_common.c b/gfx/common/gl_common.c
index 7edbb8a19e..f349938427 100644
--- a/gfx/common/gl_common.c
+++ b/gfx/common/gl_common.c
@@ -24,36 +24,6 @@
 #include "../drivers/gl_symlinks.h"
 #include "../video_coord_array.h"
 
-void gl_ff_vertex(const struct video_coords *coords)
-{
-#ifndef NO_GL_FF_VERTEX
-   /* Fall back to fixed function-style if needed and possible. */
-   glClientActiveTexture(GL_TEXTURE1);
-   glTexCoordPointer(2, GL_FLOAT, 0, coords->lut_tex_coord);
-   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-   glClientActiveTexture(GL_TEXTURE0);
-   glVertexPointer(2, GL_FLOAT, 0, coords->vertex);
-   glEnableClientState(GL_VERTEX_ARRAY);
-   glColorPointer(4, GL_FLOAT, 0, coords->color);
-   glEnableClientState(GL_COLOR_ARRAY);
-   glTexCoordPointer(2, GL_FLOAT, 0, coords->tex_coord);
-   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
-#endif
-}
-
-void gl_ff_matrix(const math_matrix_4x4 *mat)
-{
-#ifndef NO_GL_FF_MATRIX
-   math_matrix_4x4 ident;
-
-   /* Fall back to fixed function-style if needed and possible. */
-   glMatrixMode(GL_PROJECTION);
-   glLoadMatrixf(mat->data);
-   glMatrixMode(GL_MODELVIEW);
-   matrix_4x4_identity(ident);
-   glLoadMatrixf(ident.data);
-#endif
-}
 
 static void gl_size_format(GLint* internalFormat)
 {
diff --git a/gfx/common/gl_common.h b/gfx/common/gl_common.h
index 46514d99f5..bf2858d8ca 100644
--- a/gfx/common/gl_common.h
+++ b/gfx/common/gl_common.h
@@ -31,7 +31,7 @@
 #include "../../verbosity.h"
 #include "../font_driver.h"
 #include "../video_coord_array.h"
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 #include "../drivers/gl_symlinks.h"
 
 RETRO_BEGIN_DECLS
@@ -155,6 +155,41 @@ typedef struct gl
 bool gl_load_luts(const struct video_shader *generic_shader,
       GLuint *lut_textures);
 
+#ifdef NO_GL_FF_VERTEX
+#define gl_ff_vertex(coords) ((void)0)
+#else
+static INLINE void gl_ff_vertex(const struct video_coords *coords)
+{
+   /* Fall back to fixed function-style if needed and possible. */
+   glClientActiveTexture(GL_TEXTURE1);
+   glTexCoordPointer(2, GL_FLOAT, 0, coords->lut_tex_coord);
+   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+   glClientActiveTexture(GL_TEXTURE0);
+   glVertexPointer(2, GL_FLOAT, 0, coords->vertex);
+   glEnableClientState(GL_VERTEX_ARRAY);
+   glColorPointer(4, GL_FLOAT, 0, coords->color);
+   glEnableClientState(GL_COLOR_ARRAY);
+   glTexCoordPointer(2, GL_FLOAT, 0, coords->tex_coord);
+   glEnableClientState(GL_TEXTURE_COORD_ARRAY);
+}
+#endif
+
+#ifdef NO_GL_FF_MATRIX
+#define gl_ff_matrix(mat) ((void)0)
+#else
+static INLINE void gl_ff_matrix(const math_matrix_4x4 *mat)
+{
+   math_matrix_4x4 ident;
+
+   /* Fall back to fixed function-style if needed and possible. */
+   glMatrixMode(GL_PROJECTION);
+   glLoadMatrixf(mat->data);
+   glMatrixMode(GL_MODELVIEW);
+   matrix_4x4_identity(ident);
+   glLoadMatrixf(ident.data);
+}
+#endif
+
 static INLINE unsigned gl_wrap_type_to_enum(enum gfx_wrap_type type)
 {
    switch (type)
@@ -176,9 +211,8 @@ static INLINE unsigned gl_wrap_type_to_enum(enum gfx_wrap_type type)
    return 0;
 }
 
+
 bool gl_query_core_context_in_use(void);
-void gl_ff_vertex(const struct video_coords *coords);
-void gl_ff_matrix(const math_matrix_4x4 *mat);
 void gl_load_texture_image(GLenum target,
       GLint level,
       GLint internalFormat,
diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c
index 1f3aebbaa7..b8f6c32fac 100644
--- a/gfx/common/vulkan_common.c
+++ b/gfx/common/vulkan_common.c
@@ -159,7 +159,7 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
    retro_assert(staging->type == VULKAN_TEXTURE_STAGING);
 
    vulkan_sync_texture_to_gpu(vk, staging);
-   vulkan_transition_texture(vk, staging);
+   vulkan_transition_texture(vk, cmd, staging);
 
    /* We don't have to sync against previous TRANSFER, 
     * since we observed the completion by fences. 
@@ -170,7 +170,7 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
     * We would also need to optionally maintain extra textures due to 
     * changes in resolution, so this seems like the sanest and 
     * simplest solution. */
-   vulkan_image_layout_transition(vk, vk->cmd, dynamic->image,
+   vulkan_image_layout_transition(vk, cmd, dynamic->image,
          VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
          0, VK_ACCESS_TRANSFER_WRITE_BIT,
          VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
@@ -184,12 +184,12 @@ void vulkan_copy_staging_to_dynamic(vk_t *vk, VkCommandBuffer cmd,
    region.srcSubresource.layerCount = 1;
    region.dstSubresource = region.srcSubresource;
 
-   vkCmdCopyImage(vk->cmd,
+   vkCmdCopyImage(cmd,
          staging->image, VK_IMAGE_LAYOUT_GENERAL,
          dynamic->image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
          1, &region);
 
-   vulkan_image_layout_transition(vk, vk->cmd,
+   vulkan_image_layout_transition(vk, cmd,
          dynamic->image,
          VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
          VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL,
@@ -729,7 +729,7 @@ static void vulkan_write_quad_descriptors(
    }
 }
 
-void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture)
+void vulkan_transition_texture(vk_t *vk, VkCommandBuffer cmd, struct vk_texture *texture)
 {
    /* Transition to GENERAL layout for linear streamed textures.
     * We're using linear textures here, so only 
@@ -744,7 +744,7 @@ void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture)
    switch (texture->type)
    {
       case VULKAN_TEXTURE_STREAMED:
-         vulkan_image_layout_transition(vk, vk->cmd, texture->image,
+         vulkan_image_layout_transition(vk, cmd, texture->image,
                texture->layout, VK_IMAGE_LAYOUT_GENERAL,
                VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_SHADER_READ_BIT,
                VK_PIPELINE_STAGE_HOST_BIT,
@@ -752,7 +752,7 @@ void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture)
          break;
 
       case VULKAN_TEXTURE_STAGING:
-         vulkan_image_layout_transition(vk, vk->cmd, texture->image,
+         vulkan_image_layout_transition(vk, cmd, texture->image,
                texture->layout, VK_IMAGE_LAYOUT_GENERAL,
                VK_ACCESS_HOST_WRITE_BIT, VK_ACCESS_TRANSFER_READ_BIT,
                VK_PIPELINE_STAGE_HOST_BIT,
@@ -786,7 +786,7 @@ static void vulkan_check_dynamic_state(
 void vulkan_draw_triangles(vk_t *vk, const struct vk_draw_triangles *call)
 {
    if (call->texture)
-      vulkan_transition_texture(vk, call->texture);
+      vulkan_transition_texture(vk, vk->cmd, call->texture);
 
    if (call->pipeline != vk->tracker.pipeline)
    {
@@ -844,7 +844,7 @@ void vulkan_draw_triangles(vk_t *vk, const struct vk_draw_triangles *call)
 
 void vulkan_draw_quad(vk_t *vk, const struct vk_draw_quad *quad)
 {
-   vulkan_transition_texture(vk, quad->texture);
+   vulkan_transition_texture(vk, vk->cmd, quad->texture);
 
    if (quad->pipeline != vk->tracker.pipeline)
    {
@@ -867,7 +867,9 @@ void vulkan_draw_quad(vk_t *vk, const struct vk_draw_quad *quad)
                sizeof(*quad->mvp), &range))
          return;
 
-      if (memcmp(quad->mvp, &vk->tracker.mvp, sizeof(*quad->mvp)) 
+      if (
+               string_is_equal_fast(quad->mvp,
+                  &vk->tracker.mvp, sizeof(*quad->mvp)) 
             || quad->texture->view != vk->tracker.view
             || quad->sampler != vk->tracker.sampler)
       {
diff --git a/gfx/common/vulkan_common.h b/gfx/common/vulkan_common.h
index a849d40410..519570de34 100644
--- a/gfx/common/vulkan_common.h
+++ b/gfx/common/vulkan_common.h
@@ -46,7 +46,7 @@
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../font_driver.h"
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 #include "../drivers_shader/shader_vulkan.h"
 
 RETRO_BEGIN_DECLS
@@ -413,7 +413,7 @@ struct vk_texture vulkan_create_texture(vk_t *vk,
 void vulkan_sync_texture_to_gpu(vk_t *vk, const struct vk_texture *tex);
 void vulkan_sync_texture_to_cpu(vk_t *vk, const struct vk_texture *tex);
 
-void vulkan_transition_texture(vk_t *vk, struct vk_texture *texture);
+void vulkan_transition_texture(vk_t *vk, VkCommandBuffer cmd, struct vk_texture *texture);
 
 void vulkan_transfer_image_ownership(VkCommandBuffer cmd,
       VkImage image, VkImageLayout layout,
diff --git a/gfx/common/win32_common.cpp b/gfx/common/win32_common.cpp
index 05cbd428d0..a5a15d3fa9 100644
--- a/gfx/common/win32_common.cpp
+++ b/gfx/common/win32_common.cpp
@@ -26,7 +26,7 @@
 #include "../../verbosity.h"
 #include "../../driver.h"
 #include "../../paths.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../core_info.h"
 
@@ -190,7 +190,7 @@ INT_PTR CALLBACK PickCoreProc(HWND hDlg, UINT message,
                         core_info_list_get_supported_cores(core_info_list,
                               path_get(RARCH_PATH_CONTENT), &core_info, &list_size);
                         info = (const core_info_t*)&core_info[lbItem];
-                        runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH,info->path);
+                        rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH,info->path);
                      } 
                      break;
                }
diff --git a/gfx/common/win32_common.h b/gfx/common/win32_common.h
index d0a2baa31e..0dfca29025 100644
--- a/gfx/common/win32_common.h
+++ b/gfx/common/win32_common.h
@@ -27,7 +27,7 @@
 #include <boolean.h>
 #include <retro_common_api.h>
 #include "../../driver.h"
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 
 #ifdef _XBOX
 #include "../../defines/xdk_defines.h"
diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 63a8c9dc78..76eadf3f5d 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -503,7 +503,7 @@ bool x11_connect(void)
    return true;
 }
 
-void x11_update_title(void *data, video_frame_info_t *video_info)
+void x11_update_title(void *data, void *data2)
 {
    char title[128];
 
diff --git a/gfx/common/x11_common.h b/gfx/common/x11_common.h
index ad745a70a7..f8e0820a82 100644
--- a/gfx/common/x11_common.h
+++ b/gfx/common/x11_common.h
@@ -22,7 +22,6 @@
 #include <boolean.h>
 
 #include "../video_driver.h"
-#include "../video_context_driver.h"
 
 extern Window   g_x11_win;
 extern Display *g_x11_dpy;
@@ -63,7 +62,7 @@ bool x11_alive(void *data);
 
 bool x11_connect(void);
 
-void x11_update_title(void *data, video_frame_info_t *video_info);
+void x11_update_title(void *data, void *data2);
 
 bool x11_input_ctx_new(bool true_full);
 
diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index 2889304329..9c4ddf5007 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -526,14 +526,14 @@ static bool ctr_frame(void* data, const void* frame,
    }
    frames++;
 #ifndef HAVE_THREADS
-   if(task_queue_ctl(TASK_QUEUE_CTL_FIND, &ctr_tasks_finder_data))
+   if(task_queue_find(&ctr_tasks_finder_data))
    {
 #if 0
       ctr->vsync_event_pending = true;
 #endif
       while(ctr->vsync_event_pending)
       {
-         task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
+         task_queue_check();
          svcSleepThread(0);
 #if 0
          aptMainLoop();
@@ -865,12 +865,6 @@ static bool ctr_suppress_screensaver(void* data, bool enable)
    return false;
 }
 
-static bool ctr_has_windowed(void* data)
-{
-   (void)data;
-   return false;
-}
-
 static void ctr_free(void* data)
 {
    ctr_video_t* ctr = (ctr_video_t*)data;
@@ -1178,7 +1172,7 @@ video_driver_t video_ctr =
    ctr_alive,
    ctr_focus,
    ctr_suppress_screensaver,
-   ctr_has_windowed,
+   NULL, /* has_windowed */
    ctr_set_shader,
    ctr_free,
    "ctr",
diff --git a/gfx/drivers/d3d.cpp b/gfx/drivers/d3d.cpp
index d394c5d287..e2a39d1bb8 100644
--- a/gfx/drivers/d3d.cpp
+++ b/gfx/drivers/d3d.cpp
@@ -313,7 +313,7 @@ static bool d3d_init_multipass(d3d_video_t *d3d)
 static bool d3d_process_shader(d3d_video_t *d3d)
 {
 #ifdef HAVE_FBO
-   if (memcmp(path_get_extension(d3d->shader_path.c_str()), "cgp", 3) == 0)
+   if (string_is_equal_fast(path_get_extension(d3d->shader_path.c_str()), "cgp", 3))
       return d3d_init_multipass(d3d);
 #endif
 
@@ -893,7 +893,7 @@ static bool d3d_alive(void *data)
          mode.width  = temp_width;
          mode.height = temp_height;
 
-         video_context_driver_set_resize(mode);
+         current_video_context.set_resize(video_context_data, mode.width, mode.height);
          d3d_restore(d3d);
       }
 
@@ -906,22 +906,12 @@ static bool d3d_alive(void *data)
    return ret;
 }
 
-static bool d3d_focus(void *data)
-{
-   return video_context_driver_focus();
-}
-
 static bool d3d_suppress_screensaver(void *data, bool enable)
 {
    bool enabled = enable;
    return video_context_driver_suppress_screensaver(&enabled);
 }
 
-static bool d3d_has_windowed(void *data)
-{
-   return video_context_driver_has_windowed();
-}
-
 static void d3d_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
 {
    d3d_video_t *d3d = (d3d_video_t*)data;
@@ -1471,9 +1461,11 @@ static bool d3d_frame(void *data, const void *frame,
    }
 #endif
 
-   video_context_driver_update_window_title(video_info);
+   video_info->cb_update_window_title(
+         video_info->context_data, video_info);
 
-   video_context_driver_swap_buffers(video_info);
+   video_info->cb_swap_buffers(
+         video_info->context_data, video_info);
 
    return true;
 }
@@ -1721,9 +1713,9 @@ video_driver_t video_d3d = {
    d3d_frame,
    d3d_set_nonblock_state,
    d3d_alive,
-   d3d_focus,
+   NULL,                      /* focus */
    d3d_suppress_screensaver,
-   d3d_has_windowed,
+   NULL,                      /* has_windowed */
    d3d_set_shader,
    d3d_free,
    "d3d",
@@ -1731,7 +1723,7 @@ video_driver_t video_d3d = {
    d3d_set_rotation,
    d3d_viewport_info,
    d3d_read_viewport,
-   NULL, /* read_frame_raw */
+   NULL,                      /* read_frame_raw */
 #ifdef HAVE_OVERLAY
    d3d_get_overlay_interface,
 #endif
diff --git a/gfx/drivers/d3d.h b/gfx/drivers/d3d.h
index f78d8ccf12..2822ad12ff 100644
--- a/gfx/drivers/d3d.h
+++ b/gfx/drivers/d3d.h
@@ -46,12 +46,8 @@
 
 #include "../../driver.h"
 
-#if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_HLSL)
-#include "../video_shader_driver.h"
-#endif
-
 #include "../font_driver.h"
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 #include "../common/d3d_common.h"
 #include "../video_renderchain_driver.h"
 #ifdef _XBOX
diff --git a/gfx/drivers/dispmanx_gfx.c b/gfx/drivers/dispmanx_gfx.c
index 0249322e6e..9058834402 100644
--- a/gfx/drivers/dispmanx_gfx.c
+++ b/gfx/drivers/dispmanx_gfx.c
@@ -28,7 +28,6 @@
 
 #include "../../driver.h"
 #include "../../retroarch.h"
-#include "../video_context_driver.h"
 #include "../font_driver.h"
 
 struct dispmanx_page
@@ -577,13 +576,6 @@ static bool dispmanx_gfx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool dispmanx_gfx_has_windowed(void *data)
-{
-   (void)data;
-
-   return false;
-}
-
 static bool dispmanx_gfx_set_shader(void *data,
       enum rarch_shader_type type, const char *path)
 {
@@ -696,7 +688,7 @@ video_driver_t video_dispmanx = {
    dispmanx_gfx_alive,
    dispmanx_gfx_focus,
    dispmanx_gfx_suppress_screensaver,
-   dispmanx_gfx_has_windowed,
+   NULL, /* has_windowed */
    dispmanx_gfx_set_shader,
    dispmanx_gfx_free,
    "dispmanx",
diff --git a/gfx/drivers/drm_gfx.c b/gfx/drivers/drm_gfx.c
index 99eed65b59..d8f8bb0a00 100644
--- a/gfx/drivers/drm_gfx.c
+++ b/gfx/drivers/drm_gfx.c
@@ -37,7 +37,6 @@
 #endif
 
 #include "../font_driver.h"
-#include "../video_context_driver.h"
 #include "../../retroarch.h"
 
 #include "drm_pixformats.h"
@@ -415,7 +414,7 @@ static uint64_t drm_plane_type(drmModePlane *plane)
    for (j = 0; j < props->count_props; j++)
    {
       /* found the type property */
-      if (memcmp(drmModeGetProperty(drm.fd, props->props[j])->name, "type", 4) == 0)
+      if (string_is_equal_fast(drmModeGetProperty(drm.fd, props->props[j])->name, "type", 4))
          return (props->prop_values[j]);
    }
    return (0);
@@ -916,13 +915,6 @@ static bool drm_gfx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool drm_gfx_has_windowed(void *data)
-{
-   (void)data;
-
-   return false;
-}
-
 static bool drm_gfx_set_shader(void *data,
       enum rarch_shader_type type, const char *path)
 {
@@ -1019,7 +1011,7 @@ video_driver_t video_drm = {
    drm_gfx_alive,
    drm_gfx_focus,
    drm_gfx_suppress_screensaver,
-   drm_gfx_has_windowed,
+   NULL, /* has_windowed */
    drm_gfx_set_shader,
    drm_gfx_free,
    "drm",
diff --git a/gfx/drivers/exynos_gfx.c b/gfx/drivers/exynos_gfx.c
index 1ae3b86c82..f8b69d7668 100644
--- a/gfx/drivers/exynos_gfx.c
+++ b/gfx/drivers/exynos_gfx.c
@@ -181,7 +181,7 @@ static int exynos_get_device_index(void)
 
       ver = drmGetVersion(fd);
 
-      if (memcmp(ver->name, "exynos", 6) == 0)
+      if (string_is_equal_fast(ver->name, "exynos", 6))
          found = true;
       else
          ++index;
@@ -1374,13 +1374,6 @@ static bool exynos_gfx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool exynos_gfx_has_windowed(void *data)
-{
-   (void)data;
-
-   return false;
-}
-
 static void exynos_gfx_set_rotation(void *data, unsigned rotation)
 {
    struct exynos_video *vid = (struct exynos_video*)data;
@@ -1536,7 +1529,7 @@ video_driver_t video_exynos = {
   exynos_gfx_alive,
   exynos_gfx_focus,
   exynos_gfx_suppress_screensaver,
-  exynos_gfx_has_windowed,
+  NULL, /* has_windowed */
   exynos_gfx_set_shader,
   exynos_gfx_free,
   "exynos",
diff --git a/gfx/drivers/gdi_gfx.c b/gfx/drivers/gdi_gfx.c
index f8bba30c03..c65b9f752c 100644
--- a/gfx/drivers/gdi_gfx.c
+++ b/gfx/drivers/gdi_gfx.c
@@ -272,7 +272,8 @@ static bool gdi_gfx_frame(void *data, const void *frame,
 
    InvalidateRect(hwnd, NULL, false);
 
-   video_context_driver_update_window_title(video_info);
+   video_info->cb_update_window_title(
+         video_info->context_data, video_info);
 
    return true;
 }
diff --git a/gfx/drivers/gl.c b/gfx/drivers/gl.c
index 257dd53b44..ed694fd727 100644
--- a/gfx/drivers/gl.c
+++ b/gfx/drivers/gl.c
@@ -54,7 +54,6 @@
 #endif
 
 #include "../font_driver.h"
-#include "../video_context_driver.h"
 
 #ifdef HAVE_GLSL
 #include "../drivers_shader/shader_glsl.h"
@@ -76,8 +75,6 @@
 #include "../common/win32_common.h"
 #endif
 
-#include "../video_shader_driver.h"
-
 #ifndef GL_SYNC_GPU_COMMANDS_COMPLETE
 #define GL_SYNC_GPU_COMMANDS_COMPLETE     0x9117
 #endif
@@ -220,9 +217,7 @@ static void gl_overlay_tex_geom(void *data,
 
 static void gl_render_overlay(gl_t *gl, video_frame_info_t *video_info)
 {
-   video_shader_ctx_mvp_t mvp;
    video_shader_ctx_coords_t coords;
-   video_shader_ctx_info_t shader_info;
    unsigned i;
    unsigned width                      = video_info->width;
    unsigned height                     = video_info->height;
@@ -236,11 +231,8 @@ 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. */
-   shader_info.data       = gl;
-   shader_info.idx        = VIDEO_SHADER_STOCK_BLEND;
-   shader_info.set_active = true;
-
-   video_shader_driver_use(shader_info);
+   video_info->cb_shader_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;
@@ -252,10 +244,7 @@ static void gl_render_overlay(gl_t *gl, video_frame_info_t *video_info)
 
    video_shader_driver_set_coords(coords);
 
-   mvp.data             = gl;
-   mvp.matrix           = &gl->mvp_no_rot;
-
-   video_shader_driver_set_mvp(mvp);
+   video_info->cb_shader_set_mvp(gl, video_info->shader_data, &gl->mvp_no_rot);
 
    for (i = 0; i < gl->overlays; i++)
    {
@@ -815,7 +804,7 @@ static INLINE void gl_copy_frame(gl_t *gl,
 #endif
 }
 
-static INLINE void gl_set_shader_viewport(gl_t *gl, unsigned idx)
+static INLINE void gl_set_shader_viewports(gl_t *gl)
 {
    unsigned width, height;
    video_shader_ctx_info_t shader_info;
@@ -823,7 +812,14 @@ static INLINE void gl_set_shader_viewport(gl_t *gl, unsigned idx)
    video_driver_get_size(&width, &height);
 
    shader_info.data       = gl;
-   shader_info.idx        = idx;
+   shader_info.idx        = 0;
+   shader_info.set_active = true;
+
+   video_shader_driver_use(shader_info);
+   gl_set_viewport_wrapper(gl, width, height, false, true);
+
+   shader_info.data       = gl;
+   shader_info.idx        = 1;
    shader_info.set_active = true;
 
    video_shader_driver_use(shader_info);
@@ -1001,9 +997,7 @@ static void gl_pbo_async_readback(gl_t *gl)
 
 static INLINE void gl_draw_texture(gl_t *gl, video_frame_info_t *video_info)
 {
-   video_shader_ctx_mvp_t mvp;
    video_shader_ctx_coords_t coords;
-   video_shader_ctx_info_t shader_info;
    GLfloat color[16];
    unsigned width         = video_info->width;
    unsigned height        = video_info->height;
@@ -1033,11 +1027,7 @@ static INLINE void gl_draw_texture(gl_t *gl, video_frame_info_t *video_info)
    gl->coords.color     = color;
    glBindTexture(GL_TEXTURE_2D, gl->menu_texture);
 
-   shader_info.data       = gl;
-   shader_info.idx        = VIDEO_SHADER_STOCK_BLEND;
-   shader_info.set_active = true;
-
-   video_shader_driver_use(shader_info);
+   video_info->cb_shader_use(gl, video_info->shader_data, VIDEO_SHADER_STOCK_BLEND, true);
 
    gl->coords.vertices  = 4;
 
@@ -1046,10 +1036,7 @@ static INLINE void gl_draw_texture(gl_t *gl, video_frame_info_t *video_info)
 
    video_shader_driver_set_coords(coords);
 
-   mvp.data             = gl;
-   mvp.matrix           = &gl->mvp_no_rot;
-
-   video_shader_driver_set_mvp(mvp);
+   video_info->cb_shader_set_mvp(gl, video_info->shader_data, &gl->mvp_no_rot);
 
    glEnable(GL_BLEND);
 
@@ -1077,11 +1064,9 @@ static bool gl_frame(void *data, const void *frame,
       unsigned pitch, const char *msg,
       video_frame_info_t *video_info)
 {
-   video_shader_ctx_mvp_t mvp;
    video_shader_ctx_coords_t coords;
    video_shader_ctx_params_t params;
    struct video_tex_info feedback_info;
-   video_shader_ctx_info_t shader_info;
    gl_t                            *gl = (gl_t*)data;
    unsigned width                      = video_info->width;
    unsigned height                     = video_info->height;
@@ -1096,11 +1081,7 @@ static bool gl_frame(void *data, const void *frame,
       glBindVertexArray(gl->vao);
 #endif
 
-   shader_info.data       = gl;
-   shader_info.idx        = 1;
-   shader_info.set_active = true;
-
-   video_shader_driver_use(shader_info);
+   video_info->cb_shader_use(gl, video_info->shader_data, 1, true);
 
 #ifdef IOS
    /* Apparently the viewport is lost each frame, thanks Apple. */
@@ -1126,7 +1107,7 @@ static bool gl_frame(void *data, const void *frame,
       mode.width        = width;
       mode.height       = height;
 
-      video_context_driver_set_resize(mode);
+      video_info->cb_set_resize(video_info->context_data, mode.width, mode.height);
 
 #ifdef HAVE_FBO
       if (gl->fbo_inited)
@@ -1240,10 +1221,7 @@ static bool gl_frame(void *data, const void *frame,
 
    video_shader_driver_set_coords(coords);
 
-   mvp.data             = gl;
-   mvp.matrix           = &gl->mvp;
-
-   video_shader_driver_set_mvp(mvp);
+   video_info->cb_shader_set_mvp(gl, video_info->shader_data, &gl->mvp);
 
    glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 
@@ -1273,17 +1251,14 @@ static bool gl_frame(void *data, const void *frame,
    gl_render_overlay(gl, video_info);
 #endif
 
-   video_context_driver_update_window_title(video_info);
+   video_info->cb_update_window_title(
+         video_info->context_data, video_info);
 
 #ifdef HAVE_FBO
    /* Reset state which could easily mess up libretro core. */
    if (gl->hw_render_fbo_init)
    {
-      shader_info.data       = gl;
-      shader_info.idx        = 0;
-      shader_info.set_active = true;
-
-      video_shader_driver_use(shader_info);
+      video_info->cb_shader_use(gl, video_info->shader_data, 0, true);
 
       glBindTexture(GL_TEXTURE_2D, 0);
 #ifndef NO_GL_FF_VERTEX
@@ -1318,15 +1293,15 @@ static bool gl_frame(void *data, const void *frame,
     * and pause to prevent flicker. */
    if (
          video_info->black_frame_insertion
-         && !input_driver_is_nonblock_state()
+         && !video_info->input_driver_nonblock_state
          && !video_info->runloop_is_slowmotion
          && !video_info->runloop_is_paused)
    {
-      video_context_driver_swap_buffers(video_info);
+      video_info->cb_swap_buffers(video_info->context_data, video_info);
       glClear(GL_COLOR_BUFFER_BIT);
    }
 
-   video_context_driver_swap_buffers(video_info);
+   video_info->cb_swap_buffers(video_info->context_data, video_info);
 
 #ifdef HAVE_GL_SYNC
    if (video_info->hard_sync && gl->have_sync)
@@ -2001,8 +1976,7 @@ static void *gl_init(const video_info_t *video, const input_driver_t **input, vo
 
    /* Apparently need to set viewport for passes
     * when we aren't using FBOs. */
-   gl_set_shader_viewport(gl, 0);
-   gl_set_shader_viewport(gl, 1);
+   gl_set_shader_viewports(gl);
 
    mip_level            = 1;
    gl->tex_mipmap       = video_shader_driver_mipmap_input(&mip_level);
@@ -2133,22 +2107,12 @@ static bool gl_alive(void *data)
    return ret;
 }
 
-static bool gl_focus(void *data)
-{
-   return video_context_driver_focus();
-}
-
 static bool gl_suppress_screensaver(void *data, bool enable)
 {
    bool enabled = enable;
    return video_context_driver_suppress_screensaver(&enabled);
 }
 
-static bool gl_has_windowed(void *data)
-{
-   return video_context_driver_has_windowed();
-}
-
 static void gl_update_tex_filter_frame(gl_t *gl)
 {
    video_shader_ctx_filter_t shader_filter;
@@ -2297,8 +2261,7 @@ static bool gl_set_shader(void *data,
 #endif
 
    /* Apparently need to set viewport for passes when we aren't using FBOs. */
-   gl_set_shader_viewport(gl, 0);
-   gl_set_shader_viewport(gl, 1);
+   gl_set_shader_viewports(gl);
    context_bind_hw_render(true);
 #if defined(_WIN32) && !defined(_XBOX)
    /* Shader dialog is disabled for now, until video_threaded issues are fixed.
@@ -2717,9 +2680,9 @@ video_driver_t video_gl = {
    gl_frame,
    gl_set_nonblock_state,
    gl_alive,
-   gl_focus,
+   NULL,                    /* focus */
    gl_suppress_screensaver,
-   gl_has_windowed,
+   NULL,                    /* has_windowed */
 
    gl_set_shader,
 
diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c
index e2e7d7b5bf..f7f6cfeef8 100644
--- a/gfx/drivers/gx_gfx.c
+++ b/gfx/drivers/gx_gfx.c
@@ -29,7 +29,6 @@
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_driver.h"
-#include "../../menu/menu_display.h"
 #endif
 
 #ifdef HW_RVL
@@ -1121,12 +1120,6 @@ static bool gx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool gx_has_windowed(void *data)
-{
-   (void)data;
-   return false;
-}
-
 static void gx_set_rotation(void *data, unsigned orientation)
 {
    gx_video_t *gx = (gx_video_t*)data;
@@ -1591,7 +1584,7 @@ video_driver_t video_gx = {
    gx_alive,
    gx_focus,
    gx_suppress_screensaver,
-   gx_has_windowed,
+   NULL, /* has_windowed */
    gx_set_shader,
    gx_free,
    "gx",
diff --git a/gfx/drivers/omap_gfx.c b/gfx/drivers/omap_gfx.c
index 3ddfcbd0ba..1adb488de1 100644
--- a/gfx/drivers/omap_gfx.c
+++ b/gfx/drivers/omap_gfx.c
@@ -49,8 +49,6 @@
 #include "../../driver.h"
 #include "../../retroarch.h"
 
-#include "../video_context_driver.h"
-
 typedef struct omapfb_page
 {
   unsigned yoffset;
diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c
index 148942dd5f..307bcf7b74 100644
--- a/gfx/drivers/psp1_gfx.c
+++ b/gfx/drivers/psp1_gfx.c
@@ -604,12 +604,6 @@ static bool psp_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool psp_has_windowed(void *data)
-{
-   (void)data;
-   return false;
-}
-
 static void psp_free(void *data)
 {
    psp1_video_t *psp = (psp1_video_t*)data;
@@ -964,7 +958,7 @@ video_driver_t video_psp1 = {
    psp_alive,
    psp_focus,
    psp_suppress_screensaver,
-   psp_has_windowed,
+   NULL, /* has_windowed */
    psp_set_shader,
    psp_free,
    "psp1",
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 1585460dad..d7c479d9e1 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -41,7 +41,6 @@
 #include "../../configuration.h"
 #include "../../retroarch.h"
 #include "../../verbosity.h"
-#include "../video_context_driver.h"
 
 typedef struct sdl2_tex
 {
diff --git a/gfx/drivers/sdl_gfx.c b/gfx/drivers/sdl_gfx.c
index 25d14d4ce2..9154acc628 100644
--- a/gfx/drivers/sdl_gfx.c
+++ b/gfx/drivers/sdl_gfx.c
@@ -44,8 +44,6 @@
 
 #include "../../configuration.h"
 
-#include "../video_context_driver.h"
-
 typedef struct sdl_menu_frame
 {
    bool active;
diff --git a/gfx/drivers/sunxi_gfx.c b/gfx/drivers/sunxi_gfx.c
index 0d6e4d5a61..216f4640eb 100644
--- a/gfx/drivers/sunxi_gfx.c
+++ b/gfx/drivers/sunxi_gfx.c
@@ -825,13 +825,6 @@ static void sunxi_gfx_set_rotation(void *data, unsigned rotation)
    (void)rotation;
 }
 
-static bool sunxi_gfx_has_windowed(void *data)
-{
-   (void)data;
-
-   return false;
-}
-
 static bool sunxi_gfx_suppress_screensaver(void *data, bool enable)
 {
    (void)data;
@@ -971,7 +964,7 @@ video_driver_t video_sunxi = {
   sunxi_gfx_alive,
   sunxi_gfx_focus,
   sunxi_gfx_suppress_screensaver,
-  sunxi_gfx_has_windowed,
+  NULL, /* has_windowed */
   sunxi_gfx_set_shader,
   sunxi_gfx_free,
   "sunxi",
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index 9902ab4945..64d2451e48 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -37,7 +37,6 @@
 #endif
 
 #include "../font_driver.h"
-#include "../video_context_driver.h"
 
 #include "../../retroarch.h"
 #include "../../driver.h"
@@ -423,9 +422,10 @@ static bool vg_frame(void *data, const void *frame,
       vg_draw_message(vg, msg);
 #endif
 
-   video_context_driver_update_window_title(video_info);
-
-   video_context_driver_swap_buffers(video_info);
+   video_info->cb_update_window_title(
+         video_info->context_data, video_info);
+   video_info->cb_swap_buffers(
+         video_info->context_data, video_info);
 
    return true;
 }
@@ -451,22 +451,12 @@ static bool vg_alive(void *data)
    return !quit;
 }
 
-static bool vg_focus(void *data)
-{
-   return video_context_driver_focus();
-}
-
 static bool vg_suppress_screensaver(void *data, bool enable)
 {
    bool enabled = enable;
    return video_context_driver_suppress_screensaver(&enabled);
 }
 
-static bool vg_has_windowed(void *data)
-{
-   return video_context_driver_has_windowed();
-}
-
 static bool vg_set_shader(void *data,
       enum rarch_shader_type type, const char *path)
 {
@@ -510,19 +500,19 @@ video_driver_t video_vg = {
    vg_frame,
    vg_set_nonblock_state,
    vg_alive,
-   vg_focus,
+   NULL,                      /* focused */
    vg_suppress_screensaver,
-   vg_has_windowed,
+   NULL,                      /* has_windowed */
    vg_set_shader,
    vg_free,
    "vg",
-   NULL, /* set_viewport */
+   NULL,                      /* set_viewport */
    vg_set_rotation,
    vg_viewport_info,
    vg_read_viewport,
-   NULL, /* read_frame_raw */
+   NULL,                      /* read_frame_raw */
 #ifdef HAVE_OVERLAY
-  NULL, /* overlay_interface */
+  NULL,                       /* overlay_interface */
 #endif
   vg_get_poke_interface
 };
diff --git a/gfx/drivers/vga_gfx.c b/gfx/drivers/vga_gfx.c
index f5351cb009..1d828e0d9c 100644
--- a/gfx/drivers/vga_gfx.c
+++ b/gfx/drivers/vga_gfx.c
@@ -244,7 +244,8 @@ static bool vga_gfx_frame(void *data, const void *frame,
    if (msg)
       font_driver_render_msg(video_info, NULL, msg, NULL);
 
-   video_context_driver_update_window_title(video_info);
+   video_info->cb_update_window_title(
+         video_info->context_data, video_info);
 
    return true;
 }
@@ -275,12 +276,6 @@ static bool vga_gfx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool vga_gfx_has_windowed(void *data)
-{
-   (void)data;
-   return true;
-}
-
 static void vga_gfx_free(void *data)
 {
    (void)data;
@@ -449,7 +444,7 @@ video_driver_t video_vga = {
    vga_gfx_alive,
    vga_gfx_focus,
    vga_gfx_suppress_screensaver,
-   vga_gfx_has_windowed,
+   NULL, /* has_windowed */
    vga_gfx_set_shader,
    vga_gfx_free,
    "vga",
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index 7a18ebdff6..bd8af133e2 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -33,7 +33,6 @@
 #include "../common/vita2d_common.h"
 #include "../../driver.h"
 #include "../video_coord_array.h"
-#include "../video_context_driver.h"
 #include "../../verbosity.h"
 #include "../../configuration.h"
 
@@ -291,12 +290,6 @@ static bool vita2d_gfx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool vita2d_gfx_has_windowed(void *data)
-{
-   (void)data;
-   return true;
-}
-
 static void vita2d_gfx_free(void *data)
 {
    vita_video_t *vita = (vita_video_t *)data;
@@ -965,7 +958,7 @@ video_driver_t video_vita2d = {
    vita2d_gfx_alive,
    vita2d_gfx_focus,
    vita2d_gfx_suppress_screensaver,
-   vita2d_gfx_has_windowed,
+   NULL, /* has_windowed */
    vita2d_gfx_set_shader,
    vita2d_gfx_free,
    "vita2d",
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index 9dd26eda12..4b800c1a84 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -47,7 +47,6 @@
 #include "../../retroarch.h"
 #include "../../verbosity.h"
 
-#include "../video_context_driver.h"
 #include "../video_coord_array.h"
 
 static void vulkan_set_viewport(void *data, unsigned viewport_width,
@@ -1259,12 +1258,6 @@ static bool vulkan_alive(void *data)
    return ret;
 }
 
-static bool vulkan_focus(void *data)
-{
-   (void)data;
-   return video_context_driver_focus();
-}
-
 static bool vulkan_suppress_screensaver(void *data, bool enable)
 {
    (void)data;
@@ -1272,12 +1265,6 @@ static bool vulkan_suppress_screensaver(void *data, bool enable)
    return video_context_driver_suppress_screensaver(&enabled);
 }
 
-static bool vulkan_has_windowed(void *data)
-{
-   (void)data;
-   return video_context_driver_has_windowed();
-}
-
 static bool vulkan_set_shader(void *data,
       enum rarch_shader_type type, const char *path)
 {
@@ -1571,7 +1558,7 @@ static void vulkan_inject_black_frame(vk_t *vk, video_frame_info_t *video_info)
    slock_unlock(vk->context->queue_lock);
 #endif
 
-   video_context_driver_swap_buffers(video_info);
+   video_info->cb_swap_buffers(video_info->context_data, video_info);
 }
 
 static bool vulkan_frame(void *data, const void *frame,
@@ -1727,7 +1714,7 @@ static bool vulkan_frame(void *data, const void *frame,
          if (vk->swapchain[vk->last_valid_index].texture_optimal.memory != VK_NULL_HANDLE)
             tex = &vk->swapchain[vk->last_valid_index].texture_optimal;
          else
-            vulkan_transition_texture(vk, tex);
+            vulkan_transition_texture(vk, vk->cmd, tex);
 
          input.image  = tex->image;
          input.view   = tex->view;
@@ -1937,12 +1924,11 @@ static bool vulkan_frame(void *data, const void *frame,
    slock_unlock(vk->context->queue_lock);
 #endif
 
-
-   video_context_driver_swap_buffers(video_info);
-
+   video_info->cb_swap_buffers(video_info->context_data, video_info);
 
    if (!vk->context->swap_interval_emulation_lock)
-      video_context_driver_update_window_title(video_info);
+      video_info->cb_update_window_title(
+            video_info->context_data, video_info);
 
    /* Handle spurious swapchain invalidations as soon as we can,
     * i.e. right after swap buffers. */
@@ -1951,7 +1937,8 @@ static bool vulkan_frame(void *data, const void *frame,
       gfx_ctx_mode_t mode;
       mode.width  = width;
       mode.height = height;
-      video_context_driver_set_resize(mode);
+
+      video_info->cb_set_resize(video_info->context_data, mode.width, mode.height);
 
       vk->should_resize = false;
    }
@@ -1961,7 +1948,7 @@ static bool vulkan_frame(void *data, const void *frame,
     * and pause to prevent flicker. */
    if (
          video_info->black_frame_insertion
-         && !input_driver_is_nonblock_state()
+         && !video_info->input_driver_nonblock_state
          && !video_info->runloop_is_slowmotion
          && !video_info->runloop_is_paused)
    {
@@ -2582,9 +2569,9 @@ video_driver_t video_vulkan = {
    vulkan_frame,
    vulkan_set_nonblock_state,
    vulkan_alive,
-   vulkan_focus,
+   NULL,                         /* focus */
    vulkan_suppress_screensaver,
-   vulkan_has_windowed,
+   NULL,                         /* has_windowed */
    vulkan_set_shader,
    vulkan_free,
    "vulkan",
@@ -2592,7 +2579,7 @@ video_driver_t video_vulkan = {
    vulkan_set_rotation,
    vulkan_viewport_info,
    vulkan_read_viewport,
-   NULL,                           /* vulkan_read_frame_raw */
+   NULL,                         /* vulkan_read_frame_raw */
 
 #ifdef HAVE_OVERLAY
    vulkan_get_overlay_interface,
@@ -2600,6 +2587,6 @@ video_driver_t video_vulkan = {
    NULL,
 #endif
    vulkan_get_poke_interface,
-   NULL,                           /* vulkan_wrap_type_to_enum */
+   NULL,                         /* vulkan_wrap_type_to_enum */
 };
 
diff --git a/gfx/drivers/wiiu_gfx.c b/gfx/drivers/wiiu_gfx.c
index d80c0e3b56..41da81ad3e 100644
--- a/gfx/drivers/wiiu_gfx.c
+++ b/gfx/drivers/wiiu_gfx.c
@@ -728,12 +728,6 @@ static bool wiiu_gfx_suppress_screensaver(void* data, bool enable)
    return false;
 }
 
-static bool wiiu_gfx_has_windowed(void* data)
-{
-   (void)data;
-   return true;
-}
-
 static bool wiiu_gfx_set_shader(void* data,
                                 enum rarch_shader_type type, const char* path)
 {
@@ -887,7 +881,7 @@ video_driver_t video_wiiu =
    wiiu_gfx_alive,
    wiiu_gfx_focus,
    wiiu_gfx_suppress_screensaver,
-   wiiu_gfx_has_windowed,
+   NULL, /* has_windowed */
    wiiu_gfx_set_shader,
    wiiu_gfx_free,
    "gx2",
diff --git a/gfx/drivers/xenon360_gfx.c b/gfx/drivers/xenon360_gfx.c
index 809cf5e664..3832e7c538 100644
--- a/gfx/drivers/xenon360_gfx.c
+++ b/gfx/drivers/xenon360_gfx.c
@@ -271,12 +271,6 @@ static bool xenon360_gfx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool xenon360_gfx_has_windowed(void *data)
-{
-   (void)data;
-   return false;
-}
-
 static void xenon360_gfx_set_rotation(void *data, unsigned rotation)
 {
    (void)data;
@@ -321,7 +315,7 @@ video_driver_t video_xenon360 = {
    xenon360_gfx_alive,
    xenon360_gfx_focus,
    xenon360_gfx_suppress_screensaver,
-   xenon360_gfx_has_windowed,
+   NULL, /* has_windowed */
    xenon360_gfx_set_shader,
    xenon360_gfx_free,
    "xenon360",
diff --git a/gfx/drivers/xshm_gfx.c b/gfx/drivers/xshm_gfx.c
index 561b20726f..159c66c121 100644
--- a/gfx/drivers/xshm_gfx.c
+++ b/gfx/drivers/xshm_gfx.c
@@ -138,11 +138,6 @@ static bool xshm_gfx_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static bool xshm_gfx_has_windowed(void *data)
-{
-   return true;
-}
-
 static void xshm_gfx_free(void *data)
 {
    
diff --git a/gfx/drivers_context/android_ctx.c b/gfx/drivers_context/android_ctx.c
index b721c8467b..b1c907a838 100644
--- a/gfx/drivers_context/android_ctx.c
+++ b/gfx/drivers_context/android_ctx.c
@@ -471,7 +471,7 @@ dpi_fallback:
    return true;
 }
 
-static void android_gfx_ctx_swap_buffers(void *data, video_frame_info_t *video_info)
+static void android_gfx_ctx_swap_buffers(void *data, void *data2)
 {
    android_ctx_data_t *and  = (android_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/cgl_ctx.c b/gfx/drivers_context/cgl_ctx.c
index 74ab9c3f64..95673270a0 100644
--- a/gfx/drivers_context/cgl_ctx.c
+++ b/gfx/drivers_context/cgl_ctx.c
@@ -29,7 +29,7 @@
 #include <OpenGL/OpenGL.h>
 #include <OpenGL/gl.h>
 
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 
 typedef int CGSConnectionID;
 typedef int CGSWindowID;
diff --git a/gfx/drivers_context/cocoa_gl_ctx.m b/gfx/drivers_context/cocoa_gl_ctx.m
index d43a888bdc..bcc864cee3 100644
--- a/gfx/drivers_context/cocoa_gl_ctx.m
+++ b/gfx/drivers_context/cocoa_gl_ctx.m
@@ -39,7 +39,7 @@
 #include <compat/apple_compat.h>
 
 #import "../../ui/drivers/cocoa/cocoa_common.h"
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 #include "../../configuration.h"
 #include "../../verbosity.h"
 
@@ -427,10 +427,10 @@ static void cocoagl_gfx_ctx_get_video_size(void *data, unsigned* width, unsigned
 }
 
 #if defined(HAVE_COCOA)
-static void cocoagl_gfx_ctx_update_title(void *data, video_frame_info_t *video_info)
+static void cocoagl_gfx_ctx_update_title(void *data, void *data2)
 {
    ui_window_cocoa_t view;
-   const ui_window_t *window  = ui_companion_driver_get_window_ptr();
+   const ui_window_t *window      = ui_companion_driver_get_window_ptr();
 
    view.data = (CocoaView*)nsview_get_ptr();
 
@@ -538,7 +538,7 @@ static bool cocoagl_gfx_ctx_has_windowed(void *data)
 }
 #endif
 
-static void cocoagl_gfx_ctx_swap_buffers(void *data, video_frame_info_t *video_info)
+static void cocoagl_gfx_ctx_swap_buffers(void *data, void *data2)
 {
    if (!(--g_fast_forward_skips < 0))
       return;
diff --git a/gfx/drivers_context/d3d_ctx.cpp b/gfx/drivers_context/d3d_ctx.cpp
index 9c1214618f..c13f90d8aa 100644
--- a/gfx/drivers_context/d3d_ctx.cpp
+++ b/gfx/drivers_context/d3d_ctx.cpp
@@ -25,10 +25,12 @@
 #endif
 
 #include <compat/strl.h>
+#include <string/stdstring.h>
 
 #include "../drivers/d3d.h"
 #include "../common/win32_common.h"
 
+#include "../../configuration.h"
 #include "../../verbosity.h"
 #include "../../ui/ui_companion_driver.h"
 
@@ -75,7 +77,7 @@ static bool gfx_ctx_d3d_set_resize(void *data, unsigned new_width, unsigned new_
    return true;
 }
 
-static void gfx_ctx_d3d_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_d3d_swap_buffers(void *data, void *data2)
 {
    d3d_video_t      *d3d = (d3d_video_t*)data;
    LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev;
@@ -83,8 +85,9 @@ static void gfx_ctx_d3d_swap_buffers(void *data, video_frame_info_t *video_info)
    d3d_swap(d3d, d3dr);
 }
 
-static void gfx_ctx_d3d_update_title(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_d3d_update_title(void *data, void *data2)
 {
+   video_frame_info_t *video_info = (video_frame_info_t*)data2;
 #ifdef _XBOX
    if (video_info->fps_show)
    {
@@ -186,6 +189,19 @@ static void gfx_ctx_d3d_input_driver(void *data,
    *input               = xinput ? (const input_driver_t*)&input_xinput : NULL;
    *input_data          = xinput;
 #else
+   settings_t *settings = config_get_ptr();
+
+   if (string_is_equal_fast(settings->arrays.input_driver, "raw", 4))
+   {
+      *input_data = input_winraw.init(name);
+      if (*input_data)
+      {
+         *input = &input_winraw;
+         dinput = NULL;
+         return;
+      }
+   }
+
    dinput               = input_dinput.init(name);
    *input               = dinput ? &input_dinput : NULL;
    *input_data          = dinput;
diff --git a/gfx/drivers_context/drm_ctx.c b/gfx/drivers_context/drm_ctx.c
index cd755adb86..d87030d35c 100644
--- a/gfx/drivers_context/drm_ctx.c
+++ b/gfx/drivers_context/drm_ctx.c
@@ -228,9 +228,10 @@ static bool gfx_ctx_drm_queue_flip(void)
    return false;
 }
 
-static void gfx_ctx_drm_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_drm_swap_buffers(void *data, void *data2)
 {
-   gfx_ctx_drm_data_t *drm = (gfx_ctx_drm_data_t*)data;
+   gfx_ctx_drm_data_t        *drm = (gfx_ctx_drm_data_t*)data;
+   video_frame_info_t *video_info = (video_frame_info_t*)data2;
 
    switch (drm_api)
    {
diff --git a/gfx/drivers_context/emscriptenegl_ctx.c b/gfx/drivers_context/emscriptenegl_ctx.c
index 8212507112..76d4bddc00 100644
--- a/gfx/drivers_context/emscriptenegl_ctx.c
+++ b/gfx/drivers_context/emscriptenegl_ctx.c
@@ -25,7 +25,7 @@
 #include "../../config.h"
 #endif
 
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 
 #ifdef HAVE_EGL
 #include "../common/egl_common.h"
@@ -74,7 +74,7 @@ static void gfx_ctx_emscripten_check_window(void *data, bool *quit,
    *quit       = false;
 }
 
-static void gfx_ctx_emscripten_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_emscripten_swap_buffers(void *data, void *data2)
 {
    (void)data;
    /* no-op in emscripten, no way to force swap/wait for VSync in browsers */
diff --git a/gfx/drivers_context/gdi_ctx.cpp b/gfx/drivers_context/gdi_ctx.cpp
index 9e9b770262..5ced3e5c07 100644
--- a/gfx/drivers_context/gdi_ctx.cpp
+++ b/gfx/drivers_context/gdi_ctx.cpp
@@ -35,7 +35,7 @@
 #include "../../configuration.h"
 #include "../../dynamic.h"
 #include "../../verbosity.h"
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 
 #include "../common/win32_common.h"
 
@@ -86,7 +86,7 @@ static bool gfx_ctx_gdi_set_resize(void *data,
    return false;
 }
 
-static void gfx_ctx_gdi_update_window_title(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_gdi_update_window_title(void *data, void *data2)
 {
    const ui_window_t *window = ui_companion_driver_get_window_ptr();
    char title[128];
@@ -284,7 +284,7 @@ static uint32_t gfx_ctx_gdi_get_flags(void *data)
    return flags;
 }
 
-static void gfx_ctx_gdi_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_gdi_swap_buffers(void *data, void *data2)
 {
    (void)data;
 
diff --git a/gfx/drivers_context/gfx_null_ctx.c b/gfx/drivers_context/gfx_null_ctx.c
index ff51ea6de4..e6bf37c819 100644
--- a/gfx/drivers_context/gfx_null_ctx.c
+++ b/gfx/drivers_context/gfx_null_ctx.c
@@ -16,7 +16,7 @@
 
 /* Null context. */
 
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 
 static void gfx_ctx_null_swap_interval(void *data, unsigned interval)
 {
@@ -34,7 +34,7 @@ static void gfx_ctx_null_check_window(void *data, bool *quit,
    (void)resize;
 }
 
-static void gfx_ctx_null_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_null_swap_buffers(void *data, void *data2)
 {
    (void)data;
 }
diff --git a/gfx/drivers_context/khr_display_ctx.c b/gfx/drivers_context/khr_display_ctx.c
index d5d72c59c7..fd69cb1620 100644
--- a/gfx/drivers_context/khr_display_ctx.c
+++ b/gfx/drivers_context/khr_display_ctx.c
@@ -180,7 +180,7 @@ static void gfx_ctx_khr_display_set_swap_interval(void *data, unsigned swap_inte
    }
 }
 
-static void gfx_ctx_khr_display_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_khr_display_swap_buffers(void *data, void *data2)
 {
    khr_display_ctx_data_t *khr = (khr_display_ctx_data_t*)data;
    vulkan_present(&khr->vk, khr->vk.context.current_swapchain_index);
diff --git a/gfx/drivers_context/mali_fbdev_ctx.c b/gfx/drivers_context/mali_fbdev_ctx.c
index 12b8ce430f..42234bfd56 100644
--- a/gfx/drivers_context/mali_fbdev_ctx.c
+++ b/gfx/drivers_context/mali_fbdev_ctx.c
@@ -241,7 +241,7 @@ static void gfx_ctx_mali_fbdev_set_swap_interval(void *data, unsigned swap_inter
 #endif
 }
 
-static void gfx_ctx_mali_fbdev_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_mali_fbdev_swap_buffers(void *data, void *data2)
 {
    mali_ctx_data_t *mali = (mali_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/opendingux_fbdev_ctx.c b/gfx/drivers_context/opendingux_fbdev_ctx.c
index 9cccc1ac51..b50317e200 100644
--- a/gfx/drivers_context/opendingux_fbdev_ctx.c
+++ b/gfx/drivers_context/opendingux_fbdev_ctx.c
@@ -203,7 +203,7 @@ static bool gfx_ctx_opendingux_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static void gfx_ctx_opendingux_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_opendingux_swap_buffers(void *data, void *data2)
 {
    opendingux_ctx_data_t *viv = (opendingux_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/osmesa_ctx.c b/gfx/drivers_context/osmesa_ctx.c
index 00055a7249..98af666d17 100644
--- a/gfx/drivers_context/osmesa_ctx.c
+++ b/gfx/drivers_context/osmesa_ctx.c
@@ -337,7 +337,7 @@ static bool osmesa_ctx_has_windowed(void *data)
    return true;
 }
 
-static void osmesa_ctx_swap_buffers(void *data, video_frame_info_t *video_info)
+static void osmesa_ctx_swap_buffers(void *data, void *data2)
 {
    gfx_ctx_osmesa_data_t *osmesa = (gfx_ctx_osmesa_data_t*)data;
    osmesa_fifo_accept(osmesa);
diff --git a/gfx/drivers_context/ps3_ctx.c b/gfx/drivers_context/ps3_ctx.c
index fb3af25cdb..e7c48bfdcd 100644
--- a/gfx/drivers_context/ps3_ctx.c
+++ b/gfx/drivers_context/ps3_ctx.c
@@ -33,7 +33,7 @@
 #include "../../configuration.h"
 #include "../../defines/ps3_defines.h"
 #include "../common/gl_common.h"
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 
 typedef struct gfx_ctx_ps3_data
 {
@@ -173,7 +173,7 @@ static bool gfx_ctx_ps3_suppress_screensaver(void *data, bool enable)
    return false;
 }
 
-static void gfx_ctx_ps3_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_ps3_swap_buffers(void *data, void *data2)
 {
    (void)data;
 #ifdef HAVE_LIBDBGFONT
diff --git a/gfx/drivers_context/qnx_ctx.c b/gfx/drivers_context/qnx_ctx.c
index 37c9b654fb..e2f365a7c7 100644
--- a/gfx/drivers_context/qnx_ctx.c
+++ b/gfx/drivers_context/qnx_ctx.c
@@ -413,7 +413,7 @@ static void gfx_ctx_qnx_set_swap_interval(void *data, unsigned swap_interval)
 #endif
 }
 
-static void gfx_ctx_qnx_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_qnx_swap_buffers(void *data, void *data2)
 {
    qnx_ctx_data_t *qnx = (qnx_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/sdl_gl_ctx.c b/gfx/drivers_context/sdl_gl_ctx.c
index 7afc5d6858..6c9f70df40 100644
--- a/gfx/drivers_context/sdl_gl_ctx.c
+++ b/gfx/drivers_context/sdl_gl_ctx.c
@@ -266,7 +266,7 @@ static void sdl_ctx_get_video_size(void *data,
    }
 }
 
-static void sdl_ctx_update_title(void *data, video_frame_info_t *video_info)
+static void sdl_ctx_update_title(void *data, void *data2)
 {
    char title[128];
 
@@ -365,7 +365,7 @@ static bool sdl_ctx_has_windowed(void *data)
    return true;
 }
 
-static void sdl_ctx_swap_buffers(void *data, video_frame_info_t *video_info)
+static void sdl_ctx_swap_buffers(void *data, void *data2)
 {
 #ifdef HAVE_SDL2
    gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)data;
diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
index fee7c6f2fe..a68c7b61f4 100644
--- a/gfx/drivers_context/vc_egl_ctx.c
+++ b/gfx/drivers_context/vc_egl_ctx.c
@@ -32,7 +32,7 @@
 #include <retro_inline.h>
 
 #include "../../configuration.h"
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 
 #include "../../frontend/frontend_driver.h"
 
@@ -581,7 +581,7 @@ error:
    return false;
 }
 
-static void gfx_ctx_vc_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_vc_swap_buffers(void *data, void *data2)
 {
    vc_ctx_data_t *vc = (vc_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/vivante_fbdev_ctx.c b/gfx/drivers_context/vivante_fbdev_ctx.c
index 6d8e0728f5..17fdf3e19b 100644
--- a/gfx/drivers_context/vivante_fbdev_ctx.c
+++ b/gfx/drivers_context/vivante_fbdev_ctx.c
@@ -219,7 +219,7 @@ static void gfx_ctx_vivante_set_swap_interval(void *data, unsigned swap_interval
 #endif
 }
 
-static void gfx_ctx_vivante_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_vivante_swap_buffers(void *data, void *data2)
 {
    vivante_ctx_data_t *viv = (vivante_ctx_data_t*)data;
 
diff --git a/gfx/drivers_context/wayland_ctx.c b/gfx/drivers_context/wayland_ctx.c
index 80ee8c8324..2deee78efb 100644
--- a/gfx/drivers_context/wayland_ctx.c
+++ b/gfx/drivers_context/wayland_ctx.c
@@ -499,22 +499,22 @@ static void registry_handle_global(void *data, struct wl_registry *reg,
 
    (void)version;
 
-   if (memcmp(interface, "wl_compositor", 13) == 0)
+   if (string_is_equal_fast(interface, "wl_compositor", 13))
       wl->compositor = (struct wl_compositor*)wl_registry_bind(reg,
             id, &wl_compositor_interface, 3);
-   else if (memcmp(interface, "wl_output", 9) == 0)
+   else if (string_is_equal_fast(interface, "wl_output", 9))
    {
       output = (struct wl_output*)wl_registry_bind(reg,
             id, &wl_output_interface, 2);
       wl_output_add_listener(output, &output_listener, wl);
       wl_display_roundtrip(wl->dpy);
    }
-   else if (memcmp(interface, "wl_shell", 8) == 0)
+   else if (string_is_equal_fast(interface, "wl_shell", 8))
       wl->shell = (struct wl_shell*)
          wl_registry_bind(reg, id, &wl_shell_interface, 1);
-   else if (memcmp(interface, "wl_shm", 6) == 0)
+   else if (string_is_equal_fast(interface, "wl_shm", 6))
       wl->shm = (struct wl_shm*)wl_registry_bind(reg, id, &wl_shm_interface, 1);
-   else if (memcmp(interface, "wl_seat", 7) == 0)
+   else if (string_is_equal_fast(interface, "wl_seat", 7))
    {
       wl->seat = (struct wl_seat*)wl_registry_bind(reg, id, &wl_seat_interface, 4);
       wl_seat_add_listener(wl->seat, &seat_listener, wl);
@@ -720,7 +720,7 @@ static bool gfx_ctx_wl_set_resize(void *data, unsigned width, unsigned height)
    return true;
 }
 
-static void gfx_ctx_wl_update_title(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_wl_update_title(void *data, void *data2)
 {
    gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
    char title[128];
@@ -1567,7 +1567,7 @@ static void *gfx_ctx_wl_get_context_data(void *data)
 }
 #endif
 
-static void gfx_ctx_wl_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_wl_swap_buffers(void *data, void *data2)
 {
    gfx_ctx_wayland_data_t *wl = (gfx_ctx_wayland_data_t*)data;
 
diff --git a/gfx/drivers_context/wgl_ctx.cpp b/gfx/drivers_context/wgl_ctx.cpp
index 9d082947f1..a6a01370c4 100644
--- a/gfx/drivers_context/wgl_ctx.cpp
+++ b/gfx/drivers_context/wgl_ctx.cpp
@@ -34,6 +34,7 @@
 #include <commdlg.h>
 
 #include <dynamic/dylib.h>
+#include <string/stdstring.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
@@ -41,7 +42,7 @@
 
 #include "../../configuration.h"
 #include "../../dynamic.h"
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 
 #include "../common/win32_common.h"
 
@@ -102,6 +103,27 @@ static enum gfx_ctx_api win32_api         = GFX_CTX_NONE;
 
 static dylib_t          dll_handle        = NULL; /* Handle to OpenGL32.dll */
 
+static gfx_ctx_proc_t gfx_ctx_wgl_get_proc_address(const char *symbol)
+{
+   switch (win32_api)
+   {
+      case GFX_CTX_OPENGL_API:
+#if defined(HAVE_OPENGL)
+         {
+            gfx_ctx_proc_t func = (gfx_ctx_proc_t)wglGetProcAddress(symbol);
+            if (func)
+               return func;
+         }
+#endif
+         break;
+      default:
+         break;
+   }
+
+   return (gfx_ctx_proc_t)GetProcAddress((HINSTANCE)dll_handle, symbol);
+}
+
+#if defined(HAVE_OPENGL)
 static void setup_pixel_format(HDC hdc)
 {
    PIXELFORMATDESCRIPTOR pfd = {0};
@@ -117,7 +139,6 @@ static void setup_pixel_format(HDC hdc)
    SetPixelFormat(hdc, ChoosePixelFormat(hdc, &pfd), &pfd);
 }
 
-#if defined(HAVE_OPENGL)
 static void create_gl_context(HWND hwnd, bool *quit)
 {
    struct retro_hw_render_callback *hwr = video_driver_get_hw_context();
@@ -203,8 +224,7 @@ static void create_gl_context(HWND hwnd, bool *quit)
       *aptr = 0;
 
       if (!pcreate_context)
-         pcreate_context = (wglCreateContextAttribsProc)
-            wglGetProcAddress("wglCreateContextAttribsARB");
+         pcreate_context = (wglCreateContextAttribsProc)gfx_ctx_wgl_get_proc_address("wglCreateContextAttribsARB");
 
       if (pcreate_context)
       {
@@ -331,7 +351,7 @@ static void gfx_ctx_wgl_check_window(void *data, bool *quit,
    }
 }
 
-static void gfx_ctx_wgl_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_wgl_swap_buffers(void *data, void *data2)
 {
    (void)data;
 
@@ -386,7 +406,7 @@ static bool gfx_ctx_wgl_set_resize(void *data,
    return false;
 }
 
-static void gfx_ctx_wgl_update_title(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_wgl_update_title(void *data, void *data2)
 {
    const ui_window_t *window = ui_companion_driver_get_window_ptr();
 
@@ -540,12 +560,8 @@ static bool gfx_ctx_wgl_set_video_mode(void *data,
    switch (win32_api)
    {
       case GFX_CTX_OPENGL_API:
-#ifdef HAVE_OPENGL
-         p_swap_interval = (BOOL (APIENTRY *)(int))
-            wglGetProcAddress("wglSwapIntervalEXT");
-#endif
+         p_swap_interval = (BOOL (APIENTRY *)(int))gfx_ctx_wgl_get_proc_address("wglSwapIntervalEXT");
          break;
-
       case GFX_CTX_NONE:
       default:
          break;
@@ -564,10 +580,22 @@ static void gfx_ctx_wgl_input_driver(void *data,
       const char *joypad_name,
       const input_driver_t **input, void **input_data)
 {
-   dinput_wgl           = input_dinput.init(joypad_name);
+   settings_t *settings = config_get_ptr();
 
-   *input               = dinput_wgl ? &input_dinput : NULL;
-   *input_data          = dinput_wgl;
+   if (string_is_equal_fast(settings->arrays.input_driver, "raw", 4))
+   {
+      *input_data = input_winraw.init(joypad_name);
+      if (*input_data)
+      {
+         *input = &input_winraw;
+         dinput_wgl = NULL;
+         return;
+      }
+   }
+
+   dinput_wgl  = input_dinput.init(joypad_name);
+   *input      = dinput_wgl ? &input_dinput : NULL;
+   *input_data = dinput_wgl;
 }
 
 static bool gfx_ctx_wgl_has_focus(void *data)
@@ -587,15 +615,6 @@ static bool gfx_ctx_wgl_has_windowed(void *data)
    return true;
 }
 
-static gfx_ctx_proc_t gfx_ctx_wgl_get_proc_address(const char *symbol)
-{
-#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN)
-   gfx_ctx_proc_t func = (gfx_ctx_proc_t)wglGetProcAddress(symbol);
-   if (func)
-      return func;
-#endif
-   return (gfx_ctx_proc_t)GetProcAddress((HINSTANCE)dll_handle, symbol);
-}
 
 static bool gfx_ctx_wgl_get_metrics(void *data,
 	enum display_metric_types type, float *value)
diff --git a/gfx/drivers_context/x_ctx.c b/gfx/drivers_context/x_ctx.c
index 58132a7fb7..222e5d11e9 100644
--- a/gfx/drivers_context/x_ctx.c
+++ b/gfx/drivers_context/x_ctx.c
@@ -307,7 +307,7 @@ static void gfx_ctx_x_swap_interval(void *data, unsigned interval)
    }
 }
 
-static void gfx_ctx_x_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_x_swap_buffers(void *data, void *data2)
 {
    gfx_ctx_x_data_t *x = (gfx_ctx_x_data_t*)data;
 
diff --git a/gfx/drivers_context/xegl_ctx.c b/gfx/drivers_context/xegl_ctx.c
index 07a0c018b9..351c021215 100644
--- a/gfx/drivers_context/xegl_ctx.c
+++ b/gfx/drivers_context/xegl_ctx.c
@@ -490,7 +490,7 @@ static void gfx_ctx_xegl_show_mouse(void *data, bool state)
    x11_show_mouse(g_x11_dpy, g_x11_win, state);
 }
 
-static void gfx_ctx_xegl_swap_buffers(void *data, video_frame_info_t *video_info)
+static void gfx_ctx_xegl_swap_buffers(void *data, void *data2)
 {
    xegl_ctx_data_t *xegl = (xegl_ctx_data_t*)data;
 
diff --git a/gfx/drivers_font/gl_raster_font.c b/gfx/drivers_font/gl_raster_font.c
index bb4896ed69..33ddd2641c 100644
--- a/gfx/drivers_font/gl_raster_font.c
+++ b/gfx/drivers_font/gl_raster_font.c
@@ -22,8 +22,7 @@
 
 #include "../common/gl_common.h"
 #include "../font_driver.h"
-#include "../video_shader_driver.h"
-#include "../video_context_driver.h"
+#include "../video_driver.h"
 
 /* TODO: Move viewport side effects to the caller: it's a source of bugs. */
 
diff --git a/gfx/drivers_font/vita2d_font.c b/gfx/drivers_font/vita2d_font.c
index 80554993ad..87f903d27c 100644
--- a/gfx/drivers_font/vita2d_font.c
+++ b/gfx/drivers_font/vita2d_font.c
@@ -293,7 +293,7 @@ static void vita2d_font_render_msg(
       g    				= FONT_COLOR_GET_GREEN(params->color);
       b    				= FONT_COLOR_GET_BLUE(params->color);
       alpha    		= FONT_COLOR_GET_ALPHA(params->color);
-      color    		= params->color;
+      color    		= RGBA8(r,g,b,alpha);
    }
    else
    {
diff --git a/gfx/drivers_font/vulkan_raster_font.c b/gfx/drivers_font/vulkan_raster_font.c
index f2030f551b..c1036d217d 100644
--- a/gfx/drivers_font/vulkan_raster_font.c
+++ b/gfx/drivers_font/vulkan_raster_font.c
@@ -15,6 +15,7 @@
 
 #include <string.h>
 
+#include <encodings/utf.h>
 #include <compat/strl.h>
 
 #include "../common/vulkan_common.h"
@@ -25,8 +26,11 @@ typedef struct
 {
    vk_t *vk;
    struct vk_texture texture;
+   struct vk_texture texture_optimal;
    const font_renderer_driver_t *font_driver;
    void *font_data;
+   struct font_atlas *atlas;
+   bool needs_update;
 
    struct vk_vertex *pv;
    struct vk_buffer_range range;
@@ -39,7 +43,6 @@ static void *vulkan_raster_font_init_font(void *data,
       const char *font_path, float font_size,
       bool is_threaded)
 {
-   const struct font_atlas *atlas = NULL;
    vulkan_raster_t *font          = 
       (vulkan_raster_t*)calloc(1, sizeof(*font));
 
@@ -65,10 +68,19 @@ static void *vulkan_raster_font_init_font(void *data,
       return NULL;
    }
 
-   atlas = font->font_driver->get_atlas(font->font_data);
+   font->atlas = font->font_driver->get_atlas(font->font_data);
    font->texture = vulkan_create_texture(font->vk, NULL,
-         atlas->width, atlas->height, VK_FORMAT_R8_UNORM, atlas->buffer,
-         NULL /*&swizzle*/, VULKAN_TEXTURE_STATIC);
+         font->atlas->width, font->atlas->height, VK_FORMAT_R8_UNORM, font->atlas->buffer,
+         NULL /*&swizzle*/, VULKAN_TEXTURE_STAGING);
+
+   vulkan_map_persistent_texture(
+         font->vk->context->device, &font->texture);
+
+   font->texture_optimal = vulkan_create_texture(font->vk, NULL,
+         font->atlas->width, font->atlas->height, VK_FORMAT_R8_UNORM, NULL,
+         NULL /*&swizzle*/, VULKAN_TEXTURE_DYNAMIC);
+
+   font->needs_update = true;
 
    return font;
 }
@@ -85,10 +97,29 @@ static void vulkan_raster_font_free_font(void *data, bool is_threaded)
    vkQueueWaitIdle(font->vk->context->queue);
    vulkan_destroy_texture( 
          font->vk->context->device, &font->texture);
+   vulkan_destroy_texture(
+         font->vk->context->device, &font->texture_optimal);
 
    free(font);
 }
 
+static INLINE void vulkan_raster_font_update_glyph(vulkan_raster_t *font, const struct font_glyph *glyph)
+{
+   if(font->atlas->dirty)
+   {
+      int row;
+      for(row = glyph->atlas_offset_y; row < (glyph->atlas_offset_y + glyph->height); row++)
+      {
+         uint8_t* src = font->atlas->buffer + row * font->atlas->width + glyph->atlas_offset_x;
+         uint8_t* dst = (uint8_t*)font->texture.mapped + row * font->texture.stride + glyph->atlas_offset_x;
+         memcpy(dst, src, glyph->width);
+      }
+
+      font->atlas->dirty = false;
+      font->needs_update = true;
+   }
+}
+
 static int vulkan_get_message_width(void *data, const char *msg,
       unsigned msg_len, float scale)
 {
@@ -107,8 +138,12 @@ static int vulkan_get_message_width(void *data, const char *msg,
       if (!glyph) /* Do something smarter here ... */
          glyph = font->font_driver->get_glyph(font->font_data, '?');
 
+
       if (glyph)
+      {
+         vulkan_raster_font_update_glyph(font, glyph);
          delta_x += glyph->advance_x;
+      }
    }
 
    return delta_x * scale;
@@ -119,9 +154,9 @@ static void vulkan_raster_font_render_line(
       float scale, const float color[4], float pos_x,
       float pos_y, unsigned text_align)
 {
-   unsigned i;
    struct vk_color vk_color;
    vk_t *vk             = font->vk;
+   const char* msg_end  = msg + msg_len;
    int x                = roundf(pos_x * vk->vp.width);
    int y                = roundf((1.0f - pos_y) * vk->vp.height);
    int delta_x          = 0;
@@ -146,17 +181,20 @@ static void vulkan_raster_font_render_line(
          break;
    }
 
-   for (i = 0; i < msg_len; i++)
+   while (msg < msg_end)
    {
       int off_x, off_y, tex_x, tex_y, width, height;
+      unsigned code                  = utf8_walk(&msg);
       const struct font_glyph *glyph =
-         font->font_driver->get_glyph(font->font_data, (uint8_t)msg[i]);
+         font->font_driver->get_glyph(font->font_data, code);
 
       if (!glyph) /* Do something smarter here ... */
          glyph = font->font_driver->get_glyph(font->font_data, '?');
       if (!glyph)
          continue;
 
+      vulkan_raster_font_update_glyph(font, glyph);
+
       off_x  = glyph->draw_offset_x;
       off_y  = glyph->draw_offset_y;
       tex_x  = glyph->atlas_offset_x;
@@ -235,7 +273,7 @@ static void vulkan_raster_font_flush(vulkan_raster_t *font)
 {
    const struct vk_draw_triangles call = {
       font->vk->pipelines.font,
-      &font->texture,
+      &font->texture_optimal,
       font->vk->samplers.mipmap_linear,
       &font->vk->mvp,
       sizeof(font->vk->mvp),
@@ -243,6 +281,47 @@ static void vulkan_raster_font_flush(vulkan_raster_t *font)
       font->vertices,
    };
 
+   if(font->needs_update)
+   {
+      VkCommandBuffer staging;
+      VkSubmitInfo submit_info             = { VK_STRUCTURE_TYPE_SUBMIT_INFO };
+      VkCommandBufferAllocateInfo cmd_info = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_ALLOCATE_INFO };
+      VkCommandBufferBeginInfo begin_info  = { VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO };
+
+      cmd_info.commandPool        = font->vk->staging_pool;
+      cmd_info.level              = VK_COMMAND_BUFFER_LEVEL_PRIMARY;
+      cmd_info.commandBufferCount = 1;
+      vkAllocateCommandBuffers(font->vk->context->device, &cmd_info, &staging);
+
+      begin_info.flags            = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
+      vkBeginCommandBuffer(staging, &begin_info);
+
+      vulkan_copy_staging_to_dynamic(font->vk, staging,
+            &font->texture_optimal, &font->texture);
+
+      vkEndCommandBuffer(staging);
+
+#ifdef HAVE_THREADS
+      slock_lock(font->vk->context->queue_lock);
+#endif
+
+      submit_info.commandBufferCount = 1;
+      submit_info.pCommandBuffers    = &staging;
+      vkQueueSubmit(font->vk->context->queue,
+            1, &submit_info, VK_NULL_HANDLE);
+
+      vkQueueWaitIdle(font->vk->context->queue);
+
+#ifdef HAVE_THREADS
+      slock_unlock(font->vk->context->queue_lock);
+#endif
+
+      vkFreeCommandBuffers(font->vk->context->device,
+            font->vk->staging_pool, 1, &staging);
+
+      font->needs_update = false;
+   }
+
    vulkan_draw_triangles(font->vk, &call);
 }
 
@@ -340,13 +419,20 @@ static void vulkan_raster_font_render_msg(
 static const struct font_glyph *vulkan_raster_font_get_glyph(
       void *data, uint32_t code)
 {
+   const struct font_glyph* glyph;
    vulkan_raster_t *font = (vulkan_raster_t*)data;
 
    if (!font || !font->font_driver)
       return NULL;
    if (!font->font_driver->ident)
        return NULL;
-   return font->font_driver->get_glyph((void*)font->font_driver, code);
+
+   glyph = font->font_driver->get_glyph((void*)font->font_driver, code);
+
+   if(glyph)
+      vulkan_raster_font_update_glyph(font, glyph);
+
+   return glyph;
 }
 
 static void vulkan_raster_font_flush_block(unsigned width, unsigned height,
diff --git a/gfx/drivers_renderchain/d3d9_cg_renderchain.cpp b/gfx/drivers_renderchain/d3d9_cg_renderchain.cpp
index c75e6ec3a9..70a990b39c 100644
--- a/gfx/drivers_renderchain/d3d9_cg_renderchain.cpp
+++ b/gfx/drivers_renderchain/d3d9_cg_renderchain.cpp
@@ -299,7 +299,7 @@ static bool cg_d3d9_renderchain_init_shader_fvf(void *data, void *pass_data)
 
    for (count = 0; count < MAXD3DDECLLENGTH; count++)
    {
-      if (memcmp(&decl_end, &decl[count], sizeof(decl_end)) == 0)
+      if (string_is_equal_fast(&decl_end, &decl[count], sizeof(decl_end)))
          break;
    }
 
diff --git a/gfx/drivers_renderchain/gl_legacy_renderchain.c b/gfx/drivers_renderchain/gl_legacy_renderchain.c
index 6a0068723d..452abdca90 100644
--- a/gfx/drivers_renderchain/gl_legacy_renderchain.c
+++ b/gfx/drivers_renderchain/gl_legacy_renderchain.c
@@ -50,7 +50,7 @@
 #include "../common/win32_common.h"
 #endif
 
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 
 #define set_texture_coords(coords, xamt, yamt) \
    coords[2] = xamt; \
diff --git a/gfx/drivers_renderchain/xdk_renderchain.cpp b/gfx/drivers_renderchain/xdk_renderchain.cpp
index 4cfa4de7a8..f3c22e1ba3 100644
--- a/gfx/drivers_renderchain/xdk_renderchain.cpp
+++ b/gfx/drivers_renderchain/xdk_renderchain.cpp
@@ -21,7 +21,7 @@
 #include "../drivers/d3d.h"
 #include "../common/d3d_common.h"
 
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 
 #include "../../configuration.h"
 #include "../../verbosity.h"
diff --git a/gfx/drivers_shader/shader_gl_cg.c b/gfx/drivers_shader/shader_gl_cg.c
index 3aaec6d1fd..754e08b4e2 100644
--- a/gfx/drivers_shader/shader_gl_cg.c
+++ b/gfx/drivers_shader/shader_gl_cg.c
@@ -46,7 +46,7 @@
 
 #include "../include/Cg/cg.h"
 
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 #include "../video_shader_parse.h"
 #include "../../core.h"
 #include "../../managers/state_manager.h"
@@ -261,14 +261,13 @@ static bool gl_cg_set_mvp(void *data, void *shader_data, const math_matrix_4x4 *
 {
    cg_shader_data_t *cg = (cg_shader_data_t*)shader_data;
    if (!cg || !cg->prg[cg->active_idx].mvp)
-      goto fallback;
+   {
+      gl_ff_matrix(mat);
+      return false;
+   }
 
    cgGLSetMatrixParameterfc(cg->prg[cg->active_idx].mvp, mat->data);
    return true;
-
-fallback:
-   gl_ff_matrix(mat);
-   return false;
 }
 
 static bool gl_cg_set_coords(void *handle_data, void *shader_data, const struct video_coords *coords)
@@ -1054,7 +1053,7 @@ static void *gl_cg_init(void *data, const char *path)
    memset(cg->alias_define, 0, sizeof(cg->alias_define));
 
    if (    !string_is_empty(path) 
-         && (memcmp(path_get_extension(path), "cgp", 3) == 0))
+         && string_is_equal_fast(path_get_extension(path), "cgp", 3))
    {
       if (!gl_cg_load_preset(cg, path))
          goto error;
diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index 2799559a80..a76359eeb6 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -257,10 +257,27 @@ static bool gl_glsl_compile_shader(glsl_shader_data_t *glsl,
    GLint status;
    const char *source[4];
    char version[32];
+   const char *existing_version = strstr(program, "#version");
 
-   version[0] = '\0';
+   version[0]                   = '\0';
 
-   if (glsl_core && !strstr(program, "#version"))
+   if (existing_version)
+   {
+      const char* version_extra = "";
+      unsigned version_no = strtoul(existing_version + 8, (char**)&program, 10);
+#ifdef HAVE_OPENGLES
+      if (version_no < 130)
+         version_no = 100;
+      else
+      {
+         version_extra = " es";
+         version_no = 300;
+      }
+#endif
+      snprintf(version, sizeof(version), "#version %u%s\n", version_no, version_extra);
+      RARCH_LOG("[GLSL]: Using GLSL version %u%s.\n", version_no, version_extra);
+   }
+   else if (glsl_core)
    {
       unsigned version_no = 0;
       unsigned gl_ver = glsl_major * 100 + glsl_minor * 10;
@@ -758,7 +775,7 @@ static void *gl_glsl_init(void *data, const char *path)
       bool ret             = false;
       const char *path_ext = path_get_extension(path);
 
-      if (memcmp(path_ext, "glslp", 5) == 0)
+      if (string_is_equal_fast(path_ext, "glslp", 5))
       {
          conf = config_file_new(path);
          if (conf)
@@ -767,7 +784,7 @@ static void *gl_glsl_init(void *data, const char *path)
             glsl->shader->modern = true;
          }
       }
-      else if (memcmp(path_ext, "glsl", 4) == 0)
+      else if (string_is_equal_fast(path_ext, "glsl", 4))
       {
          strlcpy(glsl->shader->pass[0].source.path, path,
                sizeof(glsl->shader->pass[0].source.path));
@@ -1361,7 +1378,10 @@ static bool gl_glsl_set_mvp(void *data, void *shader_data, const math_matrix_4x4
    (void)data;
 
    if (!glsl || !glsl->shader->modern)
-      goto fallback;
+   {
+      gl_ff_matrix(mat);
+      return false;
+   }
 
    loc = glsl->uniforms[glsl->active_idx].mvp;
    if (loc >= 0)
@@ -1376,11 +1396,8 @@ static bool gl_glsl_set_mvp(void *data, void *shader_data, const math_matrix_4x4
          current_mat_data[glsl->active_idx]         = *mat->data;
       }
    }
-   return true;
 
-fallback:
-   gl_ff_matrix(mat);
-   return false;
+   return true;
 }
 
 #define gl_glsl_set_coord_array(attribs, coord1, coord2, coords, size, multiplier) \
diff --git a/gfx/drivers_shader/shader_glsl.h b/gfx/drivers_shader/shader_glsl.h
index 9b04095cd7..7f77693a59 100644
--- a/gfx/drivers_shader/shader_glsl.h
+++ b/gfx/drivers_shader/shader_glsl.h
@@ -19,7 +19,7 @@
 #define __RARCH_GLSL_H
 
 #include <boolean.h>
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 
 void gl_glsl_set_get_proc_address(gfx_ctx_proc_t (*proc)(const char*));
 
diff --git a/gfx/drivers_shader/shader_hlsl.c b/gfx/drivers_shader/shader_hlsl.c
index a52624339d..a26e3e4fce 100644
--- a/gfx/drivers_shader/shader_hlsl.c
+++ b/gfx/drivers_shader/shader_hlsl.c
@@ -410,7 +410,7 @@ static void *hlsl_init(void *data, const char *path)
    if (!hlsl_data)
 	   return NULL;
 
-   if (path && (memcmp(path_get_extension(path), ".cgp", 4) == 0))
+   if (path && (string_is_equal_fast(path_get_extension(path), ".cgp", 4)))
    {
       if (!hlsl_load_preset(hlsl_data, d3d, path))
          goto error;
diff --git a/gfx/drivers_shader/shader_hlsl.h b/gfx/drivers_shader/shader_hlsl.h
index a18e6d75ac..2fe39ee7c2 100644
--- a/gfx/drivers_shader/shader_hlsl.h
+++ b/gfx/drivers_shader/shader_hlsl.h
@@ -17,9 +17,10 @@
 #ifndef __RARCH_HLSL_H
 #define __RARCH_HLSL_H
 
-#include "../video_shader_driver.h"
 #include <stdint.h>
 
+#include "../video_driver.h"
+
 void hlsl_set_proj_matrix(void *data, XMMATRIX rotation_value);
 
 #define RARCH_HLSL_MAX_SHADERS 16
diff --git a/gfx/drivers_shader/shader_null.c b/gfx/drivers_shader/shader_null.c
index 11985337a1..8a2ce6c77f 100644
--- a/gfx/drivers_shader/shader_null.c
+++ b/gfx/drivers_shader/shader_null.c
@@ -27,11 +27,7 @@
 #include "../../config.h"
 #endif
 
-#ifdef HAVE_OPENGL
-#include "../common/gl_common.h"
-#endif
-
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 
 typedef struct null_shader_data
 {
@@ -58,18 +54,6 @@ static void *shader_null_init(void *data, const char *path)
    return null_shader;
 }
 
-static void shader_null_set_params(void *data, void *shader_data,
-      unsigned width, unsigned height, 
-      unsigned tex_width, unsigned tex_height, 
-      unsigned out_width, unsigned out_height,
-      unsigned frame_count,
-      const void *info, 
-      const void *prev_info, 
-      const void *feedback_info,
-      const void *fbo_info, unsigned fbo_info_cnt)
-{
-}
-
 static void shader_null_set_uniform_parameter(
       void *data,
       struct uniform_info *param,
@@ -77,82 +61,11 @@ static void shader_null_set_uniform_parameter(
 {
 }
 
-static bool shader_null_set_mvp(void *data, void *shader_data, const math_matrix_4x4 *mat)
-{
-#ifdef HAVE_OPENGL
-#ifndef NO_GL_FF_MATRIX
-   if (memcmp(video_driver_get_ident(), "gl", 2) == 0)
-      gl_ff_matrix(mat);
-#endif
-#endif
-   return false;
-}
-
-static bool shader_null_set_coords(void *handle_data, void *shader_data, const struct video_coords *coords)
-{
-#ifdef HAVE_OPENGL
-#ifndef NO_GL_FF_VERTEX
-   if (memcmp(video_driver_get_ident(), "gl", 2) == 0)
-      gl_ff_vertex(coords);
-#endif
-#endif
-   return false;
-}
-
-static void shader_null_use(void *data, void *shader_data, unsigned idx, bool set_active)
-{
-   (void)data;
-   (void)idx;
-   (void)set_active;
-}
-
-static unsigned shader_null_num(void *data)
-{
-   return 0;
-}
-
-static bool shader_null_filter_type(void *data, unsigned idx, bool *smooth)
-{
-   (void)idx;
-   (void)smooth;
-   return false;
-}
-
-static enum gfx_wrap_type shader_null_wrap_type(void *data, unsigned idx)
-{
-   (void)idx;
-   return RARCH_WRAP_BORDER;
-}
-
-static void shader_null_shader_scale(void *data,
-      unsigned idx, struct gfx_fbo_scale *scale)
-{
-   (void)idx;
-   (void)scale;
-}
-
 static unsigned shader_null_get_prev_textures(void *data)
 {
    return 0;
 }
 
-static bool shader_null_mipmap_input(void *data, unsigned idx)
-{
-   (void)idx;
-   return false;
-}
-
-static bool shader_null_get_feedback_pass(void *data, unsigned *idx)
-{
-   (void)idx;
-   return false;
-}
-
-static struct video_shader *shader_null_get_current_shader(void *data)
-{
-   return NULL;
-}
-
 static bool shader_null_compile_program(
       void *data,
       unsigned idx,
@@ -165,21 +78,21 @@ static bool shader_null_compile_program(
 const shader_backend_t shader_null_backend = {
    shader_null_init,
    shader_null_deinit,
-   shader_null_set_params,
+   NULL,
    shader_null_set_uniform_parameter,
    shader_null_compile_program,
-   shader_null_use,
-   shader_null_num,
-   shader_null_filter_type,
-   shader_null_wrap_type,
-   shader_null_shader_scale,
-   shader_null_set_coords,
    NULL,
-   shader_null_set_mvp,
+   NULL,
+   NULL,
+   NULL,
+   NULL,
+   NULL,
+   NULL,
+   NULL,
    shader_null_get_prev_textures,
-   shader_null_get_feedback_pass,
-   shader_null_mipmap_input,
-   shader_null_get_current_shader,
+   NULL,
+   NULL,
+   NULL,
 
    RARCH_SHADER_NONE,
    "nullshader"
diff --git a/gfx/drivers_shader/shader_vulkan.cpp b/gfx/drivers_shader/shader_vulkan.cpp
index fb3e47c1f7..605f786302 100644
--- a/gfx/drivers_shader/shader_vulkan.cpp
+++ b/gfx/drivers_shader/shader_vulkan.cpp
@@ -26,10 +26,11 @@
 
 #include <compat/strl.h>
 #include <formats/image.h>
+#include <retro_miscellaneous.h>
 
 #include "slang_reflection.hpp"
 
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 #include "../../verbosity.h"
 #include "../../msg_hash.h"
 
@@ -45,7 +46,7 @@ static const uint32_t opaque_frag[] =
 
 static unsigned num_miplevels(unsigned width, unsigned height)
 {
-   unsigned size   = std::max(width, height);
+   unsigned size   = MAX(width, height);
    unsigned levels = 0;
    while (size)
    {
@@ -280,23 +281,23 @@ class Framebuffer
       void generate_mips(VkCommandBuffer cmd);
 
    private:
-      VkDevice device = VK_NULL_HANDLE;
       const VkPhysicalDeviceMemoryProperties &memory_properties;
-      VkImage image = VK_NULL_HANDLE;
-      VkImageView view = VK_NULL_HANDLE;
+      VkDevice device     = VK_NULL_HANDLE;
+      VkImage image       = VK_NULL_HANDLE;
+      VkImageView view    = VK_NULL_HANDLE;
       VkImageView fb_view = VK_NULL_HANDLE;
       Size2D size;
       VkFormat format;
       unsigned max_levels;
-      unsigned levels = 0;
+      unsigned levels           = 0;
 
       VkFramebuffer framebuffer = VK_NULL_HANDLE;
-      VkRenderPass render_pass = VK_NULL_HANDLE;
+      VkRenderPass render_pass  = VK_NULL_HANDLE;
 
       struct
       {
-         size_t size = 0;
-         uint32_t type = 0;
+         size_t size           = 0;
+         uint32_t type         = 0;
          VkDeviceMemory memory = VK_NULL_HANDLE;
       } memory;
 
@@ -2171,17 +2172,18 @@ Framebuffer::Framebuffer(
 
 void Framebuffer::clear(VkCommandBuffer cmd)
 {
+   VkClearColorValue color;
+   VkImageSubresourceRange range;
+
    image_layout_transition(cmd, image,
          VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
          0, VK_ACCESS_TRANSFER_WRITE_BIT,
          VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT,
          VK_PIPELINE_STAGE_TRANSFER_BIT);
 
-   VkClearColorValue color;
    memset(&color, 0, sizeof(color));
-
-   VkImageSubresourceRange range;
    memset(&range, 0, sizeof(range));
+
    range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
    range.levelCount = 1;
    range.layerCount = 1;
@@ -2198,6 +2200,7 @@ void Framebuffer::clear(VkCommandBuffer cmd)
 
 void Framebuffer::generate_mips(VkCommandBuffer cmd)
 {
+   unsigned i;
    // This is run every frame, so make sure
    // we aren't opting into the "lazy" way of doing this. :)
    VkImageMemoryBarrier barriers[2] = {
@@ -2244,7 +2247,7 @@ void Framebuffer::generate_mips(VkCommandBuffer cmd)
          0, nullptr,
          2, barriers);
 
-   for (unsigned i = 1; i < levels; i++)
+   for (i = 1; i < levels; i++)
    {
       // For subsequent passes, we have to transition from DST_OPTIMAL to SRC_OPTIMAL,
       // but only do so one mip-level at a time.
@@ -2267,23 +2270,23 @@ void Framebuffer::generate_mips(VkCommandBuffer cmd)
       }
 
       VkImageBlit blit_region = {};
-      unsigned src_width = std::max(size.width >> (i - 1), 1u);
-      unsigned src_height = std::max(size.height >> (i - 1), 1u);
-      unsigned target_width = std::max(size.width >> i, 1u);
-      unsigned target_height = std::max(size.height >> i, 1u);
+      unsigned src_width      = MAX(size.width >> (i - 1), 1u);
+      unsigned src_height     = MAX(size.height >> (i - 1), 1u);
+      unsigned target_width   = MAX(size.width >> i, 1u);
+      unsigned target_height  = MAX(size.height >> i, 1u);
 
-      blit_region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-      blit_region.srcSubresource.mipLevel = i - 1;
+      blit_region.srcSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
+      blit_region.srcSubresource.mipLevel       = i - 1;
       blit_region.srcSubresource.baseArrayLayer = 0;
-      blit_region.srcSubresource.layerCount = 1;
-      blit_region.dstSubresource = blit_region.srcSubresource;
-      blit_region.dstSubresource.mipLevel = i;
-      blit_region.srcOffsets[1].x = src_width;
-      blit_region.srcOffsets[1].y = src_height;
-      blit_region.srcOffsets[1].z = 1;
-      blit_region.dstOffsets[1].x = target_width;
-      blit_region.dstOffsets[1].y = target_height;
-      blit_region.dstOffsets[1].z = 1;
+      blit_region.srcSubresource.layerCount     = 1;
+      blit_region.dstSubresource                = blit_region.srcSubresource;
+      blit_region.dstSubresource.mipLevel       = i;
+      blit_region.srcOffsets[1].x               = src_width;
+      blit_region.srcOffsets[1].y               = src_height;
+      blit_region.srcOffsets[1].z               = 1;
+      blit_region.dstOffsets[1].x               = target_width;
+      blit_region.dstOffsets[1].y               = target_height;
+      blit_region.dstOffsets[1].z               = 1;
 
       vkCmdBlitImage(cmd,
             image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
@@ -2325,20 +2328,22 @@ void Framebuffer::generate_mips(VkCommandBuffer cmd)
 void Framebuffer::copy(VkCommandBuffer cmd,
       VkImage src_image, VkImageLayout src_layout)
 {
+   VkImageCopy region;
+
    image_layout_transition(cmd, image,
          VK_IMAGE_LAYOUT_UNDEFINED, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
          0, VK_ACCESS_TRANSFER_WRITE_BIT,
          VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT,
          VK_PIPELINE_STAGE_TRANSFER_BIT);
 
-   VkImageCopy region;
    memset(&region, 0, sizeof(region));
+
    region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
    region.srcSubresource.layerCount = 1;
-   region.dstSubresource = region.srcSubresource;
-   region.extent.width = size.width;
-   region.extent.height = size.height;
-   region.extent.depth = 1;
+   region.dstSubresource            = region.srcSubresource;
+   region.extent.width              = size.width;
+   region.extent.height             = size.height;
+   region.extent.depth              = 1;
 
    vkCmdCopyImage(cmd,
          src_image, src_layout,
@@ -2544,7 +2549,6 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_default(
    if (!chain)
       return nullptr;
 
-   memset(&pass_info, 0, sizeof(pass_info));
    pass_info.scale_type_x  = VULKAN_FILTER_CHAIN_SCALE_VIEWPORT;
    pass_info.scale_type_y  = VULKAN_FILTER_CHAIN_SCALE_VIEWPORT;
    pass_info.scale_x       = 1.0f;
@@ -2553,6 +2557,8 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_default(
    pass_info.source_filter = filter;
    pass_info.mip_filter    = VULKAN_FILTER_CHAIN_NEAREST;
    pass_info.address       = VULKAN_FILTER_CHAIN_ADDRESS_CLAMP_TO_EDGE;
+   pass_info.max_levels    = 0;
+
    chain->set_pass_info(0, pass_info);
 
    chain->set_shader(0, VK_SHADER_STAGE_VERTEX_BIT,
@@ -2646,6 +2652,7 @@ static unique_ptr<StaticTexture> vulkan_filter_chain_load_lut(VkCommandBuffer cm
       vulkan_filter_chain *chain,
       const video_shader_lut *shader)
 {
+   unsigned i;
    texture_image image;
    unique_ptr<Buffer> buffer;
    VkMemoryRequirements mem_reqs;
@@ -2728,29 +2735,29 @@ static unique_ptr<StaticTexture> vulkan_filter_chain_load_lut(VkCommandBuffer cm
          shader->mipmap ? VK_IMAGE_LAYOUT_GENERAL : VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
          1, &region);
 
-   for (unsigned i = 1; i < image_info.mipLevels; i++)
+   for (i = 1; i < image_info.mipLevels; i++)
    {
       VkImageBlit blit_region = {};
-      unsigned src_width = std::max(image.width >> (i - 1), 1u);
-      unsigned src_height = std::max(image.height >> (i - 1), 1u);
-      unsigned target_width = std::max(image.width >> i, 1u);
-      unsigned target_height = std::max(image.height >> i, 1u);
+      unsigned src_width      = MAX(image.width >> (i - 1), 1u);
+      unsigned src_height     = MAX(image.height >> (i - 1), 1u);
+      unsigned target_width   = MAX(image.width >> i, 1u);
+      unsigned target_height  = MAX(image.height >> i, 1u);
 
-      blit_region.srcSubresource.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT;
-      blit_region.srcSubresource.mipLevel = i - 1;
+      blit_region.srcSubresource.aspectMask     = VK_IMAGE_ASPECT_COLOR_BIT;
+      blit_region.srcSubresource.mipLevel       = i - 1;
       blit_region.srcSubresource.baseArrayLayer = 0;
-      blit_region.srcSubresource.layerCount = 1;
-      blit_region.dstSubresource = blit_region.srcSubresource;
-      blit_region.dstSubresource.mipLevel = i;
-      blit_region.srcOffsets[1].x = src_width;
-      blit_region.srcOffsets[1].y = src_height;
-      blit_region.srcOffsets[1].z = 1;
-      blit_region.dstOffsets[1].x = target_width;
-      blit_region.dstOffsets[1].y = target_height;
-      blit_region.dstOffsets[1].z = 1;
+      blit_region.srcSubresource.layerCount     = 1;
+      blit_region.dstSubresource                = blit_region.srcSubresource;
+      blit_region.dstSubresource.mipLevel       = i;
+      blit_region.srcOffsets[1].x               = src_width;
+      blit_region.srcOffsets[1].y               = src_height;
+      blit_region.srcOffsets[1].z               = 1;
+      blit_region.dstOffsets[1].x               = target_width;
+      blit_region.dstOffsets[1].y               = target_height;
+      blit_region.dstOffsets[1].z               = 1;
 
-      // Only injects execution and memory barriers,
-      // not actual transition.
+      /* Only injects execution and memory barriers,
+       * not actual transition. */
       image_layout_transition(cmd, tex,
             VK_IMAGE_LAYOUT_GENERAL,
             VK_IMAGE_LAYOUT_GENERAL,
@@ -2847,6 +2854,7 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset(
       const struct vulkan_filter_chain_create_info *info,
       const char *path, vulkan_filter_chain_filter filter)
 {
+   unsigned i;
    unique_ptr<video_shader> shader{ new video_shader() };
    if (!shader)
       return nullptr;
@@ -2873,15 +2881,24 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset(
 
    shader->num_parameters = 0;
 
-   for (unsigned i = 0; i < shader->passes; i++)
+   for (i = 0; i < shader->passes; i++)
    {
-      const video_shader_pass *pass = &shader->pass[i];
+      glslang_output output;
+      struct vulkan_filter_chain_pass_info pass_info;
+      const video_shader_pass *pass      = &shader->pass[i];
       const video_shader_pass *next_pass =
          i + 1 < shader->passes ? &shader->pass[i + 1] : nullptr;
-      struct vulkan_filter_chain_pass_info pass_info;
-      memset(&pass_info, 0, sizeof(pass_info));
 
-      glslang_output output;
+      pass_info.scale_type_x  = VULKAN_FILTER_CHAIN_SCALE_ORIGINAL;
+      pass_info.scale_type_y  = VULKAN_FILTER_CHAIN_SCALE_ORIGINAL;
+      pass_info.scale_x       = 0.0f;
+      pass_info.scale_y       = 0.0f;
+      pass_info.rt_format     = VK_FORMAT_UNDEFINED; 
+      pass_info.source_filter = VULKAN_FILTER_CHAIN_LINEAR;
+      pass_info.mip_filter    = VULKAN_FILTER_CHAIN_LINEAR;
+      pass_info.address       = VULKAN_FILTER_CHAIN_ADDRESS_REPEAT;
+      pass_info.max_levels    = 0;
+
       if (!glslang_compile_shader(pass->source.path, &output))
       {
          RARCH_ERR("Failed to compile shader: \"%s\".\n",
@@ -2960,15 +2977,14 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset(
             pass->filter == RARCH_FILTER_LINEAR ? VULKAN_FILTER_CHAIN_LINEAR : 
             VULKAN_FILTER_CHAIN_NEAREST;
       }
-      pass_info.address = wrap_to_address(pass->wrap);
+      pass_info.address    = wrap_to_address(pass->wrap);
+      pass_info.max_levels = 1;
 
       // TODO: Expose max_levels in slangp.
       // CGP format is a bit awkward in that it uses mipmap_input,
       // so we much check if next pass needs the mipmapping.
       if (next_pass && next_pass->mipmap)
          pass_info.max_levels = ~0u;
-      else
-         pass_info.max_levels = 1;
 
       pass_info.mip_filter = pass->filter != RARCH_FILTER_NEAREST && pass_info.max_levels > 1
          ? VULKAN_FILTER_CHAIN_LINEAR : VULKAN_FILTER_CHAIN_NEAREST;
@@ -3061,16 +3077,19 @@ vulkan_filter_chain_t *vulkan_filter_chain_create_from_preset(
    if (last_pass_is_fbo)
    {
       struct vulkan_filter_chain_pass_info pass_info;
-      memset(&pass_info, 0, sizeof(pass_info));
-      pass_info.scale_type_x = VULKAN_FILTER_CHAIN_SCALE_VIEWPORT;
-      pass_info.scale_type_y = VULKAN_FILTER_CHAIN_SCALE_VIEWPORT;
-      pass_info.scale_x = 1.0f;
-      pass_info.scale_y = 1.0f;
-      pass_info.rt_format = tmpinfo.swapchain.format;
+
+      pass_info.scale_type_x  = VULKAN_FILTER_CHAIN_SCALE_VIEWPORT;
+      pass_info.scale_type_y  = VULKAN_FILTER_CHAIN_SCALE_VIEWPORT;
+      pass_info.scale_x       = 1.0f;
+      pass_info.scale_y       = 1.0f;
+
+      pass_info.rt_format     = tmpinfo.swapchain.format;
 
       pass_info.source_filter = filter;
-      pass_info.mip_filter = VULKAN_FILTER_CHAIN_NEAREST;
-      pass_info.address = VULKAN_FILTER_CHAIN_ADDRESS_CLAMP_TO_EDGE;
+      pass_info.mip_filter    = VULKAN_FILTER_CHAIN_NEAREST;
+      pass_info.address       = VULKAN_FILTER_CHAIN_ADDRESS_CLAMP_TO_EDGE;
+
+      pass_info.max_levels    = 0;
 
       chain->set_pass_info(shader->passes, pass_info);
 
diff --git a/gfx/drivers_shader/shader_vulkan.h b/gfx/drivers_shader/shader_vulkan.h
index 16ec5c1cb4..26c373023e 100644
--- a/gfx/drivers_shader/shader_vulkan.h
+++ b/gfx/drivers_shader/shader_vulkan.h
@@ -38,10 +38,10 @@ enum vulkan_filter_chain_filter
 
 enum vulkan_filter_chain_address
 {
-   VULKAN_FILTER_CHAIN_ADDRESS_REPEAT = 0,
-   VULKAN_FILTER_CHAIN_ADDRESS_MIRRORED_REPEAT = 1,
-   VULKAN_FILTER_CHAIN_ADDRESS_CLAMP_TO_EDGE = 2,
-   VULKAN_FILTER_CHAIN_ADDRESS_CLAMP_TO_BORDER = 3,
+   VULKAN_FILTER_CHAIN_ADDRESS_REPEAT               = 0,
+   VULKAN_FILTER_CHAIN_ADDRESS_MIRRORED_REPEAT      = 1,
+   VULKAN_FILTER_CHAIN_ADDRESS_CLAMP_TO_EDGE        = 2,
+   VULKAN_FILTER_CHAIN_ADDRESS_CLAMP_TO_BORDER      = 3,
    VULKAN_FILTER_CHAIN_ADDRESS_MIRROR_CLAMP_TO_EDGE = 4,
    VULKAN_FILTER_CHAIN_ADDRESS_COUNT
 };
diff --git a/gfx/drivers_shader/slang_preprocess.h b/gfx/drivers_shader/slang_preprocess.h
index 37fd2ec91b..e889f31947 100644
--- a/gfx/drivers_shader/slang_preprocess.h
+++ b/gfx/drivers_shader/slang_preprocess.h
@@ -18,7 +18,7 @@
 
 #include <boolean.h>
 #include <retro_common_api.h>
-#include "../video_shader_driver.h"
+#include "../video_driver.h"
 
 RETRO_BEGIN_DECLS
 
diff --git a/gfx/video_context_driver.c b/gfx/video_context_driver.c
deleted file mode 100644
index a25bcedeb2..0000000000
--- a/gfx/video_context_driver.c
+++ /dev/null
@@ -1,516 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  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 <string.h>
-
-#include <compat/strl.h>
-#include <string/stdstring.h>
-
-#include "video_context_driver.h"
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-#include "../configuration.h"
-#include "../runloop.h"
-#include "../verbosity.h"
-
-static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
-#if defined(__CELLOS_LV2__)
-   &gfx_ctx_ps3,
-#endif
-#if defined(HAVE_D3D)
-   &gfx_ctx_d3d,
-#endif
-#if defined(HAVE_VIDEOCORE)
-   &gfx_ctx_videocore,
-#endif
-#if defined(HAVE_MALI_FBDEV)
-   &gfx_ctx_mali_fbdev,
-#endif
-#if defined(HAVE_VIVANTE_FBDEV)
-   &gfx_ctx_vivante_fbdev,
-#endif
-#if defined(HAVE_OPENDINGUX_FBDEV)
-   &gfx_ctx_opendingux_fbdev,
-#endif
-#if defined(_WIN32) && (defined(HAVE_OPENGL) || defined(HAVE_VULKAN))
-   &gfx_ctx_wgl,
-#endif
-#if defined(HAVE_WAYLAND)
-   &gfx_ctx_wayland,
-#endif
-#if defined(HAVE_X11) && !defined(HAVE_OPENGLES)
-#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN)
-   &gfx_ctx_x,
-#endif
-#endif
-#if defined(HAVE_X11) && defined(HAVE_OPENGL) && defined(HAVE_EGL)
-   &gfx_ctx_x_egl,
-#endif
-#if defined(HAVE_KMS)
-   &gfx_ctx_drm,
-#endif
-#if defined(ANDROID)
-   &gfx_ctx_android,
-#endif
-#if defined(__QNX__)
-   &gfx_ctx_qnx,
-#endif
-#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
-   &gfx_ctx_cocoagl,
-#endif
-#if defined(__APPLE__) && !defined(TARGET_IPHONE_SIMULATOR) && !defined(TARGET_OS_IPHONE)
-   &gfx_ctx_cgl,
-#endif
-#if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && defined(HAVE_OPENGL)
-   &gfx_ctx_sdl_gl,
-#endif
-#ifdef HAVE_OSMESA
-   &gfx_ctx_osmesa,
-#endif
-#ifdef EMSCRIPTEN
-   &gfx_ctx_emscripten,
-#endif
-#if defined(HAVE_VULKAN) && defined(HAVE_VULKAN_DISPLAY)
-   &gfx_ctx_khr_display,
-#endif
-#if defined(_WIN32) && !defined(_XBOX)
-   &gfx_ctx_gdi,
-#endif
-   &gfx_ctx_null,
-   NULL
-};
-
-const gfx_ctx_driver_t *current_video_context = NULL;
-void *video_context_data                      = NULL;
-
-/**
- * find_video_context_driver_driver_index:
- * @ident                      : Identifier of resampler driver to find.
- *
- * Finds graphics context driver index by @ident name.
- *
- * Returns: graphics context driver index if driver was found, otherwise
- * -1.
- **/
-static int find_video_context_driver_index(const char *ident)
-{
-   unsigned i;
-   for (i = 0; gfx_ctx_drivers[i]; i++)
-      if (string_is_equal_noncase(ident, gfx_ctx_drivers[i]->ident))
-         return i;
-   return -1;
-}
-
-/**
- * find_prev_context_driver:
- *
- * Finds previous driver in graphics context driver array.
- **/
-bool video_context_driver_find_prev_driver(void)
-{
-   settings_t *settings = config_get_ptr();
-   int                i = find_video_context_driver_index(
-         settings->arrays.video_context_driver);
-
-   if (i > 0)
-   {
-      strlcpy(settings->arrays.video_context_driver,
-            gfx_ctx_drivers[i - 1]->ident,
-            sizeof(settings->arrays.video_context_driver));
-      return true;
-   }
-
-   RARCH_WARN("Couldn't find any previous video context driver.\n");
-   return false;
-}
-
-/**
- * find_next_context_driver:
- *
- * Finds next driver in graphics context driver array.
- **/
-bool video_context_driver_find_next_driver(void)
-{
-   settings_t *settings = config_get_ptr();
-   int i = find_video_context_driver_index(settings->arrays.video_context_driver);
-
-   if (i >= 0 && gfx_ctx_drivers[i + 1])
-   {
-      strlcpy(settings->arrays.video_context_driver,
-            gfx_ctx_drivers[i + 1]->ident,
-            sizeof(settings->arrays.video_context_driver));
-      return true;
-   }
-
-   RARCH_WARN("Couldn't find any next video context driver.\n");
-   return false;
-}
-
-/**
- * video_context_driver_init:
- * @data                    : Input data.
- * @ctx                     : Graphics context driver to initialize.
- * @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?
- *
- * Initialize graphics context driver.
- *
- * Returns: graphics context driver if successfully initialized, otherwise NULL.
- **/
-static const gfx_ctx_driver_t *video_context_driver_init(
-      void *data,
-      const gfx_ctx_driver_t *ctx,
-      const char *ident,
-      enum gfx_ctx_api api, unsigned major,
-      unsigned minor, bool hw_render_ctx)
-{
-   if (ctx->bind_api(data, api, major, minor))
-   {
-      video_frame_info_t video_info;
-      void       *ctx_data = NULL;
-
-      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_driver_set_data(ctx_data);
-      return ctx;
-   }
-
-#ifndef _WIN32
-   RARCH_WARN("Failed to bind API (#%u, version %u.%u) on context driver \"%s\".\n",
-         (unsigned)api, major, minor, ctx->ident);
-#endif
-
-   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 (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;
-}
-
-/**
- * video_context_driver_init_first:
- * @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 first suitable graphics context driver and initializes.
- *
- * 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)
-{
-   return video_context_driver_find_driver(data, ident, api,
-         major, minor, hw_render_ctx);
-}
-
-bool video_context_driver_check_window(gfx_ctx_size_t *size_data)
-{
-   if (     video_context_data
-         && current_video_context
-         && current_video_context->check_window)
-   {
-      bool is_shutdown = runloop_ctl(RUNLOOP_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;
-   }
-
-   return false;
-}
-
-bool video_context_driver_init_image_buffer(const video_info_t *data)
-{
-   if (     current_video_context
-         && current_video_context->image_buffer_init
-         && current_video_context->image_buffer_init(video_context_data, data))
-      return true;
-   return false;
-}
-
-bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img)
-{
-   if (     current_video_context
-         && current_video_context->image_buffer_write
-         && current_video_context->image_buffer_write(video_context_data,
-            img->frame, img->width, img->height, img->pitch,
-            img->rgb32, img->index, img->handle))
-      return true;
-   return false;
-}
-
-bool video_context_driver_get_video_output_prev(void)
-{
-   if (!current_video_context
-         || !current_video_context->get_video_output_prev)
-      return false;
-   current_video_context->get_video_output_prev(video_context_data);
-   return true;
-}
-
-bool video_context_driver_get_video_output_next(void)
-{
-   if (!current_video_context ||
-         !current_video_context->get_video_output_next)
-      return false;
-   current_video_context->get_video_output_next(video_context_data);
-   return true;
-}
-
-bool video_context_driver_bind_hw_render(bool *enable)
-{
-   if (!current_video_context || !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 && current_video_context->make_current)
-      current_video_context->make_current(release);
-}
-
-bool video_context_driver_set(const gfx_ctx_driver_t *data)
-{
-   if (!data)
-      return false;
-   current_video_context = data;
-   return true;
-}
-
-void video_context_driver_destroy(void)
-{
-   current_video_context = NULL;
-}
-
-bool video_context_driver_translate_aspect(gfx_ctx_aspect_t *aspect)
-{
-   if (!video_context_data || !aspect)
-      return false;
-   if (!current_video_context->translate_aspect)
-      return false;
-   *aspect->aspect = current_video_context->translate_aspect(
-         video_context_data, aspect->width, aspect->height);
-   return true;
-}
-
-void video_context_driver_free(void)
-{
-   if (current_video_context->destroy)
-      current_video_context->destroy(video_context_data);
-   current_video_context = NULL;
-   video_context_data    = NULL;
-}
-
-bool video_context_driver_get_video_output_size(gfx_ctx_size_t *size_data)
-{
-   if (!size_data)
-      return false;
-   if (!current_video_context || !current_video_context->get_video_output_size)
-      return false;
-   current_video_context->get_video_output_size(video_context_data,
-         size_data->width, size_data->height);
-   return true;
-}
-
-bool video_context_driver_swap_interval(unsigned *interval)
-{
-   if (!current_video_context || !current_video_context->swap_interval)
-      return false;
-   current_video_context->swap_interval(video_context_data, *interval);
-   return true;
-}
-
-bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc)
-{
-   if (!current_video_context || !current_video_context->get_proc_address)
-      return false;
-
-   proc->addr = current_video_context->get_proc_address(proc->sym);
-
-   return true;
-}
-
-bool video_context_driver_get_metrics(gfx_ctx_metrics_t *metrics)
-{
-   if (     current_video_context
-         && current_video_context->get_metrics
-         && current_video_context->get_metrics(video_context_data,
-            metrics->type,
-            metrics->value))
-      return true;
-   return false;
-}
-
-bool video_context_driver_input_driver(gfx_ctx_input_t *inp)
-{
-   settings_t *settings    = config_get_ptr();
-   const char *joypad_name = settings ? settings->arrays.input_joypad_driver : NULL;
-
-   if (!current_video_context || !current_video_context->input_driver)
-      return false;
-   current_video_context->input_driver(
-         video_context_data, joypad_name,
-         inp->input, inp->input_data);
-   return true;
-}
-
-bool video_context_driver_suppress_screensaver(bool *bool_data)
-{
-   if (     video_context_data
-         && current_video_context
-         && current_video_context->suppress_screensaver(
-            video_context_data, *bool_data))
-      return true;
-   return false;
-}
-
-bool video_context_driver_get_ident(gfx_ctx_ident_t *ident)
-{
-   if (!ident)
-      return false;
-   ident->ident = NULL;
-   if (current_video_context)
-      ident->ident = current_video_context->ident;
-   return true;
-}
-
-bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info)
-{
-   video_frame_info_t video_info;
-
-   if (!current_video_context || !current_video_context->set_video_mode)
-      return false;
-
-   video_driver_build_info(&video_info);
-
-   if (!current_video_context->set_video_mode(
-            video_context_data, &video_info, mode_info->width,
-            mode_info->height, mode_info->fullscreen))
-      return false;
-   return true;
-}
-
-bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info)
-{
-   if (!current_video_context || !current_video_context->get_video_size)
-      return false;
-   current_video_context->get_video_size(video_context_data,
-         &mode_info->width, &mode_info->height);
-   return true;
-}
-
-bool video_context_driver_get_context_data(void *data)
-{
-   if (!current_video_context || !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 || !current_video_context->show_mouse)
-      return false;
-   current_video_context->show_mouse(video_context_data, *bool_data);
-   return true;
-}
-
-void video_context_driver_set_data(void *data)
-{
-   video_context_data = data;
-}
-
-bool video_context_driver_get_flags(gfx_ctx_flags_t *flags)
-{
-   if (!flags)
-      return false;
-   if (!current_video_context || !current_video_context->get_flags)
-      return false;
-   flags->flags = current_video_context->get_flags(video_context_data);
-   return true;
-}
-
-bool video_context_driver_set_flags(gfx_ctx_flags_t *flags)
-{
-   if (!flags)
-      return false;
-   if (!current_video_context || !current_video_context->set_flags)
-      return false;
-   current_video_context->set_flags(video_context_data, flags->flags);
-   return true;
-}
diff --git a/gfx/video_context_driver.h b/gfx/video_context_driver.h
deleted file mode 100644
index 6bc9b30d4d..0000000000
--- a/gfx/video_context_driver.h
+++ /dev/null
@@ -1,349 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  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/>.
- */
-
-#ifndef __VIDEO_CONTEXT_DRIVER_H
-#define __VIDEO_CONTEXT_DRIVER_H
-
-#include <boolean.h>
-#include <retro_common_api.h>
-
-#include "video_driver.h"
-
-RETRO_BEGIN_DECLS
-
-#ifndef MAX_EGLIMAGE_TEXTURES
-#define MAX_EGLIMAGE_TEXTURES 32
-#endif
-
-enum gfx_ctx_api
-{
-   GFX_CTX_NONE = 0,
-   GFX_CTX_OPENGL_API,
-   GFX_CTX_OPENGL_ES_API,
-   GFX_CTX_DIRECT3D8_API,
-   GFX_CTX_DIRECT3D9_API,
-   GFX_CTX_OPENVG_API,
-   GFX_CTX_VULKAN_API,
-   GFX_CTX_GDI_API
-};
-
-enum display_metric_types
-{
-   DISPLAY_METRIC_NONE = 0,
-   DISPLAY_METRIC_MM_WIDTH,
-   DISPLAY_METRIC_MM_HEIGHT,
-   DISPLAY_METRIC_DPI
-};
-
-enum display_flags
-{
-   GFX_CTX_FLAGS_NONE = 0,
-   GFX_CTX_FLAGS_GL_CORE_CONTEXT,
-   GFX_CTX_FLAGS_MULTISAMPLING,
-   GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES
-};
-
-
-typedef void (*gfx_ctx_proc_t)(void);
-
-typedef struct gfx_ctx_driver
-{
-   /* The opaque pointer is the underlying video driver data (e.g. gl_t for
-    * OpenGL contexts). Although not advised, the context driver is allowed
-    * to hold a pointer to it as the context never outlives the video driver.
-    *
-    * The context driver is responsible for it's own data.*/
-   void* (*init)(video_frame_info_t *video_info, void *video_driver);
-   void (*destroy)(void *data);
-
-   /* Which API to bind to. */
-   bool (*bind_api)(void *video_driver, enum gfx_ctx_api,
-         unsigned major, unsigned minor);
-
-   /* Sets the swap interval. */
-   void (*swap_interval)(void *data, unsigned);
-
-   /* Sets video mode. Creates a window, etc. */
-   bool (*set_video_mode)(void*, video_frame_info_t *video_info, unsigned, unsigned, bool);
-
-   /* Gets current window size.
-    * If not initialized yet, it returns current screen size. */
-   void (*get_video_size)(void*, unsigned*, unsigned*);
-
-   void (*get_video_output_size)(void*, unsigned*, unsigned*);
-
-   void (*get_video_output_prev)(void*);
-
-   void (*get_video_output_next)(void*);
-
-   bool (*get_metrics)(void *data, enum display_metric_types type,
-         float *value);
-
-   /* Translates a window size to an aspect ratio.
-    * In most cases this will be just width / height, but
-    * some contexts will better know which actual aspect ratio is used.
-    * This can be NULL to assume the default behavior.
-    */
-   float (*translate_aspect)(void*, unsigned, unsigned);
-
-   /* Asks driver to update window title (FPS, etc). */
-   void (*update_window_title)(void*, video_frame_info_t *video_info);
-
-   /* Queries for resize and quit events.
-    * Also processes events. */
-   void (*check_window)(void*, bool*, bool*,
-         unsigned*, unsigned*, bool);
-
-   /* Acknowledge a resize event. This is needed for some APIs.
-    * Most backends will ignore this. */
-   bool (*set_resize)(void*, unsigned, unsigned);
-
-   /* Checks if window has input focus. */
-   bool (*has_focus)(void*);
-
-   /* Should the screensaver be suppressed? */
-   bool (*suppress_screensaver)(void *data, bool enable);
-
-   /* Checks if context driver has windowed support. */
-   bool (*has_windowed)(void*);
-
-   /* Swaps buffers. VBlank sync depends on
-    * earlier calls to swap_interval. */
-   void (*swap_buffers)(void*, video_frame_info_t *video_info);
-
-   /* Most video backends will want to use a certain input driver.
-    * Checks for it here. */
-   void (*input_driver)(void*, const char *, const input_driver_t**, void**);
-
-   /* Wraps whatever gl_proc_address() there is.
-    * Does not take opaque, to avoid lots of ugly wrapper code. */
-   gfx_ctx_proc_t (*get_proc_address)(const char*);
-
-   /* Returns true if this context supports EGLImage buffers for
-    * screen drawing and was initalized correctly. */
-   bool (*image_buffer_init)(void*, const video_info_t*);
-
-   /* Writes the frame to the EGLImage and sets image_handle to it.
-    * Returns true if a new image handle is created.
-    * Always returns true the first time it's called for a new index.
-    * The graphics core must handle a change in the handle correctly. */
-   bool (*image_buffer_write)(void*, const void *frame, unsigned width,
-         unsigned height, unsigned pitch, bool rgb32,
-         unsigned index, void **image_handle);
-
-   /* Shows or hides mouse. Can be NULL if context doesn't
-    * have a concept of mouse pointer. */
-   void (*show_mouse)(void *data, bool state);
-
-   /* Human readable string. */
-   const char *ident;
-
-   uint32_t (*get_flags)(void *data);
-
-   void     (*set_flags)(void *data, uint32_t flags);
-
-   /* Optional. Binds HW-render offscreen context. */
-   void (*bind_hw_render)(void *data, bool enable);
-
-   /* Optional. Gets base data for the context which is used by the driver.
-    * This is mostly relevant for graphics APIs such as Vulkan
-    * which do not have global context state. */
-   void *(*get_context_data)(void *data);
-
-   /* Optional. Makes driver context (only GLX right now)
-    * active for this thread. */
-   void (*make_current)(bool release);
-} gfx_ctx_driver_t;
-
-
-typedef struct gfx_ctx_flags
-{
-   uint32_t flags;
-} gfx_ctx_flags_t;
-
-typedef struct gfx_ctx_size
-{
-   bool *quit;
-   bool *resize;
-   unsigned *width;
-   unsigned *height;
-} gfx_ctx_size_t;
-
-typedef struct gfx_ctx_mode
-{
-   unsigned width;
-   unsigned height;
-   bool fullscreen;
-} gfx_ctx_mode_t;
-
-typedef struct gfx_ctx_metrics
-{
-   enum display_metric_types type;
-   float *value;
-} gfx_ctx_metrics_t;
-
-typedef struct gfx_ctx_aspect
-{
-   float *aspect;
-   unsigned width;
-   unsigned height;
-} gfx_ctx_aspect_t;
-
-typedef struct gfx_ctx_image
-{
-   const void *frame;
-   unsigned width;
-   unsigned height;
-   unsigned pitch;
-   unsigned index;
-   bool rgb32;
-   void **handle;
-} gfx_ctx_image_t;
-
-typedef struct gfx_ctx_input
-{
-   const input_driver_t **input;
-   void **input_data;
-} gfx_ctx_input_t;
-
-typedef struct gfx_ctx_proc_address
-{
-   const char *sym;
-   retro_proc_address_t addr;
-} gfx_ctx_proc_address_t;
-
-typedef struct gfx_ctx_ident
-{
-   const char *ident;
-} gfx_ctx_ident_t;
-
-extern const gfx_ctx_driver_t gfx_ctx_osmesa;
-extern const gfx_ctx_driver_t gfx_ctx_sdl_gl;
-extern const gfx_ctx_driver_t gfx_ctx_x_egl;
-extern const gfx_ctx_driver_t gfx_ctx_wayland;
-extern const gfx_ctx_driver_t gfx_ctx_x;
-extern const gfx_ctx_driver_t gfx_ctx_d3d;
-extern const gfx_ctx_driver_t gfx_ctx_drm;
-extern const gfx_ctx_driver_t gfx_ctx_mali_fbdev;
-extern const gfx_ctx_driver_t gfx_ctx_vivante_fbdev;
-extern const gfx_ctx_driver_t gfx_ctx_android;
-extern const gfx_ctx_driver_t gfx_ctx_ps3;
-extern const gfx_ctx_driver_t gfx_ctx_wgl;
-extern const gfx_ctx_driver_t gfx_ctx_videocore;
-extern const gfx_ctx_driver_t gfx_ctx_qnx;
-extern const gfx_ctx_driver_t gfx_ctx_cgl;
-extern const gfx_ctx_driver_t gfx_ctx_cocoagl;
-extern const gfx_ctx_driver_t gfx_ctx_emscripten;
-extern const gfx_ctx_driver_t gfx_ctx_opendingux_fbdev;
-extern const gfx_ctx_driver_t gfx_ctx_khr_display;
-extern const gfx_ctx_driver_t gfx_ctx_gdi;
-extern const gfx_ctx_driver_t gfx_ctx_null;
-
-/**
- * video_context_driver_init_first:
- * @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 first suitable graphics context driver and initializes.
- *
- * 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);
-
-bool video_context_driver_find_prev_driver(void);
-
-bool video_context_driver_find_next_driver(void);
-
-bool video_context_driver_init_image_buffer(const video_info_t *data);
-
-bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img);
-
-bool video_context_driver_get_video_output_prev(void);
-
-bool video_context_driver_get_video_output_next(void);
-
-bool video_context_driver_bind_hw_render(bool *enable);
-
-void video_context_driver_make_current(bool restore);
-
-bool video_context_driver_set(const gfx_ctx_driver_t *data);
-
-void video_context_driver_destroy(void);
-
-#define video_context_driver_update_window_title(video_info) \
-   if (current_video_context && current_video_context->update_window_title) \
-      current_video_context->update_window_title(video_context_data, video_info)
-
-#define video_context_driver_swap_buffers(video_info) \
-   if (current_video_context && current_video_context->swap_buffers) \
-      current_video_context->swap_buffers(video_context_data, video_info)
-
-#define video_context_driver_focus() ((video_context_data && current_video_context->has_focus && current_video_context->has_focus(video_context_data)) ? true : false)
-
-#define video_context_driver_set_resize(mode_info) \
-   if (current_video_context && current_video_context->set_resize) \
-      current_video_context->set_resize(video_context_data, mode_info.width, mode_info.height)
-
-bool video_context_driver_get_video_output_size(gfx_ctx_size_t *size_data);
-
-bool video_context_driver_swap_interval(unsigned *interval);
-
-bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc);
-
-bool video_context_driver_suppress_screensaver(bool *bool_data);
-
-bool video_context_driver_get_ident(gfx_ctx_ident_t *ident);
-
-bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info);
-
-bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info);
-
-bool video_context_driver_get_context_data(void *data);
-
-bool video_context_driver_show_mouse(bool *bool_data);
-
-void video_context_driver_set_data(void *data);
-
-bool video_context_driver_get_flags(gfx_ctx_flags_t *flags);
-
-bool video_context_driver_set_flags(gfx_ctx_flags_t *flags);
-
-bool video_context_driver_get_metrics(gfx_ctx_metrics_t *metrics);
-
-bool video_context_driver_translate_aspect(gfx_ctx_aspect_t *aspect);
-
-bool video_context_driver_input_driver(gfx_ctx_input_t *inp);
-
-#define video_context_driver_has_windowed() ((video_context_data && current_video_context->has_windowed && current_video_context->has_windowed(video_context_data)) ? true : false)
-
-void video_context_driver_free(void);
-
-extern const gfx_ctx_driver_t *current_video_context;
-
-extern void *video_context_data;
-
-RETRO_END_DECLS
-
-#endif
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 2529a627c5..101e85c538 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -43,8 +43,12 @@
 #include "../menu/menu_setting.h"
 #endif
 
+#ifdef HAVE_OPENGL
+#include "common/gl_common.h"
+#endif
+
 #include "video_thread_wrapper.h"
-#include "video_context_driver.h"
+#include "video_driver.h"
 
 #include "../frontend/frontend_driver.h"
 #include "../record/record_driver.h"
@@ -52,7 +56,7 @@
 #include "../configuration.h"
 #include "../driver.h"
 #include "../retroarch.h"
-#include "../runloop.h"
+#include "../input/input_driver.h"
 #include "../list_special.h"
 #include "../core.h"
 #include "../command.h"
@@ -117,6 +121,9 @@ typedef struct video_pixel_scaler
    void *scaler_out;
 } video_pixel_scaler_t;
 
+static void (*video_driver_cb_shader_use)(void *data, void *shader_data, unsigned index, bool set_active);
+static bool (*video_driver_cb_shader_set_mvp)(void *data, void *shader_data, const math_matrix_4x4 *mat);
+
 /* Opaque handles to currently running window.
  * Used by e.g. input drivers which bind to a window.
  * Drivers are responsible for setting these if an input driver
@@ -130,9 +137,11 @@ static unsigned            video_driver_state_scale      = 0;
 static unsigned            video_driver_state_out_bpp    = 0;
 static bool                video_driver_state_out_rgb32  = false;
 
+static struct retro_system_av_info video_driver_av_info;
+
 static enum retro_pixel_format video_driver_pix_fmt      = RETRO_PIXEL_FORMAT_0RGB1555;
 
-const void *frame_cache_data                             = NULL;
+static const void *frame_cache_data                      = NULL;
 static unsigned frame_cache_width                        = 0;
 static unsigned frame_cache_height                       = 0;
 static size_t frame_cache_pitch                          = 0;
@@ -195,6 +204,13 @@ static slock_t *display_lock                             = NULL;
 static slock_t *context_lock                             = NULL;
 #endif
 
+gfx_ctx_driver_t current_video_context;
+
+void *video_context_data                                 = NULL;
+
+shader_backend_t *current_shader                         = NULL;
+void *shader_data                                        = NULL;
+
 struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END] = {
    { "4:3",           1.3333f },
    { "16:9",          1.7778f },
@@ -292,6 +308,108 @@ static const video_driver_t *video_drivers[] = {
    NULL,
 };
 
+static const gfx_ctx_driver_t *gfx_ctx_drivers[] = {
+#if defined(__CELLOS_LV2__)
+   &gfx_ctx_ps3,
+#endif
+#if defined(HAVE_D3D)
+   &gfx_ctx_d3d,
+#endif
+#if defined(HAVE_VIDEOCORE)
+   &gfx_ctx_videocore,
+#endif
+#if defined(HAVE_MALI_FBDEV)
+   &gfx_ctx_mali_fbdev,
+#endif
+#if defined(HAVE_VIVANTE_FBDEV)
+   &gfx_ctx_vivante_fbdev,
+#endif
+#if defined(HAVE_OPENDINGUX_FBDEV)
+   &gfx_ctx_opendingux_fbdev,
+#endif
+#if defined(_WIN32) && (defined(HAVE_OPENGL) || defined(HAVE_VULKAN))
+   &gfx_ctx_wgl,
+#endif
+#if defined(HAVE_WAYLAND)
+   &gfx_ctx_wayland,
+#endif
+#if defined(HAVE_X11) && !defined(HAVE_OPENGLES)
+#if defined(HAVE_OPENGL) || defined(HAVE_VULKAN)
+   &gfx_ctx_x,
+#endif
+#endif
+#if defined(HAVE_X11) && defined(HAVE_OPENGL) && defined(HAVE_EGL)
+   &gfx_ctx_x_egl,
+#endif
+#if defined(HAVE_KMS)
+   &gfx_ctx_drm,
+#endif
+#if defined(ANDROID)
+   &gfx_ctx_android,
+#endif
+#if defined(__QNX__)
+   &gfx_ctx_qnx,
+#endif
+#if defined(HAVE_COCOA) || defined(HAVE_COCOATOUCH)
+   &gfx_ctx_cocoagl,
+#endif
+#if defined(__APPLE__) && !defined(TARGET_IPHONE_SIMULATOR) && !defined(TARGET_OS_IPHONE)
+   &gfx_ctx_cgl,
+#endif
+#if (defined(HAVE_SDL) || defined(HAVE_SDL2)) && defined(HAVE_OPENGL)
+   &gfx_ctx_sdl_gl,
+#endif
+#ifdef HAVE_OSMESA
+   &gfx_ctx_osmesa,
+#endif
+#ifdef EMSCRIPTEN
+   &gfx_ctx_emscripten,
+#endif
+#if defined(HAVE_VULKAN) && defined(HAVE_VULKAN_DISPLAY)
+   &gfx_ctx_khr_display,
+#endif
+#if defined(_WIN32) && !defined(_XBOX)
+   &gfx_ctx_gdi,
+#endif
+   &gfx_ctx_null,
+   NULL
+};
+
+static const shader_backend_t *shader_ctx_drivers[] = {
+#ifdef HAVE_GLSL
+   &gl_glsl_backend,
+#endif
+#ifdef HAVE_CG
+   &gl_cg_backend,
+#endif
+#ifdef HAVE_HLSL
+   &hlsl_backend,
+#endif
+   &shader_null_backend,
+   NULL
+};
+
+/* Stub functions */
+
+static void update_window_title_null(void *data, void *data2)
+{
+}
+
+static void swap_buffers_null(void *data, void *data2)
+{
+}
+
+static bool get_metrics_null(void *data, enum display_metric_types type,
+      float *value)
+{
+   return false;
+}
+
+static bool set_resize_null(void *a, unsigned b, unsigned c)
+{
+   return false;
+}
+
 /**
  * video_driver_find_handle:
  * @idx                : index of driver to get handle to.
@@ -394,6 +512,62 @@ const video_poke_interface_t *video_driver_get_poke(void)
    return video_driver_poke;
 }
 
+static void video_context_driver_reset(void)
+{
+   if (!current_video_context.get_metrics)
+      current_video_context.get_metrics         = get_metrics_null;
+
+   if (!current_video_context.update_window_title)
+      current_video_context.update_window_title = update_window_title_null;
+
+   if (!current_video_context.set_resize)
+      current_video_context.set_resize          = set_resize_null;
+
+   if (!current_video_context.swap_buffers)
+      current_video_context.swap_buffers        = swap_buffers_null;
+}
+
+bool video_context_driver_set(const gfx_ctx_driver_t *data)
+{
+   if (!data)
+      return false;
+   current_video_context                     = *data;
+   video_context_driver_reset();
+   return true;
+}
+
+void video_context_driver_destroy(void)
+{
+   current_video_context.init                       = NULL;
+   current_video_context.bind_api                   = NULL;
+   current_video_context.swap_interval              = NULL;
+   current_video_context.set_video_mode             = NULL;
+   current_video_context.get_video_size             = NULL;
+   current_video_context.get_video_output_size      = NULL;
+   current_video_context.get_video_output_prev      = NULL;
+   current_video_context.get_video_output_next      = NULL;
+   current_video_context.get_metrics                = get_metrics_null;
+   current_video_context.translate_aspect           = NULL;
+   current_video_context.update_window_title        = update_window_title_null;
+   current_video_context.check_window               = NULL;
+   current_video_context.set_resize                 = set_resize_null;
+   current_video_context.has_focus                  = NULL;
+   current_video_context.suppress_screensaver       = NULL;
+   current_video_context.has_windowed               = NULL;
+   current_video_context.swap_buffers               = swap_buffers_null;
+   current_video_context.input_driver               = NULL;
+   current_video_context.get_proc_address           = NULL;
+   current_video_context.image_buffer_init          = NULL;
+   current_video_context.image_buffer_write         = NULL;
+   current_video_context.show_mouse                 = NULL;
+   current_video_context.ident                      = NULL;
+   current_video_context.get_flags                  = NULL;
+   current_video_context.set_flags                  = NULL;
+   current_video_context.bind_hw_render             = NULL;
+   current_video_context.get_context_data           = NULL;
+   current_video_context.make_current               = NULL;
+}
+
 /**
  * video_driver_get_current_framebuffer:
  *
@@ -451,8 +625,7 @@ static void video_driver_init_filter(enum retro_pixel_format colfmt)
    void *buf                            = NULL;
    struct retro_game_geometry *geom     = NULL;
    settings_t *settings                 = config_get_ptr();
-   struct retro_system_av_info *av_info =
-      video_viewport_get_system_av_info();
+   struct retro_system_av_info *av_info = &video_driver_av_info;
 
    /* Deprecated format. Gets pre-converted. */
    if (colfmt == RETRO_PIXEL_FORMAT_0RGB1555)
@@ -501,15 +674,13 @@ static void video_driver_init_filter(enum retro_pixel_format colfmt)
          width * height * video_driver_state_out_bpp);
 #endif
    if (!buf)
-      goto error;
+   {
+      RARCH_ERR("[Video]: Softfilter initialization failed.\n");
+      video_driver_filter_free();
+      return;
+   }
 
    video_driver_state_buffer    = buf;
-
-   return;
-
-error:
-   RARCH_ERR("[Video]: Softfilter initialization failed.\n");
-   video_driver_filter_free();
 }
 
 static void video_driver_init_input(const input_driver_t *tmp)
@@ -684,16 +855,15 @@ error:
 
 static bool video_driver_init_internal(bool *video_is_threaded)
 {
+   video_info_t video;
    unsigned max_dim, scale, width, height;
    const input_driver_t *tmp              = NULL;
    const struct retro_game_geometry *geom = NULL;
    rarch_system_info_t *system            = NULL;
-   video_info_t video                     = {0};
    static uint16_t dummy_pixels[32]       = {0};
    video_viewport_t *custom_vp            = &video_viewport_custom;
    settings_t *settings                   = config_get_ptr();
-   struct retro_system_av_info *av_info   =
-      video_viewport_get_system_av_info();
+   struct retro_system_av_info *av_info   = &video_driver_av_info;
 
    video_driver_filter_free();
 
@@ -787,8 +957,10 @@ static bool video_driver_init_internal(bool *video_is_threaded)
    video.width         = width;
    video.height        = height;
    video.fullscreen    = settings->bools.video_fullscreen;
-   video.vsync         = settings->bools.video_vsync && !runloop_ctl(RUNLOOP_CTL_IS_NONBLOCK_FORCED, NULL);
+   video.vsync         = settings->bools.video_vsync && !rarch_ctl(RARCH_CTL_IS_NONBLOCK_FORCED, NULL);
    video.force_aspect  = settings->bools.video_force_aspect;
+   video.font_enable   = settings->bools.video_font_enable;
+   video.swap_interval = settings->uints.video_swap_interval;
 #ifdef GEKKO
    video.viwidth       = settings->uints.video_viwidth;
    video.vfilter       = settings->bools.video_vfilter;
@@ -798,8 +970,6 @@ static bool video_driver_init_internal(bool *video_is_threaded)
    video.rgb32         = video_driver_state_filter ?
       video_driver_state_out_rgb32 :
       (video_driver_pix_fmt == RETRO_PIXEL_FORMAT_XRGB8888);
-   video.swap_interval = settings->uints.video_swap_interval;
-   video.font_enable   = settings->bools.video_font_enable;
 
    /* Reset video frame count */
    video_driver_frame_count = 0;
@@ -841,8 +1011,9 @@ static bool video_driver_init_internal(bool *video_is_threaded)
    if (current_video->poke_interface)
       current_video->poke_interface(video_driver_data, &video_driver_poke);
 
-   if (current_video->viewport_info && (!custom_vp->width ||
-            !custom_vp->height))
+   if (current_video->viewport_info && 
+         (!custom_vp->width  ||
+          !custom_vp->height))
    {
       /* Force custom viewport to have sane parameters. */
       custom_vp->width = width;
@@ -870,6 +1041,8 @@ static bool video_driver_init_internal(bool *video_is_threaded)
    video_driver_set_texture_frame(&dummy_pixels, false, 1, 1, 1.0f);
 #endif
 
+   video_context_driver_reset();
+
    return true;
 
 error:
@@ -1188,16 +1361,13 @@ bool video_driver_cached_frame(void)
 void video_driver_monitor_adjust_system_rates(void)
 {
    float timing_skew;
-   const struct retro_system_timing *info = NULL;
-   struct retro_system_av_info *av_info   =
-      video_viewport_get_system_av_info();
+   struct retro_system_av_info *av_info   = &video_driver_av_info;
    settings_t *settings                   = config_get_ptr();
    float video_refresh_rate               = settings->floats.video_refresh_rate;
+   const struct retro_system_timing *info = (const struct retro_system_timing*)&av_info->timing;
 
-   runloop_ctl(RUNLOOP_CTL_UNSET_NONBLOCK_FORCED, NULL);
+   rarch_ctl(RARCH_CTL_UNSET_NONBLOCK_FORCED, NULL);
 
-   if  (av_info)
-      info = (const struct retro_system_timing*)&av_info->timing;
 
    if (!info || info->fps <= 0.0)
       return;
@@ -1217,7 +1387,7 @@ void video_driver_monitor_adjust_system_rates(void)
       return;
 
    /* We won't be able to do VSync reliably when game FPS > monitor FPS. */
-   runloop_ctl(RUNLOOP_CTL_SET_NONBLOCK_FORCED, NULL);
+   rarch_ctl(RARCH_CTL_SET_NONBLOCK_FORCED, NULL);
    RARCH_LOG("[Video]: Game FPS > Monitor FPS. Cannot rely on VSync.\n");
 }
 
@@ -1392,8 +1562,8 @@ bool video_driver_supports_read_frame_raw(void)
 
 void video_driver_set_viewport_config(void)
 {
-   settings_t *settings = config_get_ptr();
-   struct retro_system_av_info *av_info = video_viewport_get_system_av_info();
+   settings_t *settings                   = config_get_ptr();
+   struct retro_system_av_info *av_info   = &video_driver_av_info;
 
    if (settings->floats.video_aspect_ratio < 0.0f)
    {
@@ -1429,12 +1599,8 @@ void video_driver_set_viewport_square_pixel(void)
 {
    unsigned len, highest, i, aspect_x, aspect_y;
    unsigned width, height;
-   struct retro_game_geometry *geom     = NULL;
-   struct retro_system_av_info *av_info = 
-      video_viewport_get_system_av_info();
-
-   if (av_info)
-      geom = &av_info->geometry;
+   struct retro_system_av_info *av_info = &video_driver_av_info;
+   struct retro_game_geometry *geom     = &av_info->geometry;
 
    if (!geom)
       return;
@@ -1466,9 +1632,8 @@ void video_driver_set_viewport_square_pixel(void)
 
 void video_driver_set_viewport_core(void)
 {
-   struct retro_system_av_info *av_info = 
-      video_viewport_get_system_av_info();
-   struct retro_game_geometry *geom = &av_info->geometry;
+   struct retro_system_av_info *av_info = &video_driver_av_info;
+   struct retro_game_geometry *geom     = &av_info->geometry;
 
    if (!geom || geom->base_width <= 0.0f || geom->base_height <= 0.0f)
       return;
@@ -1963,12 +2128,8 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
       unsigned base_width;
       /* Use system reported sizes as these define the 
        * geometry for the "normal" case. */
-      struct retro_system_av_info *av_info = 
-         video_viewport_get_system_av_info();
-      unsigned base_height = 0;
-      
-      if (av_info)
-         base_height = av_info->geometry.base_height;
+      struct retro_system_av_info *av_info = &video_driver_av_info;
+      unsigned base_height                 = av_info->geometry.base_height;
 
       if (base_height == 0)
          base_height = 1;
@@ -2012,9 +2173,7 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
 
 struct retro_system_av_info *video_viewport_get_system_av_info(void)
 {
-   static struct retro_system_av_info av_info;
-
-   return &av_info;
+   return &video_driver_av_info;
 }
 
 struct video_viewport *video_viewport_get_custom(void)
@@ -2187,11 +2346,10 @@ void video_driver_frame(const void *data, unsigned width,
          && msg)
       strlcpy(video_driver_msg, msg, sizeof(video_driver_msg));
 
-   if (!current_video || !current_video->frame(
-            video_driver_data, data, width, height,
-            video_driver_frame_count,
-            (unsigned)pitch, video_driver_msg, &video_info))
-      video_driver_active = false;
+   video_driver_active = current_video->frame(
+         video_driver_data, data, width, height,
+         video_driver_frame_count,
+         (unsigned)pitch, video_driver_msg, &video_info);
 
    video_driver_frame_count++;
 
@@ -2253,6 +2411,14 @@ bool video_driver_texture_unload(uintptr_t *id)
    return true;
 }
 
+static void video_shader_driver_use_null(void *data,
+      void *shader_data, unsigned idx, bool set_active)
+{
+   (void)data;
+   (void)idx;
+   (void)set_active;
+}
+
 void video_driver_build_info(video_frame_info_t *video_info)
 {
    bool is_perfcnt_enable            = false;
@@ -2338,6 +2504,20 @@ void video_driver_build_info(video_frame_info_t *video_info)
    video_info->runloop_is_paused      = is_paused;
    video_info->runloop_is_idle        = is_idle;
    video_info->runloop_is_slowmotion  = is_slowmotion;
+
+   video_info->input_driver_nonblock_state = input_driver_is_nonblock_state();
+
+   video_info->context_data           = video_context_data;
+   video_info->shader_data            = shader_data;
+
+   video_info->cb_update_window_title = current_video_context.update_window_title;
+   video_info->cb_swap_buffers        = current_video_context.swap_buffers;
+   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_shader_set_mvp      = video_driver_cb_shader_set_mvp;
+
 #ifdef HAVE_THREADS
    video_driver_threaded_unlock(is_threaded);
 #endif
@@ -2406,6 +2586,7 @@ void video_driver_get_window_title(char *buf, unsigned len)
    }
 }
 
+
 void video_driver_get_status(uint64_t *frame_count, bool * is_alive,
       bool *is_focused)
 {
@@ -2413,3 +2594,711 @@ void video_driver_get_status(uint64_t *frame_count, bool * is_alive,
    *is_alive    = video_driver_is_alive();
    *is_focused  = video_driver_is_focused();
 }
+
+/**
+ * find_video_context_driver_driver_index:
+ * @ident                      : Identifier of resampler driver to find.
+ *
+ * Finds graphics context driver index by @ident name.
+ *
+ * Returns: graphics context driver index if driver was found, otherwise
+ * -1.
+ **/
+static int find_video_context_driver_index(const char *ident)
+{
+   unsigned i;
+   for (i = 0; gfx_ctx_drivers[i]; i++)
+      if (string_is_equal_noncase(ident, gfx_ctx_drivers[i]->ident))
+         return i;
+   return -1;
+}
+
+/**
+ * find_prev_context_driver:
+ *
+ * Finds previous driver in graphics context driver array.
+ **/
+bool video_context_driver_find_prev_driver(void)
+{
+   settings_t *settings = config_get_ptr();
+   int                i = find_video_context_driver_index(
+         settings->arrays.video_context_driver);
+
+   if (i > 0)
+   {
+      strlcpy(settings->arrays.video_context_driver,
+            gfx_ctx_drivers[i - 1]->ident,
+            sizeof(settings->arrays.video_context_driver));
+      return true;
+   }
+
+   RARCH_WARN("Couldn't find any previous video context driver.\n");
+   return false;
+}
+
+/**
+ * find_next_context_driver:
+ *
+ * Finds next driver in graphics context driver array.
+ **/
+bool video_context_driver_find_next_driver(void)
+{
+   settings_t *settings = config_get_ptr();
+   int i = find_video_context_driver_index(settings->arrays.video_context_driver);
+
+   if (i >= 0 && gfx_ctx_drivers[i + 1])
+   {
+      strlcpy(settings->arrays.video_context_driver,
+            gfx_ctx_drivers[i + 1]->ident,
+            sizeof(settings->arrays.video_context_driver));
+      return true;
+   }
+
+   RARCH_WARN("Couldn't find any next video context driver.\n");
+   return false;
+}
+
+/**
+ * video_context_driver_init:
+ * @data                    : Input data.
+ * @ctx                     : Graphics context driver to initialize.
+ * @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?
+ *
+ * Initialize graphics context driver.
+ *
+ * Returns: graphics context driver if successfully initialized, otherwise NULL.
+ **/
+static const gfx_ctx_driver_t *video_context_driver_init(
+      void *data,
+      const gfx_ctx_driver_t *ctx,
+      const char *ident,
+      enum gfx_ctx_api api, unsigned major,
+      unsigned minor, bool hw_render_ctx)
+{
+   if (ctx->bind_api(data, api, major, minor))
+   {
+      video_frame_info_t video_info;
+      void       *ctx_data = NULL;
+
+      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_driver_set_data(ctx_data);
+      return ctx;
+   }
+
+#ifndef _WIN32
+   RARCH_WARN("Failed to bind API (#%u, version %u.%u) on context driver \"%s\".\n",
+         (unsigned)api, major, minor, ctx->ident);
+#endif
+
+   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 (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;
+}
+
+/**
+ * video_context_driver_init_first:
+ * @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 first suitable graphics context driver and initializes.
+ *
+ * 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)
+{
+   return video_context_driver_find_driver(data, ident, api,
+         major, minor, hw_render_ctx);
+}
+
+bool video_context_driver_check_window(gfx_ctx_size_t *size_data)
+{
+   if (     video_context_data
+         && current_video_context.check_window)
+   {
+      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;
+   }
+
+   return false;
+}
+
+bool video_context_driver_init_image_buffer(const video_info_t *data)
+{
+   if (    
+            current_video_context.image_buffer_init
+         && current_video_context.image_buffer_init(video_context_data, data))
+      return true;
+   return false;
+}
+
+bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img)
+{
+   if (    
+            current_video_context.image_buffer_write
+         && current_video_context.image_buffer_write(video_context_data,
+            img->frame, img->width, img->height, img->pitch,
+            img->rgb32, img->index, img->handle))
+      return true;
+   return false;
+}
+
+bool video_context_driver_get_video_output_prev(void)
+{
+   if (!current_video_context.get_video_output_prev)
+      return false;
+   current_video_context.get_video_output_prev(video_context_data);
+   return true;
+}
+
+bool video_context_driver_get_video_output_next(void)
+{
+   if (!current_video_context.get_video_output_next)
+      return false;
+   current_video_context.get_video_output_next(video_context_data);
+   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)
+      current_video_context.make_current(release);
+}
+
+
+bool video_context_driver_translate_aspect(gfx_ctx_aspect_t *aspect)
+{
+   if (!video_context_data || !aspect)
+      return false;
+   if (!current_video_context.translate_aspect)
+      return false;
+   *aspect->aspect = current_video_context.translate_aspect(
+         video_context_data, aspect->width, aspect->height);
+   return true;
+}
+
+void video_context_driver_free(void)
+{
+   if (current_video_context.destroy)
+      current_video_context.destroy(video_context_data);
+   video_context_driver_destroy();
+   video_context_data    = NULL;
+}
+
+bool video_context_driver_get_video_output_size(gfx_ctx_size_t *size_data)
+{
+   if (!size_data)
+      return false;
+   if (!current_video_context.get_video_output_size)
+      return false;
+   current_video_context.get_video_output_size(video_context_data,
+         size_data->width, size_data->height);
+   return true;
+}
+
+bool video_context_driver_swap_interval(unsigned *interval)
+{
+   if (!current_video_context.swap_interval)
+      return false;
+   current_video_context.swap_interval(video_context_data, *interval);
+   return true;
+}
+
+bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc)
+{
+   if (!current_video_context.get_proc_address)
+      return false;
+
+   proc->addr = current_video_context.get_proc_address(proc->sym);
+
+   return true;
+}
+
+bool video_context_driver_get_metrics(gfx_ctx_metrics_t *metrics)
+{
+   if ( 
+         current_video_context.get_metrics(video_context_data,
+            metrics->type,
+            metrics->value))
+      return true;
+   return false;
+}
+
+bool video_context_driver_input_driver(gfx_ctx_input_t *inp)
+{
+   settings_t *settings    = config_get_ptr();
+   const char *joypad_name = settings ? settings->arrays.input_joypad_driver : NULL;
+
+   if (!current_video_context.input_driver)
+      return false;
+   current_video_context.input_driver(
+         video_context_data, joypad_name,
+         inp->input, inp->input_data);
+   return true;
+}
+
+bool video_context_driver_suppress_screensaver(bool *bool_data)
+{
+   if (     video_context_data
+         && current_video_context.suppress_screensaver(
+            video_context_data, *bool_data))
+      return true;
+   return false;
+}
+
+bool video_context_driver_get_ident(gfx_ctx_ident_t *ident)
+{
+   if (!ident)
+      return false;
+   ident->ident = current_video_context.ident;
+   return true;
+}
+
+bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info)
+{
+   video_frame_info_t video_info;
+
+   if (!current_video_context.set_video_mode)
+      return false;
+
+   video_driver_build_info(&video_info);
+
+   if (!current_video_context.set_video_mode(
+            video_context_data, &video_info, mode_info->width,
+            mode_info->height, mode_info->fullscreen))
+      return false;
+   return true;
+}
+
+bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info)
+{
+   if (!current_video_context.get_video_size)
+      return false;
+   current_video_context.get_video_size(video_context_data,
+         &mode_info->width, &mode_info->height);
+   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)
+      return false;
+   current_video_context.show_mouse(video_context_data, *bool_data);
+   return true;
+}
+
+void video_context_driver_set_data(void *data)
+{
+   video_context_data = data;
+}
+
+bool video_context_driver_get_flags(gfx_ctx_flags_t *flags)
+{
+   if (!flags)
+      return false;
+   if (!current_video_context.get_flags)
+      return false;
+   flags->flags = current_video_context.get_flags(video_context_data);
+   return true;
+}
+
+bool video_context_driver_set_flags(gfx_ctx_flags_t *flags)
+{
+   if (!flags)
+      return false;
+   if (!current_video_context.set_flags)
+      return false;
+   current_video_context.set_flags(video_context_data, flags->flags);
+   return true;
+}
+
+bool video_driver_is_focused(void)
+{
+   if (video_context_data && current_video_context.has_focus)
+      return current_video_context.has_focus(video_context_data);
+   else if (current_video->focus)
+      return current_video->focus(video_driver_data);
+   return true;
+}
+
+bool video_driver_has_windowed(void)
+{
+#if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
+   return false;
+#else
+   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
+}
+
+bool video_driver_cached_frame_has_valid_framebuffer(void)
+{
+   if (frame_cache_data)
+      return (frame_cache_data == RETRO_HW_FRAME_BUFFER_VALID);
+   return false;
+}
+
+static const shader_backend_t *video_shader_set_backend(enum rarch_shader_type type)
+{
+   switch (type)
+   {
+      case RARCH_SHADER_CG:
+         {
+#ifdef HAVE_CG
+            gfx_ctx_flags_t flags;
+            flags.flags = 0;
+            video_context_driver_get_flags(&flags);
+
+            if (BIT32_GET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT))
+            {
+               RARCH_ERR("[Shader driver]: Cg cannot be used with core GL context. Trying to fall back to GLSL...\n");
+               return video_shader_set_backend(RARCH_SHADER_GLSL);
+            }
+
+            RARCH_LOG("[Shader driver]: Using Cg shader backend.\n");
+            return &gl_cg_backend;
+#else
+            break;
+#endif
+         }
+      case RARCH_SHADER_GLSL:
+#ifdef HAVE_GLSL
+         RARCH_LOG("[Shader driver]: Using GLSL shader backend.\n");
+         return &gl_glsl_backend;
+#else
+         break;
+#endif
+      case RARCH_SHADER_NONE:
+      default:
+         break;
+   }
+
+   return NULL;
+}
+
+bool video_shader_driver_get_prev_textures(video_shader_ctx_texture_t *texture)
+{
+   if (!texture)
+      return false;
+   texture->id = current_shader->get_prev_textures(shader_data);
+
+   return true;
+}
+
+bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident)
+{
+   if (!ident)
+      return false;
+   ident->ident = current_shader->ident;
+   return true;
+}
+
+bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader)
+{
+   void *video_driver                       = video_driver_get_ptr(true);
+   const video_poke_interface_t *video_poke = video_driver_get_poke();
+
+   shader->data = NULL;
+   if (!video_poke || !video_driver || !video_poke->get_current_shader)
+      return false;
+   shader->data = video_poke->get_current_shader(video_driver);
+   return true;
+}
+
+bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader)
+{
+   shader->data = current_shader->get_current_shader(shader_data);
+
+   return true;
+}
+
+bool video_shader_driver_deinit(void)
+{
+   if (!current_shader)
+      return false;
+
+   if (current_shader->deinit)
+      current_shader->deinit(shader_data);
+
+   shader_data    = NULL;
+   current_shader = NULL;
+   return true;
+}
+
+static enum gfx_wrap_type video_shader_driver_wrap_type_null(
+      void *data, unsigned index)
+{
+   return RARCH_WRAP_BORDER;
+}
+
+static bool video_shader_driver_set_mvp_null(void *data,
+      void *shader_data, const math_matrix_4x4 *mat)
+{
+#ifdef HAVE_OPENGL
+#ifndef NO_GL_FF_MATRIX
+   if (string_is_equal_fast(video_driver_get_ident(), "gl", 2))
+      gl_ff_matrix(mat);
+#endif
+#endif
+   return false;
+}
+
+static bool video_shader_driver_set_coords_null(void *handle_data,
+      void *shader_data, const struct video_coords *coords)
+{
+#ifdef HAVE_OPENGL
+#ifndef NO_GL_FF_VERTEX
+   if (string_is_equal_fast(video_driver_get_ident(), "gl", 2))
+      gl_ff_vertex(coords);
+#endif
+#endif
+   return false;
+}
+
+static struct video_shader *video_shader_driver_get_current_shader_null(void *data)
+{
+   return NULL;
+}
+
+
+static void video_shader_driver_set_params_null(void *data, void *shader_data,
+      unsigned width, unsigned height, 
+      unsigned tex_width, unsigned tex_height, 
+      unsigned out_width, unsigned out_height,
+      unsigned frame_count,
+      const void *info, 
+      const void *prev_info, 
+      const void *feedback_info,
+      const void *fbo_info, unsigned fbo_info_cnt)
+{
+}
+
+static void video_shader_driver_scale_null(void *data,
+      unsigned idx, struct gfx_fbo_scale *scale)
+{
+   (void)idx;
+   (void)scale;
+}
+
+static bool video_shader_driver_mipmap_input_null(void *data, unsigned idx)
+{
+   (void)idx;
+   return false;
+}
+
+static bool video_shader_driver_filter_type_null(void *data, unsigned idx, bool *smooth)
+{
+   (void)idx;
+   (void)smooth;
+   return false;
+}
+
+static unsigned video_shader_driver_num_null(void *data)
+{
+   return 0;
+}
+
+static bool video_shader_driver_get_feedback_pass_null(void *data, unsigned *idx)
+{
+   (void)idx;
+   return false;
+}
+
+static void video_shader_driver_reset_to_defaults(void)
+{
+   if (!current_shader->wrap_type)
+      current_shader->wrap_type         = video_shader_driver_wrap_type_null;
+   if (current_shader->set_mvp)
+      video_driver_cb_shader_set_mvp    = current_shader->set_mvp;
+   else
+   {
+      current_shader->set_mvp           = video_shader_driver_set_mvp_null;
+      video_driver_cb_shader_set_mvp    = video_shader_driver_set_mvp_null;
+   }
+   if (!current_shader->set_coords)
+      current_shader->set_coords        = video_shader_driver_set_coords_null;
+   if (current_shader->use)
+      video_driver_cb_shader_use        = current_shader->use;
+   else 
+   {
+      current_shader->use               = video_shader_driver_use_null;
+      video_driver_cb_shader_use        = video_shader_driver_use_null;
+   }
+   if (!current_shader->set_params)
+      current_shader->set_params        = video_shader_driver_set_params_null;
+   if (!current_shader->shader_scale)
+      current_shader->shader_scale      = video_shader_driver_scale_null;
+   if (!current_shader->mipmap_input)
+      current_shader->mipmap_input      = video_shader_driver_mipmap_input_null;
+   if (!current_shader->filter_type)
+      current_shader->filter_type       = video_shader_driver_filter_type_null;
+   if (!current_shader->num_shaders)
+      current_shader->num_shaders       = video_shader_driver_num_null;
+   if (!current_shader->get_current_shader)
+      current_shader->get_current_shader= video_shader_driver_get_current_shader_null;
+   if (!current_shader->get_feedback_pass)
+      current_shader->get_feedback_pass = video_shader_driver_get_feedback_pass_null;
+}
+
+/* Finds first suitable shader context driver. */
+bool video_shader_driver_init_first(void)
+{
+   current_shader = (shader_backend_t*)shader_ctx_drivers[0];
+   video_shader_driver_reset_to_defaults();
+   return true;
+}
+
+bool video_shader_driver_init(video_shader_ctx_init_t *init)
+{
+   void *tmp = NULL;
+
+   if (!init->shader || !init->shader->init)
+   {
+      init->shader = video_shader_set_backend(init->shader_type);
+
+      if (!init->shader)
+         return false;
+   }
+
+   tmp = init->shader->init(init->data, init->path);
+
+   if (!tmp)
+      return false;
+
+   shader_data    = tmp;
+   current_shader = (shader_backend_t*)init->shader;
+   video_shader_driver_reset_to_defaults();
+
+   return true;
+}
+
+bool video_shader_driver_get_feedback_pass(unsigned *data)
+{
+   return current_shader->get_feedback_pass(shader_data, data);
+}
+
+bool video_shader_driver_mipmap_input(unsigned *index)
+{
+   return current_shader->mipmap_input(shader_data, *index);
+}
+
+bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler)
+{
+   if (!scaler || !scaler->scale)
+      return false;
+
+   scaler->scale->valid = false;
+
+   current_shader->shader_scale(shader_data, scaler->idx, scaler->scale);
+   return true;
+}
+
+bool video_shader_driver_info(video_shader_ctx_info_t *shader_info)
+{
+   if (!shader_info)
+      return false;
+
+   shader_info->num = current_shader->num_shaders(shader_data);
+
+   return true;
+}
+
+bool video_shader_driver_filter_type(video_shader_ctx_filter_t *filter)
+{
+   return (filter) ? current_shader->filter_type(shader_data, 
+         filter->index, filter->smooth) : false;
+}
+
+bool video_shader_driver_compile_program(struct shader_program_info *program_info)
+{
+   return (program_info) ? current_shader->compile_program(program_info->data,
+         program_info->idx, NULL, program_info) : false;
+}
+
+bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap)
+{
+   wrap->type = current_shader->wrap_type(shader_data, wrap->idx);
+   return true;
+}
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 869aae8e47..d2dd72cd4b 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -23,6 +23,7 @@
 
 #include <boolean.h>
 #include <retro_common_api.h>
+#include <gfx/math/matrix_4x4.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
@@ -33,13 +34,291 @@
 #endif
 
 #include "video_defines.h"
+#include "video_coord_array.h"
 #include "video_filter.h"
 #include "video_shader_parse.h"
 
 #include "../input/input_driver.h"
 
+#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_SLANG)
+#ifndef HAVE_SHADER_MANAGER
+#define HAVE_SHADER_MANAGER
+#endif
+
+#include "video_shader_parse.h"
+
+#define VIDEO_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1)
+#define VIDEO_SHADER_MENU        (GFX_MAX_SHADERS - 2)
+#define VIDEO_SHADER_MENU_2      (GFX_MAX_SHADERS - 3)
+#define VIDEO_SHADER_MENU_3      (GFX_MAX_SHADERS - 4)
+#define VIDEO_SHADER_MENU_4      (GFX_MAX_SHADERS - 5)
+#define VIDEO_SHADER_MENU_5      (GFX_MAX_SHADERS - 6)
+
+#endif
+
+#if defined(_XBOX360)
+#define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL
+#elif defined(__PSL1GHT__) || defined(HAVE_OPENGLES2) || defined(HAVE_GLSL)
+#define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
+#elif defined(__CELLOS_LV2__) || defined(HAVE_CG)
+#define DEFAULT_SHADER_TYPE RARCH_SHADER_CG
+#else
+#define DEFAULT_SHADER_TYPE RARCH_SHADER_NONE
+#endif
+
 RETRO_BEGIN_DECLS
 
+#ifndef MAX_EGLIMAGE_TEXTURES
+#define MAX_EGLIMAGE_TEXTURES 32
+#endif
+
+enum gfx_ctx_api
+{
+   GFX_CTX_NONE = 0,
+   GFX_CTX_OPENGL_API,
+   GFX_CTX_OPENGL_ES_API,
+   GFX_CTX_DIRECT3D8_API,
+   GFX_CTX_DIRECT3D9_API,
+   GFX_CTX_OPENVG_API,
+   GFX_CTX_VULKAN_API,
+   GFX_CTX_GDI_API
+};
+
+enum display_metric_types
+{
+   DISPLAY_METRIC_NONE = 0,
+   DISPLAY_METRIC_MM_WIDTH,
+   DISPLAY_METRIC_MM_HEIGHT,
+   DISPLAY_METRIC_DPI
+};
+
+enum display_flags
+{
+   GFX_CTX_FLAGS_NONE = 0,
+   GFX_CTX_FLAGS_GL_CORE_CONTEXT,
+   GFX_CTX_FLAGS_MULTISAMPLING,
+   GFX_CTX_FLAGS_CUSTOMIZABLE_SWAPCHAIN_IMAGES
+};
+
+enum shader_uniform_type
+{
+   UNIFORM_1F = 0,
+   UNIFORM_2F,
+   UNIFORM_3F,
+   UNIFORM_4F,
+   UNIFORM_1FV,
+   UNIFORM_2FV,
+   UNIFORM_3FV,
+   UNIFORM_4FV,
+   UNIFORM_1I
+};
+
+enum shader_program_type
+{
+   SHADER_PROGRAM_VERTEX = 0,
+   SHADER_PROGRAM_FRAGMENT,
+   SHADER_PROGRAM_COMBINED
+};
+
+struct shader_program_info
+{
+   void *data;
+   const char *vertex;
+   const char *fragment;
+   const char *combined;
+   unsigned idx;
+   bool is_file;
+};
+
+struct uniform_info
+{
+   unsigned type; /* shader uniform type */
+   bool enabled;
+
+   int32_t location;
+   int32_t count;
+
+   struct
+   {
+      enum shader_program_type type;
+      const char *ident;
+      uint32_t idx;
+      bool add_prefix;
+      bool enable;
+   } lookup;
+
+   struct
+   {
+      struct
+      {
+         intptr_t v0;
+         intptr_t v1;
+         intptr_t v2;
+         intptr_t v3;
+      } integer;
+
+      intptr_t *integerv;
+
+      struct
+      {
+         uintptr_t v0;
+         uintptr_t v1;
+         uintptr_t v2;
+         uintptr_t v3;
+      } unsigned_integer;
+
+      uintptr_t *unsigned_integerv;
+
+      struct
+      {
+         float v0;
+         float v1;
+         float v2;
+         float v3;
+      } f;
+
+      float *floatv;
+   } result;
+};
+
+
+
+
+typedef struct shader_backend
+{
+   void *(*init)(void *data, const char *path);
+   void (*deinit)(void *data);
+
+   /* Set shader parameters. */
+   void (*set_params)(void *data, void *shader_data,
+         unsigned width, unsigned height, 
+         unsigned tex_width, unsigned tex_height, 
+         unsigned out_width, unsigned out_height,
+         unsigned frame_counter,
+         const void *info, 
+         const void *prev_info,
+         const void *feedback_info,
+         const void *fbo_info, unsigned fbo_info_cnt);
+
+   void (*set_uniform_parameter)(void *data, struct uniform_info *param,
+         void *uniform_data);
+
+   /* Compile a shader program. */
+   bool (*compile_program)(void *data, unsigned idx,
+         void *program_data, struct shader_program_info *program_info);
+
+   /* Use a shader program specified by variable 'index'. */
+   void (*use)(void *data, void *shader_data, unsigned index, bool set_active);
+
+   /* Returns the number of currently loaded shaders. */
+   unsigned (*num_shaders)(void *data);
+
+   bool (*filter_type)(void *data, unsigned index, bool *smooth);
+   enum gfx_wrap_type (*wrap_type)(void *data, unsigned index);
+   void (*shader_scale)(void *data,
+         unsigned index, struct gfx_fbo_scale *scale);
+   bool (*set_coords)(void *handle_data,
+         void *shader_data, const struct video_coords *coords);
+   bool (*set_coords_fallback)(void *handle_data,
+         void *shader_data, const struct video_coords *coords);
+   bool (*set_mvp)(void *data, void *shader_data,
+         const math_matrix_4x4 *mat);
+   unsigned (*get_prev_textures)(void *data);
+   bool (*get_feedback_pass)(void *data, unsigned *pass);
+   bool (*mipmap_input)(void *data, unsigned index);
+
+   struct video_shader *(*get_current_shader)(void *data);
+
+   enum rarch_shader_type type;
+
+   /* Human readable string. */
+   const char *ident;
+} shader_backend_t;
+
+typedef struct video_shader_ctx_init
+{
+   enum rarch_shader_type shader_type;
+   const shader_backend_t *shader;
+   struct
+   {
+      bool core_context_enabled;
+   } gl;
+   void *data;
+   const char *path;
+} video_shader_ctx_init_t;
+
+typedef struct video_shader_ctx_params
+{
+   void *data;
+   unsigned width;
+   unsigned height;
+   unsigned tex_width;
+   unsigned tex_height;
+   unsigned out_width;
+   unsigned out_height;
+   unsigned frame_counter;
+   const void *info;
+   const void *prev_info;
+   const void *feedback_info;
+   const void *fbo_info;
+   unsigned fbo_info_cnt;
+} video_shader_ctx_params_t;
+
+typedef struct video_shader_ctx_coords
+{
+   void *handle_data;
+   const void *data;
+} video_shader_ctx_coords_t;
+
+typedef struct video_shader_ctx_scale
+{
+   unsigned idx;
+   struct gfx_fbo_scale *scale;
+} video_shader_ctx_scale_t;
+
+typedef struct video_shader_ctx_info
+{
+   bool set_active;
+   unsigned num;
+   unsigned idx;
+   void *data;
+} video_shader_ctx_info_t;
+
+typedef struct video_shader_ctx_mvp
+{
+   void *data;
+   const math_matrix_4x4 *matrix;
+} video_shader_ctx_mvp_t;
+
+typedef struct video_shader_ctx_filter
+{
+   unsigned index;
+   bool *smooth;
+} video_shader_ctx_filter_t;
+
+typedef struct video_shader_ctx_wrap
+{
+   unsigned idx;
+   enum gfx_wrap_type type;
+} video_shader_ctx_wrap_t;
+
+typedef struct video_shader_ctx
+{
+   struct video_shader *data;
+} video_shader_ctx_t;
+
+typedef struct video_shader_ctx_ident
+{
+   const char *ident;
+} video_shader_ctx_ident_t;
+
+typedef struct video_shader_ctx_texture
+{
+   unsigned id;
+} video_shader_ctx_texture_t;
+
+typedef void (*gfx_ctx_proc_t)(void);
+
 typedef struct video_info
 {
    /* Width of window. 
@@ -114,62 +393,246 @@ typedef struct video_info
 
 typedef struct video_frame_info
 {
-   float menu_wallpaper_opacity;
-   float refresh_rate;
+   bool input_driver_nonblock_state;
    bool shared_context;
    bool black_frame_insertion;
    bool hard_sync;
-   unsigned hard_sync_frames;
    bool fps_show;
    bool scale_integer;
-   unsigned aspect_ratio_idx;
    bool post_filter_record;
-   unsigned max_swapchain_images;
    bool windowed_fullscreen;
    bool fullscreen;
-   unsigned monitor_index;
    bool font_enable;
-   char fps_text[128];
-
-   unsigned width;
-   unsigned height;
-
-   float font_msg_pos_x;
-   float font_msg_pos_y;
-   float font_msg_color_r;
-   float font_msg_color_g;
-   float font_msg_color_b;
    bool use_rgba;
    bool libretro_running;
-
-   float menu_header_opacity;
-   float menu_footer_opacity;
-
    bool xmb_shadows_enable;
-   float xmb_alpha_factor;
-   unsigned xmb_theme;
-   unsigned xmb_color_theme;
-   unsigned menu_shader_pipeline;
-
-   unsigned materialui_color_theme;
-
    bool battery_level_enable;
    bool timedate_enable;
    bool runloop_is_slowmotion;
    bool runloop_is_idle;
    bool runloop_is_paused;
    bool is_perfcnt_enable;
-
    bool menu_is_alive;
 
    int custom_vp_x;
    int custom_vp_y;
+
+   unsigned hard_sync_frames;
+   unsigned aspect_ratio_idx;
+   unsigned max_swapchain_images;
+   unsigned monitor_index;
+   unsigned width;
+   unsigned height;
+   unsigned xmb_theme;
+   unsigned xmb_color_theme;
+   unsigned menu_shader_pipeline;
+   unsigned materialui_color_theme;
    unsigned custom_vp_width;
    unsigned custom_vp_height;
    unsigned custom_vp_full_width;
    unsigned custom_vp_full_height;
+
+   float menu_wallpaper_opacity;
+   float refresh_rate;
+   float font_msg_pos_x;
+   float font_msg_pos_y;
+   float font_msg_color_r;
+   float font_msg_color_g;
+   float font_msg_color_b;
+   float menu_header_opacity;
+   float menu_footer_opacity;
+   float xmb_alpha_factor;
+
+   char fps_text[128];
+   void (*cb_update_window_title)(void*, void *);
+   void (*cb_swap_buffers)(void*, void *);
+   bool (*cb_get_metrics)(void *data, enum display_metric_types type,
+      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_shader_set_mvp)(void *data, void *shader_data,
+         const math_matrix_4x4 *mat);
+
+   void *context_data;
+   void *shader_data;
 } video_frame_info_t;
 
+typedef void (*update_window_title_cb)(void*, void*);
+typedef bool (*get_metrics_cb)(void *data, enum display_metric_types type,
+      float *value);
+typedef bool (*set_resize_cb)(void*, unsigned, unsigned);
+
+
+typedef struct gfx_ctx_driver
+{
+   /* The opaque pointer is the underlying video driver data (e.g. gl_t for
+    * OpenGL contexts). Although not advised, the context driver is allowed
+    * to hold a pointer to it as the context never outlives the video driver.
+    *
+    * The context driver is responsible for it's own data.*/
+   void* (*init)(video_frame_info_t *video_info, void *video_driver);
+   void (*destroy)(void *data);
+
+   /* Which API to bind to. */
+   bool (*bind_api)(void *video_driver, enum gfx_ctx_api,
+         unsigned major, unsigned minor);
+
+   /* Sets the swap interval. */
+   void (*swap_interval)(void *data, unsigned);
+
+   /* Sets video mode. Creates a window, etc. */
+   bool (*set_video_mode)(void*, video_frame_info_t *video_info, unsigned, unsigned, bool);
+
+   /* Gets current window size.
+    * If not initialized yet, it returns current screen size. */
+   void (*get_video_size)(void*, unsigned*, unsigned*);
+
+   void (*get_video_output_size)(void*, unsigned*, unsigned*);
+
+   void (*get_video_output_prev)(void*);
+
+   void (*get_video_output_next)(void*);
+
+   get_metrics_cb get_metrics;
+
+   /* Translates a window size to an aspect ratio.
+    * In most cases this will be just width / height, but
+    * some contexts will better know which actual aspect ratio is used.
+    * This can be NULL to assume the default behavior.
+    */
+   float (*translate_aspect)(void*, unsigned, unsigned);
+
+   /* Asks driver to update window title (FPS, etc). */
+   update_window_title_cb update_window_title;
+
+   /* Queries for resize and quit events.
+    * Also processes events. */
+   void (*check_window)(void*, bool*, bool*,
+         unsigned*, unsigned*, bool);
+
+   /* Acknowledge a resize event. This is needed for some APIs.
+    * Most backends will ignore this. */
+   set_resize_cb set_resize;
+
+   /* Checks if window has input focus. */
+   bool (*has_focus)(void*);
+
+   /* Should the screensaver be suppressed? */
+   bool (*suppress_screensaver)(void *data, bool enable);
+
+   /* Checks if context driver has windowed support. */
+   bool (*has_windowed)(void*);
+
+   /* Swaps buffers. VBlank sync depends on
+    * earlier calls to swap_interval. */
+   void (*swap_buffers)(void*, void *);
+
+   /* Most video backends will want to use a certain input driver.
+    * Checks for it here. */
+   void (*input_driver)(void*, const char *, const input_driver_t**, void**);
+
+   /* Wraps whatever gl_proc_address() there is.
+    * Does not take opaque, to avoid lots of ugly wrapper code. */
+   gfx_ctx_proc_t (*get_proc_address)(const char*);
+
+   /* Returns true if this context supports EGLImage buffers for
+    * screen drawing and was initalized correctly. */
+   bool (*image_buffer_init)(void*, const video_info_t*);
+
+   /* Writes the frame to the EGLImage and sets image_handle to it.
+    * Returns true if a new image handle is created.
+    * Always returns true the first time it's called for a new index.
+    * The graphics core must handle a change in the handle correctly. */
+   bool (*image_buffer_write)(void*, const void *frame, unsigned width,
+         unsigned height, unsigned pitch, bool rgb32,
+         unsigned index, void **image_handle);
+
+   /* Shows or hides mouse. Can be NULL if context doesn't
+    * have a concept of mouse pointer. */
+   void (*show_mouse)(void *data, bool state);
+
+   /* Human readable string. */
+   const char *ident;
+
+   uint32_t (*get_flags)(void *data);
+
+   void     (*set_flags)(void *data, uint32_t flags);
+
+   /* Optional. Binds HW-render offscreen context. */
+   void (*bind_hw_render)(void *data, bool enable);
+
+   /* Optional. Gets base data for the context which is used by the driver.
+    * This is mostly relevant for graphics APIs such as Vulkan
+    * which do not have global context state. */
+   void *(*get_context_data)(void *data);
+
+   /* Optional. Makes driver context (only GLX right now)
+    * active for this thread. */
+   void (*make_current)(bool release);
+} gfx_ctx_driver_t;
+
+typedef struct gfx_ctx_flags
+{
+   uint32_t flags;
+} gfx_ctx_flags_t;
+
+typedef struct gfx_ctx_size
+{
+   bool *quit;
+   bool *resize;
+   unsigned *width;
+   unsigned *height;
+} gfx_ctx_size_t;
+
+typedef struct gfx_ctx_mode
+{
+   unsigned width;
+   unsigned height;
+   bool fullscreen;
+} gfx_ctx_mode_t;
+
+typedef struct gfx_ctx_metrics
+{
+   enum display_metric_types type;
+   float *value;
+} gfx_ctx_metrics_t;
+
+typedef struct gfx_ctx_aspect
+{
+   float *aspect;
+   unsigned width;
+   unsigned height;
+} gfx_ctx_aspect_t;
+
+typedef struct gfx_ctx_image
+{
+   const void *frame;
+   unsigned width;
+   unsigned height;
+   unsigned pitch;
+   unsigned index;
+   bool rgb32;
+   void **handle;
+} gfx_ctx_image_t;
+
+typedef struct gfx_ctx_input
+{
+   const input_driver_t **input;
+   void **input_data;
+} gfx_ctx_input_t;
+
+typedef struct gfx_ctx_proc_address
+{
+   const char *sym;
+   retro_proc_address_t addr;
+} gfx_ctx_proc_address_t;
+
+typedef struct gfx_ctx_ident
+{
+   const char *ident;
+} gfx_ctx_ident_t;
+
 /* Optionally implemented interface to poke more
  * deeply into video driver. */
 
@@ -318,15 +781,11 @@ extern struct aspect_ratio_elem aspectratio_lut[ASPECT_RATIO_END];
 
 #define video_driver_is_alive()   ((current_video) ? current_video->alive(video_driver_data) : true)
 
-#define video_driver_is_focused() (current_video->focus(video_driver_data))
+bool video_driver_is_focused(void);
 
-#if defined(RARCH_CONSOLE) || defined(RARCH_MOBILE)
-#define video_driver_has_windowed() (false)
-#else
-#define video_driver_has_windowed() (current_video->has_windowed && current_video->has_windowed(video_driver_data))
-#endif
+bool video_driver_has_windowed(void);
 
-#define video_driver_cached_frame_has_valid_framebuffer() (frame_cache_data ? (frame_cache_data == RETRO_HW_FRAME_BUFFER_VALID) : false)
+bool video_driver_cached_frame_has_valid_framebuffer(void);
 
 void video_driver_destroy(void);
 void video_driver_set_cached_frame_ptr(const void *data);
@@ -639,11 +1098,160 @@ extern video_driver_t video_gdi;
 extern video_driver_t video_vga;
 extern video_driver_t video_null;
 
-extern const void *frame_cache_data;
+extern const gfx_ctx_driver_t gfx_ctx_osmesa;
+extern const gfx_ctx_driver_t gfx_ctx_sdl_gl;
+extern const gfx_ctx_driver_t gfx_ctx_x_egl;
+extern const gfx_ctx_driver_t gfx_ctx_wayland;
+extern const gfx_ctx_driver_t gfx_ctx_x;
+extern const gfx_ctx_driver_t gfx_ctx_d3d;
+extern const gfx_ctx_driver_t gfx_ctx_drm;
+extern const gfx_ctx_driver_t gfx_ctx_mali_fbdev;
+extern const gfx_ctx_driver_t gfx_ctx_vivante_fbdev;
+extern const gfx_ctx_driver_t gfx_ctx_android;
+extern const gfx_ctx_driver_t gfx_ctx_ps3;
+extern const gfx_ctx_driver_t gfx_ctx_wgl;
+extern const gfx_ctx_driver_t gfx_ctx_videocore;
+extern const gfx_ctx_driver_t gfx_ctx_qnx;
+extern const gfx_ctx_driver_t gfx_ctx_cgl;
+extern const gfx_ctx_driver_t gfx_ctx_cocoagl;
+extern const gfx_ctx_driver_t gfx_ctx_emscripten;
+extern const gfx_ctx_driver_t gfx_ctx_opendingux_fbdev;
+extern const gfx_ctx_driver_t gfx_ctx_khr_display;
+extern const gfx_ctx_driver_t gfx_ctx_gdi;
+extern const gfx_ctx_driver_t gfx_ctx_null;
 
 extern void *video_driver_data;
 extern video_driver_t *current_video;
 
+/**
+ * video_context_driver_init_first:
+ * @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 first suitable graphics context driver and initializes.
+ *
+ * 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);
+
+bool video_context_driver_find_prev_driver(void);
+
+bool video_context_driver_find_next_driver(void);
+
+bool video_context_driver_init_image_buffer(const video_info_t *data);
+
+bool video_context_driver_write_to_image_buffer(gfx_ctx_image_t *img);
+
+bool video_context_driver_get_video_output_prev(void);
+
+bool video_context_driver_get_video_output_next(void);
+
+bool video_context_driver_bind_hw_render(bool *enable);
+
+void video_context_driver_make_current(bool restore);
+
+bool video_context_driver_set(const gfx_ctx_driver_t *data);
+
+void video_context_driver_destroy(void);
+
+bool video_context_driver_get_video_output_size(gfx_ctx_size_t *size_data);
+
+bool video_context_driver_swap_interval(unsigned *interval);
+
+bool video_context_driver_get_proc_address(gfx_ctx_proc_address_t *proc);
+
+bool video_context_driver_suppress_screensaver(bool *bool_data);
+
+bool video_context_driver_get_ident(gfx_ctx_ident_t *ident);
+
+bool video_context_driver_set_video_mode(gfx_ctx_mode_t *mode_info);
+
+bool video_context_driver_get_video_size(gfx_ctx_mode_t *mode_info);
+
+bool video_context_driver_get_context_data(void *data);
+
+bool video_context_driver_show_mouse(bool *bool_data);
+
+void video_context_driver_set_data(void *data);
+
+bool video_context_driver_get_flags(gfx_ctx_flags_t *flags);
+
+bool video_context_driver_set_flags(gfx_ctx_flags_t *flags);
+
+bool video_context_driver_get_metrics(gfx_ctx_metrics_t *metrics);
+
+bool video_context_driver_translate_aspect(gfx_ctx_aspect_t *aspect);
+
+bool video_context_driver_input_driver(gfx_ctx_input_t *inp);
+
+void video_context_driver_free(void);
+
+extern gfx_ctx_driver_t current_video_context;
+
+extern void *video_context_data;
+
+bool video_shader_driver_get_prev_textures(video_shader_ctx_texture_t *texture);
+
+bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident);
+
+bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader);
+
+bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader);
+
+bool video_shader_driver_deinit(void);
+
+#define video_shader_driver_set_parameter(param) \
+   if (current_shader && current_shader->set_uniform_parameter) \
+      current_shader->set_uniform_parameter(shader_data, &param, NULL)
+
+#define video_shader_driver_set_parameters(params) \
+   current_shader->set_params(params.data, shader_data, params.width, params.height, params.tex_width, params.tex_height, params.out_width, params.out_height, params.frame_counter, params.info, params.prev_info, params.feedback_info, params.fbo_info, params.fbo_info_cnt)
+
+bool video_shader_driver_init_first(void);
+
+bool video_shader_driver_init(video_shader_ctx_init_t *init);
+
+bool video_shader_driver_get_feedback_pass(unsigned *data);
+
+bool video_shader_driver_mipmap_input(unsigned *index);
+
+#define video_shader_driver_set_coords(coords) \
+   if (!current_shader->set_coords(coords.handle_data, shader_data, (const struct video_coords*)coords.data) && current_shader->set_coords_fallback) \
+      current_shader->set_coords_fallback(coords.handle_data, shader_data, (const struct video_coords*)coords.data)
+
+bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler);
+
+bool video_shader_driver_info(video_shader_ctx_info_t *shader_info);
+
+#define video_shader_driver_set_mvp(mvp) \
+   if (mvp.matrix) \
+      current_shader->set_mvp(mvp.data, shader_data, mvp.matrix) \
+
+bool video_shader_driver_filter_type(video_shader_ctx_filter_t *filter);
+
+bool video_shader_driver_compile_program(struct shader_program_info *program_info);
+
+#define video_shader_driver_use(shader_info) \
+   current_shader->use(shader_info.data, shader_data, shader_info.idx, shader_info.set_active)
+
+bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap);
+
+extern shader_backend_t *current_shader;
+extern void *shader_data;
+
+extern const shader_backend_t gl_glsl_backend;
+extern const shader_backend_t hlsl_backend;
+extern const shader_backend_t gl_cg_backend;
+extern const shader_backend_t shader_null_backend;
+
 RETRO_END_DECLS
 
 #endif
diff --git a/gfx/video_shader_driver.c b/gfx/video_shader_driver.c
deleted file mode 100644
index 160cfe17bc..0000000000
--- a/gfx/video_shader_driver.c
+++ /dev/null
@@ -1,241 +0,0 @@
-/*  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 <string.h>
-
-#include <string/stdstring.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-#include "video_shader_driver.h"
-#include "../verbosity.h"
-
-static const shader_backend_t *shader_ctx_drivers[] = {
-#ifdef HAVE_GLSL
-   &gl_glsl_backend,
-#endif
-#ifdef HAVE_CG
-   &gl_cg_backend,
-#endif
-#ifdef HAVE_HLSL
-   &hlsl_backend,
-#endif
-   &shader_null_backend,
-   NULL
-};
-
-const shader_backend_t *current_shader = NULL;
-void *shader_data                      = NULL;
-
-static const shader_backend_t *video_shader_set_backend(enum rarch_shader_type type)
-{
-   switch (type)
-   {
-      case RARCH_SHADER_CG:
-         {
-
-#ifdef HAVE_CG
-            gfx_ctx_flags_t flags;
-            video_context_driver_get_flags(&flags);
-
-            if (BIT32_GET(flags.flags, GFX_CTX_FLAGS_GL_CORE_CONTEXT))
-            {
-               RARCH_ERR("[Shader driver]: Cg cannot be used with core GL context. Trying to fall back to GLSL...\n");
-               return video_shader_set_backend(RARCH_SHADER_GLSL);
-            }
-
-            RARCH_LOG("[Shader driver]: Using Cg shader backend.\n");
-            return &gl_cg_backend;
-#else
-            break;
-#endif
-         }
-      case RARCH_SHADER_GLSL:
-#ifdef HAVE_GLSL
-         RARCH_LOG("[Shader driver]: Using GLSL shader backend.\n");
-         return &gl_glsl_backend;
-#else
-         break;
-#endif
-      case RARCH_SHADER_NONE:
-      default:
-         break;
-   }
-
-   return NULL;
-}
-
-bool video_shader_driver_get_prev_textures(video_shader_ctx_texture_t *texture)
-{
-   if (!texture || !current_shader)
-   {
-      if (texture)
-         texture->id = 0;
-      return false;
-   }
-   texture->id = current_shader->get_prev_textures(shader_data);
-
-   return true;
-}
-
-bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident)
-{
-   if (!current_shader || !ident)
-      return false;
-   ident->ident = current_shader->ident;
-   return true;
-}
-
-bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader)
-{
-   void *video_driver                       = video_driver_get_ptr(true);
-   const video_poke_interface_t *video_poke = video_driver_get_poke();
-
-   shader->data = NULL;
-   if (!video_poke || !video_driver || !video_poke->get_current_shader)
-      return false;
-   shader->data = video_poke->get_current_shader(video_driver);
-   return true;
-}
-
-bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader)
-{
-   shader->data = NULL;
-   if (!current_shader || !current_shader->get_current_shader)
-      return false;
-
-   shader->data = current_shader->get_current_shader(shader_data);
-   return true;
-}
-
-bool video_shader_driver_deinit(void)
-{
-   if (!current_shader)
-      return false;
-
-   if (current_shader->deinit)
-      current_shader->deinit(shader_data);
-
-   shader_data    = NULL;
-   current_shader = NULL;
-   return true;
-}
-
-/* Finds first suitable shader context driver. */
-bool video_shader_driver_init_first(void)
-{
-   unsigned i;
-
-   for (i = 0; shader_ctx_drivers[i]; i++)
-   {
-      current_shader = shader_ctx_drivers[i];
-      return true;
-   }
-   return false;
-}
-
-bool video_shader_driver_init(video_shader_ctx_init_t *init)
-{
-   void *tmp = NULL;
-
-   if (!init->shader || !init->shader->init)
-   {
-      init->shader = video_shader_set_backend(init->shader_type);
-
-      if (!init->shader)
-         return false;
-   }
-
-   tmp = init->shader->init(init->data, init->path);
-
-   if (!tmp)
-      return false;
-
-   shader_data    = tmp;
-   current_shader = init->shader;
-
-   return true;
-}
-
-bool video_shader_driver_get_feedback_pass(unsigned *data)
-{
-   if (     current_shader 
-         && current_shader->get_feedback_pass
-         && current_shader->get_feedback_pass(shader_data, data))
-      return true;
-   return false;
-}
-
-bool video_shader_driver_mipmap_input(unsigned *index)
-{
-   if (     current_shader 
-         && current_shader->mipmap_input(shader_data, *index))
-      return true;
-   return false;
-}
-
-bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler)
-{
-   if (!scaler || !scaler->scale)
-      return false;
-
-   scaler->scale->valid = false;
-
-   if (!current_shader || !current_shader->shader_scale)
-      return false;
-
-   current_shader->shader_scale(shader_data, scaler->idx, scaler->scale);
-   return true;
-}
-
-bool video_shader_driver_info(video_shader_ctx_info_t *shader_info)
-{
-   if (!shader_info || !current_shader)
-      return false;
-
-   shader_info->num = 0;
-   if (current_shader->num_shaders)
-      shader_info->num = current_shader->num_shaders(shader_data);
-   return true;
-}
-
-bool video_shader_driver_filter_type(video_shader_ctx_filter_t *filter)
-{
-   if (     filter
-         && current_shader 
-         && current_shader->filter_type 
-         && current_shader->filter_type(shader_data,
-            filter->index, filter->smooth))
-      return true;
-   return false;
-}
-
-bool video_shader_driver_compile_program(struct shader_program_info *program_info)
-{
-   if (!current_shader || !program_info)
-      return false;
-   return current_shader->compile_program(program_info->data,
-         program_info->idx, NULL, program_info);
-}
-
-bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap)
-{
-   if (!current_shader || !current_shader->wrap_type)
-      return false;
-   wrap->type = current_shader->wrap_type(shader_data, wrap->idx);
-   return true;
-}
diff --git a/gfx/video_shader_driver.h b/gfx/video_shader_driver.h
deleted file mode 100644
index fe5996c406..0000000000
--- a/gfx/video_shader_driver.h
+++ /dev/null
@@ -1,333 +0,0 @@
-/*  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/>.
- */
-
-#ifndef VIDEO_SHADER_DRIVER_H__
-#define VIDEO_SHADER_DRIVER_H__
-
-#include <boolean.h>
-#include <retro_common_api.h>
-
-#include <gfx/math/matrix_4x4.h>
-
-#include "video_coord_array.h"
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-#if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_SLANG)
-#ifndef HAVE_SHADER_MANAGER
-#define HAVE_SHADER_MANAGER
-#endif
-
-#include "video_shader_parse.h"
-
-#define VIDEO_SHADER_STOCK_BLEND (GFX_MAX_SHADERS - 1)
-#define VIDEO_SHADER_MENU        (GFX_MAX_SHADERS - 2)
-#define VIDEO_SHADER_MENU_2      (GFX_MAX_SHADERS - 3)
-#define VIDEO_SHADER_MENU_3      (GFX_MAX_SHADERS - 4)
-#define VIDEO_SHADER_MENU_4      (GFX_MAX_SHADERS - 5)
-#define VIDEO_SHADER_MENU_5      (GFX_MAX_SHADERS - 6)
-
-#endif
-
-#if defined(_XBOX360)
-#define DEFAULT_SHADER_TYPE RARCH_SHADER_HLSL
-#elif defined(__PSL1GHT__) || defined(HAVE_OPENGLES2) || defined(HAVE_GLSL)
-#define DEFAULT_SHADER_TYPE RARCH_SHADER_GLSL
-#elif defined(__CELLOS_LV2__) || defined(HAVE_CG)
-#define DEFAULT_SHADER_TYPE RARCH_SHADER_CG
-#else
-#define DEFAULT_SHADER_TYPE RARCH_SHADER_NONE
-#endif
-
-#include "video_context_driver.h"
-
-RETRO_BEGIN_DECLS
-
-enum shader_uniform_type
-{
-   UNIFORM_1F = 0,
-   UNIFORM_2F,
-   UNIFORM_3F,
-   UNIFORM_4F,
-   UNIFORM_1FV,
-   UNIFORM_2FV,
-   UNIFORM_3FV,
-   UNIFORM_4FV,
-   UNIFORM_1I
-};
-
-enum shader_program_type
-{
-   SHADER_PROGRAM_VERTEX = 0,
-   SHADER_PROGRAM_FRAGMENT,
-   SHADER_PROGRAM_COMBINED
-};
-
-struct shader_program_info
-{
-   void *data;
-   const char *vertex;
-   const char *fragment;
-   const char *combined;
-   unsigned idx;
-   bool is_file;
-};
-
-struct uniform_info
-{
-   unsigned type; /* shader uniform type */
-   bool enabled;
-
-   int32_t location;
-   int32_t count;
-
-   struct
-   {
-      enum shader_program_type type;
-      const char *ident;
-      uint32_t idx;
-      bool add_prefix;
-      bool enable;
-   } lookup;
-
-   struct
-   {
-      struct
-      {
-         intptr_t v0;
-         intptr_t v1;
-         intptr_t v2;
-         intptr_t v3;
-      } integer;
-
-      intptr_t *integerv;
-
-      struct
-      {
-         uintptr_t v0;
-         uintptr_t v1;
-         uintptr_t v2;
-         uintptr_t v3;
-      } unsigned_integer;
-
-      uintptr_t *unsigned_integerv;
-
-      struct
-      {
-         float v0;
-         float v1;
-         float v2;
-         float v3;
-      } f;
-
-      float *floatv;
-   } result;
-};
-
-typedef struct shader_backend
-{
-   void *(*init)(void *data, const char *path);
-   void (*deinit)(void *data);
-
-   /* Set shader parameters. */
-   void (*set_params)(void *data, void *shader_data,
-         unsigned width, unsigned height, 
-         unsigned tex_width, unsigned tex_height, 
-         unsigned out_width, unsigned out_height,
-         unsigned frame_counter,
-         const void *info, 
-         const void *prev_info,
-         const void *feedback_info,
-         const void *fbo_info, unsigned fbo_info_cnt);
-
-   void (*set_uniform_parameter)(void *data, struct uniform_info *param,
-         void *uniform_data);
-
-   /* Compile a shader program. */
-   bool (*compile_program)(void *data, unsigned idx,
-         void *program_data, struct shader_program_info *program_info);
-
-   /* Use a shader program specified by variable 'index'. */
-   void (*use)(void *data, void *shader_data, unsigned index, bool set_active);
-
-   /* Returns the number of currently loaded shaders. */
-   unsigned (*num_shaders)(void *data);
-
-   bool (*filter_type)(void *data, unsigned index, bool *smooth);
-   enum gfx_wrap_type (*wrap_type)(void *data, unsigned index);
-   void (*shader_scale)(void *data,
-         unsigned index, struct gfx_fbo_scale *scale);
-   bool (*set_coords)(void *handle_data,
-         void *shader_data, const struct video_coords *coords);
-   bool (*set_coords_fallback)(void *handle_data,
-         void *shader_data, const struct video_coords *coords);
-   bool (*set_mvp)(void *data, void *shader_data,
-         const math_matrix_4x4 *mat);
-   unsigned (*get_prev_textures)(void *data);
-   bool (*get_feedback_pass)(void *data, unsigned *pass);
-   bool (*mipmap_input)(void *data, unsigned index);
-
-   struct video_shader *(*get_current_shader)(void *data);
-
-   enum rarch_shader_type type;
-
-   /* Human readable string. */
-   const char *ident;
-} shader_backend_t;
-
-typedef struct video_shader_ctx_init
-{
-   enum rarch_shader_type shader_type;
-   const shader_backend_t *shader;
-   struct
-   {
-      bool core_context_enabled;
-   } gl;
-   void *data;
-   const char *path;
-} video_shader_ctx_init_t;
-
-typedef struct video_shader_ctx_params
-{
-   void *data;
-   unsigned width;
-   unsigned height;
-   unsigned tex_width;
-   unsigned tex_height;
-   unsigned out_width;
-   unsigned out_height;
-   unsigned frame_counter;
-   const void *info;
-   const void *prev_info;
-   const void *feedback_info;
-   const void *fbo_info;
-   unsigned fbo_info_cnt;
-} video_shader_ctx_params_t;
-
-typedef struct video_shader_ctx_coords
-{
-   void *handle_data;
-   const void *data;
-} video_shader_ctx_coords_t;
-
-typedef struct video_shader_ctx_scale
-{
-   unsigned idx;
-   struct gfx_fbo_scale *scale;
-} video_shader_ctx_scale_t;
-
-typedef struct video_shader_ctx_info
-{
-   bool set_active;
-   unsigned num;
-   unsigned idx;
-   void *data;
-} video_shader_ctx_info_t;
-
-typedef struct video_shader_ctx_mvp
-{
-   void *data;
-   const math_matrix_4x4 *matrix;
-} video_shader_ctx_mvp_t;
-
-typedef struct video_shader_ctx_filter
-{
-   unsigned index;
-   bool *smooth;
-} video_shader_ctx_filter_t;
-
-typedef struct video_shader_ctx_wrap
-{
-   unsigned idx;
-   enum gfx_wrap_type type;
-} video_shader_ctx_wrap_t;
-
-typedef struct video_shader_ctx
-{
-   struct video_shader *data;
-} video_shader_ctx_t;
-
-typedef struct video_shader_ctx_ident
-{
-   const char *ident;
-} video_shader_ctx_ident_t;
-
-typedef struct video_shader_ctx_texture
-{
-   unsigned id;
-} video_shader_ctx_texture_t;
-
-bool video_shader_driver_get_prev_textures(video_shader_ctx_texture_t *texture);
-
-bool video_shader_driver_get_ident(video_shader_ctx_ident_t *ident);
-
-bool video_shader_driver_get_current_shader(video_shader_ctx_t *shader);
-
-bool video_shader_driver_direct_get_current_shader(video_shader_ctx_t *shader);
-
-bool video_shader_driver_deinit(void);
-
-#define video_shader_driver_set_parameter(param) \
-   if (current_shader && current_shader->set_uniform_parameter) \
-      current_shader->set_uniform_parameter(shader_data, &param, NULL)
-
-#define video_shader_driver_set_parameters(params) \
-   if (current_shader && current_shader->set_params) \
-      current_shader->set_params(params.data, shader_data, params.width, params.height, params.tex_width, params.tex_height, params.out_width, params.out_height, params.frame_counter, params.info, params.prev_info, params.feedback_info, params.fbo_info, params.fbo_info_cnt)
-
-bool video_shader_driver_init_first(void);
-
-bool video_shader_driver_init(video_shader_ctx_init_t *init);
-
-bool video_shader_driver_get_feedback_pass(unsigned *data);
-
-bool video_shader_driver_mipmap_input(unsigned *index);
-
-#define video_shader_driver_set_coords(coords) \
-   if (current_shader && current_shader->set_coords) \
-     if (!current_shader->set_coords(coords.handle_data, shader_data, (const struct video_coords*)coords.data) && current_shader->set_coords_fallback) \
-      current_shader->set_coords_fallback(coords.handle_data, shader_data, (const struct video_coords*)coords.data)
-
-bool video_shader_driver_scale(video_shader_ctx_scale_t *scaler);
-
-bool video_shader_driver_info(video_shader_ctx_info_t *shader_info);
-
-#define video_shader_driver_set_mvp(mvp) \
-   if (mvp.matrix && current_shader && current_shader->set_mvp) \
-      current_shader->set_mvp(mvp.data, shader_data, mvp.matrix) \
-
-bool video_shader_driver_filter_type(video_shader_ctx_filter_t *filter);
-
-bool video_shader_driver_compile_program(struct shader_program_info *program_info);
-
-#define video_shader_driver_use(shader_info) \
-   if (current_shader) \
-      current_shader->use(shader_info.data, shader_data, shader_info.idx, shader_info.set_active)
-
-bool video_shader_driver_wrap_type(video_shader_ctx_wrap_t *wrap);
-
-extern const shader_backend_t *current_shader;
-extern void *shader_data;
-
-extern const shader_backend_t gl_glsl_backend;
-extern const shader_backend_t hlsl_backend;
-extern const shader_backend_t gl_cg_backend;
-extern const shader_backend_t shader_null_backend;
-
-RETRO_END_DECLS
-
-#endif
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index 05661dd35b..e832a810d9 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -491,7 +491,7 @@ bool video_shader_resolve_parameters(config_file_t *conf,
       /* First try to use the more robust slang implementation to support #includes. */
       /* FIXME: The check for slang can be removed if it's sufficiently tested for
        * GLSL/Cg as well, it should be the same implementation. */
-      if ((memcmp(path_get_extension(shader->pass[i].source.path), "slang", 5) == 0) &&
+      if ((string_is_equal_fast(path_get_extension(shader->pass[i].source.path), "slang", 5)) &&
             slang_preprocess_parse_parameters(shader->pass[i].source.path, shader))
          continue;
       /* If that doesn't work, fallback to the old path.
diff --git a/gfx/video_thread_wrapper.c b/gfx/video_thread_wrapper.c
index f573e397aa..fc905d16c1 100644
--- a/gfx/video_thread_wrapper.c
+++ b/gfx/video_thread_wrapper.c
@@ -21,12 +21,12 @@
 #include <compat/strl.h>
 #include <features/features_cpu.h>
 #include <rthreads/rthreads.h>
+#include <string/stdstring.h>
 
 #include "video_thread_wrapper.h"
 #include "font_driver.h"
-#include "video_shader_driver.h"
 
-#include "../runloop.h"
+#include "../retroarch.h"
 #include "../verbosity.h"
 
 enum thread_cmd
@@ -376,7 +376,7 @@ static bool video_thread_handle_packet(
 
          thr->driver->viewport_info(thr->driver_data, &vp);
 
-         if (memcmp(&vp, &thr->read_vp, sizeof(vp)) == 0)
+         if (string_is_equal_fast(&vp, &thr->read_vp, sizeof(vp)))
          {
             /* We can read safely
              *
@@ -661,7 +661,7 @@ static bool video_thread_alive(void *data)
    bool ret;
    thread_video_t *thr = (thread_video_t*)data;
 
-   if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL))
+   if (rarch_ctl(RARCH_CTL_IS_PAUSED, NULL))
    {
       thread_packet_t pkt = { CMD_ALIVE };
 
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 5be8e8af3a..a9f82c3a75 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -153,8 +153,6 @@ CHEATS
 /*============================================================
 VIDEO CONTEXT
 ============================================================ */
-
-#include "../gfx/video_context_driver.c"
 #include "../gfx/drivers_context/gfx_null_ctx.c"
 
 #if defined(__CELLOS_LV2__)
@@ -225,11 +223,7 @@ VIDEO CONTEXT
 /*============================================================
 VIDEO SHADERS
 ============================================================ */
-
-#ifdef HAVE_SHADERS
-#include "../gfx/video_shader_driver.c"
 #include "../gfx/video_shader_parse.c"
-
 #include "../gfx/drivers_shader/shader_null.c"
 
 #ifdef HAVE_CG
@@ -246,8 +240,6 @@ VIDEO SHADERS
 #include "../gfx/drivers_shader/shader_glsl.c"
 #endif
 
-#endif
-
 /*============================================================
 VIDEO IMAGE
 ============================================================ */
@@ -418,6 +410,7 @@ FONTS
 INPUT
 ============================================================ */
 #include "../tasks/task_autodetect.c"
+#include "../tasks/task_audio_mixer.c"
 #include "../input/input_joypad_driver.c"
 #include "../input/input_config.c"
 #include "../input/input_keymaps.c"
@@ -433,6 +426,10 @@ INPUT
 #include "../input/common/x11_input_common.c"
 #endif
 
+#if defined(_WIN32) && !defined(_XBOX)
+#include "../input/drivers/winraw_input.c"
+#endif
+
 #include "../input/input_autodetect_builtin.c"
 
 #if defined(__CELLOS_LV2__)
@@ -834,7 +831,6 @@ RETROARCH
 #include "../retroarch.c"
 #include "../dirs.c"
 #include "../paths.c"
-#include "../runloop.c"
 #include "../libretro-common/queues/task_queue.c"
 
 #include "../msg_hash.c"
@@ -982,8 +978,6 @@ MENU
 #include "../menu/cbs/menu_cbs_down.c"
 #include "../menu/cbs/menu_cbs_contentlist_switch.c"
 #include "../menu/menu_shader.c"
-#include "../menu/menu_navigation.c"
-#include "../menu/menu_display.c"
 #include "../menu/menu_displaylist.c"
 #include "../menu/menu_animation.c"
 
diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index 721cf2e290..f201574ff2 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -30,7 +30,7 @@
 #endif
 
 #ifdef HAVE_MENU
-#include "../../menu/menu_display.h"
+#include "../../menu/menu_driver.h"
 #endif
 
 #include "../input_config.h"
@@ -42,7 +42,6 @@
 #include "../drivers_keyboard/keyboard_event_android.h"
 #include "../../tasks/tasks_internal.h"
 #include "../../performance_counters.h"
-#include "../../configuration.h"
 
 #define MAX_TOUCH 16
 #define MAX_NUM_KEYBOARDS 3
@@ -369,8 +368,8 @@ static void android_input_poll_main_cmd(void)
          {
             bool boolean = false;
 
-            runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
-            runloop_ctl(RUNLOOP_CTL_SET_IDLE,   &boolean);
+            rarch_ctl(RARCH_CTL_SET_PAUSED, &boolean);
+            rarch_ctl(RARCH_CTL_SET_IDLE,   &boolean);
             video_driver_unset_stub_frame();
 
             if ((android_app->sensor_state_mask
@@ -389,8 +388,8 @@ static void android_input_poll_main_cmd(void)
          {
             bool boolean = true;
 
-            runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
-            runloop_ctl(RUNLOOP_CTL_SET_IDLE,   &boolean);
+            rarch_ctl(RARCH_CTL_SET_PAUSED, &boolean);
+            rarch_ctl(RARCH_CTL_SET_IDLE,   &boolean);
             video_driver_set_stub_frame();
 
             /* Avoid draining battery while app is not being used. */
@@ -1243,7 +1242,6 @@ static bool android_input_key_pressed(void *data, int key)
 {		
    rarch_joypad_info_t joypad_info;
    android_input_t *android           = (android_input_t*)data;		
-   settings_t *settings               = config_get_ptr();		
    const struct retro_keybind *keyptr = (const struct retro_keybind*)
       &input_config_binds[0][key];
 
@@ -1254,7 +1252,7 @@ static bool android_input_key_pressed(void *data, int key)
 
    joypad_info.joy_idx        = 0;
    joypad_info.auto_binds     = input_autoconf_binds[0];
-   joypad_info.axis_threshold = settings->floats.input_axis_threshold;
+   joypad_info.axis_threshold = *(input_driver_get_float(INPUT_ACTION_AXIS_THRESHOLD));
 
    if (keyptr->valid &&		
          input_joypad_pressed(android->joypad, joypad_info,
@@ -1293,13 +1291,13 @@ static void android_input_poll(void *data)
       
       if (android_app->destroyRequested != 0)
       {
-         runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
+         rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL);
          return;
       }
 
       if (android_app->reinitRequested != 0)
       {
-         if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL))
+         if (rarch_ctl(RARCH_CTL_IS_PAUSED, NULL))
             command_event(CMD_EVENT_REINIT, NULL);
          android_app_write_cmd(android_app, APP_CMD_REINIT_DONE);
          return;
@@ -1320,13 +1318,13 @@ bool android_run_events(void *data)
    /* Check if we are exiting. */
    if (android_app->destroyRequested != 0)
    {
-      runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
+      rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL);
       return false;
    }
 
    if (android_app->reinitRequested != 0)
    {
-      if (runloop_ctl(RUNLOOP_CTL_IS_PAUSED, NULL))
+      if (rarch_ctl(RARCH_CTL_IS_PAUSED, NULL))
          command_event(CMD_EVENT_REINIT, NULL);
       android_app_write_cmd(android_app, APP_CMD_REINIT_DONE);
    }
diff --git a/input/drivers/qnx_input.c b/input/drivers/qnx_input.c
index a729dfa1b1..6e15030001 100644
--- a/input/drivers/qnx_input.c
+++ b/input/drivers/qnx_input.c
@@ -659,7 +659,7 @@ static void qnx_handle_navigator_event(
        command_event(CMD_EVENT_MENU_TOGGLE, NULL);
        return;
    shutdown:
-       runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
+       rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL);
        return;
 }
 
diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c
index 126613892d..096c11c8d6 100644
--- a/input/drivers/sdl_input.c
+++ b/input/drivers/sdl_input.c
@@ -30,7 +30,7 @@
 #include "../input_keymaps.h"
 #include "../input_keyboard.h"
 
-#include "../../gfx/video_context_driver.h"
+#include "../../gfx/video_driver.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"
 
@@ -302,7 +302,7 @@ static void sdl_grab_mouse(void *data, bool state)
       SDL_Window *w;
    };
 
-   if (memcmp(video_driver_get_ident(), "sdl2", 4) != 0)
+   if (string_is_not_equal_fast(video_driver_get_ident(), "sdl2", 4))
       return;
 
    /* First member of sdl2_video_t is the window */
diff --git a/input/drivers/udev_input.c b/input/drivers/udev_input.c
index f80ec0a318..ffb70d7aca 100644
--- a/input/drivers/udev_input.c
+++ b/input/drivers/udev_input.c
@@ -317,32 +317,32 @@ static void udev_input_handle_hotplug(udev_input_t *udev)
    action        = udev_device_get_action(dev);
    devnode       = udev_device_get_devnode(dev);
 
-   if (val_keyboard && (memcmp(val_keyboard, "1", 1) == 0) && devnode)
+   if (val_keyboard && string_is_equal_fast(val_keyboard, "1", 1) && devnode)
       devtype = "keyboard";
 
-   if (val_mouse && (memcmp(val_mouse, "1", 1) == 0) && devnode)
+   if (val_mouse && string_is_equal_fast(val_mouse, "1", 1) && devnode)
       devtype = "mouse";
 
-   if (val_touchpad && (memcmp(val_touchpad, "1", 1) == 0) && devnode)
+   if (val_touchpad && string_is_equal_fast(val_touchpad, "1", 1) && devnode)
       devtype = "touchpad";
 
    if (!devtype)
       goto end;
 
-   if (memcmp(action, "add", 3) == 0)
+   if (string_is_equal_fast(action, "add", 3))
    {
       device_handle_cb cb      = NULL;
-      if (memcmp(devtype, "keyboard", 8) == 0)
+      if (string_is_equal_fast(devtype, "keyboard", 8))
          cb = udev_handle_keyboard;
-      else if (memcmp(devtype, "touchpad", 8) == 0)
+      else if (string_is_equal_fast(devtype, "touchpad", 8))
          cb = udev_handle_touchpad;
-      else if (memcmp(devtype, "mouse", 5) == 0)
+      else if (string_is_equal_fast(devtype, "mouse", 5))
          cb = udev_handle_mouse;
 
       RARCH_LOG("[udev]: Hotplug add %s: %s.\n", devtype, devnode);
       udev_input_add_device(udev, devnode, cb);
    }
-   else if (memcmp(action, "remove", 6) == 0)
+   else if (string_is_equal_fast(action, "remove", 6))
    {
       RARCH_LOG("[udev]: Hotplug remove %s: %s.\n", devtype, devnode);
       udev_input_remove_device(udev, devnode);
diff --git a/input/drivers/winraw_input.c b/input/drivers/winraw_input.c
new file mode 100644
index 0000000000..b10dd36270
--- /dev/null
+++ b/input/drivers/winraw_input.c
@@ -0,0 +1,481 @@
+/*  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 <Windows.h>
+
+#include "../input_driver.h"
+#include "../input_keymaps.h"
+#include "../video_driver.h"
+#include "../../verbosity.h"
+
+#define WINRAW_LOG(msg) RARCH_LOG("[WINRAW]: "msg"\n")
+#define WINRAW_ERR(err) RARCH_ERR("[WINRAW]: "err"\n")
+
+#define WINRAW_SYS_WRN(fun)\
+      RARCH_WARN("[WINRAW]: "fun" failed with error %lu.\n", GetLastError())
+#define WINRAW_SYS_ERR(fun)\
+      RARCH_ERR("[WINRAW]: "fun" failed with error %lu.\n", GetLastError())
+
+typedef struct
+{
+   uint8_t keys[256];
+} winraw_keyboard_t;
+
+typedef struct
+{
+   LONG x, y, dlt_x, dlt_y;
+   LONG whl_u, whl_d;
+   bool btn_l, btn_m, btn_r;
+} winraw_mouse_t;
+
+typedef struct
+{
+   winraw_keyboard_t keyboard;
+   winraw_mouse_t mouse;
+   const input_device_driver_t *joypad;
+   HWND window;
+   bool kbd_mapp_block;
+   bool mouse_grab;
+} winraw_input_t;
+
+static winraw_keyboard_t *g_keyboard = NULL;
+static winraw_mouse_t *g_mouse       = NULL;
+
+static HWND winraw_create_window(WNDPROC wnd_proc)
+{
+   HWND wnd;
+   WNDCLASSA wc = {0};
+
+   wc.hInstance = GetModuleHandleA(NULL);
+
+   if (!wc.hInstance)
+   {
+      WINRAW_SYS_ERR("GetModuleHandleA");
+      return NULL;
+   }
+
+   wc.lpfnWndProc   = wnd_proc;
+   wc.lpszClassName = "winraw-input";
+   if (!RegisterClassA(&wc) && GetLastError() != ERROR_CLASS_ALREADY_EXISTS)
+   {
+      WINRAW_SYS_ERR("RegisterClassA");
+      return NULL;
+   }
+
+   wnd = CreateWindowExA(0, wc.lpszClassName, NULL, 0, 0, 0, 0, 0,
+         HWND_MESSAGE, NULL, NULL, NULL);
+   if (!wnd)
+   {
+      WINRAW_SYS_ERR("CreateWindowExA");
+      goto error;
+   }
+
+   return wnd;
+
+error:
+   UnregisterClassA(wc.lpszClassName, NULL);
+   return NULL;
+}
+
+static void winraw_destroy_window(HWND wnd)
+{
+   BOOL r;
+
+   if (!wnd)
+      return;
+
+   r = DestroyWindow(wnd);
+
+   if (!r)
+      WINRAW_SYS_WRN("DestroyWindow");
+
+   r = UnregisterClassA("winraw-input", NULL);
+
+   if (!r)
+      WINRAW_SYS_WRN("UnregisterClassA");
+}
+
+static bool winraw_set_keyboard_input(HWND window)
+{
+   RAWINPUTDEVICE rid;
+   BOOL r;
+
+   rid.dwFlags     = window ? 0 : RIDEV_REMOVE;
+   rid.hwndTarget  = window;
+   rid.usUsagePage = 0x01; /* generic desktop */
+   rid.usUsage     = 0x06; /* keyboard */
+
+   r               = RegisterRawInputDevices(&rid, 1, sizeof(RAWINPUTDEVICE));
+
+   if (!r)
+   {
+      WINRAW_SYS_ERR("RegisterRawInputDevices");
+      return false;
+   }
+
+   return true;
+}
+
+static bool winraw_set_mouse_input(HWND window, bool grab)
+{
+   RAWINPUTDEVICE rid;
+   BOOL r;
+
+   if (window)
+      rid.dwFlags  = grab ? RIDEV_CAPTUREMOUSE : 0;
+   else
+      rid.dwFlags  = RIDEV_REMOVE;
+
+   rid.hwndTarget  = window;
+   rid.usUsagePage = 0x01; /* generic desktop */
+   rid.usUsage     = 0x02; /* mouse */
+
+   r               = RegisterRawInputDevices(&rid, 1, sizeof(RAWINPUTDEVICE));
+
+   if (!r)
+   {
+      WINRAW_SYS_ERR("RegisterRawInputDevices");
+      return false;
+   }
+
+   return true;
+}
+
+static int16_t winraw_keyboard_state(winraw_input_t *wr, unsigned id)
+{
+   unsigned key;
+
+   if (id >= RETROK_LAST)
+      return 0;
+
+   key = input_keymaps_translate_rk_to_keysym((enum retro_key)id);
+   return wr->keyboard.keys[key];
+}
+
+static int16_t winraw_mouse_state(winraw_input_t *wr, bool abs, unsigned id)
+{
+   switch (id)
+   {
+      case RETRO_DEVICE_ID_MOUSE_X:
+         return abs ? wr->mouse.x : wr->mouse.dlt_x;
+      case RETRO_DEVICE_ID_MOUSE_Y:
+         return abs ? wr->mouse.y : wr->mouse.dlt_y;
+      case RETRO_DEVICE_ID_MOUSE_LEFT:
+         return wr->mouse.btn_l ? 1 : 0;
+      case RETRO_DEVICE_ID_MOUSE_RIGHT:
+         return wr->mouse.btn_r ? 1 : 0;
+      case RETRO_DEVICE_ID_MOUSE_WHEELUP:
+         return wr->mouse.whl_u ? 1 : 0;
+      case RETRO_DEVICE_ID_MOUSE_WHEELDOWN:
+         return wr->mouse.whl_d ? 1 : 0;
+      case RETRO_DEVICE_ID_MOUSE_MIDDLE:
+         return wr->mouse.btn_m ? 1 : 0;
+   }
+
+   return 0;
+}
+
+static int16_t winraw_joypad_state(winraw_input_t *wr,
+      rarch_joypad_info_t joypad_info,
+      const struct retro_keybind *binds,
+      unsigned port, unsigned id)
+{
+   const struct retro_keybind *bind = &binds[id];
+
+   if (!wr->kbd_mapp_block && winraw_keyboard_state(wr, bind->key))
+      return 1;
+
+   return input_joypad_pressed(wr->joypad, joypad_info, port, binds, id);
+}
+
+static LRESULT CALLBACK winraw_callback(HWND wnd, UINT msg, WPARAM wpar, LPARAM lpar)
+{
+   static uint8_t data[1024];
+   UINT r;
+   POINT crs_pos;
+   RAWINPUT *ri = (RAWINPUT*)data;
+   UINT size    = sizeof(data);
+
+   if (msg != WM_INPUT)
+      return DefWindowProcA(wnd, msg, wpar, lpar);
+
+   if (GET_RAWINPUT_CODE_WPARAM(wpar) != RIM_INPUT) /* app is in the background */
+      goto end;
+
+   r = GetRawInputData((HRAWINPUT)lpar, RID_INPUT, data, &size, sizeof(RAWINPUTHEADER));
+   if (r == (UINT)-1)
+   {
+      WINRAW_SYS_WRN("GetRawInputData");
+      goto end;
+   }
+
+   if (ri->header.dwType == RIM_TYPEKEYBOARD)
+   {
+      if (ri->data.keyboard.Message == WM_KEYDOWN)
+         g_keyboard->keys[ri->data.keyboard.VKey] = 1;
+      else if (ri->data.keyboard.Message == WM_KEYUP)
+         g_keyboard->keys[ri->data.keyboard.VKey] = 0;
+   }
+   else if (ri->header.dwType == RIM_TYPEMOUSE)
+   {
+      if (ri->data.mouse.usFlags & MOUSE_MOVE_ABSOLUTE)
+      {
+         g_mouse->x = ri->data.mouse.lLastX;
+         g_mouse->y = ri->data.mouse.lLastY;
+      }
+      else if (ri->data.mouse.lLastX || ri->data.mouse.lLastY)
+      {
+         InterlockedExchangeAdd(&g_mouse->dlt_x, ri->data.mouse.lLastX);
+         InterlockedExchangeAdd(&g_mouse->dlt_y, ri->data.mouse.lLastY);
+
+         if (!GetCursorPos(&crs_pos))
+            WINRAW_SYS_WRN("GetCursorPos");
+         else if (!ScreenToClient((HWND)video_driver_window_get(), &crs_pos))
+            WINRAW_SYS_WRN("ScreenToClient");
+         else
+         {
+            g_mouse->x = crs_pos.x;
+            g_mouse->y = crs_pos.y;
+         }
+      }
+
+      if (ri->data.mouse.usButtonFlags & RI_MOUSE_LEFT_BUTTON_DOWN)
+         g_mouse->btn_l = true;
+      else if (ri->data.mouse.usButtonFlags & RI_MOUSE_LEFT_BUTTON_UP)
+         g_mouse->btn_l = false;
+
+      if (ri->data.mouse.usButtonFlags & RI_MOUSE_MIDDLE_BUTTON_DOWN)
+         g_mouse->btn_m = true;
+      else if (ri->data.mouse.usButtonFlags & RI_MOUSE_MIDDLE_BUTTON_UP)
+         g_mouse->btn_m = false;
+
+      if (ri->data.mouse.usButtonFlags & RI_MOUSE_RIGHT_BUTTON_DOWN)
+         g_mouse->btn_r = true;
+      else if (ri->data.mouse.usButtonFlags & RI_MOUSE_RIGHT_BUTTON_UP)
+         g_mouse->btn_r = false;
+
+      if (ri->data.mouse.usButtonFlags & RI_MOUSE_WHEEL)
+      {
+         if ((SHORT)ri->data.mouse.usButtonData > 0)
+            InterlockedExchange(&g_mouse->whl_u, 1);
+         else if ((SHORT)ri->data.mouse.usButtonData < 0)
+            InterlockedExchange(&g_mouse->whl_d, 1);
+      }
+   }
+
+end:
+   DefWindowProcA(wnd, msg, wpar, lpar);
+   return 0;
+}
+
+static void *winraw_init(const char *joypad_driver)
+{
+   bool r             = false;
+   winraw_input_t *wr = (winraw_input_t *)calloc(1, sizeof(winraw_input_t));
+   g_keyboard         = (winraw_keyboard_t*)calloc(1, sizeof(winraw_keyboard_t));
+   g_mouse            = (winraw_mouse_t*)calloc(1, sizeof(winraw_mouse_t));
+
+   if (!wr || !g_keyboard || !g_mouse)
+   {
+      WINRAW_ERR("calloc failed.");
+      goto error;
+   }
+
+   WINRAW_LOG("Initializing input driver ...");
+
+   input_keymaps_init_keyboard_lut(rarch_key_map_winraw);
+
+   wr->window = winraw_create_window(winraw_callback);
+   if (!wr->window)
+   {
+      WINRAW_ERR("winraw_create_window failed.");
+      goto error;
+   }
+
+   r = winraw_set_keyboard_input(wr->window);
+   if (!r)
+   {
+      WINRAW_ERR("winraw_set_keyboard_input failed.");
+      goto error;
+   }
+
+   r = winraw_set_mouse_input(wr->window, false);
+   if (!r)
+   {
+      WINRAW_ERR("winraw_set_mouse_input failed.");
+      goto error;
+   }
+
+   wr->joypad = input_joypad_init_driver(joypad_driver, wr);
+
+   WINRAW_LOG("Input driver initialized.");
+   return wr;
+
+error:
+   if (wr && wr->window)
+   {
+      winraw_set_mouse_input(NULL, false);
+      winraw_set_keyboard_input(NULL);
+      winraw_destroy_window(wr->window);
+   }
+   free(g_mouse);
+   free(g_keyboard);
+   free(wr);
+   WINRAW_ERR("Input driver initialization failed.");
+   return NULL;
+}
+
+static void winraw_poll(void *d)
+{
+   winraw_input_t *wr = (winraw_input_t*)d;
+
+   memcpy(&wr->keyboard, g_keyboard, sizeof(winraw_keyboard_t));
+
+   wr->mouse.x = g_mouse->x;
+   wr->mouse.y = g_mouse->y;
+   wr->mouse.dlt_x = InterlockedExchange(&g_mouse->dlt_x, 0);
+   wr->mouse.dlt_y = InterlockedExchange(&g_mouse->dlt_y, 0);
+   wr->mouse.whl_u = InterlockedExchange(&g_mouse->whl_u, 0);
+   wr->mouse.whl_d = InterlockedExchange(&g_mouse->whl_d, 0);
+   wr->mouse.btn_l = g_mouse->btn_l;
+   wr->mouse.btn_m = g_mouse->btn_m;
+   wr->mouse.btn_r = g_mouse->btn_r;
+
+   if (wr->joypad)
+      wr->joypad->poll();
+}
+
+static int16_t winraw_input_state(void *d,
+      rarch_joypad_info_t joypad_info,
+      const struct retro_keybind **binds,
+      unsigned port, unsigned device, unsigned index, unsigned id)
+{
+   winraw_input_t *wr = (winraw_input_t*)d;
+
+   switch (device)
+   {
+      case RETRO_DEVICE_KEYBOARD:
+         return winraw_keyboard_state(wr, id);
+      case RETRO_DEVICE_MOUSE:
+         return winraw_mouse_state(wr, false, id);
+      case RARCH_DEVICE_MOUSE_SCREEN:
+         return winraw_mouse_state(wr, true, id);
+      case RETRO_DEVICE_JOYPAD:
+         return winraw_joypad_state(wr, joypad_info, binds[port], port, id);
+      case RETRO_DEVICE_ANALOG:
+         if (binds[port])
+            return input_joypad_analog(wr->joypad, joypad_info,
+                  port, index, id, binds[port]);
+   }
+
+   return 0;
+}
+
+static bool winraw_meta_key_pressed(void *u1, int u2)
+{
+   return false;
+}
+
+static void winraw_free(void *d)
+{
+   winraw_input_t *wr = (winraw_input_t*)d;
+
+   WINRAW_LOG("Deinitializing input driver ...");
+
+   if (wr->joypad)
+      wr->joypad->destroy();
+   winraw_set_mouse_input(NULL, false);
+   winraw_set_keyboard_input(NULL);
+   winraw_destroy_window(wr->window);
+   free(g_mouse);
+   free(g_keyboard);
+   free(wr);
+
+   WINRAW_LOG("Input driver deinitialized.");
+}
+
+static uint64_t winraw_get_capabilities(void *u)
+{
+   return RETRO_DEVICE_KEYBOARD |
+          RETRO_DEVICE_MOUSE |
+          RETRO_DEVICE_JOYPAD |
+          RETRO_DEVICE_ANALOG;
+}
+
+static void winraw_grab_mouse(void *d, bool grab)
+{
+   winraw_input_t *wr = (winraw_input_t*)d;
+   bool r;
+
+   if (grab == wr->mouse_grab)
+      return;
+
+   r = winraw_set_mouse_input(wr->window, grab);
+   if (!r)
+   {
+      WINRAW_ERR("Mouse grab failed.");
+      return;
+   }
+
+   wr->mouse_grab = grab;
+}
+
+static bool winraw_set_rumble(void *d, unsigned port,
+      enum retro_rumble_effect effect, uint16_t strength)
+{
+   winraw_input_t *wr = (winraw_input_t*)d;
+
+   return input_joypad_set_rumble(wr->joypad, port, effect, strength);
+}
+
+static const input_device_driver_t *winraw_get_joypad_driver(void *d)
+{
+   winraw_input_t *wr = (winraw_input_t*)d;
+
+   return wr->joypad;
+}
+
+static bool winraw_keyboard_mapping_is_blocked(void *d)
+{
+   winraw_input_t *wr = (winraw_input_t*)d;
+
+   return wr->kbd_mapp_block;
+}
+
+static void winraw_keyboard_mapping_set_block(void *d, bool block)
+{
+   winraw_input_t *wr = (winraw_input_t*)d;
+
+   wr->kbd_mapp_block = block;
+}
+
+input_driver_t input_winraw = {
+   winraw_init,
+   winraw_poll,
+   winraw_input_state,
+   winraw_meta_key_pressed,
+   winraw_free,
+   NULL,
+   NULL,
+   winraw_get_capabilities,
+   "raw",
+   winraw_grab_mouse,
+   NULL,
+   winraw_set_rumble,
+   winraw_get_joypad_driver,
+   NULL,
+   winraw_keyboard_mapping_is_blocked,
+   winraw_keyboard_mapping_set_block,
+};
diff --git a/input/drivers_hid/btstack_hid.c b/input/drivers_hid/btstack_hid.c
index 2d99774fa7..397c928d96 100644
--- a/input/drivers_hid/btstack_hid.c
+++ b/input/drivers_hid/btstack_hid.c
@@ -31,6 +31,7 @@
 #ifdef HAVE_DYNAMIC
 #include <dynamic/dylib.h>
 #endif
+#include <string/stdstring.h>
 
 #include "../input_defines.h"
 #include "../input_hid_driver.h"
@@ -554,8 +555,8 @@ uint32_t embedded_get_ticks(void);
 #define READ_L2CAP_LENGTH(buffer)     ( READ_BT_16(buffer, 4))
 #define READ_L2CAP_CHANNEL_ID(buffer) ( READ_BT_16(buffer, 6))
 
-#define BD_ADDR_CMP(a,b) memcmp(a,b, BD_ADDR_LEN)
-#define BD_ADDR_COPY(dest,src) memcpy(dest,src,BD_ADDR_LEN)
+#define BD_ADDR_CMP(a,b)               memcmp(a,b, BD_ADDR_LEN)
+#define BD_ADDR_COPY(dest,src)         memcpy(dest,src,BD_ADDR_LEN)
 
 void bt_store_16(uint8_t *buffer, uint16_t pos, uint16_t value);
 
diff --git a/input/drivers_joypad/dinput_joypad.c b/input/drivers_joypad/dinput_joypad.c
index 9cf7066e7c..0523921246 100644
--- a/input/drivers_joypad/dinput_joypad.c
+++ b/input/drivers_joypad/dinput_joypad.c
@@ -23,6 +23,7 @@
 
 #include <boolean.h>
 #include <compat/strl.h>
+#include <string/stdstring.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
@@ -123,7 +124,7 @@ static bool guid_is_xinput_device(const GUID* product_guid)
 
    for (i = 0; i < ARRAY_SIZE(common_xinput_guids); ++i)
    {
-      if (memcmp(product_guid, &common_xinput_guids[i], sizeof(GUID)) == 0)
+      if (string_is_equal_fast(product_guid, &common_xinput_guids[i], sizeof(GUID)))
          return true;
    }
 
diff --git a/input/drivers_joypad/gx_joypad.c b/input/drivers_joypad/gx_joypad.c
index b67ccf32ba..46347e6f54 100644
--- a/input/drivers_joypad/gx_joypad.c
+++ b/input/drivers_joypad/gx_joypad.c
@@ -323,7 +323,7 @@ static void gx_joypad_poll(void)
 #ifdef HW_RVL
    if (g_quit)
    {
-      runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
+      rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL);
       return;
    }
 
diff --git a/input/drivers_joypad/udev_joypad.c b/input/drivers_joypad/udev_joypad.c
index 8351877e81..28535b2042 100644
--- a/input/drivers_joypad/udev_joypad.c
+++ b/input/drivers_joypad/udev_joypad.c
@@ -418,15 +418,15 @@ static void udev_joypad_handle_hotplug(struct udev_device *dev)
    const char *action  = udev_device_get_action(dev);
    const char *devnode = udev_device_get_devnode(dev);
 
-   if (!val || (memcmp(val, "1", 1) != 0) || !devnode)
+   if (!val || string_is_not_equal_fast(val, "1", 1) || !devnode)
       goto end;
 
-   if (memcmp(action, "add", 3) == 0)
+   if (string_is_equal_fast(action, "add", 3))
    {
       RARCH_LOG("[udev]: Hotplug add: %s.\n", devnode);
       udev_check_device(dev, devnode);
    }
-   else if (memcmp(action, "remove", 6) == 0)
+   else if (string_is_equal_fast(action, "remove", 6))
    {
       RARCH_LOG("[udev]: Hotplug remove: %s.\n", devnode);
       udev_joypad_remove_device(devnode);
diff --git a/input/drivers_keyboard/keyboard_event_apple.c b/input/drivers_keyboard/keyboard_event_apple.c
index 507d8640b9..4373204562 100644
--- a/input/drivers_keyboard/keyboard_event_apple.c
+++ b/input/drivers_keyboard/keyboard_event_apple.c
@@ -25,8 +25,8 @@
 #include "../input_keymaps.h"
 #include "../input_keyboard.h"
 
-#include "../../runloop.h"
 #include "../../driver.h"
+#include "../../retroarch.h"
 
 #include "keyboard_event_apple.h"
 
diff --git a/input/drivers_keyboard/keyboard_event_win32.cpp b/input/drivers_keyboard/keyboard_event_win32.cpp
index 936607cba9..e81d365838 100644
--- a/input/drivers_keyboard/keyboard_event_win32.cpp
+++ b/input/drivers_keyboard/keyboard_event_win32.cpp
@@ -21,7 +21,7 @@
 #include "../input_config.h"
 #include "../input_keymaps.h"
 #include "../input_keyboard.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../gfx/common/win32_common.h"
 
 LRESULT win32_handle_keyboard_event(HWND hwnd, UINT message,
diff --git a/input/input_config.c b/input/input_config.c
index 6e2978745f..303084c958 100644
--- a/input/input_config.c
+++ b/input/input_config.c
@@ -293,13 +293,13 @@ static void parse_hat(struct retro_keybind *bind, const char *str)
       return;
    }
 
-   if      (memcmp(dir, "up", 2) == 0)
+   if      (string_is_equal_fast(dir, "up", 2))
       hat_dir = HAT_UP_MASK;
-   else if (memcmp(dir, "down", 4) == 0)
+   else if (string_is_equal_fast(dir, "down", 4))
       hat_dir = HAT_DOWN_MASK;
-   else if (memcmp(dir, "left", 4) == 0)
+   else if (string_is_equal_fast(dir, "left", 4))
       hat_dir = HAT_LEFT_MASK;
-   else if (memcmp(dir, "right", 5) == 0)
+   else if (string_is_equal_fast(dir, "right", 5))
       hat_dir = HAT_RIGHT_MASK;
 
    if (hat_dir)
diff --git a/input/input_driver.c b/input/input_driver.c
index a7dbaf9c7f..7378d92627 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -94,6 +94,9 @@ static const input_driver_t *input_drivers[] = {
 #endif
 #ifdef DJGPP
    &input_dos,
+#endif
+#ifdef _WIN32
+   &input_winraw,
 #endif
    &input_null,
    NULL,
@@ -123,6 +126,8 @@ static bool input_driver_block_libretro_input     = false;
 static bool input_driver_nonblock_state           = false;
 static bool input_driver_flushing_input           = false;
 static bool input_driver_data_own                 = false;
+static float input_driver_axis_threshold          = 0.0f;
+static unsigned input_driver_max_users            = 0;
 
 /**
  * input_driver_find_handle:
@@ -270,8 +275,7 @@ void input_poll(void)
 {
    size_t i;
    settings_t *settings           = config_get_ptr();
-   unsigned max_users             = settings->uints.input_max_users;
-   float axis_threshold           = settings->floats.input_axis_threshold;
+   unsigned max_users             = input_driver_max_users;
    
    current_input->poll(current_input_data);
 
@@ -285,7 +289,7 @@ void input_poll(void)
             libretro_input_binds[i][RARCH_TURBO_ENABLE].valid)
       {
          rarch_joypad_info_t joypad_info;
-         joypad_info.axis_threshold = axis_threshold;
+         joypad_info.axis_threshold = input_driver_axis_threshold;
          joypad_info.joy_idx        = settings->uints.input_joypad_map[i];
          joypad_info.auto_binds     = input_autoconf_binds[joypad_info.joy_idx];
 
@@ -304,7 +308,7 @@ void input_poll(void)
             overlay_ptr,
             settings->floats.input_overlay_opacity,
             settings->uints.input_analog_dpad_mode[0],
-            axis_threshold);
+            input_driver_axis_threshold);
 #endif
 
 #ifdef HAVE_COMMAND
@@ -380,7 +384,7 @@ int16_t input_state(unsigned port, unsigned device,
          {
             rarch_joypad_info_t joypad_info;
 
-            joypad_info.axis_threshold = settings->floats.input_axis_threshold;
+            joypad_info.axis_threshold = input_driver_axis_threshold;
             joypad_info.joy_idx        = settings->uints.input_joypad_map[port];
             joypad_info.auto_binds     = input_autoconf_binds[joypad_info.joy_idx];
 
@@ -478,7 +482,7 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
    unsigned i;
    const struct retro_keybind *binds[MAX_USERS];
    settings_t *settings = config_get_ptr();
-   unsigned max_users   = settings->uints.input_max_users;
+   unsigned max_users   = input_driver_max_users;
 
    for (i = 0; i < max_users; i++)
    {
@@ -497,7 +501,7 @@ void state_tracker_update_input(uint16_t *input1, uint16_t *input2)
    if (!input_driver_block_libretro_input)
    {
       rarch_joypad_info_t joypad_info;
-      joypad_info.axis_threshold = settings->floats.input_axis_threshold;
+      joypad_info.axis_threshold = input_driver_axis_threshold;
 
       for (i = 4; i < 16; i++)
       {
@@ -558,7 +562,7 @@ static INLINE bool input_menu_keys_pressed_internal(
 
          joypad_info.joy_idx        = settings->uints.input_joypad_map[port];
          joypad_info.auto_binds     = input_autoconf_binds[joypad_info.joy_idx];
-         joypad_info.axis_threshold = settings->floats.input_axis_threshold;
+         joypad_info.axis_threshold = input_driver_axis_threshold;
 
          if (sec   && input_joypad_pressed(sec,
                   joypad_info, port, input_config_binds[0], i))
@@ -679,7 +683,7 @@ uint64_t input_menu_keys_pressed(
       settings_t     *settings                     = (settings_t*)data;
       const struct retro_keybind *binds_norm       = NULL;
       const struct retro_keybind *binds_auto       = NULL;
-      unsigned max_users                           = settings->uints.input_max_users;
+      unsigned max_users                           = input_driver_max_users;
 
       if (settings->bools.menu_unified_controls && !menu_input_dialog_get_display_kb())
          return input_keys_pressed(settings, old_input, last_input,
@@ -694,7 +698,7 @@ uint64_t input_menu_keys_pressed(
 
       joypad_info.joy_idx                          = 0;
       joypad_info.auto_binds                       = NULL;
-      joypad_info.axis_threshold                   = settings->floats.input_axis_threshold;
+      joypad_info.axis_threshold                   = input_driver_axis_threshold;
 
       input_driver_block_libretro_input            = false;
       input_driver_block_hotkey                    = false;
@@ -841,7 +845,7 @@ static INLINE bool input_keys_pressed_internal(
 
       joypad_info.joy_idx        = settings->uints.input_joypad_map[0];
       joypad_info.auto_binds     = input_autoconf_binds[joypad_info.joy_idx];
-      joypad_info.axis_threshold = settings->floats.input_axis_threshold;
+      joypad_info.axis_threshold = input_driver_axis_threshold;
 
       if (bind_valid && current_input->input_state(current_input_data,
                joypad_info, &binds,
@@ -919,7 +923,7 @@ uint64_t input_keys_pressed(
 
    joypad_info.joy_idx                          = 0;
    joypad_info.auto_binds                       = NULL;
-   joypad_info.axis_threshold                   = settings->floats.input_axis_threshold;
+   joypad_info.axis_threshold                   = input_driver_axis_threshold;
    
    input_driver_block_libretro_input            = false;
    input_driver_block_hotkey                    = false;
@@ -1015,10 +1019,11 @@ void input_driver_poll(void)
 
 bool input_driver_init(void)
 {
-   settings_t *settings       = config_get_ptr();
-
    if (current_input)
+   {
+      settings_t *settings    = config_get_ptr();
       current_input_data      = current_input->init(settings->arrays.input_joypad_driver);
+   }
 
    if (!current_input_data)
       return false;
@@ -1091,10 +1096,11 @@ bool input_driver_find_driver(void)
       current_input = (const input_driver_t*)
          input_driver_find_handle(0);
 
-      if (current_input)
-         return true;
-      retroarch_fail(1, "find_input_driver()");
-      return false;
+      if (!current_input)
+      {
+         retroarch_fail(1, "find_input_driver()");
+         return false;
+      }
    }
 
    return true;
@@ -1204,12 +1210,8 @@ void input_driver_deinit_remote(void)
 {
 #ifdef HAVE_NETWORKGAMEPAD
    if (input_driver_remote)
-   {
-      settings_t *settings = config_get_ptr();
-
       input_remote_free(input_driver_remote,
-            settings->uints.input_max_users);
-   }
+            input_driver_max_users);
    input_driver_remote = NULL;
 #endif
 }
@@ -1224,7 +1226,7 @@ bool input_driver_init_remote(void)
 
    input_driver_remote = input_remote_new(
          settings->uints.network_remote_base_port,
-         settings->uints.input_max_users);
+         input_driver_max_users);
 
    if (input_driver_remote)
       return true;
@@ -1243,6 +1245,34 @@ bool input_driver_grab_mouse(void)
    return true;
 }
 
+float *input_driver_get_float(enum input_action action)
+{
+   switch (action)
+   {
+      case INPUT_ACTION_AXIS_THRESHOLD:
+         return &input_driver_axis_threshold;
+      default:
+      case INPUT_ACTION_NONE:
+         break;
+   }
+
+   return NULL;
+}
+
+unsigned *input_driver_get_uint(enum input_action action)
+{
+   switch (action)
+   {
+      case INPUT_ACTION_MAX_USERS:
+         return &input_driver_max_users;
+      default:
+      case INPUT_ACTION_NONE:
+         break;
+   }
+
+   return NULL;
+}
+
 bool input_driver_ungrab_mouse(void)
 {
    if (!current_input || !current_input->grab_mouse)
diff --git a/input/input_driver.h b/input/input_driver.h
index 64ef2b9676..d847fe2e06 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -48,6 +48,13 @@ enum input_toggle_type
    INPUT_TOGGLE_LAST
 };
 
+enum input_action
+{
+   INPUT_ACTION_NONE = 0,
+   INPUT_ACTION_AXIS_THRESHOLD,
+   INPUT_ACTION_MAX_USERS
+};
+
 struct retro_keybind
 {
    bool valid;
@@ -336,6 +343,10 @@ bool input_driver_grab_mouse(void);
 
 bool input_driver_ungrab_mouse(void);
 
+float *input_driver_get_float(enum input_action action);
+
+unsigned *input_driver_get_uint(enum input_action action);
+
 bool input_driver_is_data_ptr_same(void *data);
 
 extern input_driver_t input_android;
@@ -355,6 +366,7 @@ extern input_driver_t input_cocoa;
 extern input_driver_t input_qnx;
 extern input_driver_t input_rwebinput;
 extern input_driver_t input_dos;
+extern input_driver_t input_winraw;
 extern input_driver_t input_null;
 
 RETRO_END_DECLS
diff --git a/input/input_keyboard.c b/input/input_keyboard.c
index ddf97e9a73..5a9e813594 100644
--- a/input/input_keyboard.c
+++ b/input/input_keyboard.c
@@ -19,13 +19,13 @@
 #include <string.h>
 #include <ctype.h>
 
+#include <encodings/utf.h>
+
 #include "input_keyboard.h"
 
 #include "input_driver.h"
 
-#include <encodings/utf.h>
-
-#include "../runloop.h"
+#include "../retroarch.h"
 
 struct input_keyboard_line
 {
@@ -324,7 +324,7 @@ void input_keyboard_event(bool down, unsigned code,
    else
    {
       retro_keyboard_event_t *key_event = NULL;
-      runloop_ctl(RUNLOOP_CTL_KEY_EVENT_GET, &key_event);
+      rarch_ctl(RARCH_CTL_KEY_EVENT_GET, &key_event);
 
       if (key_event && *key_event)
          (*key_event)(down, code, character, mod);
diff --git a/input/input_keymaps.c b/input/input_keymaps.c
index 9bc933bf55..3f43db63d5 100644
--- a/input/input_keymaps.c
+++ b/input/input_keymaps.c
@@ -1515,6 +1515,109 @@ const struct rarch_key_map rarch_key_map_dos[] = {
 };
 #endif
 
+#ifdef _WIN32
+const struct rarch_key_map rarch_key_map_winraw[] = {
+   { VK_BACK, RETROK_BACKSPACE },
+   { VK_TAB, RETROK_TAB },
+   { VK_CLEAR, RETROK_CLEAR },
+   { VK_RETURN, RETROK_RETURN },
+   { VK_PAUSE, RETROK_PAUSE },
+   { VK_ESCAPE, RETROK_ESCAPE },
+   { VK_MODECHANGE, RETROK_MODE },
+   { VK_SPACE, RETROK_SPACE },
+   { VK_PRIOR, RETROK_PAGEUP },
+   { VK_NEXT, RETROK_PAGEDOWN },
+   { VK_END, RETROK_END },
+   { VK_HOME, RETROK_HOME },
+   { VK_LEFT, RETROK_LEFT },
+   { VK_UP, RETROK_UP },
+   { VK_RIGHT, RETROK_RIGHT },
+   { VK_DOWN, RETROK_DOWN },
+   { VK_PRINT, RETROK_PRINT },
+   { VK_INSERT, RETROK_INSERT },
+   { VK_DELETE, RETROK_DELETE },
+   { VK_HELP, RETROK_HELP },
+   { 0x30, RETROK_0 },
+   { 0x31, RETROK_1 },
+   { 0x32, RETROK_2 },
+   { 0x33, RETROK_3 },
+   { 0x34, RETROK_4 },
+   { 0x35, RETROK_5 },
+   { 0x36, RETROK_6 },
+   { 0x37, RETROK_7 },
+   { 0x38, RETROK_8 },
+   { 0x39, RETROK_9 },
+   { 0x41, RETROK_a },
+   { 0x42, RETROK_b },
+   { 0x43, RETROK_c },
+   { 0x44, RETROK_d },
+   { 0x45, RETROK_e },
+   { 0x46, RETROK_f },
+   { 0x47, RETROK_g },
+   { 0x48, RETROK_h },
+   { 0x49, RETROK_i },
+   { 0x4A, RETROK_j },
+   { 0x4B, RETROK_k },
+   { 0x4C, RETROK_l },
+   { 0x4D, RETROK_m },
+   { 0x4E, RETROK_n },
+   { 0x4F, RETROK_o },
+   { 0x50, RETROK_p },
+   { 0x51, RETROK_q },
+   { 0x52, RETROK_r },
+   { 0x53, RETROK_s },
+   { 0x54, RETROK_t },
+   { 0x55, RETROK_u },
+   { 0x56, RETROK_v },
+   { 0x57, RETROK_w },
+   { 0x58, RETROK_x },
+   { 0x59, RETROK_y },
+   { 0x5A, RETROK_z },
+   { VK_LWIN, RETROK_LSUPER },
+   { VK_RWIN, RETROK_RSUPER },
+   { VK_APPS, RETROK_MENU },
+   { VK_NUMPAD0, RETROK_KP0 },
+   { VK_NUMPAD1, RETROK_KP1 },
+   { VK_NUMPAD2, RETROK_KP2 },
+   { VK_NUMPAD3, RETROK_KP3 },
+   { VK_NUMPAD4, RETROK_KP4 },
+   { VK_NUMPAD5, RETROK_KP5 },
+   { VK_NUMPAD6, RETROK_KP6 },
+   { VK_NUMPAD7, RETROK_KP7 },
+   { VK_NUMPAD8, RETROK_KP8 },
+   { VK_NUMPAD9, RETROK_KP9 },
+   { VK_MULTIPLY, RETROK_KP_MULTIPLY },
+   { VK_ADD, RETROK_KP_PLUS },
+   { VK_SUBTRACT, RETROK_KP_MINUS },
+   { VK_DECIMAL, RETROK_KP_PERIOD },
+   { VK_DIVIDE, RETROK_KP_DIVIDE },
+   { VK_F1, RETROK_F1 },
+   { VK_F2, RETROK_F2 },
+   { VK_F3, RETROK_F3 },
+   { VK_F4, RETROK_F4 },
+   { VK_F5, RETROK_F5 },
+   { VK_F6, RETROK_F6 },
+   { VK_F7, RETROK_F7 },
+   { VK_F8, RETROK_F8 },
+   { VK_F9, RETROK_F9 },
+   { VK_F10, RETROK_F10 },
+   { VK_F11, RETROK_F11 },
+   { VK_F12, RETROK_F12 },
+   { VK_F13, RETROK_F13 },
+   { VK_F14, RETROK_F14 },
+   { VK_F15, RETROK_F15 },
+   { VK_NUMLOCK, RETROK_NUMLOCK },
+   { VK_SCROLL, RETROK_SCROLLOCK },
+   { VK_LSHIFT, RETROK_LSHIFT },
+   { VK_RSHIFT, RETROK_RSHIFT },
+   { VK_LCONTROL, RETROK_LCTRL },
+   { VK_RCONTROL, RETROK_RCTRL },
+   { VK_LMENU, RETROK_LALT },
+   { VK_RMENU, RETROK_RALT },
+   { 0, RETROK_UNKNOWN }
+};
+#endif
+
 static enum retro_key rarch_keysym_lut[RETROK_LAST];
 
 /**
diff --git a/input/input_keymaps.h b/input/input_keymaps.h
index df3cb48790..001727a760 100644
--- a/input/input_keymaps.h
+++ b/input/input_keymaps.h
@@ -59,6 +59,7 @@ extern const struct rarch_key_map rarch_key_map_android[];
 extern const struct rarch_key_map rarch_key_map_qnx[];
 extern const struct rarch_key_map rarch_key_map_dos[];
 extern const struct rarch_key_map rarch_key_map_wiiu[];
+extern const struct rarch_key_map rarch_key_map_winraw[];
 
 /**
  * input_keymaps_init_keyboard_lut:
diff --git a/input/input_remapping.c b/input/input_remapping.c
index 7871be75d2..17aae07ab3 100644
--- a/input/input_remapping.c
+++ b/input/input_remapping.c
@@ -22,7 +22,6 @@
 #include "input_remapping.h"
 #include "../configuration.h"
 #include "../retroarch.h"
-#include "../runloop.h"
 
 /**
  * input_remapping_load_file:
@@ -105,6 +104,7 @@ bool input_remapping_save_file(const char *path)
    char buf[PATH_MAX_LENGTH];
    char remap_file[PATH_MAX_LENGTH];
    config_file_t               *conf = NULL;
+   unsigned max_users                = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
    settings_t              *settings = config_get_ptr();
 
    buf[0] = remap_file[0]            = '\0';
@@ -123,7 +123,7 @@ bool input_remapping_save_file(const char *path)
          return false;
    }
 
-   for (i = 0; i < settings->uints.input_max_users; i++)
+   for (i = 0; i < max_users; i++)
    {
       char buf[64];
       char key_ident[RARCH_FIRST_CUSTOM_BIND + 4][128]   = {{0}};
diff --git a/intl/msg_hash_chs.c b/intl/msg_hash_chs.c
index aebc8657ec..5b13c06aca 100644
--- a/intl/msg_hash_chs.c
+++ b/intl/msg_hash_chs.c
@@ -754,7 +754,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
          snprintf(s, len,
                "当前视频驱动.");
 
-         if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+         if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
          {
             snprintf(s, len,
                   "OpenGL视频驱动. \n"
@@ -768,7 +768,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "dependent on your graphics card's \n"
                   "underlying GL driver).");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4))
          {
             snprintf(s, len,
                   "SDL 2 视频驱动.\n"
@@ -780,7 +780,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "core implementations is dependent \n"
                   "on your platform SDL implementation.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4))
          {
             snprintf(s, len,
                   "SDL 视频驱动.\n"
@@ -791,7 +791,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Performance is considered to be suboptimal. \n"
                   "Consider using it only as a last resort.");
          }
-         else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3))
          {
             snprintf(s, len,
                   "Direct3D 视频驱动. \n"
@@ -800,7 +800,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "is dependent on your graphic card's \n"
                   "underlying D3D driver).");
          }
-         else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6))
          {
             snprintf(s, len,
                   "Exynos-G2D 视频驱动. \n"
@@ -812,7 +812,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Performance for software rendered cores \n"
                   "should be optimal.");
          }
-         else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3))
          {
             snprintf(s, len,
                   "Plain DRM 视频驱动. \n"
@@ -821,7 +821,7 @@ int menu_hash_get_help_chs_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "libdrm for hardware scaling using \n"
                   "GPU overlays.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5))
          {
             snprintf(s, len,
                   "Sunxi-G2D 视频驱动. \n"
diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h
index 85e2e72553..b6558ba0ae 100644
--- a/intl/msg_hash_chs.h
+++ b/intl/msg_hash_chs.h
@@ -988,6 +988,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "连接到游戏主机")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "作为游戏主机")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "服务器地址")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS,
diff --git a/intl/msg_hash_de.c b/intl/msg_hash_de.c
index 8adadab268..d7dca703e5 100644
--- a/intl/msg_hash_de.c
+++ b/intl/msg_hash_de.c
@@ -772,7 +772,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len)
          snprintf(s, len,
                "Aktueller Grafiktreiber");
 
-         if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+         if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
          {
             snprintf(s, len,
                   "OpenGL-Grafiktreiber. \n"
@@ -785,7 +785,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "als auch bei libretro-GL-Cores, hängt von dem \n"
                   "GL-Treiber deiner Grafikkarte ab.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4))
          {
             snprintf(s, len,
                   "SDL2-Grafiktreiber.\n"
@@ -796,7 +796,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Die Leistung hängt von der SDL- \n"
                   "Implementierung deiner Plattform ab.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4))
          {
             snprintf(s, len,
                   "SDL-Grafiktreiber.\n"
@@ -808,7 +808,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "solltest diesen Treiber nur als letzte \n"
                   "Möglichkeit verwenden.");
          }
-         else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3))
          {
              snprintf(s, len,
                   "Direct3D-Grafiktreiber. \n"
@@ -817,7 +817,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Cores hängt von dem D3D-Treiber deiner \n"
                   "Grafikkarte ab.");
          }
-         else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6))
          {
             snprintf(s, len,
                   "Exynos-G2D-Grafiktreiber. \n"
@@ -829,7 +829,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Die Leistung bei software-gerendeten Cores sollte \n"
                   "optimal sein.");
          }
-         else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3))
          {
             snprintf(s, len,
                   "DRM-Grafiktreiber \n"
@@ -838,7 +838,7 @@ int menu_hash_get_help_de_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Er verwendet libdrm für Hardware-Skalierung und \n"
                   "GPU-Overlays.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5))
          {
             snprintf(s, len,
                   "Sunxi-G2D-Grafiktreiber\n"
@@ -2033,7 +2033,7 @@ const char *msg_hash_to_str_de(enum msg_hash_enums msg)
 #ifdef HAVE_MENU
    const char *ret = menu_hash_to_str_de_label_enum(msg);
 
-   if (ret && (memcmp(ret, "null", 4) != 0))
+   if (ret && (string_is_not_equal_fast(ret, "null", 4)))
       return ret;
 #endif
 
diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h
index 7783f5ea15..117425d3e9 100644
--- a/intl/msg_hash_de.h
+++ b/intl/msg_hash_de.h
@@ -979,6 +979,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "Verbinde zu einem Netplay-Host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "Starte Hosting")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "Server-Adresse")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS,
diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h
index d093f3fddb..791201f8f6 100644
--- a/intl/msg_hash_eo.h
+++ b/intl/msg_hash_eo.h
@@ -898,6 +898,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "Connect to Netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "Start hosting")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "Server Address")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_MODE,
diff --git a/intl/msg_hash_es.c b/intl/msg_hash_es.c
index 147427d1ee..d5a804242c 100644
--- a/intl/msg_hash_es.c
+++ b/intl/msg_hash_es.c
@@ -234,7 +234,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len)
          snprintf(s, len,
                "Controlador de vídeo actual.");
 
-         if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+         if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
          {
             snprintf(s, len,
                   "Controlador de vídeo OpenGL. \n"
@@ -249,7 +249,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "del controlador GL que tenga tu \n"
                   "tarjeta gráfica.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4))
          {
             snprintf(s, len,
                   "Controlador de vídeo SDL 2.\n"
@@ -261,7 +261,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "libretro por software depende de la \n"
                   "implementación SDL de tu plataforma.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4))
          {
             snprintf(s, len,
                   "Controlador de vídeo SDL.\n"
@@ -273,7 +273,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "a lo óptimo. Utilízalo únicamente como \n"
                   "último recurso.");
          }
-         else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3))
          {
             snprintf(s, len,
                   "Controlador de vídeo Direct3D. \n"
@@ -283,7 +283,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "del controlador D3D de tu tarjeta \n"
                   "gráfica.");
          }
-         else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6))
          {
             snprintf(s, len,
                   "Controlador de vídeo Exynos-G2D. \n"
@@ -297,7 +297,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "renderizados por software debería \n"
                   "ser óptimo.");
          }
-         else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3))
          {
             snprintf(s, len,
                   "Controlador de vídeo de DRM simple. \n"
@@ -308,7 +308,7 @@ int menu_hash_get_help_es_enum(enum msg_hash_enums msg, char *s, size_t len)
                   " \n"
                   "El blitting se hace por software.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5))
          {
             snprintf(s, len,
                   "Controlador de vídeo Sunxi-G2D. \n"
diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h
index ddf9b2e9d4..4517524c9e 100644
--- a/intl/msg_hash_fr.h
+++ b/intl/msg_hash_fr.h
@@ -892,6 +892,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "Connexion à l'hôte distant")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "Commencer l'hébergement")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "Adresse IP")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_MODE,
diff --git a/intl/msg_hash_it.c b/intl/msg_hash_it.c
index e7928cae74..fd996f0714 100644
--- a/intl/msg_hash_it.c
+++ b/intl/msg_hash_it.c
@@ -209,7 +209,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len)
          snprintf(s, len,
                "Driver video attuale.");
 
-         if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+         if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
          {
             snprintf(s, len,
                   "Diver video OpenGL. \n"
@@ -223,7 +223,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "dalla tua scheda grafica \n"
                   "sottostante driver GL).");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4))
          {
             snprintf(s, len,
                   "Driver video SDL 2.\n"
@@ -235,7 +235,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "renderizzati via software dipende \n"
                   "dall'implementazzione sulla tua piattaforma SDL.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4))
          {
             snprintf(s, len,
                   "Driver video SDL.\n"
@@ -246,7 +246,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Le performance sono considerate quasi ottimali. \n"
                   "Considera di usare questo soltanto come ultima scelta.");
          }
-         else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3))
          {
             snprintf(s, len,
                   "Driver video Direct3D. \n"
@@ -255,7 +255,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "software dipende dal driver D3D inerente \n"
                   "alla tua scheda video).");
          }
-         else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6))
          {
             snprintf(s, len,
                   "Exynos-G2D Video Driver. \n"
@@ -267,7 +267,7 @@ int menu_hash_get_help_it_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Le performance per i core renderizzati via software \n"
                   "dovrebbero essere ottimali.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5))
          {
             snprintf(s, len,
                   "Driver video Sunxi-G2D. \n"
diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h
index 3c93d165a1..bc1955c3bd 100644
--- a/intl/msg_hash_it.h
+++ b/intl/msg_hash_it.h
@@ -864,6 +864,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "Connetti alla rete ospite")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "Comincia ad ospitare")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "Indirizzo Server")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS,
diff --git a/intl/msg_hash_ja.c b/intl/msg_hash_ja.c
index 0f281b4969..9dfe552e5c 100644
--- a/intl/msg_hash_ja.c
+++ b/intl/msg_hash_ja.c
@@ -781,7 +781,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
          snprintf(s, len,
                "Current Video driver.");
 
-         if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+         if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
          {
             snprintf(s, len,
                   "OpenGL Video driver. \n"
@@ -795,7 +795,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "dependent on your graphics card's \n"
                   "underlying GL driver).");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4))
          {
             snprintf(s, len,
                   "SDL 2 Video driver.\n"
@@ -807,7 +807,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "core implementations is dependent \n"
                   "on your platform SDL implementation.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4))
          {
             snprintf(s, len,
                   "SDL Video driver.\n"
@@ -818,7 +818,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Performance is considered to be suboptimal. \n"
                   "Consider using it only as a last resort.");
          }
-         else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3))
          {
             snprintf(s, len,
                   "Direct3D Video driver. \n"
@@ -827,7 +827,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "is dependent on your graphic card's \n"
                   "underlying D3D driver).");
          }
-         else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6))
          {
             snprintf(s, len,
                   "Exynos-G2D Video Driver. \n"
@@ -839,7 +839,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Performance for software rendered cores \n"
                   "should be optimal.");
          }
-         else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3))
          {
             snprintf(s, len,
                   "Plain DRM Video Driver. \n"
@@ -848,7 +848,7 @@ int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "libdrm for hardware scaling using \n"
                   "GPU overlays.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5))
          {
             snprintf(s, len,
                   "Sunxi-G2D Video Driver. \n"
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index 79935229f0..d536fb9020 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -995,6 +995,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "ネットプレイサーバーに接続")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "ホストする")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "サーバーのIPアドレス")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS,
diff --git a/intl/msg_hash_ko.c b/intl/msg_hash_ko.c
index 26c6093ee8..7d77c2d7bc 100644
--- a/intl/msg_hash_ko.c
+++ b/intl/msg_hash_ko.c
@@ -770,7 +770,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) {
             snprintf(s, len,
                      "Current Video driver.");
 
-            if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+            if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
             {
                snprintf(s, len,
                      "OpenGL Video driver. \n"
@@ -784,7 +784,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) {
                      "dependent on your graphics card's \n"
                      "underlying GL driver).");
             }
-            else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4))
             {
                snprintf(s, len,
                      "SDL 2 Video driver.\n"
@@ -796,7 +796,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) {
                      "core implementations is dependent \n"
                      "on your platform SDL implementation.");
             }
-            else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4))
             {
                snprintf(s, len,
                      "SDL Video driver.\n"
@@ -807,7 +807,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) {
                      "Performance is considered to be suboptimal. \n"
                      "Consider using it only as a last resort.");
             }
-            else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3))
             {
                snprintf(s, len,
                      "Direct3D Video driver. \n"
@@ -816,7 +816,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) {
                      "is dependent on your graphic card's \n"
                      "underlying D3D driver).");
             }
-            else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6))
             {
                snprintf(s, len,
                      "Exynos-G2D Video Driver. \n"
@@ -827,7 +827,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) {
                      " \n"
                      "Performance for software rendered cores \n"
                      "should be optimal.");
-            } else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0)
+            } else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3))
             {
                snprintf(s, len,
                      "Plain DRM Video Driver. \n"
@@ -836,7 +836,7 @@ int menu_hash_get_help_ko_enum(enum msg_hash_enums msg, char *s, size_t len) {
                      "libdrm for hardware scaling using \n"
                      "GPU overlays.");
             }
-            else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5))
             {
                snprintf(s, len,
                      "Sunxi-G2D Video Driver. \n"
@@ -1999,7 +1999,7 @@ const char *msg_hash_to_str_ko(enum msg_hash_enums msg) {
 #ifdef HAVE_MENU
     const char *ret = menu_hash_to_str_ko_label_enum(msg);
 
-    if (ret && (memcmp(ret, "null", 4) != 0))
+    if (ret && (string_is_not_equal_fast(ret, "null", 4)))
        return ret;
 #endif
 
diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h
index fb14b3ba6c..07ad121361 100644
--- a/intl/msg_hash_ko.h
+++ b/intl/msg_hash_ko.h
@@ -979,6 +979,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "넷플레이 호스트 연결")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "넷플레이 호스트 시작")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "서버 주소")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS,
diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h
index 4e7a84af56..9afaeb3138 100644
--- a/intl/msg_hash_nl.h
+++ b/intl/msg_hash_nl.h
@@ -898,6 +898,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "Connect to Netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "Start hosting")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "Server Adres")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_MODE,
diff --git a/intl/msg_hash_pt_br.c b/intl/msg_hash_pt_br.c
index da206d1c50..c8aa763d6b 100644
--- a/intl/msg_hash_pt_br.c
+++ b/intl/msg_hash_pt_br.c
@@ -109,7 +109,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len)
          snprintf(s, len,
                "Driver de Vídeo em uso.");
 
-         if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+         if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
          {
             snprintf(s, len,
                   "Driver de Vídeo OpenGL. \n"
@@ -123,7 +123,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "depende do driver GL instalado em sua \n"
                   "placa de vídeo.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4))
          {
             snprintf(s, len,
                   "Driver de Vídeo SDL 2.\n"
@@ -135,7 +135,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "renderização por software depende da \n"
                   "implementação SDL de sua plataforma.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4))
          {
             snprintf(s, len,
                   "Driver de Vídeo SDL.\n"
@@ -146,7 +146,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "O desemprenho é considerado subótimo. \n"
                   "Considere seu uso apenas em último caso.");
          }
-         else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3))
          {
             snprintf(s, len,
                   "Driver de Vídeo Direct3D. \n"
@@ -155,7 +155,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "renderização por software depende do driver \n"
                   "D3D instalado em sua placa de vídeo.");
          }
-         else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6))
          {
             snprintf(s, len,
                   "Driver de Vídeo Exynos-G2D. \n"
@@ -167,7 +167,7 @@ int menu_hash_get_help_pt_br_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "O desempenho para cores de renderização por \n"
                   "software deve ser ótimo.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5))
          {
             snprintf(s, len,
                   "Driver de Vídeo Sunxi-G2D. \n"
@@ -952,930 +952,7 @@ const char *msg_hash_to_str_pt_br(enum msg_hash_enums msg)
 {
    switch (msg)
    {
-      case MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE:
-         return "Ask";
-      case MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY:
-         return "Recursos (Assets)";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES:
-         return "Quadros de Blocos de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE:
-         return "Dispositivo de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER:
-         return "Driver de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN:
-         return "Plugin de DSP de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE:
-         return "Ativar Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_FILTER_DIR:
-         return "Filtros de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY:
-         return "Latência de Áudio (ms)";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW:
-         return "Distorção Máxima de Sincronização de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_MUTE:
-         return "Silenciar Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE:
-         return "Taxa de Amostragem de Áudio (Hz)";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA:
-         return "Variação Máxima de Taxa de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER:
-         return "Driver do Amostrador de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS:
-         return "Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_SYNC:
-         return "Sincronismo de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME:
-         return "Volume de Áudio (dB)";
-      case MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL:
-         return "Intervalo de Gravação Automática de SaveRAM";
-      case MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE:
-         return "Carregar Automaticamente Arquivos de Sobreposição";
-      case MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE:
-         return "Carregar Automaticamente Arquivos Remapeados";
-      case MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE:
-         return "Não Sobrescrever SaveRAM ao Carregar Savestate";
-      case MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL:
-         return "URL Buildbot de Recursos (Assets)";
-      case MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY:
-         /* UPDATE/FIXME */ return "Descompactação";
-      case MENU_ENUM_LABEL_VALUE_CAMERA_ALLOW:
-         return "Autorizar Câmera";
-      case MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER:
-         return "Driver de Câmera";
-      case MENU_ENUM_LABEL_VALUE_CHEAT:
-         return "Cheat";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES:
-         return "Aplicar Alterações de Cheats";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH:
-         return "Cheats";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD:
-         return "Carregar Cheat";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS:
-         return "Salvar Cheat Como";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_NUM_PASSES:
-         return "Códigos de Cheat";
-      case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT:
-         return "Fechar";
-      case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS:
-         return "Carregar Configuração";
-      case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
-         return "Configurações";
-      case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
-         return "Salvar Configuração ao Sair";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Coleção";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY:
-         return "Databases de Conteúdo";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE:
-         return "Tamanho da Lista de Histórico";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS:
-         return "Menu Rápido";
-      case MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIRECTORY:
-         return "Recursos (Assets) de Cores"; /* FIXME/UPDATE */
-      case MENU_ENUM_LABEL_VALUE_CORE_CHEAT_OPTIONS:
-         return "Cheats";
-      case MENU_ENUM_LABEL_VALUE_CORE_COUNTERS:
-         return "Contadores de Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_ENABLE:
-         return "Mostrar Nome dos Cores";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFORMATION:
-         return "Informação de Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_AUTHORS:
-         return "Autores";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CATEGORIES:
-         return "Categorias";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL:
-         return "Rótulo do core";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME:
-         return "Nome do core";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE:
-         return "Firmware(s)";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES:
-         return "Licença(s)";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS:
-         return "Permissões";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS:
-         return "Extensões suportadas";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER:
-         return "Fabricante do sistema";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME:
-         return "Nome do sistema";
-      case MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS: /* UPDATE/FIXME */
-         return "Opções de Remapeamento de Controlador de Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_LIST:
-         return "Carregar Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_OPTIONS:
-         return "Opções";
-      case MENU_ENUM_LABEL_VALUE_CORE_SETTINGS:
-         return "Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE: /* TODO/FIXME */
-         return "Não Iniciar Cores Automaticamente";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
-         return "Autoextrair Arquivos Baixados";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL:
-         return "URL Buildbot de Cores";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST:
-         return "Atualização de Cores";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS:
-         return "Atualização de Core"; /* UPDATE/FIXME */
-      case MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY:
-         return "Cursores";
-      case MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER:
-         return "Gerenciador de Cursores";
-      case MENU_ENUM_LABEL_VALUE_CUSTOM_RATIO:
-         return "Relação de Aspecto Personalizada";
-      case MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER:
-         return "Gerenciador de Databases";
-      case MENU_ENUM_LABEL_VALUE_FAVORITES:
-         return "Selecionar Arquivo e Detectar Core"; /* TODO/FIXME - update */
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT:
-         return "<Diretório de Conteúdo>";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT:
-         return "<Padrão>";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE:
-         return "<Nenhum>";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND:
-         return "Diretório não encontrado.";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS:
-         return "Diretórios";
-      case MENU_ENUM_LABEL_VALUE_DISABLED:
-         return "Desativado";
-      case MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS:
-         return "Estado do Drive de Disco";
-      case MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND:
-         return "Anexar Imagem de Disco";
-      case MENU_ENUM_LABEL_VALUE_DISK_INDEX:
-         return "Índice de Discos";
-      case MENU_ENUM_LABEL_VALUE_DISK_OPTIONS:    /* UPDATE/FIXME */
-         return "Opções de Disco do Core";
-      case MENU_ENUM_LABEL_VALUE_DONT_CARE:
-         return "Tanto faz";
-      case MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE:
-         return "Ativar Sobreposição de DPI";
-      case MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE:
-         return "Sobreposição de DPI";
-      case MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS:
-         return "Drivers";
-      case MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN:
-         return "Desligar Core Dummy On";
-      case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER:
-         return "Papel de Parede Dinâmico";
-      case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
-         return "Papéis de Parede Dinâmicos";
-      case MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR:
-         return "Cor de Realce do Menu Inicial";
-      case MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR:
-         return "Cor do Menu Inicial";
-      case MENU_ENUM_LABEL_VALUE_FALSE:
-         return "Falso";
-      case MENU_ENUM_LABEL_VALUE_FASTFORWARD_RATIO:
-         return "Velocidade Máxima de Execução";
-      case MENU_ENUM_LABEL_VALUE_FPS_SHOW:
-         return "Mostrar Taxa de Quadros";
-      case MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE:
-         return "Limitar Velocidade Máxima de Execução";
-      case MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS:
-         return "Definições do Limitador de Quadros";
-      case MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS:
-         return "Contadores do Frontend";
-      case MENU_ENUM_LABEL_VALUE_HELP:
-         return "Ajuda";
-      case MENU_ENUM_LABEL_VALUE_HISTORY_LIST_ENABLE:
-         return "Ativar Lista de Histórico";
-      case MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU:
-         return "Horizontal Menu"; /* FIXME - don't edit this yet. */
-      case MENU_ENUM_LABEL_VALUE_INFORMATION_LIST:
-         return "Informação";
-      case MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE:
-         return "Ativar Autoconfiguração";
-      case MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD:
-         return "Limiar de Eixo do Controlador";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND:
-         return "Esconder Descritores de Entradas sem Uso";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW:
-         return "Mostrar Rótulos de Entradas de Core";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DRIVER:
-         return "Driver de Controlador";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE:
-         return "Ciclo de Trabalho";
-      case MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS:
-         return "Associação de Teclas de Atalho";
-      case MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS:
-         return "Usuários Máximos";
-      case MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE:
-         return "Mostrar Overlay de Teclado";
-      case MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE:
-         return "Mostrar Overlay";
-      case MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY:
-         return "Remapeamentos de Controladores";
-      case MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE:
-         return "Ativar Remapeamentos";
-      case MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS:
-         return "Entradas";
-      case MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD:
-         return "Período de Turbo";
-      case MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS:
-         return "Usuário %u";
-      case MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR:
-         return "Autoconfigurações de Dispositivos de Entrada";
-      case MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER:
-         return "Driver de Joypad";
-      case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED:
-         return "Chinês (Simplificado)";
-      case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL:
-         return "Chinês (Tradicional)";
-      case MENU_ENUM_LABEL_VALUE_LANG_DUTCH:
-         return "Holandês";
-      case MENU_ENUM_LABEL_VALUE_LANG_ENGLISH:
-         return "Inglês";
-      case MENU_ENUM_LABEL_VALUE_LANG_ESPERANTO:
-         return "Esperanto";
-      case MENU_ENUM_LABEL_VALUE_LANG_FRENCH:
-         return "Francês";
-      case MENU_ENUM_LABEL_VALUE_LANG_GERMAN:
-         return "Alemão";
-      case MENU_ENUM_LABEL_VALUE_LANG_ITALIAN:
-         return "Italiano";
-      case MENU_ENUM_LABEL_VALUE_LANG_JAPANESE:
-         return "Japonês";
-      case MENU_ENUM_LABEL_VALUE_LANG_KOREAN:
-         return "Coreano";
-      case MENU_ENUM_LABEL_VALUE_LANG_PORTUGUESE_BRAZIL:
-         return "Português (Brasileiro)";
-      case MENU_ENUM_LABEL_VALUE_LANG_PORTUGUESE_PORTUGAL:
-         return "Português (Portugal)";
-      case MENU_ENUM_LABEL_VALUE_LANG_RUSSIAN:
-         return "Russo";
-      case MENU_ENUM_LABEL_VALUE_LANG_SPANISH:
-         return "Espanhol";
-      case MENU_ENUM_LABEL_VALUE_LEFT_ANALOG:
-         return "Analógico Esquerdo";
-      case MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH:
-         return "Cores";
-      case MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH:
-         return "Informações de Cores";
-      case MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL:
-         return "Nível de Registro de Core";
-      case MENU_ENUM_LABEL_VALUE_LINEAR:
-         return "Linear";
-      case MENU_ENUM_LABEL_VALUE_LOAD_ARCHIVE:
-         return "Carregar Arquivo";
-      case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
-         return "Selecionar do Histórico";
-      case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST:
-         return "Carregar Conteúdo";
-      case MENU_ENUM_LABEL_VALUE_LOAD_STATE:
-         return "Carregar Savestate";
-      case MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW:
-         return "Autorizar Localização";
-      case MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER:
-         return "Driver de Localização";
-      case MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS:
-         return "Registro de Dados";
-      case MENU_ENUM_LABEL_VALUE_LOG_VERBOSITY:
-         return "Detalhamento de Registro";
-      case MENU_ENUM_LABEL_VALUE_MAIN_MENU: /* TODO/FIXME - translate */
-         return "Main Menu";
-      case MENU_ENUM_LABEL_VALUE_MANAGEMENT:
-         return "Databases";
-      case MENU_ENUM_LABEL_VALUE_MENU_DRIVER:
-         return "Driver de Menu";
-      case MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS: /* TODO/FIXME - Update */
-         return "Menu de Navegação";
-      case MENU_ENUM_LABEL_VALUE_MENU_SETTINGS:
-         return "Menu";
-      case MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER:
-         return "Papel de Parede do Menu";
-      case MENU_ENUM_LABEL_VALUE_MISSING:
-         return "Faltando";
-      case MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE:
-         return "Suporte a Mouse";
-      case MENU_ENUM_LABEL_VALUE_MULTIMEDIA_SETTINGS:
-         return "Reprodução de Mídia"; /* UPDATE/FIXME */
-      case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filtrar por Extensões Suportadas"; /* TODO/FIXME - rewrite */
-      case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
-         return "Navegação Circular";
-      case MENU_ENUM_LABEL_VALUE_NEAREST:
-         return "Nearest";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT: /* TODO: Original string changed */
-         return "Trocar Entradas de Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES:
-         return "Quadros de Retardo de Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE:
-         return "Ativar Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS: /* TODO: Original string changed */
-         return "Endereço IP";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_MODE:
-         return "Ativar Cliente de Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME:
-         return "Nome de Usuário";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATOR_MODE_ENABLE:
-         return "Ativar Espectador de Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_TCP_UDP_PORT:
-         return "Portas TCP/UDP de Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE:
-         return "Comandos de Rede";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_CMD_PORT:
-         return "Porta para Comandos de Rede";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS:
-         return "Rede";
-      case MENU_ENUM_LABEL_VALUE_NO:
-         return "Não";
-      case MENU_ENUM_LABEL_VALUE_NONE:
-         return "Nenhum";
-      case MENU_ENUM_LABEL_VALUE_NO_CORE:
-         return "Nenhum Core";
-      case MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE:
-         return "Nenhum core disponível.";
-      case MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE:
-         return "Nenhuma informação de core disponível.";
-      case MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE:
-         return "Nenhuma opção de core disponível.";
-      case MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE:
-         return "Nenhuma informação disponível.";
-      case MENU_ENUM_LABEL_VALUE_NO_ITEMS:
-         return "Nenhum item.";
-      case MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS:
-         return "Nenhum medidor de desempenho.";
-      case MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE:
-         return "Histórico vazio.";
-      case MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND:
-         return "Nenhuma definição encontrada.";
-      case MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS:
-         return "Nenhum parâmetro de shader disponível.";
-      case MENU_ENUM_LABEL_VALUE_OFF:
-         return "OFF";
-      case MENU_ENUM_LABEL_VALUE_ON:
-         return "ON";
-      case MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER:
-         return "Atualização Online";
-      case MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS:
-         return "Informações de Tela";
-      case MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE:
-         return "Abrir Arquivo";
-      case MENU_ENUM_LABEL_VALUE_OPTIONAL:
-         return "Opcional";
-      case MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY:
-         return "Overlays de Teclado";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_DIRECTORY:
-         return "Overlays";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_OPACITY:
-         return "Opacidade de Overlay";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_PRESET:
-         return "Predefinições de Overlay";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_SCALE:
-         return "Interpolação de Overlay";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_SETTINGS:
-         return "Overlay em Tela";
-      case MENU_ENUM_LABEL_VALUE_PAL60_ENABLE:
-         return "Usar Modo PAL60";
-      case MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO:
-         return "Pausar Quando o Menu for Ativado";
-      case MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE:
-         return "Não Rodar em Background";
-      case MENU_ENUM_LABEL_VALUE_PERFCNT_ENABLE:
-         return "Contadores de Desempenho";
-      case MENU_ENUM_LABEL_VALUE_PLAYLIST_DIRECTORY:
-         return "Históricos";
-      case MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS:
-         return "Histórico";
-      case MENU_ENUM_LABEL_VALUE_POINTER_ENABLE:
-         return "Suporte a Touch";
-      case MENU_ENUM_LABEL_VALUE_PORT:
-         return "Porta";
-      case MENU_ENUM_LABEL_VALUE_PRESENT:
-         return "Presente";
-      case MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS:
-         return "Configurações de Privacidade";
-      case MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH:
-         return "Sair do RetroArch";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CRC32:
-         return "CRC32";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DESCRIPTION:
-         return "Descrição";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DEVELOPER:
-         return "Desenvolvedor";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FRANCHISE:
-         return "Franquia";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_MD5:
-         return "MD5";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME:
-         return "Nome";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ORIGIN:
-         return "Origem";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PUBLISHER:
-         return "Editora";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH:
-         return "Mês de Lançamento";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_YEAR:
-         return "Ano de Lançamento";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SHA1:
-         return "SHA1";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_START_CONTENT:
-         return "Iniciar Conteúdo";
-      case MENU_ENUM_LABEL_VALUE_REBOOT:
-         return "Reiniciar";
-      case MENU_ENUM_LABEL_VALUE_RECORDING_CONFIG_DIRECTORY:
-         return "Configurações de Gravações";
-      case MENU_ENUM_LABEL_VALUE_RECORDING_OUTPUT_DIRECTORY:
-         return "Gravações";
-      case MENU_ENUM_LABEL_VALUE_RECORDING_SETTINGS:
-         return "Gravação";
-      case MENU_ENUM_LABEL_VALUE_RECORD_CONFIG:
-         return "Configurações de Gravação";
-      case MENU_ENUM_LABEL_VALUE_RECORD_DRIVER:
-         return "Driver de Gravação";
-      case MENU_ENUM_LABEL_VALUE_RECORD_ENABLE:
-         return "Ativar Gravação";
-      case MENU_ENUM_LABEL_VALUE_RECORD_PATH: /* FIXME/UPDATE */
-         return "Caminho da Gravação";
-      case MENU_ENUM_LABEL_VALUE_RECORD_USE_OUTPUT_DIRECTORY:
-         return "Diretório de Saída";
-      case MENU_ENUM_LABEL_VALUE_REMAP_FILE_LOAD:
-         return "Carregar Remapeamento";
-      case MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_CORE:
-         return "Salvar Remapeamento de Core";
-      case MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_GAME:
-         return "Salvar Remapeamento de Jogo";
-      case MENU_ENUM_LABEL_VALUE_REQUIRED:
-         return "Obrigatório";
-      case MENU_ENUM_LABEL_VALUE_RESTART_CONTENT:
-         return "Reiniciar";
-      case MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH:
-         return "Reiniciar RetroArch";
-      case MENU_ENUM_LABEL_VALUE_RESUME:
-         return "Retomar";
-      case MENU_ENUM_LABEL_VALUE_RESUME_CONTENT:
-         return "Retomar";
-      case MENU_ENUM_LABEL_VALUE_RETROKEYBOARD:
-         return "RetroTeclado";
-      case MENU_ENUM_LABEL_VALUE_RETROPAD:
-         return "RetroPad";
-      case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
-         return "Ativar Retrocesso";
-      case MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY:
-         return "Granularidade do Retrocesso";
-      case MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS:
-         return "Retrocesso";
-      case MENU_ENUM_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
-         return "Navegação";
-      case MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY:
-         return "Configurações";
-      case MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN:
-         return "Mostrar Tela de Início";
-      case MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG:
-         return "Analógico Direito";
-      case MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY:
-         return "Saves";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX:
-         return "Índice Automático de Savestates";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD:
-         return "Carregar Savestate Automaticamente";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE:
-         return "Savestate Automático";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY:
-         return "Savestates";
-      case MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG:
-         return "Salvar Nova Configuração";
-      case MENU_ENUM_LABEL_VALUE_SAVE_STATE:
-         return "Salvar Savestate";
-      case MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS:
-         return "Saves";
-      case MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY:
-         return "Escanear Diretório";
-      case MENU_ENUM_LABEL_VALUE_SCAN_FILE:
-         return "Escanear Arquivo";
-      case MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY:
-         return "<Escanear este Diretório>";
-      case MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY:
-         return "Capturas de Telas";
-      case MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION:
-         return "Resolução de Tela";
-      case MENU_ENUM_LABEL_VALUE_SEARCH:
-         return "Busca:";
-      case MENU_ENUM_LABEL_VALUE_SECONDS:
-         return "segundos";
-      case MENU_ENUM_LABEL_VALUE_SETTINGS:
-         return "Definições";
-      case MENU_ENUM_LABEL_VALUE_SHADER:
-         return "Shader";
-      case MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES:
-         return "Aplicar Alterações de Shaders";
-      case MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS:
-         return "Shaders";
-      case MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS:
-         return "Mostrar Configurações Avançadas";
-      case MENU_ENUM_LABEL_VALUE_SHUTDOWN:
-         return "Desligar";
-      case MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO:
-         return "Taxa de Câmera Lenta";
-      case MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE:
-         return "Ordenar Saves em Pastas";
-      case MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE:
-         return "Ordenar Savestates em Pastas";
-      case MENU_ENUM_LABEL_VALUE_START_CORE:
-         return "Iniciar Core";
-      case MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD:
-         return "Iniciar RetroPad Remoto";
-      case MENU_ENUM_LABEL_VALUE_STATUS:
-         return "Status";
-      case MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE:
-         return "Comandos stdin";
-      case MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE:
-         return "Suspender Proteção de Tela";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_BGM_ENABLE:
-         return "Ativar Sistema BGM";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_DIRECTORY:
-         return "System/BIOS";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:
-         return "Informação de Sistema";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_7ZIP_SUPPORT:
-         return "Suporte a 7zip";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ALSA_SUPPORT:
-         return "Suporte a ALSA";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE:
-         return "Data do build";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CG_SUPPORT:
-         return "Suporte a Cg";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COCOA_SUPPORT:
-         return "Suporte a Cocoa";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COMMAND_IFACE_SUPPORT:
-         return "Suporte a interface de comandos";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CORETEXT_SUPPORT:
-         return "Suporte a CoreText";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CPU_FEATURES:
-         return "Atributos da CPU";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_DPI:
-         return "Mostrar DPI";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_HEIGHT:
-         return "Mostrar altura (mm)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_WIDTH:
-         return "Mostrar largura (mm)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DSOUND_SUPPORT:
-         return "Suporte a DirectSound";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WASAPI_SUPPORT:
-         return "Suporte a WASAPI";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYLIB_SUPPORT:
-         return "Suporte a bibliotecas dinâmicas";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_EGL_SUPPORT:
-         return "Suporte a EGL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FBO_SUPPORT:
-         return "Suporte a OpenGL/Direct3D render-to-texture (multi-pass shaders)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FFMPEG_SUPPORT:
-         return "Suporte a FFmpeg";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FREETYPE_SUPPORT:
-         return "Suporte a FreeType";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_IDENTIFIER:
-         return "Indentificador do frontend";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_NAME:
-         return "Nome do frontend";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_OS:
-         return "OS do frontend";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION:
-         return "Versão do git";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GLSL_SUPPORT:
-         return "Suporte a GLSL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_HLSL_SUPPORT:
-         return "Suporte a HLSL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_JACK_SUPPORT:
-         return "Suporte a JACK";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_KMS_SUPPORT:
-         return "Suporte a KMS/EGL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT:
-         return "Suporte a LibretroDB";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT:
-         return "Suporte a Libusb";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT:
-         return "Suporte a análise XML libxml2";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT:
-         return "Suporte a Netplay (peer-to-peer)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT:
-         return "Suporte a interface de comandos de rede";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENAL_SUPPORT:
-         return "Suporte a OpenAL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGLES_SUPPORT:
-         return "Suporte a OpenGL ES";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGL_SUPPORT:
-         return "Suporte a OpenGL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENSL_SUPPORT:
-         return "Suporte a OpenSL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENVG_SUPPORT:
-         return "Suporte a OpenVG";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OSS_SUPPORT:
-         return "Suporte a OSS";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OVERLAY_SUPPORT:
-         return "Suporte a Overlay";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE:
-         return "Fonte de energia";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGED:
-         return "Carregado";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGING:
-         return "Carregando";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_DISCHARGING:
-         return "Descarregando";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_NO_SOURCE:
-         return "Nenhuma fonte";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PULSEAUDIO_SUPPORT:
-         return "Suporte a PulseAudio";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PYTHON_SUPPORT:
-         return "Suporte a Python (script em shaders)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RETRORATING_LEVEL:
-         return "Nível de RetroRating";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ROARAUDIO_SUPPORT:
-         return "Suporte a RoarAudio";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RPNG_SUPPORT:
-         return "Suporte a PNG (RPNG)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RSOUND_SUPPORT:
-         return "Suporte a RSound";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL2_SUPPORT:
-         return "Suporte a SDL2";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_IMAGE_SUPPORT:
-         return "Suporte a imagem SDL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_SUPPORT:
-         return "Suporte a SDL1.2";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_THREADING_SUPPORT:
-         return "Suporte a Threading";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_UDEV_SUPPORT:
-         return "Suporte a Udev";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_V4L2_SUPPORT:
-         return "Suporte a Video4Linux2";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VIDEO_CONTEXT_DRIVER:
-         return "Driver de contexto de vídeo";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WAYLAND_SUPPORT:
-         return "Suporte a Wayland";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_X11_SUPPORT:
-         return "Suporte a X11";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XAUDIO2_SUPPORT:
-         return "Suporte a XAudio2";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XVIDEO_SUPPORT:
-         return "Suporte a XVideo";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ZLIB_SUPPORT:
-         return "Suporte a Zlib";
-      case MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT:
-         return "Capturar Tela";
-      case MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE: /* TODO/FIXME - update */
-         return "Ativar Runloop de Threads de Dados";
-      case MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE:
-         return "Mostrar Hora / Data";
-      case MENU_ENUM_LABEL_VALUE_TITLE_COLOR:
-         return "Cor do Menu Título";
-      case MENU_ENUM_LABEL_VALUE_TRUE:
-         return "Verdadeiro";
-      case MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT:
-         return "Ativar UI Companion ao Iniciar";
-      case MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE:
-         return "Barra de Menu (Dica)";
-      case MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE:
-         return "Incapaz de ler arquivo compactado.";
-      case MENU_ENUM_LABEL_VALUE_UNKNOWN:
-         return "Desconhecido";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_ASSETS:
-         return "Atualizar Recursos (Assets)";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES:
-         return "Atualizar Perfis de Autoconfiguração";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_CG_SHADERS:
-         return "Atualizar Shaders Cg";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_CHEATS:
-         return "Atualizar Cheats";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES:
-         return "Atualizar Databases";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_GLSL_SHADERS:
-         return "Atualizar Shaders GLSL";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS:
-         return "Atualizar Overlays";
-      case MENU_ENUM_LABEL_VALUE_USER:
-         return "Usuário";
-      case MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS:
-         return "Interface de Usuário";
-      case MENU_ENUM_LABEL_VALUE_USER_LANGUAGE:
-         return "Idioma";
-      case MENU_ENUM_LABEL_VALUE_USER_SETTINGS:
-         return "Usuário";
-      case MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER:
-         return "Usar Visualizador de Imagens Interno";
-      case MENU_ENUM_LABEL_VALUE_USE_BUILTIN_PLAYER:
-         return "Usar Player Interno"; /* TODO/FIXME */
-      case MENU_ENUM_LABEL_VALUE_USE_THIS_DIRECTORY:
-         return "<Usar este diretório>";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE:
-         return "Permitir Rotação";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO:
-         return "Relação de Aspecto Automática";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX:
-         return "Índice de Relações de Aspecto";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION:
-         return "Inserção de Quadro Negro";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN:
-         return "Descartar Overscan (Recarregue)";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION:
-         return "Desativar Desktop Composition";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER:
-         return "Driver de Vídeo";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FILTER:
-         return "Filtro de Vídeo";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_DIR:
-         return "Filtros de Vídeo";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER:
-         return "Filtro de Cintilação";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FONT_ENABLE:
-         return "Mostrar Mensagem de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FONT_PATH:
-         return "Fonte da Mensagem de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FONT_SIZE:
-         return "Tamanho da Mensagem de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_ASPECT:
-         return "Forçar Relação de Aspecto";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE:
-         return "Forcar Desativação de sRGB FBO";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY:
-         return "Retardo de Quadro";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN:
-         return "Usar Modo Tela Cheia";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA:
-         return "Gamma de Vídeo";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD:
-         return "Ativar Gravação por GPU";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT:
-         return "Ativar Captura de Tela via GPU";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC:
-         return "Sincronizar GPU com CPU";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES:
-         return "Quadros de Sincronização entre GPU e CPU";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X:
-         return "Posição X da Mensagem de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y:
-         return "Posição Y da Mensagem de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX:
-         return "Índice de Monitores";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_POST_FILTER_RECORD:
-         return "Ativar Filtro Pós-Gravação";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE:
-         return "Taxa de Atualização de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO:
-         return "Taxa de Atualização de Quadros Estimada";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION:
-         return "Rotação";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SCALE:
-         return "Variar Escala em Janela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER:
-         return "Escala em Degraus Inteiros";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS:
-         return "Vídeo";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR:
-         return "Shaders";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES:
-         return "Número de Shaders";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS:
-         return "Parâmetros de Shader em Uso";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET:
-         return "Carregar Predefinições de Shader";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS:
-         return "Menu de Parâmetros de Shader";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS:
-         return "Salvar Predefinições de Shader Como";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT:
-         return "Ativar Contexto Compartilhado de Hardware";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH:
-         return "Filtragem Bilinear por Hardware";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER:
-         return "Ativar Filtro de Suavização";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL:
-         return "Intervalo de Permuta do Sincronismo Vertical";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_THREADED:
-         return "Vídeo em Threads";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VFILTER:
-         return "Eliminar Cintilação";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH:
-         return "Definir Largura de Tela VI";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC:
-         return "Sincronismo Vertical";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN:
-         return "Modo Tela Cheia em Janela";
-      case MENU_ENUM_LABEL_VALUE_YES:
-         return "Sim";
-      case MSG_APPENDED_DISK:
-         return "Disco anexado";
-      case MSG_APPLYING_CHEAT:
-         return "Applying cheat changes.";
-      case MSG_APPLYING_SHADER:
-         return "Aplicando shader";
-      case MSG_AUDIO_MUTED:
-         return "Áudio mudo.";
-      case MSG_AUDIO_UNMUTED:
-         return "Áudio normal.";
-      case MSG_BLOCKING_SRAM_OVERWRITE:
-         return "Bloqueando Sobrescrição de SRAM";
-      case MSG_BYTES:
-         return "bytes";
-      case MSG_CONFIG_DIRECTORY_NOT_SET:
-         return "Diretório de configurações não definido. Incapaz de salvar.";
-      case MSG_CORE_DOES_NOT_SUPPORT_SAVESTATES:
-         return "O core não suporta savestates.";
-      case MSG_COULD_NOT_READ_CONTENT_FILE:
-         return "Incapaz de ler arquivo de conteúdo";
-      case MSG_DOWNLOADING:
-         return "Baixando";
-      case MSG_EXTRACTING:
-         return "Extraindo";
-      case MSG_FAILED_TO:
-         return "Falha ao";
-      case MSG_FAILED_TO_APPLY_SHADER:
-         return "Falha ao aplicar shader.";
-      case MSG_FAILED_TO_LOAD_CONTENT:
-         return "Falha ao carregar conteúdo";
-      case MSG_FAILED_TO_LOAD_MOVIE_FILE:
-         return "Falha ao carregar vídeo";
-      case MSG_FAILED_TO_LOAD_OVERLAY:
-         return "Falha ao carregar overlay.";
-      case MSG_FAILED_TO_LOAD_STATE:
-         return "Falha ao carregar estado de";
-      case MSG_FAILED_TO_REMOVE_DISK_FROM_TRAY:
-         return "Falha ao remover disco da bandeja.";
-      case MSG_FAILED_TO_REMOVE_TEMPORARY_FILE:
-         return "Falha ao remover arquivo temporário";
-      case MSG_FAILED_TO_SAVE_SRAM:
-         return "Falha ao salvar SRAM";
-      case MSG_FAILED_TO_SAVE_STATE_TO:
-         return "Falha ao salvar estado em";
-      case MSG_FAILED_TO_START_MOVIE_RECORD:
-         return "Falha ao iniciar gravação de vídeo.";
-      case MSG_FAILED_TO_UNMUTE_AUDIO:
-         return "Falha ao desativar mudo.";
-      case MSG_GOT_INVALID_DISK_INDEX:
-         return "Índice de disco inválido.";
-      case MSG_GRAB_MOUSE_STATE:
-         return "Obter estado do mouse";
-      case MSG_LOADED_STATE_FROM_SLOT:
-         return "Estado carregado do slot #%d.";
-      case MSG_LOADED_STATE_FROM_SLOT_AUTO:
-         return "Estado carregado do slot #-1 (auto).";
-      case MSG_LOADING_STATE:
-         return "Carregando estado";
-      case MSG_PAUSED:
-         return "Pausado.";
-      case MSG_RECEIVED:
-         return "recebido";
-      case MSG_REDIRECTING_CHEATFILE_TO:
-         return "Redirecionando cheat para";
-      case MSG_REDIRECTING_SAVEFILE_TO:
-         return "Redirecionando save para";
-      case MSG_REDIRECTING_SAVESTATE_TO:
-         return "Redirecionando savestate para"; /* TODO */
-      case MSG_REMOVED_DISK_FROM_TRAY:
-         return "Disco removido da bandeja.";
-      case MSG_REMOVING_TEMPORARY_CONTENT_FILE:
-         return "Removendo conteúdo temporário";
-      case MSG_RESET:
-         return "Reiniciar";
-      case MSG_RESTARTING_RECORDING_DUE_TO_DRIVER_REINIT:
-         return "Reiniciando gravação devido a reinício de driver.";
-      case MSG_REWINDING:
-         return "Retrocedendo.";
-      case MSG_REWIND_REACHED_END:
-         return "Final do buffer de retrocesso atingido.";
-      case MSG_SAVED_STATE_TO_SLOT:
-         return "Estado salvo no slot #%d.";
-      case MSG_SAVED_STATE_TO_SLOT_AUTO:
-         return "Estado salvo no slot #-1 (auto).";
-      case MSG_SAVED_SUCCESSFULLY_TO:
-         return "Salvo com sucesso em";
-      case MSG_SAVING_RAM_TYPE:
-         return "Salvando tipo de RAM";
-      case MSG_SAVING_STATE:
-         return "Salvando estado";
-      case MSG_SCANNING:
-         return "Examinando";
-      case MSG_SCANNING_OF_DIRECTORY_FINISHED:
-         return "Exame de diretório concluído";
-      case MSG_SENDING_COMMAND:
-         return "Enviando comando";
-      case MSG_SHADER:
-         return "Shader";
-      case MSG_SKIPPING_SRAM_LOAD:
-         return "Ignorando carregamento de SRAM.";
-      case MSG_SLOW_MOTION:
-         return "Câmera lenta.";
-      case MSG_SLOW_MOTION_REWIND:
-         return "Retrocesso em câmera lenta.";
-      case MSG_STARTING_MOVIE_PLAYBACK:
-         return "Iniciando reprodução de vídeo.";
-      case MSG_STARTING_MOVIE_RECORD_TO:
-         return "Iniciando gravação de vídeo em";
-      case MSG_STATE_SIZE:
-         return "Tamanho do estado";
-      case MSG_STATE_SLOT:
-         return "Slot de estado";
-      case MSG_TO:
-         return "para";
-      case MSG_UNKNOWN:
-         return "Desconhecido";
-      case MSG_UNPAUSED:
-         return "Despausado.";
-      case MSG_UNRECOGNIZED_COMMAND:
-         return "Comando desconhecido";
-      case MSG_VIRTUAL_DISK_TRAY:
-         return "bandeja de disco virtual.";
+      #include "msg_hash_pt_br.h"
       default:
          break;
    }
diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h
index a3a38522a0..ab4c1480b6 100644
--- a/intl/msg_hash_pt_br.h
+++ b/intl/msg_hash_pt_br.h
@@ -977,6 +977,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "Conecar ao hospedeiro do netplay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "Iniciar hospedeiro do netplay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "Endereço do Servidor")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS,
diff --git a/intl/msg_hash_pt_pt.c b/intl/msg_hash_pt_pt.c
index 7139d5902a..4cee1d3487 100644
--- a/intl/msg_hash_pt_pt.c
+++ b/intl/msg_hash_pt_pt.c
@@ -109,7 +109,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len)
          snprintf(s, len,
                "Driver de Vídeo em uso.");
 
-         if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+         if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
          {
             snprintf(s, len,
                   "Driver de Vídeo OpenGL. \n"
@@ -123,7 +123,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "depende do driver GL instalado em sua \n"
                   "placa de vídeo.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4))
          {
             snprintf(s, len,
                   "Driver de Vídeo SDL 2.\n"
@@ -135,7 +135,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "renderização por software depende da \n"
                   "implementação SDL de sua plataforma.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4))
          {
             snprintf(s, len,
                   "Driver de Vídeo SDL.\n"
@@ -146,7 +146,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "O desemprenho é considerado subótimo. \n"
                   "Considere seu uso apenas em último caso.");
          }
-         else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3))
          {
             snprintf(s, len,
                   "Driver de Vídeo Direct3D. \n"
@@ -155,7 +155,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "renderização por software depende do driver \n"
                   "D3D instalado em sua placa de vídeo.");
          }
-         else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6))
          {
             snprintf(s, len,
                   "Driver de Vídeo Exynos-G2D. \n"
@@ -167,7 +167,7 @@ int menu_hash_get_help_pt_pt_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "O desempenho para cores de renderização por \n"
                   "software deve ser ótimo.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5))
          {
             snprintf(s, len,
                   "Driver de Vídeo Sunxi-G2D. \n"
@@ -952,928 +952,7 @@ const char *msg_hash_to_str_pt_pt(enum msg_hash_enums msg)
 {
    switch (msg)
    {
-      case MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE:
-         return "Ask";
-      case MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY:
-         return "Recursos (Assets)";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES:
-         return "Quadros de Blocos de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE:
-         return "Dispositivo de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER:
-         return "Driver de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN:
-         return "Plugin de DSP de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE:
-         return "Ativar Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_FILTER_DIR:
-         return "Filtros de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY:
-         return "Latência de Áudio (ms)";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW:
-         return "Distorção Máxima de Sincronização de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_MUTE:
-         return "Silenciar Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE:
-         return "Taxa de Amostragem de Áudio (Hz)";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA:
-         return "Variação Máxima de Taxa de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER:
-         return "Driver do Amostrador de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS:
-         return "Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_SYNC:
-         return "Sincronismo de Áudio";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME:
-         return "Volume de Áudio (dB)";
-      case MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL:
-         return "Intervalo de Gravação Automática de SaveRAM";
-      case MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE:
-         return "Carregar Automaticamente Arquivos de Sobreposição";
-      case MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE:
-         return "Carregar Automaticamente Arquivos Remapeados";
-      case MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE:
-         return "Não Sobrescrever SaveRAM ao Carregar Savestate";
-      case MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL:
-         return "URL Buildbot de Recursos (Assets)";
-      case MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY:
-         /* UPDATE/FIXME */ return "Descompactação";
-      case MENU_ENUM_LABEL_VALUE_CAMERA_ALLOW:
-         return "Autorizar Câmera";
-      case MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER:
-         return "Driver de Câmera";
-      case MENU_ENUM_LABEL_VALUE_CHEAT:
-         return "Cheat";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES:
-         return "Aplicar Alterações de Cheats";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH:
-         return "Cheats";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD:
-         return "Carregar Cheat";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS:
-         return "Salvar Cheat Como";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_NUM_PASSES:
-         return "Códigos de Cheat";
-      case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT:
-         return "Fechar";
-      case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS:
-         return "Carregar Configuração";
-      case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
-         return "Configurações";
-      case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
-         return "Salvar Configuração ao Sair";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Coleção";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY:
-         return "Databases de Conteúdo";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE:
-         return "Tamanho da Lista de Histórico";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS:
-         return "Menu Rápido";
-      case MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIRECTORY:
-         return "Recursos (Assets) de Cores"; /* FIXME/UPDATE */
-      case MENU_ENUM_LABEL_VALUE_CORE_CHEAT_OPTIONS:
-         return "Cheats";
-      case MENU_ENUM_LABEL_VALUE_CORE_COUNTERS:
-         return "Contadores de Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_ENABLE:
-         return "Mostrar Nome dos Cores";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFORMATION:
-         return "Informação de Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_AUTHORS:
-         return "Autores";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CATEGORIES:
-         return "Categorias";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL:
-         return "Rótulo do core";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME:
-         return "Nome do core";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE:
-         return "Firmware(s)";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES:
-         return "Licença(s)";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS:
-         return "Permissões";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS:
-         return "Extensões suportadas";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER:
-         return "Fabricante do sistema";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME:
-         return "Nome do sistema";
-      case MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS: /* UPDATE/FIXME */
-         return "Opções de Remapeamento de Controlador de Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_LIST:
-         return "Carregar Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_OPTIONS:
-         return "Opções";
-      case MENU_ENUM_LABEL_VALUE_CORE_SETTINGS:
-         return "Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE: /* TODO/FIXME */
-         return "Não Iniciar Cores Automaticamente";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
-         return "Autoextrair Arquivos Baixados";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL:
-         return "URL Buildbot de Cores";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST:
-         return "Atualização de Cores";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS:
-         return "Atualização de Core"; /* UPDATE/FIXME */
-      case MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY:
-         return "Cursores";
-      case MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER:
-         return "Gerenciador de Cursores";
-      case MENU_ENUM_LABEL_VALUE_CUSTOM_RATIO:
-         return "Relação de Aspecto Personalizada";
-      case MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER:
-         return "Gerenciador de Databases";
-      case MENU_ENUM_LABEL_VALUE_FAVORITES:
-         return "Selecionar Arquivo e Detectar Core"; /* TODO/FIXME - update */
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT:
-         return "<Diretório de Conteúdo>";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT:
-         return "<Padrão>";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE:
-         return "<Nenhum>";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND:
-         return "Diretório não encontrado.";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS:
-         return "Diretórios";
-      case MENU_ENUM_LABEL_VALUE_DISABLED:
-         return "Desativado";
-      case MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS:
-         return "Estado do Drive de Disco";
-      case MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND:
-         return "Anexar Imagem de Disco";
-      case MENU_ENUM_LABEL_VALUE_DISK_INDEX:
-         return "Índice de Discos";
-      case MENU_ENUM_LABEL_VALUE_DISK_OPTIONS:    /* UPDATE/FIXME */
-         return "Opções de Disco do Core";
-      case MENU_ENUM_LABEL_VALUE_DONT_CARE:
-         return "Tanto faz";
-      case MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE:
-         return "Ativar Sobreposição de DPI";
-      case MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE:
-         return "Sobreposição de DPI";
-      case MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS:
-         return "Drivers";
-      case MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN:
-         return "Desligar Core Dummy On";
-      case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER:
-         return "Papel de Parede Dinâmico";
-      case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
-         return "Papéis de Parede Dinâmicos";
-      case MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR:
-         return "Cor de Realce do Menu Inicial";
-      case MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR:
-         return "Cor do Menu Inicial";
-      case MENU_ENUM_LABEL_VALUE_FALSE:
-         return "Falso";
-      case MENU_ENUM_LABEL_VALUE_FASTFORWARD_RATIO:
-         return "Velocidade Máxima de Execução";
-      case MENU_ENUM_LABEL_VALUE_FPS_SHOW:
-         return "Mostrar Taxa de Quadros";
-      case MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE:
-         return "Limitar Velocidade Máxima de Execução";
-      case MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS:
-         return "Definições do Limitador de Quadros";
-      case MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS:
-         return "Contadores do Frontend";
-      case MENU_ENUM_LABEL_VALUE_HELP:
-         return "Ajuda";
-      case MENU_ENUM_LABEL_VALUE_HISTORY_LIST_ENABLE:
-         return "Ativar Lista de Histórico";
-      case MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU:
-         return "Horizontal Menu"; /* FIXME - don't edit this yet. */
-      case MENU_ENUM_LABEL_VALUE_INFORMATION_LIST:
-         return "Informação";
-      case MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE:
-         return "Ativar Autoconfiguração";
-      case MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD:
-         return "Limiar de Eixo do Controlador";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND:
-         return "Esconder Descritores de Entradas sem Uso";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW:
-         return "Mostrar Rótulos de Entradas de Core";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DRIVER:
-         return "Driver de Controlador";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE:
-         return "Ciclo de Trabalho";
-      case MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS:
-         return "Associação de Teclas de Atalho";
-      case MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS:
-         return "Usuários Máximos";
-      case MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE:
-         return "Mostrar Overlay de Teclado";
-      case MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE:
-         return "Mostrar Overlay";
-      case MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY:
-         return "Remapeamentos de Controladores";
-      case MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE:
-         return "Ativar Remapeamentos";
-      case MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS:
-         return "Entradas";
-      case MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD:
-         return "Período de Turbo";
-      case MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS:
-         return "Usuário %u";
-      case MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR:
-         return "Autoconfigurações de Dispositivos de Entrada";
-      case MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER:
-         return "Driver de Joypad";
-      case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED:
-         return "Chinês (Simplificado)";
-      case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL:
-         return "Chinês (Tradicional)";
-      case MENU_ENUM_LABEL_VALUE_LANG_DUTCH:
-         return "Holandês";
-      case MENU_ENUM_LABEL_VALUE_LANG_ENGLISH:
-         return "Inglês";
-      case MENU_ENUM_LABEL_VALUE_LANG_ESPERANTO:
-         return "Esperanto";
-      case MENU_ENUM_LABEL_VALUE_LANG_FRENCH:
-         return "Francês";
-      case MENU_ENUM_LABEL_VALUE_LANG_GERMAN:
-         return "Alemão";
-      case MENU_ENUM_LABEL_VALUE_LANG_ITALIAN:
-         return "Italiano";
-      case MENU_ENUM_LABEL_VALUE_LANG_JAPANESE:
-         return "Japonês";
-      case MENU_ENUM_LABEL_VALUE_LANG_KOREAN:
-         return "Coreano";
-      case MENU_ENUM_LABEL_VALUE_LANG_PORTUGUESE_BRAZIL:
-         return "Português (Brasileiro)";
-      case MENU_ENUM_LABEL_VALUE_LANG_PORTUGUESE_PORTUGAL:
-         return "Português (Portugal)";
-      case MENU_ENUM_LABEL_VALUE_LANG_RUSSIAN:
-         return "Russo";
-      case MENU_ENUM_LABEL_VALUE_LANG_SPANISH:
-         return "Espanhol";
-      case MENU_ENUM_LABEL_VALUE_LEFT_ANALOG:
-         return "Analógico Esquerdo";
-      case MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH:
-         return "Cores";
-      case MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH:
-         return "Informações de Cores";
-      case MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL:
-         return "Nível de Registro de Core";
-      case MENU_ENUM_LABEL_VALUE_LINEAR:
-         return "Linear";
-      case MENU_ENUM_LABEL_VALUE_LOAD_ARCHIVE:
-         return "Carregar Arquivo";
-      case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
-         return "Selecionar do Histórico";
-      case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST:
-         return "Carregar Conteúdo";
-      case MENU_ENUM_LABEL_VALUE_LOAD_STATE:
-         return "Carregar Savestate";
-      case MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW:
-         return "Autorizar Localização";
-      case MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER:
-         return "Driver de Localização";
-      case MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS:
-         return "Registro de Dados";
-      case MENU_ENUM_LABEL_VALUE_LOG_VERBOSITY:
-         return "Detalhamento de Registro";
-      case MENU_ENUM_LABEL_VALUE_MAIN_MENU: /* TODO/FIXME - translate */
-         return "Main Menu";
-      case MENU_ENUM_LABEL_VALUE_MANAGEMENT:
-         return "Databases";
-      case MENU_ENUM_LABEL_VALUE_MENU_DRIVER:
-         return "Driver de Menu";
-      case MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS: /* TODO/FIXME - Update */
-         return "Menu de Navegação";
-      case MENU_ENUM_LABEL_VALUE_MENU_SETTINGS:
-         return "Menu";
-      case MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER:
-         return "Papel de Parede do Menu";
-      case MENU_ENUM_LABEL_VALUE_MISSING:
-         return "Faltando";
-      case MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE:
-         return "Suporte a Mouse";
-      case MENU_ENUM_LABEL_VALUE_MULTIMEDIA_SETTINGS:
-         return "Reprodução de Mídia"; /* UPDATE/FIXME */
-      case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filtrar por Extensões Suportadas"; /* TODO/FIXME - rewrite */
-      case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
-         return "Navegação Circular";
-      case MENU_ENUM_LABEL_VALUE_NEAREST:
-         return "Nearest";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT: /* TODO: Original string changed */
-         return "Trocar Entradas de Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES:
-         return "Quadros de Retardo de Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE:
-         return "Ativar Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS: /* TODO: Original string changed */
-         return "Endereço IP";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_MODE:
-         return "Ativar Cliente de Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME:
-         return "Nome de Usuário";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATOR_MODE_ENABLE:
-         return "Ativar Espectador de Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_TCP_UDP_PORT:
-         return "Portas TCP/UDP de Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE:
-         return "Comandos de Rede";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_CMD_PORT:
-         return "Porta para Comandos de Rede";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS:
-         return "Rede";
-      case MENU_ENUM_LABEL_VALUE_NO:
-         return "Não";
-      case MENU_ENUM_LABEL_VALUE_NONE:
-         return "Nenhum";
-      case MENU_ENUM_LABEL_VALUE_NO_CORE:
-         return "Nenhum Core";
-      case MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE:
-         return "Nenhum core disponível.";
-      case MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE:
-         return "Nenhuma informação de core disponível.";
-      case MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE:
-         return "Nenhuma opção de core disponível.";
-      case MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE:
-         return "Nenhuma informação disponível.";
-      case MENU_ENUM_LABEL_VALUE_NO_ITEMS:
-         return "Nenhum item.";
-      case MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS:
-         return "Nenhum medidor de desempenho.";
-      case MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE:
-         return "Histórico vazio.";
-      case MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND:
-         return "Nenhuma definição encontrada.";
-      case MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS:
-         return "Nenhum parâmetro de shader disponível.";
-      case MENU_ENUM_LABEL_VALUE_OFF:
-         return "OFF";
-      case MENU_ENUM_LABEL_VALUE_ON:
-         return "ON";
-      case MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER:
-         return "Atualização Online";
-      case MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS:
-         return "Informações de Tela";
-      case MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE:
-         return "Abrir Arquivo";
-      case MENU_ENUM_LABEL_VALUE_OPTIONAL:
-         return "Opcional";
-      case MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY:
-         return "Overlays de Teclado";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_DIRECTORY:
-         return "Overlays";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_OPACITY:
-         return "Opacidade de Overlay";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_PRESET:
-         return "Predefinições de Overlay";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_SCALE:
-         return "Interpolação de Overlay";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_SETTINGS:
-         return "Overlay em Tela";
-      case MENU_ENUM_LABEL_VALUE_PAL60_ENABLE:
-         return "Usar Modo PAL60";
-      case MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO:
-         return "Pausar Quando o Menu for Ativado";
-      case MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE:
-         return "Não Rodar em Background";
-      case MENU_ENUM_LABEL_VALUE_PERFCNT_ENABLE:
-         return "Contadores de Desempenho";
-      case MENU_ENUM_LABEL_VALUE_PLAYLIST_DIRECTORY:
-         return "Históricos";
-      case MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS:
-         return "Histórico";
-      case MENU_ENUM_LABEL_VALUE_POINTER_ENABLE:
-         return "Suporte a Touch";
-      case MENU_ENUM_LABEL_VALUE_PORT:
-         return "Porta";
-      case MENU_ENUM_LABEL_VALUE_PRESENT:
-         return "Presente";
-      case MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS:
-         return "Configurações de Privacidade";
-      case MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH:
-         return "Sair do RetroArch";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CRC32:
-         return "CRC32";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DESCRIPTION:
-         return "Descrição";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DEVELOPER:
-         return "Desenvolvedor";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FRANCHISE:
-         return "Franquia";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_MD5:
-         return "MD5";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME:
-         return "Nome";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ORIGIN:
-         return "Origem";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PUBLISHER:
-         return "Editora";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH:
-         return "Mês de Lançamento";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_YEAR:
-         return "Ano de Lançamento";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SHA1:
-         return "SHA1";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_START_CONTENT:
-         return "Iniciar Conteúdo";
-      case MENU_ENUM_LABEL_VALUE_REBOOT:
-         return "Reiniciar";
-      case MENU_ENUM_LABEL_VALUE_RECORDING_CONFIG_DIRECTORY:
-         return "Configurações de Gravações";
-      case MENU_ENUM_LABEL_VALUE_RECORDING_OUTPUT_DIRECTORY:
-         return "Gravações";
-      case MENU_ENUM_LABEL_VALUE_RECORDING_SETTINGS:
-         return "Gravação";
-      case MENU_ENUM_LABEL_VALUE_RECORD_CONFIG:
-         return "Configurações de Gravação";
-      case MENU_ENUM_LABEL_VALUE_RECORD_DRIVER:
-         return "Driver de Gravação";
-      case MENU_ENUM_LABEL_VALUE_RECORD_ENABLE:
-         return "Ativar Gravação";
-      case MENU_ENUM_LABEL_VALUE_RECORD_PATH: /* FIXME/UPDATE */
-         return "Caminho da Gravação";
-      case MENU_ENUM_LABEL_VALUE_RECORD_USE_OUTPUT_DIRECTORY:
-         return "Diretório de Saída";
-      case MENU_ENUM_LABEL_VALUE_REMAP_FILE_LOAD:
-         return "Carregar Remapeamento";
-      case MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_CORE:
-         return "Salvar Remapeamento de Core";
-      case MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_GAME:
-         return "Salvar Remapeamento de Jogo";
-      case MENU_ENUM_LABEL_VALUE_REQUIRED:
-         return "Obrigatório";
-      case MENU_ENUM_LABEL_VALUE_RESTART_CONTENT:
-         return "Reiniciar";
-      case MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH:
-         return "Reiniciar RetroArch";
-      case MENU_ENUM_LABEL_VALUE_RESUME:
-         return "Retomar";
-      case MENU_ENUM_LABEL_VALUE_RESUME_CONTENT:
-         return "Retomar";
-      case MENU_ENUM_LABEL_VALUE_RETROKEYBOARD:
-         return "RetroTeclado";
-      case MENU_ENUM_LABEL_VALUE_RETROPAD:
-         return "RetroPad";
-      case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
-         return "Ativar Retrocesso";
-      case MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY:
-         return "Granularidade do Retrocesso";
-      case MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS:
-         return "Retrocesso";
-      case MENU_ENUM_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
-         return "Navegação";
-      case MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY:
-         return "Configurações";
-      case MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN:
-         return "Mostrar Tela de Início";
-      case MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG:
-         return "Analógico Direito";
-      case MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY:
-         return "Saves";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX:
-         return "Índice Automático de Savestates";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD:
-         return "Carregar Savestate Automaticamente";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE:
-         return "Savestate Automático";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY:
-         return "Savestates";
-      case MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG:
-         return "Salvar Nova Configuração";
-      case MENU_ENUM_LABEL_VALUE_SAVE_STATE:
-         return "Salvar Savestate";
-      case MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS:
-         return "Saves";
-      case MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY:
-         return "Escanear Diretório";
-      case MENU_ENUM_LABEL_VALUE_SCAN_FILE:
-         return "Escanear Arquivo";
-      case MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY:
-         return "<Escanear este Diretório>";
-      case MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY:
-         return "Capturas de Telas";
-      case MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION:
-         return "Resolução de Tela";
-      case MENU_ENUM_LABEL_VALUE_SEARCH:
-         return "Busca:";
-      case MENU_ENUM_LABEL_VALUE_SECONDS:
-         return "segundos";
-      case MENU_ENUM_LABEL_VALUE_SETTINGS:
-         return "Definições";
-      case MENU_ENUM_LABEL_VALUE_SHADER:
-         return "Shader";
-      case MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES:
-         return "Aplicar Alterações de Shaders";
-      case MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS:
-         return "Shaders";
-      case MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS:
-         return "Mostrar Configurações Avançadas";
-      case MENU_ENUM_LABEL_VALUE_SHUTDOWN:
-         return "Desligar";
-      case MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO:
-         return "Taxa de Câmera Lenta";
-      case MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE:
-         return "Ordenar Saves em Pastas";
-      case MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE:
-         return "Ordenar Savestates em Pastas";
-      case MENU_ENUM_LABEL_VALUE_START_CORE:
-         return "Iniciar Core";
-      case MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD:
-         return "Iniciar RetroPad Remoto";
-      case MENU_ENUM_LABEL_VALUE_STATUS:
-         return "Status";
-      case MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE:
-         return "Comandos stdin";
-      case MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE:
-         return "Suspender Proteção de Tela";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_BGM_ENABLE:
-         return "Ativar Sistema BGM";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_DIRECTORY:
-         return "System/BIOS";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:
-         return "Informação de Sistema";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_7ZIP_SUPPORT:
-         return "Suporte a 7zip";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ALSA_SUPPORT:
-         return "Suporte a ALSA";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE:
-         return "Data do build";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CG_SUPPORT:
-         return "Suporte a Cg";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COCOA_SUPPORT:
-         return "Suporte a Cocoa";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COMMAND_IFACE_SUPPORT:
-         return "Suporte a interface de comandos";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CORETEXT_SUPPORT:
-         return "Suporte a CoreText";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CPU_FEATURES:
-         return "Atributos da CPU";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_DPI:
-         return "Mostrar DPI";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_HEIGHT:
-         return "Mostrar altura (mm)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_WIDTH:
-         return "Mostrar largura (mm)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DSOUND_SUPPORT:
-         return "Suporte a DirectSound";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYLIB_SUPPORT:
-         return "Suporte a bibliotecas dinâmicas";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_EGL_SUPPORT:
-         return "Suporte a EGL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FBO_SUPPORT:
-         return "Suporte a OpenGL/Direct3D render-to-texture (multi-pass shaders)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FFMPEG_SUPPORT:
-         return "Suporte a FFmpeg";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FREETYPE_SUPPORT:
-         return "Suporte a FreeType";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_IDENTIFIER:
-         return "Indentificador do frontend";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_NAME:
-         return "Nome do frontend";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_OS:
-         return "OS do frontend";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION:
-         return "Versão do git";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GLSL_SUPPORT:
-         return "Suporte a GLSL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_HLSL_SUPPORT:
-         return "Suporte a HLSL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_JACK_SUPPORT:
-         return "Suporte a JACK";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_KMS_SUPPORT:
-         return "Suporte a KMS/EGL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT:
-         return "Suporte a LibretroDB";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT:
-         return "Suporte a Libusb";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT:
-         return "Suporte a análise XML libxml2";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT:
-         return "Suporte a Netplay (peer-to-peer)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT:
-         return "Suporte a interface de comandos de rede";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENAL_SUPPORT:
-         return "Suporte a OpenAL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGLES_SUPPORT:
-         return "Suporte a OpenGL ES";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGL_SUPPORT:
-         return "Suporte a OpenGL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENSL_SUPPORT:
-         return "Suporte a OpenSL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENVG_SUPPORT:
-         return "Suporte a OpenVG";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OSS_SUPPORT:
-         return "Suporte a OSS";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OVERLAY_SUPPORT:
-         return "Suporte a Overlay";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE:
-         return "Fonte de energia";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGED:
-         return "Carregado";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGING:
-         return "Carregando";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_DISCHARGING:
-         return "Descarregando";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_NO_SOURCE:
-         return "Nenhuma fonte";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PULSEAUDIO_SUPPORT:
-         return "Suporte a PulseAudio";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PYTHON_SUPPORT:
-         return "Suporte a Python (script em shaders)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RETRORATING_LEVEL:
-         return "Nível de RetroRating";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ROARAUDIO_SUPPORT:
-         return "Suporte a RoarAudio";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RPNG_SUPPORT:
-         return "Suporte a PNG (RPNG)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RSOUND_SUPPORT:
-         return "Suporte a RSound";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL2_SUPPORT:
-         return "Suporte a SDL2";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_IMAGE_SUPPORT:
-         return "Suporte a imagem SDL";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_SUPPORT:
-         return "Suporte a SDL1.2";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_THREADING_SUPPORT:
-         return "Suporte a Threading";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_UDEV_SUPPORT:
-         return "Suporte a Udev";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_V4L2_SUPPORT:
-         return "Suporte a Video4Linux2";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VIDEO_CONTEXT_DRIVER:
-         return "Driver de contexto de vídeo";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WAYLAND_SUPPORT:
-         return "Suporte a Wayland";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_X11_SUPPORT:
-         return "Suporte a X11";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XAUDIO2_SUPPORT:
-         return "Suporte a XAudio2";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XVIDEO_SUPPORT:
-         return "Suporte a XVideo";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ZLIB_SUPPORT:
-         return "Suporte a Zlib";
-      case MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT:
-         return "Capturar Tela";
-      case MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE: /* TODO/FIXME - update */
-         return "Ativar Runloop de Threads de Dados";
-      case MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE:
-         return "Mostrar Hora / Data";
-      case MENU_ENUM_LABEL_VALUE_TITLE_COLOR:
-         return "Cor do Menu Título";
-      case MENU_ENUM_LABEL_VALUE_TRUE:
-         return "Verdadeiro";
-      case MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT:
-         return "Ativar UI Companion ao Iniciar";
-      case MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE:
-         return "Barra de Menu (Dica)";
-      case MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE:
-         return "Incapaz de ler arquivo compactado.";
-      case MENU_ENUM_LABEL_VALUE_UNKNOWN:
-         return "Desconhecido";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_ASSETS:
-         return "Atualizar Recursos (Assets)";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES:
-         return "Atualizar Perfis de Autoconfiguração";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_CG_SHADERS:
-         return "Atualizar Shaders Cg";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_CHEATS:
-         return "Atualizar Cheats";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES:
-         return "Atualizar Databases";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_GLSL_SHADERS:
-         return "Atualizar Shaders GLSL";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS:
-         return "Atualizar Overlays";
-      case MENU_ENUM_LABEL_VALUE_USER:
-         return "Usuário";
-      case MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS:
-         return "Interface de Usuário";
-      case MENU_ENUM_LABEL_VALUE_USER_LANGUAGE:
-         return "Idioma";
-      case MENU_ENUM_LABEL_VALUE_USER_SETTINGS:
-         return "Usuário";
-      case MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER:
-         return "Usar Visualizador de Imagens Interno";
-      case MENU_ENUM_LABEL_VALUE_USE_BUILTIN_PLAYER:
-         return "Usar Player Interno"; /* TODO/FIXME */
-      case MENU_ENUM_LABEL_VALUE_USE_THIS_DIRECTORY:
-         return "<Usar este diretório>";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE:
-         return "Permitir Rotação";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO:
-         return "Relação de Aspecto Automática";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX:
-         return "Índice de Relações de Aspecto";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION:
-         return "Inserção de Quadro Negro";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN:
-         return "Descartar Overscan (Recarregue)";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION:
-         return "Desativar Desktop Composition";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER:
-         return "Driver de Vídeo";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FILTER:
-         return "Filtro de Vídeo";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_DIR:
-         return "Filtros de Vídeo";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER:
-         return "Filtro de Cintilação";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FONT_ENABLE:
-         return "Mostrar Mensagem de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FONT_PATH:
-         return "Fonte da Mensagem de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FONT_SIZE:
-         return "Tamanho da Mensagem de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_ASPECT:
-         return "Forçar Relação de Aspecto";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE:
-         return "Forcar Desativação de sRGB FBO";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY:
-         return "Retardo de Quadro";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN:
-         return "Usar Modo Tela Cheia";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA:
-         return "Gamma de Vídeo";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD:
-         return "Ativar Gravação por GPU";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT:
-         return "Ativar Captura de Tela via GPU";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC:
-         return "Sincronizar GPU com CPU";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES:
-         return "Quadros de Sincronização entre GPU e CPU";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X:
-         return "Posição X da Mensagem de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y:
-         return "Posição Y da Mensagem de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX:
-         return "Índice de Monitores";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_POST_FILTER_RECORD:
-         return "Ativar Filtro Pós-Gravação";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE:
-         return "Taxa de Atualização de Tela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO:
-         return "Taxa de Atualização de Quadros Estimada";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION:
-         return "Rotação";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SCALE:
-         return "Variar Escala em Janela";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER:
-         return "Escala em Degraus Inteiros";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS:
-         return "Vídeo";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR:
-         return "Shaders";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES:
-         return "Número de Shaders";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS:
-         return "Parâmetros de Shader em Uso";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET:
-         return "Carregar Predefinições de Shader";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS:
-         return "Menu de Parâmetros de Shader";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS:
-         return "Salvar Predefinições de Shader Como";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT:
-         return "Ativar Contexto Compartilhado de Hardware";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH:
-         return "Filtragem Bilinear por Hardware";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER:
-         return "Ativar Filtro de Suavização";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL:
-         return "Intervalo de Permuta do Sincronismo Vertical";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_THREADED:
-         return "Vídeo em Threads";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VFILTER:
-         return "Eliminar Cintilação";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH:
-         return "Definir Largura de Tela VI";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC:
-         return "Sincronismo Vertical";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN:
-         return "Modo Tela Cheia em Janela";
-      case MENU_ENUM_LABEL_VALUE_YES:
-         return "Sim";
-      case MSG_APPENDED_DISK:
-         return "Disco anexado";
-      case MSG_APPLYING_CHEAT:
-         return "Applying cheat changes.";
-      case MSG_APPLYING_SHADER:
-         return "Aplicando shader";
-      case MSG_AUDIO_MUTED:
-         return "Áudio mudo.";
-      case MSG_AUDIO_UNMUTED:
-         return "Áudio normal.";
-      case MSG_BLOCKING_SRAM_OVERWRITE:
-         return "Bloqueando Sobrescrição de SRAM";
-      case MSG_BYTES:
-         return "bytes";
-      case MSG_CONFIG_DIRECTORY_NOT_SET:
-         return "Diretório de configurações não definido. Incapaz de salvar.";
-      case MSG_CORE_DOES_NOT_SUPPORT_SAVESTATES:
-         return "O core não suporta savestates.";
-      case MSG_COULD_NOT_READ_CONTENT_FILE:
-         return "Incapaz de ler arquivo de conteúdo";
-      case MSG_DOWNLOADING:
-         return "Baixando";
-      case MSG_EXTRACTING:
-         return "Extraindo";
-      case MSG_FAILED_TO:
-         return "Falha ao";
-      case MSG_FAILED_TO_APPLY_SHADER:
-         return "Falha ao aplicar shader.";
-      case MSG_FAILED_TO_LOAD_CONTENT:
-         return "Falha ao carregar conteúdo";
-      case MSG_FAILED_TO_LOAD_MOVIE_FILE:
-         return "Falha ao carregar vídeo";
-      case MSG_FAILED_TO_LOAD_OVERLAY:
-         return "Falha ao carregar overlay.";
-      case MSG_FAILED_TO_LOAD_STATE:
-         return "Falha ao carregar estado de";
-      case MSG_FAILED_TO_REMOVE_DISK_FROM_TRAY:
-         return "Falha ao remover disco da bandeja.";
-      case MSG_FAILED_TO_REMOVE_TEMPORARY_FILE:
-         return "Falha ao remover arquivo temporário";
-      case MSG_FAILED_TO_SAVE_SRAM:
-         return "Falha ao salvar SRAM";
-      case MSG_FAILED_TO_SAVE_STATE_TO:
-         return "Falha ao salvar estado em";
-      case MSG_FAILED_TO_START_MOVIE_RECORD:
-         return "Falha ao iniciar gravação de vídeo.";
-      case MSG_FAILED_TO_UNMUTE_AUDIO:
-         return "Falha ao desativar mudo.";
-      case MSG_GOT_INVALID_DISK_INDEX:
-         return "Índice de disco inválido.";
-      case MSG_GRAB_MOUSE_STATE:
-         return "Obter estado do mouse";
-      case MSG_LOADED_STATE_FROM_SLOT:
-         return "Estado carregado do slot #%d.";
-      case MSG_LOADED_STATE_FROM_SLOT_AUTO:
-         return "Estado carregado do slot #-1 (auto).";
-      case MSG_LOADING_STATE:
-         return "Carregando estado";
-      case MSG_PAUSED:
-         return "Pausado.";
-      case MSG_RECEIVED:
-         return "recebido";
-      case MSG_REDIRECTING_CHEATFILE_TO:
-         return "Redirecionando cheat para";
-      case MSG_REDIRECTING_SAVEFILE_TO:
-         return "Redirecionando save para";
-      case MSG_REDIRECTING_SAVESTATE_TO:
-         return "Redirecionando savestate para"; /* TODO */
-      case MSG_REMOVED_DISK_FROM_TRAY:
-         return "Disco removido da bandeja.";
-      case MSG_REMOVING_TEMPORARY_CONTENT_FILE:
-         return "Removendo conteúdo temporário";
-      case MSG_RESET:
-         return "Reiniciar";
-      case MSG_RESTARTING_RECORDING_DUE_TO_DRIVER_REINIT:
-         return "Reiniciando gravação devido a reinício de driver.";
-      case MSG_REWINDING:
-         return "Retrocedendo.";
-      case MSG_REWIND_REACHED_END:
-         return "Final do buffer de retrocesso atingido.";
-      case MSG_SAVED_STATE_TO_SLOT:
-         return "Estado salvo no slot #%d.";
-      case MSG_SAVED_STATE_TO_SLOT_AUTO:
-         return "Estado salvo no slot #-1 (auto).";
-      case MSG_SAVED_SUCCESSFULLY_TO:
-         return "Salvo com sucesso em";
-      case MSG_SAVING_RAM_TYPE:
-         return "Salvando tipo de RAM";
-      case MSG_SAVING_STATE:
-         return "Salvando estado";
-      case MSG_SCANNING:
-         return "Examinando";
-      case MSG_SCANNING_OF_DIRECTORY_FINISHED:
-         return "Exame de diretório concluído";
-      case MSG_SENDING_COMMAND:
-         return "Enviando comando";
-      case MSG_SHADER:
-         return "Shader";
-      case MSG_SKIPPING_SRAM_LOAD:
-         return "Ignorando carregamento de SRAM.";
-      case MSG_SLOW_MOTION:
-         return "Câmera lenta.";
-      case MSG_SLOW_MOTION_REWIND:
-         return "Retrocesso em câmera lenta.";
-      case MSG_STARTING_MOVIE_PLAYBACK:
-         return "Iniciando reprodução de vídeo.";
-      case MSG_STARTING_MOVIE_RECORD_TO:
-         return "Iniciando gravação de vídeo em";
-      case MSG_STATE_SIZE:
-         return "Tamanho do estado";
-      case MSG_STATE_SLOT:
-         return "Slot de estado";
-      case MSG_TO:
-         return "para";
-      case MSG_UNKNOWN:
-         return "Desconhecido";
-      case MSG_UNPAUSED:
-         return "Despausado.";
-      case MSG_UNRECOGNIZED_COMMAND:
-         return "Comando desconhecido";
-      case MSG_VIRTUAL_DISK_TRAY:
-         return "bandeja de disco virtual.";
+      #include "msg_hash_pt_pt.h"
       default:
          break;
    }
diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h
index 5dd001b8fa..8205d9dccc 100644
--- a/intl/msg_hash_pt_pt.h
+++ b/intl/msg_hash_pt_pt.h
@@ -977,6 +977,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "Conecar ao hospedeiro do netplay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "Iniciar hospedeiro do netplay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "Endereço do Servidor")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS,
diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h
index ea717c26a2..60005b3f2d 100644
--- a/intl/msg_hash_ru.h
+++ b/intl/msg_hash_ru.h
@@ -9,31 +9,31 @@ MSG_HASH(
       )
 MSG_HASH(
       MSG_UNKNOWN_COMPILER,
-      "Неизвестный Компилятор"
+      "Неизвестный компилятор"
       )
 MSG_HASH(
       MSG_DEVICE_DISCONNECTED_FROM_PORT,
-      "Device disconnected from port"
+      "Устройство отключено от порта"
       )
 MSG_HASH(
       MSG_UNKNOWN_NETPLAY_COMMAND_RECEIVED,
-      "Unknown netplay command received"
+      "Неизвестная команда netplay"
       )
 MSG_HASH(
       MSG_FILE_ALREADY_EXISTS_SAVING_TO_BACKUP_BUFFER,
-      "File already exists. Saving to backup buffer"
+      "Файл уже существует. Сохранение в резервном буфере"
       )
 MSG_HASH(
       MSG_GOT_CONNECTION_FROM,
-      "Got connection from: \"%s\""
+      "Установленно  соединение с: \"%s\""
       )
 MSG_HASH(
       MSG_GOT_CONNECTION_FROM_NAME,
-      "Got connection from: \"%s (%s)\""
+      "Установленно  соединение с: \"%s (%s)\""
       )
 MSG_HASH(
       MSG_NO_ARGUMENTS_SUPPLIED_AND_NO_MENU_BUILTIN,
-      "No arguments supplied and no menu builtin, displaying help..."
+      "Нет аргументов и встроенного меню,отображается справка..."
       )
 MSG_HASH(
       MSG_NETPLAY_USERS_HAS_FLIPPED,
@@ -41,55 +41,55 @@ MSG_HASH(
       )
 MSG_HASH(
       MSG_SETTING_DISK_IN_TRAY,
-      "Setting disk in tray"
+      "Установка диска в привод"
       )
 MSG_HASH(
       MSG_WAITING_FOR_CLIENT,
-      "Ожидание клиент..."
+      "Ожидание клиента ..."
       )
 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,
-      "Adjusts settings related to the appearance of the menu screen."
+      "Настройка параметров, относящихся к внешнему виду экрана меню."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC,
-      "Hard-synchronize the CPU and GPU. Reduces latency at the cost of performance."
+      "Синхронизируйте CPU и GPU.Это улучшит производительность."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_VIDEO_THREADED,
-      "Improves performance at the cost of latency and more video stuttering. Use only if you cannot obtain full speed otherwise."
+      "Повышает производительность за счёт понижения количества кадров в секунду. Использовать только когда другие способы не сработали."
       )
 MSG_HASH(
       MSG_AUDIO_VOLUME,
-      "Громкость"
+      "Громкость звука"
       )
 MSG_HASH(
       MSG_AUTODETECT,
-      "Autodetect"
+      "Определять автоматически"
       )
 MSG_HASH(
       MSG_AUTOLOADING_SAVESTATE_FROM,
-      "Auto-loading savestate from"
+      "Автозагрузка из"
       )
 MSG_HASH(
       MSG_CAPABILITIES,
-      "Capabilities"
+      "Возможности"
       )
 MSG_HASH(
       MSG_CONNECTING_TO_NETPLAY_HOST,
-      "Connecting to netplay host"
+      "Подключение к netplay"
       )
 MSG_HASH(
       MSG_CONNECTING_TO_PORT,
-      "Connecting to port"
+      "Подключение к порту"
       )
 MSG_HASH(
       MSG_CONNECTION_SLOT,
-      "Connection slot"
+      "Слот подключения"
       )
 MSG_HASH(
       MSG_SORRY_UNIMPLEMENTED_CORES_DONT_DEMAND_CONTENT_NETPLAY,
@@ -101,76 +101,77 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS,
-      "Accounts Cheevos"
+      "Аккаунт Cheevos"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME,
-      "Имя"
+      "Имя пользователя"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST,
-      "Accounts"
+      "Аккаунты"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST_END,
-      "Accounts List Endpoint"
+      "Аккаунт лист Endpoint"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ACCOUNTS_RETRO_ACHIEVEMENTS,
-      "Retro Achievements"
+      "Достижения"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST,
-      "Achievement List"
+      "Список достижений"
       )
 
+
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST_HARDCORE,
-      "Achievement List (Hardcore)"
+      "Список достижений (Hardcore)"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST,
-      "Scan Content"
+      "Результат сканирования"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST,
-      "Configurations"
+      "Конфигурации"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ADD_TAB,
-      "Import content"
+      "Импорт содержимого"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE,
-      "Ask"
+      "Спрашивать"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY,
-      "Assets"
+      "Активы"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES,
-      "Block Frames"
+      "Блокировка фреймов"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE,
-      "Audio Device"
+      "Аудио-устройство"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER,
-      "Audio Driver"
+      "Аудио драйвер"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN,
-      "Audio DSP Plugin"
+      "Аудио DSP Plugin"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE,
-      "Audio Enable"
+      "Включить звук"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_FILTER_DIR,
-      "Audio Filter"
+      "Аудио фильтр"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_TURBO_DEADZONE_LIST,
@@ -178,47 +179,47 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY,
-      "Audio Latency (ms)"
+      "Задержка звука (ms)"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW,
-      "Audio Maximum Timing Skew"
+      "Максимальный тайминг синхронизации аудио-сигнала"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_MUTE,
-      "Audio Mute"
+      "Выключить звук"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE,
-      "Audio Output Rate (Hz)"
+      "Частота аудиовыхода (KHz)"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA,
-      "Dynamic Audio Rate Control"
+      "Динамический контроль скорости звука"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER,
-      "Audio Resampler Driver"
+      "Драйвер аудиоразъема"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS,
-      "Audio"
+      "Аудио"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_SYNC,
-      "Audio Sync"
+      "Синхронизация звука"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME,
-      "Audio Volume Level (dB)"
+      "Уровень громкости звука (dB)"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL,
-      "SaveRAM Autosave Interval"
+      "Интервал авто-сохранений"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE,
-      "Load Override Files Automatically"
+      "Переопределить файлы загрузки"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE,
@@ -226,7 +227,7 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE,
-      "Load Shader Presets Automatically"
+      "Автоматическая загрузка преднастройки шейдеров"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK,
@@ -238,19 +239,19 @@ MSG_HASH(
       )
 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,
-      "Scroll Down"
+      "Прокрутить вниз"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP,
-      "Scroll Up"
+      "Прокрутить вверх"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_START,
@@ -258,63 +259,63 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD,
-      "Toggle Keyboard"
+      "Переключить клавиатуру"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU,
-      "Toggle Menu"
+      "Переключить меню"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS,
-      "Basic menu controls"
+      "Базовые элементы управления меню"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_CONFIRM,
-      "Confirm/OK"
+      "Подтвердить"
       )
 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,
-      "Scroll Up"
+      "Прокрутить вверх"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_START,
-      "Defaults"
+      "По умолчанию"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_KEYBOARD,
-      "Toggle Keyboard"
+      "Переключить клавиатуру"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_MENU,
-      "Toggle Menu"
+      "Переключить меню"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
-      "Don't overwrite SaveRAM on loading savestate"
+      "Не перезаписывать SaveRAM при загрузке сохранений"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
-      "Bluetooth Enable"
+      "Bluetooth Включить"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
-      "Buildbot Assets URL"
+      "Создание ботов URL"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY,
-      "Cache"
+      "Кэш"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CAMERA_ALLOW,
-      "Allow Camera"
+      "Разрешить использовать камеру"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER,
@@ -322,31 +323,31 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEAT,
-      "Cheat"
+      "Чит"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES,
-      "Apply Cheat Changes"
+      "Применить изменения чита"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
-      "Cheat File"
+      "Чит-файл"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEAT_FILE,
-      "Cheat File"
+      "Чит-файл"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD,
-      "Load Cheat File"
+      "Загрузить чит-файл"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS,
-      "Save Cheat File As"
+      "Сохранить чит файл как:"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEAT_NUM_PASSES,
-      "Cheat Passes"
+      "Пропуск чита"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_DESCRIPTION,
@@ -354,31 +355,31 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
-      "Achievements Hardcore Mode"
+      "Достижения в Hardcore Mode"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS,
-      "Locked Achievements:"
+      "Заблокированные Достижения:"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ENTRY,
-      "Locked"
+      "Заблокировано"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS,
-      "Retro Achievements"
+      "Достижения"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL,
-      "Test Unofficial Achievements"
+      "Тестовые Неофициальные Достижения"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS,
-      "Unlocked Achievements:"
+      "Разблокированные достижения:"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY,
-      "Unlocked"
+      "Разблокирован"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT,
@@ -386,27 +387,27 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONFIG,
-      "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,
-      "Collections"
+      "Коллекции"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY,
-      "Content Database"
+      "База Данных контента"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONTENT_DIR,
@@ -414,367 +415,367 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE,
-      "History List Size")
+      "Размер списка истории")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS,
-      "Быстрое меню")
+      "Выйти из меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR,
-      "Core Assets")
+      "Основные средства")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIRECTORY,
       "Загрузки")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_CHEAT_OPTIONS,
-      "Cheats")
+      "Читы")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_COUNTERS,
-      "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,
-      "Прошивка(и)")
+      "Микропрограммы")
 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,
-      "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,
-      "Automatically extract downloaded archive")
+      "Автоматически извлечь загруженный архив")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL,
-      "Buildbot Cores URL")
+      "Создание ботов URL")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST,
       "Обновление ядра")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS,
-      "Updater")
+      "Обновление")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE,
-      "Архитектура процессора:")
+      "Архитектура CPU:")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CPU_CORES,
-      "Количество ядер процессора:")
+      "Ядра CPU:")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
       "Курсор")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER,
-      "Cursor Manager")
+      "Курсор менеджер")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CUSTOM_RATIO,
-      "Custom Ratio")
+      "Дополнительное значение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER,
-      "Database Manager")
+      "Менеджер баз данных")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION,
-      "Database Selection")
+      "Выбор баз данных")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY,
-      "Убрать")
+      "Удаление")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES,
-      "Favorites")
+      "Избранное")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT,
-      "<Content dir>")
+      "<Каталог содержимого>")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT,
-      "<Default>")
+      "<По умолчанию>")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE,
-      "<None>")
+      "<Нет>")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND,
-      "Directory not found.")
+      "Каталог не найден.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS,
-      "Directory")
+      "Каталог")
 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,
-      "Content Downloader")
+      "Загрузка содержимого")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
-      "DPI Override Enable")
+      "Разрешить переопределение DPI")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
-      "DPI Override")
+      "DPI Переопределение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
       "Драйвер")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
-      "Load Dummy on Core Shutdown")
+      "Загрузка макета при выключении ядра")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
-      "Dynamic Wallpaper")
+      "Динамические обои")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY,
-      "Dynamic Wallpapers")
+      "Динамические обои")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
-      "Enable Achievements")
+      "Включить достижения")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR,
-      "Menu entry hover color")
+      "Цвет наведения указателя меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR,
-      "Menu entry normal color")
+      "Нормальный цвет ввода в меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FALSE,
-      "False")
+      "Выключено")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FASTFORWARD_RATIO,
-      "Maximum Run Speed")
+      "Максимальная рабочая скорость")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FPS_SHOW,
-      "Display Framerate")
+      "Вывести значение FPS на экран")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE,
-      "Limit Maximum Run Speed")
+      "Ограничить максимальную скорость работы")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS,
-      "Frame Throttle")
+      "Настройка частоты кадров")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS,
-      "Frontend Counters")
+      "Внешние счетчики")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS,
-      "Load Content-Specific Core Options Automatically")
+      "Автоматически загружать основные параметры")
 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,
-      "Game-options file")
+      "Файл параметров игры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP,
-      "помощь")
+      "Помощь")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING,
-      "Audio/Video Troubleshooting")
+      "Устранение проблем с аудио / видео")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD,
-      "Changing Virtual Gamepad Overlay")
+      "Изменение обложки виртуального геймпада")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_CONTROLS,
-      "Basic Menu Controls")
+      "Основные элементы управления меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_LIST,
       "Помощь")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_LOADING_CONTENT,
-      "Loading Content")
+      "Загрузка содержимого")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT,
-      "Scanning For Content")
+      "Сканирование содержимого")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_WHAT_IS_A_CORE,
-      "What Is A Core?")
+      "Что такое ядро?")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_LIST_ENABLE,
-      "History List Enable")
+      "Список истории включен")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_TAB,
-      "History")
+      "История")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU,
-      "Horizontal Menu")
+      "Горизонтальное меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_IMAGES_TAB,
-      "Image")
+      "Образ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION,
-      "Информация")
+      "информация")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION_LIST,
       "Информация")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE,
-      "Analog To Digital Type")
+      "Аналого-цифровой тип")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ALL_USERS_CONTROL_MENU,
-      "All Users Control Menu")
+      "Все пользователи управляющие меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X,
-      "Left Analog X")
+      "Левый аналог ось - X")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,
-      "Left analog X- (left)")
+      "Левый аналог ось - X (влево)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,
-      "Left analog X+ (right)")
+      "Левый аналог ось - X+ (вправо)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y,
-      "Left Analog Y")
+      "Левый аналог ось - Y")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,
-      "Left analog Y- (up)")
+      "Левый аналог ось - Y- (вверх)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,
-      "Left analog Y+ (down)")
+      "Левый аналог ось - Y+ (вниз)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X,
-      "Right Analog X")
+      "Правый аналог ось - X")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,
-      "Right analog X- (left)")
+      "Правый аналог ось - X- (влево)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,
-      "Right analog X+ (right)")
+      "Правый аналог ось - X + (вправо)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y,
-      "Right Analog Y")
+      "Правый аналог ось - Y")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,
-      "Right analog Y- (up)")
+      "Правый аналог ось - Y- (вверх)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,
-      "Right analog Y+ (down)")
+      "Правый аналог ось - Y+ (вниз)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE,
-      "Autoconfig Enable")
+      "Авто-конфигурация включена")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD,
-      "Analog Stick Deadzone")
+      "Мертвая зона у стиков")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL,
-      "Menu Swap OK & Cancel Buttons")
+      "Сменить функции кнопок")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL,
-      "Bind All")
+      "Скрепить всё")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL,
-      "Bind Default All")
+      "Скрепить все по умолчанию")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_BIND_TIMEOUT,
-      "Bind Timeout")
+      "Тайм-аут привязки")
 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,
-      "Device Index")
+      "Индекс устройства")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE,
-      "Device Type")
+      "Тип устройства")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_DRIVER,
-      "Input Driver")
+      "Ввод драйвера")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE,
-      "Duty Cycle")
+      "Рабочий цикл")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS,
-      "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 button (right)")
+      "Кнопка A ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,
-      "B button (down)")
+      "Кнопка B ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,
-      "Down D-pad")
+      "Крестовина ВНИЗ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,
-      "L2 button (trigger)")
+      "Кнопка L2 ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,
-      "L3 button (thumb)")
+      "Кнопка L3")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,
-      "L button (shoulder)")
+      "Кнопка L ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,
-      "Left D-pad")
+      "Крестовина ВЛЕВО")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,
-      "R2 button (trigger)")
+      "Кнопка R2")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,
-      "R3 button (thumb)")
+      "Кнопка R3")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,
-      "R button (shoulder)")
+      "Кнопка R")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,
-      "Right D-pad")
+      "Крестовина ВПРАВО")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,
-      "Select button")
+      "Кнопка SELECT")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,
-      "Start button")
+      "Кнопка START")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,
-      "Up D-pad")
+      "Крестовина ВВЕРХ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,
-      "X button (top)")
+      "Кнопка X")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,
-      "Y button (left)")
+      "Кнопка Y")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_KEY,
-      "(Key: %s)")
+      "(Ключ: %s)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
-      "Keyboard Gamepad Mapping Type")
+      "Тип отображения клавиатуры для геймпада")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS,
-      "Max Users")
+      "Максимум пользователей")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
-      "Menu Toggle Gamepad Combo")
+      "Переключать меню геймпадом")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,
       "Cheat index -")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,
       "Cheat index +")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,
-      "Cheat toggle")
+      "Переключить чит")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,
-      "Disk eject toggle")
+      "Извлечь диск")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,
-      "Disk next")
+      "Следующий диск")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,
-      "Disk prev")
+      "Предыдущий диск")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,
-      "Enable hotkeys")
+      "EВключить горячие клавиши")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,
-      "Fast forward hold")
+      "Ускоренная перемотка вперед")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,
-      "Fast forward toggle")
+      "Быстрая перемотка вперед")
 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,
-      "Grab mouse toggle")
+      "Переключатель мыши")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,
-      "Load state")
+      "Состояние загрузки")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,
-      "Menu toggle")
+      "Переключение меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,
-      "Movie record toggle")
+      "Переключатель записи видео")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,
-      "Audio mute toggle")
+      "Отключения звука")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP,
-      "Netplay flip users")
+      "Netplay отразить пользователей")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,
-      "On-screen keyboard toggle")
+      "Переключение экранной клавиатуры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,
-      "Overlay next")
+      "Наложение поверх")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,
-      "Pause toggle")
+      "Приостановить переключение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,
-      "Quit RetroArch")
+      "Выход из RetroArch")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,
-      "Сброс игры")
+      "Сбросить игру")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,
-      "Rewind")
+      "Перемотка назад")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,
-      "Save state")
+      "Сохранить состояние")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,
-      "Снять скриншот")
+      "Сделать скриншот")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,
-      "Next shader")
+      "Следующий шейдер")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,
-      "Previous shader")
+      "Предыдущий шейдер")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,
-      "Slow motion")
+      "Замедленная съемка")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,
-      "Savestate slot -")
+      "Сохранять слот -")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,
-      "Savestate slot +")
+      "Сохранять слот +")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
-      "Volume -")
+      "Громкость -")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
-      "Volume +")
+      "Громкость +")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
-      "Display Overlay")
+      "Отобразить наложение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
-      "Hide Overlay In Menu")
+      "Скрыть наложение в меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR,
-      "Poll Type Behavior")
+      "Тип поведения")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_EARLY,
-      "Early")
+      "Раньше")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE,
-      "Late")
+      "Позже")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_NORMAL,
-      "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,
-      "Save Autoconfig")
+      "Сохранить авто-конфигурацию")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS,
-      "Input")
+      "Ввод")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE,
-      "Small Keyboard Enable")
+      "Включить малую клавиатуру")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_TOUCH_ENABLE,
-      "Touch Enable")
+      "Включить касание")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,
-      "Turbo enable")
+      "Турбо-режим включить")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD,
-      "Turbo Period")
+      "Турбо-период")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS,
-      "Input User %u Binds")
+      "Вход пользователя% u Binds")
 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 Driver")
+      "Драйвер геймпада")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
-      "Services")
+      "Сервисы")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
       "Chinese (Simplified)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
@@ -808,301 +809,303 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_SPANISH,
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_VIETNAMESE,
       "Vietnamese")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,
-      "Left Analog")
+      "Левый аналог")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH,
       "Ядро")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH,
-      "Core Info")
+      "Ядро инфо")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL,
-      "Core Logging Level")
+      "Уровень ведения журнала")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LINEAR,
-      "Linear")
+      "Линейный")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_ARCHIVE,
-      "Load Archive")
+      "Загрузить архив")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY,
-      "Load Recent")
+      "Загрузить последние")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST,
-      "Load Content")
+      "Загрузить контент")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE,
-      "Load State")
+      "Состояние загрузки")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW,
-      "Allow Location")
+      "Разрешить местоположение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER,
-      "Location Driver")
+      "Местоположение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
-      "Logging")
+      "Ввод логина")
 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,
-      "Database Settings")
+      "Настройки баз данных")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME,
-      "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,
-      "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,
-      "Settings")
+      "Настройки")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER,
-      "Menu Linear Filter")
+      "Линейный фильтр меню")
 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,
-      "Missing")
+      "Отсутствует")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MORE,
       "...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE,
       "Поддержка мыши")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MULTIMEDIA_SETTINGS,
-      "Multimedia")
+      "Мультимедия")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_MUSIC_TAB,
       "Музыка")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
-      "Filter unknown extensions")
+      "Фильтрация неизвестных расширений")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND,
-      "Navigation Wrap-Around")
+      "Навигация автоматической-прокруткой")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NEAREST,
-      "Nearest")
+      "Ближайший")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY,
       "Netplay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CHECK_FRAMES,
-      "Netplay Check Frames")
+      "Проверка фреймов Netplay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT,
-      "Netplay P2 Uses C1")
+      "Netplay P2 использует C1")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES,
-      "Netplay Delay Frames")
+      "Задержка кадров Netplay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT,
-      "Disconnect")
+      "Отключено")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE,
-      "Netplay Enable")
+      "Включить Netplay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
-      "Connect to Netplay host")
+      "Подключение к Netplay-хосту")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
-      "Start hosting")
+      "Старт хостинг")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
-      "Server Address")
+      "Адрес сервера")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_MODE,
-      "Netplay Client Enable")
+      "Включить клиент Netplay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME,
-      "Username")
+      "Имя пользователя")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_SETTINGS,
-      "Netplay settings")
+      "Настройки Netplay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATOR_MODE_ENABLE,
-      "Netplay Spectator Enable")
+      "Включить режим зрителя в Netplay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_TCP_UDP_PORT,
-      "Netplay TCP/UDP Port")
+      "Порт Netplay TCP / UDP")
 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,
-      "Network Information")
+      "Информация о сети")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE,
-      "Network Gamepad")
+      "Сетевой геймпад")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_PORT,
-      "Network Remote Base Port")
+      "Сетевой удаленный базовый порт")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS,
-      "Network")
+      "Сеть")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO,
-      "No")
+      "Нет")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NONE,
-      "None")
+      "Отсутствует")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE,
       "N/A")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY,
-      "No achievements to display.")
+      "Никаких достижений для показа.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORE,
-      "Нет ядра")
+      "Без ядра")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE,
-      "No cores available.")
+      "Нет доступных ядер.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE,
-      "No core information available.")
+      "Нет информации о ядре.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE,
-      "No core options available.")
+      "Нет доступных опций ядра.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY,
-      "No entries to display.")
+      "Нет записей для отображения.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE,
-      "No history available.")
+      "История недоступна.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE,
-      "No information is available.")
+      "Нет информации.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_ITEMS,
-      "No items.")
+      "Нет элементов.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS,
-      "No performance counters.")
+      "Нет счетчиков производительности.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PLAYLISTS,
-      "No playlists.")
+      "Нет плейлистов.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE,
-      "No playlist entries available.")
+      "Нет доступных записей в плейлисте.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND,
-      "No settings found.")
+      "Настройки не найдены.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS,
-      "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,
-      "Onscreen Display")
+      "Экранное отображение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS,
-      "Onscreen Overlay")
+      "Экранное наложение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_NOTIFICATIONS_SETTINGS,
-      "Onscreen Notifications")
+      "Экранные уведомления")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
-      "Browse Archive")
+      "Обзор архива")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL,
-      "Optional")
+      "Опционально")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY,
-      "Overlay")
+      "Наложение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED,
-      "Autoload Preferred Overlay")
+      "Автозагрузка наложения")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_DIRECTORY,
-      "Overlay")
+      "Наложение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_OPACITY,
-      "Overlay Opacity")
+      "Наложение преднастроек")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_PRESET,
-      "Overlay Preset")
+      "Масштаб наложения")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_SCALE,
       "Overlay Scale")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_SETTINGS,
-      "Onscreen Overlay")
+      "Экранное наложение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PAL60_ENABLE,
-      "Use PAL60 Mode")
+      "Использовать режим PAL60")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY,
-      "Parent directory")
+      "Родительский каталог")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO,
-      "Pause when menu activated")
+      "Пауза при активации меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE,
-      "Don't run in background")
+      "Не работать в фоновом режиме")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PERFCNT_ENABLE,
-      "Performance Counters")
+      "Счетчики производительности")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB,
-      "Playlists")
+      "Плейлисты")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PLAYLIST_DIRECTORY,
-      "Playlist")
+      "Плейлист")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS,
-      "Playlists")
+      "Плейлисты")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_POINTER_ENABLE,
-      "Touch Support")
+      "Поддержка Touch")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PORT,
-      "Port")
+      "Порт")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PRESENT,
-      "Present")
+      "Отображать")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS,
-      "Privacy")
+      "Конфиденциальность")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH,
-      "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")
+      "Рейтинг BBFC")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CERO_RATING,
-      "CERO Rating")
+      "Рейтинг CERO")
 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")
+      "Проблема журнала Edge")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_RATING,
-      "Edge Magazine Rating")
+      "Рейтинг журнала Edge")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_REVIEW,
-      "Edge Magazine Review")
+      "Обзор журнала Edge")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ELSPA_RATING,
-      "ELSPA Rating")
+      "Рейтинг ELSPA")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ENHANCEMENT_HW,
-      "Enhancement Hardware")
+      "Оборудование для улучшения")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ESRB_RATING,
-      "ESRB Rating")
+      "Рейтинг ESRB")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FAMITSU_MAGAZINE_RATING,
-      "Famitsu Magazine Rating")
+      "Рейтинг журнала Famitsu")
 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,
-      "Name")
+      "Имя")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ORIGIN,
-      "Origin")
+      "Происхождение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PEGI_RATING,
-      "PEGI Rating")
+      "Рейтинг PEGI")
 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")
+      "Rumble поддерживается")
 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,
-      "Start Content")
+      "Запустить контент")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_TGDB_RATING,
-      "TGDB Rating")
+      "Рейтинг TGDB")
 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,
-      "Recording")
+      "Запись")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_CONFIG,
-      "Load Recording Config...")
+      "Загрузка конфигурации записи...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_DRIVER,
-      "Record Driver")
+      "Драйвер записи")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_ENABLE,
-      "Enable Recording")
+      "Включить запись")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_PATH,
-      "Save Output Recording as...")
+      "Сохранить запись вывода как ...")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_USE_OUTPUT_DIRECTORY,
-      "Save Recordings in Output Dir")
+      "Сохранить записи в выходном каталоге")
 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_GAME,
-      "Save Game Remap File")
+      "Сохранить файл переопределения игры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_REQUIRED,
-      "Required")
+      "Необходимые")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RESTART_CONTENT,
       "Перезапуск")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH,
@@ -1112,609 +1115,607 @@ 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 w/ Analog")
+      "Ретро-геймпад с аналогами")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS,
-      "Achievements")
+      "Достижения")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_ENABLE,
-      "Rewind Enable")
+      "Включить перемотку назад")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY,
-      "Rewind Granularity")
+      "Гранулярность перемотки")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS,
-      "Rewind")
+      "Перемотка назад")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RGUI_BROWSER_DIRECTORY,
-      "File Browser")
+      "Браузер файлов")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY,
-      "Config")
+      "Конфигурация")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN,
-      "Display Start Screen")
+      "Запуск записи экрана")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
-      "Right Analog")
+      "Правый аналог")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
-      "Run")
+      "Бег")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
-      "SAMBA Enable")
+      "Включить SAMBA")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
-      "Savefile")
+      "Сохранить файл")
 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_SAVE_CURRENT_CONFIG,
-      "Save Current Configuration")
+      "Сохранить текущую конфигурацию")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
-      "Save Core Overrides")
+      "Сохранить переопределения ядра")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
-      "Save Game Overrides")
+      "Сохранить переопределения игры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG,
-      "Save New Configuration")
+      "Сохранить новую конфигурацию")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_STATE,
-      "Save State")
+      "Сохранить статистику")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS,
-      "Saving")
+      "Сохранить")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY,
-      "Scan Directory")
+      "Сканировать каталог")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SCAN_FILE,
-      "Scan File")
+      "Сканировать файл")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY,
-      "<Scan This Directory>")
+      "<Сканировать этот каталог>")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY,
-      "Screenshot")
+      "Скриншот")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION,
-      "Screen Resolution")
+      "Разрешение экрана")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SEARCH,
-      "Search")
+      "Поиск")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SECONDS,
-      "seconds")
+      "секунды")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS,
-      "Settings")
+      "Настройки")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS_TAB,
-      "Settings")
+      "Настройки")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER,
-      "Shader")
+      "Шейдер")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES,
-      "Apply Shader Changes")
+      "Применение изменений шейдера")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS,
-      "Shaders")
+      "Шейдеры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON,
-      "Ribbon")
+      "Лента")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED,
-      "Ribbon (simplified)")
+      "Лента (упрощённая)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SIMPLE_SNOW,
-      "Simple Snow")
+      "Простой снег")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SNOW,
-      "Snow")
+      "Снег")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS,
-      "Show Advanced Settings")
+      "Показать дополнительные настройки")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES,
-      "Show Hidden Files and Folders")
+      "Показать скрытые файлы и папки")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHUTDOWN,
-      "Shutdown")
+      "Неисправность")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO,
-      "Slow-Motion Ratio")
+      "Коэффициент замедленного движения ")
 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_SSH_ENABLE,
-      "SSH Enable")
+      "SSH включён")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
-      "Start Core")
+      "запустить ядро")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
-      "Start Remote RetroPad")
+      "Запустить удаленный Ретро-геймпад")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_START_VIDEO_PROCESSOR,
-      "Start Video Processor")
+      "Запустить видеопроцессор")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_STATE_SLOT,
-      "State Slot")
+      "Статистика слота")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_STATUS,
-      "Status")
+      "Статус")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE,
-      "stdin Commands")
+      "Команды stdin")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SUPPORTED_CORES,
-      "Suggested cores")
+      "Рекомендуемые ядра")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE,
-      "Suspend Screensaver")
+      "Приостановить экран")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_BGM_ENABLE,
-      "System BGM Enable")
+      "Включен режим BGM")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_DIRECTORY,
-      "System/BIOS")
+      "Система / BIOS")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION,
-      "System Information")
+      "Системная информация")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_7ZIP_SUPPORT,
-      "7zip support")
+      "Поддержка 7zip")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ALSA_SUPPORT,
-      "ALSA support")
+      "Поддержка ALSA")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE,
-      "Build date")
+      "Дата создания")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CG_SUPPORT,
-      "Cg support")
+      "Поддержка Cg")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COCOA_SUPPORT,
-      "Cocoa support")
+      "Поддержка Cocoa")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COMMAND_IFACE_SUPPORT,
-      "Command interface support")
+      "Поддержка командного интерфейса")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CORETEXT_SUPPORT,
-      "CoreText support")
+      "Поддержка CoreText")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CPU_FEATURES,
-      "CPU Features")
+      "Особенности CPU")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_DPI,
-      "Display metric DPI")
+      "Отображать индекс DPI")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_HEIGHT,
-      "Display metric height (mm)")
+      "Отображать высоту (mm)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_WIDTH,
-      "Display metric width (mm)")
+      "Отображать ширину (mm)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DSOUND_SUPPORT,
-      "DirectSound support")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WASAPI_SUPPORT,
-      "WASAPI support")
+      "Поддержка DirectSound")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYLIB_SUPPORT,
-      "Dynamic library support")
+      "Поддержка динамических библиотек")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYNAMIC_SUPPORT,
-      "Dynamic run-time loading of libretro library")
+      "Загрузка динамических библиотек во время выполнения")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_EGL_SUPPORT,
-      "EGL support")
+      "Поддержка EGL")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FBO_SUPPORT,
-      "OpenGL/Direct3D render-to-texture (multi-pass shaders) support")
+      "Поддержка OpenGL/Direct3D рендеринга для текстур")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FFMPEG_SUPPORT,
-      "FFmpeg support")
+      "Поддержка FFmpeg")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FREETYPE_SUPPORT,
-      "FreeType support")
+      "Поддержка FreeType")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_IDENTIFIER,
-      "Frontend identifier")
+      "Идентификатор внешнего интерфейса")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_NAME,
-      "Frontend name")
+      "Имя внешнего интерфейса")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_OS,
-      "Frontend OS")
+      "Внешний интерфейс")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION,
-      "Git version")
+      "Версия Git")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GLSL_SUPPORT,
-      "GLSL support")
+      "Поддержка GLSL")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_HLSL_SUPPORT,
-      "HLSL support")
+      "Поддержка HLSL")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_JACK_SUPPORT,
-      "JACK support")
+      "Поддержка JACK")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_KMS_SUPPORT,
-      "KMS/EGL support")
+      "поддержка KMS/EGL")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
-      "LibretroDB support")
+      "Поддержка LibretroDB")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
-      "Libusb support")
+      "Поддержка Libusb")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
-      "libxml2 XML parsing support")
+      "Поддержка синтаксического анализа libxml2 XML")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
-      "Netplay (peer-to-peer) support")
+      "Поддержка Netplay (peer-to-peer)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,
-      "Network Command interface support")
+      "Поддержка сетевого командного интерфейса")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_REMOTE_SUPPORT,
-      "Network Gamepad support")
+      "Поддержка геймпада в сети")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENAL_SUPPORT,
-      "OpenAL support")
+      "Поддержка OpenAL")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGLES_SUPPORT,
-      "OpenGL ES support")
+      "Поддержка OpenGL ES")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGL_SUPPORT,
-      "OpenGL support")
+      "Поддержка OpenGL")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENSL_SUPPORT,
-      "OpenSL support")
+      "Поддержка OpenSL")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENVG_SUPPORT,
-      "OpenVG support")
+      "Поддержка OpenVG")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OSS_SUPPORT,
-      "OSS support")
+      "Поддержка OSS")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OVERLAY_SUPPORT,
-      "Overlay support")
+      "Поддержка Overlay")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE,
-      "Power source")
+      "Источник питания")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGED,
-      "Charged")
+      "Заряжена")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGING,
-      "Charging")
+      "Заряжается ")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_DISCHARGING,
-      "Discharging")
+      "Разряжается")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_NO_SOURCE,
-      "No source")
+      "Нет источника")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PULSEAUDIO_SUPPORT,
-      "PulseAudio support")
+      "Поддержка PulseAudio")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PYTHON_SUPPORT,
-      "Python (script support in shaders) support")
+      "Поддержка Python (поддержка скриптов в шейдерах)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RBMP_SUPPORT,
-      "BMP support (RBMP)")
+      "Поддержка BMP(RBMP)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RETRORATING_LEVEL,
-      "RetroRating level")
+      "Уровень RetroRating")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RJPEG_SUPPORT,
-      "JPEG support (RJPEG)")
+      "Поддержка JPEG (RJPEG)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ROARAUDIO_SUPPORT,
-      "RoarAudio support")
+      "Поддержка RoarAudio")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RPNG_SUPPORT,
-      "PNG support (RPNG)")
+      "Поддержка PNG(RPNG)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RSOUND_SUPPORT,
-      "RSound support")
+      "Поддержка RSound")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RTGA_SUPPORT,
-      "TGA support (RTGA)")
+      "Поддержка TGA(RTGA)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL2_SUPPORT,
-      "SDL2 support")
+      "Поддержка SDL2")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_IMAGE_SUPPORT,
-      "SDL image support")
+      "Поддержка изображений SDL")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_SUPPORT,
-      "SDL1.2 support")
+      "Поддержка SDL1.2")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SLANG_SUPPORT,
-      "Slang support")
+      "Поддержка Slang")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_THREADING_SUPPORT,
-      "Threading support")
+      "Поддержка Threading")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_UDEV_SUPPORT,
-      "Udev support")
+      "Поддержка Udev")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_V4L2_SUPPORT,
-      "Video4Linux2 support")
+      "Поддержка Video4Linux2")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VIDEO_CONTEXT_DRIVER,
-      "Video context driver")
+      "Драйвер контекстного видео")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VULKAN_SUPPORT,
-      "Vulkan support")
+      "Поддержка Vulkan")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WAYLAND_SUPPORT,
-      "Wayland support")
+      "Поддержка Wayland")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_X11_SUPPORT,
-      "X11 support")
+      "Поддержка X11")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XAUDIO2_SUPPORT,
-      "XAudio2 support")
+      "Поддержка XAudio2")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XVIDEO_SUPPORT,
-      "XVideo support")
+      "Поддержка XVideo")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ZLIB_SUPPORT,
-      "Zlib support")
+      "Поддержка Zlib")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT,
-      "Take Screenshot")
+      "Сделать скриншот")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE,
-      "Threaded tasks")
+      "Реализованные задачи")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAILS,
-      "Thumbnails")
+      "Миниатюры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAILS_DIRECTORY,
-      "Thumbnails")
+      "Миниатюры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST,
-      "Thumbnails Updater")
+      "Обновление эскизов")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_BOXARTS,
       "Boxarts")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_SCREENSHOTS,
-      "Screenshots")
+      "Скриншоты")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_TITLE_SCREENS,
-      "Title Screens")
+      "Экраны заголовков")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
-      "Display time / date")
+      "Показывать время / дата")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_TITLE_COLOR,
-      "Menu title color")
+      "Цвет заголовков в меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_TRUE,
       "True")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE,
-      "UI Companion Enable")
+      "UI Companion включён")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT,
-      "UI Companion Start On Boot")
+      "Включить UI Companion при загрузке")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
-      "Menubar")
+      "Строка меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE,
-      "Unable to read compressed file.")
+      "Не удалось прочитать сжатый файл.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE,
-      "Undo Load State")
+      "Отменить загрузку")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UNDO_SAVE_STATE,
-      "Undo Save State")
+      "Отменить сохранение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UNKNOWN,
-      "Unknown")
+      "Неизвестно")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS,
-      "Updater")
+      "Обновитель")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_ASSETS,
-      "Update Assets")
+      "Обновить активы")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES,
-      "Update Autoconfig Profiles")
+      "Обновить профили авто-конфигурации")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_CG_SHADERS,
-      "Update Cg Shaders")
+      "Обновление Cg шейдеров")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_CHEATS,
-      "Update Cheats")
+      "Обновить читы")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES,
-      "Update Core Info Files")
+      "Обновить основные информационные файлы")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES,
-      "Update Databases")
+      "Обновить базы данных")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_GLSL_SHADERS,
-      "Update GLSL Shaders")
+      "Обновить GLSL шейдеры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_LAKKA,
-      "Update Lakka")
+      "Обновить Lakka")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS,
-      "Update Overlays")
+      "Обновить Overlays")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_SLANG_SHADERS,
-      "Update Slang Shaders")
+      "Обновить сленговые шейдеры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_USER,
-      "User")
+      "Пользователь")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS,
-      "User Interface")
+      "Интерфейс пользователя")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_LANGUAGE,
       "Language")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_SETTINGS,
-      "User")
+      "Пользователь")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER,
-      "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,
-      "<Use this directory>")
+      "<Использовать этот катало>")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE,
-      "Allow rotation")
+      "Разрешить вращение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO,
-      "Auto Aspect Ratio")
+      "Автоотношение сторон")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX,
-      "Aspect Ratio")
+      "Соотношение сторон")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION,
-      "Black Frame Insertion")
+      "Вставка черного кадра")
 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_DRIVER,
-      "Video Driver")
+      "Видео драйвер")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
-      "Video Filter")
+      "Видео фильтр")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_DIR,
-      "Video Filter")
+      "Видео фильтр")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER,
-      "Flicker filter")
+      "Мерцающий фильтр")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FONT_ENABLE,
-      "Enable Onscreen Notifications")
+      "Onscreen Notification включить")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FONT_PATH,
-      "Onscreen Notification Font")
+      "Экранный шрифт уведомления")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FONT_SIZE,
-      "Onscreen Notification Size")
+      "Размер уведомлений на экране")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_ASPECT,
-      "Force aspect ratio")
+      "Форсировать пропорции")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE,
-      "Force-disable sRGB FBO")
+      "Принудительное отключение sRGB FBO")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY,
-      "Frame Delay")
+      "Задержка кадра")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN,
-      "Use Fullscreen Mode")
+      "Использовать полноэкранный режим")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA,
-      "Video Gamma")
+      "Видео гамма")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD,
-      "Use GPU Recording")
+      "Использовать GPU Recording")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT,
-      "GPU Screenshot Enable")
+      "GPU Screenshot включен")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC,
-      "Hard GPU Sync")
+      "GPU Sync максимум")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES,
-      "Hard GPU Sync Frames")
+      "GPU Sync Frames максимум")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES,
-      "Max swapchain images")
+      "Максимальное количество образов свопчейнов")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X,
-      "Onscreen Notification X Position")
+      "Позиция X по уведомлению на экране")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y,
-      "Onscreen Notification Y Position")
+      "Позиция Y на экранном уведомлении")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX,
-      "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,
-      "Vertical Refresh Rate")
+      "Вертикальная частота обновления")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO,
-      "Estimated Screen Framerate")
+      "Оценочная частота экрана")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION,
-      "Rotation")
+      "Вращение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SCALE,
-      "Windowed Scale")
+      "Оконная шкала")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER,
-      "Integer Scale")
+      "Целочисленная шкала")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS,
       "Видео")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR,
-      "Video Shader")
+      "Видео шейдер")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES,
-      "Shader Passes")
+      "Шейдерные проходы")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS,
-      "Preview Shader Parameters")
+      "Предварительный просмотр параметров шейдера")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET,
-      "Load Shader Preset")
+      "Загрузить предварительную настройку шейдера")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS,
-      "Menu Shader Parameters")
+      "Параметры меню шейдера")
 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_GAME,
-      "Save Game Preset")
+      "Сохранить предварительную настройку игры")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT,
-      "Enable Hardware Shared Context")
+      "Включить Hardware Shared Context")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH,
-      "Bilinear Filtering")
+      "Билинейная фильтрация")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER,
-      "Soft Filter Enable")
+      "Включён мягкий фильтр")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL,
-      "Vertical Sync (Vsync) Swap Interval")
+      "Интервал свопинга по вертикальной синхронизации")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_TAB,
-      "Video")
+      "Видео")
 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,
-      "Custom Viewport Height")
+      "Высота пользовательского видового экрана")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
-      "Custom Viewport Width")
+      "Пользовательская ширина видового экрана")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X,
-      "Custom Viewport X Pos.")
+      "Пользовательский видовой экран X Поз.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
-      "Custom Viewport Y Pos.")
+      "Пользовательский видовой экран Y Поз.")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH,
-      "Set VI Screen Width")
+      "Установить ширину экрана VI")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
-      "Vertical Sync (Vsync)")
+      "Вертикальная синхронизация (Vsync)")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN,
-      "Windowed Fullscreen Mode")
+      "Полноэкранный режим")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_DRIVER,
-      "Вай-фай драйвер")
+      "Wi-Fi драйвер")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS,
-      "Вай-фай Wi-Fi")
+      "Wi-Fi")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR,
-      "Menu Alpha Factor")
+      "Меню Alpha Factor")
 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_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_DOTART,
       "Dot-Art")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
-      "Menu Color Theme")
+      "Цветная тема меню")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
-      "Apple Green")
+      "Зеленое яблоко")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
-      "Dark")
+      "Темно")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE,
-      "Dark Purple")
+      "Темно фиолетовый")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE,
-      "Electric Blue")
+      "Электрический синий")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GOLDEN,
-      "Golden")
+      "Золотой")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED,
-      "Legacy Red")
+      "Красный")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDNIGHT_BLUE,
-      "Midnight Blue")
+      "Темно-синий")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_PLAIN,
-      "Plain")
+      "Обычный")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_UNDERSEA,
-      "Undersea")
+      "Водные глубины")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
-      "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,
-      "Icon Shadows Enable")
+      "Тени иконок включена")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY,
-      "Display History Tab")
+      "Показать вкладку история просмотров")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES,
-      "Display Image Tab")
+      "Показать вкладку изображение")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC,
-      "Display Music Tab")
+      "Показать вкладку музыка")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS,
-      "Display Settings Tab")
+      "Показать вкладку настройки")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO,
-      "Display Video Tab")
+      "Показать вкладку видео")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME,
-      "Menu Icon 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,
-      "Enable or disable achievements. For more information, visit http://retroachievements.org")
+      "Включение или отключение достижений. Для получения дополнительной информации посетите страницу 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, fast-forward, pause, and slow-motion for all games.")
+      "Включить или отключить сохранения, читы, перемотка назад, перемотка вперед, пауза и замедленное воспроизведение для всех игр.")
 MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS,
-      "Change drivers for this system.")
+      "Изменение драйверов для этой системы.")
 MSG_HASH(MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS,
-      "Change settings for the achievements.")
+      "Изменение настроек для достижений.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CORE_SETTINGS,
-      "Change settings for the core.")
+      "Изменить настройки для ядра.")
 MSG_HASH(MENU_ENUM_SUBLABEL_RECORDING_SETTINGS,
-      "Change settings for the recording.")
+      "Изменить настройки для записи.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONSCREEN_DISPLAY_SETTINGS,
-      "Change settings for display overlay, keyboard overlay and onscreen notifications.")
+      "Измените настройки отображения перекрытия, наложения клавиатуры и уведомлений на экране.")
 MSG_HASH(MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS,
-      "Change settings for rewinding, fast-forwarding, and slow-motion.")
+      "Измените настройки для перемотки, быстрой перемотки и замедленного воспроизведения.")
 MSG_HASH(MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
-      "Change settings for the saving.")
+      "Измените настройки для сохранения.")
 MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS,
-      "Change settings for the logging.")
+      "Изменить настройки для ведения журнала.")
 MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS,
-      "Change settings for the user interface.")
+      "Изменить настройки для пользовательского интерфейса.")
 MSG_HASH(MENU_ENUM_SUBLABEL_USER_SETTINGS,
-      "Change accounts, username, and language.")
+      "Измените учетные записи, имя пользователя и язык.")
 MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS,
-      "Change your privacy settings.")
+      "Измените настройки конфиденциальности.")
 MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS,
-      "Change default directories for this system.")
+      "Изменение каталогов по умолчанию для этой системы.")
 MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS,
-      "Change settings for the playlists.")
+      "Изменить настройки для списков воспроизведения.")
 MSG_HASH(MENU_ENUM_SUBLABEL_NETWORK_SETTINGS,
-      "Configure server and network settings.")
+      "Настроить параметры сервера и сети.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
-      "Scan contents and add to the database.")
+      "Сканировать содержимое и добавить в базу данных.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
-      "Adjusts settings for audio output.")
+      "Настройка параметров аудиовыхода.")
 MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
-      "Enable or disable bluetooth.")
+      "Включить или отключить Bluetooth.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
-      "Saves changes to configuration file on exit.")
+      "Сохраняет изменения в файле конфигурации при выходе.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
-      "Change default settings for configuration files.")
+      "Измените настройки по умолчанию для файлов конфигурации.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST,
-      "Manage and create configuration files.")
+      "Управление и создание файлов конфигурации.")
 MSG_HASH(MENU_ENUM_SUBLABEL_CPU_CORES,
-      "Amount of cores that the CPU has.")
+      "«Количество ядер CPU.")
 MSG_HASH(MENU_ENUM_SUBLABEL_FPS_SHOW,
-      "Displays the current framerate per second onscreen.")
+      "Отображает текущую частоту кадров в секунду на экране.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS,
-      "Configure hotkey settings.")
+      "Настроить параметры горячих клавиш.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
-      "Gamepad button combination to toggle menu.")
+      "Комбинация кнопок геймпада для переключения меню.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_SETTINGS,
-      "Adjusts settings for joypads, keyboard and mouse.")
+      "Настройки управления для джойстика, клавиатуры и мыши.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_USER_BINDS,
-      "Configure controls for this user.")
+      "Настройки элементов управления для этого пользователя.")
 MSG_HASH(MENU_ENUM_SUBLABEL_LOG_VERBOSITY,
-      "Enable or disable logging to the terminal.")
+      "Включить или отключить ведение журнала в терминале.")
 MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY,
-      "Join or host a netplay session.")
+      "Присоединиться или создать сеанс netplay.")
 MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
-      "Display core, network and system information.")
+      "Отображать информацию о ядре, сети и системе.")
 MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
-      "Download add-ons, components and contents for RetroArch.")
+      "Загрузите надстройки, компоненты и содержимое для 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,
-      "Prevents your system's screensaver from becoming active.")
+      "Запрещается активация заставки вашей системы.")
 MSG_HASH(MENU_ENUM_SUBLABEL_USER_LANGUAGE,
-      "Sets the language of the interface.")
+      "Устанавливает язык интерфейса.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION,
-      "Inserts a black frame inbetween frames. Useful for users of 120 Hz screens who want to play 60 Hz material with eliminated ghosting.")
+      "Вставляет черную рамку между кадрами. Полезно для пользователей с экранами с частотой 120 Гц, которые хотят проигрывать материал с частотой 60 Гц с устраненным ореолом.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY,
-      "Reduces latency at the cost of higher risk of video stuttering. Adds a delay after V-Sync (in ms).")
+      "Уменьшает задержку за счет более высокого риска заикания видео. Добавляет задержку после V-Sync (в мс).")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES,
-      "Sets how many frames the CPU can run ahead of the GPU when using 'Hard GPU Sync'.")
+      "Устанавливает, сколько кадров процессор может запустить перед графическим процессором при использовании« Hard GPU Sync.")
 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,
-      "Selects which display screen to use.")
+      "Выбирает, какой экран дисплея использовать.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_AUTO,
-      "The accurate estimated refresh rate of the screen in Hz.")
+      "Точная оценка частоты обновления экрана в Гц.")
 MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_SETTINGS,
-      "Adjusts settings for video output.")
+      "Настройка параметров вывода видео.")
 MSG_HASH(MENU_ENUM_SUBLABEL_WIFI_SETTINGS,
-      "Scans for wireless networks and establishes connection.")
+      "Сканирует беспроводные сети и устанавливает соединение.")
 MSG_HASH(MENU_ENUM_SUBLABEL_HELP_LIST,
-      "Learn more about how it works.")
+      "Узнайте больше о том, как это работает.")
 MSG_HASH(MSG_APPENDED_DISK,
       "Вставлен диск")
 MSG_HASH(MSG_APPLICATION_DIR,
-      "Application Dir")
+      "Каталог приложений")
 MSG_HASH(MSG_APPLYING_CHEAT,
-      "Applying cheat changes.")
+      "Применение читов.")
 MSG_HASH(MSG_APPLYING_SHADER,
       "Применён шейдер")
 MSG_HASH(MSG_AUDIO_MUTED,
@@ -1722,115 +1723,115 @@ 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,
       "Ошибка автосохранения.")
 MSG_HASH(MSG_AUTO_SAVE_STATE_TO,
-      "Auto save state to")
+      "Процесс авто-сохранения")
 MSG_HASH(MSG_BLOCKING_SRAM_OVERWRITE,
       "Перезапись SRAM запрещена.")
 MSG_HASH(MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT,
-      "Bringing up command interface on port")
+      "Вывод командного интерфейса на порт")
 MSG_HASH(MSG_BYTES,
-      "байт")
+      "Байт")
 MSG_HASH(MSG_CANNOT_INFER_NEW_CONFIG_PATH,
-      "Cannot infer new config path. Use current time.")
+      "Вывод командного интерфейса на порт.")
 MSG_HASH(MSG_CHEEVOS_HARDCORE_MODE_ENABLE,
-      "Hardcore Mode Enabled, savestate & rewind were disabled.")
+      "Режим Hardcore включен, режим сохранения и перемотки отключен.")
 MSG_HASH(MSG_COMPARING_WITH_KNOWN_MAGIC_NUMBERS,
-      "Comparing with known magic numbers...")
+      "Сравнение с известными магическими числами ...")
 MSG_HASH(MSG_COMPILED_AGAINST_API,
-      "Compiled against API")
+      "Скомпилирован против API")
 MSG_HASH(MSG_CONFIG_DIRECTORY_NOT_SET,
       "Не задана папка хранения настроек. Невозможно сохранить конфигурацию.")
 MSG_HASH(MSG_CONNECTED_TO,
-      "Connected to")
+      "Подключен к")
 MSG_HASH(MSG_CONTENT_CRC32S_DIFFER,
-      "Content CRC32s differ. Cannot use different games.")
+      "Содержимое CRC32 различается. Нельзя использовать разные игры.")
 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,
-      "Ядро не поддерживает быстрые сохранения.")
+      "Ядро не поддерживает быстрые сохранение.")
 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,
       "Не удалось прочитать файл контента")
 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.")
+      "Ошибка контрольной суммы CRC32 между файлом содержимого и контрольной суммой сохраненного содержимого в заголовке файла воспроизведения), что, скорее всего, приведет к рассинхронизации при воспроизведении.")
 MSG_HASH(MSG_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,
       "Обнаружено окно проекции")
 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_DOWNLOAD_FAILED,
-      "Download failed")
+      "Загрузка не удалась")
 MSG_HASH(MSG_ERROR,
-      "Error")
+      "Ошибка")
 MSG_HASH(MSG_ERROR_LIBRETRO_CORE_REQUIRES_CONTENT,
-      "Libretro core requires content, but nothing was provided.")
+      "Ядру Libretro требуется контент, но ничего не было предоставлено.")
 MSG_HASH(MSG_ERROR_LIBRETRO_CORE_REQUIRES_SPECIAL_CONTENT,
-      "Libretro core requires special content, but none were provided.")
+      "Ядру Libretro требуется особый контент, но его не было.")
 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_SAVING_SHADER_PRESET,
-      "Error saving shader preset.")
+      "Ошибка сохранения пресетов шейдера.")
 MSG_HASH(MSG_EXTERNAL_APPLICATION_DIR,
-      "External Application Dir")
+      "Внешний каталог приложений")
 MSG_HASH(MSG_EXTRACTING,
-      "Extracting")
+      "Извлечение")
 MSG_HASH(MSG_EXTRACTING_FILE,
-      "Extracting file")
+      "Извлечение файла")
 MSG_HASH(MSG_FAILED_SAVING_CONFIG_TO,
-      "Failed saving config to")
+      "Ошибка сохранения конфигурации в")
 MSG_HASH(MSG_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,
       "Не удалось применить шейдер")
 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,
       "Не удалось загрузить контент")
 MSG_HASH(MSG_FAILED_TO_LOAD_MOVIE_FILE,
@@ -1840,19 +1841,19 @@ MSG_HASH(MSG_FAILED_TO_LOAD_OVERLAY,
 MSG_HASH(MSG_FAILED_TO_LOAD_STATE,
       "Ошибка загрузки сохранения из")
 MSG_HASH(MSG_FAILED_TO_OPEN_LIBRETRO_CORE,
-      "Failed to open libretro core")
+      "Не удалось открыть ядро libretro")
 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.")
+      "Не удалось получить данные SRAM с хоста.")
 MSG_HASH(MSG_FAILED_TO_REMOVE_DISK_FROM_TRAY,
       "Невозможно извлечь диск.")
 MSG_HASH(MSG_FAILED_TO_REMOVE_TEMPORARY_FILE,
@@ -1862,17 +1863,17 @@ MSG_HASH(MSG_FAILED_TO_SAVE_SRAM,
 MSG_HASH(MSG_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.")
+      "FНе удалось отправить никнейм на хост.")
 MSG_HASH(MSG_FAILED_TO_SEND_SRAM_DATA_TO_CLIENT,
-      "Failed to send SRAM data to client.")
+      "Не удалось отправить данные SRAM клиенту.")
 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,
       "Невозможно начать запись видео.")
 MSG_HASH(MSG_FAILED_TO_START_RECORDING,
@@ -1880,29 +1881,29 @@ MSG_HASH(MSG_FAILED_TO_START_RECORDING,
 MSG_HASH(MSG_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,
       "Не удалось включить звук.")
 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,
       "Обнаружен шейдер")
 MSG_HASH(MSG_FRAMES,
-      "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,
       "Задан неверный номер диска.")
 MSG_HASH(MSG_GRAB_MOUSE_STATE,
@@ -1910,31 +1911,31 @@ MSG_HASH(MSG_GRAB_MOUSE_STATE,
 MSG_HASH(MSG_HW_RENDERED_MUST_USE_POSTSHADED_RECORDING,
       "Ядро использует аппаратный рендеринг. Включите запись с GPU.")
 MSG_HASH(MSG_INFLATED_CHECKSUM_DID_NOT_MATCH_CRC32,
-      "Inflated checksum did not match CRC32.")
+      "Завышенная контрольная сумма не соответствует CRC32.")
 MSG_HASH(MSG_INPUT_CHEAT,
-      "Input Cheat")
+      "Исходный чит")
 MSG_HASH(MSG_INPUT_CHEAT_FILENAME,
-      "Cheat Filename")
+      "Имя чита")
 MSG_HASH(MSG_INPUT_PRESET_FILENAME,
-      "Preset Filename")
+      "Имя настроек")
 MSG_HASH(MSG_INTERFACE,
-      "Interface")
+      "Интерфейс")
 MSG_HASH(MSG_INTERNAL_STORAGE,
-      "Internal Storage")
+      "Внутреннее хранилище")
 MSG_HASH(MSG_REMOVABLE_STORAGE,
-      "Removable Storage")
+      "Внешнее хранилище")
 MSG_HASH(MSG_INVALID_NICKNAME_SIZE,
-      "Invalid nickname size.")
+      "Недопустимый размер никнейма.")
 MSG_HASH(MSG_IN_BYTES,
-      "в байтах")
+      "В байтах")
 MSG_HASH(MSG_IN_GIGABYTES,
-      "в гигабайтах")
+      "В гигабайтах")
 MSG_HASH(MSG_IN_MEGABYTES,
-      "в мегабайтах")
+      "В мегабайтах")
 MSG_HASH(MSG_LIBRETRO_ABI_BREAK,
-      "скомпилировано для другой версии libretro.")
+      "Скомпилировано для другой версии libretro.")
 MSG_HASH(MSG_LIBRETRO_FRONTEND,
-      "Frontend for libretro")
+      "Внешний интерфейс для libretro")
 MSG_HASH(MSG_LOADED_STATE_FROM_SLOT,
       "Загружено сохранение из слота #%d.")
 MSG_HASH(MSG_LOADED_STATE_FROM_SLOT_AUTO,
@@ -1942,19 +1943,19 @@ MSG_HASH(MSG_LOADED_STATE_FROM_SLOT_AUTO,
 MSG_HASH(MSG_LOADING,
       "Загрузка")
 MSG_HASH(MSG_FIRMWARE,
-      "One or more firmware files are missing")
+      "Отсутствуют один или несколько файлов прошивки")
 MSG_HASH(MSG_LOADING_CONTENT_FILE,
       "Загружен файл контента")
 MSG_HASH(MSG_LOADING_HISTORY_FILE,
-      "Loading history file")
+      "Загрузка файла истории")
 MSG_HASH(MSG_LOADING_STATE,
       "Загружено сохранение")
 MSG_HASH(MSG_MEMORY,
-      "Memory")
+      "Память")
 MSG_HASH(MSG_MOVIE_FILE_IS_NOT_A_VALID_BSV1_FILE,
-      "Movie file is not a valid BSV1 file.")
+      "Видеофайл не является допустимым файлом BSV1.")
 MSG_HASH(MSG_MOVIE_FORMAT_DIFFERENT_SERIALIZER_VERSION,
-      "Movie format seems to have a different serializer version. Will most likely fail.")
+      "Формат фильма, похоже, отличается от версии сериализатора.")
 MSG_HASH(MSG_MOVIE_PLAYBACK_ENDED,
       "Достигнут конец записи.")
 MSG_HASH(MSG_MOVIE_RECORD_STOPPED,
@@ -1962,23 +1963,23 @@ MSG_HASH(MSG_MOVIE_RECORD_STOPPED,
 MSG_HASH(MSG_NETPLAY_FAILED,
       "Ошибка запуска сетевой игры.")
 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,
       "Размеры окна были изменены. Запись остановлена.")
 MSG_HASH(MSG_RECORDING_TO,
@@ -2000,13 +2001,13 @@ MSG_HASH(MSG_RESET,
 MSG_HASH(MSG_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")
+      "Возврат каталога savefile на")
 MSG_HASH(MSG_REVERTING_SAVESTATE_DIRECTORY_TO,
-      "Reverting savestate directory to")
+      "Возврат каталога savestate к")
 MSG_HASH(MSG_REWINDING,
       "Перемотка.")
 MSG_HASH(MSG_REWIND_INIT,
@@ -2018,7 +2019,7 @@ MSG_HASH(MSG_REWIND_INIT_FAILED_THREADED_AUDIO,
 MSG_HASH(MSG_REWIND_REACHED_END,
       "Достигнут предел буфера перемотки.")
 MSG_HASH(MSG_SAVED_NEW_CONFIG_TO,
-      "Saved new config to")
+      "Сохранено новое имя конфигурации")
 MSG_HASH(MSG_SAVED_STATE_TO_SLOT,
       "Сохранено в слот #%d.")
 MSG_HASH(MSG_SAVED_STATE_TO_SLOT_AUTO,
@@ -2036,11 +2037,11 @@ 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,
       "Пропуск загрузки SRAM.")
 MSG_HASH(MSG_SLOW_MOTION,
@@ -2062,9 +2063,9 @@ MSG_HASH(MSG_TAKING_SCREENSHOT,
 MSG_HASH(MSG_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,
@@ -2072,134 +2073,134 @@ MSG_HASH(MSG_UNPAUSED,
 MSG_HASH(MSG_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,
       "Используется фиктивное ядро. Запись не производится.")
 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")
+      "Версия API libretro")
 MSG_HASH(MSG_VIEWPORT_SIZE_CALCULATION_FAILED,
       "Ошибка расчёта размеров окна проекции. Будут использованы необработанные данные. Возможны ошибки.")
 MSG_HASH(MSG_VIRTUAL_DISK_TRAY,
-      "виртуальный лоток cd-привода")
+      "Виртуальный лоток cd-привода")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_LATENCY,
-      "Desired audio latency in milliseconds. Might not be honored if the audio driver can't provide given latency.")
+      "Требуемая длительность звукового сигнала в миллисекундах. Невозможно удостовериться, что звуковой драйвер не может обеспечить заданную задержку.")
 MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_MUTE,
-      "Mute/unmute audio.")
+      "Отключить / включить звук.")
 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."
+      "Помогает сгладить недостатки времени при синхронизации аудио и видео в одно и то же время. Имейте в виду, что если отключено, правильную синхронизацию получить почти невозможно."
       )
 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,
-      "Maximum amount of users supported by RetroArch."
+      "Максимальное количество пользователей, поддерживаемых RetroArch."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_INPUT_POLL_TYPE_BEHAVIOR,
-      "Influence how input polling is done inside RetroArch. Setting it to 'Early' or 'Late' can result in less latency, depending on your configuration."
+      "Влияйте на то, как входной опрос выполняется внутри RetroArch. Установка его на« Early »или« Late »может привести к меньшему времени ожидания в зависимости от вашей конфигурации."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_INPUT_ALL_USERS_CONTROL_MENU,
-      "Allows any user to control the menu. If disabled, only User 1 can control the menu."
+      "Позволяет любому пользователю управлять меню. Если отключено, только пользователь 1 может управлять меню."
       )
 MSG_HASH(
       MENU_ENUM_SUBLABEL_AUDIO_VOLUME,
-      "Audio volume (in dB). 0 dB is normal volume, no gain applied."
+      "Громкость звука (в дБ). 0 дБ - это нормальный уровень громкости, при этом не применяется усиление."
       )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_AUDIO_SYNC,
-   "Synchronize audio. Recommended."
+   "Синхронизировать звук. Рекомендуется."
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_AXIS_THRESHOLD,
-   "How far an axis must be tilted to result in a button press."
+   "Как далеко ось должна быть наклонена, чтобы вызвать нажатие кнопки."
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_BIND_TIMEOUT,
-   "Amount of seconds to wait until proceeding to the next bind."
+   "Количество секунд ожидания до перехода к следующей привязке."
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_TURBO_PERIOD,
-   "Describes the period of which turbo-enabled buttons toggle. 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,
-   "Synchronizes the output video of the graphics card to the refresh rate of the screen. Recommended."
+   "Синхронизирует видеовыход видеокарты с частотой обновления экрана. Рекомендуется."
    )
 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."
+   "AРазрешить ядрам задавать поворот, при отключении, запросы на поворот игнорируются, что полезно при настройках, когда один из них поворачивает экран вручную."
    )
 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."
+   "Некоторые ядра могут иметь функцию отключения, если она включена, это предотвратит остановку ядра от RetroArch, вместо этого он загрузит фиктивное ядро."
    )
 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,
-   "Vertical refresh rate of your screen. Used to calculate a suitable audio input rate. NOTE: This will be ignored if 'Threaded Video' is enabled."
+   "Вертикальная частота обновления экрана. Используется для расчета подходящей скорости ввода аудиосигнала. ПРИМЕЧАНИЕ: Это будет проигнорировано, если включено« Потоковое видео."
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_AUDIO_ENABLE,
-   "Enable audio output."
+   "Включить вывод звука."
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_AUDIO_MAX_TIMING_SKEW,
-   "The maximum change in audio input rate. You may want to increase this to enable very large changes in timing, for example running PAL cores on NTSC displays, at the cost of inaccurate audio pitch."
+   "Максимальное изменение скорости ввода аудиосигнала. Возможно, вы захотите увеличить его, чтобы обеспечить очень большие изменения во времени, например, запуск PAL-ядер на дисплеях NTSC за счет неточности звукового поля."
    )
 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,
-   "Выключено"
+   "Отключено"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_ENABLED,
@@ -2207,7 +2208,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_PATH,
-   "Content History Path"
+   "Путь к истории контента"
    )
 MSG_HASH(
       MENU_ENUM_LABEL_DATABASE_CURSOR_LIST_ENTRY_ORIGIN,
@@ -2256,11 +2257,11 @@ MSG_HASH(
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BROWSE_URL,
-      "Адрес"
+      "URL Path"
       )
 MSG_HASH(
       MENU_ENUM_LABEL_VALUE_BROWSE_START,
-      "Старт"
+      "Start"
       )
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
       "Bokeh")
diff --git a/intl/msg_hash_us.c b/intl/msg_hash_us.c
index f95feccd73..ee0ae74fb6 100644
--- a/intl/msg_hash_us.c
+++ b/intl/msg_hash_us.c
@@ -770,7 +770,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) {
             snprintf(s, len,
                      "Current Video driver.");
 
-            if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+            if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
             {
                 snprintf(s, len,
                          "OpenGL Video driver. \n"
@@ -784,7 +784,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) {
                                  "dependent on your graphics card's \n"
                                  "underlying GL driver).");
             }
-            else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4))
             {
                 snprintf(s, len,
                          "SDL 2 Video driver.\n"
@@ -796,7 +796,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) {
                                  "core implementations is dependent \n"
                                  "on your platform SDL implementation.");
             }
-            else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4))
             {
                 snprintf(s, len,
                          "SDL Video driver.\n"
@@ -807,7 +807,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) {
                                  "Performance is considered to be suboptimal. \n"
                                  "Consider using it only as a last resort.");
             }
-            else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3))
             {
                 snprintf(s, len,
                          "Direct3D Video driver. \n"
@@ -816,7 +816,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) {
                                  "is dependent on your graphic card's \n"
                                  "underlying D3D driver).");
             }
-            else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6))
             {
                 snprintf(s, len,
                          "Exynos-G2D Video Driver. \n"
@@ -828,7 +828,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) {
                                  "Performance for software rendered cores \n"
                                  "should be optimal.");
             }
-            else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3))
             {
                 snprintf(s, len,
                          "Plain DRM Video Driver. \n"
@@ -837,7 +837,7 @@ int menu_hash_get_help_us_enum(enum msg_hash_enums msg, char *s, size_t len) {
                                  "libdrm for hardware scaling using \n"
                                  "GPU overlays.");
             }
-            else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0)
+            else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5))
             {
                 snprintf(s, len,
                          "Sunxi-G2D Video Driver. \n"
@@ -2006,7 +2006,7 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg) {
 #ifdef HAVE_MENU
     const char *ret = menu_hash_to_str_us_label_enum(msg);
 
-    if (ret && (memcmp(ret, "null", 4) != 0))
+    if (ret && string_is_not_equal_fast(ret, "null", 4))
        return ret;
 #endif
 
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 4d47a5fe6a..6e21a58b72 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -991,6 +991,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
       "Connect to netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
       "Start netplay host")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
       "Server Address")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS,
@@ -1391,6 +1393,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_JACK_SUPPORT,
       "JACK support")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_KMS_SUPPORT,
       "KMS/EGL support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LAKKA_VERSION,
+      "Lakka Version")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
       "LibretroDB support")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
diff --git a/intl/msg_hash_vn.c b/intl/msg_hash_vn.c
index 41069cc955..ff66dd8c2e 100644
--- a/intl/msg_hash_vn.c
+++ b/intl/msg_hash_vn.c
@@ -781,7 +781,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
          snprintf(s, len,
                "Current Video driver.");
 
-         if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+         if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
          {
             snprintf(s, len,
                   "OpenGL Video driver. \n"
@@ -795,7 +795,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "dependent on your graphics card's \n"
                   "underlying GL driver).");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl2", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl2", 4))
          {
             snprintf(s, len,
                   "SDL 2 Video driver.\n"
@@ -807,7 +807,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "core implementations is dependent \n"
                   "on your platform SDL implementation.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sdl1", 4) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sdl1", 4))
          {
             snprintf(s, len,
                   "SDL Video driver.\n"
@@ -818,7 +818,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Performance is considered to be suboptimal. \n"
                   "Consider using it only as a last resort.");
          }
-         else if (memcmp(settings->arrays.video_driver, "d3d", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "d3d", 3))
          {
             snprintf(s, len,
                   "Direct3D Video driver. \n"
@@ -827,7 +827,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "is dependent on your graphic card's \n"
                   "underlying D3D driver).");
          }
-         else if (memcmp(settings->arrays.video_driver, "exynos", 6) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "exynos", 6))
          {
             snprintf(s, len,
                   "Exynos-G2D Video Driver. \n"
@@ -839,7 +839,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "Performance for software rendered cores \n"
                   "should be optimal.");
          }
-         else if (memcmp(settings->arrays.video_driver, "drm", 3) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "drm", 3))
          {
             snprintf(s, len,
                   "Plain DRM Video Driver. \n"
@@ -848,7 +848,7 @@ int menu_hash_get_help_vn_enum(enum msg_hash_enums msg, char *s, size_t len)
                   "libdrm for hardware scaling using \n"
                   "GPU overlays.");
          }
-         else if (memcmp(settings->arrays.video_driver, "sunxi", 5) == 0)
+         else if (string_is_equal_fast(settings->arrays.video_driver, "sunxi", 5))
          {
             snprintf(s, len,
                   "Sunxi-G2D Video Driver. \n"
@@ -1904,1791 +1904,8 @@ const char *msg_hash_to_str_vn(enum msg_hash_enums msg)
 {
    switch (msg)
    {
-      case MENU_ENUM_SUBLABEL_MENU_SETTINGS:
-         return "Điều chỉnh thiết lập related to the appearance of the menu screen.";
-      case MSG_AUDIO_VOLUME:
-         return "Âm lượng âm thanh";
-      case MSG_AUTODETECT:
-         return "Tự động phát hiện";
-      case MSG_AUTOLOADING_SAVESTATE_FROM:
-         return "Đang tự đông tải savestate từ";
-      case MSG_CONNECTING_TO_NETPLAY_HOST:
-         return "Đang kết nối vào máy chủ netplay";
-      case MSG_CONNECTING_TO_PORT:
-         return "Đang kết nối vào port";
-      case MSG_CONNECTION_SLOT:
-         return "Khe kết nối";
-      case MSG_FAILED:
-         return "Bị Lỗi";
-      case MSG_FILE_ALREADY_EXISTS_SAVING_TO_BACKUP_BUFFER:
-         return "Ttệp đã tồn tại. Đang lưu vào backup buffer";
-      case MSG_GOT_CONNECTION_FROM:
-         return "Được kết nối từ: \"%s\"";
-      case MSG_NETPLAY_USERS_HAS_FLIPPED:
-         return "Người dùng Netplay đã flipped";
-      case MSG_SUCCEEDED:
-         return "Đã thành công";
-      case MSG_UNKNOWN_NETPLAY_COMMAND_RECEIVED:
-         return "Netplay không biết lệnh nhận được";
-      case MSG_WAITING_FOR_CLIENT:
-         return "Đang đợi máy khách  ...";
-	  case MSG_SHADER:
-         return "Shader";
-      case  MSG_SORRY_UNIMPLEMENTED_CORES_DONT_DEMAND_CONTENT_NETPLAY:
-         return "Sorry, unimplemented: cores that don't demand content cannot participate in netplay.";
-      case MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD:
-         return "Mật khẩu";
-      case MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS:
-         return "Tài khoản Cheevos";
-      case MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME:
-         return "Tên truy nhập";
-      case MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST:
-         return "Những tài khoản";
-      case MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST_END:
-         return "Điểm cuối của danh sách tài khoản";
-      case MENU_ENUM_LABEL_VALUE_ACCOUNTS_RETRO_ACHIEVEMENTS:
-         return "Thành tích Retro";
-      case MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST:
-         return "Danh sách thành tích";
-      case MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST:
-         return "Thêm nội dung";
-      case MENU_ENUM_LABEL_VALUE_ADD_TAB:
-         return "Tạo nội dung";
-      case MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE:
-         return "Hỏi";
-      case MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY:
-         return "Danh mục assets";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES:
-         return "Block Frames";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE:
-         return "Thiết bị âm thanh";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER:
-         return "Trình điều khiển âm thanh";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN:
-         return "Âm thanh DSP Plugin";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE:
-         return "Kích hoạt âm thanh";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_FILTER_DIR:
-         return "Âm thanh Filter Danh mục";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY:
-         return "Âm thanh Latency (ms)";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW:
-         return "Âm thanh Maximum Timing Skew";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_MUTE:
-         return "Âm thanh Mute";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE:
-         return "Âm thanh Output Rate (Hz)";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA:
-         return "Âm thanh Rate Control Delta";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER:
-         return "Âm thanh Resampler Driver";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS:
-         return "Âm thanh";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_SYNC:
-         return "Âm thanh Sync";
-      case MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME:
-         return "Mức âm lượng (dB)";
-      case MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL:
-         return "SaveRAM Autosave Interval";
-      case MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE:
-         return "Tự động tải tập tin ghi đè";
-      case MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE:
-         return "Tự động tải tập tin Remap";
-      case MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE:
-         return "Tự động tải Shader Presets";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK:
-         return "Trở lại";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM:
-         return "Xác nhận";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO:
-         return "Thông tin";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT:
-         return "Thoát";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN:
-         return "Cuộn xuống";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP:
-         return "Cuộn lên";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_START:
-         return "Start";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD:
-         return "Bật/tắt bàn phím";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU:
-         return "Bật/tắt trình đơn";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS:
-         return "Trình đơn điều khiển căn bản";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_CONFIRM:
-         return "Confirm/OK";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_INFO:
-         return "Thông tin";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_QUIT:
-         return "Thoát";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_SCROLL_UP:
-         return "Cuộn lên";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_START:
-         return "Những mặc định";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_KEYBOARD:
-         return "Bật/tắt bàn phím";
-      case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_MENU:
-         return "Bật/tắt trình đơn";
-      case MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE:
-         return "Khi tải savestate đừng ghi đè SaveRAM";
-      case MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE:
-         return "Kích hoạt Bluetooth";
-      case MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL:
-         return "URL của Buildbot Assets";
-      case MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY:
-         return "Danh mục cache";
-      case MENU_ENUM_LABEL_VALUE_CAMERA_ALLOW:
-         return "Cho phép Camera";
-      case MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER:
-         return "Trình Camera";
-      case MENU_ENUM_LABEL_VALUE_CHEAT:
-         return "Cheat";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES:
-         return "Áp dụng thay đổi của Cheat";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH:
-         return "Danh mục tập tin Cheat";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_FILE:
-         return "Tập tin Cheat";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD:
-         return "Tải tập tin Cheat";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS:
-         return "Lưu tập tin Cheat như";
-      case MENU_ENUM_LABEL_VALUE_CHEAT_NUM_PASSES:
-         return "Cheat Passes";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_DESCRIPTION:
-         return "Miêu tả";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE:
-         return "Chế độ Hardcore";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS:
-         return "Thành tựu bị khóa:";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ENTRY:
-         return "Đã khóa";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS:
-         return "Những thành tựu Retro";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL:
-         return "Thử nghiệm không chính thức";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS:
-         return "Những thành tựu đã mở:";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY:
-         return "Đã mở";
-      case MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT:
-         return "Đóng nội dung";
-      case MENU_ENUM_LABEL_VALUE_CONFIG:
-         return "Config";
-      case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS:
-         return "Tải cấu hình";
-      case MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS:
-         return "Cấu hình";
-      case MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT:
-         return "Lưu cấu hình khi thoát";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST:
-         return "Bộ sưu tập";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY:
-         return "Mục cơ sở dữ liệu nội dung";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_DIR:
-         return "Mục nội dung";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE:
-         return "Kích thước danh sách lịch sử";
-      case MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS:
-         return "Trình đơn lẹ";
-      case MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR:
-         return "Mục Core Assets";
-      case MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIRECTORY:
-         return "Mục Downloads";
-      case MENU_ENUM_LABEL_VALUE_CORE_CHEAT_OPTIONS:
-         return "Cheats";
-      case MENU_ENUM_LABEL_VALUE_CORE_COUNTERS:
-         return "Core Counters";
-      case MENU_ENUM_LABEL_VALUE_CORE_ENABLE:
-         return "Hiển thị tên của core";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFORMATION:
-         return "Core Thông tin";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_AUTHORS:
-         return "Tác giả";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CATEGORIES:
-         return "Thể loại";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL:
-         return "Nhãn hiệu Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME:
-         return "Tên của Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE:
-         return "Phần vững";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES:
-         return "Bản quyền";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS:
-         return "Phép";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS:
-         return "Tiện ích mở rộng được hỗ trợ";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER:
-         return "Nhà sản xuất hệ thống";
-      case MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME:
-         return "Tên hệ thống";
-      case MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS:
-         return "Điều khiển";
-      case MENU_ENUM_LABEL_VALUE_CORE_LIST:
-         return "Tải Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_OPTIONS:
-         return "Tùy chọn";
-      case MENU_ENUM_LABEL_VALUE_CORE_SETTINGS:
-         return "Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE:
-/* FIXME? Translate 'Start a Core Automatically' */
-         return "Tự động chạy Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE:
-         return "Tự động giải nén lưu trữ tải về";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL:
-         return "URL của Buildbot Cores";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST:
-         return "Cập nhật cho Core";
-      case MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS:
-         return "Cập nhật";
-      case MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE:
-         return "Kiến trúc CPU:";
-      case MENU_ENUM_LABEL_VALUE_CPU_CORES:
-         return "CPU Cores:";
-      case MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY:
-         return "Mục Cursor";
-      case MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER:
-         return "Cursor Manager";
-      case MENU_ENUM_LABEL_VALUE_CUSTOM_RATIO:
-         return "Custom Ratio";
-      case MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER:
-         return "Quản lý cho cơ sở dữ liệu";
-      case MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION:
-         return "Lựa chọn cơ sở dữ liệu";
-      case MENU_ENUM_LABEL_VALUE_DELETE_ENTRY:
-         return "Xoá";
-      case MENU_ENUM_LABEL_VALUE_FAVORITES:
-         return "Yêu thích";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT:
-         return "<Mục nội dung>";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT:
-         return "<Mặc định>";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE:
-         return "<Không có gì>";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND:
-         return "Không tìm thấy thư mục.";
-      case MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS:
-         return "Thư mục";
-      case MENU_ENUM_LABEL_VALUE_DISABLED:
-         return "Vô hiệu hoá";
-      case MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS:
-         return "Tình trạng khay đĩa";
-      case MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND:
-         return "Thêm đĩa";
-      case MENU_ENUM_LABEL_VALUE_DISK_INDEX:
-         return "Chỉ số đĩa";
-      case MENU_ENUM_LABEL_VALUE_DISK_OPTIONS:
-         return "Điều khiển đĩa";
-      case MENU_ENUM_LABEL_VALUE_DONT_CARE:
-         return "Không quan tâm";
-      case MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST:
-         return "Mục Downloads";
-      case MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE:
-         return "Tải về Core...";
-      case MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT:
-         return "Tải về nội dung";
-      case MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE:
-         return "Kích hoạt DPI Override";
-      case MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS:
-         return "Trình điều khiển";
-      case MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN:
-/* FIXME? Translate 'Load Dummy on Core Shutdown' */
-         return "Tải Core giả khi tắt máy";
-      case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER:
-         return "Nền năng động";
-      case MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY:
-         return "Mục nền năng động";
-      case MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE:
-         return "Kích hoạt";
-      case MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR:
-         return "Menu entry hover color";
-      case MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR:
-         return "Menu entry normal color";
-      case MENU_ENUM_LABEL_VALUE_FALSE:
-         return "False";
-      case MENU_ENUM_LABEL_VALUE_FASTFORWARD_RATIO:
-         return "Maximum Run Speed";
-      case MENU_ENUM_LABEL_VALUE_FPS_SHOW:
-         return "Display Framerate";
-      case MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE:
-         return "Limit Maximum Run Speed";
-      case MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS:
-         return "Frame Throttle";
-      case MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS:
-         return "Frontend Counters";
-      case MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS:
-         return "Tải Content-Specific Core Options Automatically";
-      case MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE:
-         return "Create game-options file";
-      case MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_IN_USE:
-         return "Game-options file";
-      case MENU_ENUM_LABEL_VALUE_HELP:
-         return "help";
-      case MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING:
-         return "Âm thanh/Video Troubleshooting";
-      case MENU_ENUM_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD:
-         return "Changing Virtual Gamepad Overlay";
-      case MENU_ENUM_LABEL_VALUE_HELP_CONTROLS:
-         return "Basic Menu Controls";
-      case MENU_ENUM_LABEL_VALUE_HELP_LIST:
-         return "Help";
-      case MENU_ENUM_LABEL_VALUE_HELP_LOADING_CONTENT:
-         return "Đang tải Content";
-      case MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT:
-         return "Scanning For Content";
-      case MENU_ENUM_LABEL_VALUE_HELP_WHAT_IS_A_CORE:
-         return "What Is A Core?";
-      case MENU_ENUM_LABEL_VALUE_HISTORY_LIST_ENABLE:
-         return "History List Enable";
-      case MENU_ENUM_LABEL_VALUE_HISTORY_TAB:
-         return "History";
-      case MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU:
-         return "Horizontal Menu";
-      case MENU_ENUM_LABEL_VALUE_IMAGES_TAB:
-         return "Image";
-      case MENU_ENUM_LABEL_VALUE_INFORMATION:
-         return "Information";
-      case MENU_ENUM_LABEL_VALUE_INFORMATION_LIST:
-         return "Information";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE:
-         return "Analog To Digital Type";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ALL_USERS_CONTROL_MENU:
-         return "All Users Control Menu";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X:
-         return "Left Analog X";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS:
-         return "Left analog X- (left)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS:
-         return "Left analog X+ (right)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y:
-         return "Left Analog Y";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS:
-         return "Left analog Y- (up)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS:
-         return "Left analog Y+ (down)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X:
-         return "Right Analog X";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS:
-         return "Right analog X- (left)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS:
-         return "Right analog X+ (right)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y:
-         return "Right Analog Y";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS:
-         return "Right analog Y- (up)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS:
-         return "Right analog Y+ (down)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE:
-         return "Kích hoạt Autoconfig";
-      case MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD:
-         return "Input Axis Threshold";
-      case MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL:
-         return "Bind All";
-      case MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL:
-         return "Bind Default All";
-      case MENU_ENUM_LABEL_VALUE_INPUT_BIND_TIMEOUT:
-         return "Bind Timeout";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_HIDE_UNBOUND:
-         return "Hide Unbound Core Input Descriptors";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DESCRIPTOR_LABEL_SHOW:
-         return "Display Input Descriptor Labels";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_INDEX:
-         return "Device Index";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE:
-         return "Device Type";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DRIVER:
-         return "Input Driver";
-      case MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE:
-         return "Duty Cycle";
-      case MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS:
-         return "Input Hotkey Binds";
-      case MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE:
-         return "Kích hoạt Keyboard Gamepad Mapping";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A:
-         return "A button (right)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B:
-         return "B button (down)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN:
-         return "Down D-pad";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2:
-         return "L2 button (trigger)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3:
-         return "L3 button (thumb)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L:
-         return "L button (shoulder)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT:
-         return "Left D-pad";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2:
-         return "R2 button (trigger)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3:
-         return "R3 button (thumb)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R:
-         return "R button (shoulder)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT:
-         return "Right D-pad";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT:
-         return "Select button";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START:
-         return "Start button";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP:
-         return "Up D-pad";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X:
-         return "X button (top)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y:
-         return "Y button (left)";
-      case MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE:
-         return "Keyboard Gamepad Mapping Type";
-      case MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS:
-         return "Max Users";
-      case MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO:
-         return "Menu Toggle Gamepad Combo";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS:
-         return "Cheat index -";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS:
-         return "Cheat index +";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE:
-         return "Cheat toggle";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE:
-         return "Disk eject toggle";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT:
-         return "Disk next";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV:
-         return "Disk prev";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY:
-         return "Kích hoạt hotkeys";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY:
-         return "Fast forward hold";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY:
-         return "Fast forward toggle";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE:
-         return "Frameadvance";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY:
-         return "Bật/tắt chế độ toàn màn hình";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE:
-         return "Grab mouse toggle";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY:
-         return "Tải state";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE:
-         return "Menu toggle";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE:
-         return "Movie record toggle";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE:
-         return "Âm thanh mute toggle";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP:
-         return "Netplay flip users";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_OSK:
-         return "On-screen keyboard toggle";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT:
-         return "Overlay next";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE:
-         return "Pause toggle";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY:
-         return "Quit RetroArch";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_RESET:
-         return "Reset game";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND:
-         return "Rewind";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY:
-         return "Save state";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT:
-         return "Chụp ảnh màn hình";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT:
-         return "Next shader";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV:
-         return "Previous shader";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION:
-         return "Slow motion";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS:
-         return "Savestate slot -";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS:
-         return "Savestate slot +";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN:
-         return "Volume -";
-      case MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP:
-         return "Volume +";
-      case MENU_ENUM_LABEL_VALUE_INPUT_OSK_OVERLAY_ENABLE:
-         return "Display Keyboard Overlay";
-      case MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE:
-         return "Display Overlay";
-      case MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU:
-         return "Hide Overlay In Menu";
-      case MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR:
-         return "Poll Type Behavior";
-      case MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_EARLY:
-         return "Early";
-      case MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE:
-         return "Late";
-      case MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_NORMAL:
-         return "Normal";
-      case MENU_ENUM_LABEL_VALUE_INPUT_PREFER_FRONT_TOUCH:
-         return "Prefer Front Touch";
-      case MENU_ENUM_LABEL_VALUE_INPUT_REMAPPING_DIRECTORY:
-         return "Input Remapping Danh mục";
-      case MENU_ENUM_LABEL_VALUE_INPUT_REMAP_BINDS_ENABLE:
-         return "Kích hoạt Remap Binds";
-      case MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG:
-         return "Lưu Autoconfig";
-      case MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS:
-         return "Input";
-      case MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE:
-         return "Small Keyboard Enable";
-      case MENU_ENUM_LABEL_VALUE_INPUT_TOUCH_ENABLE:
-         return "Kích hoạt Touch";
-      case MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE:
-         return "Kích hoạt Turbo";
-      case MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD:
-         return "Turbo Period";
-      case MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS:
-         return "Input User %u Binds";
-      case MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS:
-         return "Internal storage status";
-      case MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR:
-         return "Input Device Autoconfig Danh mục";
-      case MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER:
-         return "Joypad Driver";
-      case MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES:
-         return "Services";
-      case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED:
-         return "Tiếng Trung Quốc (Chữ Hán giản thể)";
-      case MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL:
-         return "Tiếng Trung Quốc (Chữ Hán phồn thể)";
-      case MENU_ENUM_LABEL_VALUE_LANG_DUTCH:
-         return "Tiếng Hà Lan";
-      case MENU_ENUM_LABEL_VALUE_LANG_ENGLISH:
-         return "Tiếng Anh";
-      case MENU_ENUM_LABEL_VALUE_LANG_ESPERANTO:
-         return "Tiếng Quốc tế ngữ";
-      case MENU_ENUM_LABEL_VALUE_LANG_FRENCH:
-         return "Tiếng Pháp";
-      case MENU_ENUM_LABEL_VALUE_LANG_GERMAN:
-         return "Tiếng Đức";
-      case MENU_ENUM_LABEL_VALUE_LANG_ITALIAN:
-         return "Tiếng Ý";
-      case MENU_ENUM_LABEL_VALUE_LANG_JAPANESE:
-         return "Tiếng Nhật";
-      case MENU_ENUM_LABEL_VALUE_LANG_KOREAN:
-         return "Tiếng Hàn Quốc";
-      case MENU_ENUM_LABEL_VALUE_LANG_POLISH:
-         return "Polish";
-      case MENU_ENUM_LABEL_VALUE_LANG_PORTUGUESE_BRAZIL:
-         return "Tiếng Bồ Đào Nha (Brazil)";
-      case MENU_ENUM_LABEL_VALUE_LANG_PORTUGUESE_PORTUGAL:
-         return "Tiếng Bồ Đào Nha (Portugal)";
-      case MENU_ENUM_LABEL_VALUE_LANG_RUSSIAN:
-         return "Tiếng Nga";
-      case MENU_ENUM_LABEL_VALUE_LANG_SPANISH:
-         return "Tiếng Tây Ban Nha";
-      case MENU_ENUM_LABEL_VALUE_LANG_VIETNAMESE:
-         return "Tiếng Việt";
-      case MENU_ENUM_LABEL_VALUE_LEFT_ANALOG:
-         return "Left Analog";
-      case MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH:
-         return "Core Danh mục";
-      case MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH:
-         return "Core Info Danh mục";
-      case MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL:
-         return "Core Logging Level";
-      case MENU_ENUM_LABEL_VALUE_LINEAR:
-         return "Linear";
-      case MENU_ENUM_LABEL_VALUE_LOAD_ARCHIVE:
-         return "Tải Archive With Core";
-      case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY:
-         return "Tải Recent";
-      case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST:
-         return "Tải Content";
-      case MENU_ENUM_LABEL_VALUE_LOAD_STATE:
-         return "Tải State";
-      case MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW:
-         return "Allow Location";
-      case MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER:
-         return "Location Driver";
-      case MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS:
-         return "Logging";
-      case MENU_ENUM_LABEL_VALUE_LOG_VERBOSITY:
-         return "Logging Verbosity";
-      case MENU_ENUM_LABEL_VALUE_MAIN_MENU:
-         return "Main Menu";
-      case MENU_ENUM_LABEL_VALUE_MANAGEMENT:
-         return "Database thiết lập";
-      case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME:
-         return "Menu Color Theme";
-      case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE:
-         return "Blue";
-      case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE_GREY:
-         return "Blue Grey";
-      case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE:
-         return "Dark Blue";
-      case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GREEN:
-         return "Green";
-      case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD:
-         return "Shield";
-      case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_RED:
-         return "Red";
-      case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW:
-         return "Yellow";
-      case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_FOOTER_OPACITY:
-         return "Footer Opacity";
-      case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_HEADER_OPACITY:
-         return "Header Opacity";
-      case MENU_ENUM_LABEL_VALUE_MENU_DRIVER:
-         return "Menu Driver";
-      case MENU_ENUM_LABEL_VALUE_MENU_ENUM_THROTTLE_FRAMERATE:
-         return "Throttle Menu Framerate";
-      case MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER:
-         return "Menu Linear Filter";
-      case MENU_ENUM_LABEL_VALUE_MENU_SETTINGS:
-         return "Menu";
-      case MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER:
-         return "Background";
-      case MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY:
-         return "Background opacity";
-      case MENU_ENUM_LABEL_VALUE_MISSING:
-         return "Missing";
-      case MENU_ENUM_LABEL_VALUE_MORE:
-         return "...";
-      case MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE:
-         return "Mouse Support";
-      case MENU_ENUM_LABEL_VALUE_MULTIMEDIA_SETTINGS:
-         return "Multimedia";
-      case MENU_ENUM_LABEL_VALUE_MUSIC_TAB:
-         return "Music";
-      case MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE:
-         return "Filter unknown extensions";
-      case MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND:
-         return "Navigation Wrap-Around";
-      case MENU_ENUM_LABEL_VALUE_NEAREST:
-         return "Nearest";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY:
-         return "Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_CHECK_FRAMES:
-         return "Netplay Check Frames";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_CLIENT_SWAP_INPUT:
-         return "Netplay P2 Uses C1";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_DELAY_FRAMES:
-         return "Netplay Delay Frames";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT:
-         return "Disconnect";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE:
-         return "Kích hoạt Netplay";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT:
-         return "Connect to Netplay host";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST:
-         return "Start hosting";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS:
-         return "Server Address";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_MODE:
-         return "Kích hoạt Netplay Client";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME:
-         return "Username";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_SETTINGS:
-         return "Netplay thiết lập";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATOR_MODE_ENABLE:
-         return "Kích hoạt Netplay Spectator";
-      case MENU_ENUM_LABEL_VALUE_NETPLAY_TCP_UDP_PORT:
-         return "Netplay TCP/UDP Port";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_CMD_ENABLE:
-         return "Network Commands";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_CMD_PORT:
-         return "Network Command Port";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_INFORMATION:
-         return "Network Information";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE:
-         return "Network Gamepad";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_PORT:
-         return "Network Remote Base Port";
-      case MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS:
-         return "Network";
-      case MENU_ENUM_LABEL_VALUE_NO:
-         return "No";
-      case MENU_ENUM_LABEL_VALUE_NONE:
-         return "None";
-      case MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE:
-         return "N/A";
-      case MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY:
-         return "No achievements to display.";
-      case MENU_ENUM_LABEL_VALUE_NO_CORE:
-         return "No Core";
-      case MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE:
-         return "No cores available.";
-      case MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE:
-         return "No core information available.";
-      case MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE:
-         return "No core options available.";
-      case MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY:
-         return "No entries to display.";
-      case MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE:
-         return "No history available.";
-      case MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE:
-         return "No information is available.";
-      case MENU_ENUM_LABEL_VALUE_NO_ITEMS:
-         return "No items.";
-      case MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS:
-         return "No performance counters.";
-      case MENU_ENUM_LABEL_VALUE_NO_PLAYLISTS:
-         return "No playlists.";
-      case MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE:
-         return "No playlist entries available.";
-      case MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND:
-         return "No thiết lập found.";
-      case MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS:
-         return "No shader parameters.";
-      case MENU_ENUM_LABEL_VALUE_OFF:
-         return "OFF";
-      case MENU_ENUM_LABEL_VALUE_ON:
-         return "ON";
-      case MENU_ENUM_LABEL_VALUE_ONLINE_UPDATER:
-         return "Online Updater";
-      case MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS:
-         return "Onscreen Display";
-      case MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS:
-         return "Onscreen Overlay";
-      case MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE:
-         return "Open Archive As Folder";
-      case MENU_ENUM_LABEL_VALUE_OPTIONAL:
-         return "Optional";
-      case MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_DIRECTORY:
-         return "OSK Overlay Dir";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY:
-         return "Overlay";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED:
-         return "Tự động tải Preferred Overlay";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_DIRECTORY:
-         return "Overlay Dir";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_OPACITY:
-         return "Overlay Opacity";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_PRESET:
-         return "Overlay Preset";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_SCALE:
-         return "Overlay Scale";
-      case MENU_ENUM_LABEL_VALUE_OVERLAY_SETTINGS:
-         return "Onscreen Overlay";
-      case MENU_ENUM_LABEL_VALUE_PAL60_ENABLE:
-         return "Use PAL60 Mode";
-      case MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY:
-         return "Parent directory";
-      case MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO:
-         return "Pause when menu activated";
-      case MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE:
-         return "Don't run in background";
-      case MENU_ENUM_LABEL_VALUE_PERFCNT_ENABLE:
-         return "Performance Counters";
-      case MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB:
-         return "Playlists";
-      case MENU_ENUM_LABEL_VALUE_PLAYLIST_DIRECTORY:
-         return "Playlist Danh mục";
-      case MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS:
-         return "Playlists";
-      case MENU_ENUM_LABEL_VALUE_POINTER_ENABLE:
-         return "Touch Support";
-      case MENU_ENUM_LABEL_VALUE_PORT:
-         return "Port";
-      case MENU_ENUM_LABEL_VALUE_PRESENT:
-         return "Present";
-      case MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS:
-         return "Privacy";
-      case MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH:
-         return "Thoát RetroArch";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ANALOG:
-         return "Analog supported";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_BBFC_RATING:
-         return "BBFC Rating";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CERO_RATING:
-         return "CERO Rating";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_COOP:
-         return "Co-op supported";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CRC32:
-         return "CRC32";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DESCRIPTION:
-         return "Description";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_DEVELOPER:
-         return "Developer";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_ISSUE:
-         return "Edge Magazine Issue";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_RATING:
-         return "Edge Magazine Rating";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_EDGE_MAGAZINE_REVIEW:
-         return "Edge Magazine Review";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ELSPA_RATING:
-         return "ELSPA Rating";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ENHANCEMENT_HW:
-         return "Enhancement Hardware";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ESRB_RATING:
-         return "ESRB Rating";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FAMITSU_MAGAZINE_RATING:
-         return "Famitsu Magazine Rating";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_FRANCHISE:
-         return "Franchise";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_GENRE:
-         return "Genre";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_MD5:
-         return "MD5";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_NAME:
-         return "Name";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_ORIGIN:
-         return "Origin";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PEGI_RATING:
-         return "PEGI Rating";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_PUBLISHER:
-         return "Publisher";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_MONTH:
-         return "Releasedate Month";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RELEASE_YEAR:
-         return "Releasedate Year";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_RUMBLE:
-         return "Rumble supported";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SERIAL:
-         return "Serial";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SHA1:
-         return "SHA1";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_START_CONTENT:
-         return "Start Content";
-      case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_TGDB_RATING:
-         return "TGDB Rating";
-      case MENU_ENUM_LABEL_VALUE_REBOOT:
-         return "Khởi động lại";
-      case MENU_ENUM_LABEL_VALUE_RECORDING_CONFIG_DIRECTORY:
-         return "Recording Config Danh mục";
-      case MENU_ENUM_LABEL_VALUE_RECORDING_OUTPUT_DIRECTORY:
-         return "Recording Output Danh mục";
-      case MENU_ENUM_LABEL_VALUE_RECORDING_SETTINGS:
-         return "Recording";
-      case MENU_ENUM_LABEL_VALUE_RECORD_CONFIG:
-         return "Load Recording Config...";
-      case MENU_ENUM_LABEL_VALUE_RECORD_DRIVER:
-         return "Record Driver";
-      case MENU_ENUM_LABEL_VALUE_RECORD_ENABLE:
-         return "Enabel Recording";
-      case MENU_ENUM_LABEL_VALUE_RECORD_PATH:
-         return "Save Recording Output as...";
-      case MENU_ENUM_LABEL_VALUE_RECORD_USE_OUTPUT_DIRECTORY:
-         return "Save Recordings in Output Dir";
-      case MENU_ENUM_LABEL_VALUE_REMAP_FILE:
-         return "Remap File";
-      case MENU_ENUM_LABEL_VALUE_REMAP_FILE_LOAD:
-         return "Tải Remap File";
-      case MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_CORE:
-         return "Save Core Remap File";
-      case MENU_ENUM_LABEL_VALUE_REMAP_FILE_SAVE_GAME:
-         return "Save Game Remap File";
-      case MENU_ENUM_LABEL_VALUE_REQUIRED:
-         return "Required";
-      case MENU_ENUM_LABEL_VALUE_RESTART_CONTENT:
-         return "Khởi động lại";
-      case MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH:
-         return "Restart RetroArch";
-      case MENU_ENUM_LABEL_VALUE_RESUME:
-         return "Resume";
-      case MENU_ENUM_LABEL_VALUE_RESUME_CONTENT:
-         return "Resume";
-      case MENU_ENUM_LABEL_VALUE_RETROKEYBOARD:
-         return "RetroKeyboard";
-      case MENU_ENUM_LABEL_VALUE_RETROPAD:
-         return "RetroPad";
-      case MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS:
-         return "Retro Achievements";
-      case MENU_ENUM_LABEL_VALUE_REWIND_ENABLE:
-         return "Kích hoạt Rewind";
-      case MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY:
-         return "Rewind Granularity";
-      case MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS:
-         return "Rewind";
-      case MENU_ENUM_LABEL_VALUE_RGUI_BROWSER_DIRECTORY:
-         return "File Browser Danh mục";
-      case MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY:
-         return "Config Danh mục";
-      case MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN:
-         return "Show Start Screen";
-      case MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG:
-         return "Right Analog";
-      case MENU_ENUM_LABEL_VALUE_RUN:
-         return "Run";
-      case MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE:
-         return "Kích hoạt SAMBA";
-      case MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY:
-         return "Savefile Danh mục";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX:
-         return "Save State Auto Index";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD:
-         return "Tự động tải State";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE:
-         return "Auto Save State";
-      case MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY:
-         return "Savestate Danh mục";
-      case MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG:
-         return "Save Current Config";
-      case MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE:
-         return "Save Core Overrides";
-      case MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME:
-         return "Save Game Overrides";
-      case MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG:
-         return "Save New Config";
-      case MENU_ENUM_LABEL_VALUE_SAVE_STATE:
-         return "Save State";
-      case MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS:
-         return "Saving";
-      case MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY:
-         return "Scan Directory";
-      case MENU_ENUM_LABEL_VALUE_SCAN_FILE:
-         return "Scan File";
-      case MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY:
-         return "<Scan This Directory>";
-      case MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY:
-         return "Screenshot Danh mục";
-      case MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION:
-         return "Screen Resolution";
-      case MENU_ENUM_LABEL_VALUE_SEARCH:
-         return "Search";
-      case MENU_ENUM_LABEL_VALUE_SECONDS:
-         return "seconds";
-      case MENU_ENUM_LABEL_VALUE_SETTINGS:
-         return "Thiết lập";
-      case MENU_ENUM_LABEL_VALUE_SETTINGS_TAB:
-         return "Thiết lập";
-      case MENU_ENUM_LABEL_VALUE_SHADER:
-         return "Shader";
-      case MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES:
-         return "Áp dụng Shader Changes";
-      case MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS:
-         return "Shaders";
-      case MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON:
-         return "Ribbon";
-      case MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED:
-         return "Ribbon (simplified)";
-      case MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS:
-         return "Show Advanced thiết lập";
-      case MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES:
-         return "Show Hidden Files and Folders";
-      case MENU_ENUM_LABEL_VALUE_SHUTDOWN:
-         return "Tắt Máy";
-      case MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO:
-         return "Slow-Motion Ratio";
-      case MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE:
-         return "Sort Saves In Folders";
-      case MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE:
-         return "Sort Savestates In Folders";
-      case MENU_ENUM_LABEL_VALUE_SSH_ENABLE:
-         return "Kích hoạt SSH";
-      case MENU_ENUM_LABEL_VALUE_START_CORE:
-         return "Start Core";
-      case MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD:
-         return "Start Remote RetroPad";
-      case MENU_ENUM_LABEL_VALUE_START_VIDEO_PROCESSOR:
-         return "Start Video Processor";
-      case MENU_ENUM_LABEL_VALUE_STATE_SLOT:
-         return "State Slot";
-      case MENU_ENUM_LABEL_VALUE_STATUS:
-         return "Status";
-      case MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE:
-         return "stdin Commands";
-      case MENU_ENUM_LABEL_VALUE_SUPPORTED_CORES:
-         return "Supported cores";
-      case MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE:
-         return "Suspend Screensaver";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_BGM_ENABLE:
-         return "Kích hoạt System BGM";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_DIRECTORY:
-         return "System/BIOS Danh mục";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION:
-         return "System Information";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_7ZIP_SUPPORT:
-         return "7zip support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ALSA_SUPPORT:
-         return "ALSA support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE:
-         return "Build date";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CG_SUPPORT:
-         return "Cg support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COCOA_SUPPORT:
-         return "Cocoa support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COMMAND_IFACE_SUPPORT:
-         return "Command interface support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CORETEXT_SUPPORT:
-         return "CoreText support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CPU_FEATURES:
-         return "CPU Features";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_DPI:
-         return "Display metric DPI";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_HEIGHT:
-         return "Display metric height (mm)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_WIDTH:
-         return "Display metric width (mm)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DSOUND_SUPPORT:
-         return "DirectSound support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WASAPI_SUPPORT:
-         return "WASAPI support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYLIB_SUPPORT:
-         return "Dynamic library support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYNAMIC_SUPPORT:
-         return "Dynamic run-time loading of libretro library";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_EGL_SUPPORT:
-         return "EGL support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FBO_SUPPORT:
-         return "OpenGL/Direct3D render-to-texture (multi-pass shaders) support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FFMPEG_SUPPORT:
-         return "FFmpeg support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FREETYPE_SUPPORT:
-         return "FreeType support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_IDENTIFIER:
-         return "Frontend identifier";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_NAME:
-         return "Frontend name";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_OS:
-         return "Frontend OS";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION:
-         return "Git version";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GLSL_SUPPORT:
-         return "GLSL support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_HLSL_SUPPORT:
-         return "HLSL support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_JACK_SUPPORT:
-         return "JACK support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_KMS_SUPPORT:
-         return "KMS/EGL support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT:
-         return "LibretroDB support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT:
-         return "Libusb support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT:
-         return "libxml2 XML parsing support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT:
-         return "Netplay (peer-to-peer) support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT:
-         return "Network Command interface support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_REMOTE_SUPPORT:
-         return "Network Gamepad support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENAL_SUPPORT:
-         return "OpenAL support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGLES_SUPPORT:
-         return "OpenGL ES support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGL_SUPPORT:
-         return "OpenGL support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENSL_SUPPORT:
-         return "OpenSL support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENVG_SUPPORT:
-         return "OpenVG support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OSS_SUPPORT:
-         return "OSS support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OVERLAY_SUPPORT:
-         return "Overlay support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE:
-         return "Power source";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGED:
-         return "Charged";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGING:
-         return "Charging";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_DISCHARGING:
-         return "Discharging";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_NO_SOURCE:
-         return "No source";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PULSEAUDIO_SUPPORT:
-         return "PulseAudio support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PYTHON_SUPPORT:
-         return "Python (script support in shaders) support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RBMP_SUPPORT:
-         return "BMP support (RBMP)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RETRORATING_LEVEL:
-         return "RetroRating level";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RJPEG_SUPPORT:
-         return "JPEG support (RJPEG)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ROARAUDIO_SUPPORT:
-         return "RoarAudio support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RPNG_SUPPORT:
-         return "PNG support (RPNG)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RSOUND_SUPPORT:
-         return "RSound support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RTGA_SUPPORT:
-         return "TGA support (RTGA)";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL2_SUPPORT:
-         return "SDL2 support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_IMAGE_SUPPORT:
-         return "SDL image support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_SUPPORT:
-         return "SDL1.2 support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SLANG_SUPPORT:
-         return "Slang support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_THREADING_SUPPORT:
-         return "Threading support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_UDEV_SUPPORT:
-         return "Udev support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_V4L2_SUPPORT:
-         return "Video4Linux2 support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VIDEO_CONTEXT_DRIVER:
-         return "Video context driver";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VULKAN_SUPPORT:
-         return "Vulkan support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WAYLAND_SUPPORT:
-         return "Wayland support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_X11_SUPPORT:
-         return "X11 support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XAUDIO2_SUPPORT:
-         return "XAudio2 support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XVIDEO_SUPPORT:
-         return "XVideo support";
-      case MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ZLIB_SUPPORT:
-         return "Zlib support";
-      case MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT:
-         return "Chụp ảnh màn hình";
-      case MENU_ENUM_LABEL_VALUE_THUMBNAILS_DIRECTORY:
-         return "Thumbnails Danh mục";
-      case MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST:
-         return "Thumbnails Updater";
-      case MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE:
-         return "Kích hoạt UI Companion";
-      case MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT:
-         return "UI Companion Start On Boot";
-      case MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE:
-         return "Undo Tải State";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_ASSETS:
-         return "Cập nhật Assets";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES:
-         return "Cập nhật Autoconfig Profiles";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_CG_SHADERS:
-         return "Cập nhật Cg Shaders";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_CHEATS:
-         return "Cập nhật Cheats";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES:
-         return "Cập nhật Core Info Files";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES:
-         return "Cập nhật Databases";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_GLSL_SHADERS:
-         return "Cập nhật GLSL Shaders";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_LAKKA:
-         return "Cập nhật Lakka";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS:
-         return "Cập nhật Overlays";
-      case MENU_ENUM_LABEL_VALUE_UPDATE_SLANG_SHADERS:
-         return "Cập nhật Slang Shaders";
-      case MENU_ENUM_LABEL_VALUE_USER:
-         return "User";
-      case MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS:
-         return "User Interface";
-      case MENU_ENUM_LABEL_VALUE_USER_LANGUAGE:
-         return "Language";
-      case MENU_ENUM_LABEL_VALUE_USER_SETTINGS:
-         return "User";
-      case MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER:
-         return "Use Builtin Image Viewer";
-      case MENU_ENUM_LABEL_VALUE_USE_BUILTIN_PLAYER:
-         return "Use Builtin Media Player";
-      case MENU_ENUM_LABEL_VALUE_USE_THIS_DIRECTORY:
-         return "<Use this directory>";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE:
-         return "Allow rotation";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO:
-         return "Auto Aspect Ratio";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX:
-         return "Aspect Ratio Index";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION:
-         return "Black Frame Insertion";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_CROP_OVERSCAN:
-         return "Crop Overscan (Reload)";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_DISABLE_COMPOSITION:
-         return "Disable Desktop Composition";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_DRIVER:
-         return "Video Driver";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FILTER:
-         return "Video Filter";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_DIR:
-         return "Video Filter Danh mục";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER:
-         return "Flicker filter";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FONT_ENABLE:
-         return "Display OSD Message";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FONT_PATH:
-         return "OSD Message Font";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FONT_SIZE:
-         return "OSD Message Size";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_ASPECT:
-         return "Force aspect ratio";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE:
-         return "Force-disable sRGB FBO";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY:
-         return "Frame Delay";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN:
-         return "Sử dụng chế độ toàn màn hình";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA:
-         return "Video Gamma";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD:
-         return "Use GPU Recording";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT:
-         return "Kích hoạt GPU Screenshot";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC:
-         return "Hard GPU Sync";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES:
-         return "Hard GPU Sync Frames";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES:
-         return "Max swapchain images";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X:
-         return "OSD Message X Position";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y:
-         return "OSD Message Y Position";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX:
-         return "Monitor Index";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_POST_FILTER_RECORD:
-         return "Kích hoạt Post Filter Recording";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE:
-         return "Refresh Rate";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO:
-         return "Estimated Monitor Framerate";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION:
-         return "Rotation";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SCALE:
-         return "Windowed Scale";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER:
-         return "Integer Scale";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS:
-         return "Video";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR:
-         return "Video Shader Danh mục";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES:
-         return "Shader Passes";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS:
-         return "Preview Shader Parameters";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET:
-         return "Tải Shader Preset";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS:
-         return "Menu Shader Parameters";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_AS:
-         return "Save Shader Preset As";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_CORE:
-         return "Save Core Preset";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_SAVE_GAME:
-         return "Save Game Preset";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT:
-         /* FIXME? Translate 'Enable Hardware Shared Context' */
-         return "Kích hoạt Hardware Shared Context";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH:
-         return "HW Bilinear Filtering";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER:
-         return "Kích hoạt Soft Filter";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL:
-         return "VSync Swap Interval";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_TAB:
-         return "Video";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_THREADED:
-         return "Threaded Video";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VFILTER:
-         return "Deflicker";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_HEIGHT:
-         return "Custom Viewport Height";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH:
-         return "Custom Viewport Width";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X:
-         return "Custom Viewport X";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y:
-         return "Custom Viewport Y";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH:
-         return "Set VI Screen Width";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC:
-         return "VSync";
-      case MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN:
-         return "Chế độ toàn màn hình trong khung";
-      case MENU_ENUM_LABEL_VALUE_WIFI_DRIVER:
-         return "Wi-Fi Driver";
-      case MENU_ENUM_LABEL_VALUE_WIFI_SETTINGS:
-         return "Wi-Fi";
-      case MENU_ENUM_LABEL_VALUE_XMB_ALPHA_FACTOR:
-         return "Menu Alpha Factor";
-      case MENU_ENUM_LABEL_VALUE_XMB_FONT:
-         return "Menu Font";
-      case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_CUSTOM:
-         return "Custom";
-      case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_FLATUI:
-         return "FlatUI";
-      case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME:
-         return "Monochrome";
-      case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_SYSTEMATIC:
-         return "Systematic";
-      case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_PIXEL:
-         return "Pixel";
-      case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_RETROACTIVE:
-         return "RetroActive";
-      case MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_DOTART:
-         return "Dot-Art";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME:
-         return "Menu Color Theme";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN:
-         return "Apple Green";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK:
-         return "Dark";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE:
-         return "Dark Purple";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE:
-         return "Electric Blue";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GOLDEN:
-         return "Golden";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED:
-         return "Legacy Red";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDNIGHT_BLUE:
-         return "Midnight Blue";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_PLAIN:
-         return "Plain";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_UNDERSEA:
-         return "Undersea";
-      case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED:
-         return "Volcanic Red";
-      case MENU_ENUM_LABEL_VALUE_XMB_RIBBON_ENABLE:
-         return "Menu Shader Pipeline";
-      case MENU_ENUM_LABEL_VALUE_XMB_SCALE_FACTOR:
-         return "Menu Scale Factor";
-      case MENU_ENUM_LABEL_VALUE_XMB_SHADOWS_ENABLE:
-         return "Kích hoạt Icon Shadows";
-      case MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY:
-         return "Show History Tab";
-      case MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES:
-         return "Show Images Tab";
-      case MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC:
-         return "Show Music Tab";
-      case MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS:
-         return "Show thiết lập Tab";
-      case MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO:
-         return "Show Video Tab";
-      case MENU_ENUM_LABEL_VALUE_XMB_THEME:
-         return "Menu Icon Theme";
-      case MENU_ENUM_LABEL_VALUE_YES:
-         return "Yes";
-      case MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO:
-         return "Shader Preset";
-      case MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST:
-         return "Tải/quét nội dung và thêm vào bộ sưu tập.";
-      case MENU_ENUM_SUBLABEL_AUDIO_SETTINGS:
-         return "Điều chỉnh thiết lập cho âm thanh ra.";
-      case MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE:
-         return "Bật/tắt bluetooth.";
-      case MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT:
-         return "Lưu cấu hình khi thoát retroarch.";
-      case MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS:
-         return "Change default settings for configuration files.";
-      case MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST:
-         return "Manage and create configuration files.";
-      case MENU_ENUM_SUBLABEL_CPU_CORES:
-         return "Số lượng lõi của CPU.";
-      case MENU_ENUM_SUBLABEL_FPS_SHOW:
-         return "Hiển thị tốc độ khung hình/giây trên màn hình.";
-      case MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS:
-         return "Đặt cấu hình thiết lập của hotkey.";
-      case MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO:
-         return "Kết hợp nút Gamepad để vào menu bật/tắt.";
-      case MENU_ENUM_SUBLABEL_INPUT_SETTINGS:
-         return "Điều chỉnh thiết lập cho joypads, bàn phím và chuột.";
-      case MENU_ENUM_SUBLABEL_INPUT_USER_BINDS:
-         return "Đặt cấu hình điều khiển cho người dùng này.";
-      case MENU_ENUM_SUBLABEL_LOG_VERBOSITY:
-         return "Kích hoạt or disable logging to the terminal.";
-      case MENU_ENUM_SUBLABEL_NETPLAY:
-         return "Tham gia hoặc làm máy chủ cho netplay.";
-      case MENU_ENUM_SUBLABEL_ONLINE_UPDATER:
-         return "Tải/cập nhật tiện ích và thành phần của RetroArch.";
-      case MENU_ENUM_SUBLABEL_SAMBA_ENABLE:
-         return "Bật/tắt chia sẻ thư mục trên mạng.";
-      case MENU_ENUM_SUBLABEL_SERVICES_SETTINGS:
-         return "Quản lý dịch vụ của hệ điều hành.";
-      case MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES:
-         return "Hiện ra tập tin và thư mục ẩn trong trình duyệt tập tin.";
-      case MENU_ENUM_SUBLABEL_SSH_ENABLE:
-         return "Bật/tắt giao thức SSH.";
-      case MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE:
-         return "Chặn tính năng screensaver (màn hình chờ).";
-      case MENU_ENUM_SUBLABEL_USER_LANGUAGE:
-         return "Thiết lập ngôn ngữ của giao diện .";
-      case MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION:
-         return "Inserts a black frame inbetween frames. Useful for users of 120 Hz monitors who want to play 60 Hz material with eliminated ghosting.";
-      case MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY:
-         return "Reduces latency at the cost of higher risk of video stuttering. Adds a delay after V-Sync (in ms).";
-      case MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES:
-         return "Sets how many frames the CPU can run ahead of the GPU when using 'Hard GPU Sync'.";
-      case MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES:
-         return "Tells the video driver to explicitly use a specified buffering mode.";
-      case MENU_ENUM_SUBLABEL_VIDEO_MONITOR_INDEX:
-         return "Chọn màn hình hiển thị để sử dụng.";
-      case MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_AUTO:
-         return "The accurate estimated refresh rate of the monitor in Hz.";
-      case MENU_ENUM_SUBLABEL_VIDEO_SETTINGS:
-         return "Điều chỉnh thiết lập cho video ra.";
-      case MENU_ENUM_SUBLABEL_WIFI_SETTINGS:
-         return "Tìm mạng không dây và thiết lập kết nối.";
-      case MSG_APPENDED_DISK:
-         return "Appended disk";
-      case MSG_APPLICATION_DIR:
-         return "Application Danh mục";
-      case MSG_APPLYING_CHEAT:
-         return "Đang áp dụng cheat changes.";
-      case MSG_APPLYING_SHADER:
-         return "Đang áp dụng shader";
-      case MSG_AUDIO_MUTED:
-         return "Âm thanh muted.";
-      case MSG_AUDIO_UNMUTED:
-         return "Âm thanh unmuted.";
-      case MSG_AUTOCONFIG_FILE_ERROR_SAVING:
-         return "Tập tin Autoconfig bị lỗi khi lưu.";
-      case MSG_AUTOCONFIG_FILE_SAVED_SUCCESSFULLY:
-         return "Tập tin Autoconfig đã lưu thành công.";
-      case MSG_AUTOSAVE_FAILED:
-         return "Could not initialize autosave.";
-      case MSG_AUTO_SAVE_STATE_TO:
-         return "Auto save state to";
-      case MSG_BLOCKING_SRAM_OVERWRITE:
-         return "Blocking SRAM Overwrite";
-      case MSG_BRINGING_UP_COMMAND_INTERFACE_ON_PORT:
-         return "Đang đưa lên lệnh giao diện trên cổng";
-      case MSG_BYTES:
-         return "bytes";
-      case MSG_CANNOT_INFER_NEW_CONFIG_PATH:
-         return "Cannot infer new config path. Use current time.";
-      case MSG_CHEEVOS_HARDCORE_MODE_ENABLE:
-         return "Hardcore Mode Enabled: savestate & rewind were disabled.";
-      case MSG_COMPARING_WITH_KNOWN_MAGIC_NUMBERS:
-         return "Comparing with known magic numbers...";
-      case MSG_COMPILED_AGAINST_API:
-         return "Compiled against API";
-      case MSG_CONFIG_DIRECTORY_NOT_SET:
-         return "Config directory not set. Cannot save new config.";
-      case MSG_CONNECTED_TO:
-         return "Connected to";
-      case MSG_CONTENT_CRC32S_DIFFER:
-         return "Content CRC32s differ. Cannot use different games.";
-      case MSG_CONTENT_LOADING_SKIPPED_IMPLEMENTATION_WILL_DO_IT:
-         return "Content loading skipped. Implementation will tải it on its own.";
-      case MSG_CORE_DOES_NOT_SUPPORT_SAVESTATES:
-         return "Core does not support save states.";
-      case MSG_CORE_OPTIONS_FILE_CREATED_SUCCESSFULLY:
-         return "Core options file created successfully.";
-      case MSG_COULD_NOT_FIND_ANY_NEXT_DRIVER:
-         return "Could not find any next driver";
-      case MSG_COULD_NOT_FIND_COMPATIBLE_SYSTEM:
-         return "Could not find compatible system.";
-      case MSG_COULD_NOT_FIND_VALID_DATA_TRACK:
-         return "Could not find valid data track";
-      case MSG_COULD_NOT_OPEN_DATA_TRACK:
-         return "could not open data track";
-      case MSG_COULD_NOT_READ_CONTENT_FILE:
-         return "Could not read content file";
-      case MSG_COULD_NOT_READ_MOVIE_HEADER:
-         return "Could not read movie header.";
-      case MSG_COULD_NOT_READ_STATE_FROM_MOVIE:
-         return "Could not read state from movie.";
-      case MSG_CRC32_CHECKSUM_MISMATCH:
-         return "CRC32 checksum mismatch between content file and saved content checksum in replay file header; replay highly likely to desync on playback.";
-      case MSG_CUSTOM_TIMING_GIVEN:
-         return "Custom timing given";
-      case MSG_DECOMPRESSION_ALREADY_IN_PROGRESS:
-         return "Decompression already in progress.";
-      case MSG_DECOMPRESSION_FAILED:
-         return "Decompression failed.";
-      case MSG_DETECTED_VIEWPORT_OF:
-         return "Detected viewport of";
-      case MSG_DID_NOT_FIND_A_VALID_CONTENT_PATCH:
-         return "Did not find a valid content patch.";
-      case MSG_DISCONNECT_DEVICE_FROM_A_VALID_PORT:
-         return "Ngắt kết nối thiết bị từ cổng hợp lệ.";
-      case MSG_DISK_CLOSED:
-         return "Closed";
-      case MSG_DISK_EJECTED:
-         return "Ejected";
-      case MSG_DOWNLOADING:
-         return "Downloading";
-      case MSG_DOWNLOAD_FAILED:
-         return "Download failed";
-      case MSG_ERROR:
-         return "Error";
-      case MSG_ERROR_LIBRETRO_CORE_REQUIRES_CONTENT:
-         return "Libretro core requires content, but nothing was provided.";
-      case MSG_ERROR_LIBRETRO_CORE_REQUIRES_SPECIAL_CONTENT:
-         return "Libretro core requires special content, but none were provided.";
-      case MSG_ERROR_PARSING_ARGUMENTS:
-         return "Error parsing arguments.";
-      case MSG_ERROR_SAVING_CORE_OPTIONS_FILE:
-         return "Error saving core options file.";
-      case MSG_ERROR_SAVING_REMAP_FILE:
-         return "Error saving remap file.";
-      case MSG_ERROR_SAVING_SHADER_PRESET:
-         return "Error saving shader preset.";
-      case MSG_EXTERNAL_APPLICATION_DIR:
-         return "External Application Danh mục";
-      case MSG_EXTRACTING:
-         return "Extracting";
-      case MSG_EXTRACTING_FILE:
-         return "Extracting file";
-      case MSG_FAILED_SAVING_CONFIG_TO:
-         return "Failed saving config to";
-      case MSG_FAILED_TO:
-         return "Failed to";
-      case MSG_FAILED_TO_ACCEPT_INCOMING_SPECTATOR:
-         return "Failed to accept incoming spectator.";
-      case MSG_FAILED_TO_ALLOCATE_MEMORY_FOR_PATCHED_CONTENT:
-         return "Failed to allocate memory for patched content...";
-      case MSG_FAILED_TO_APPLY_SHADER:
-         return "Failed to áp dụng shader.";
-      case MSG_FAILED_TO_BIND_SOCKET:
-         return "Failed to bind socket.";
-      case MSG_FAILED_TO_CREATE_THE_DIRECTORY:
-         return "Failed to create the directory.";
-      case MSG_FAILED_TO_EXTRACT_CONTENT_FROM_COMPRESSED_FILE:
-         return "Failed to extract content from compressed file";
-      case MSG_FAILED_TO_GET_NICKNAME_FROM_CLIENT:
-         return "Failed to get nickname from client.";
-      case MSG_FAILED_TO_LOAD:
-         return "Bị lỗi khi tải";
-      case MSG_FAILED_TO_LOAD_CONTENT:
-         return "Failed to tải content";
-      case MSG_FAILED_TO_LOAD_MOVIE_FILE:
-         return "Failed to tải movie file";
-      case MSG_FAILED_TO_LOAD_OVERLAY:
-         return "Failed to tải overlay.";
-      case MSG_FAILED_TO_LOAD_STATE:
-         return "Failed to tải state from";
-      case MSG_FAILED_TO_OPEN_LIBRETRO_CORE:
-         return "Failed to open libretro core";
-      case MSG_FAILED_TO_PATCH:
-         return "Failed to patch";
-      case MSG_FAILED_TO_RECEIVE_HEADER_FROM_CLIENT:
-         return "Failed to receive header from client.";
-      case MSG_FAILED_TO_RECEIVE_NICKNAME:
-         return "Failed to receive nickname.";
-      case MSG_FAILED_TO_RECEIVE_NICKNAME_FROM_HOST:
-         return "Failed to receive nickname from host.";
-      case MSG_FAILED_TO_RECEIVE_NICKNAME_SIZE_FROM_HOST:
-         return "Failed to receive nickname size from host.";
-      case MSG_FAILED_TO_RECEIVE_SRAM_DATA_FROM_HOST:
-         return "Failed to receive SRAM data from host.";
-      case MSG_FAILED_TO_REMOVE_DISK_FROM_TRAY:
-         return "Failed to remove disk from tray.";
-      case MSG_FAILED_TO_REMOVE_TEMPORARY_FILE:
-         return "Failed to remove temporary file";
-      case MSG_FAILED_TO_SAVE_SRAM:
-         return "Failed to save SRAM";
-      case MSG_FAILED_TO_SAVE_STATE_TO:
-         return "Failed to save state to";
-      case MSG_FAILED_TO_SEND_NICKNAME:
-         return "Failed to send nickname.";
-      case MSG_FAILED_TO_SEND_NICKNAME_SIZE:
-         return "Failed to send nickname size.";
-      case MSG_FAILED_TO_SEND_NICKNAME_TO_CLIENT:
-         return "Failed to send nickname to client.";
-      case MSG_FAILED_TO_SEND_NICKNAME_TO_HOST:
-         return "Failed to send nickname to host.";
-      case MSG_FAILED_TO_SEND_SRAM_DATA_TO_CLIENT:
-         return "Failed to send SRAM data to client.";
-      case MSG_FAILED_TO_START_AUDIO_DRIVER:
-         return "Bị lỗi khi chạy chương trình điều khiển âm thanh. Sẽ tiếp tục chạy và bỏ âm thanh.";
-      case MSG_FAILED_TO_START_MOVIE_RECORD:
-         return "Failed to start movie record.";
-      case MSG_FAILED_TO_START_RECORDING:
-         return "Failed to start recording.";
-      case MSG_FAILED_TO_TAKE_SCREENSHOT:
-         return "Bị lỗi khi chụp ảnh màn hình.";
-      case MSG_FAILED_TO_UNDO_LOAD_STATE:
-         return "Failed to undo tải state.";
-      case MSG_FAILED_TO_UNDO_SAVE_STATE:
-         return "Failed to undo save state.";
-      case MSG_FAILED_TO_UNMUTE_AUDIO:
-         return "Failed to unmute Âm thanh.";
-      case MSG_FATAL_ERROR_RECEIVED_IN:
-         return "Fatal error received in";
-      case MSG_FILE_NOT_FOUND:
-         return "Không tìm thấy tệp";
-      case MSG_FOUND_AUTO_SAVESTATE_IN:
-         return "Tìm thấy savestate tự đông trong";
-      case MSG_FOUND_DISK_LABEL:
-         return "Found disk label";
-      case MSG_FOUND_FIRST_DATA_TRACK_ON_FILE:
-         return "Found first data track on file";
-      case MSG_FOUND_LAST_STATE_SLOT:
-         return "Tiềm thấy state slot xài lần trước";
-      case MSG_FOUND_SHADER:
-         return "Found shader";
-      case MSG_FRAMES:
-         return "Frames";
-      case MSG_GAME_SPECIFIC_CORE_OPTIONS_FOUND_AT:
-         return "Per-Game Options: game-specific core options found at";
-      case MSG_GOT_INVALID_DISK_INDEX:
-         return "Got invalid disk index.";
-      case MSG_GRAB_MOUSE_STATE:
-         return "Grab mouse state";
-      case MSG_HW_RENDERED_MUST_USE_POSTSHADED_RECORDING:
-         return "Libretro core is hardware rendered. Must use post-shaded recording as well.";
-      case MSG_INFLATED_CHECKSUM_DID_NOT_MATCH_CRC32:
-         return "Inflated checksum did not match CRC32.";
-      case MSG_INPUT_CHEAT:
-         return "Input Cheat";
-      case MSG_INPUT_CHEAT_FILENAME:
-         return "Cheat Filename";
-      case MSG_INPUT_PRESET_FILENAME:
-         return "Preset Filename";
-      case MSG_INTERFACE:
-         return "Interface";
-      case MSG_INTERNAL_STORAGE:
-         return "Internal Storage";
-      case MSG_REMOVABLE_STORAGE:
-         return "Removable Storage";
-      case MSG_INVALID_NICKNAME_SIZE:
-         return "Invalid nickname size.";
-      case MSG_IN_BYTES:
-         return "in bytes";
-      case MSG_IN_GIGABYTES:
-         return "in gigabytes";
-      case MSG_IN_MEGABYTES:
-         return "in megabytes";
-      case MSG_LIBRETRO_ABI_BREAK:
-         return "is compiled against a different version of libretro than this libretro implementation.";
-      case MSG_LIBRETRO_FRONTEND:
-         return "Frontend for libretro";
-      case MSG_LOADED_STATE_FROM_SLOT:
-         return "Loaded state from slot #%d.";
-      case MSG_LOADED_STATE_FROM_SLOT_AUTO:
-         return "Loaded state from slot -1 (auto).";
-      case MSG_LOADING:
-         return "Đang tải";
-      case MSG_LOADING_CONTENT_FILE:
-         return "Loading content file";
-      case MSG_LOADING_HISTORY_FILE:
-         return "Đang nạp tập tin lịch sử";
-      case MSG_LOADING_STATE:
-         return "Đang tải state";
-      case MSG_MEMORY:
-         return "Memory";
-      case MSG_MOVIE_FILE_IS_NOT_A_VALID_BSV1_FILE:
-         return "Movie file is not a valid BSV1 file.";
-      case MSG_MOVIE_FORMAT_DIFFERENT_SERIALIZER_VERSION:
-         return "Movie format seems to have a different serializer version. Will most likely fail.";
-      case MSG_MOVIE_PLAYBACK_ENDED:
-         return "Movie playback ended.";
-      case MSG_MOVIE_RECORD_STOPPED:
-         return "Stopping movie record.";
-      case MSG_NETPLAY_FAILED:
-         return "Failed to initialize netplay.";
-      case MSG_NO_CONTENT_STARTING_DUMMY_CORE:
-         return "No content, starting dummy core.";
-      case MSG_NO_SAVE_STATE_HAS_BEEN_OVERWRITTEN_YET:
-         return "No save state has been overwritten yet.";
-      case MSG_NO_STATE_HAS_BEEN_LOADED_YET:
-         return "No state has been loaded yet.";
-      case MSG_OVERRIDES_ERROR_SAVING:
-         return "Error saving overrides.";
-      case MSG_OVERRIDES_SAVED_SUCCESSFULLY:
-         return "Overrides saved successfully.";
-      case MSG_PAUSED:
-         return "Paused.";
-      case MSG_PROGRAM:
-         return "RetroArch";
-      case MSG_READING_FIRST_DATA_TRACK:
-         return "Reading first data track...";
-      case MSG_RECEIVED:
-         return "received";
-      case MSG_RECORDING_TERMINATED_DUE_TO_RESIZE:
-         return "Recording terminated due to resize.";
-      case MSG_RECORDING_TO:
-         return "Recording to";
-      case MSG_REDIRECTING_CHEATFILE_TO:
-         return "Redirecting cheat file to";
-      case MSG_REDIRECTING_SAVEFILE_TO:
-         return "Redirecting save file to";
-      case MSG_REDIRECTING_SAVESTATE_TO:
-         return "Redirecting savestate to";
-      case MSG_REMAP_FILE_SAVED_SUCCESSFULLY:
-         return "Remap file saved successfully.";
-      case MSG_REMOVED_DISK_FROM_TRAY:
-         return "Removed disk from tray.";
-      case MSG_REMOVING_TEMPORARY_CONTENT_FILE:
-         return "Removing temporary content file";
-      case MSG_RESET:
-         return "Reset";
-      case MSG_RESTARTING_RECORDING_DUE_TO_DRIVER_REINIT:
-         return "Restarting recording due to driver reinit.";
-      case MSG_RESTORED_OLD_SAVE_STATE:
-         return "Restored old save state.";
-      case MSG_RESTORING_DEFAULT_SHADER_PRESET_TO:
-         return "Shaders: restoring default shader preset to";
-      case MSG_REVERTING_SAVEFILE_DIRECTORY_TO:
-         return "Reverting savefile directory to";
-      case MSG_REVERTING_SAVESTATE_DIRECTORY_TO:
-         return "Reverting savestate directory to";
-      case MSG_REWINDING:
-         return "Rewinding.";
-      case MSG_REWIND_INIT:
-         return "Initializing rewind buffer with size";
-      case MSG_REWIND_INIT_FAILED:
-         return "Failed to initialize rewind buffer. Rewinding will be disabled.";
-      case MSG_REWIND_INIT_FAILED_THREADED_AUDIO:
-         return "Implementation uses threaded Âm thanh. Cannot use rewind.";
-      case MSG_REWIND_REACHED_END:
-         return "Reached end of rewind buffer.";
-      case MSG_SAVED_NEW_CONFIG_TO:
-         return "Saved new config to";
-      case MSG_SAVED_STATE_TO_SLOT:
-         return "Saved state to slot #%d.";
-      case MSG_SAVED_STATE_TO_SLOT_AUTO:
-         return "Saved state to slot #-1 (auto).";
-      case MSG_SAVED_SUCCESSFULLY_TO:
-         return "Saved successfully to";
-      case MSG_SAVING_RAM_TYPE:
-         return "Saving RAM type";
-      case MSG_SAVING_STATE:
-         return "Saving state";
-      case MSG_SCANNING:
-         return "Scanning";
-      case MSG_SCANNING_OF_DIRECTORY_FINISHED:
-         return "Scanning of directory finished";
-      case MSG_SENDING_COMMAND:
-         return "Sending command";
-      case MSG_SEVERAL_PATCHES_ARE_EXPLICITLY_DEFINED:
-         return "Several patches are explicitly defined, ignoring all...";
-      case MSG_SHADER_PRESET_SAVED_SUCCESSFULLY:
-         return "Shader preset saved successfully.";
-      case MSG_SKIPPING_SRAM_LOAD:
-         return "Skipping SRAM tải.";
-      case MSG_SLOW_MOTION:
-         return "Slow motion.";
-      case MSG_SLOW_MOTION_REWIND:
-         return "Slow motion rewind.";
-      case MSG_SRAM_WILL_NOT_BE_SAVED:
-         return "SRAM will not be saved.";
-      case MSG_STARTING_MOVIE_PLAYBACK:
-         return "Starting movie playback.";
-      case MSG_STARTING_MOVIE_RECORD_TO:
-         return "Starting movie record to";
-      case MSG_STATE_SIZE:
-         return "State size";
-      case MSG_STATE_SLOT:
-         return "State slot";
-      case MSG_TAKING_SCREENSHOT:
-         return "Taking screenshot.";
-      case MSG_TO:
-         return "to";
-      case MSG_UNDID_LOAD_STATE:
-         return "Undid Tải state.";
-      case MSG_UNDOING_SAVE_STATE:
-         return "Undoing save state";
-      case MSG_UNKNOWN:
-         return "Unknown";
-      case MSG_UNPAUSED:
-         return "Unpaused.";
-      case MSG_UNRECOGNIZED_COMMAND:
-         return "Unrecognized command";
-      case MSG_USING_CORE_NAME_FOR_NEW_CONFIG:
-         return "Using core name for new config.";
-      case MSG_USING_LIBRETRO_DUMMY_CORE_RECORDING_SKIPPED:
-         return "Using libretro dummy core. Skipping recording.";
-      case MSG_VALUE_CONNECT_DEVICE_FROM_A_VALID_PORT:
-         return "Kết nối thiết bị từ cổng hợp lệ.";
-      case MSG_VALUE_DISCONNECTING_DEVICE_FROM_PORT:
-         return "Đang ngắt kết nối thiết bị từ cổng";
-      case MSG_VALUE_REBOOTING:
-         return "Đang khởi động lại...";
-      case MSG_VALUE_SHUTTING_DOWN:
-         return "Đang tắt máy...";
-      case MSG_VERSION_OF_LIBRETRO_API:
-         return "Phiên bản của libretro API";
-      case MSG_VIEWPORT_SIZE_CALCULATION_FAILED:
-         return "Viewport size calculation failed! Will continue using raw data. This will probably not work right ...";
-      case MSG_VIRTUAL_DISK_TRAY:
-         return "virtual disk tray.";
+      #include "msg_hash_vn.h"
       default:
-#if 0
-         RARCH_LOG("Unimplemented: [%d]\n", msg);
-#endif
          break;
    }
 
diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h
new file mode 100644
index 0000000000..88a379268e
--- /dev/null
+++ b/intl/msg_hash_vn.h
@@ -0,0 +1,3009 @@
+MSG_HASH(
+      MSG_COMPILER,
+      "Compiler"
+      )
+MSG_HASH(
+      MSG_UNKNOWN_COMPILER,
+      "Unknown compiler"
+      )
+MSG_HASH(
+      MSG_DEVICE_DISCONNECTED_FROM_PORT,
+      "Device disconnected from port"
+      )
+MSG_HASH(
+      MSG_UNKNOWN_NETPLAY_COMMAND_RECEIVED,
+      "Netplay không biết lệnh nhận được"
+      )
+MSG_HASH(
+      MSG_FILE_ALREADY_EXISTS_SAVING_TO_BACKUP_BUFFER,
+      "Ttệp đã tồn tại. Đang lưu vào backup buffer"
+      )
+MSG_HASH(
+      MSG_GOT_CONNECTION_FROM,
+      "Được kết nối từ: \"%s\""
+      )
+MSG_HASH(
+      MSG_GOT_CONNECTION_FROM_NAME,
+      "Got connection from: \"%s (%s)\""
+      )
+MSG_HASH(
+      MSG_PUBLIC_ADDRESS,
+      "Public address"
+      )
+MSG_HASH(
+      MSG_NO_ARGUMENTS_SUPPLIED_AND_NO_MENU_BUILTIN,
+      "No arguments supplied and no menu builtin, displaying help..."
+      )
+MSG_HASH(
+      MSG_NETPLAY_USERS_HAS_FLIPPED,
+      "Người dùng Netplay đã flipped"
+      )
+MSG_HASH(
+      MSG_SETTING_DISK_IN_TRAY,
+      "Setting disk in tray"
+      )
+MSG_HASH(
+      MSG_WAITING_FOR_CLIENT,
+      "Đang đợi máy khách  ..."
+      )
+MSG_HASH(
+      MSG_NETPLAY_YOU_HAVE_LEFT_THE_GAME,
+      "You have left the game"
+      )
+MSG_HASH(
+      MSG_NETPLAY_YOU_HAVE_JOINED_AS_PLAYER_N,
+      "You have joined as player %d"
+      )
+MSG_HASH(
+      MSG_NETPLAY_IMPLEMENTATIONS_DIFFER,
+      "Implementations differ. Make sure you're using the exact same versions of RetroArch and the core."
+      )
+MSG_HASH(
+      MSG_NETPLAY_ENDIAN_DEPENDENT,
+      "This core does not support inter-architecture netplay between these systems"
+      )
+MSG_HASH(
+      MSG_NETPLAY_PLATFORM_DEPENDENT,
+      "This core does not support inter-architecture netplay"
+      )
+MSG_HASH(
+      MSG_NETPLAY_ENTER_PASSWORD,
+      "Enter netplay server password:"
+      )
+MSG_HASH(
+      MSG_NETPLAY_INCORRECT_PASSWORD,
+      "Incorrect password"
+      )
+MSG_HASH(
+      MSG_NETPLAY_SERVER_NAMED_HANGUP,
+      "\"%s\" has disconnected"
+      )
+MSG_HASH(
+      MSG_NETPLAY_SERVER_HANGUP,
+      "A netplay client has disconnected"
+      )
+MSG_HASH(
+      MSG_NETPLAY_CLIENT_HANGUP,
+      "Netplay disconnected"
+      )
+MSG_HASH(
+      MSG_NETPLAY_CANNOT_PLAY_UNPRIVILEGED,
+      "You do not have permission to play"
+      )
+MSG_HASH(
+      MSG_NETPLAY_CANNOT_PLAY_NO_SLOTS,
+      "There are no free player slots"
+      )
+MSG_HASH(
+      MSG_NETPLAY_CANNOT_PLAY,
+      "Cannot switch to play mode"
+      )
+MSG_HASH(
+      MSG_NETPLAY_PEER_PAUSED,
+      "Netplay peer \"%s\" paused"
+      )
+MSG_HASH(
+      MSG_NETPLAY_CHANGED_NICK,
+      "Your nickname changed to \"%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,
+      "Điều chỉnh thiết lập related to the appearance of the menu screen."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC,
+      "Hard-synchronize the CPU and GPU. Reduces latency at the cost of performance."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_VIDEO_THREADED,
+      "Improves performance at the cost of latency and more video stuttering. Use only if you cannot obtain full speed otherwise."
+      )
+MSG_HASH(
+      MSG_AUDIO_VOLUME,
+      "Âm lượng âm thanh"
+      )
+MSG_HASH(
+      MSG_AUTODETECT,
+      "Tự động phát hiện"
+      )
+MSG_HASH(
+      MSG_AUTOLOADING_SAVESTATE_FROM,
+      "Đang tự đông tải savestate từ"
+      )
+MSG_HASH(
+      MSG_CAPABILITIES,
+      "Capabilities"
+      )
+MSG_HASH(
+      MSG_CONNECTING_TO_NETPLAY_HOST,
+      "Đang kết nối vào máy chủ netplay"
+      )
+MSG_HASH(
+      MSG_CONNECTING_TO_PORT,
+      "Đang kết nối vào port"
+      )
+MSG_HASH(
+      MSG_CONNECTION_SLOT,
+      "Khe kết nối"
+      )
+MSG_HASH(
+      MSG_SORRY_UNIMPLEMENTED_CORES_DONT_DEMAND_CONTENT_NETPLAY,
+      "Sorry, unimplemented: cores that don't demand content cannot participate in netplay."
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_PASSWORD,
+      "Mật khẩu"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS,
+      "Tài khoản Cheevos"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_USERNAME,
+      "Tên truy nhập"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST,
+      "Những tài khoản"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ACCOUNTS_LIST_END,
+      "Điểm cuối của danh sách tài khoản"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ACCOUNTS_RETRO_ACHIEVEMENTS,
+      "Thành tích Retro"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST,
+      "Danh sách thành tích"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ACHIEVEMENT_LIST_HARDCORE,
+      "Achievement List (Hardcore)"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST,
+      "Thêm nội dung"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONFIGURATIONS_LIST,
+      "Configurations"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ADD_TAB,
+      "Tạo nội dung"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_NETPLAY_TAB,
+      "Netplay Rooms"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE,
+      "Hỏi"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_ASSETS_DIRECTORY,
+      "Danh mục assets"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_BLOCK_FRAMES,
+      "Block Frames"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_DEVICE,
+      "Thiết bị âm thanh"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_DRIVER,
+      "Trình điều khiển âm thanh"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_DSP_PLUGIN,
+      "Âm thanh DSP Plugin"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_ENABLE,
+      "Kích hoạt âm thanh"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_FILTER_DIR,
+      "Âm thanh Filter Danh mục"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_TURBO_DEADZONE_LIST,
+      "Turbo/Deadzone"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_LATENCY,
+      "Âm thanh Latency (ms)"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_MAX_TIMING_SKEW,
+      "Âm thanh Maximum Timing Skew"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_MUTE,
+      "Âm thanh Mute"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_OUTPUT_RATE,
+      "Âm thanh Output Rate (Hz)"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_RATE_CONTROL_DELTA,
+      "Âm thanh Rate Control Delta"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_RESAMPLER_DRIVER,
+      "Âm thanh Resampler Driver"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS,
+      "Âm thanh"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_SYNC,
+      "Âm thanh Sync"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_VOLUME,
+      "Mức âm lượng (dB)"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_WASAPI_EXCLUSIVE_MODE,
+      "WASAPI Exclusive Mode"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_WASAPI_FLOAT_FORMAT,
+      "WASAPI Float Format"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUDIO_WASAPI_SH_BUFFER_LENGTH,
+      "WASAPI Shared Buffer Length"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUTOSAVE_INTERVAL,
+      "SaveRAM Autosave Interval"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE,
+      "Tự động tải tập tin ghi đè"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE,
+      "Tự động tải tập tin Remap"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE,
+      "Tự động tải Shader Presets"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_BACK,
+      "Trở lại"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_CONFIRM,
+      "Xác nhận"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_INFO,
+      "Thông tin"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_QUIT,
+      "Thoát"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_DOWN,
+      "Cuộn xuống"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_SCROLL_UP,
+      "Cuộn lên"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_START,
+      "Start"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_KEYBOARD,
+      "Bật/tắt bàn phím"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_CONTROLS_TOGGLE_MENU,
+      "Bật/tắt trình đơn"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS,
+      "Trình đơn điều khiển căn bản"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_CONFIRM,
+      "Confirm/OK"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_INFO,
+      "Thông tin"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_QUIT,
+      "Thoát"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_SCROLL_UP,
+      "Cuộn lên"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_START,
+      "Những mặc định"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_KEYBOARD,
+      "Bật/tắt bàn phím"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_MENU,
+      "Bật/tắt trình đơn"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BLOCK_SRAM_OVERWRITE,
+      "Khi tải savestate đừng ghi đè SaveRAM"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BLUETOOTH_ENABLE,
+      "Kích hoạt Bluetooth"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_BUILDBOT_ASSETS_URL,
+      "URL của Buildbot Assets"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CACHE_DIRECTORY,
+      "Danh mục cache"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CAMERA_ALLOW,
+      "Cho phép Camera"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CAMERA_DRIVER,
+      "Trình Camera"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEAT,
+      "Cheat"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEAT_APPLY_CHANGES,
+      "Áp dụng thay đổi của Cheat"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEAT_DATABASE_PATH,
+      "Danh mục tập tin Cheat"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEAT_FILE,
+      "Tập tin Cheat"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEAT_FILE_LOAD,
+      "Tải tập tin Cheat"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEAT_FILE_SAVE_AS,
+      "Lưu tập tin Cheat như"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEAT_NUM_PASSES,
+      "Cheat Passes"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_DESCRIPTION,
+      "Miêu tả"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE,
+      "Chế độ Hardcore"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS,
+      "Thành tựu bị khóa:"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ENTRY,
+      "Đã khóa"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_SETTINGS,
+      "Những thành tựu Retro"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_TEST_UNOFFICIAL,
+      "Thử nghiệm không chính thức"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ACHIEVEMENTS,
+      "Những thành tựu đã mở:"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CHEEVOS_UNLOCKED_ENTRY,
+      "Đã mở"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CLOSE_CONTENT,
+      "Đóng nội dung"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONFIG,
+      "Config"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONFIGURATIONS,
+      "Tải cấu hình"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS,
+      "Cấu hình"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT,
+      "Lưu cấu hình khi thoát"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONTENT_COLLECTION_LIST,
+      "Bộ sưu tập"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONTENT_DATABASE_DIRECTORY,
+      "Mục cơ sở dữ liệu nội dung"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONTENT_DIR,
+      "Mục nội dung"
+      )
+MSG_HASH(
+      MENU_ENUM_LABEL_VALUE_CONTENT_HISTORY_SIZE,
+      "Kích thước danh sách lịch sử")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PLAYLIST_ENTRY_REMOVE,
+      "Allow to remove entries")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS,
+      "Trình đơn lẹ")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIR,
+      "Mục Core Assets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_ASSETS_DIRECTORY,
+      "Mục Downloads")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_CHEAT_OPTIONS,
+      "Cheats")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_COUNTERS,
+      "Core Counters")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_ENABLE,
+      "Hiển thị tên của core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFORMATION,
+      "Core Thông tin")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_AUTHORS,
+      "Tác giả")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CATEGORIES,
+      "Thể loại")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_LABEL,
+      "Nhãn hiệu Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_CORE_NAME,
+      "Tên của Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE,
+      "Phần vững")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_LICENSES,
+      "Bản quyền")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_PERMISSIONS,
+      "Phép" )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_SUPPORTED_EXTENSIONS,
+      "Tiện ích mở rộng được hỗ trợ")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_MANUFACTURER,
+      "Nhà sản xuất hệ thống")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INFO_SYSTEM_NAME,
+      "Tên hệ thống")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_INPUT_REMAPPING_OPTIONS,
+      "Điều khiển")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_LIST,
+      "Tải Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_OPTIONS,
+      "Options" "Tùy chọn")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SETTINGS,
+      "Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE,
+      "Tự động chạy Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_AUTO_EXTRACT_ARCHIVE,
+      "Tự động giải nén lưu trữ tải về")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_BUILDBOT_URL,
+      "URL của Buildbot Cores")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_LIST,
+      "Cập nhật cho Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CORE_UPDATER_SETTINGS,
+      "Cập nhật")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CPU_ARCHITECTURE,
+      "Kiến trúc CPU:")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CPU_CORES,
+      "CPU Cores:")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CURSOR_DIRECTORY,
+      "Mục Cursor")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CURSOR_MANAGER,
+      "Cursor Manager")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CUSTOM_RATIO,
+      "Custom Ratio")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_MANAGER,
+      "Quản lý cho cơ sở dữ liệu")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DATABASE_SELECTION,
+      "Lựa chọn cơ sở dữ liệu")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DELETE_ENTRY,
+      "Xoá")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_FAVORITES,
+      "Yêu thích")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_CONTENT,
+      "<Mục nội dung>")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_DEFAULT,
+      "<Mặc định>")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NONE,
+      "<Không có gì>")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_NOT_FOUND,
+      "Không tìm thấy thư mục.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS,
+      "Thư mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_CYCLE_TRAY_STATUS,
+      "Tình trạng khay đĩa")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_IMAGE_APPEND,
+      "Thêm đĩa")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_INDEX,
+      "Chỉ số đĩa")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DISK_OPTIONS,
+      "Điều khiển đĩa")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DONT_CARE,
+      "Không quan tâm")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOADED_FILE_DETECT_CORE_LIST,
+      "Mục Downloads")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE,
+      "Tải về Core...")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT,
+      "Tải về nội dung")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_ENABLE,
+      "DPI Override Enable")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DPI_OVERRIDE_VALUE,
+      "Kích hoạt DPI Override")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS,
+      "Trình điều khiển")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DUMMY_ON_CORE_SHUTDOWN,
+      "Tải Core giả khi tắt máy")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CHECK_FOR_MISSING_FIRMWARE,
+      "Check for Missing Firmware Before Loading")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPER,
+      "Nền năng động")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_DYNAMIC_WALLPAPERS_DIRECTORY,
+      "Mục nền năng động")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_CHEEVOS_ENABLE,
+      "Kích hoạt")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_ENTRY_HOVER_COLOR,
+      "Menu entry hover color")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_ENTRY_NORMAL_COLOR,
+      "Menu entry normal color")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_FALSE,
+      "False")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_FASTFORWARD_RATIO,
+      "Maximum Run Speed")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_FPS_SHOW,
+      "Display Framerate")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_ENABLE,
+      "Limit Maximum Run Speed")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_FRAME_THROTTLE_SETTINGS,
+      "Frame Throttle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS,
+      "Frontend Counters")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS,
+      "Tải Content-Specific Core Options Automatically")
+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,
+      "Game-options file")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP,
+      "Help")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_AUDIO_VIDEO_TROUBLESHOOTING,
+      "Âm thanh/Video Troubleshooting")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_CHANGE_VIRTUAL_GAMEPAD,
+      "Changing Virtual Gamepad Overlay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_CONTROLS,
+      "Basic Menu Controls")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_LIST,
+      "Help")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_LOADING_CONTENT,
+      "Đang tải Content")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_SCANNING_CONTENT,
+      "Scanning For Content")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HELP_WHAT_IS_A_CORE,
+      "What Is A Core?")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_LIST_ENABLE,
+      "History List Enable")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HISTORY_TAB,
+      "History")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_HORIZONTAL_MENU,
+      "Horizontal Menu")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_IMAGES_TAB,
+      "Image")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION,
+      "Information")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INFORMATION_LIST,
+      "Information")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ADC_TYPE,
+      "Analog To Digital Type")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ALL_USERS_CONTROL_MENU,
+      "All Users Control Menu")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X,
+      "Left Analog X")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_MINUS,
+      "Left analog X- (left)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_X_PLUS,
+      "Left analog X+ (right)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y,
+      "Left Analog Y")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_MINUS,
+      "Left analog Y- (up)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_LEFT_Y_PLUS,
+      "Left analog Y+ (down)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X,
+      "Right Analog X")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_MINUS,
+      "Right analog X- (left)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_X_PLUS,
+      "Right analog X+ (right)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y,
+      "Right Analog Y")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_MINUS,
+      "Right analog Y- (up)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ANALOG_RIGHT_Y_PLUS,
+      "Right analog Y+ (down)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_AUTODETECT_ENABLE,
+      "Kích hoạt Autoconfig")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD,
+      "Analog Stick Deadzone")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_INPUT_SWAP_OK_CANCEL,
+      "Menu Swap OK & Cancel Buttons")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_BIND_ALL,
+      "Bind All")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_BIND_DEFAULT_ALL,
+      "Bind Default All")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_BIND_TIMEOUT,
+      "Bind Timeout")
+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,
+      "Device Index")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_TYPE,
+      "Device Type")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_DRIVER,
+      "Input Driver")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_DUTY_CYCLE,
+      "Duty Cycle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_HOTKEY_BINDS,
+      "Input Hotkey Binds")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_ICADE_ENABLE,
+      "Kích hoạt Keyboard Gamepad Mapping")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_A,
+      "A button (right)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,
+      "B button (down)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_DOWN,
+      "Down D-pad")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L2,
+      "L2 button (trigger)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L3,
+      "L3 button (thumb)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_L,
+      "L button (shoulder)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_LEFT,
+      "Left D-pad")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,
+      "R2 button (trigger)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R3,
+      "R3 button (thumb)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R,
+      "R button (shoulder)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_RIGHT,
+      "Right D-pad")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_SELECT,
+      "Select button")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_START,
+      "Start button")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_UP,
+      "Up D-pad")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_X,
+      "X button (top)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_Y,
+      "Y button (left)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_KEY,
+      "(Key: %s)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_KEYBOARD_GAMEPAD_MAPPING_TYPE,
+      "Keyboard Gamepad Mapping Type")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS,
+      "Max Users")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
+      "Menu Toggle Gamepad Combo")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_MINUS,
+      "Cheat index -")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_INDEX_PLUS,
+      "Cheat index +")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_CHEAT_TOGGLE,
+      "Cheat toggle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_EJECT_TOGGLE,
+      "Disk eject toggle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_NEXT,
+      "Disk next")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_DISK_PREV,
+      "Disk prev")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_ENABLE_HOTKEY,
+      "Kích hoạt hotkeys")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_HOLD_KEY,
+      "Fast forward hold")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_FAST_FORWARD_KEY,
+      "Fast forward toggle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_FRAMEADVANCE,
+      "Frameadvance")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_FULLSCREEN_TOGGLE_KEY,
+      "Bật/tắt chế độ toàn màn hình")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_GRAB_MOUSE_TOGGLE,
+      "Grab mouse toggle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,
+      "Game focus toggle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_LOAD_STATE_KEY,
+      "Tải state")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MENU_TOGGLE,
+      "Menu toggle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MOVIE_RECORD_TOGGLE,
+      "Movie record toggle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_MUTE,
+      "Âm thanh mute toggle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FLIP,
+      "Netplay flip users")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,
+      "Netplay toggle play/spectate mode")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OSK,
+      "On-screen keyboard toggle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_OVERLAY_NEXT,
+      "Overlay next")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_PAUSE_TOGGLE,
+      "Pause toggle")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_QUIT_KEY,
+      "Quit RetroArch")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_RESET,
+      "Reset game")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_REWIND,
+      "Rewind")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SAVE_STATE_KEY,
+      "Save state")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SCREENSHOT,
+      "Chụp ảnh màn hình")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_NEXT,
+      "Next shader")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SHADER_PREV,
+      "Previous shader")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_SLOWMOTION,
+      "Slow motion")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_MINUS,
+      "Savestate slot -")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_STATE_SLOT_PLUS,
+      "Savestate slot +")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_DOWN,
+      "Volume -")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_META_VOLUME_UP,
+      "Volume +")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_ENABLE,
+      "Display Overlay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_OVERLAY_HIDE_IN_MENU,
+      "Hide Overlay In Menu")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR,
+      "Poll Type Behavior")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_EARLY,
+      "Early")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE,
+      "Late")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_NORMAL,
+      "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,
+      "Kích hoạt Remap Binds")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG,
+      "Lưu Autoconfig")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS,
+      "Input")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE,
+      "Small Keyboard Enable")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_TOUCH_ENABLE,
+      "Kích hoạt Touch")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,
+      "Kích hoạt Turbo")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_TURBO_PERIOD,
+      "Turbo Period")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_USER_BINDS,
+      "Input User %u Binds")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INTERNAL_STORAGE_STATUS,
+      "Internal storage status")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_AUTOCONFIG_DIR,
+      "Input Autoconfig Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
+      "Joypad Driver")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LAKKA_SERVICES,
+      "Services")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_SIMPLIFIED,
+      "Tiếng Trung Quốc (Chữ Hán giản thể)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_CHINESE_TRADITIONAL,
+      "Tiếng Trung Quốc (Chữ Hán phồn thể)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_DUTCH,
+      "Tiếng Hà Lan")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_ENGLISH,
+      "Tiếng Anh")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_ESPERANTO,
+      "Tiếng Quốc tế ngữ")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_FRENCH,
+      "Tiếng Pháp")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_GERMAN,
+      "Tiếng Đức")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_ITALIAN,
+      "Tiếng Ý")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_JAPANESE,
+      "Tiếng Nhật")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_KOREAN,
+      "Tiếng Hàn Quốc")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_POLISH,
+      "Polish")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_PORTUGUESE_BRAZIL,
+      "Tiếng Bồ Đào Nha (Brazil)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_PORTUGUESE_PORTUGAL,
+      "Tiếng Bồ Đào Nha (Portugal)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_RUSSIAN,
+      "Tiếng Nga")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_SPANISH,
+      "Tiếng Tây Ban Nha")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LANG_VIETNAMESE,
+      "Tiếng Việt")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LEFT_ANALOG,
+      "Left Analog")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LIBRETRO_DIR_PATH,
+      "Core Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LIBRETRO_INFO_PATH,
+      "Core Info Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL,
+      "Core Logging Level")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LINEAR,
+      "Linear")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_ARCHIVE,
+      "Tải Archive With Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_HISTORY,
+      "Tải Recent")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST,
+      "Tải Content")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOAD_STATE,
+      "Tải State")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_ALLOW,
+      "Allow Location")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER,
+      "Location Driver")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
+      "Logging")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_LOG_VERBOSITY,
+      "Logging Verbosity")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MAIN_MENU,
+      "Main Menu")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MANAGEMENT,
+      "Database thiết lập")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME,
+      "Menu Color Theme")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE,
+      "Blue")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_BLUE_GREY,
+      "Blue Grey")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE,
+      "Dark Blue")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GREEN,
+      "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,
+      "Red")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW,
+      "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,
+      "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,
+      "Settings")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER,
+      "Menu Linear Filter")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_SETTINGS,
+      "Menu")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER,
+      "Background")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MENU_WALLPAPER_OPACITY,
+      "Background opacity")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MISSING,
+      "Missing")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MORE,
+      "...")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MOUSE_ENABLE,
+      "Mouse Support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MULTIMEDIA_SETTINGS,
+      "Multimedia")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_MUSIC_TAB,
+      "Music")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NAVIGATION_BROWSER_FILTER_SUPPORTED_EXTENSIONS_ENABLE,
+      "Filter unknown extensions")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NAVIGATION_WRAPAROUND,
+      "Navigation Wrap-Around")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NEAREST,
+      "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_CLIENT_SWAP_INPUT,
+      "Netplay P2 Uses C1")
+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,
+      "Kích hoạt Netplay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_CLIENT,
+      "Connect to netplay host")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST,
+      "Start netplay host")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST,
+      "Stop netplay host")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_IP_ADDRESS,
+      "Server Address")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_LAN_SCAN_SETTINGS,
+      "Scan local network")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_MODE,
+      "Kích hoạt Netplay Client")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_NICKNAME,
+      "Username")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_PASSWORD,
+      "Server Password")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_PUBLIC_ANNOUNCE,
+      "Publicly Announce Netplay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_REQUIRE_SLAVES,
+      "Disallow Non-Slave-Mode Clients")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_SETTINGS,
+      "Netplay thiết lập")
+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,
+      "Kích hoạt Netplay Spectator")
+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,
+      "Network Information")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_ENABLE,
+      "Network Gamepad")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_REMOTE_PORT,
+      "Network Remote Base Port")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_SETTINGS,
+      "Network")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO,
+      "No")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NONE,
+      "None")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE,
+      "N/A")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_ACHIEVEMENTS_TO_DISPLAY,
+      "No achievements to display.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORE,
+      "No Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORES_AVAILABLE,
+      "No cores available.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORE_INFORMATION_AVAILABLE,
+      "No core information available.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_CORE_OPTIONS_AVAILABLE,
+      "No core options available.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_ENTRIES_TO_DISPLAY,
+      "No entries to display.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_HISTORY_AVAILABLE,
+      "No history available.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_INFORMATION_AVAILABLE,
+      "No information is available.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_ITEMS,
+      "No items.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_NETPLAY_HOSTS_FOUND,
+      "No netplay hosts found.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_NETWORKS_FOUND,
+      "No networks found.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PERFORMANCE_COUNTERS,
+      "No performance counters.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PLAYLISTS,
+      "No playlists.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_PLAYLIST_ENTRIES_AVAILABLE,
+      "No playlist entries available.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_SETTINGS_FOUND,
+      "No settings found.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NO_SHADER_PARAMETERS,
+      "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,
+      "Online Updater")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS,
+      "Onscreen Display")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_OVERLAY_SETTINGS,
+      "Onscreen Overlay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_ONSCREEN_NOTIFICATIONS_SETTINGS,
+      "Onscreen Notifications")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE,
+      "Browse Archive")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OPTIONAL,
+      "Optional")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY,
+      "Overlay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_AUTOLOAD_PREFERRED,
+      "Tự động tải Preferred Overlay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_DIRECTORY,
+      "Overlay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_OPACITY,
+      "Overlay Opacity")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_PRESET,
+      "Overlay Preset")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_SCALE,
+      "Overlay Scale")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_OVERLAY_SETTINGS,
+      "Onscreen Overlay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PAL60_ENABLE,
+      "Use PAL60 Mode")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY,
+      "Parent directory")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PAUSE_LIBRETRO,
+      "Pause when menu activated")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PAUSE_NONACTIVE,
+      "Don't run in background")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PERFCNT_ENABLE,
+      "Performance Counters")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PLAYLISTS_TAB,
+      "Playlists")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PLAYLIST_DIRECTORY,
+      "Playlist Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS,
+      "Playlists")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_POINTER_ENABLE,
+      "Touch Support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PORT,
+      "Port")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PRESENT,
+      "Present")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS,
+      "Privacy")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_QUIT_RETROARCH,
+      "Thoát 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,
+      "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,
+      "Start Content")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RDB_ENTRY_TGDB_RATING,
+      "TGDB Rating")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_REBOOT,
+      "Khởi động lại")
+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,
+      "Recording")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_CONFIG,
+      "Load Recording Config...")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_DRIVER,
+      "Record Driver")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_ENABLE,
+      "Enable Recording")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_PATH,
+      "Save Output Recording as...")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RECORD_USE_OUTPUT_DIRECTORY,
+      "Save Recordings in Output Dir")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_REMAP_FILE,
+      "Remap File")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_REMAP_FILE_LOAD,
+      "Tải 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_GAME,
+      "Save Game Remap File")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_REQUIRED,
+      "Required")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RESTART_CONTENT,
+      "Khởi động lại")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RESTART_RETROARCH,
+      "Restart RetroArch")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RESUME,
+      "Resume")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RESUME_CONTENT,
+      "Resume")
+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 w/ Analog")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS,
+      "Achievements")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_ENABLE,
+      "Kích hoạt Rewind")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY,
+      "Rewind Granularity")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_REWIND_SETTINGS,
+      "Rewind")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RGUI_BROWSER_DIRECTORY,
+      "File Browser")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RGUI_CONFIG_DIRECTORY,
+      "Config Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RGUI_SHOW_START_SCREEN,
+      "Display Start Screen")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RIGHT_ANALOG,
+      "Right Analog")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_RUN,
+      "Run")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAMBA_ENABLE,
+      "Kích hoạt SAMBA")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVEFILE_DIRECTORY,
+      "Savefile Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
+      "Save State Auto Index")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_LOAD,
+      "Tự động tải State")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_SAVE,
+      "Auto Save State")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_DIRECTORY,
+      "Savestate Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVESTATE_THUMBNAIL_ENABLE,
+      "Savestate Thumbnails")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG,
+      "Save Current Configuration")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_CORE,
+      "Save Core Overrides")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG_OVERRIDE_GAME,
+      "Save Game Overrides")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_NEW_CONFIG,
+      "Save New Configuration")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVE_STATE,
+      "Save State")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS,
+      "Saving")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY,
+      "Scan Directory")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SCAN_FILE,
+      "Scan File")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY,
+      "<Scan This Directory>")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREENSHOT_DIRECTORY,
+      "Screenshot Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SCREEN_RESOLUTION,
+      "Screen Resolution")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SEARCH,
+      "Search")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SECONDS,
+      "seconds")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS,
+      "Thiết lập")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SETTINGS_TAB,
+      "Thiết lập")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER,
+      "Shader")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_APPLY_CHANGES,
+      "Áp dụng Changes")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_OPTIONS,
+      "Shaders")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON,
+      "Ribbon")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED,
+      "Ribbon (simplified)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SIMPLE_SNOW,
+      "Simple Snow")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_SNOW,
+      "Snow")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHOW_ADVANCED_SETTINGS,
+      "Show Advanced thiết lập")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHOW_HIDDEN_FILES,
+      "Show Hidden Files and Folders")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHUTDOWN,
+      "Tắt Máy")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO,
+      "Slow-Motion Ratio")
+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_SSH_ENABLE,
+      "Kích hoạt SSH")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_START_CORE,
+      "Start Core")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD,
+      "Start Remote RetroPad")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_START_VIDEO_PROCESSOR,
+      "Start Video Processor")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_STATE_SLOT,
+      "State Slot")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_STATUS,
+      "Status")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_STDIN_CMD_ENABLE,
+      "stdin Commands")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SUPPORTED_CORES,
+      "Suggested cores")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SUSPEND_SCREENSAVER_ENABLE,
+      "Suspend Screensaver")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_BGM_ENABLE,
+      "Kích hoạt System BGM")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_DIRECTORY,
+      "System/BIOS Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFORMATION,
+      "System Information")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_7ZIP_SUPPORT,
+      "7zip support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ALSA_SUPPORT,
+      "ALSA support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE,
+      "Build date")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CG_SUPPORT,
+      "Cg support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COCOA_SUPPORT,
+      "Cocoa support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_COMMAND_IFACE_SUPPORT,
+      "Command interface support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CORETEXT_SUPPORT,
+      "CoreText support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_CPU_FEATURES,
+      "CPU Features")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_DPI,
+      "Display metric DPI")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_HEIGHT,
+      "Display metric height (mm)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DISPLAY_METRIC_MM_WIDTH,
+      "Display metric width (mm)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DSOUND_SUPPORT,
+      "DirectSound support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WASAPI_SUPPORT,
+      "WASAPI support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYLIB_SUPPORT,
+      "Dynamic library support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYNAMIC_SUPPORT,
+      "Dynamic run-time loading of libretro library")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_EGL_SUPPORT,
+      "EGL support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FBO_SUPPORT,
+      "OpenGL/Direct3D render-to-texture (multi-pass shaders) support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FFMPEG_SUPPORT,
+      "FFmpeg support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FREETYPE_SUPPORT,
+      "FreeType support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_IDENTIFIER,
+      "Frontend identifier")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_NAME,
+      "Frontend name")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_FRONTEND_OS,
+      "Frontend OS")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION,
+      "Git version")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GLSL_SUPPORT,
+      "GLSL support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_HLSL_SUPPORT,
+      "HLSL support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_JACK_SUPPORT,
+      "JACK support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_KMS_SUPPORT,
+      "KMS/EGL support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBRETRODB_SUPPORT,
+      "LibretroDB support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBUSB_SUPPORT,
+      "Libusb support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LIBXML2_SUPPORT,
+      "libxml2 XML parsing support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETPLAY_SUPPORT,
+      "Netplay (peer-to-peer) support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_COMMAND_IFACE_SUPPORT,
+      "Network Command interface support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_NETWORK_REMOTE_SUPPORT,
+      "Network Gamepad support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENAL_SUPPORT,
+      "OpenAL support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGLES_SUPPORT,
+      "OpenGL ES support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENGL_SUPPORT,
+      "OpenGL support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENSL_SUPPORT,
+      "OpenSL support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OPENVG_SUPPORT,
+      "OpenVG support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OSS_SUPPORT,
+      "OSS support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_OVERLAY_SUPPORT,
+      "Overlay support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE,
+      "Power source")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGED,
+      "Charged")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_CHARGING,
+      "Charging")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_DISCHARGING,
+      "Discharging")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_POWER_SOURCE_NO_SOURCE,
+      "No source")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PULSEAUDIO_SUPPORT,
+      "PulseAudio support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_PYTHON_SUPPORT,
+      "Python (script support in shaders) support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RBMP_SUPPORT,
+      "BMP support (RBMP)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RETRORATING_LEVEL,
+      "RetroRating level")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RJPEG_SUPPORT,
+      "JPEG support (RJPEG)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ROARAUDIO_SUPPORT,
+      "RoarAudio support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RPNG_SUPPORT,
+      "PNG support (RPNG)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RSOUND_SUPPORT,
+      "RSound support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_RTGA_SUPPORT,
+      "TGA support (RTGA)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL2_SUPPORT,
+      "SDL2 support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_IMAGE_SUPPORT,
+      "SDL image support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SDL_SUPPORT,
+      "SDL1.2 support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_SLANG_SUPPORT,
+      "Slang support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_THREADING_SUPPORT,
+      "Threading support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_UDEV_SUPPORT,
+      "Udev support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_V4L2_SUPPORT,
+      "Video4Linux2 support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VIDEO_CONTEXT_DRIVER,
+      "Video context driver")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_VULKAN_SUPPORT,
+      "Vulkan support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_WAYLAND_SUPPORT,
+      "Wayland support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_X11_SUPPORT,
+      "X11 support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XAUDIO2_SUPPORT,
+      "XAudio2 support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_XVIDEO_SUPPORT,
+      "XVideo support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_ZLIB_SUPPORT,
+      "Zlib support")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_TAKE_SCREENSHOT,
+      "Chụp ảnh màn hình")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_THREADED_DATA_RUNLOOP_ENABLE,
+      "Threaded tasks")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAILS,
+      "Thumbnails")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAILS_DIRECTORY,
+      "Thumbnails Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST,
+      "Thumbnails Updater")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_BOXARTS,
+      "Boxarts")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_SCREENSHOTS,
+      "Screenshots")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_THUMBNAIL_MODE_TITLE_SCREENS,
+      "Title Screens")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_TIMEDATE_ENABLE,
+      "Display time / date")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_TITLE_COLOR,
+      "Menu title color")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_TRUE,
+      "True")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UI_COMPANION_ENABLE,
+      "Kích hoạt UI Companion")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT,
+      "UI Companion Start On Boot")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UI_MENUBAR_ENABLE,
+      "Menubar")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UNABLE_TO_READ_COMPRESSED_FILE,
+      "Unable to read compressed file.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UNDO_LOAD_STATE,
+      "Undo Tải State")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UNDO_SAVE_STATE,
+      "Undo Save State")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UNKNOWN,
+      "Unknown")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATER_SETTINGS,
+      "Updater")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_ASSETS,
+      "Cập nhật Assets")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_AUTOCONFIG_PROFILES,
+      "Cập nhật Autoconfig Profiles")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_CG_SHADERS,
+      "Cập nhật Cg Shaders")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_CHEATS,
+      "Cập nhật Cheats")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES,
+      "Cập nhật Core Info Files")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_DATABASES,
+      "Cập nhật Databases")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_GLSL_SHADERS,
+      "Cập nhật GLSL Shaders")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_LAKKA,
+      "Cập nhật Lakka")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_OVERLAYS,
+      "Cập nhật Overlays")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_UPDATE_SLANG_SHADERS,
+      "Cập nhật Slang Shaders")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_USER,
+      "User")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_INTERFACE_SETTINGS,
+      "User Interface")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_LANGUAGE,
+      "Language")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_USER_SETTINGS,
+      "User")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_USE_BUILTIN_IMAGE_VIEWER,
+      "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,
+      "<Use this directory>")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_ALLOW_ROTATE,
+      "Allow rotation")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO,
+      "Config Aspect Ratio")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_AUTO,
+      "Auto Aspect Ratio")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_ASPECT_RATIO_INDEX,
+      "Aspect Ratio")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_BLACK_FRAME_INSERTION,
+      "Black Frame Insertion")
+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_DRIVER,
+      "Video Driver")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER,
+      "Video Filter")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_DIR,
+      "Video Filter Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FILTER_FLICKER,
+      "Flicker filter")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FONT_ENABLE,
+      "Enable Onscreen Notifications")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FONT_PATH,
+      "Onscreen Notification Font")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FONT_SIZE,
+      "Onscreen Notification Size")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_ASPECT,
+      "Force aspect ratio")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FORCE_SRGB_DISABLE,
+      "Force-disable sRGB FBO")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_DELAY,
+      "Frame Delay")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN,
+      "Sử dụng chế độ toàn màn hình")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_GAMMA,
+      "Video Gamma")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_GPU_RECORD,
+      "Use GPU Recording")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_GPU_SCREENSHOT,
+      "Kích hoạt GPU Screenshot")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC,
+      "Hard GPU Sync")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_HARD_SYNC_FRAMES,
+      "Hard GPU Sync Frames")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES,
+      "Max swapchain images")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_X,
+      "Onscreen Notification X Position")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MESSAGE_POS_Y,
+      "Onscreen Notification Y Position")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_MONITOR_INDEX,
+      "Monitor Index")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_POST_FILTER_RECORD,
+      "Kích hoạt Post Filter Recording")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE,
+      "Vertical Refresh Rate")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_REFRESH_RATE_AUTO,
+      "Estimated Screen Framerate")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_ROTATION,
+      "Rotation")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SCALE,
+      "Windowed Scale")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SCALE_INTEGER,
+      "Integer Scale")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS,
+      "Video")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_DIR,
+      "Video Shader Danh mục")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES,
+      "Shader Passes")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PARAMETERS,
+      "Preview Shader Parameters")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET,
+      "Tải Shader Preset")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS,
+      "Menu Shader Parameters")
+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_GAME,
+      "Save Game Preset")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT,
+      "Kích hoạt Hardware Shared Context")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH,
+      "Bilinear Filtering")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER,
+      "Kích hoạt Soft Filter")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL,
+      "Vertical Sync (Vsync) Swap Interval")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_TAB,
+      "Video")
+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,
+      "Custom Aspect Ratio Height")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
+      "Custom Aspect Ratio Width")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_X,
+      "Custom Aspect Ratio X Pos.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
+      "Custom Aspect Ratio Y Pos.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VI_WIDTH,
+      "Set VI Screen Width")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_VSYNC,
+      "Vertical Sync (Vsync)")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOWED_FULLSCREEN,
+      "Chế độ toàn màn hình trong khung")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_WIDTH,
+      "Window Width")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_WINDOW_HEIGHT,
+      "Window Height")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_X,
+      "Fullscreen Width")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_FULLSCREEN_Y,
+      "Fullscreen Height")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_WIFI_DRIVER,
+      "Wi-Fi Driver")
+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_XMB_FONT,
+      "Menu 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,
+      "Monochrome")
+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_DOTART,
+      "Dot-Art")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME,
+      "Menu Color Theme")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_APPLE_GREEN,
+      "Apple Green")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
+      "Dark")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE,
+      "Dark Purple")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE,
+      "Electric Blue")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_GOLDEN,
+      "Golden")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED,
+      "Legacy Red")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MIDNIGHT_BLUE,
+      "Midnight Blue")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_PLAIN,
+      "Plain")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_UNDERSEA,
+      "Undersea")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
+      "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,
+      "Kích hoạt Icon Shadows")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_HISTORY,
+      "Display History Tab")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_ADD,
+      "Display Import content Tab")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_IMAGES,
+      "Display Image Tab")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_MUSIC,
+      "Display Music Tab")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_SETTINGS,
+      "Show thiết lập Tab")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_VIDEO,
+      "Display Video Tab")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_SHOW_NETPLAY,
+      "Display Netplay Tab")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_THEME,
+      "Menu Icon Theme")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_YES,
+      "Yes")
+MSG_HASH(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_TWO,
+      "Shader Preset")
+MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_ENABLE,
+      "Enable or disable achievements. For more information, visit 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, fast-forward, pause, and slow-motion for all games.")
+MSG_HASH(MENU_ENUM_SUBLABEL_DRIVER_SETTINGS,
+      "Change drivers used by the system.")
+MSG_HASH(MENU_ENUM_SUBLABEL_RETRO_ACHIEVEMENTS_SETTINGS,
+      "Change achievement settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CORE_SETTINGS,
+      "Change core settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_RECORDING_SETTINGS,
+      "Change recording settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_ONSCREEN_DISPLAY_SETTINGS,
+      "Change display overlay and keyboard overlay, and onscreen notification settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_FRAME_THROTTLE_SETTINGS,
+      "Change rewind, fast-forward, and slow-motion settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
+      "Change saving settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOGGING_SETTINGS,
+      "Change logging settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_USER_INTERFACE_SETTINGS,
+      "Change user interface settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_USER_SETTINGS,
+      "Change account, username, and language settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_PRIVACY_SETTINGS,
+      "Change your privacy settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_DIRECTORY_SETTINGS,
+      "Change default directories where files are located.")
+MSG_HASH(MENU_ENUM_SUBLABEL_PLAYLIST_SETTINGS,
+      "Change playlist settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_NETWORK_SETTINGS,
+      "Configure server and network settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_ADD_CONTENT_LIST,
+      "Tải/quét nội dung và thêm vào bộ sưu tập.")
+MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
+      "Điều chỉnh thiết lập cho âm thanh ra.")
+MSG_HASH(MENU_ENUM_SUBLABEL_BLUETOOTH_ENABLE,
+      "Bật/tắt bluetooth.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
+      "Lưu cấu hình khi thoát retroarch.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATION_SETTINGS,
+      "Change default settings for configuration files.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CONFIGURATIONS_LIST,
+      "Manage and create configuration files.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CPU_CORES,
+      "Số lượng lõi của CPU.")
+MSG_HASH(MENU_ENUM_SUBLABEL_FPS_SHOW,
+      "Hiển thị tốc độ khung hình/giây trên màn hình.")
+MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_HOTKEY_BINDS,
+      "Đặt cấu hình thiết lập của hotkey.")
+MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_MENU_ENUM_TOGGLE_GAMEPAD_COMBO,
+      "Kết hợp nút Gamepad để vào menu bật/tắt.")
+MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_SETTINGS,
+      "Điều chỉnh thiết lập cho joypads, bàn phím và chuột.")
+MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_USER_BINDS,
+      "Configure controls for this user.")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOG_VERBOSITY,
+      "Kích hoạt or disable logging to the terminal.")
+MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY,
+      "Tham gia hoặc làm máy chủ cho netplay.")
+MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_LAN_SCAN_SETTINGS,
+      "Search for and connect to netplay hosts on the local network.")
+MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION_LIST_LIST,
+      "Display core, network, and system information.")
+MSG_HASH(MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
+      "Tải/cập nhật tiện ích và thành phần của RetroArch.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SAMBA_ENABLE,
+      "Bật/tắt chia sẻ thư mục trên mạng.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SERVICES_SETTINGS,
+      "Quản lý dịch vụ của hệ điều hành.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SHOW_HIDDEN_FILES,
+      "Hiện ra tập tin và thư mục ẩn trong trình duyệt tập tin.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SSH_ENABLE,
+      "Bật/tắt giao thức SSH.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SUSPEND_SCREENSAVER_ENABLE,
+      "Chặn tính năng screensaver (màn hình chờ).")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_SCALE,
+      "Sets the window size relative to the core viewport size. Alternatively, you can set a window width and height below for a fixed window size.")
+MSG_HASH(MENU_ENUM_SUBLABEL_USER_LANGUAGE,
+      "Thiết lập ngôn ngữ của giao diện .")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_BLACK_FRAME_INSERTION,
+      "Inserts a black frame inbetween frames. Useful for users with 120Hz screens who want to play 60Hz content to eliminate ghosting.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FRAME_DELAY,
+      "Reduces latency at the cost of a higher risk of video stuttering. Adds a delay after V-Sync (in ms).")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_HARD_SYNC_FRAMES,
+      "Sets how many frames the CPU can run ahead of the GPU when using 'Hard GPU Sync'.")
+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,
+      "Chọn màn hình hiển thị để sử dụng.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_REFRESH_RATE_AUTO,
+      "The accurate estimated refresh rate of the screen in Hz.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_SETTINGS,
+      "Điều chỉnh thiết lập cho video ra.")
+MSG_HASH(MENU_ENUM_SUBLABEL_WIFI_SETTINGS,
+      "Tìm mạng không dây và thiết lập kết nối.")
+MSG_HASH(MENU_ENUM_SUBLABEL_HELP_LIST,
+      "Learn more about how the program works.")
+MSG_HASH(MSG_APPENDED_DISK,
+      "Appended disk")
+MSG_HASH(MSG_APPLICATION_DIR,
+      "Application Danh mục")
+MSG_HASH(MSG_APPLYING_CHEAT,
+      "Đang áp dụng cheat changes.")
+MSG_HASH(MSG_APPLYING_SHADER,
+      "Đang áp dụng shader")
+MSG_HASH(MSG_AUDIO_MUTED,
+      "Âm thanh muted.")
+MSG_HASH(MSG_AUDIO_UNMUTED,
+      "Âm thanh unmuted.")
+MSG_HASH(MSG_AUTOCONFIG_FILE_ERROR_SAVING,
+      "Tập tin Autoconfig bị lỗi khi lưu.")
+MSG_HASH(MSG_AUTOCONFIG_FILE_SAVED_SUCCESSFULLY,
+      "Tập tin Autoconfig đã lưu thành công.")
+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,
+      "Đang đưa lên lệnh giao diện trên cổng")
+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,
+      "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,
+      "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,
+      "Ngắt kết nối thiết bị từ cổng hợp lệ.")
+MSG_HASH(MSG_DISK_CLOSED,
+      "Closed")
+MSG_HASH(MSG_DISK_EJECTED,
+      "Ejected")
+MSG_HASH(MSG_DOWNLOADING,
+      "Downloading")
+MSG_HASH(MSG_DOWNLOAD_FAILED,
+      "Download failed")
+MSG_HASH(MSG_ERROR,
+      "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_SAVING_SHADER_PRESET,
+      "Error saving shader preset.")
+MSG_HASH(MSG_EXTERNAL_APPLICATION_DIR,
+      "External Application Dir")
+MSG_HASH(MSG_EXTRACTING,
+      "Extracting")
+MSG_HASH(MSG_EXTRACTING_FILE,
+      "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,
+      "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,
+      "Bị lỗi khi chạy chương trình điều khiển âm thanh. Sẽ tiếp tục chạy và bỏ âm thanh.")
+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,
+      "Bị lỗi khi chụp ảnh màn hình.")
+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 Âm thanh.")
+MSG_HASH(MSG_FATAL_ERROR_RECEIVED_IN,
+      "Fatal error received in")
+MSG_HASH(MSG_FILE_NOT_FOUND,
+      "Không tìm thấy tệp")
+MSG_HASH(MSG_FOUND_AUTO_SAVESTATE_IN,
+      "Tìm thấy savestate tự đông trong")
+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,
+      "Tiềm thấy state slot xài lần trước")
+MSG_HASH(MSG_FOUND_SHADER,
+      "Found shader")
+MSG_HASH(MSG_FRAMES,
+      "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,
+      "Input Cheat")
+MSG_HASH(MSG_INPUT_CHEAT_FILENAME,
+      "Cheat Filename")
+MSG_HASH(MSG_INPUT_PRESET_FILENAME,
+      "Preset Filename")
+MSG_HASH(MSG_INTERFACE,
+      "Interface")
+MSG_HASH(MSG_INTERNAL_STORAGE,
+      "Internal Storage")
+MSG_HASH(MSG_REMOVABLE_STORAGE,
+      "Removable Storage")
+MSG_HASH(MSG_INVALID_NICKNAME_SIZE,
+      "Invalid nickname size.")
+MSG_HASH(MSG_IN_BYTES,
+      "in bytes")
+MSG_HASH(MSG_IN_GIGABYTES,
+      "in gigabytes")
+MSG_HASH(MSG_IN_MEGABYTES,
+      "in 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,
+      "Đang tải")
+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,
+      "Đang nạp tập tin lịch sử")
+MSG_HASH(MSG_LOADING_STATE,
+      "Đang tải state")
+MSG_HASH(MSG_MEMORY,
+      "Memory")
+MSG_HASH(MSG_MOVIE_FILE_IS_NOT_A_VALID_BSV1_FILE,
+      "Movie file is not a valid BSV1 file.")
+MSG_HASH(MSG_MOVIE_FORMAT_DIFFERENT_SERIALIZER_VERSION,
+      "Movie format seems to have a different serializer version. Will most likely fail.")
+MSG_HASH(MSG_MOVIE_PLAYBACK_ENDED,
+      "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,
+      "Paused.")
+MSG_HASH(MSG_PROGRAM,
+      "RetroArch")
+MSG_HASH(MSG_READING_FIRST_DATA_TRACK,
+      "Reading first data track...")
+MSG_HASH(MSG_RECEIVED,
+      "received")
+MSG_HASH(MSG_RECORDING_TERMINATED_DUE_TO_RESIZE,
+      "Recording terminated due to resize.")
+MSG_HASH(MSG_RECORDING_TO,
+      "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_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,
+      "Scanning")
+MSG_HASH(MSG_SCANNING_OF_DIRECTORY_FINISHED,
+      "Scanning of directory finished")
+MSG_HASH(MSG_SENDING_COMMAND,
+      "Sending command")
+MSG_HASH(MSG_SEVERAL_PATCHES_ARE_EXPLICITLY_DEFINED,
+      "Several patches are explicitly defined, ignoring all...")
+MSG_HASH(MSG_SHADER,
+      "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,
+      "Slow motion.")
+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,
+      "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,
+      "Kết nối thiết bị từ cổng hợp lệ.")
+MSG_HASH(MSG_VALUE_DISCONNECTING_DEVICE_FROM_PORT,
+      "Đang ngắt kết nối thiết bị từ cổng")
+MSG_HASH(MSG_VALUE_REBOOTING,
+      "Đang khởi động lại...")
+MSG_HASH(MSG_VALUE_SHUTTING_DOWN,
+      "Đang tắt máy...")
+MSG_HASH(MSG_VERSION_OF_LIBRETRO_API,
+      "Phiên bản của 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,
+      "Desired audio latency in milliseconds. Might not be honored if the audio driver can't provide given latency.")
+MSG_HASH(MENU_ENUM_SUBLABEL_AUDIO_MUTE,
+      "Mute/unmute audio.")
+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,
+      "Maximum amount of users supported by RetroArch."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_INPUT_POLL_TYPE_BEHAVIOR,
+      "Influence how input polling is done inside RetroArch. Setting it to 'Early' or 'Late' can result in less latency, depending on your configuration."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_INPUT_ALL_USERS_CONTROL_MENU,
+      "Allows any user to control the menu. If disabled, only User 1 can control the menu."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_AUDIO_VOLUME,
+      "Audio volume (in dB). 0 dB is normal volume, and no gain is applied."
+      )
+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 audio buffer length when using the WASAPI driver in shared mode."
+      )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_AUDIO_SYNC,
+   "Synchronize audio. Recommended."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_INPUT_AXIS_THRESHOLD,
+   "How far an axis must be tilted to result in a button press."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_INPUT_BIND_TIMEOUT,
+   "Amount of seconds to wait until proceeding to the next bind."
+   )
+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,
+   "Synchronizes the output video of the graphics card to the refresh rate of the screen. Recommended."
+   )
+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,
+   "Vertical refresh rate of your screen. Used to calculate a suitable audio input rate. NOTE: This will be ignored if 'Threaded Video' is enabled."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_AUDIO_ENABLE,
+   "Enable audio output."
+   )
+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,
+   "Bị Lỗi"
+   )
+MSG_HASH(
+   MSG_SUCCEEDED,
+   "Đã thành công"
+   )
+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,
+   "Vô hiệu hoá"
+   )
+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,
+      "Database Info")
+MSG_HASH(MSG_WIFI_SCAN_COMPLETE,
+      "Wi-Fi scan complete.")
+MSG_HASH(MSG_SCANNING_WIRELESS_NETWORKS,
+      "Scanning wireless networks...")
+MSG_HASH(MSG_NETPLAY_LAN_SCAN_COMPLETE,
+      "Netplay scan complete.")
+MSG_HASH(MSG_NETPLAY_LAN_SCANNING,
+      "Scanning for netplay hosts...")
+MSG_HASH(MENU_ENUM_SUBLABEL_PAUSE_NONACTIVE,
+      "Pause gameplay when RetroArch is not the active window.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_DISABLE_COMPOSITION,
+      "Enable or disable composition (Windows only).")
+MSG_HASH(MENU_ENUM_SUBLABEL_HISTORY_LIST_ENABLE,
+      "Enable or disable recent playlist for games, images, music, and videos.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_HISTORY_SIZE,
+      "Limit the number of entries in recent playlist for games, images, music, and videos.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_INPUT_UNIFIED_MENU_CONTROLS,
+      "Unified Menu Controls")
+MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_UNIFIED_MENU_CONTROLS,
+      "Use the same controls for both the menu and the game. Applies to the keyboard.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FONT_ENABLE,
+      "Show onscreen messages.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETWORK_USER_REMOTE_ENABLE,
+      "User %d Remote Enable")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_BATTERY_LEVEL_ENABLE,
+      "Display battery level")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SELECT_FILE,
+      "Select File")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SELECT_FROM_COLLECTION,
+      "Select From Collection")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_FILTER,
+      "Filter")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SCALE,
+      "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,
+      "Start"
+      )
+MSG_HASH(MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_BOKEH,
+      "Bokeh")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_REFRESH_ROOMS,
+      "Refresh")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME,
+      "Nickname: %s")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME_LAN,
+      "Nickname (lan): %s")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_COMPAT_CONTENT_FOUND,
+      "Compatible content found")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_CROP_OVERSCAN,
+      "Cuts off a few pixels around the edges of the image customarily left blank by developers which sometimes also contain garbage pixels.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_SMOOTH,
+      "Adds a slight blur to the image to take the edge off of the hard pixel edges. This option has very little impact on performance.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_FILTER,
+      "Apply a CPU-powered video filter. NOTE: Might come at a high performance cost. Some video filters might only work for cores that use 32bit or 16bit color.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CHEEVOS_USERNAME,
+      "Input the username of your Retro Achievements account.")
+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.")
+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,
+      "Select which core to use.")
+MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_CONTENT_LIST,
+      "Select which content to start.")
+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.")
+MSG_HASH(MENU_ENUM_SUBLABEL_QUIT_RETROARCH,
+      "Quit the program.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_WIDTH,
+      "Set the custom width size for the display window. Leaving it at 0 will attempt to scale the window as large as possible.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_WINDOW_HEIGHT,
+      "Set the custom height size for the display window. Leaving it at 0 will attempt to scale the window as large as possible.")
+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,
+      "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."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_VIDEO_SCALE_INTEGER,
+      "Only scales video in integer steps. The base size depends on system-reported geometry and aspect ratio. If 'Force Aspect' is not set, X/Y will be integer scaled independently."
+      )
+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,
+      "Start in fullscreen. Can be changed at runtime."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_VIDEO_WINDOWED_FULLSCREEN,
+      "If fullscreen, prefer using a windowed fullscreen mode."
+      )
+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_REWIND_ENABLE,
+      "Enable rewinding. This will take a performance hit when playing."
+      )
+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_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,
+      "Swap buttons for OK/Cancel. Disabled is the Japanese button orientation, enabled is the western orientation."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_PAUSE_LIBRETRO,
+      "If disabled, the content will keep running in the background when RetroArch's menu is toggled."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_VIDEO_DRIVER,
+      "Video driver to use."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_AUDIO_DRIVER,
+      "Audio driver to use."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_INPUT_DRIVER,
+      "Input driver to use. Depending on the video driver, it might force a different input driver."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_JOYPAD_DRIVER,
+      "Joypad driver to use."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_AUDIO_RESAMPLER_DRIVER,
+      "Audio resampler driver to use."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_CAMERA_DRIVER,
+      "Camera driver to use."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_LOCATION_DRIVER,
+      "Location driver to use."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_MENU_DRIVER,
+      "Menu driver to use."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_RECORD_DRIVER,
+      "Record driver to use."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_WIFI_DRIVER,
+      "WiFi driver to use."
+      )
+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,
+      "Override the default audio device the audio driver uses. This is driver dependent."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_AUDIO_DSP_PLUGIN,
+      "Audio DSP plugin that processes audio before it's sent to the driver."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_AUDIO_OUTPUT_RATE,
+      "Audio output sample rate."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_OVERLAY_OPACITY,
+      "Opacity of all UI elements of the overlay."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_OVERLAY_SCALE,
+      "Scale of all UI elements of the overlay."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_INPUT_OVERLAY_ENABLE,
+      "Enable the overlay."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_OVERLAY_PRESET,
+      "Select an overlay from the file browser."
+      )
+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_TIMEDATE_ENABLE,
+      "Shows current date and/or time inside the menu."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_BATTERY_LEVEL_ENABLE,
+      "Shows current battery level inside the menu."
+      )
+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,
+      "Enables netplay in host (server) mode."
+      )
+MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_ENABLE_CLIENT,
+      "Enables netplay in client mode.")
+MSG_HASH(MENU_ENUM_SUBLABEL_NETPLAY_DISCONNECT,
+      "Disconnects an active Netplay connection.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SCAN_DIRECTORY,
+      "Scans a directory for compatible files and add them to the collection.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SCAN_FILE,
+      "Scans a compatible file and add it to the collection.")
+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,
+      "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_CLIENT_SWAP_INPUT,
+      "When being client over netplay, use keybinds for Player 1.")
+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,
+      "Scan for new rooms.")
+MSG_HASH(MENU_ENUM_SUBLABEL_DELETE_ENTRY,
+      "Remove this entry from the collection.")
+MSG_HASH(MENU_ENUM_SUBLABEL_INFORMATION,
+      "View more information about the content.")
+MSG_HASH(MENU_ENUM_SUBLABEL_RUN,
+      "Start the content.")
+MSG_HASH(MENU_ENUM_SUBLABEL_MENU_FILE_BROWSER_SETTINGS,
+      "Adjusts filebrowser 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,
+      "Shows current core name inside menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_DATABASE_MANAGER,
+      "View databases.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CURSOR_MANAGER,
+      "View previous searches.")
+MSG_HASH(MENU_ENUM_SUBLABEL_TAKE_SCREENSHOT,
+      "Captures an image of the screen.")
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_CLOSE_CONTENT,
+      "Closes the current content. Any unsaved changes might be lost."
+      )
+MSG_HASH(MENU_ENUM_SUBLABEL_LOAD_STATE,
+      "Load a saved state from the currently selected slot.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SAVE_STATE,
+      "Save a state to the currently selected slot.")
+MSG_HASH(MENU_ENUM_SUBLABEL_RESUME,
+      "Resume the currently running content and leave the Quick Menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_RESUME_CONTENT,
+      "Resume the currently running content and leave the Quick Menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_STATE_SLOT,
+      "Changes the currently selected state slot.")
+MSG_HASH(MENU_ENUM_SUBLABEL_UNDO_LOAD_STATE,
+      "If a state was loaded, content will go back to the state prior to loading.")
+MSG_HASH(MENU_ENUM_SUBLABEL_UNDO_SAVE_STATE,
+      "If a state was overwritten, it will roll back to the previous save state.")
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_ACCOUNTS_RETRO_ACHIEVEMENTS,
+      "Retro Achievements service. For more information, visit http://retroachievements.org"
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_ACCOUNTS_LIST,
+      "Manages currently configured accounts."
+      )
+MSG_HASH(MENU_ENUM_SUBLABEL_INPUT_META_REWIND,
+      "Manages rewind settings.")
+MSG_HASH(MENU_ENUM_SUBLABEL_RESTART_CONTENT,
+      "Restarts the content from the beginning.")
+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_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,
+      "Set up cheat codes.")
+MSG_HASH(MENU_ENUM_SUBLABEL_SHADER_OPTIONS,
+      "Set up shaders to visually augment the image.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CORE_INPUT_REMAPPING_OPTIONS,
+      "Change the controls for the currently running content.")
+MSG_HASH(MENU_ENUM_SUBLABEL_CORE_OPTIONS,
+      "Change the options for the currently running content.")
+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,
+      "Allow the user to remove entries from collections.")
+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_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_XMB_SHOW_IMAGES,
+      "Show the image tab inside the main menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_MUSIC,
+      "Show the music tab inside the main menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_VIDEO,
+      "Show the video tab inside the main menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_NETPLAY,
+      "Show the netplay tab inside the main menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_SETTINGS,
+      "Show the settings tab inside the main menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_HISTORY,
+      "Show the recent history tab inside the main menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_XMB_SHOW_ADD,
+      "Show the import content tab inside the main menu.")
+MSG_HASH(MENU_ENUM_SUBLABEL_RGUI_SHOW_START_SCREEN,
+      "Show startup screen in menu. This is automatically set to false after the program starts for the first time.")
+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. 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,
+      "Defines a directory where overlays are kept for easy access.")
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_CHEAT_DATABASE_PATH,
+      "Cheat files are kept here."
+      )
+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_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_FILE_LOAD,
+      "Load a cheat file."
+      )
+MSG_HASH(
+      MENU_ENUM_SUBLABEL_CHEAT_FILE_SAVE_AS,
+      "Save current cheats as a save file."
+      )
+MSG_HASH(MENU_ENUM_SUBLABEL_CONTENT_SETTINGS,
+      "Quickly access all relevant in-game 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,
+      "Custom viewport height that is used if the Aspect Ratio is set to 'Custom'.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH,
+      "Custom viewport width that is used if the Aspect Ratio is set to 'Custom'.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_X,
+      "Custom viewport offset used for defining the X-axis position of the viewport. These are ignored if 'Integer Scale' is enabled. It will be automatically centered then.")
+MSG_HASH(MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
+      "Custom viewport offset used for defining the Y-axis position of the viewport. These are ignored if 'Integer Scale' is enabled. It will be automatically centered then.")
+MSG_HASH(MENU_ENUM_LABEL_VALUE_NETPLAY_USE_MITM_SERVER,
+      "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.")
diff --git a/libretro-common/audio/audio_mixer.c b/libretro-common/audio/audio_mixer.c
index cf20e13948..5e77cf1b0b 100644
--- a/libretro-common/audio/audio_mixer.c
+++ b/libretro-common/audio/audio_mixer.c
@@ -23,7 +23,6 @@
 #include <audio/audio_mixer.h>
 #include <audio/audio_resampler.h>
 
-#include <streams/file_stream.h>
 #include <formats/rwav.h>
 #include <memalign.h>
 
@@ -46,13 +45,6 @@
 #define AUDIO_MIXER_MAX_VOICES      8
 #define AUDIO_MIXER_TEMP_OGG_BUFFER 8192
 
-enum audio_mixer_type
-{
-   AUDIO_MIXER_TYPE_NONE = 0,
-   AUDIO_MIXER_TYPE_WAV,
-   AUDIO_MIXER_TYPE_OGG
-};
-
 struct audio_mixer_sound
 {
    enum audio_mixer_type type;
@@ -243,26 +235,16 @@ void audio_mixer_done(void)
       s_voices[i].type = AUDIO_MIXER_TYPE_NONE;
 }
 
-audio_mixer_sound_t* audio_mixer_load_wav(const char* path)
+audio_mixer_sound_t* audio_mixer_load_wav(void *buffer, int32_t size)
 {
    /* WAV data */
    rwav_t wav;
-   /* Raw WAV bytes */
-   void* buffer               = NULL;
-   ssize_t size               = 0;
    /* WAV samples converted to float */
    float* pcm                 = NULL;
    size_t samples             = 0;
    /* Result */
    audio_mixer_sound_t* sound = NULL;
-   enum rwav_state rwav_ret   = RWAV_ITERATE_ERROR;
-   
-   if (filestream_read_file(path, &buffer, &size) == 0)
-      return NULL;
-   
-   rwav_ret = rwav_load(&wav, buffer, size);
-
-   free(buffer);
+   enum rwav_state rwav_ret   = rwav_load(&wav, buffer, size);
 
    if (rwav_ret != RWAV_ITERATE_DONE)
       return NULL;
@@ -283,7 +265,7 @@ audio_mixer_sound_t* audio_mixer_load_wav(const char* path)
       pcm = resampled;
    }
    
-   sound = (audio_mixer_sound_t*)malloc(sizeof(audio_mixer_sound_t));
+   sound = (audio_mixer_sound_t*)calloc(1, sizeof(*sound));
    
    if (!sound)
    {
@@ -300,24 +282,14 @@ audio_mixer_sound_t* audio_mixer_load_wav(const char* path)
    return sound;
 }
 
-audio_mixer_sound_t* audio_mixer_load_ogg(const char* path)
+audio_mixer_sound_t* audio_mixer_load_ogg(void *buffer, int32_t size)
 {
 #ifdef HAVE_STB_VORBIS
-   ssize_t size;
-   void* buffer               = NULL;
-   audio_mixer_sound_t* sound = NULL;
-   
-   if (filestream_read_file(path, &buffer, &size) == 0)
-      return NULL;
-   
-   sound = (audio_mixer_sound_t*)malloc(sizeof(audio_mixer_sound_t));
+   audio_mixer_sound_t* sound = (audio_mixer_sound_t*)calloc(1, sizeof(*sound));
    
    if (!sound)
-   {
-      free(buffer);
       return NULL;
-   }
-   
+
    sound->type           = AUDIO_MIXER_TYPE_OGG;
    sound->types.ogg.size = size;
    sound->types.ogg.data = buffer;
@@ -330,17 +302,22 @@ audio_mixer_sound_t* audio_mixer_load_ogg(const char* path)
 
 void audio_mixer_destroy(audio_mixer_sound_t* sound)
 {
+   void *handle = NULL;
    if (!sound)
       return;
 
    switch (sound->type)
    {
       case AUDIO_MIXER_TYPE_WAV:
-         memalign_free((void*)sound->types.wav.pcm);
+         handle = (void*)sound->types.wav.pcm;
+         if (handle)
+            memalign_free(handle);
          break;
       case AUDIO_MIXER_TYPE_OGG:
 #ifdef HAVE_STB_VORBIS
-         memalign_free((void*)sound->types.ogg.data);
+         handle = (void*)sound->types.ogg.data;
+         if (handle)
+            memalign_free(handle);
 #endif
          break;
       case AUDIO_MIXER_TYPE_NONE:
@@ -407,7 +384,7 @@ static bool audio_mixer_play_ogg(
 
    voice->types.ogg.resampler      = resamp;
    voice->types.ogg.resampler_data = resampler_data;
-   voice->types.ogg.buffer         = ogg_buffer;
+   voice->types.ogg.buffer         = (float*)ogg_buffer;
    voice->types.ogg.buf_samples    = samples;
    voice->types.ogg.ratio          = ratio;
    voice->types.ogg.stream         = stb_vorbis;
@@ -470,7 +447,7 @@ audio_mixer_voice_t* audio_mixer_play(audio_mixer_sound_t* sound, bool repeat,
 void audio_mixer_stop(audio_mixer_voice_t* voice)
 {
    if (voice && voice->stop_cb)
-      voice->stop_cb(voice, AUDIO_MIXER_SOUND_STOPPED);
+      voice->stop_cb(voice->sound, AUDIO_MIXER_SOUND_STOPPED);
 }
 
 static void audio_mixer_mix_wav(float* buffer, size_t num_frames,
@@ -494,7 +471,7 @@ again:
       if (voice->repeat)
       {
          if (voice->stop_cb)
-            voice->stop_cb(voice, AUDIO_MIXER_SOUND_REPEATED);
+            voice->stop_cb(voice->sound, AUDIO_MIXER_SOUND_REPEATED);
 
          buf_free                  -= pcm_available;
          pcm_available              = sound->types.wav.frames * 2;
@@ -504,7 +481,7 @@ again:
       }
 
       if (voice->stop_cb)
-         voice->stop_cb(voice, AUDIO_MIXER_SOUND_FINISHED);
+         voice->stop_cb(voice->sound, AUDIO_MIXER_SOUND_FINISHED);
 
       voice->type = AUDIO_MIXER_TYPE_NONE;
    }
@@ -541,7 +518,7 @@ again:
          if (voice->repeat)
          {
             if (voice->stop_cb)
-               voice->stop_cb(voice, AUDIO_MIXER_SOUND_REPEATED);
+               voice->stop_cb(voice->sound, AUDIO_MIXER_SOUND_REPEATED);
 
             stb_vorbis_seek_start(voice->types.ogg.stream);
             goto again;
@@ -549,7 +526,7 @@ again:
          else
          {
             if (voice->stop_cb)
-               voice->stop_cb(voice, AUDIO_MIXER_SOUND_FINISHED);
+               voice->stop_cb(voice->sound, AUDIO_MIXER_SOUND_FINISHED);
 
             voice->type = AUDIO_MIXER_TYPE_NONE;
             return;
diff --git a/libretro-common/encodings/encoding_utf.c b/libretro-common/encodings/encoding_utf.c
index 76fca8dfb8..c4ec8fd7a8 100644
--- a/libretro-common/encodings/encoding_utf.c
+++ b/libretro-common/encodings/encoding_utf.c
@@ -218,10 +218,10 @@ uint32_t utf8_walk(const char **string)
       ret = (ret<<6) | (utf8_walkbyte(string) & 0x3F);
 
    if (first >= 0xF0)
-      return ret | (first&31)<<18;
+      return ret | (first&7)<<18;
    if (first >= 0xE0)
       return ret | (first&15)<<12;
-   return ret | (first&7)<<6;
+   return ret | (first&31)<<6;
 }
 
 static bool utf16_to_char(uint8_t **utf_data,
diff --git a/libretro-common/file/archive_file_7z.c b/libretro-common/file/archive_file_7z.c
index 6757d8ac1f..09329a3a88 100644
--- a/libretro-common/file/archive_file_7z.c
+++ b/libretro-common/file/archive_file_7z.c
@@ -308,7 +308,7 @@ static int sevenzip_parse_file_init(file_archive_transfer_t *state,
    if (state->archive_size < SEVENZIP_MAGIC_LEN)
       goto error;
 
-   if (memcmp(state->data, SEVENZIP_MAGIC, SEVENZIP_MAGIC_LEN) != 0)
+   if (string_is_not_equal_fast(state->data, SEVENZIP_MAGIC, SEVENZIP_MAGIC_LEN))
       goto error;
 
    state->stream = sevenzip_context;
diff --git a/libretro-common/file/config_file.c b/libretro-common/file/config_file.c
index 65fe3f96e2..3c55fce147 100644
--- a/libretro-common/file/config_file.c
+++ b/libretro-common/file/config_file.c
@@ -270,8 +270,9 @@ static void add_sub_conf(config_file_t *conf, char *line)
    real_path[0] = '\0';
 
 #ifdef _WIN32
-   fill_pathname_resolve_relative(real_path, conf->path,
-         path, sizeof(real_path));
+   if (!string_is_empty(conf->path))
+      fill_pathname_resolve_relative(real_path, conf->path,
+            path, sizeof(real_path));
 #else
 #ifndef __CELLOS_LV2__
    if (*path == '~')
@@ -282,8 +283,9 @@ static void add_sub_conf(config_file_t *conf, char *line)
    }
    else
 #endif
-      fill_pathname_resolve_relative(real_path, conf->path,
-            path, sizeof(real_path));
+      if (!string_is_empty(conf->path))
+         fill_pathname_resolve_relative(real_path, conf->path,
+               path, sizeof(real_path));
 #endif
 
    sub_conf = (config_file_t*)
@@ -745,13 +747,13 @@ bool config_get_bool(config_file_t *conf, const char *key, bool *in)
 
    if (entry)
    {
-      if (memcmp(entry->value, "true", 4) == 0)
+      if (string_is_equal_fast(entry->value, "true", 4))
          *in = true;
-      else if (memcmp(entry->value, "1", 1) == 0)
+      else if (string_is_equal_fast(entry->value, "1", 1))
          *in = true;
-      else if (memcmp(entry->value, "false", 5) == 0)
+      else if (string_is_equal_fast(entry->value, "false", 5))
          *in = false;
-      else if (memcmp(entry->value, "0", 1) == 0)
+      else if (string_is_equal_fast(entry->value, "0", 1))
          *in = false;
       else
          return false;
diff --git a/libretro-common/formats/bmp/rbmp.c b/libretro-common/formats/bmp/rbmp.c
index 1f6401f114..cbc274365a 100644
--- a/libretro-common/formats/bmp/rbmp.c
+++ b/libretro-common/formats/bmp/rbmp.c
@@ -293,11 +293,10 @@ static unsigned char *rbmp__bmp_load(rbmp__context *s, unsigned *x, unsigned *y,
          }
          if (bpp == 16 || bpp == 32)
          {
-            mr = mg = mb = 0;
-
             switch (compress)
             {
                case 0:
+#if 0
                   if (bpp == 32)
                   {
                      mr = 0xffu << 16;
@@ -311,6 +310,7 @@ static unsigned char *rbmp__bmp_load(rbmp__context *s, unsigned *x, unsigned *y,
                      mg = 31u <<  5;
                      mb = 31u <<  0;
                   }
+#endif
                   break;
                case 3:
                   mr = rbmp__get32le(s);
@@ -323,6 +323,9 @@ static unsigned char *rbmp__bmp_load(rbmp__context *s, unsigned *x, unsigned *y,
                      return 0;
                   break;
                default:
+#if 0
+                  mr = mg = mb = 0;
+#endif
                   break;
             }
 
diff --git a/libretro-common/formats/json/jsonsax_full.c b/libretro-common/formats/json/jsonsax_full.c
index b94115bc3a..25270f6a44 100644
--- a/libretro-common/formats/json/jsonsax_full.c
+++ b/libretro-common/formats/json/jsonsax_full.c
@@ -111,38 +111,38 @@ typedef byte TokenAttributes;
 
 static void* JSON_CALL DefaultReallocHandler(void* userData, void* ptr, size_t size)
 {
-    (void)userData; /* unused */
-    return realloc(ptr, size);
+   (void)userData; /* unused */
+   return realloc(ptr, size);
 }
 
 static void JSON_CALL DefaultFreeHandler(void* userData, void* ptr)
 {
-    (void)userData; /* unused */
-    free(ptr);
+   (void)userData; /* unused */
+   free(ptr);
 }
 
 static const JSON_MemorySuite defaultMemorySuite = { NULL, &DefaultReallocHandler, &DefaultFreeHandler };
 
 static byte* DoubleBuffer(const JSON_MemorySuite* pMemorySuite, byte* pDefaultBuffer, byte* pBuffer, size_t length)
 {
-    size_t newLength = length * 2;
-    if (newLength < length)
-    {
-        pBuffer = NULL;
-    }
-    else if (pBuffer == pDefaultBuffer)
-    {
-        pBuffer = (byte*)pMemorySuite->realloc(pMemorySuite->userData, NULL, newLength);
-        if (pBuffer)
-        {
-            memcpy(pBuffer, pDefaultBuffer, length);
-        }
-    }
-    else
-    {
-        pBuffer = (byte*)pMemorySuite->realloc(pMemorySuite->userData, pBuffer, newLength);
-    }
-    return pBuffer;
+   size_t newLength = length * 2;
+   if (newLength < length)
+   {
+      pBuffer = NULL;
+   }
+   else if (pBuffer == pDefaultBuffer)
+   {
+      pBuffer = (byte*)pMemorySuite->realloc(pMemorySuite->userData, NULL, newLength);
+      if (pBuffer)
+      {
+         memcpy(pBuffer, pDefaultBuffer, length);
+      }
+   }
+   else
+   {
+      pBuffer = (byte*)pMemorySuite->realloc(pMemorySuite->userData, pBuffer, newLength);
+   }
+   return pBuffer;
 }
 
 /******************** Unicode Decoder ********************/
@@ -150,12 +150,12 @@ static byte* DoubleBuffer(const JSON_MemorySuite* pMemorySuite, byte* pDefaultBu
 /* Mutually-exclusive decoder states. */
 /* The bits of DecoderState are layed out as follows:
 
-     ---lllnn
+   ---lllnn
 
-     - = unused (3 bits)
-     l = expected total sequence length (3 bits)
-     d = number of bytes decoded so far (2 bits)
- */
+   - = unused (3 bits)
+   l = expected total sequence length (3 bits)
+   d = number of bytes decoded so far (2 bits)
+   */
 
 #define DECODER_RESET  0x00
 #define DECODED_1_OF_2 0x09 /* 00001001 */
@@ -171,20 +171,20 @@ typedef byte DecoderState;
 /* Decoder data. */
 typedef struct tag_DecoderData
 {
-    DecoderState state;
-    uint32_t     bits;
+   DecoderState state;
+   uint32_t     bits;
 } DecoderData;
 typedef DecoderData* Decoder;
 
 /* The bits of DecoderOutput are layed out as follows:
 
-     ------rrlllccccccccccccccccccccc
+   ------rrlllccccccccccccccccccccc
 
-     - = unused (6 bits)
-     r = result code (2 bits)
-     l = sequence length (3 bits)
-     c = codepoint (21 bits)
- */
+   - = unused (6 bits)
+   r = result code (2 bits)
+   l = sequence length (3 bits)
+   c = codepoint (21 bits)
+   */
 #define SEQUENCE_PENDING           0
 #define SEQUENCE_COMPLETE          1
 #define SEQUENCE_INVALID_INCLUSIVE 2
@@ -201,403 +201,403 @@ typedef uint32_t DecoderOutput;
 
 static void Decoder_Reset(Decoder decoder)
 {
-    decoder->state = DECODER_RESET;
-    decoder->bits = 0;
+   decoder->state = DECODER_RESET;
+   decoder->bits = 0;
 }
 
 static int Decoder_SequencePending(Decoder decoder)
 {
-    return decoder->state != DECODER_RESET;
+   return decoder->state != DECODER_RESET;
 }
 
 static DecoderOutput Decoder_ProcessByte(Decoder decoder, Encoding encoding, byte b)
 {
-    DecoderOutput output = DECODER_OUTPUT(SEQUENCE_PENDING, 0, 0);
-    switch (encoding)
-    {
-    case JSON_UTF8:
-        /* When the input encoding is UTF-8, the decoded codepoint's bits are
-           recorded in the bottom 3 bytes of bits as they are decoded.
-           The top byte is not used. */
-        switch (decoder->state)
-        {
-        case DECODER_RESET:
-            if (IS_UTF8_SINGLE_BYTE(b))
-            {
-                output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 1, b);
-            }
-            else if (IS_UTF8_FIRST_BYTE_OF_2(b))
-            {
-                /* UTF-8 2-byte sequences that are overlong encodings can be
-                   detected from just the first byte (C0 or C1). */
-                decoder->bits = (uint32_t)BOTTOM_5_BITS(b) << 6;
-                if (decoder->bits < FIRST_2_BYTE_UTF8_CODEPOINT)
-                {
-                    output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 1, 0);
-                }
-                else
-                {
-                    decoder->state = DECODED_1_OF_2;
-                    goto noreset;
-                }
-            }
-            else if (IS_UTF8_FIRST_BYTE_OF_3(b))
-            {
-                decoder->bits = (uint32_t)BOTTOM_4_BITS(b) << 12;
-                decoder->state = DECODED_1_OF_3;
-                goto noreset;
-            }
-            else if (IS_UTF8_FIRST_BYTE_OF_4(b))
-            {
-                /* Some UTF-8 4-byte sequences that encode out-of-range
-                   codepoints can be detected from the first byte (F5 - FF). */
-                decoder->bits = (uint32_t)BOTTOM_3_BITS(b) << 18;
-                if (decoder->bits > MAX_CODEPOINT)
-                {
-                    output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 1, 0);
-                }
-                else
-                {
-                    decoder->state = DECODED_1_OF_4;
-                    goto noreset;
-                }
-            }
-            else
-            {
-                /* The byte is of the form 11111xxx or 10xxxxxx, and is not
-                   a valid first byte for a UTF-8 sequence. */
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 1, 0);
-            }
-            break;
+   DecoderOutput output = DECODER_OUTPUT(SEQUENCE_PENDING, 0, 0);
+   switch (encoding)
+   {
+      case JSON_UTF8:
+         /* When the input encoding is UTF-8, the decoded codepoint's bits are
+            recorded in the bottom 3 bytes of bits as they are decoded.
+            The top byte is not used. */
+         switch (decoder->state)
+         {
+            case DECODER_RESET:
+               if (IS_UTF8_SINGLE_BYTE(b))
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 1, b);
+               }
+               else if (IS_UTF8_FIRST_BYTE_OF_2(b))
+               {
+                  /* UTF-8 2-byte sequences that are overlong encodings can be
+                     detected from just the first byte (C0 or C1). */
+                  decoder->bits = (uint32_t)BOTTOM_5_BITS(b) << 6;
+                  if (decoder->bits < FIRST_2_BYTE_UTF8_CODEPOINT)
+                  {
+                     output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 1, 0);
+                  }
+                  else
+                  {
+                     decoder->state = DECODED_1_OF_2;
+                     goto noreset;
+                  }
+               }
+               else if (IS_UTF8_FIRST_BYTE_OF_3(b))
+               {
+                  decoder->bits = (uint32_t)BOTTOM_4_BITS(b) << 12;
+                  decoder->state = DECODED_1_OF_3;
+                  goto noreset;
+               }
+               else if (IS_UTF8_FIRST_BYTE_OF_4(b))
+               {
+                  /* Some UTF-8 4-byte sequences that encode out-of-range
+                     codepoints can be detected from the first byte (F5 - FF). */
+                  decoder->bits = (uint32_t)BOTTOM_3_BITS(b) << 18;
+                  if (decoder->bits > MAX_CODEPOINT)
+                  {
+                     output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 1, 0);
+                  }
+                  else
+                  {
+                     decoder->state = DECODED_1_OF_4;
+                     goto noreset;
+                  }
+               }
+               else
+               {
+                  /* The byte is of the form 11111xxx or 10xxxxxx, and is not
+                     a valid first byte for a UTF-8 sequence. */
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 1, 0);
+               }
+               break;
 
-        case DECODED_1_OF_2:
-            if (IS_UTF8_CONTINUATION_BYTE(b))
-            {
-                output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 2, decoder->bits | BOTTOM_6_BITS(b));
-            }
-            else
-            {
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
+            case DECODED_1_OF_2:
+               if (IS_UTF8_CONTINUATION_BYTE(b))
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 2, decoder->bits | BOTTOM_6_BITS(b));
+               }
+               else
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
 
-            }
-            break;
+               }
+               break;
 
-        case DECODED_1_OF_3:
-            if (IS_UTF8_CONTINUATION_BYTE(b))
-            {
-                /* UTF-8 3-byte sequences that are overlong encodings or encode
-                   surrogate codepoints can be detected after 2 bytes. */
-                decoder->bits |= (uint32_t)BOTTOM_6_BITS(b) << 6;
-                if ((decoder->bits < FIRST_3_BYTE_UTF8_CODEPOINT) || IS_SURROGATE(decoder->bits))
-                {
-                    output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
-                }
-                else
-                {
-                    decoder->state = DECODED_2_OF_3;
-                    goto noreset;
-                }
-            }
-            else
-            {
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
-            }
-            break;
+            case DECODED_1_OF_3:
+               if (IS_UTF8_CONTINUATION_BYTE(b))
+               {
+                  /* UTF-8 3-byte sequences that are overlong encodings or encode
+                     surrogate codepoints can be detected after 2 bytes. */
+                  decoder->bits |= (uint32_t)BOTTOM_6_BITS(b) << 6;
+                  if ((decoder->bits < FIRST_3_BYTE_UTF8_CODEPOINT) || IS_SURROGATE(decoder->bits))
+                  {
+                     output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
+                  }
+                  else
+                  {
+                     decoder->state = DECODED_2_OF_3;
+                     goto noreset;
+                  }
+               }
+               else
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
+               }
+               break;
 
-        case DECODED_2_OF_3:
-            if (IS_UTF8_CONTINUATION_BYTE(b))
-            {
-                output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 3, decoder->bits | BOTTOM_6_BITS(b));
-            }
-            else
-            {
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
-            }
-            break;
+            case DECODED_2_OF_3:
+               if (IS_UTF8_CONTINUATION_BYTE(b))
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 3, decoder->bits | BOTTOM_6_BITS(b));
+               }
+               else
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
+               }
+               break;
 
-        case DECODED_1_OF_4:
-            if (IS_UTF8_CONTINUATION_BYTE(b))
-            {
-                /* UTF-8 4-byte sequences that are overlong encodings or encode
-                   out-of-range codepoints can be detected after 2 bytes. */
-                decoder->bits |= (uint32_t)BOTTOM_6_BITS(b) << 12;
-                if ((decoder->bits < FIRST_4_BYTE_UTF8_CODEPOINT) || (decoder->bits > MAX_CODEPOINT))
-                {
-                    output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
-                }
-                else
-                {
-                    decoder->state = DECODED_2_OF_4;
-                    goto noreset;
-                }
-            }
-            else
-            {
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
-            }
-            break;
+            case DECODED_1_OF_4:
+               if (IS_UTF8_CONTINUATION_BYTE(b))
+               {
+                  /* UTF-8 4-byte sequences that are overlong encodings or encode
+                     out-of-range codepoints can be detected after 2 bytes. */
+                  decoder->bits |= (uint32_t)BOTTOM_6_BITS(b) << 12;
+                  if ((decoder->bits < FIRST_4_BYTE_UTF8_CODEPOINT) || (decoder->bits > MAX_CODEPOINT))
+                  {
+                     output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
+                  }
+                  else
+                  {
+                     decoder->state = DECODED_2_OF_4;
+                     goto noreset;
+                  }
+               }
+               else
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 1, 0);
+               }
+               break;
 
-        case DECODED_2_OF_4:
-            if (IS_UTF8_CONTINUATION_BYTE(b))
-            {
-                decoder->bits |= (uint32_t)BOTTOM_6_BITS(b) << 6;
-                decoder->state = DECODED_3_OF_4;
-                goto noreset;
-            }
-            else
-            {
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
-            }
-            break;
+            case DECODED_2_OF_4:
+               if (IS_UTF8_CONTINUATION_BYTE(b))
+               {
+                  decoder->bits |= (uint32_t)BOTTOM_6_BITS(b) << 6;
+                  decoder->state = DECODED_3_OF_4;
+                  goto noreset;
+               }
+               else
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
+               }
+               break;
 
-        case DECODED_3_OF_4:
-            if (IS_UTF8_CONTINUATION_BYTE(b))
-            {
-                output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, decoder->bits | BOTTOM_6_BITS(b));
-            }
-            else
-            {
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 3, 0);
-            }
-            break;
-        }
-        break;
+            case DECODED_3_OF_4:
+               if (IS_UTF8_CONTINUATION_BYTE(b))
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, decoder->bits | BOTTOM_6_BITS(b));
+               }
+               else
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 3, 0);
+               }
+               break;
+         }
+         break;
 
-    case JSON_UTF16LE:
-        /* When the input encoding is UTF-16, the decoded codepoint's bits are
-           recorded in the bottom 2 bytes of bits as they are decoded.
-           If those 2 bytes form a leading surrogate, the decoder treats the
-           surrogate pair as a single 4-byte sequence, shifts the leading
-           surrogate into the high 2 bytes of bits, and decodes the
-           trailing surrogate's bits in the bottom 2 bytes of bits. */
-        switch (decoder->state)
-        {
-        case DECODER_RESET:
-            decoder->bits = b;
-            decoder->state = DECODED_1_OF_2;
-            goto noreset;
+      case JSON_UTF16LE:
+         /* When the input encoding is UTF-16, the decoded codepoint's bits are
+            recorded in the bottom 2 bytes of bits as they are decoded.
+            If those 2 bytes form a leading surrogate, the decoder treats the
+            surrogate pair as a single 4-byte sequence, shifts the leading
+            surrogate into the high 2 bytes of bits, and decodes the
+            trailing surrogate's bits in the bottom 2 bytes of bits. */
+         switch (decoder->state)
+         {
+            case DECODER_RESET:
+               decoder->bits = b;
+               decoder->state = DECODED_1_OF_2;
+               goto noreset;
 
-        case DECODED_1_OF_2:
-            decoder->bits |= (uint32_t)b << 8;
-            if (IS_TRAILING_SURROGATE(decoder->bits))
-            {
-                /* A trailing surrogate cannot appear on its own. */
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 2, 0);
-            }
-            else if (IS_LEADING_SURROGATE(decoder->bits))
-            {
-                /* A leading surrogate implies a 4-byte surrogate pair. */
-                decoder->bits <<= 16;
-                decoder->state = DECODED_2_OF_4;
-                goto noreset;
-            }
-            else
-            {
-                output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 2, decoder->bits);
-            }
-            break;
+            case DECODED_1_OF_2:
+               decoder->bits |= (uint32_t)b << 8;
+               if (IS_TRAILING_SURROGATE(decoder->bits))
+               {
+                  /* A trailing surrogate cannot appear on its own. */
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 2, 0);
+               }
+               else if (IS_LEADING_SURROGATE(decoder->bits))
+               {
+                  /* A leading surrogate implies a 4-byte surrogate pair. */
+                  decoder->bits <<= 16;
+                  decoder->state = DECODED_2_OF_4;
+                  goto noreset;
+               }
+               else
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 2, decoder->bits);
+               }
+               break;
 
-        case DECODED_2_OF_4:
-            decoder->bits |= b;
-            decoder->state = DECODED_3_OF_4;
-            goto noreset;
+            case DECODED_2_OF_4:
+               decoder->bits |= b;
+               decoder->state = DECODED_3_OF_4;
+               goto noreset;
 
-        case DECODED_3_OF_4:
-            decoder->bits |= (uint32_t)b << 8;
-            if (!IS_TRAILING_SURROGATE(decoder->bits & 0xFFFF))
-            {
-                /* A leading surrogate must be followed by a trailing one.
-                   Treat the previous 3 bytes as an invalid 2-byte sequence
-                   followed by the first byte of a new sequence. */
-                decoder->bits &= 0xFF;
-                decoder->state = DECODED_1_OF_2;
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
-                goto noreset;
-            }
-            else
-            {
-                output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, CODEPOINT_FROM_SURROGATES(decoder->bits));
-            }
-            break;
-        }
-        break;
+            case DECODED_3_OF_4:
+               decoder->bits |= (uint32_t)b << 8;
+               if (!IS_TRAILING_SURROGATE(decoder->bits & 0xFFFF))
+               {
+                  /* A leading surrogate must be followed by a trailing one.
+                     Treat the previous 3 bytes as an invalid 2-byte sequence
+                     followed by the first byte of a new sequence. */
+                  decoder->bits &= 0xFF;
+                  decoder->state = DECODED_1_OF_2;
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
+                  goto noreset;
+               }
+               else
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, CODEPOINT_FROM_SURROGATES(decoder->bits));
+               }
+               break;
+         }
+         break;
 
-    case JSON_UTF16BE:
-        /* When the input encoding is UTF-16, the decoded codepoint's bits are
-           recorded in the bottom 2 bytes of bits as they are decoded.
-           If those 2 bytes form a leading surrogate, the decoder treats the
-           surrogate pair as a single 4-byte sequence, shifts the leading
-           surrogate into the high 2 bytes of bits, and decodes the
-           trailing surrogate's bits in the bottom 2 bytes of bits. */
-        switch (decoder->state)
-        {
-        case DECODER_RESET:
-            decoder->bits = (uint32_t)b << 8;
-            decoder->state = DECODED_1_OF_2;
-            goto noreset;
+      case JSON_UTF16BE:
+         /* When the input encoding is UTF-16, the decoded codepoint's bits are
+            recorded in the bottom 2 bytes of bits as they are decoded.
+            If those 2 bytes form a leading surrogate, the decoder treats the
+            surrogate pair as a single 4-byte sequence, shifts the leading
+            surrogate into the high 2 bytes of bits, and decodes the
+            trailing surrogate's bits in the bottom 2 bytes of bits. */
+         switch (decoder->state)
+         {
+            case DECODER_RESET:
+               decoder->bits = (uint32_t)b << 8;
+               decoder->state = DECODED_1_OF_2;
+               goto noreset;
 
-        case DECODED_1_OF_2:
-            decoder->bits |= b;
-            if (IS_TRAILING_SURROGATE(decoder->bits))
-            {
-                /* A trailing surrogate cannot appear on its own. */
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 2, 0);
-            }
-            else if (IS_LEADING_SURROGATE(decoder->bits))
-            {
-                /* A leading surrogate implies a 4-byte surrogate pair. */
-                decoder->bits <<= 16;
-                decoder->state = DECODED_2_OF_4;
-                goto noreset;
-            }
-            else
-            {
-                output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 2, decoder->bits);
-            }
-            break;
+            case DECODED_1_OF_2:
+               decoder->bits |= b;
+               if (IS_TRAILING_SURROGATE(decoder->bits))
+               {
+                  /* A trailing surrogate cannot appear on its own. */
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 2, 0);
+               }
+               else if (IS_LEADING_SURROGATE(decoder->bits))
+               {
+                  /* A leading surrogate implies a 4-byte surrogate pair. */
+                  decoder->bits <<= 16;
+                  decoder->state = DECODED_2_OF_4;
+                  goto noreset;
+               }
+               else
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 2, decoder->bits);
+               }
+               break;
 
-        case DECODED_2_OF_4:
-            decoder->bits |= (uint32_t)b << 8;
-            decoder->state = DECODED_3_OF_4;
-            goto noreset;
+            case DECODED_2_OF_4:
+               decoder->bits |= (uint32_t)b << 8;
+               decoder->state = DECODED_3_OF_4;
+               goto noreset;
 
-        case DECODED_3_OF_4:
-            decoder->bits |= b;
-            if (!IS_TRAILING_SURROGATE(decoder->bits & 0xFFFF))
-            {
-                /* A leading surrogate must be followed by a trailing one.
-                   Treat the previous 3 bytes as an invalid 2-byte sequence
-                   followed by the first byte of a new sequence. */
-                decoder->bits &= 0xFF00;
-                decoder->state = DECODED_1_OF_2;
-                output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
-                goto noreset;
-            }
-            else
-            {
-                output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, CODEPOINT_FROM_SURROGATES(decoder->bits));
-            }
-            break;
-        }
-        break;
+            case DECODED_3_OF_4:
+               decoder->bits |= b;
+               if (!IS_TRAILING_SURROGATE(decoder->bits & 0xFFFF))
+               {
+                  /* A leading surrogate must be followed by a trailing one.
+                     Treat the previous 3 bytes as an invalid 2-byte sequence
+                     followed by the first byte of a new sequence. */
+                  decoder->bits &= 0xFF00;
+                  decoder->state = DECODED_1_OF_2;
+                  output = DECODER_OUTPUT(SEQUENCE_INVALID_EXCLUSIVE, 2, 0);
+                  goto noreset;
+               }
+               else
+               {
+                  output = DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, CODEPOINT_FROM_SURROGATES(decoder->bits));
+               }
+               break;
+         }
+         break;
 
-    case JSON_UTF32LE:
-        /* When the input encoding is UTF-32, the decoded codepoint's bits are
-           recorded in bits as they are decoded. */
-        switch (decoder->state)
-        {
-        case DECODER_RESET:
-            decoder->state = DECODED_1_OF_4;
-            decoder->bits = (uint32_t)b;
-            goto noreset;
+      case JSON_UTF32LE:
+         /* When the input encoding is UTF-32, the decoded codepoint's bits are
+            recorded in bits as they are decoded. */
+         switch (decoder->state)
+         {
+            case DECODER_RESET:
+               decoder->state = DECODED_1_OF_4;
+               decoder->bits = (uint32_t)b;
+               goto noreset;
 
-        case DECODED_1_OF_4:
-            decoder->state = DECODED_2_OF_4;
-            decoder->bits |= (uint32_t)b << 8;
-            goto noreset;
+            case DECODED_1_OF_4:
+               decoder->state = DECODED_2_OF_4;
+               decoder->bits |= (uint32_t)b << 8;
+               goto noreset;
 
-        case DECODED_2_OF_4:
-            decoder->state = DECODED_3_OF_4;
-            decoder->bits |= (uint32_t)b << 16;
-            goto noreset;
+            case DECODED_2_OF_4:
+               decoder->state = DECODED_3_OF_4;
+               decoder->bits |= (uint32_t)b << 16;
+               goto noreset;
 
-        case DECODED_3_OF_4:
-            decoder->bits |= (uint32_t)b << 24;
-            output = (IS_SURROGATE(decoder->bits) || (decoder->bits > MAX_CODEPOINT))
-                ? DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 4, 0)
-                : DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, decoder->bits);
-            break;
-        }
-        break;
+            case DECODED_3_OF_4:
+               decoder->bits |= (uint32_t)b << 24;
+               output = (IS_SURROGATE(decoder->bits) || (decoder->bits > MAX_CODEPOINT))
+                  ? DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 4, 0)
+                  : DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, decoder->bits);
+               break;
+         }
+         break;
 
-    case JSON_UTF32BE:
-        /* When the input encoding is UTF-32, the decoded codepoint's bits are
-           recorded in bits as they are decoded. */
-        switch (decoder->state)
-        {
-        case DECODER_RESET:
-            decoder->state = DECODED_1_OF_4;
-            decoder->bits = (uint32_t)b << 24;
-            goto noreset;
+      case JSON_UTF32BE:
+         /* When the input encoding is UTF-32, the decoded codepoint's bits are
+            recorded in bits as they are decoded. */
+         switch (decoder->state)
+         {
+            case DECODER_RESET:
+               decoder->state = DECODED_1_OF_4;
+               decoder->bits = (uint32_t)b << 24;
+               goto noreset;
 
-        case DECODED_1_OF_4:
-            decoder->state = DECODED_2_OF_4;
-            decoder->bits |= (uint32_t)b << 16;
-            goto noreset;
+            case DECODED_1_OF_4:
+               decoder->state = DECODED_2_OF_4;
+               decoder->bits |= (uint32_t)b << 16;
+               goto noreset;
 
-        case DECODED_2_OF_4:
-            decoder->state = DECODED_3_OF_4;
-            decoder->bits |= (uint32_t)b << 8;
-            goto noreset;
+            case DECODED_2_OF_4:
+               decoder->state = DECODED_3_OF_4;
+               decoder->bits |= (uint32_t)b << 8;
+               goto noreset;
 
-        case DECODED_3_OF_4:
-            decoder->bits |= b;
-            output = (IS_SURROGATE(decoder->bits) || (decoder->bits > MAX_CODEPOINT))
-                ? DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 4, 0)
-                : DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, decoder->bits);
-            break;
-        }
-        break;
-    }
+            case DECODED_3_OF_4:
+               decoder->bits |= b;
+               output = (IS_SURROGATE(decoder->bits) || (decoder->bits > MAX_CODEPOINT))
+                  ? DECODER_OUTPUT(SEQUENCE_INVALID_INCLUSIVE, 4, 0)
+                  : DECODER_OUTPUT(SEQUENCE_COMPLETE, 4, decoder->bits);
+               break;
+         }
+         break;
+   }
 
-    /* Reset the decoder for the next sequence. */
-    Decoder_Reset(decoder);
+   /* Reset the decoder for the next sequence. */
+   Decoder_Reset(decoder);
 
 noreset:
-    return output;
+   return output;
 }
 
 /******************** Unicode Encoder ********************/
 
 /* This function makes the following assumptions about its input:
 
-     1. The c argument is a valid codepoint (U+0000 - U+10FFFF).
-     2. The encoding argument is not JSON_UnknownEncoding.
-     3. The pBytes argument points to an array of at least 4 bytes.
-*/
+   1. The c argument is a valid codepoint (U+0000 - U+10FFFF).
+   2. The encoding argument is not JSON_UnknownEncoding.
+   3. The pBytes argument points to an array of at least 4 bytes.
+   */
 static size_t EncodeCodepoint(Codepoint c, Encoding encoding, byte* pBytes)
 {
-    size_t length = 0;
-    switch (encoding)
-    {
-    case JSON_UTF8:
-        if (c < FIRST_2_BYTE_UTF8_CODEPOINT)
-        {
+   size_t length = 0;
+   switch (encoding)
+   {
+      case JSON_UTF8:
+         if (c < FIRST_2_BYTE_UTF8_CODEPOINT)
+         {
             pBytes[0] = (byte)c;
             length = 1;
-        }
-        else if (c < FIRST_3_BYTE_UTF8_CODEPOINT)
-        {
+         }
+         else if (c < FIRST_3_BYTE_UTF8_CODEPOINT)
+         {
             pBytes[0] = (byte)(0xC0 | (c >> 6));
             pBytes[1] = (byte)(0x80 | BOTTOM_6_BITS(c));
             length = 2;
-        }
-        else if (c < FIRST_4_BYTE_UTF8_CODEPOINT)
-        {
+         }
+         else if (c < FIRST_4_BYTE_UTF8_CODEPOINT)
+         {
             pBytes[0] = (byte)(0xE0 | (c >> 12));
             pBytes[1] = (byte)(0x80 | BOTTOM_6_BITS(c >> 6));
             pBytes[2] = (byte)(0x80 | BOTTOM_6_BITS(c));
             length = 3;
-        }
-        else
-        {
+         }
+         else
+         {
             pBytes[0] = (byte)(0xF0 | (c >> 18));
             pBytes[1] = (byte)(0x80 | BOTTOM_6_BITS(c >> 12));
             pBytes[2] = (byte)(0x80 | BOTTOM_6_BITS(c >> 6));
             pBytes[3] = (byte)(0x80 | BOTTOM_6_BITS(c));
             length = 4;
-        }
-        break;
+         }
+         break;
 
-    case JSON_UTF16LE:
-        if (c < FIRST_NON_BMP_CODEPOINT)
-        {
+      case JSON_UTF16LE:
+         if (c < FIRST_NON_BMP_CODEPOINT)
+         {
             pBytes[0] = (byte)(c);
             pBytes[1] = (byte)(c >> 8);
             length = 2;
-        }
-        else
-        {
+         }
+         else
+         {
             uint32_t surrogates = SURROGATES_FROM_CODEPOINT(c);
 
             /* Leading surrogate. */
@@ -608,18 +608,18 @@ static size_t EncodeCodepoint(Codepoint c, Encoding encoding, byte* pBytes)
             pBytes[2] = (byte)(surrogates);
             pBytes[3] = (byte)(surrogates >> 8);
             length = 4;
-        }
-        break;
+         }
+         break;
 
-    case JSON_UTF16BE:
-        if (c < FIRST_NON_BMP_CODEPOINT)
-        {
+      case JSON_UTF16BE:
+         if (c < FIRST_NON_BMP_CODEPOINT)
+         {
             pBytes[1] = (byte)(c);
             pBytes[0] = (byte)(c >> 8);
             length = 2;
-        }
-        else
-        {
+         }
+         else
+         {
             /* The codepoint requires a surrogate pair in UTF-16. */
             uint32_t surrogates = SURROGATES_FROM_CODEPOINT(c);
 
@@ -631,26 +631,26 @@ static size_t EncodeCodepoint(Codepoint c, Encoding encoding, byte* pBytes)
             pBytes[3] = (byte)(surrogates);
             pBytes[2] = (byte)(surrogates >> 8);
             length = 4;
-        }
-        break;
+         }
+         break;
 
-    case JSON_UTF32LE:
-        pBytes[0] = (byte)(c);
-        pBytes[1] = (byte)(c >> 8);
-        pBytes[2] = (byte)(c >> 16);
-        pBytes[3] = (byte)(c >> 24);
-        length = 4;
-        break;
+      case JSON_UTF32LE:
+         pBytes[0] = (byte)(c);
+         pBytes[1] = (byte)(c >> 8);
+         pBytes[2] = (byte)(c >> 16);
+         pBytes[3] = (byte)(c >> 24);
+         length = 4;
+         break;
 
-    case JSON_UTF32BE:
-        pBytes[3] = (byte)(c);
-        pBytes[2] = (byte)(c >> 8);
-        pBytes[1] = (byte)(c >> 16);
-        pBytes[0] = (byte)(c >> 24);
-        length = 4;
-        break;
-    }
-    return length;
+      case JSON_UTF32BE:
+         pBytes[3] = (byte)(c);
+         pBytes[2] = (byte)(c >> 8);
+         pBytes[1] = (byte)(c >> 16);
+         pBytes[0] = (byte)(c >> 24);
+         length = 4;
+         break;
+   }
+   return length;
 }
 
 /******************** JSON Lexer States ********************/
@@ -712,7 +712,7 @@ typedef byte LexerState;
 
    We implement a simple LL(1) parser based on this grammar, with events
    emitted when certain non-terminals are replaced.
-*/
+   */
 
 /* Mutually-exclusive grammar tokens and non-terminals. The values are defined
    so that the bottom 4 bits of a value can be used as an index into the
@@ -747,10 +747,10 @@ typedef byte Symbol;
 /* Grammarian data. */
 typedef struct tag_GrammarianData
 {
-    Symbol* pStack; /* initially set to defaultStack */
-    size_t  stackSize;
-    size_t  stackUsed;
-    Symbol  defaultStack[DEFAULT_SYMBOL_STACK_SIZE];
+   Symbol* pStack; /* initially set to defaultStack */
+   size_t  stackSize;
+   size_t  stackUsed;
+   Symbol  defaultStack[DEFAULT_SYMBOL_STACK_SIZE];
 } GrammarianData;
 typedef GrammarianData* Grammarian;
 
@@ -780,12 +780,12 @@ typedef byte GrammarEvent;
 
 /* The bits of GrammarianOutput are layed out as follows:
 
-     -rreeeee
+   -rreeeee
 
-     - = unused (1 bit)
-     r = result code (2 bits)
-     e = event (5 bits)
- */
+   - = unused (1 bit)
+   r = result code (2 bits)
+   e = event (5 bits)
+   */
 #define GRAMMARIAN_OUTPUT(r, e)   (GrammarianOutput)(((GrammarianResultCode)(r) << 5) | (GrammarEvent)(e))
 #define GRAMMARIAN_RESULT_CODE(o) (GrammarianResultCode)((GrammarianOutput)(o) >> 5)
 #define GRAMMARIAN_EVENT(o)       (GrammarEvent)((GrammarianOutput)(o) & 0x1F)
@@ -794,163 +794,156 @@ typedef byte GrammarianOutput;
 /* Grammar rule used by the grammarian to process a token. */
 typedef struct tag_GrammarRule
 {
-    Symbol       symbolToPush1;
-    Symbol       symbolToPush2;
-    byte         reprocess;
-    GrammarEvent emit;
+   Symbol       symbolToPush1;
+   Symbol       symbolToPush2;
+   byte         reprocess;
+   GrammarEvent emit;
 } GrammarRule;
 
 /* Grammarian functions. */
 
 static void Grammarian_Reset(Grammarian grammarian, int isInitialized)
 {
-    /* When we reset the grammarian, we keep the symbol stack that has
-       already been allocated, if any. If the client wants to reclaim the
-       memory used by the that buffer, he needs to free the grammarian
-       and create a new one. */
-    if (!isInitialized)
-    {
-        grammarian->pStack = grammarian->defaultStack;
-        grammarian->stackSize = sizeof(grammarian->defaultStack);
-    }
+   /* When we reset the grammarian, we keep the symbol stack that has
+      already been allocated, if any. If the client wants to reclaim the
+      memory used by the that buffer, he needs to free the grammarian
+      and create a new one. */
+   if (!isInitialized)
+   {
+      grammarian->pStack = grammarian->defaultStack;
+      grammarian->stackSize = sizeof(grammarian->defaultStack);
+   }
 
-    /* The grammarian always starts with NT_VALUE on the symbol stack. */
-    grammarian->pStack[0] = NT_VALUE;
-    grammarian->stackUsed = 1;
+   /* The grammarian always starts with NT_VALUE on the symbol stack. */
+   grammarian->pStack[0] = NT_VALUE;
+   grammarian->stackUsed = 1;
 }
 
-static void Grammarian_FreeAllocations(Grammarian grammarian, const JSON_MemorySuite* pMemorySuite)
+static void Grammarian_FreeAllocations(Grammarian grammarian,
+      const JSON_MemorySuite* pMemorySuite)
 {
-    if (grammarian->pStack != grammarian->defaultStack)
-    {
-        pMemorySuite->free(pMemorySuite->userData, grammarian->pStack);
-    }
+   if (grammarian->pStack != grammarian->defaultStack)
+      pMemorySuite->free(pMemorySuite->userData, grammarian->pStack);
 }
 
 static int Grammarian_FinishedDocument(Grammarian grammarian)
 {
-    return !grammarian->stackUsed;
+   return !grammarian->stackUsed;
 }
 
-static GrammarianOutput Grammarian_ProcessToken(Grammarian grammarian, Symbol token, const JSON_MemorySuite* pMemorySuite)
+static GrammarianOutput Grammarian_ProcessToken(Grammarian grammarian,
+      Symbol token, const JSON_MemorySuite* pMemorySuite)
 {
-    /* The order and number of the rows and columns in this table must
-       match the defined token and non-terminal symbol values.
+   /* The order and number of the rows and columns in this table must
+      match the defined token and non-terminal symbol values.
 
-       The row index is the incoming token's Symbol value.
+      The row index is the incoming token's Symbol value.
 
-       The column index is the bottom 4 bits of Symbol value of
-       the non-terminal at the top of the processing stack.
-       Since non-terminal Symbol values start at 0x10, taking
-       the bottom 4 bits yields a 0-based index. */
-    static const byte ruleLookup[15][7] =
-    {
-        /*             V     MS    M     MM    IS    I     MI  */
-        /*  ----  */ { 0,    0,    0,    0,    0,    0,    0  },
-        /*  null  */ { 1,    0,    0,    0,    13,   15,   0  },
-        /*  true  */ { 2,    0,    0,    0,    13,   15,   0  },
-        /* false  */ { 2,    0,    0,    0,    13,   15,   0  },
-        /* string */ { 3,    8,    10,   0,    13,   15,   0  },
-        /* number */ { 4,    0,    0,    0,    13,   15,   0  },
-        /*  NaN   */ { 5,    0,    0,    0,    13,   15,   0  },
-        /*  Inf   */ { 5,    0,    0,    0,    13,   15,   0  },
-        /* -Inf   */ { 5,    0,    0,    0,    13,   15,   0  },
-        /*   {    */ { 6,    0,    0,    0,    13,   15,   0  },
-        /*   }    */ { 0,    9,    0,    12,   0,    0,    0  },
-        /*   [    */ { 7,    0,    0,    0,    13,   15,   0  },
-        /*   ]    */ { 0,    0,    0,    0,    14,   0,    17 },
-        /*   :    */ { 0,    0,    0,    0,    0,    0,    0  },
-        /*   ,    */ { 0,    0,    0,    11,   0,    0,    16 }
-    };
+      The column index is the bottom 4 bits of Symbol value of
+      the non-terminal at the top of the processing stack.
+      Since non-terminal Symbol values start at 0x10, taking
+      the bottom 4 bits yields a 0-based index. */
+   static const byte ruleLookup[15][7] =
+   {
+      /*             V     MS    M     MM    IS    I     MI  */
+      /*  ----  */ { 0,    0,    0,    0,    0,    0,    0  },
+      /*  null  */ { 1,    0,    0,    0,    13,   15,   0  },
+      /*  true  */ { 2,    0,    0,    0,    13,   15,   0  },
+      /* false  */ { 2,    0,    0,    0,    13,   15,   0  },
+      /* string */ { 3,    8,    10,   0,    13,   15,   0  },
+      /* number */ { 4,    0,    0,    0,    13,   15,   0  },
+      /*  NaN   */ { 5,    0,    0,    0,    13,   15,   0  },
+      /*  Inf   */ { 5,    0,    0,    0,    13,   15,   0  },
+      /* -Inf   */ { 5,    0,    0,    0,    13,   15,   0  },
+      /*   {    */ { 6,    0,    0,    0,    13,   15,   0  },
+      /*   }    */ { 0,    9,    0,    12,   0,    0,    0  },
+      /*   [    */ { 7,    0,    0,    0,    13,   15,   0  },
+      /*   ]    */ { 0,    0,    0,    0,    14,   0,    17 },
+      /*   :    */ { 0,    0,    0,    0,    0,    0,    0  },
+      /*   ,    */ { 0,    0,    0,    11,   0,    0,    16 }
+   };
 
-    static const GrammarRule rules[17] =
-    {
-        /* 1.  */ { T_NONE,          T_NONE,      0, EMIT_NULL           },
-        /* 2.  */ { T_NONE,          T_NONE,      0, EMIT_BOOLEAN        },
-        /* 3.  */ { T_NONE,          T_NONE,      0, EMIT_STRING         },
-        /* 4.  */ { T_NONE,          T_NONE,      0, EMIT_NUMBER         },
-        /* 5.  */ { T_NONE,          T_NONE,      0, EMIT_SPECIAL_NUMBER },
-        /* 6.  */ { T_RIGHT_CURLY,   NT_MEMBERS,  0, EMIT_START_OBJECT   },
-        /* 7.  */ { T_RIGHT_SQUARE,  NT_ITEMS,    0, EMIT_START_ARRAY    },
-        /* 8.  */ { NT_MORE_MEMBERS, NT_MEMBER,   1, EMIT_NOTHING        },
-        /* 9.  */ { T_NONE,          T_NONE,      1, EMIT_END_OBJECT     },
-        /* 10. */ { NT_VALUE,        T_COLON,     0, EMIT_OBJECT_MEMBER  },
-        /* 11. */ { NT_MORE_MEMBERS, NT_MEMBER,   0, EMIT_NOTHING        },
-        /* 12. */ { T_NONE,          T_NONE,      1, EMIT_END_OBJECT     },
-        /* 13. */ { NT_MORE_ITEMS,   NT_ITEM,     1, EMIT_NOTHING        },
-        /* 14. */ { T_NONE,          T_NONE,      1, EMIT_END_ARRAY      },
-        /* 15. */ { NT_VALUE,        T_NONE,      1, EMIT_ARRAY_ITEM     },
-        /* 16. */ { NT_MORE_ITEMS,   NT_ITEM,     0, EMIT_NOTHING        },
-        /* 17. */ { T_NONE,          T_NONE,      1, EMIT_END_ARRAY      }
-    };
+   static const GrammarRule rules[17] =
+   {
+      /* 1.  */ { T_NONE,          T_NONE,      0, EMIT_NULL           },
+      /* 2.  */ { T_NONE,          T_NONE,      0, EMIT_BOOLEAN        },
+      /* 3.  */ { T_NONE,          T_NONE,      0, EMIT_STRING         },
+      /* 4.  */ { T_NONE,          T_NONE,      0, EMIT_NUMBER         },
+      /* 5.  */ { T_NONE,          T_NONE,      0, EMIT_SPECIAL_NUMBER },
+      /* 6.  */ { T_RIGHT_CURLY,   NT_MEMBERS,  0, EMIT_START_OBJECT   },
+      /* 7.  */ { T_RIGHT_SQUARE,  NT_ITEMS,    0, EMIT_START_ARRAY    },
+      /* 8.  */ { NT_MORE_MEMBERS, NT_MEMBER,   1, EMIT_NOTHING        },
+      /* 9.  */ { T_NONE,          T_NONE,      1, EMIT_END_OBJECT     },
+      /* 10. */ { NT_VALUE,        T_COLON,     0, EMIT_OBJECT_MEMBER  },
+      /* 11. */ { NT_MORE_MEMBERS, NT_MEMBER,   0, EMIT_NOTHING        },
+      /* 12. */ { T_NONE,          T_NONE,      1, EMIT_END_OBJECT     },
+      /* 13. */ { NT_MORE_ITEMS,   NT_ITEM,     1, EMIT_NOTHING        },
+      /* 14. */ { T_NONE,          T_NONE,      1, EMIT_END_ARRAY      },
+      /* 15. */ { NT_VALUE,        T_NONE,      1, EMIT_ARRAY_ITEM     },
+      /* 16. */ { NT_MORE_ITEMS,   NT_ITEM,     0, EMIT_NOTHING        },
+      /* 17. */ { T_NONE,          T_NONE,      1, EMIT_END_ARRAY      }
+   };
 
-    GrammarEvent emit = EMIT_NOTHING;
+   GrammarEvent emit = EMIT_NOTHING;
 
-    /* If the stack is empty, no more tokens were expected. */
-    if (Grammarian_FinishedDocument(grammarian))
-    {
-        return GRAMMARIAN_OUTPUT(REJECTED_TOKEN, EMIT_NOTHING);
-    }
+   /* If the stack is empty, no more tokens were expected. */
+   if (Grammarian_FinishedDocument(grammarian))
+      return GRAMMARIAN_OUTPUT(REJECTED_TOKEN, EMIT_NOTHING);
 
-    for (;;)
-    {
-        Symbol topSymbol = grammarian->pStack[grammarian->stackUsed - 1];
-        if (IS_TOKEN(topSymbol))
-        {
-            if (topSymbol != token)
-            {
-                return GRAMMARIAN_OUTPUT(REJECTED_TOKEN, EMIT_NOTHING);
-            }
+   for (;;)
+   {
+      Symbol topSymbol = grammarian->pStack[grammarian->stackUsed - 1];
+      if (IS_TOKEN(topSymbol))
+      {
+         if (topSymbol != token)
+            return GRAMMARIAN_OUTPUT(REJECTED_TOKEN, EMIT_NOTHING);
+         grammarian->stackUsed--;
+         break;
+      }
+      else
+      {
+         const GrammarRule* pRule = NULL;
+         byte ruleNumber          = ruleLookup[token][BOTTOM_4_BITS(topSymbol)];
+
+         if (ruleNumber == 0)
+            return GRAMMARIAN_OUTPUT(REJECTED_TOKEN, EMIT_NOTHING);
+
+         pRule = &rules[ruleNumber - 1];
+
+         /* The rule removes the top symbol and does not replace it. */
+         if (pRule->symbolToPush1 == T_NONE)
             grammarian->stackUsed--;
-            break;
-        }
-        else
-        {
-            byte ruleNumber = ruleLookup[token][BOTTOM_4_BITS(topSymbol)];
-            if (ruleNumber == 0)
+         else
+         {
+            /* The rule replaces the top symbol with 1 or 2 symbols. */
+            grammarian->pStack[grammarian->stackUsed - 1] = pRule->symbolToPush1;
+            if (pRule->symbolToPush2 != T_NONE)
             {
-                return GRAMMARIAN_OUTPUT(REJECTED_TOKEN, EMIT_NOTHING);
-            }
-            else
-            {
-                const GrammarRule* pRule = &rules[ruleNumber - 1];
-                if (pRule->symbolToPush1 == T_NONE)
-                {
-                    /* The rule removes the top symbol and does not replace it. */
-                    grammarian->stackUsed--;
-                }
-                else
-                {
-                    /* The rule replaces the top symbol with 1 or 2 symbols. */
-                    grammarian->pStack[grammarian->stackUsed - 1] = pRule->symbolToPush1;
-                    if (pRule->symbolToPush2 != T_NONE)
-                    {
-                        /* The rule replaces the top symbol with 2 symbols.
-                           Make sure the stack has room for the second one. */
-                        if (grammarian->stackUsed == grammarian->stackSize)
-                        {
-                            Symbol* pBiggerStack = DoubleBuffer(pMemorySuite, grammarian->defaultStack, grammarian->pStack, grammarian->stackSize);
-                            if (!pBiggerStack)
-                            {
-                                return GRAMMARIAN_OUTPUT(SYMBOL_STACK_FULL, EMIT_NOTHING);
-                            }
-                            grammarian->pStack = pBiggerStack;
-                            grammarian->stackSize *= 2;
-                        }
-                        grammarian->pStack[grammarian->stackUsed] = pRule->symbolToPush2;
-                        grammarian->stackUsed++;
-                    }
-                }
-                emit |= pRule->emit;
-                if (!pRule->reprocess)
-                {
-                    break;
-                }
-            }
-        }
-    }
+               /* The rule replaces the top symbol with 2 symbols.
+                  Make sure the stack has room for the second one. */
+               if (grammarian->stackUsed == grammarian->stackSize)
+               {
+                  Symbol* pBiggerStack = DoubleBuffer(pMemorySuite,
+                        grammarian->defaultStack, grammarian->pStack,
+                        grammarian->stackSize);
 
-    return GRAMMARIAN_OUTPUT(ACCEPTED_TOKEN, emit);
+                  if (!pBiggerStack)
+                     return GRAMMARIAN_OUTPUT(SYMBOL_STACK_FULL, EMIT_NOTHING);
+
+                  grammarian->pStack = pBiggerStack;
+                  grammarian->stackSize *= 2;
+               }
+               grammarian->pStack[grammarian->stackUsed] = pRule->symbolToPush2;
+               grammarian->stackUsed++;
+            }
+         }
+         emit |= pRule->emit;
+         if (!pRule->reprocess)
+            break;
+      }
+   }
+
+   return GRAMMARIAN_OUTPUT(ACCEPTED_TOKEN, emit);
 }
 
 /******************** JSON Parser ********************/
@@ -986,9 +979,9 @@ typedef byte ParserFlags;
    terminated. */
 typedef struct tag_MemberName
 {
-    struct tag_MemberName* pNextName;
-    size_t                 length;
-    byte                   pBytes[1]; /* variable-size buffer */
+   struct tag_MemberName* pNextName;
+   size_t                 length;
+   byte                   pBytes[1]; /* variable-size buffer */
 } MemberName;
 
 /* An object's list of member names, and a pointer to the object's
@@ -996,462 +989,448 @@ typedef struct tag_MemberName
    do not have named items, they do not need to be recorded in the stack. */
 typedef struct tag_MemberNames
 {
-    struct tag_MemberNames* pAncestor;
-    MemberName*             pFirstName;
+   struct tag_MemberNames* pAncestor;
+   MemberName*             pFirstName;
 } MemberNames;
 
 /* A parser instance. */
 struct JSON_Parser_Data
 {
-    JSON_MemorySuite                    memorySuite;
-    void*                               userData;
-    ParserState                         state;
-    ParserFlags                         flags;
-    Encoding                            inputEncoding;
-    Encoding                            stringEncoding;
-    Encoding                            numberEncoding;
-    Symbol                              token;
-    TokenAttributes                     tokenAttributes;
-    Error                               error;
-    byte                                errorOffset;
-    LexerState                          lexerState;
-    uint32_t                            lexerBits;
-    size_t                              codepointLocationByte;
-    size_t                              codepointLocationLine;
-    size_t                              codepointLocationColumn;
-    size_t                              tokenLocationByte;
-    size_t                              tokenLocationLine;
-    size_t                              tokenLocationColumn;
-    size_t                              depth;
-    byte*                               pTokenBytes;
-    size_t                              tokenBytesLength;
-    size_t                              tokenBytesUsed;
-    size_t                              maxStringLength;
-    size_t                              maxNumberLength;
-    MemberNames*                        pMemberNames;
-    DecoderData                         decoderData;
-    GrammarianData                      grammarianData;
-    JSON_Parser_EncodingDetectedHandler encodingDetectedHandler;
-    JSON_Parser_NullHandler             nullHandler;
-    JSON_Parser_BooleanHandler          booleanHandler;
-    JSON_Parser_StringHandler           stringHandler;
-    JSON_Parser_NumberHandler           numberHandler;
-    JSON_Parser_SpecialNumberHandler    specialNumberHandler;
-    JSON_Parser_StartObjectHandler      startObjectHandler;
-    JSON_Parser_EndObjectHandler        endObjectHandler;
-    JSON_Parser_ObjectMemberHandler     objectMemberHandler;
-    JSON_Parser_StartArrayHandler       startArrayHandler;
-    JSON_Parser_EndArrayHandler         endArrayHandler;
-    JSON_Parser_ArrayItemHandler        arrayItemHandler;
-    byte                                defaultTokenBytes[DEFAULT_TOKEN_BYTES_LENGTH];
+   JSON_MemorySuite                    memorySuite;
+   void*                               userData;
+   ParserState                         state;
+   ParserFlags                         flags;
+   Encoding                            inputEncoding;
+   Encoding                            stringEncoding;
+   Encoding                            numberEncoding;
+   Symbol                              token;
+   TokenAttributes                     tokenAttributes;
+   Error                               error;
+   byte                                errorOffset;
+   LexerState                          lexerState;
+   uint32_t                            lexerBits;
+   size_t                              codepointLocationByte;
+   size_t                              codepointLocationLine;
+   size_t                              codepointLocationColumn;
+   size_t                              tokenLocationByte;
+   size_t                              tokenLocationLine;
+   size_t                              tokenLocationColumn;
+   size_t                              depth;
+   byte*                               pTokenBytes;
+   size_t                              tokenBytesLength;
+   size_t                              tokenBytesUsed;
+   size_t                              maxStringLength;
+   size_t                              maxNumberLength;
+   MemberNames*                        pMemberNames;
+   DecoderData                         decoderData;
+   GrammarianData                      grammarianData;
+   JSON_Parser_EncodingDetectedHandler encodingDetectedHandler;
+   JSON_Parser_NullHandler             nullHandler;
+   JSON_Parser_BooleanHandler          booleanHandler;
+   JSON_Parser_StringHandler           stringHandler;
+   JSON_Parser_NumberHandler           numberHandler;
+   JSON_Parser_SpecialNumberHandler    specialNumberHandler;
+   JSON_Parser_StartObjectHandler      startObjectHandler;
+   JSON_Parser_EndObjectHandler        endObjectHandler;
+   JSON_Parser_ObjectMemberHandler     objectMemberHandler;
+   JSON_Parser_StartArrayHandler       startArrayHandler;
+   JSON_Parser_EndArrayHandler         endArrayHandler;
+   JSON_Parser_ArrayItemHandler        arrayItemHandler;
+   byte                                defaultTokenBytes[DEFAULT_TOKEN_BYTES_LENGTH];
 };
 
 /* Parser internal functions. */
 
 static void JSON_Parser_SetErrorAtCodepoint(JSON_Parser parser, Error error)
 {
-    parser->error = error;
+   parser->error = error;
 }
 
-static void JSON_Parser_SetErrorAtStringEscapeSequenceStart(JSON_Parser parser, Error error, int codepointsAgo)
+static void JSON_Parser_SetErrorAtStringEscapeSequenceStart(
+      JSON_Parser parser, Error error, int codepointsAgo)
 {
-    /* Note that backtracking from the current codepoint requires us to make
-       three assumptions, which are always valid in the context of a string
-       escape sequence:
+   /* Note that backtracking from the current codepoint requires us to make
+      three assumptions, which are always valid in the context of a string
+      escape sequence:
 
-         1. The input encoding is not JSON_UnknownEncoding.
+      1. The input encoding is not JSON_UnknownEncoding.
 
-         2 The codepoints we are backing up across are all in the range
-            U+0000 - U+007F, aka ASCII, so we can assume the number of
-            bytes comprising them based on the input encoding.
+      2 The codepoints we are backing up across are all in the range
+      U+0000 - U+007F, aka ASCII, so we can assume the number of
+      bytes comprising them based on the input encoding.
 
-         3. The codepoints we are backing up across do not include any
-            line breaks, so we can assume that the line number stays the
-            same and the column number can simply be decremented.
-    */
-    parser->error = error;
-    parser->errorOffset = (byte)codepointsAgo;
+      3. The codepoints we are backing up across do not include any
+      line breaks, so we can assume that the line number stays the
+      same and the column number can simply be decremented.
+      */
+   parser->error = error;
+   parser->errorOffset = (byte)codepointsAgo;
 }
 
 static void JSON_Parser_SetErrorAtToken(JSON_Parser parser, Error error)
 {
-    parser->error = error;
-    parser->errorOffset = ERROR_LOCATION_IS_TOKEN_START;
+   parser->error = error;
+   parser->errorOffset = ERROR_LOCATION_IS_TOKEN_START;
 }
 
 static JSON_Status JSON_Parser_PushMemberNameList(JSON_Parser parser)
 {
-    MemberNames* pNames = (MemberNames*)parser->memorySuite.realloc(parser->memorySuite.userData, NULL, sizeof(MemberNames));
-    if (!pNames)
-    {
-        JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
-        return JSON_Failure;
-    }
-    pNames->pAncestor = parser->pMemberNames;
-    pNames->pFirstName = NULL;
-    parser->pMemberNames = pNames;
-    return JSON_Success;
+   MemberNames* pNames = (MemberNames*)parser->memorySuite.realloc(
+         parser->memorySuite.userData, NULL, sizeof(MemberNames));
+
+   if (!pNames)
+   {
+      JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
+      return JSON_Failure;
+   }
+
+   pNames->pAncestor    = parser->pMemberNames;
+   pNames->pFirstName   = NULL;
+   parser->pMemberNames = pNames;
+   return JSON_Success;
 }
 
 static void JSON_Parser_PopMemberNameList(JSON_Parser parser)
 {
-    MemberNames* pAncestor = parser->pMemberNames->pAncestor;
-    while (parser->pMemberNames->pFirstName)
-    {
-        MemberName* pNextName = parser->pMemberNames->pFirstName->pNextName;
-        parser->memorySuite.free(parser->memorySuite.userData, parser->pMemberNames->pFirstName);
-        parser->pMemberNames->pFirstName = pNextName;
-    }
-    parser->memorySuite.free(parser->memorySuite.userData, parser->pMemberNames);
-    parser->pMemberNames = pAncestor;
+   MemberNames* pAncestor = parser->pMemberNames->pAncestor;
+   while (parser->pMemberNames->pFirstName)
+   {
+      MemberName* pNextName = parser->pMemberNames->pFirstName->pNextName;
+      parser->memorySuite.free(parser->memorySuite.userData, parser->pMemberNames->pFirstName);
+      parser->pMemberNames->pFirstName = pNextName;
+   }
+   parser->memorySuite.free(parser->memorySuite.userData, parser->pMemberNames);
+   parser->pMemberNames = pAncestor;
 }
 
 static JSON_Status JSON_Parser_StartContainer(JSON_Parser parser, int isObject)
 {
-    if (isObject && GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS) &&
-        !JSON_Parser_PushMemberNameList(parser))
-    {
-        return JSON_Failure;
-    }
-    parser->depth++;
-    return JSON_Success;
+   if (isObject && GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS) &&
+         !JSON_Parser_PushMemberNameList(parser))
+   {
+      return JSON_Failure;
+   }
+   parser->depth++;
+   return JSON_Success;
 }
 
 static void JSON_Parser_EndContainer(JSON_Parser parser, int isObject)
 {
-    parser->depth--;
-    if (isObject && GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS))
-    {
-        JSON_Parser_PopMemberNameList(parser);
-    }
+   parser->depth--;
+   if (isObject && GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS))
+   {
+      JSON_Parser_PopMemberNameList(parser);
+   }
 }
 
 static JSON_Status JSON_Parser_AddMemberNameToList(JSON_Parser parser)
 {
-    if (GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS))
-    {
-        MemberName* pName;
-        for (pName = parser->pMemberNames->pFirstName; pName; pName = pName->pNextName)
-        {
-            if (pName->length == parser->tokenBytesUsed && !memcmp(pName->pBytes, parser->pTokenBytes, pName->length))
-            {
-                JSON_Parser_SetErrorAtToken(parser, JSON_Error_DuplicateObjectMember);
-                return JSON_Failure;
-            }
-        }
-        pName = (MemberName*)parser->memorySuite.realloc(parser->memorySuite.userData, NULL, sizeof(MemberName) + parser->tokenBytesUsed - 1);
-        if (!pName)
-        {
-            JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
+   if (GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS))
+   {
+      MemberName* pName;
+      for (pName = parser->pMemberNames->pFirstName; pName; pName = pName->pNextName)
+      {
+         if (pName->length == parser->tokenBytesUsed && !memcmp(pName->pBytes, parser->pTokenBytes, pName->length))
+         {
+            JSON_Parser_SetErrorAtToken(parser, JSON_Error_DuplicateObjectMember);
             return JSON_Failure;
-        }
-        pName->pNextName = parser->pMemberNames->pFirstName;
-        pName->length = parser->tokenBytesUsed;
-        memcpy(pName->pBytes, parser->pTokenBytes, parser->tokenBytesUsed);
-        parser->pMemberNames->pFirstName = pName;
-    }
-    return JSON_Success;
+         }
+      }
+      pName = (MemberName*)parser->memorySuite.realloc(parser->memorySuite.userData, NULL, sizeof(MemberName) + parser->tokenBytesUsed - 1);
+      if (!pName)
+      {
+         JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
+         return JSON_Failure;
+      }
+      pName->pNextName = parser->pMemberNames->pFirstName;
+      pName->length = parser->tokenBytesUsed;
+      memcpy(pName->pBytes, parser->pTokenBytes, parser->tokenBytesUsed);
+      parser->pMemberNames->pFirstName = pName;
+   }
+   return JSON_Success;
 }
 
 static void JSON_Parser_ResetData(JSON_Parser parser, int isInitialized)
 {
-    parser->userData = NULL;
-    parser->flags = PARSER_DEFAULT_FLAGS;
-    parser->inputEncoding = JSON_UnknownEncoding;
-    parser->stringEncoding = JSON_UTF8;
-    parser->numberEncoding = JSON_UTF8;
-    parser->token = T_NONE;
-    parser->tokenAttributes = 0;
-    parser->error = JSON_Error_None;
-    parser->errorOffset = 0;
-    parser->lexerState = LEXING_WHITESPACE;
-    parser->lexerBits = 0;
-    parser->codepointLocationByte = 0;
-    parser->codepointLocationLine = 0;
-    parser->codepointLocationColumn = 0;
-    parser->tokenLocationByte = 0;
-    parser->tokenLocationLine = 0;
-    parser->tokenLocationColumn = 0;
-    parser->depth = 0;
-    if (!isInitialized)
-    {
-        parser->pTokenBytes = parser->defaultTokenBytes;
-        parser->tokenBytesLength = sizeof(parser->defaultTokenBytes);
-    }
-    else
-    {
-        /* When we reset the parser, we keep the output buffer and the symbol
-           stack that have already been allocated, if any. If the client wants
-           to reclaim the memory used by the those buffers, he needs to free
-           the parser and create a new one. */
-    }
-    parser->tokenBytesUsed = 0;
-    parser->maxStringLength = SIZE_MAX;
-    parser->maxNumberLength = SIZE_MAX;
-    if (!isInitialized)
-    {
-        parser->pMemberNames = NULL;
-    }
-    else
-    {
-        while (parser->pMemberNames)
-        {
-            JSON_Parser_PopMemberNameList(parser);
-        }
-    }
-    Decoder_Reset(&parser->decoderData);
-    Grammarian_Reset(&parser->grammarianData, isInitialized);
-    parser->encodingDetectedHandler = NULL;
-    parser->nullHandler = NULL;
-    parser->booleanHandler = NULL;
-    parser->stringHandler = NULL;
-    parser->numberHandler = NULL;
-    parser->specialNumberHandler = NULL;
-    parser->startObjectHandler = NULL;
-    parser->endObjectHandler = NULL;
-    parser->objectMemberHandler = NULL;
-    parser->startArrayHandler = NULL;
-    parser->endArrayHandler = NULL;
-    parser->arrayItemHandler = NULL;
-    parser->state = PARSER_RESET; /* do this last! */
+   parser->userData                 = NULL;
+   parser->flags                    = PARSER_DEFAULT_FLAGS;
+   parser->inputEncoding            = JSON_UnknownEncoding;
+   parser->stringEncoding           = JSON_UTF8;
+   parser->numberEncoding           = JSON_UTF8;
+   parser->token                    = T_NONE;
+   parser->tokenAttributes          = 0;
+   parser->error                    = JSON_Error_None;
+   parser->errorOffset              = 0;
+   parser->lexerState               = LEXING_WHITESPACE;
+   parser->lexerBits                = 0;
+   parser->codepointLocationByte    = 0;
+   parser->codepointLocationLine    = 0;
+   parser->codepointLocationColumn  = 0;
+   parser->tokenLocationByte        = 0;
+   parser->tokenLocationLine        = 0;
+   parser->tokenLocationColumn      = 0;
+   parser->depth                    = 0;
+
+   if (!isInitialized)
+   {
+      parser->pTokenBytes      = parser->defaultTokenBytes;
+      parser->tokenBytesLength = sizeof(parser->defaultTokenBytes);
+   }
+   else
+   {
+      /* When we reset the parser, we keep the output buffer and the symbol
+         stack that have already been allocated, if any. If the client wants
+         to reclaim the memory used by the those buffers, he needs to free
+         the parser and create a new one. */
+   }
+   parser->tokenBytesUsed  = 0;
+   parser->maxStringLength = SIZE_MAX;
+   parser->maxNumberLength = SIZE_MAX;
+   if (!isInitialized)
+      parser->pMemberNames = NULL;
+   else
+   {
+      while (parser->pMemberNames)
+         JSON_Parser_PopMemberNameList(parser);
+   }
+   Decoder_Reset(&parser->decoderData);
+   Grammarian_Reset(&parser->grammarianData, isInitialized);
+   parser->encodingDetectedHandler = NULL;
+   parser->nullHandler = NULL;
+   parser->booleanHandler = NULL;
+   parser->stringHandler = NULL;
+   parser->numberHandler = NULL;
+   parser->specialNumberHandler = NULL;
+   parser->startObjectHandler = NULL;
+   parser->endObjectHandler = NULL;
+   parser->objectMemberHandler = NULL;
+   parser->startArrayHandler = NULL;
+   parser->endArrayHandler = NULL;
+   parser->arrayItemHandler = NULL;
+   parser->state = PARSER_RESET; /* do this last! */
 }
 
 static void JSON_Parser_NullTerminateToken(JSON_Parser parser)
 {
-    /* Because we always ensure that there are LONGEST_ENCODING_SEQUENCE bytes
-       available at the end of the token buffer when we record codepoints, we
-       can write the null terminator to the buffer with impunity. */
-    static const byte nullTerminatorBytes[LONGEST_ENCODING_SEQUENCE] = { 0 };
-    Encoding encoding = (Encoding)((parser->token == T_NUMBER) ? parser->numberEncoding : parser->stringEncoding);
-    memcpy(parser->pTokenBytes + parser->tokenBytesUsed, nullTerminatorBytes, SHORTEST_ENCODING_SEQUENCE(encoding));
+   /* Because we always ensure that there are LONGEST_ENCODING_SEQUENCE bytes
+      available at the end of the token buffer when we record codepoints, we
+      can write the null terminator to the buffer with impunity. */
+   static const byte nullTerminatorBytes[LONGEST_ENCODING_SEQUENCE] = { 0 };
+   Encoding encoding = (Encoding)((parser->token == T_NUMBER) ? parser->numberEncoding : parser->stringEncoding);
+   memcpy(parser->pTokenBytes + parser->tokenBytesUsed, nullTerminatorBytes, SHORTEST_ENCODING_SEQUENCE(encoding));
 }
 
 static JSON_Status JSON_Parser_FlushParser(JSON_Parser parser)
 {
-    /* The symbol stack should be empty when parsing finishes. */
-    if (!Grammarian_FinishedDocument(&parser->grammarianData))
-    {
-        JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_ExpectedMoreTokens);
-        return JSON_Failure;
-    }
-    return JSON_Success;
+   /* The symbol stack should be empty when parsing finishes. */
+   if (!Grammarian_FinishedDocument(&parser->grammarianData))
+   {
+      JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_ExpectedMoreTokens);
+      return JSON_Failure;
+   }
+   return JSON_Success;
 }
 
 typedef JSON_Parser_HandlerResult (JSON_CALL * JSON_Parser_SimpleTokenHandler)(JSON_Parser parser);
 static JSON_Status JSON_Parser_CallSimpleTokenHandler(JSON_Parser parser, JSON_Parser_SimpleTokenHandler handler)
 {
-    if (handler)
-    {
-        JSON_Parser_HandlerResult result;
-        SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-        result = handler(parser);
-        SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-        if (result != JSON_Parser_Continue)
-        {
-            JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
-            return JSON_Failure;
-        }
-    }
-    return JSON_Success;
+   if (handler)
+   {
+      JSON_Parser_HandlerResult result;
+      SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
+      result = handler(parser);
+      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
+      if (result != JSON_Parser_Continue)
+      {
+         JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
+         return JSON_Failure;
+      }
+   }
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Parser_CallBooleanHandler(JSON_Parser parser)
 {
-    if (parser->booleanHandler)
-    {
-        JSON_Parser_HandlerResult result;
-        SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-        result = parser->booleanHandler(parser, parser->token == T_TRUE ? JSON_True : JSON_False);
-        SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-        if (result != JSON_Parser_Continue)
-        {
-            JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
-            return JSON_Failure;
-        }
-    }
-    return JSON_Success;
+   if (parser->booleanHandler)
+   {
+      JSON_Parser_HandlerResult result;
+      SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
+      result = parser->booleanHandler(parser, parser->token == T_TRUE ? JSON_True : JSON_False);
+      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
+      if (result != JSON_Parser_Continue)
+      {
+         JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
+         return JSON_Failure;
+      }
+   }
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Parser_CallStringHandler(JSON_Parser parser, int isObjectMember)
 {
-    JSON_Parser_StringHandler handler = isObjectMember ? parser->objectMemberHandler : parser->stringHandler;
-    if (handler)
-    {
-        JSON_Parser_HandlerResult result;
-        JSON_Parser_NullTerminateToken(parser);
-        SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-        result = handler(parser, (char*)parser->pTokenBytes, parser->tokenBytesUsed, parser->tokenAttributes);
-        SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-        if (result != JSON_Parser_Continue)
-        {
-            JSON_Parser_SetErrorAtToken(parser, (isObjectMember && result == JSON_Parser_TreatAsDuplicateObjectMember)
-                                        ? JSON_Error_DuplicateObjectMember : JSON_Error_AbortedByHandler);
-            return JSON_Failure;
-        }
-    }
-    return JSON_Success;
+   JSON_Parser_StringHandler handler = isObjectMember ? parser->objectMemberHandler : parser->stringHandler;
+   if (handler)
+   {
+      JSON_Parser_HandlerResult result;
+      JSON_Parser_NullTerminateToken(parser);
+      SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
+      result = handler(parser, (char*)parser->pTokenBytes, parser->tokenBytesUsed, parser->tokenAttributes);
+      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
+
+      if (result != JSON_Parser_Continue)
+      {
+         JSON_Parser_SetErrorAtToken(parser,
+               (isObjectMember && result == JSON_Parser_TreatAsDuplicateObjectMember)
+               ? JSON_Error_DuplicateObjectMember 
+               : JSON_Error_AbortedByHandler);
+         return JSON_Failure;
+      }
+   }
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Parser_CallNumberHandler(JSON_Parser parser)
 {
-    if (parser->numberHandler)
-    {
-        JSON_Parser_HandlerResult result;
-        JSON_Parser_NullTerminateToken(parser);
-        SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-        result = parser->numberHandler(parser, (char*)parser->pTokenBytes, parser->tokenBytesUsed, parser->tokenAttributes);
-        SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-        if (result != JSON_Parser_Continue)
-        {
-            JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
-            return JSON_Failure;
-        }
-    }
-    return JSON_Success;
+   if (parser->numberHandler)
+   {
+      JSON_Parser_HandlerResult result;
+      JSON_Parser_NullTerminateToken(parser);
+      SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
+      result = parser->numberHandler(parser, (char*)parser->pTokenBytes,
+            parser->tokenBytesUsed, parser->tokenAttributes);
+
+      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
+
+      if (result != JSON_Parser_Continue)
+      {
+         JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
+         return JSON_Failure;
+      }
+   }
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Parser_CallSpecialNumberHandler(JSON_Parser parser)
 {
-    if (parser->specialNumberHandler)
-    {
-        JSON_Parser_HandlerResult result;
-        SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-        result = parser->specialNumberHandler(parser, parser->token == T_NAN ? JSON_NaN :
-                                              (parser->token == T_INFINITY ? JSON_Infinity : JSON_NegativeInfinity));
-        SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
-        if (result != JSON_Parser_Continue)
-        {
-            JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
-            return JSON_Failure;
-        }
-    }
-    return JSON_Success;
+   if (parser->specialNumberHandler)
+   {
+      JSON_Parser_HandlerResult result;
+      SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
+      result = parser->specialNumberHandler(parser, parser->token == T_NAN ? JSON_NaN :
+            (parser->token == T_INFINITY ? JSON_Infinity : JSON_NegativeInfinity));
+      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_TOKEN_HANDLER);
+
+      if (result != JSON_Parser_Continue)
+      {
+         JSON_Parser_SetErrorAtToken(parser, JSON_Error_AbortedByHandler);
+         return JSON_Failure;
+      }
+   }
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Parser_HandleGrammarEvents(JSON_Parser parser, byte emit)
 {
-    if (GET_FLAGS(emit, EMIT_ARRAY_ITEM))
-    {
-        if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->arrayItemHandler))
-        {
+   if (GET_FLAGS(emit, EMIT_ARRAY_ITEM))
+   {
+      if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->arrayItemHandler))
+      {
+         return JSON_Failure;
+      }
+      SET_FLAGS_OFF(byte, emit, EMIT_ARRAY_ITEM);
+   }
+   switch (emit)
+   {
+      case EMIT_NULL:
+         if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->nullHandler))
             return JSON_Failure;
-        }
-        SET_FLAGS_OFF(byte, emit, EMIT_ARRAY_ITEM);
-    }
-    switch (emit)
-    {
-    case EMIT_NULL:
-        if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->nullHandler))
-        {
-            return JSON_Failure;
-        }
-        break;
+         break;
 
-    case EMIT_BOOLEAN:
-        if (!JSON_Parser_CallBooleanHandler(parser))
-        {
+      case EMIT_BOOLEAN:
+         if (!JSON_Parser_CallBooleanHandler(parser))
             return JSON_Failure;
-        }
-        break;
+         break;
 
-    case EMIT_STRING:
-        if (!JSON_Parser_CallStringHandler(parser, 0/* isObjectMember */))
-        {
+      case EMIT_STRING:
+         if (!JSON_Parser_CallStringHandler(parser, 0/* isObjectMember */))
             return JSON_Failure;
-        }
-        break;
+         break;
 
-    case EMIT_NUMBER:
-        if (!JSON_Parser_CallNumberHandler(parser))
-        {
+      case EMIT_NUMBER:
+         if (!JSON_Parser_CallNumberHandler(parser))
             return JSON_Failure;
-        }
-        break;
+         break;
 
-    case EMIT_SPECIAL_NUMBER:
-        if (!JSON_Parser_CallSpecialNumberHandler(parser))
-        {
+      case EMIT_SPECIAL_NUMBER:
+         if (!JSON_Parser_CallSpecialNumberHandler(parser))
             return JSON_Failure;
-        }
-        break;
+         break;
 
-    case EMIT_START_OBJECT:
-        if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->startObjectHandler) ||
-            !JSON_Parser_StartContainer(parser, 1/*isObject*/))
-        {
+      case EMIT_START_OBJECT:
+         if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->startObjectHandler) ||
+               !JSON_Parser_StartContainer(parser, 1/*isObject*/))
             return JSON_Failure;
-        }
-        break;
+         break;
 
-    case EMIT_END_OBJECT:
-        JSON_Parser_EndContainer(parser, 1/*isObject*/);
-        if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->endObjectHandler))
-        {
+      case EMIT_END_OBJECT:
+         JSON_Parser_EndContainer(parser, 1/*isObject*/);
+         if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->endObjectHandler))
             return JSON_Failure;
-        }
-        break;
+         break;
+      case EMIT_OBJECT_MEMBER:
+         if (!JSON_Parser_AddMemberNameToList(parser) || /* will fail if member is duplicate */
+               !JSON_Parser_CallStringHandler(parser, 1 /* isObjectMember */))
+            return JSON_Failure;
+         break;
 
-    case EMIT_OBJECT_MEMBER:
-        if (!JSON_Parser_AddMemberNameToList(parser) || /* will fail if member is duplicate */
-            !JSON_Parser_CallStringHandler(parser, 1 /* isObjectMember */))
-        {
+      case EMIT_START_ARRAY:
+         if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->startArrayHandler) ||
+               !JSON_Parser_StartContainer(parser, 0/*isObject*/))
             return JSON_Failure;
-        }
-        break;
+         break;
 
-    case EMIT_START_ARRAY:
-        if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->startArrayHandler) ||
-            !JSON_Parser_StartContainer(parser, 0/*isObject*/))
-        {
+      case EMIT_END_ARRAY:
+         JSON_Parser_EndContainer(parser, 0/*isObject*/);
+         if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->endArrayHandler))
             return JSON_Failure;
-        }
-        break;
+         break;
+   }
 
-    case EMIT_END_ARRAY:
-        JSON_Parser_EndContainer(parser, 0/*isObject*/);
-        if (!JSON_Parser_CallSimpleTokenHandler(parser, parser->endArrayHandler))
-        {
-            return JSON_Failure;
-        }
-        break;
-    }
-    if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT))
-    {
-        JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_StoppedAfterEmbeddedDocument);
-        return JSON_Failure;
-    }
-    return JSON_Success;
+   if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT))
+   {
+      JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_StoppedAfterEmbeddedDocument);
+      return JSON_Failure;
+   }
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Parser_ProcessToken(JSON_Parser parser)
 {
-    GrammarianOutput output;
-    output = Grammarian_ProcessToken(&parser->grammarianData, parser->token, &parser->memorySuite);
-    switch (GRAMMARIAN_RESULT_CODE(output))
-    {
-    case ACCEPTED_TOKEN:
-        if (!JSON_Parser_HandleGrammarEvents(parser, GRAMMARIAN_EVENT(output)))
-        {
+   GrammarianOutput output;
+   output = Grammarian_ProcessToken(&parser->grammarianData, parser->token, &parser->memorySuite);
+   switch (GRAMMARIAN_RESULT_CODE(output))
+   {
+      case ACCEPTED_TOKEN:
+         if (!JSON_Parser_HandleGrammarEvents(parser, GRAMMARIAN_EVENT(output)))
             return JSON_Failure;
-        }
-        break;
+         break;
 
-    case REJECTED_TOKEN:
-        JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnexpectedToken);
-        return JSON_Failure;
+      case REJECTED_TOKEN:
+         JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnexpectedToken);
+         return JSON_Failure;
 
-    case SYMBOL_STACK_FULL:
-        JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
-        return JSON_Failure;
-    }
+      case SYMBOL_STACK_FULL:
+         JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
+         return JSON_Failure;
+   }
 
-    /* Reset the lexer to prepare for the next token. */
-    parser->lexerState = LEXING_WHITESPACE;
-    parser->lexerBits = 0;
-    parser->token = T_NONE;
-    parser->tokenAttributes = 0;
-    parser->tokenBytesUsed = 0;
-    return JSON_Success;
+   /* Reset the lexer to prepare for the next token. */
+   parser->lexerState = LEXING_WHITESPACE;
+   parser->lexerBits = 0;
+   parser->token = T_NONE;
+   parser->tokenAttributes = 0;
+   parser->tokenBytesUsed = 0;
+   return JSON_Success;
 }
 
 /* Lexer functions. */
@@ -1466,246 +1445,247 @@ static const byte expectedLiteralChars[] = { 'u', 'l', 'l', 0, 'r', 'u', 'e', 0,
 
 /* Forward declaration. */
 static JSON_Status JSON_Parser_FlushLexer(JSON_Parser parser);
-static JSON_Status JSON_Parser_ProcessCodepoint(JSON_Parser parser, Codepoint c, size_t encodedLength);
+static JSON_Status JSON_Parser_ProcessCodepoint(
+      JSON_Parser parser, Codepoint c, size_t encodedLength);
 
-static JSON_Status JSON_Parser_HandleInvalidEncodingSequence(JSON_Parser parser, size_t encodedLength) {
-    if (parser->token == T_STRING && GET_FLAGS(parser->flags, PARSER_REPLACE_INVALID))
-    {
-        /* Since we're inside a string token, replacing the invalid sequence
-           with the Unicode replacement character as requested by the client
-           is a viable way to avoid a parse failure. Outside a string token,
-           such a replacement would simply trigger JSON_Error_UnknownToken
-           when we tried to process the replacement character, so it's less
-           confusing to stick with JSON_Error_InvalidEncodingSequence in that
-           case. */
-        SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsReplacedCharacter);
-        return JSON_Parser_ProcessCodepoint(parser, REPLACEMENT_CHARACTER_CODEPOINT, encodedLength);
-    }
-    else if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT))
-    {
-        /* Since we're parsing the top-level value of an embedded
-           document, assume that the invalid encoding sequence we've
-           encountered does not actually belong to the document, and
-           finish parsing by pretending that we've encountered EOF
-           instead of an invalid sequence. If the content is valid,
-           this will fail with JSON_Error_StoppedAfterEmbeddedDocument;
-           otherwise, it will fail with an appropriate error. */
-        return (JSON_Status)(JSON_Parser_FlushLexer(parser) && JSON_Parser_FlushParser(parser));
-    }
-    JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_InvalidEncodingSequence);
-    return JSON_Failure;
+static JSON_Status JSON_Parser_HandleInvalidEncodingSequence(
+      JSON_Parser parser, size_t encodedLength)
+{
+   if (parser->token == T_STRING && GET_FLAGS(parser->flags, PARSER_REPLACE_INVALID))
+   {
+      /* Since we're inside a string token, replacing the invalid sequence
+         with the Unicode replacement character as requested by the client
+         is a viable way to avoid a parse failure. Outside a string token,
+         such a replacement would simply trigger JSON_Error_UnknownToken
+         when we tried to process the replacement character, so it's less
+         confusing to stick with JSON_Error_InvalidEncodingSequence in that
+         case. */
+      SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsReplacedCharacter);
+      return JSON_Parser_ProcessCodepoint(parser, REPLACEMENT_CHARACTER_CODEPOINT, encodedLength);
+   }
+   else if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT))
+   {
+      /* Since we're parsing the top-level value of an embedded
+         document, assume that the invalid encoding sequence we've
+         encountered does not actually belong to the document, and
+         finish parsing by pretending that we've encountered EOF
+         instead of an invalid sequence. If the content is valid,
+         this will fail with JSON_Error_StoppedAfterEmbeddedDocument;
+         otherwise, it will fail with an appropriate error. */
+      return (JSON_Status)(JSON_Parser_FlushLexer(parser) && JSON_Parser_FlushParser(parser));
+   }
+   JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_InvalidEncodingSequence);
+   return JSON_Failure;
 }
 
-static JSON_Status JSON_Parser_HandleInvalidNumber(JSON_Parser parser, Codepoint c, int codepointsSinceValidNumber, TokenAttributes attributesToRemove)
+static JSON_Status JSON_Parser_HandleInvalidNumber(JSON_Parser parser,
+      Codepoint c, int codepointsSinceValidNumber, TokenAttributes attributesToRemove)
 {
-    SET_FLAGS_OFF(TokenAttributes, parser->tokenAttributes, attributesToRemove);
-    if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT))
-    {
-        /* The invalid number is the top-level value of an embedded document,
-           and it has a prefix that can be interpreted as a valid number.
-           We want to backtrack so that we are at the end of that prefix,
-           and then process the valid token.
+   SET_FLAGS_OFF(TokenAttributes, parser->tokenAttributes, attributesToRemove);
+   if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT))
+   {
+      /* The invalid number is the top-level value of an embedded document,
+         and it has a prefix that can be interpreted as a valid number.
+         We want to backtrack so that we are at the end of that prefix,
+         and then process the valid token.
 
-           Note that backtracking requires us to make three assumptions, which
-           are always valid in the context of a number token:
+         Note that backtracking requires us to make three assumptions, which
+         are always valid in the context of a number token:
 
-           1. The input encoding is not JSON_UnknownEncoding.
+         1. The input encoding is not JSON_UnknownEncoding.
 
-           2 The codepoints we are backing up across are all in the range
-           U+0000 - U+007F, aka ASCII, so we can assume the number of
-           bytes comprising them based on the input encoding.
+         2 The codepoints we are backing up across are all in the range
+         U+0000 - U+007F, aka ASCII, so we can assume the number of
+         bytes comprising them based on the input encoding.
 
-           3. The codepoints we are backing up across do not include any
-           line breaks, so we can assume that the line number stays the
-           same and the column number can simply be decremented.
+         3. The codepoints we are backing up across do not include any
+         line breaks, so we can assume that the line number stays the
+         same and the column number can simply be decremented.
 
-           For example:
+         For example:
 
-               "01"     => "0"
-               "123.!"  => "123"
-               "123e!"  => "123"
-               "123e+!" => "123"
-               "123e-!" => "123"
-               "1.2e!"  => "1.2"
-               "1.2e+!" => "1.2"
-               "1.2e-!" => "1.2"
-        */
-        parser->codepointLocationByte -= (size_t)codepointsSinceValidNumber * SHORTEST_ENCODING_SEQUENCE(parser->inputEncoding);
-        parser->codepointLocationColumn -= (size_t)codepointsSinceValidNumber;
-        parser->tokenBytesUsed -= (size_t)codepointsSinceValidNumber * SHORTEST_ENCODING_SEQUENCE(parser->numberEncoding);
-        return JSON_Parser_ProcessToken(parser); /* always fails */
-    }
-    else if (c == EOF_CODEPOINT)
-    {
-        /* Allow JSON_Parser_FlushLexer() to fail. */
-        return JSON_Success;
-    }
-    JSON_Parser_SetErrorAtToken(parser, JSON_Error_InvalidNumber);
-    return JSON_Failure;
+         "01"     => "0"
+         "123.!"  => "123"
+         "123e!"  => "123"
+         "123e+!" => "123"
+         "123e-!" => "123"
+         "1.2e!"  => "1.2"
+         "1.2e+!" => "1.2"
+         "1.2e-!" => "1.2"
+         */
+      parser->codepointLocationByte -= (size_t)codepointsSinceValidNumber 
+         * SHORTEST_ENCODING_SEQUENCE(parser->inputEncoding);
+      parser->codepointLocationColumn -= (size_t)codepointsSinceValidNumber;
+      parser->tokenBytesUsed -= (size_t)codepointsSinceValidNumber 
+         * SHORTEST_ENCODING_SEQUENCE(parser->numberEncoding);
+      return JSON_Parser_ProcessToken(parser); /* always fails */
+   }
+   /* Allow JSON_Parser_FlushLexer() to fail. */
+   else if (c == EOF_CODEPOINT)
+      return JSON_Success;
+
+   JSON_Parser_SetErrorAtToken(parser, JSON_Error_InvalidNumber);
+   return JSON_Failure;
 }
 
 static void JSON_Parser_StartToken(JSON_Parser parser, Symbol token)
 {
-    parser->token = token;
-    parser->tokenLocationByte = parser->codepointLocationByte;
-    parser->tokenLocationLine = parser->codepointLocationLine;
-    parser->tokenLocationColumn = parser->codepointLocationColumn;
+   parser->token               = token;
+   parser->tokenLocationByte   = parser->codepointLocationByte;
+   parser->tokenLocationLine   = parser->codepointLocationLine;
+   parser->tokenLocationColumn = parser->codepointLocationColumn;
 }
 
 static JSON_Status JSON_Parser_ProcessCodepoint(JSON_Parser parser, Codepoint c, size_t encodedLength)
 {
-    Codepoint codepointToRecord = EOF_CODEPOINT;
-    Encoding tokenEncoding;
-    size_t maxTokenLength;
-    int tokenFinished = 0;
+   Encoding tokenEncoding;
+   size_t maxTokenLength;
+   int tokenFinished           = 0;
+   Codepoint codepointToRecord = EOF_CODEPOINT;
 
-    /* If the previous codepoint was U+000D (CARRIAGE RETURN), and the current
-       codepoint is U+000A (LINE FEED), then treat the 2 codepoints as a single
-       line break. */
-    if (GET_FLAGS(parser->state, PARSER_AFTER_CARRIAGE_RETURN))
-    {
-        if (c == LINE_FEED_CODEPOINT)
-        {
-            parser->codepointLocationLine--;
-        }
-        SET_FLAGS_OFF(ParserState, parser->state, PARSER_AFTER_CARRIAGE_RETURN);
-    }
+   /* If the previous codepoint was U+000D (CARRIAGE RETURN), and the current
+      codepoint is U+000A (LINE FEED), then treat the 2 codepoints as a single
+      line break. */
+   if (GET_FLAGS(parser->state, PARSER_AFTER_CARRIAGE_RETURN))
+   {
+      if (c == LINE_FEED_CODEPOINT)
+         parser->codepointLocationLine--;
+      SET_FLAGS_OFF(ParserState, parser->state, PARSER_AFTER_CARRIAGE_RETURN);
+   }
 
 reprocess:
 
-    switch (parser->lexerState)
-    {
-    case LEXING_WHITESPACE:
-        if (c == '{')
-        {
+   switch (parser->lexerState)
+   {
+      case LEXING_WHITESPACE:
+         if (c == '{')
+         {
             JSON_Parser_StartToken(parser, T_LEFT_CURLY);
             tokenFinished = 1;
-        }
-        else if (c == '}')
-        {
+         }
+         else if (c == '}')
+         {
             JSON_Parser_StartToken(parser, T_RIGHT_CURLY);
             tokenFinished = 1;
-        }
-        else if (c == '[')
-        {
+         }
+         else if (c == '[')
+         {
             JSON_Parser_StartToken(parser, T_LEFT_SQUARE);
             tokenFinished = 1;
-        }
-        else if (c == ']')
-        {
+         }
+         else if (c == ']')
+         {
             JSON_Parser_StartToken(parser, T_RIGHT_SQUARE);
             tokenFinished = 1;
-        }
-        else if (c == ':')
-        {
+         }
+         else if (c == ':')
+         {
             JSON_Parser_StartToken(parser, T_COLON);
             tokenFinished = 1;
-        }
-        else if (c == ',')
-        {
+         }
+         else if (c == ',')
+         {
             JSON_Parser_StartToken(parser, T_COMMA);
             tokenFinished = 1;
-        }
-        else if (c == 'n')
-        {
+         }
+         else if (c == 'n')
+         {
             JSON_Parser_StartToken(parser, T_NULL);
             parser->lexerBits = NULL_LITERAL_EXPECTED_CHARS_START_INDEX;
             parser->lexerState = LEXING_LITERAL;
-        }
-        else if (c == 't')
-        {
+         }
+         else if (c == 't')
+         {
             JSON_Parser_StartToken(parser, T_TRUE);
             parser->lexerBits = TRUE_LITERAL_EXPECTED_CHARS_START_INDEX;
             parser->lexerState = LEXING_LITERAL;
-        }
-        else if (c == 'f')
-        {
+         }
+         else if (c == 'f')
+         {
             JSON_Parser_StartToken(parser, T_FALSE);
             parser->lexerBits = FALSE_LITERAL_EXPECTED_CHARS_START_INDEX;
             parser->lexerState = LEXING_LITERAL;
-        }
-        else if (c == '"')
-        {
+         }
+         else if (c == '"')
+         {
             JSON_Parser_StartToken(parser, T_STRING);
             parser->lexerState = LEXING_STRING;
-        }
-        else if (c == '-')
-        {
+         }
+         else if (c == '-')
+         {
             JSON_Parser_StartToken(parser, T_NUMBER);
             parser->tokenAttributes = JSON_IsNegative;
             codepointToRecord = '-';
             parser->lexerState = LEXING_NUMBER_AFTER_MINUS;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (c == '0')
-        {
+         }
+         else if (c == '0')
+         {
             JSON_Parser_StartToken(parser, T_NUMBER);
             codepointToRecord = '0';
             parser->lexerState = LEXING_NUMBER_AFTER_LEADING_ZERO;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (c >= '1' && c <= '9')
-        {
+         }
+         else if (c >= '1' && c <= '9')
+         {
             JSON_Parser_StartToken(parser, T_NUMBER);
             codepointToRecord = c;
             parser->lexerState = LEXING_NUMBER_DECIMAL_DIGITS;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (c == ' ' || c == TAB_CODEPOINT || c == LINE_FEED_CODEPOINT ||
-                 c == CARRIAGE_RETURN_CODEPOINT || c == EOF_CODEPOINT)
-        {
+         }
+         else if (c == ' ' || c == TAB_CODEPOINT || c == LINE_FEED_CODEPOINT ||
+               c == CARRIAGE_RETURN_CODEPOINT || c == EOF_CODEPOINT)
+         {
             /* Ignore whitespace between tokens. */
-        }
-        else if (c == BOM_CODEPOINT && parser->codepointLocationByte == 0)
-        {
-            if (GET_FLAGS(parser->flags, PARSER_ALLOW_BOM))
-            {
-                /* OK, we'll allow the BOM. */
-            }
+         }
+         else if (c == BOM_CODEPOINT && parser->codepointLocationByte == 0)
+         {
+            /* OK, we'll allow the BOM. */
+            if (GET_FLAGS(parser->flags, PARSER_ALLOW_BOM)) { }
             else
             {
-                JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_BOMNotAllowed);
-                return JSON_Failure;
+               JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_BOMNotAllowed);
+               return JSON_Failure;
             }
-        }
-        else if (c == '/' && GET_FLAGS(parser->flags, PARSER_ALLOW_COMMENTS))
-        {
+         }
+         else if (c == '/' && GET_FLAGS(parser->flags, PARSER_ALLOW_COMMENTS))
+         {
             /* Comments are not real tokens, but we save the location
                of the comment as the token location in case of an error. */
             parser->tokenLocationByte = parser->codepointLocationByte;
             parser->tokenLocationLine = parser->codepointLocationLine;
             parser->tokenLocationColumn = parser->codepointLocationColumn;
             parser->lexerState = LEXING_COMMENT_AFTER_SLASH;
-        }
-        else if (c == 'N' && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS))
-        {
+         }
+         else if (c == 'N' && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS))
+         {
             JSON_Parser_StartToken(parser, T_NAN);
             parser->lexerBits = NAN_LITERAL_EXPECTED_CHARS_START_INDEX;
             parser->lexerState = LEXING_LITERAL;
-        }
-        else if (c == 'I' && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS))
-        {
+         }
+         else if (c == 'I' && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS))
+         {
             JSON_Parser_StartToken(parser, T_INFINITY);
             parser->lexerBits = INFINITY_LITERAL_EXPECTED_CHARS_START_INDEX;
             parser->lexerState = LEXING_LITERAL;
-        }
-        else
-        {
+         }
+         else
+         {
             JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_UnknownToken);
             return JSON_Failure;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_LITERAL:
-        /* While lexing a literal we store an index into expectedLiteralChars
-           in lexerBits. */
-        if (expectedLiteralChars[parser->lexerBits])
-        {
+      case LEXING_LITERAL:
+         /* While lexing a literal we store an index into expectedLiteralChars
+            in lexerBits. */
+         if (expectedLiteralChars[parser->lexerBits])
+         {
             /* The codepoint should match the next character in the literal. */
             if (c != expectedLiteralChars[parser->lexerBits])
             {
-                JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
-                return JSON_Failure;
+               JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
+               return JSON_Failure;
             }
             parser->lexerBits++;
 
@@ -1716,125 +1696,98 @@ reprocess:
                as a single, unknown token rather than a null literal followed
                by an unknown token. */
             if (!parser->depth && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT) &&
-                !expectedLiteralChars[parser->lexerBits])
-            {
-                tokenFinished = 1;
-            }
-        }
-        else
-        {
+                  !expectedLiteralChars[parser->lexerBits])
+               tokenFinished = 1;
+         }
+         else
+         {
             /* The literal should be finished, so the codepoint should not be
                a plausible JSON literal character, but rather EOF, whitespace,
                or the first character of the next token. */
             if ((c >= 'A' && c <= 'Z') ||
-                (c >= 'a' && c <= 'z') ||
-                (c >= '0' && c <= '9') ||
-                (c == '_'))
+                  (c >= 'a' && c <= 'z') ||
+                  (c >= '0' && c <= '9') ||
+                  (c == '_'))
             {
-                JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
-                return JSON_Failure;
+               JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
+               return JSON_Failure;
             }
             if (!JSON_Parser_ProcessToken(parser))
-            {
-                return JSON_Failure;
-            }
+               return JSON_Failure;
             goto reprocess;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_STRING:
-        if (c == EOF_CODEPOINT)
-        {
-            /* Allow JSON_Parser_FlushLexer() to fail. */
-        }
-        else if (c == '"')
-        {
+      case LEXING_STRING:
+         /* Allow JSON_Parser_FlushLexer() to fail. */
+         if (c == EOF_CODEPOINT) { }
+         else if (c == '"')
             tokenFinished = 1;
-        }
-        else if (c == '\\')
-        {
+         else if (c == '\\')
             parser->lexerState = LEXING_STRING_ESCAPE;
-        }
-        else if (c < 0x20 && !GET_FLAGS(parser->flags, PARSER_ALLOW_CONTROL_CHARS))
-        {
+         else if (c < 0x20 && !GET_FLAGS(parser->flags, PARSER_ALLOW_CONTROL_CHARS))
+         {
             /* ASCII control characters (U+0000 - U+001F) are not allowed to
                appear unescaped in string values unless specifically allowed. */
             JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_UnescapedControlCharacter);
             return JSON_Failure;
-        }
-        else
-        {
+         }
+         else
+         {
             codepointToRecord = c;
             goto recordStringCodepointAndAdvance;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_STRING_ESCAPE:
-        if (c == EOF_CODEPOINT)
-        {
+      case LEXING_STRING_ESCAPE:
+         if (c == EOF_CODEPOINT)
+         {
             /* Allow JSON_Parser_FlushLexer() to fail. */
-        }
-        else
-        {
+         }
+         else
+         {
             if (c == 'u')
-            {
-                parser->lexerState = LEXING_STRING_HEX_ESCAPE_BYTE_1;
-            }
+               parser->lexerState = LEXING_STRING_HEX_ESCAPE_BYTE_1;
             else
             {
-                if (c == '"' || c == '\\' || c == '/')
-                {
-                    codepointToRecord = c;
-                }
-                else if (c == 'b')
-                {
-                    codepointToRecord = BACKSPACE_CODEPOINT;
-                }
-                else if (c == 't')
-                {
-                    codepointToRecord = TAB_CODEPOINT;
-                }
-                else if (c == 'n')
-                {
-                    codepointToRecord = LINE_FEED_CODEPOINT;
-                }
-                else if (c == 'f')
-                {
-                    codepointToRecord = FORM_FEED_CODEPOINT;
-                }
-                else if (c == 'r')
-                {
-                    codepointToRecord = CARRIAGE_RETURN_CODEPOINT;
-                }
-                else
-                {
-                    /* The current codepoint location is the first character after
-                       the backslash that started the escape sequence. The error
-                       location should be the beginning of the escape sequence, 1
-                       character earlier. */
-                    JSON_Parser_SetErrorAtStringEscapeSequenceStart(parser, JSON_Error_InvalidEscapeSequence, 1);
-                    return JSON_Failure;
-                }
-                parser->lexerState = LEXING_STRING;
-                goto recordStringCodepointAndAdvance;
+               if (c == '"' || c == '\\' || c == '/')
+                  codepointToRecord = c;
+               else if (c == 'b')
+                  codepointToRecord = BACKSPACE_CODEPOINT;
+               else if (c == 't')
+                  codepointToRecord = TAB_CODEPOINT;
+               else if (c == 'n')
+                  codepointToRecord = LINE_FEED_CODEPOINT;
+               else if (c == 'f')
+                  codepointToRecord = FORM_FEED_CODEPOINT;
+               else if (c == 'r')
+                  codepointToRecord = CARRIAGE_RETURN_CODEPOINT;
+               else
+               {
+                  /* The current codepoint location is the first character after
+                     the backslash that started the escape sequence. The error
+                     location should be the beginning of the escape sequence, 1
+                     character earlier. */
+                  JSON_Parser_SetErrorAtStringEscapeSequenceStart(parser, JSON_Error_InvalidEscapeSequence, 1);
+                  return JSON_Failure;
+               }
+               parser->lexerState = LEXING_STRING;
+               goto recordStringCodepointAndAdvance;
             }
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_STRING_HEX_ESCAPE_BYTE_1:
-    case LEXING_STRING_HEX_ESCAPE_BYTE_2:
-    case LEXING_STRING_HEX_ESCAPE_BYTE_3:
-    case LEXING_STRING_HEX_ESCAPE_BYTE_4:
-    case LEXING_STRING_HEX_ESCAPE_BYTE_5:
-    case LEXING_STRING_HEX_ESCAPE_BYTE_6:
-    case LEXING_STRING_HEX_ESCAPE_BYTE_7:
-    case LEXING_STRING_HEX_ESCAPE_BYTE_8:
-        if (c == EOF_CODEPOINT)
-        {
-            /* Allow JSON_Parser_FlushLexer() to fail. */
-        }
-        else
-        {
+      case LEXING_STRING_HEX_ESCAPE_BYTE_1:
+      case LEXING_STRING_HEX_ESCAPE_BYTE_2:
+      case LEXING_STRING_HEX_ESCAPE_BYTE_3:
+      case LEXING_STRING_HEX_ESCAPE_BYTE_4:
+      case LEXING_STRING_HEX_ESCAPE_BYTE_5:
+      case LEXING_STRING_HEX_ESCAPE_BYTE_6:
+      case LEXING_STRING_HEX_ESCAPE_BYTE_7:
+      case LEXING_STRING_HEX_ESCAPE_BYTE_8:
+         /* Allow JSON_Parser_FlushLexer() to fail. */
+         if (c != EOF_CODEPOINT)
+         {
             /* While lexing a string hex escape sequence we store the bytes
                of the escaped codepoint in the low 2 bytes of lexerBits. If
                the escape sequence represents a leading surrogate, we shift
@@ -1843,541 +1796,495 @@ reprocess:
             int byteNumber = (parser->lexerState - LEXING_STRING_HEX_ESCAPE_BYTE_1) & 0x3;
             uint32_t nibble;
             if (c >= '0' && c <= '9')
-            {
-                nibble = c - '0';
-            }
+               nibble = c - '0';
             else if (c >= 'A' && c <= 'F')
-            {
-                nibble = c - 'A' + 10;
-            }
+               nibble = c - 'A' + 10;
             else if (c >= 'a' && c <= 'f')
-            {
-                nibble = c - 'a' + 10;
-            }
+               nibble = c - 'a' + 10;
             else
             {
-                /* The current codepoint location is one of the 4 hex digit
-                   character slots in the hex escape sequence. The error
-                   location should be the beginning of the hex escape
-                   sequence, between 2 and 5 bytes earlier. */
-                int codepointsAgo = 2 /* for "\u" */ + byteNumber;
-                JSON_Parser_SetErrorAtStringEscapeSequenceStart(parser, JSON_Error_InvalidEscapeSequence, codepointsAgo);
-                return JSON_Failure;
+               /* The current codepoint location is one of the 4 hex digit
+                  character slots in the hex escape sequence. The error
+                  location should be the beginning of the hex escape
+                  sequence, between 2 and 5 bytes earlier. */
+               int codepointsAgo = 2 /* for "\u" */ + byteNumber;
+               JSON_Parser_SetErrorAtStringEscapeSequenceStart(
+                     parser, JSON_Error_InvalidEscapeSequence, codepointsAgo);
+               return JSON_Failure;
             }
             /* Store the hex digit's bits in the appropriate byte of lexerBits. */
             nibble <<= (3 - byteNumber) * 4 /* shift left by 12, 8, 4, 0 */ ;
             parser->lexerBits |= nibble;
             if (parser->lexerState == LEXING_STRING_HEX_ESCAPE_BYTE_4)
             {
-                /* The escape sequence is complete. We need to check whether
-                   it represents a leading surrogate (which implies that it
-                   will be immediately followed by a hex-escaped trailing
-                   surrogate), a trailing surrogate (which is invalid), or a
-                   valid codepoint (which should simply be appended to the
-                   string token value). */
-                if (IS_LEADING_SURROGATE(parser->lexerBits))
-                {
-                    /* Shift the leading surrogate into the high 2 bytes of
-                       lexerBits so that the trailing surrogate can be stored
-                       in the low 2 bytes. */
-                    parser->lexerBits <<= 16;
-                    parser->lexerState = LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_BACKSLASH;
-                }
-                else if (IS_TRAILING_SURROGATE(parser->lexerBits))
-                {
-                    /* The current codepoint location is the last hex digit
-                       of the hex escape sequence. The error location should
-                       be the beginning of the hex escape sequence, 5
-                       characters earlier. */
-                    JSON_Parser_SetErrorAtStringEscapeSequenceStart(parser, JSON_Error_UnpairedSurrogateEscapeSequence, 5);
-                    return JSON_Failure;
-                }
-                else
-                {
-                    /* The escape sequence represents a BMP codepoint. */
-                    codepointToRecord = parser->lexerBits;
-                    parser->lexerBits = 0;
-                    parser->lexerState = LEXING_STRING;
-                    goto recordStringCodepointAndAdvance;
-                }
+               /* The escape sequence is complete. We need to check whether
+                  it represents a leading surrogate (which implies that it
+                  will be immediately followed by a hex-escaped trailing
+                  surrogate), a trailing surrogate (which is invalid), or a
+                  valid codepoint (which should simply be appended to the
+                  string token value). */
+               if (IS_LEADING_SURROGATE(parser->lexerBits))
+               {
+                  /* Shift the leading surrogate into the high 2 bytes of
+                     lexerBits so that the trailing surrogate can be stored
+                     in the low 2 bytes. */
+                  parser->lexerBits <<= 16;
+                  parser->lexerState = LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_BACKSLASH;
+               }
+               else if (IS_TRAILING_SURROGATE(parser->lexerBits))
+               {
+                  /* The current codepoint location is the last hex digit
+                     of the hex escape sequence. The error location should
+                     be the beginning of the hex escape sequence, 5
+                     characters earlier. */
+                  JSON_Parser_SetErrorAtStringEscapeSequenceStart(
+                        parser, JSON_Error_UnpairedSurrogateEscapeSequence, 5);
+                  return JSON_Failure;
+               }
+               else
+               {
+                  /* The escape sequence represents a BMP codepoint. */
+                  codepointToRecord = parser->lexerBits;
+                  parser->lexerBits = 0;
+                  parser->lexerState = LEXING_STRING;
+                  goto recordStringCodepointAndAdvance;
+               }
             }
             else if (parser->lexerState == LEXING_STRING_HEX_ESCAPE_BYTE_8)
             {
-                /* The second hex escape sequence is complete. We need to
-                   check whether it represents a trailing surrogate as
-                   expected. If so, the surrogate pair represents a single
-                   non-BMP codepoint. */
-                if (!IS_TRAILING_SURROGATE(parser->lexerBits & 0xFFFF))
-                {
-                    /* The current codepoint location is the last hex digit of
-                       the second hex escape sequence. The error location
-                       should be the beginning of the leading surrogate
-                       hex escape sequence, 11 characters earlier. */
-                    JSON_Parser_SetErrorAtStringEscapeSequenceStart(parser, JSON_Error_UnpairedSurrogateEscapeSequence, 11);
-                    return JSON_Failure;
-                }
-                /* The escape sequence represents a non-BMP codepoint. */
-                codepointToRecord = CODEPOINT_FROM_SURROGATES(parser->lexerBits);
-                parser->lexerBits = 0;
-                parser->lexerState = LEXING_STRING;
-                goto recordStringCodepointAndAdvance;
+               /* The second hex escape sequence is complete. We need to
+                  check whether it represents a trailing surrogate as
+                  expected. If so, the surrogate pair represents a single
+                  non-BMP codepoint. */
+               if (!IS_TRAILING_SURROGATE(parser->lexerBits & 0xFFFF))
+               {
+                  /* The current codepoint location is the last hex digit of
+                     the second hex escape sequence. The error location
+                     should be the beginning of the leading surrogate
+                     hex escape sequence, 11 characters earlier. */
+                  JSON_Parser_SetErrorAtStringEscapeSequenceStart(
+                        parser, JSON_Error_UnpairedSurrogateEscapeSequence, 11);
+                  return JSON_Failure;
+               }
+               /* The escape sequence represents a non-BMP codepoint. */
+               codepointToRecord = CODEPOINT_FROM_SURROGATES(parser->lexerBits);
+               parser->lexerBits = 0;
+               parser->lexerState = LEXING_STRING;
+               goto recordStringCodepointAndAdvance;
             }
             else
-            {
-                parser->lexerState++;
-            }
-        }
-        goto advance;
+               parser->lexerState++;
+         }
+         goto advance;
 
-    case LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_BACKSLASH:
-        if (c == EOF_CODEPOINT)
-        {
-            /* Allow JSON_Parser_FlushLexer() to fail. */
-        }
-        else
-        {
+      case LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_BACKSLASH:
+         if (c != EOF_CODEPOINT)
+         {
             if (c != '\\')
             {
-                /* The current codepoint location is the first character after
-                   the leading surrogate hex escape sequence. The error
-                   location should be the beginning of the leading surrogate
-                   hex escape sequence, 6 characters earlier. */
-                JSON_Parser_SetErrorAtStringEscapeSequenceStart(parser, JSON_Error_UnpairedSurrogateEscapeSequence, 6);
-                return JSON_Failure;
+               /* The current codepoint location is the first character after
+                  the leading surrogate hex escape sequence. The error
+                  location should be the beginning of the leading surrogate
+                  hex escape sequence, 6 characters earlier. */
+               JSON_Parser_SetErrorAtStringEscapeSequenceStart(
+                     parser, JSON_Error_UnpairedSurrogateEscapeSequence, 6);
+               return JSON_Failure;
             }
             parser->lexerState = LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_U;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_U:
-        if (c == EOF_CODEPOINT)
-        {
-            /* Allow JSON_Parser_FlushLexer() to fail. */
-        }
-        else
-        {
+      case LEXING_STRING_TRAILING_SURROGATE_HEX_ESCAPE_U:
+         if (c != EOF_CODEPOINT)
+         {
             if (c != 'u')
             {
-                /* Distinguish between a totally bogus escape sequence
-                   and a valid one that just isn't the hex escape kind
-                   that we require for a trailing surrogate. The current
-                   codepoint location is the first character after the
-                   backslash that should have introduced the trailing
-                   surrogate hex escape sequence. */
-                if (c == '"' || c == '\\' || c == '/' || c == 'b' ||
-                    c == 't' || c == 'n' || c == 'f' || c == 'r')
-                {
-                    /* The error location should be at that beginning of the
-                       leading surrogate's hex escape sequence, 7 characters
-                       earlier. */
-                    JSON_Parser_SetErrorAtStringEscapeSequenceStart(parser, JSON_Error_UnpairedSurrogateEscapeSequence, 7);
-                }
-                else
-                {
-                    /* The error location should be at that backslash, 1
-                       character earlier. */
-                    JSON_Parser_SetErrorAtStringEscapeSequenceStart(parser, JSON_Error_InvalidEscapeSequence, 1);
-                }
-                return JSON_Failure;
+               /* Distinguish between a totally bogus escape sequence
+                  and a valid one that just isn't the hex escape kind
+                  that we require for a trailing surrogate. The current
+                  codepoint location is the first character after the
+                  backslash that should have introduced the trailing
+                  surrogate hex escape sequence. */
+               if (c == '"' || c == '\\' || c == '/' || c == 'b' ||
+                     c == 't' || c == 'n' || c == 'f' || c == 'r')
+               {
+                  /* The error location should be at that beginning of the
+                     leading surrogate's hex escape sequence, 7 characters
+                     earlier. */
+                  JSON_Parser_SetErrorAtStringEscapeSequenceStart(
+                        parser, JSON_Error_UnpairedSurrogateEscapeSequence, 7);
+               }
+               else
+               {
+                  /* The error location should be at that backslash, 1
+                     character earlier. */
+                  JSON_Parser_SetErrorAtStringEscapeSequenceStart(
+                        parser, JSON_Error_InvalidEscapeSequence, 1);
+               }
+               return JSON_Failure;
             }
             parser->lexerState = LEXING_STRING_HEX_ESCAPE_BYTE_5;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_NUMBER_AFTER_MINUS:
-        if (c == EOF_CODEPOINT)
-        {
+      case LEXING_NUMBER_AFTER_MINUS:
+         if (c == EOF_CODEPOINT)
+         {
             /* Allow JSON_Parser_FlushLexer() to fail. */
-        }
-        else if (c == 'I' && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS))
-        {
-            parser->token = T_NEGATIVE_INFINITY; /* changing horses mid-stream, so to speak */
-            parser->lexerBits = INFINITY_LITERAL_EXPECTED_CHARS_START_INDEX;
+         }
+         else if (c == 'I' && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS))
+         {
+            parser->token      = T_NEGATIVE_INFINITY; /* changing horses mid-stream, so to speak */
+            parser->lexerBits  = INFINITY_LITERAL_EXPECTED_CHARS_START_INDEX;
             parser->lexerState = LEXING_LITERAL;
-        }
-        else
-        {
+         }
+         else
+         {
             if (c == '0')
             {
-                codepointToRecord = '0';
-                parser->lexerState = LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO;
-                goto recordNumberCodepointAndAdvance;
+               codepointToRecord  = '0';
+               parser->lexerState = LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO;
+               goto recordNumberCodepointAndAdvance;
             }
             else if (c >= '1' && c <= '9')
             {
-                codepointToRecord = c;
-                parser->lexerState = LEXING_NUMBER_DECIMAL_DIGITS;
-                goto recordNumberCodepointAndAdvance;
+               codepointToRecord  = c;
+               parser->lexerState = LEXING_NUMBER_DECIMAL_DIGITS;
+               goto recordNumberCodepointAndAdvance;
             }
             else
             {
-                /* We trigger an unknown token error rather than an invalid number
-                   error so that "Foo" and "-Foo" trigger the same error. */
-                JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
-                return JSON_Failure;
+               /* We trigger an unknown token error rather than an invalid number
+                  error so that "Foo" and "-Foo" trigger the same error. */
+               JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
+               return JSON_Failure;
             }
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_NUMBER_AFTER_LEADING_ZERO:
-    case LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO:
-        if (c == '.')
-        {
+      case LEXING_NUMBER_AFTER_LEADING_ZERO:
+      case LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO:
+         if (c == '.')
+         {
             codepointToRecord = '.';
             SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsDecimalPoint);
             parser->lexerState = LEXING_NUMBER_AFTER_DOT;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (c == 'e' || c == 'E')
-        {
+         }
+         else if (c == 'e' || c == 'E')
+         {
             codepointToRecord = c;
             SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsExponent);
             parser->lexerState = LEXING_NUMBER_AFTER_E;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (c >= '0' && c <= '9')
-        {
+         }
+         else if (c >= '0' && c <= '9')
+         {
             /* JSON does not allow the integer part of a number to have any
                digits after a leading zero. */
             if (!JSON_Parser_HandleInvalidNumber(parser, c, 0, 0))
-            {
-                return JSON_Failure;
-            }
-        }
-        else if ((c == 'x' || c == 'X') &&
-                 parser->lexerState == LEXING_NUMBER_AFTER_LEADING_ZERO &&
-                 GET_FLAGS(parser->flags, PARSER_ALLOW_HEX_NUMBERS))
-        {
+               return JSON_Failure;
+         }
+         else if ((c == 'x' || c == 'X') &&
+               parser->lexerState == LEXING_NUMBER_AFTER_LEADING_ZERO &&
+               GET_FLAGS(parser->flags, PARSER_ALLOW_HEX_NUMBERS))
+         {
             codepointToRecord = c;
             SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_IsHex);
             parser->lexerState = LEXING_NUMBER_AFTER_X;
             goto recordNumberCodepointAndAdvance;
-        }
-        else
-        {
+         }
+         else
+         {
             /* The number is finished. */
             if (!JSON_Parser_ProcessToken(parser))
-            {
-                return JSON_Failure;
-            }
+               return JSON_Failure;
             goto reprocess;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_NUMBER_AFTER_X:
-        if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-        {
+      case LEXING_NUMBER_AFTER_X:
+         if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
+         {
             codepointToRecord = c;
             parser->lexerState = LEXING_NUMBER_HEX_DIGITS;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (!JSON_Parser_HandleInvalidNumber(parser, c, 1, JSON_IsHex))
-        {
+         }
+         else if (!JSON_Parser_HandleInvalidNumber(parser, c, 1, JSON_IsHex))
             return JSON_Failure;
-        }
-        goto advance;
+         goto advance;
 
-    case LEXING_NUMBER_HEX_DIGITS:
-        if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-        {
+      case LEXING_NUMBER_HEX_DIGITS:
+         if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
+         {
             codepointToRecord = c;
             goto recordNumberCodepointAndAdvance;
-        }
-        else
-        {
+         }
+         else
+         {
             /* The number is finished. */
             if (!JSON_Parser_ProcessToken(parser))
-            {
-                return JSON_Failure;
-            }
+               return JSON_Failure;
             goto reprocess;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_NUMBER_DECIMAL_DIGITS:
-        if (c >= '0' && c <= '9')
-        {
+      case LEXING_NUMBER_DECIMAL_DIGITS:
+         if (c >= '0' && c <= '9')
+         {
             codepointToRecord = c;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (c == '.')
-        {
+         }
+         else if (c == '.')
+         {
             codepointToRecord = '.';
             SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsDecimalPoint);
             parser->lexerState = LEXING_NUMBER_AFTER_DOT;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (c == 'e' || c == 'E')
-        {
+         }
+         else if (c == 'e' || c == 'E')
+         {
             codepointToRecord = c;
             SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsExponent);
             parser->lexerState = LEXING_NUMBER_AFTER_E;
             goto recordNumberCodepointAndAdvance;
-        }
-        else
-        {
+         }
+         else
+         {
             /* The number is finished. */
             if (!JSON_Parser_ProcessToken(parser))
-            {
-                return JSON_Failure;
-            }
+               return JSON_Failure;
             goto reprocess;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_NUMBER_AFTER_DOT:
-        if (c >= '0' && c <= '9')
-        {
+      case LEXING_NUMBER_AFTER_DOT:
+         if (c >= '0' && c <= '9')
+         {
             codepointToRecord = c;
             parser->lexerState = LEXING_NUMBER_FRACTIONAL_DIGITS;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (!JSON_Parser_HandleInvalidNumber(parser, c, 1, JSON_ContainsDecimalPoint))
-        {
+         }
+         else if (!JSON_Parser_HandleInvalidNumber(parser, c, 1, JSON_ContainsDecimalPoint))
             return JSON_Failure;
-        }
-        goto advance;
+         goto advance;
 
-    case LEXING_NUMBER_FRACTIONAL_DIGITS:
-        if (c >= '0' && c <= '9')
-        {
+      case LEXING_NUMBER_FRACTIONAL_DIGITS:
+         if (c >= '0' && c <= '9')
+         {
             codepointToRecord = c;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (c == 'e' || c == 'E')
-        {
+         }
+         else if (c == 'e' || c == 'E')
+         {
             codepointToRecord = c;
             SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsExponent);
             parser->lexerState = LEXING_NUMBER_AFTER_E;
             goto recordNumberCodepointAndAdvance;
-        }
-        else
-        {
+         }
+         else
+         {
             /* The number is finished. */
             if (!JSON_Parser_ProcessToken(parser))
-            {
-                return JSON_Failure;
-            }
+               return JSON_Failure;
             goto reprocess;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_NUMBER_AFTER_E:
-        if (c == '+')
-        {
+      case LEXING_NUMBER_AFTER_E:
+         if (c == '+')
+         {
             codepointToRecord = c;
             parser->lexerState = LEXING_NUMBER_AFTER_EXPONENT_SIGN;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (c == '-')
-        {
+         }
+         else if (c == '-')
+         {
             codepointToRecord = c;
             SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNegativeExponent);
             parser->lexerState = LEXING_NUMBER_AFTER_EXPONENT_SIGN;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (c >= '0' && c <= '9')
-        {
+         }
+         else if (c >= '0' && c <= '9')
+         {
             codepointToRecord = c;
             parser->lexerState = LEXING_NUMBER_EXPONENT_DIGITS;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (!JSON_Parser_HandleInvalidNumber(parser, c, 1, JSON_ContainsExponent))
-        {
+         }
+         else if (!JSON_Parser_HandleInvalidNumber(parser, c, 1, JSON_ContainsExponent))
             return JSON_Failure;
-        }
-        goto advance;
+         goto advance;
 
-    case LEXING_NUMBER_AFTER_EXPONENT_SIGN:
-        if (c >= '0' && c <= '9')
-        {
+      case LEXING_NUMBER_AFTER_EXPONENT_SIGN:
+         if (c >= '0' && c <= '9')
+         {
             codepointToRecord = c;
             parser->lexerState = LEXING_NUMBER_EXPONENT_DIGITS;
             goto recordNumberCodepointAndAdvance;
-        }
-        else if (!JSON_Parser_HandleInvalidNumber(parser, c, 2, JSON_ContainsExponent | JSON_ContainsNegativeExponent))
-        {
+         }
+         else if (!JSON_Parser_HandleInvalidNumber(parser, c, 2, JSON_ContainsExponent | JSON_ContainsNegativeExponent))
             return JSON_Failure;
-        }
-        goto advance;
+         goto advance;
 
-    case LEXING_NUMBER_EXPONENT_DIGITS:
-        if (c >= '0' && c <= '9')
-        {
+      case LEXING_NUMBER_EXPONENT_DIGITS:
+         if (c >= '0' && c <= '9')
+         {
             codepointToRecord = c;
             goto recordNumberCodepointAndAdvance;
-        }
-        else
-        {
+         }
+         else
+         {
             /* The number is finished. */
             if (!JSON_Parser_ProcessToken(parser))
-            {
-                return JSON_Failure;
-            }
+               return JSON_Failure;
             goto reprocess;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_COMMENT_AFTER_SLASH:
-        if (c == '/')
-        {
+      case LEXING_COMMENT_AFTER_SLASH:
+         if (c == '/')
             parser->lexerState = LEXING_SINGLE_LINE_COMMENT;
-        }
-        else if (c == '*')
-        {
+         else if (c == '*')
             parser->lexerState = LEXING_MULTI_LINE_COMMENT;
-        }
-        else
-        {
+         else
+         {
             JSON_Parser_SetErrorAtToken(parser, JSON_Error_UnknownToken);
             return JSON_Failure;
-        }
-        goto advance;
+         }
+         goto advance;
 
-    case LEXING_SINGLE_LINE_COMMENT:
-        if (c == CARRIAGE_RETURN_CODEPOINT || c == LINE_FEED_CODEPOINT || c == EOF_CODEPOINT)
-        {
+      case LEXING_SINGLE_LINE_COMMENT:
+         if (c == CARRIAGE_RETURN_CODEPOINT || c == LINE_FEED_CODEPOINT || c == EOF_CODEPOINT)
             parser->lexerState = LEXING_WHITESPACE;
-        }
-        goto advance;
+         goto advance;
 
-    case LEXING_MULTI_LINE_COMMENT:
-        if (c == '*')
-        {
+      case LEXING_MULTI_LINE_COMMENT:
+         if (c == '*')
             parser->lexerState = LEXING_MULTI_LINE_COMMENT_AFTER_STAR;
-        }
-        goto advance;
+         goto advance;
 
-    case LEXING_MULTI_LINE_COMMENT_AFTER_STAR:
-        if (c == '/')
-        {
+      case LEXING_MULTI_LINE_COMMENT_AFTER_STAR:
+         if (c == '/')
             parser->lexerState = LEXING_WHITESPACE;
-        }
-        else if (c != '*')
-        {
+         else if (c != '*')
             parser->lexerState = LEXING_MULTI_LINE_COMMENT;
-        }
-        goto advance;
-    }
+         goto advance;
+   }
 
 recordStringCodepointAndAdvance:
 
-    tokenEncoding = parser->stringEncoding;
-    maxTokenLength = parser->maxStringLength;
-    if (!codepointToRecord)
-    {
-        SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNullCharacter | JSON_ContainsControlCharacter);
-    }
-    else if (codepointToRecord < FIRST_NON_CONTROL_CODEPOINT)
-    {
-        SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsControlCharacter);
-    }
-    else if (codepointToRecord >= FIRST_NON_BMP_CODEPOINT)
-    {
-        SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNonASCIICharacter | JSON_ContainsNonBMPCharacter);
-    }
-    else if (codepointToRecord >= FIRST_NON_ASCII_CODEPOINT)
-    {
-        SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNonASCIICharacter);
-    }
-    goto recordCodepointAndAdvance;
+   tokenEncoding  = parser->stringEncoding;
+   maxTokenLength = parser->maxStringLength;
+   if (!codepointToRecord)
+   {
+      SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNullCharacter | JSON_ContainsControlCharacter);
+   }
+   else if (codepointToRecord < FIRST_NON_CONTROL_CODEPOINT)
+   {
+      SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsControlCharacter);
+   }
+   else if (codepointToRecord >= FIRST_NON_BMP_CODEPOINT)
+   {
+      SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNonASCIICharacter | JSON_ContainsNonBMPCharacter);
+   }
+   else if (codepointToRecord >= FIRST_NON_ASCII_CODEPOINT)
+   {
+      SET_FLAGS_ON(TokenAttributes, parser->tokenAttributes, JSON_ContainsNonASCIICharacter);
+   }
+   goto recordCodepointAndAdvance;
 
 recordNumberCodepointAndAdvance:
 
-    tokenEncoding = parser->numberEncoding;
-    maxTokenLength = parser->maxNumberLength;
-    goto recordCodepointAndAdvance;
+   tokenEncoding = parser->numberEncoding;
+   maxTokenLength = parser->maxNumberLength;
+   goto recordCodepointAndAdvance;
 
 recordCodepointAndAdvance:
 
-    /* We always ensure that there are LONGEST_ENCODING_SEQUENCE bytes
-       available in the buffer for the next codepoint, so we don't have to
-       check whether there is room when we decode a new codepoint, and if
-       there isn't another codepoint, we have space already allocated for
-       the encoded null terminator.*/
-    parser->tokenBytesUsed += EncodeCodepoint(codepointToRecord, tokenEncoding, parser->pTokenBytes + parser->tokenBytesUsed);
-    if (parser->tokenBytesUsed > maxTokenLength)
-    {
-        JSON_Parser_SetErrorAtToken(parser, parser->token == T_NUMBER ? JSON_Error_TooLongNumber : JSON_Error_TooLongString);
-        return JSON_Failure;
-    }
-    if (parser->tokenBytesUsed > parser->tokenBytesLength - LONGEST_ENCODING_SEQUENCE)
-    {
-        byte* pBiggerBuffer = DoubleBuffer(&parser->memorySuite, parser->defaultTokenBytes, parser->pTokenBytes, parser->tokenBytesLength);
-        if (!pBiggerBuffer)
-        {
-            JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
-            return JSON_Failure;
-        }
-        parser->pTokenBytes = pBiggerBuffer;
-        parser->tokenBytesLength *= 2;
-    }
-    goto advance;
+   /* We always ensure that there are LONGEST_ENCODING_SEQUENCE bytes
+      available in the buffer for the next codepoint, so we don't have to
+      check whether there is room when we decode a new codepoint, and if
+      there isn't another codepoint, we have space already allocated for
+      the encoded null terminator.*/
+   parser->tokenBytesUsed += EncodeCodepoint(codepointToRecord, tokenEncoding, parser->pTokenBytes + parser->tokenBytesUsed);
+   if (parser->tokenBytesUsed > maxTokenLength)
+   {
+      JSON_Parser_SetErrorAtToken(parser, parser->token == T_NUMBER ? JSON_Error_TooLongNumber : JSON_Error_TooLongString);
+      return JSON_Failure;
+   }
+   if (parser->tokenBytesUsed > parser->tokenBytesLength - LONGEST_ENCODING_SEQUENCE)
+   {
+      byte* pBiggerBuffer = DoubleBuffer(&parser->memorySuite, parser->defaultTokenBytes, parser->pTokenBytes, parser->tokenBytesLength);
+      if (!pBiggerBuffer)
+      {
+         JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_OutOfMemory);
+         return JSON_Failure;
+      }
+      parser->pTokenBytes = pBiggerBuffer;
+      parser->tokenBytesLength *= 2;
+   }
+   goto advance;
 
 advance:
 
-    /* The current codepoint has been accepted, so advance the codepoint
-       location counters accordingly. Note that the one time we don't
-       do this is when the codepoint is EOF, which doesn't actually
-       appear in the input stream. */
-    if (c == CARRIAGE_RETURN_CODEPOINT)
-    {
-        SET_FLAGS_ON(ParserState, parser->state, PARSER_AFTER_CARRIAGE_RETURN);
-    }
-    if (c != EOF_CODEPOINT)
-    {
-        parser->codepointLocationByte += encodedLength;
-        if (c == CARRIAGE_RETURN_CODEPOINT || c == LINE_FEED_CODEPOINT)
-        {
-            /* The next character will begin a new line. */
-            parser->codepointLocationLine++;
-            parser->codepointLocationColumn = 0;
-        }
-        else
-        {
-            /* The next character will be on the same line. */
-            parser->codepointLocationColumn++;
-        }
-    }
+   /* The current codepoint has been accepted, so advance the codepoint
+      location counters accordingly. Note that the one time we don't
+      do this is when the codepoint is EOF, which doesn't actually
+      appear in the input stream. */
+   if (c == CARRIAGE_RETURN_CODEPOINT)
+   {
+      SET_FLAGS_ON(ParserState, parser->state, PARSER_AFTER_CARRIAGE_RETURN);
+   }
+   if (c != EOF_CODEPOINT)
+   {
+      parser->codepointLocationByte += encodedLength;
+      if (c == CARRIAGE_RETURN_CODEPOINT || c == LINE_FEED_CODEPOINT)
+      {
+         /* The next character will begin a new line. */
+         parser->codepointLocationLine++;
+         parser->codepointLocationColumn = 0;
+      }
+      else
+      {
+         /* The next character will be on the same line. */
+         parser->codepointLocationColumn++;
+      }
+   }
 
-    if (tokenFinished && !JSON_Parser_ProcessToken(parser))
-    {
-        return JSON_Failure;
-    }
+   if (tokenFinished && !JSON_Parser_ProcessToken(parser))
+      return JSON_Failure;
 
-    return JSON_Success;
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Parser_FlushLexer(JSON_Parser parser)
 {
-    /* Push the EOF codepoint to the lexer so that it can finish the pending
-       token, if any. The EOF codepoint is never emitted by the decoder
-       itself, since it is outside the Unicode range and therefore cannot
-       be encoded in any of the possible input encodings. */
-    if (!JSON_Parser_ProcessCodepoint(parser, EOF_CODEPOINT, 0))
-    {
-        return JSON_Failure;
-    }
+   /* Push the EOF codepoint to the lexer so that it can finish the pending
+      token, if any. The EOF codepoint is never emitted by the decoder
+      itself, since it is outside the Unicode range and therefore cannot
+      be encoded in any of the possible input encodings. */
+   if (!JSON_Parser_ProcessCodepoint(parser, EOF_CODEPOINT, 0))
+      return JSON_Failure;
 
-    /* The lexer should be idle when parsing finishes. */
-    if (parser->lexerState != LEXING_WHITESPACE)
-    {
-        JSON_Parser_SetErrorAtToken(parser, JSON_Error_IncompleteToken);
-        return JSON_Failure;
-    }
-    return JSON_Success;
+   /* The lexer should be idle when parsing finishes. */
+   if (parser->lexerState != LEXING_WHITESPACE)
+   {
+      JSON_Parser_SetErrorAtToken(parser, JSON_Error_IncompleteToken);
+      return JSON_Failure;
+   }
+   return JSON_Success;
 }
 
 /* Parser's decoder functions. */
 
 static JSON_Status JSON_Parser_CallEncodingDetectedHandler(JSON_Parser parser)
 {
-    if (parser->encodingDetectedHandler && parser->encodingDetectedHandler(parser) != JSON_Parser_Continue)
-    {
-        JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_AbortedByHandler);
-        return JSON_Failure;
-    }
-    return JSON_Success;
+   if (parser->encodingDetectedHandler && parser->encodingDetectedHandler(parser) != JSON_Parser_Continue)
+   {
+      JSON_Parser_SetErrorAtCodepoint(parser, JSON_Error_AbortedByHandler);
+      return JSON_Failure;
+   }
+   return JSON_Success;
 }
 
 /* Forward declaration. */
@@ -2385,800 +2292,760 @@ static JSON_Status JSON_Parser_ProcessInputBytes(JSON_Parser parser, const byte*
 
 static JSON_Status JSON_Parser_ProcessUnknownByte(JSON_Parser parser, byte b)
 {
-    /* When the input encoding is unknown, the first 4 bytes of input are
-       recorded in decoder.bits. */
+   /* When the input encoding is unknown, the first 4 bytes of input are
+      recorded in decoder.bits. */
+   byte bytes[LONGEST_ENCODING_SEQUENCE];
 
-    byte bytes[LONGEST_ENCODING_SEQUENCE];
-    switch (parser->decoderData.state)
-    {
-    case DECODER_RESET:
-        parser->decoderData.state = DECODED_1_OF_4;
-        parser->decoderData.bits = (uint32_t)b << 24;
-        break;
+   switch (parser->decoderData.state)
+   {
+      case DECODER_RESET:
+         parser->decoderData.state = DECODED_1_OF_4;
+         parser->decoderData.bits = (uint32_t)b << 24;
+         break;
 
-    case DECODED_1_OF_4:
-        parser->decoderData.state = DECODED_2_OF_4;
-        parser->decoderData.bits |= (uint32_t)b << 16;
-        break;
+      case DECODED_1_OF_4:
+         parser->decoderData.state = DECODED_2_OF_4;
+         parser->decoderData.bits |= (uint32_t)b << 16;
+         break;
 
-    case DECODED_2_OF_4:
-        parser->decoderData.state = DECODED_3_OF_4;
-        parser->decoderData.bits |= (uint32_t)b << 8;
-        break;
+      case DECODED_2_OF_4:
+         parser->decoderData.state = DECODED_3_OF_4;
+         parser->decoderData.bits |= (uint32_t)b << 8;
+         break;
 
-    case DECODED_3_OF_4:
-        bytes[0] = (byte)(parser->decoderData.bits >> 24);
-        bytes[1] = (byte)(parser->decoderData.bits >> 16);
-        bytes[2] = (byte)(parser->decoderData.bits >> 8);
-        bytes[3] = (byte)(b);
+      case DECODED_3_OF_4:
+         bytes[0] = (byte)(parser->decoderData.bits >> 24);
+         bytes[1] = (byte)(parser->decoderData.bits >> 16);
+         bytes[2] = (byte)(parser->decoderData.bits >> 8);
+         bytes[3] = (byte)(b);
 
-        /* We try to match the following patterns in order, where .. is any
-           byte value and nz is any non-zero byte value:
-              EF BB BF .. => UTF-8 with BOM
-              FF FE 00 00 => UTF-32LE with BOM
-              FF FE nz 00 => UTF-16LE with BOM
-              00 00 FE FF -> UTF-32BE with BOM
-              FE FF .. .. => UTF-16BE with BOM
-              nz nz .. .. => UTF-8
-              nz 00 nz .. => UTF-16LE
-              nz 00 00 00 => UTF-32LE
-              00 nz .. .. => UTF-16BE
-              00 00 00 nz => UTF-32BE
-              .. .. .. .. => unknown encoding */
-        if (bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
-        {
+         /* We try to match the following patterns in order, where .. is any
+            byte value and nz is any non-zero byte value:
+            EF BB BF .. => UTF-8 with BOM
+            FF FE 00 00 => UTF-32LE with BOM
+            FF FE nz 00 => UTF-16LE with BOM
+            00 00 FE FF -> UTF-32BE with BOM
+            FE FF .. .. => UTF-16BE with BOM
+            nz nz .. .. => UTF-8
+            nz 00 nz .. => UTF-16LE
+            nz 00 00 00 => UTF-32LE
+            00 nz .. .. => UTF-16BE
+            00 00 00 nz => UTF-32BE
+            .. .. .. .. => unknown encoding */
+         if (bytes[0] == 0xEF && bytes[1] == 0xBB && bytes[2] == 0xBF)
+         {
             /* EF BB BF .. */
             parser->inputEncoding = JSON_UTF8;
-        }
-        else if (bytes[0] == 0xFF && bytes[1] == 0xFE && bytes[3] == 0x00)
-        {
+         }
+         else if (bytes[0] == 0xFF && bytes[1] == 0xFE && bytes[3] == 0x00)
+         {
             /* FF FE 00 00 or
                FF FE nz 00 */
             parser->inputEncoding = (bytes[2] == 0x00) ? JSON_UTF32LE : JSON_UTF16LE;
-        }
-        else if (bytes[0] == 0x00 && bytes[1] == 0x00 && bytes[2] == 0xFE && bytes[3] == 0xFF)
-        {
+         }
+         else if (bytes[0] == 0x00 && bytes[1] == 0x00 && bytes[2] == 0xFE && bytes[3] == 0xFF)
+         {
             /* 00 00 FE FF */
             parser->inputEncoding = JSON_UTF32BE;
-        }
-        else if (bytes[0] == 0xFE && bytes[1] == 0xFF)
-        {
+         }
+         else if (bytes[0] == 0xFE && bytes[1] == 0xFF)
+         {
             /* FE FF .. .. */
             parser->inputEncoding = JSON_UTF16BE;
-        }
-        else if (bytes[0] != 0x00)
-        {
+         }
+         else if (bytes[0] != 0x00)
+         {
             /* nz .. .. .. */
             if (bytes[1] != 0x00)
             {
-                /* nz nz .. .. */
-                parser->inputEncoding = JSON_UTF8;
+               /* nz nz .. .. */
+               parser->inputEncoding = JSON_UTF8;
             }
             else if (bytes[2] != 0x00)
             {
-                /* nz 00 nz .. */
-                parser->inputEncoding = JSON_UTF16LE;
+               /* nz 00 nz .. */
+               parser->inputEncoding = JSON_UTF16LE;
             }
             else if (bytes[3] == 0x00)
             {
-                /* nz 00 00 00 */
-                parser->inputEncoding = JSON_UTF32LE;
+               /* nz 00 00 00 */
+               parser->inputEncoding = JSON_UTF32LE;
             }
             else
             {
-                /* nz 00 00 nz => error */
+               /* nz 00 00 nz => error */
             }
-        }
-        else if (bytes[1] != 0x00)
-        {
+         }
+         else if (bytes[1] != 0x00)
+         {
             /* 00 nz .. .. */
             parser->inputEncoding = JSON_UTF16BE;
-        }
-        else if (bytes[2] == 0x00 && bytes[3] != 0x00)
-        {
+         }
+         else if (bytes[2] == 0x00 && bytes[3] != 0x00)
+         {
             /* 00 00 00 nz */
             parser->inputEncoding = JSON_UTF32BE;
-        }
-        else
-        {
+         }
+         else
+         {
             /* 00 00 nz .. or
                00 00 00 00 => error */
-        }
+         }
 
-        if (parser->inputEncoding == JSON_UnknownEncoding)
-        {
+         if (parser->inputEncoding == JSON_UnknownEncoding)
             return JSON_Parser_HandleInvalidEncodingSequence(parser, 4);
-        }
 
-        if (!JSON_Parser_CallEncodingDetectedHandler(parser))
-        {
+         if (!JSON_Parser_CallEncodingDetectedHandler(parser))
             return JSON_Failure;
-        }
 
-        /* Reset the decoder before reprocessing the bytes. */
-        Decoder_Reset(&parser->decoderData);
-        return JSON_Parser_ProcessInputBytes(parser, bytes, 4);
-    }
+         /* Reset the decoder before reprocessing the bytes. */
+         Decoder_Reset(&parser->decoderData);
+         return JSON_Parser_ProcessInputBytes(parser, bytes, 4);
+   }
 
-    /* We don't have 4 bytes yet. */
-    return JSON_Success;
+   /* We don't have 4 bytes yet. */
+   return JSON_Success;
 }
 
 JSON_Status JSON_Parser_ProcessInputBytes(JSON_Parser parser, const byte* pBytes, size_t length)
 {
-    /* Note that if length is 0, pBytes is allowed to be NULL. */
-    size_t i = 0;
-    while (parser->inputEncoding == JSON_UnknownEncoding && i < length)
-    {
-        if (!JSON_Parser_ProcessUnknownByte(parser, pBytes[i]))
-        {
-            return JSON_Failure;
-        }
-        i++;
-    }
-    while (i < length)
-    {
-        DecoderOutput output = Decoder_ProcessByte(&parser->decoderData, parser->inputEncoding, pBytes[i]);
-        DecoderResultCode result = DECODER_RESULT_CODE(output);
-        switch (result)
-        {
-        case SEQUENCE_PENDING:
+   /* Note that if length is 0, pBytes is allowed to be NULL. */
+   size_t i = 0;
+   while (parser->inputEncoding == JSON_UnknownEncoding && i < length)
+   {
+      if (!JSON_Parser_ProcessUnknownByte(parser, pBytes[i]))
+         return JSON_Failure;
+      i++;
+   }
+   while (i < length)
+   {
+      DecoderOutput output     = Decoder_ProcessByte(
+            &parser->decoderData, parser->inputEncoding, pBytes[i]);
+      DecoderResultCode result = DECODER_RESULT_CODE(output);
+      switch (result)
+      {
+         case SEQUENCE_PENDING:
             i++;
             break;
 
-        case SEQUENCE_COMPLETE:
-            if (!JSON_Parser_ProcessCodepoint(parser, DECODER_CODEPOINT(output), DECODER_SEQUENCE_LENGTH(output)))
-            {
-                return JSON_Failure;
-            }
+         case SEQUENCE_COMPLETE:
+            if (!JSON_Parser_ProcessCodepoint(
+                     parser, DECODER_CODEPOINT(output),
+                     DECODER_SEQUENCE_LENGTH(output)))
+               return JSON_Failure;
             i++;
             break;
 
-        case SEQUENCE_INVALID_INCLUSIVE:
+         case SEQUENCE_INVALID_INCLUSIVE:
             i++;
             /* fallthrough */
-        case SEQUENCE_INVALID_EXCLUSIVE:
-            if (!JSON_Parser_HandleInvalidEncodingSequence(parser, DECODER_SEQUENCE_LENGTH(output)))
-            {
-                return JSON_Failure;
-            }
+         case SEQUENCE_INVALID_EXCLUSIVE:
+            if (!JSON_Parser_HandleInvalidEncodingSequence(
+                     parser, DECODER_SEQUENCE_LENGTH(output)))
+               return JSON_Failure;
             break;
-        }
-    }
-    return JSON_Success;
+      }
+   }
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Parser_FlushDecoder(JSON_Parser parser)
 {
-    /* If the input was 1, 2, or 3 bytes long, and the input encoding was not
-       explicitly specified by the client, we can sometimes make a reasonable
-       guess. If the input was 1 or 3 bytes long, the only encoding that could
-       possibly be valid JSON is UF-8. If the input was 2 bytes long, we try
-       to match the following patterns in order, where .. is any byte value
-       and nz is any non-zero byte value:
-         FF FE => UTF-16LE with BOM
-         FE FF => UTF-16BE with BOM
-         nz nz => UTF-8
-         nz 00 => UTF-16LE
-         00 nz => UTF-16BE
-         .. .. => unknown encoding
-    */
-    if (parser->inputEncoding == JSON_UnknownEncoding &&
-        parser->decoderData.state != DECODER_RESET)
-    {
-        byte bytes[3];
-        size_t length = 0;
-        bytes[0] = (byte)(parser->decoderData.bits >> 24);
-        bytes[1] = (byte)(parser->decoderData.bits >> 16);
-        bytes[2] = (byte)(parser->decoderData.bits >> 8);
-        switch (parser->decoderData.state)
-        {
-        case DECODED_1_OF_4:
+   /* If the input was 1, 2, or 3 bytes long, and the input encoding was not
+      explicitly specified by the client, we can sometimes make a reasonable
+      guess. If the input was 1 or 3 bytes long, the only encoding that could
+      possibly be valid JSON is UF-8. If the input was 2 bytes long, we try
+      to match the following patterns in order, where .. is any byte value
+      and nz is any non-zero byte value:
+      FF FE => UTF-16LE with BOM
+      FE FF => UTF-16BE with BOM
+      nz nz => UTF-8
+      nz 00 => UTF-16LE
+      00 nz => UTF-16BE
+      .. .. => unknown encoding
+      */
+   if (parser->inputEncoding == JSON_UnknownEncoding &&
+         parser->decoderData.state != DECODER_RESET)
+   {
+      byte bytes[3];
+      size_t length = 0;
+      bytes[0] = (byte)(parser->decoderData.bits >> 24);
+      bytes[1] = (byte)(parser->decoderData.bits >> 16);
+      bytes[2] = (byte)(parser->decoderData.bits >> 8);
+
+      switch (parser->decoderData.state)
+      {
+         case DECODED_1_OF_4:
             parser->inputEncoding = JSON_UTF8;
             length = 1;
             break;
 
-        case DECODED_2_OF_4:
+         case DECODED_2_OF_4:
+            /* FF FE */
             if (bytes[0] == 0xFF && bytes[1] == 0xFE)
-            {
-                /* FF FE */
-                parser->inputEncoding = JSON_UTF16LE;
-            }
+               parser->inputEncoding = JSON_UTF16LE;
+            /* FE FF */
             else if (bytes[0] == 0xFE && bytes[1] == 0xFF)
-            {
-                /* FE FF */
-                parser->inputEncoding = JSON_UTF16BE;
-            }
+               parser->inputEncoding = JSON_UTF16BE;
             else if (bytes[0] != 0x00)
             {
-                /* nz nz or
-                   nz 00 */
-                parser->inputEncoding = bytes[1] ? JSON_UTF8 : JSON_UTF16LE;
+               /* nz nz or
+                  nz 00 */
+               parser->inputEncoding = bytes[1] ? JSON_UTF8 : JSON_UTF16LE;
             }
+            /* 00 nz */
             else if (bytes[1] != 0x00)
-            {
-                /* 00 nz */
-                parser->inputEncoding = JSON_UTF16BE;
-            }
+               parser->inputEncoding = JSON_UTF16BE;
+            /* 00 00 */
             else
-            {
-                /* 00 00 */
-                return JSON_Parser_HandleInvalidEncodingSequence(parser, 2);
-            }
+               return JSON_Parser_HandleInvalidEncodingSequence(parser, 2);
             length = 2;
             break;
 
-        case DECODED_3_OF_4:
+         case DECODED_3_OF_4:
             parser->inputEncoding = JSON_UTF8;
             length = 3;
             break;
-        }
+      }
 
-        if (!JSON_Parser_CallEncodingDetectedHandler(parser))
-        {
-            return JSON_Failure;
-        }
+      if (!JSON_Parser_CallEncodingDetectedHandler(parser))
+         return JSON_Failure;
 
-        /* Reset the decoder before reprocessing the bytes. */
-        parser->decoderData.state = DECODER_RESET;
-        parser->decoderData.bits = 0;
-        if (!JSON_Parser_ProcessInputBytes(parser, bytes, length))
-        {
-            return JSON_Failure;
-        }
-    }
+      /* Reset the decoder before reprocessing the bytes. */
+      parser->decoderData.state = DECODER_RESET;
+      parser->decoderData.bits = 0;
+      if (!JSON_Parser_ProcessInputBytes(parser, bytes, length))
+         return JSON_Failure;
+   }
 
-    /* The decoder should be idle when parsing finishes. */
-    if (Decoder_SequencePending(&parser->decoderData))
-    {
-        return JSON_Parser_HandleInvalidEncodingSequence(parser, DECODER_STATE_BYTES(parser->decoderData.state));
-    }
-    return JSON_Success;
+   /* The decoder should be idle when parsing finishes. */
+   if (Decoder_SequencePending(&parser->decoderData))
+      return JSON_Parser_HandleInvalidEncodingSequence(
+            parser, DECODER_STATE_BYTES(parser->decoderData.state));
+   return JSON_Success;
 }
 
 /* Parser API functions. */
 
 JSON_Parser JSON_CALL JSON_Parser_Create(const JSON_MemorySuite* pMemorySuite)
 {
-    JSON_Parser parser;
-    JSON_MemorySuite memorySuite;
-    if (pMemorySuite)
-    {
-        memorySuite = *pMemorySuite;
-        if (!memorySuite.realloc || !memorySuite.free)
-        {
-            /* The full memory suite must be specified. */
-            return NULL;
-        }
-    }
-    else
-    {
-        memorySuite = defaultMemorySuite;
-    }
-    parser = (JSON_Parser)memorySuite.realloc(memorySuite.userData, NULL, sizeof(struct JSON_Parser_Data));
-    if (!parser)
-    {
-        return NULL;
-    }
-    parser->memorySuite = memorySuite;
-    JSON_Parser_ResetData(parser, 0/* isInitialized */);
-    return parser;
+   JSON_Parser parser;
+   JSON_MemorySuite memorySuite;
+
+   if (pMemorySuite)
+   {
+      memorySuite = *pMemorySuite;
+
+      /* The full memory suite must be specified. */
+      if (!memorySuite.realloc || !memorySuite.free)
+         return NULL;
+   }
+   else
+      memorySuite = defaultMemorySuite;
+
+   parser = (JSON_Parser)memorySuite.realloc(memorySuite.userData, NULL, sizeof(struct JSON_Parser_Data));
+
+   if (!parser)
+      return NULL;
+
+   parser->memorySuite = memorySuite;
+   JSON_Parser_ResetData(parser, 0/* isInitialized */);
+   return parser;
 }
 
 JSON_Status JSON_CALL JSON_Parser_Free(JSON_Parser parser)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_IN_PROTECTED_API))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_PROTECTED_API);
-    if (parser->pTokenBytes != parser->defaultTokenBytes)
-    {
-        parser->memorySuite.free(parser->memorySuite.userData, parser->pTokenBytes);
-    }
-    while (parser->pMemberNames)
-    {
-        JSON_Parser_PopMemberNameList(parser);
-    }
-    Grammarian_FreeAllocations(&parser->grammarianData, &parser->memorySuite);
-    parser->memorySuite.free(parser->memorySuite.userData, parser);
-    return JSON_Success;
+   if (!parser || GET_FLAGS(parser->state, PARSER_IN_PROTECTED_API))
+      return JSON_Failure;
+
+   SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_PROTECTED_API);
+
+   if (parser->pTokenBytes != parser->defaultTokenBytes)
+      parser->memorySuite.free(parser->memorySuite.userData, parser->pTokenBytes);
+
+   while (parser->pMemberNames)
+      JSON_Parser_PopMemberNameList(parser);
+
+   Grammarian_FreeAllocations(&parser->grammarianData, &parser->memorySuite);
+   parser->memorySuite.free(parser->memorySuite.userData, parser);
+   return JSON_Success;
 }
 
 JSON_Status JSON_CALL JSON_Parser_Reset(JSON_Parser parser)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_IN_PROTECTED_API))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_PROTECTED_API);
-    JSON_Parser_ResetData(parser, 1/* isInitialized */);
-    /* Note that JSON_Parser_ResetData() unset PARSER_IN_PROTECTED_API for us. */
-    return JSON_Success;
+   if (!parser || GET_FLAGS(parser->state, PARSER_IN_PROTECTED_API))
+      return JSON_Failure;
+   SET_FLAGS_ON(ParserState, parser->state, PARSER_IN_PROTECTED_API);
+   JSON_Parser_ResetData(parser, 1/* isInitialized */);
+   /* Note that JSON_Parser_ResetData() unset PARSER_IN_PROTECTED_API for us. */
+   return JSON_Success;
 }
 
 void* JSON_CALL JSON_Parser_GetUserData(JSON_Parser parser)
 {
-    return parser ? parser->userData : NULL;
+   return parser ? parser->userData : NULL;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetUserData(JSON_Parser parser, void* userData)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->userData = userData;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+   parser->userData = userData;
+   return JSON_Success;
 }
 
 JSON_Encoding JSON_CALL JSON_Parser_GetInputEncoding(JSON_Parser parser)
 {
-    return parser ? (JSON_Encoding)parser->inputEncoding : JSON_UnknownEncoding;
+   return parser ? (JSON_Encoding)parser->inputEncoding : JSON_UnknownEncoding;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetInputEncoding(JSON_Parser parser, JSON_Encoding encoding)
 {
-    if (!parser || encoding < JSON_UnknownEncoding || encoding > JSON_UTF32BE || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    parser->inputEncoding = (Encoding)encoding;
-    return JSON_Success;
+   if (     !parser 
+         || encoding < JSON_UnknownEncoding 
+         || encoding > JSON_UTF32BE 
+         || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   parser->inputEncoding = (Encoding)encoding;
+   return JSON_Success;
 }
 
 JSON_Encoding JSON_CALL JSON_Parser_GetStringEncoding(JSON_Parser parser)
 {
-    return parser ? (JSON_Encoding)parser->stringEncoding : JSON_UTF8;
+   return parser ? (JSON_Encoding)parser->stringEncoding : JSON_UTF8;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetStringEncoding(JSON_Parser parser, JSON_Encoding encoding)
 {
-    if (!parser || encoding <= JSON_UnknownEncoding || encoding > JSON_UTF32BE || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    parser->stringEncoding = (Encoding)encoding;
-    return JSON_Success;
+   if (
+            !parser 
+         || encoding <= JSON_UnknownEncoding 
+         || encoding > JSON_UTF32BE 
+         || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   parser->stringEncoding = (Encoding)encoding;
+   return JSON_Success;
 }
 
 size_t JSON_CALL JSON_Parser_GetMaxStringLength(JSON_Parser parser)
 {
-    return parser ? parser->maxStringLength : SIZE_MAX;
+   return parser ? parser->maxStringLength : SIZE_MAX;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetMaxStringLength(JSON_Parser parser, size_t maxLength)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    parser->maxStringLength = maxLength;
-    return JSON_Success;
+   if (     !parser 
+         || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   parser->maxStringLength = maxLength;
+   return JSON_Success;
 }
 
 JSON_Encoding JSON_CALL JSON_Parser_GetNumberEncoding(JSON_Parser parser)
 {
-    return parser ? (JSON_Encoding)parser->numberEncoding : JSON_UTF8;
+   return parser ? (JSON_Encoding)parser->numberEncoding : JSON_UTF8;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetNumberEncoding(JSON_Parser parser, JSON_Encoding encoding)
 {
-    if (!parser || encoding <= JSON_UnknownEncoding || encoding > JSON_UTF32BE || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    parser->numberEncoding = (Encoding)encoding;
-    return JSON_Success;
+   if (!parser || encoding <= JSON_UnknownEncoding || encoding > JSON_UTF32BE || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   parser->numberEncoding = (Encoding)encoding;
+   return JSON_Success;
 }
 
 size_t JSON_CALL JSON_Parser_GetMaxNumberLength(JSON_Parser parser)
 {
-    return parser ? parser->maxNumberLength : SIZE_MAX;
+   return parser ? parser->maxNumberLength : SIZE_MAX;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetMaxNumberLength(JSON_Parser parser, size_t maxLength)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    parser->maxNumberLength = maxLength;
-    return JSON_Success;
+   if (     !parser 
+         || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   parser->maxNumberLength = maxLength;
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Parser_GetAllowBOM(JSON_Parser parser)
 {
-    return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_BOM)) ? JSON_True : JSON_False;
+   return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_BOM)) ? JSON_True : JSON_False;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetAllowBOM(JSON_Parser parser, JSON_Boolean allowBOM)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_BOM, allowBOM);
-    return JSON_Success;
+   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_BOM, allowBOM);
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Parser_GetAllowComments(JSON_Parser parser)
 {
-    return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_COMMENTS)) ? JSON_True : JSON_False;
+   return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_COMMENTS)) ? JSON_True : JSON_False;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetAllowComments(JSON_Parser parser, JSON_Boolean allowComments)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_COMMENTS, allowComments);
-    return JSON_Success;
+   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_COMMENTS, allowComments);
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Parser_GetAllowSpecialNumbers(JSON_Parser parser)
 {
-    return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS)) ? JSON_True : JSON_False;
+   return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS)) ? JSON_True : JSON_False;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetAllowSpecialNumbers(JSON_Parser parser, JSON_Boolean allowSpecialNumbers)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS, allowSpecialNumbers);
-    return JSON_Success;
+   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_SPECIAL_NUMBERS, allowSpecialNumbers);
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Parser_GetAllowHexNumbers(JSON_Parser parser)
 {
-    return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_HEX_NUMBERS)) ? JSON_True : JSON_False;
+   return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_HEX_NUMBERS)) ? JSON_True : JSON_False;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetAllowHexNumbers(JSON_Parser parser, JSON_Boolean allowHexNumbers)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_HEX_NUMBERS, allowHexNumbers);
-    return JSON_Success;
+   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_HEX_NUMBERS, allowHexNumbers);
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Parser_GetAllowUnescapedControlCharacters(JSON_Parser parser)
 {
-    return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_CONTROL_CHARS)) ? JSON_True : JSON_False;
+   return (parser && GET_FLAGS(parser->flags, PARSER_ALLOW_CONTROL_CHARS)) ? JSON_True : JSON_False;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetAllowUnescapedControlCharacters(JSON_Parser parser, JSON_Boolean allowUnescapedControlCharacters)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_CONTROL_CHARS, allowUnescapedControlCharacters);
-    return JSON_Success;
+   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   SET_FLAGS(ParserFlags, parser->flags, PARSER_ALLOW_CONTROL_CHARS, allowUnescapedControlCharacters);
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Parser_GetReplaceInvalidEncodingSequences(JSON_Parser parser)
 {
-    return (parser && GET_FLAGS(parser->flags, PARSER_REPLACE_INVALID)) ? JSON_True : JSON_False;
+   return (parser && GET_FLAGS(parser->flags, PARSER_REPLACE_INVALID)) ? JSON_True : JSON_False;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetReplaceInvalidEncodingSequences(JSON_Parser parser, JSON_Boolean replaceInvalidEncodingSequences)
+JSON_Status JSON_CALL JSON_Parser_SetReplaceInvalidEncodingSequences(
+      JSON_Parser parser, JSON_Boolean replaceInvalidEncodingSequences)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(ParserFlags, parser->flags, PARSER_REPLACE_INVALID, replaceInvalidEncodingSequences);
-    return JSON_Success;
+   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
+      return JSON_Failure;
+   SET_FLAGS(ParserFlags, parser->flags, PARSER_REPLACE_INVALID, replaceInvalidEncodingSequences);
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Parser_GetTrackObjectMembers(JSON_Parser parser)
 {
-    return (parser && GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS)) ? JSON_True : JSON_False;
+   return (parser && GET_FLAGS(parser->flags, PARSER_TRACK_OBJECT_MEMBERS)) ? JSON_True : JSON_False;
 }
 
 JSON_Status JSON_CALL JSON_Parser_SetTrackObjectMembers(JSON_Parser parser, JSON_Boolean trackObjectMembers)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(ParserFlags, parser->flags, PARSER_TRACK_OBJECT_MEMBERS, trackObjectMembers);
-    return JSON_Success;
+   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
+   {
+      return JSON_Failure;
+   }
+   SET_FLAGS(ParserFlags, parser->flags, PARSER_TRACK_OBJECT_MEMBERS, trackObjectMembers);
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Parser_GetStopAfterEmbeddedDocument(JSON_Parser parser)
 {
-    return (parser && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT)) ? JSON_True : JSON_False;
+   return (parser && GET_FLAGS(parser->flags, PARSER_EMBEDDED_DOCUMENT)) ? JSON_True : JSON_False;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetStopAfterEmbeddedDocument(JSON_Parser parser, JSON_Boolean stopAfterEmbeddedDocument)
+JSON_Status JSON_CALL JSON_Parser_SetStopAfterEmbeddedDocument(
+      JSON_Parser parser, JSON_Boolean stopAfterEmbeddedDocument)
 {
-    if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(ParserFlags, parser->flags, PARSER_EMBEDDED_DOCUMENT, stopAfterEmbeddedDocument);
-    return JSON_Success;
+   if (!parser || GET_FLAGS(parser->state, PARSER_STARTED))
+   {
+      return JSON_Failure;
+   }
+   SET_FLAGS(ParserFlags, parser->flags, PARSER_EMBEDDED_DOCUMENT, stopAfterEmbeddedDocument);
+   return JSON_Success;
 }
 
 JSON_Error JSON_CALL JSON_Parser_GetError(JSON_Parser parser)
 {
-    return parser ? (JSON_Error)parser->error : JSON_Error_None;
+   return parser ? (JSON_Error)parser->error : JSON_Error_None;
 }
 
-JSON_Status JSON_CALL JSON_Parser_GetErrorLocation(JSON_Parser parser, JSON_Location* pLocation)
+JSON_Status JSON_CALL JSON_Parser_GetErrorLocation(
+      JSON_Parser parser, JSON_Location* pLocation)
 {
-    if (!pLocation || !parser || parser->error == JSON_Error_None)
-    {
-        return JSON_Failure;
-    }
-    if (parser->errorOffset == ERROR_LOCATION_IS_TOKEN_START)
-    {
-        pLocation->byte = parser->tokenLocationByte;
-        pLocation->line = parser->tokenLocationLine;
-        pLocation->column = parser->tokenLocationColumn;
-    }
-    else
-    {
-        pLocation->byte = parser->codepointLocationByte - (SHORTEST_ENCODING_SEQUENCE(parser->inputEncoding) * parser->errorOffset);
-        pLocation->line = parser->codepointLocationLine;
-        pLocation->column = parser->codepointLocationColumn - parser->errorOffset;
-    }
-    pLocation->depth = parser->depth;
-    return JSON_Success;
+   if (!pLocation || !parser || parser->error == JSON_Error_None)
+      return JSON_Failure;
+
+   if (parser->errorOffset == ERROR_LOCATION_IS_TOKEN_START)
+   {
+      pLocation->byte = parser->tokenLocationByte;
+      pLocation->line = parser->tokenLocationLine;
+      pLocation->column = parser->tokenLocationColumn;
+   }
+   else
+   {
+      pLocation->byte = parser->codepointLocationByte - (SHORTEST_ENCODING_SEQUENCE(parser->inputEncoding) * parser->errorOffset);
+      pLocation->line = parser->codepointLocationLine;
+      pLocation->column = parser->codepointLocationColumn - parser->errorOffset;
+   }
+   pLocation->depth = parser->depth;
+   return JSON_Success;
 }
 
-JSON_Status JSON_CALL JSON_Parser_GetTokenLocation(JSON_Parser parser, JSON_Location* pLocation)
+JSON_Status JSON_CALL JSON_Parser_GetTokenLocation(
+      JSON_Parser parser, JSON_Location* pLocation)
 {
-    if (!parser || !pLocation || !GET_FLAGS(parser->state, PARSER_IN_TOKEN_HANDLER))
-    {
-        return JSON_Failure;
-    }
-    pLocation->byte = parser->tokenLocationByte;
-    pLocation->line = parser->tokenLocationLine;
-    pLocation->column = parser->tokenLocationColumn;
-    pLocation->depth = parser->depth;
-    return JSON_Success;
+   if (!parser || !pLocation || !GET_FLAGS(parser->state, PARSER_IN_TOKEN_HANDLER))
+      return JSON_Failure;
+
+   pLocation->byte = parser->tokenLocationByte;
+   pLocation->line = parser->tokenLocationLine;
+   pLocation->column = parser->tokenLocationColumn;
+   pLocation->depth = parser->depth;
+   return JSON_Success;
 }
 
-JSON_Status JSON_CALL JSON_Parser_GetAfterTokenLocation(JSON_Parser parser, JSON_Location* pLocation)
+JSON_Status JSON_CALL JSON_Parser_GetAfterTokenLocation(
+      JSON_Parser parser, JSON_Location* pLocation)
 {
-    if (!parser || !pLocation || !GET_FLAGS(parser->state, PARSER_IN_TOKEN_HANDLER))
-    {
-        return JSON_Failure;
-    }
-    pLocation->byte = parser->codepointLocationByte;
-    pLocation->line = parser->codepointLocationLine;
-    pLocation->column = parser->codepointLocationColumn;
-    pLocation->depth = parser->depth;
-    return JSON_Success;
+   if (!parser || !pLocation || !GET_FLAGS(parser->state, PARSER_IN_TOKEN_HANDLER))
+      return JSON_Failure;
+
+   pLocation->byte = parser->codepointLocationByte;
+   pLocation->line = parser->codepointLocationLine;
+   pLocation->column = parser->codepointLocationColumn;
+   pLocation->depth = parser->depth;
+   return JSON_Success;
 }
 
 JSON_Parser_NullHandler JSON_CALL JSON_Parser_GetEncodingDetectedHandler(JSON_Parser parser)
 {
-    return parser ? parser->encodingDetectedHandler : NULL;
+   return parser ? parser->encodingDetectedHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetEncodingDetectedHandler(JSON_Parser parser, JSON_Parser_EncodingDetectedHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetEncodingDetectedHandler(
+      JSON_Parser parser, JSON_Parser_EncodingDetectedHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->encodingDetectedHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->encodingDetectedHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_NullHandler JSON_CALL JSON_Parser_GetNullHandler(JSON_Parser parser)
 {
-    return parser ? parser->nullHandler : NULL;
+   return parser ? parser->nullHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetNullHandler(JSON_Parser parser, JSON_Parser_NullHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetNullHandler(
+      JSON_Parser parser, JSON_Parser_NullHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->nullHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->nullHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_BooleanHandler JSON_CALL JSON_Parser_GetBooleanHandler(JSON_Parser parser)
 {
-    return parser ? parser->booleanHandler : NULL;
+   return parser ? parser->booleanHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetBooleanHandler(JSON_Parser parser, JSON_Parser_BooleanHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetBooleanHandler(
+      JSON_Parser parser, JSON_Parser_BooleanHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->booleanHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->booleanHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_StringHandler JSON_CALL JSON_Parser_GetStringHandler(JSON_Parser parser)
 {
-    return parser ? parser->stringHandler : NULL;
+   return parser ? parser->stringHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetStringHandler(JSON_Parser parser, JSON_Parser_StringHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetStringHandler(
+      JSON_Parser parser, JSON_Parser_StringHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->stringHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->stringHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_NumberHandler JSON_CALL JSON_Parser_GetNumberHandler(JSON_Parser parser)
 {
-    return parser ? parser->numberHandler : NULL;
+   return parser ? parser->numberHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetNumberHandler(JSON_Parser parser, JSON_Parser_NumberHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetNumberHandler(
+      JSON_Parser parser, JSON_Parser_NumberHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->numberHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->numberHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_SpecialNumberHandler JSON_CALL JSON_Parser_GetSpecialNumberHandler(JSON_Parser parser)
 {
-    return parser ? parser->specialNumberHandler : NULL;
+   return parser ? parser->specialNumberHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetSpecialNumberHandler(JSON_Parser parser, JSON_Parser_SpecialNumberHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetSpecialNumberHandler(
+      JSON_Parser parser, JSON_Parser_SpecialNumberHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->specialNumberHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+   parser->specialNumberHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_StartObjectHandler JSON_CALL JSON_Parser_GetStartObjectHandler(JSON_Parser parser)
 {
-    return parser ? parser->startObjectHandler : NULL;
+   return parser ? parser->startObjectHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetStartObjectHandler(JSON_Parser parser, JSON_Parser_StartObjectHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetStartObjectHandler(
+      JSON_Parser parser, JSON_Parser_StartObjectHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->startObjectHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->startObjectHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_EndObjectHandler JSON_CALL JSON_Parser_GetEndObjectHandler(JSON_Parser parser)
 {
-    return parser ? parser->endObjectHandler : NULL;
+   return parser ? parser->endObjectHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetEndObjectHandler(JSON_Parser parser, JSON_Parser_EndObjectHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetEndObjectHandler(
+      JSON_Parser parser, JSON_Parser_EndObjectHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->endObjectHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->endObjectHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_ObjectMemberHandler JSON_CALL JSON_Parser_GetObjectMemberHandler(JSON_Parser parser)
 {
-    return parser ? parser->objectMemberHandler : NULL;
+   return parser ? parser->objectMemberHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetObjectMemberHandler(JSON_Parser parser, JSON_Parser_ObjectMemberHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetObjectMemberHandler(
+      JSON_Parser parser, JSON_Parser_ObjectMemberHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->objectMemberHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->objectMemberHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_StartArrayHandler JSON_CALL JSON_Parser_GetStartArrayHandler(JSON_Parser parser)
 {
-    return parser ? parser->startArrayHandler : NULL;
+   return parser ? parser->startArrayHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetStartArrayHandler(JSON_Parser parser, JSON_Parser_StartArrayHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetStartArrayHandler(
+      JSON_Parser parser, JSON_Parser_StartArrayHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->startArrayHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->startArrayHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_EndArrayHandler JSON_CALL JSON_Parser_GetEndArrayHandler(JSON_Parser parser)
 {
-    return parser ? parser->endArrayHandler : NULL;
+   return parser ? parser->endArrayHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetEndArrayHandler(JSON_Parser parser, JSON_Parser_EndArrayHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetEndArrayHandler(
+      JSON_Parser parser, JSON_Parser_EndArrayHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->endArrayHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->endArrayHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Parser_ArrayItemHandler JSON_CALL JSON_Parser_GetArrayItemHandler(JSON_Parser parser)
 {
-    return parser ? parser->arrayItemHandler : NULL;
+   return parser ? parser->arrayItemHandler : NULL;
 }
 
-JSON_Status JSON_CALL JSON_Parser_SetArrayItemHandler(JSON_Parser parser, JSON_Parser_ArrayItemHandler handler)
+JSON_Status JSON_CALL JSON_Parser_SetArrayItemHandler(
+      JSON_Parser parser, JSON_Parser_ArrayItemHandler handler)
 {
-    if (!parser)
-    {
-        return JSON_Failure;
-    }
-    parser->arrayItemHandler = handler;
-    return JSON_Success;
+   if (!parser)
+      return JSON_Failure;
+
+   parser->arrayItemHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Status JSON_CALL JSON_Parser_Parse(JSON_Parser parser, const char* pBytes, size_t length, JSON_Boolean isFinal)
 {
-    JSON_Status status = JSON_Failure;
-    if (parser && (pBytes || !length) && !GET_FLAGS(parser->state, PARSER_FINISHED | PARSER_IN_PROTECTED_API))
-    {
-        int finishedParsing = 0;
-        SET_FLAGS_ON(ParserState, parser->state, PARSER_STARTED | PARSER_IN_PROTECTED_API);
-        if (JSON_Parser_ProcessInputBytes(parser, (const byte*)pBytes, length))
-        {
-            /* New input was parsed successfully. */
-            if (isFinal)
-            {
-                /* Make sure there is nothing pending in the decoder, lexer,
-                   or parser. */
-                if (JSON_Parser_FlushDecoder(parser) &&
-                    JSON_Parser_FlushLexer(parser) &&
-                    JSON_Parser_FlushParser(parser))
-                {
-                    status = JSON_Success;
-                }
-                finishedParsing = 1;
-            }
-            else
-            {
-                status = JSON_Success;
-            }
-        }
-        else
-        {
-            /* New input failed to parse. */
+   JSON_Status status = JSON_Failure;
+   if (parser && (pBytes || !length) && !GET_FLAGS(parser->state, PARSER_FINISHED | PARSER_IN_PROTECTED_API))
+   {
+      int finishedParsing = 0;
+      SET_FLAGS_ON(ParserState, parser->state, PARSER_STARTED | PARSER_IN_PROTECTED_API);
+      if (JSON_Parser_ProcessInputBytes(parser, (const byte*)pBytes, length))
+      {
+         /* New input was parsed successfully. */
+         if (isFinal)
+         {
+            /* Make sure there is nothing pending in the decoder, lexer,
+               or parser. */
+            if (JSON_Parser_FlushDecoder(parser) &&
+                  JSON_Parser_FlushLexer(parser) &&
+                  JSON_Parser_FlushParser(parser))
+               status = JSON_Success;
+
             finishedParsing = 1;
-        }
-        if (finishedParsing)
-        {
-            SET_FLAGS_ON(ParserState, parser->state, PARSER_FINISHED);
-        }
-        SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_PROTECTED_API);
-    }
-    return status;
+         }
+         else
+            status = JSON_Success;
+      }
+      else
+      {
+         /* New input failed to parse. */
+         finishedParsing = 1;
+      }
+      if (finishedParsing)
+      {
+         SET_FLAGS_ON(ParserState, parser->state, PARSER_FINISHED);
+      }
+      SET_FLAGS_OFF(ParserState, parser->state, PARSER_IN_PROTECTED_API);
+   }
+   return status;
 }
 
 #endif /* JSON_NO_PARSER */
@@ -3203,944 +3070,830 @@ typedef byte WriterFlags;
 /* A writer instance. */
 struct JSON_Writer_Data
 {
-    JSON_MemorySuite          memorySuite;
-    void*                     userData;
-    WriterState               state;
-    WriterFlags               flags;
-    Encoding                  outputEncoding;
-    Error                     error;
-    GrammarianData            grammarianData;
-    JSON_Writer_OutputHandler outputHandler;
+   JSON_MemorySuite          memorySuite;
+   void*                     userData;
+   WriterState               state;
+   WriterFlags               flags;
+   Encoding                  outputEncoding;
+   Error                     error;
+   GrammarianData            grammarianData;
+   JSON_Writer_OutputHandler outputHandler;
 };
 
 /* Writer internal functions. */
 
 static void JSON_Writer_ResetData(JSON_Writer writer, int isInitialized)
 {
-    writer->userData = NULL;
-    writer->flags = WRITER_DEFAULT_FLAGS;
-    writer->outputEncoding = JSON_UTF8;
-    writer->error = JSON_Error_None;
-    Grammarian_Reset(&writer->grammarianData, isInitialized);
-    writer->outputHandler = NULL;
-    writer->state = WRITER_RESET; /* do this last! */
+   writer->userData = NULL;
+   writer->flags = WRITER_DEFAULT_FLAGS;
+   writer->outputEncoding = JSON_UTF8;
+   writer->error = JSON_Error_None;
+   Grammarian_Reset(&writer->grammarianData, isInitialized);
+   writer->outputHandler = NULL;
+   writer->state = WRITER_RESET; /* do this last! */
 }
 
 static void JSON_Writer_SetError(JSON_Writer writer, Error error)
 {
-    writer->error = error;
+   writer->error = error;
 }
 
 static JSON_Status JSON_Writer_ProcessToken(JSON_Writer writer, Symbol token)
 {
-    GrammarianOutput output = Grammarian_ProcessToken(&writer->grammarianData, token, &writer->memorySuite);
-    switch (GRAMMARIAN_RESULT_CODE(output))
-    {
-    case REJECTED_TOKEN:
-        JSON_Writer_SetError(writer, JSON_Error_UnexpectedToken);
-        return JSON_Failure;
+   GrammarianOutput output = Grammarian_ProcessToken(&writer->grammarianData, token, &writer->memorySuite);
+   switch (GRAMMARIAN_RESULT_CODE(output))
+   {
+      case REJECTED_TOKEN:
+         JSON_Writer_SetError(writer, JSON_Error_UnexpectedToken);
+         return JSON_Failure;
 
-    case SYMBOL_STACK_FULL:
-        JSON_Writer_SetError(writer, JSON_Error_OutOfMemory);
-        return JSON_Failure;
-    }
-    return JSON_Success;
+      case SYMBOL_STACK_FULL:
+         JSON_Writer_SetError(writer, JSON_Error_OutOfMemory);
+         return JSON_Failure;
+   }
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Writer_OutputBytes(JSON_Writer writer, const byte* pBytes, size_t length)
 {
-    if (writer->outputHandler && length)
-    {
-        if (writer->outputHandler(writer, (const char*)pBytes, length) != JSON_Writer_Continue)
-        {
-            JSON_Writer_SetError(writer, JSON_Error_AbortedByHandler);
-            return JSON_Failure;
-        }
-    }
-    return JSON_Success;
+   if (writer->outputHandler && length)
+   {
+      if (writer->outputHandler(writer, (const char*)pBytes, length) != JSON_Writer_Continue)
+      {
+         JSON_Writer_SetError(writer, JSON_Error_AbortedByHandler);
+         return JSON_Failure;
+      }
+   }
+   return JSON_Success;
 }
 
 static Codepoint JSON_Writer_GetCodepointEscapeCharacter(JSON_Writer writer, Codepoint c)
 {
-    switch (c)
-    {
-    case BACKSPACE_CODEPOINT:
-        return 'b';
+   switch (c)
+   {
+      case BACKSPACE_CODEPOINT:
+         return 'b';
 
-    case TAB_CODEPOINT:
-        return 't';
+      case TAB_CODEPOINT:
+         return 't';
 
-    case LINE_FEED_CODEPOINT:
-        return 'n';
+      case LINE_FEED_CODEPOINT:
+         return 'n';
 
-    case FORM_FEED_CODEPOINT:
-        return 'f';
+      case FORM_FEED_CODEPOINT:
+         return 'f';
 
-    case CARRIAGE_RETURN_CODEPOINT:
-        return 'r';
+      case CARRIAGE_RETURN_CODEPOINT:
+         return 'r';
 
-    case '"':
-        return '"';
+      case '"':
+         return '"';
 
-    case '/':
-        return '/';
+      case '/':
+         return '/';
 
-    case '\\':
-        return '\\';
+      case '\\':
+         return '\\';
 
-    case DELETE_CODEPOINT:
-    case LINE_SEPARATOR_CODEPOINT:
-    case PARAGRAPH_SEPARATOR_CODEPOINT:
-        return 'u';
+      case DELETE_CODEPOINT:
+      case LINE_SEPARATOR_CODEPOINT:
+      case PARAGRAPH_SEPARATOR_CODEPOINT:
+         return 'u';
 
-    default:
-        if (c < FIRST_NON_CONTROL_CODEPOINT || IS_NONCHARACTER(c) ||
-            (GET_FLAGS(writer->flags, WRITER_ESCAPE_NON_ASCII) && c > FIRST_NON_ASCII_CODEPOINT))
-        {
+      default:
+         if (c < FIRST_NON_CONTROL_CODEPOINT || IS_NONCHARACTER(c) ||
+               (GET_FLAGS(writer->flags, WRITER_ESCAPE_NON_ASCII) && c > FIRST_NON_ASCII_CODEPOINT))
             return 'u';
-        }
-        break;
-    }
-    return 0;
+         break;
+   }
+   return 0;
 }
 
 typedef struct tag_WriteBufferData
 {
-    size_t used;
-    byte   bytes[256];
+   size_t used;
+   byte   bytes[256];
 } WriteBufferData;
 typedef WriteBufferData* WriteBuffer;
 
 static void WriteBuffer_Reset(WriteBuffer buffer)
 {
-    buffer->used = 0;
+   buffer->used = 0;
 }
 
 static JSON_Status WriteBuffer_Flush(WriteBuffer buffer, JSON_Writer writer)
 {
-    JSON_Status status = JSON_Writer_OutputBytes(writer, buffer->bytes, buffer->used);
-    buffer->used = 0;
-    return status;
+   JSON_Status status = JSON_Writer_OutputBytes(writer, buffer->bytes, buffer->used);
+   buffer->used = 0;
+   return status;
 }
 
 static JSON_Status WriteBuffer_WriteBytes(WriteBuffer buffer, JSON_Writer writer, const byte* pBytes, size_t length)
 {
-    if (buffer->used + length > sizeof(buffer->bytes) &&
-        !WriteBuffer_Flush(buffer, writer))
-    {
-        return JSON_Failure;
-    }
-    memcpy(&buffer->bytes[buffer->used], pBytes, length);
-    buffer->used += length;
-    return JSON_Success;
+   if (buffer->used + length > sizeof(buffer->bytes) &&
+         !WriteBuffer_Flush(buffer, writer))
+      return JSON_Failure;
+
+   memcpy(&buffer->bytes[buffer->used], pBytes, length);
+   buffer->used += length;
+   return JSON_Success;
 }
 
 static JSON_Status WriteBuffer_WriteCodepoint(WriteBuffer buffer, JSON_Writer writer, Codepoint c)
 {
-    if (buffer->used + LONGEST_ENCODING_SEQUENCE > sizeof(buffer->bytes) &&
-        !WriteBuffer_Flush(buffer, writer))
-    {
-        return JSON_Failure;
-    }
-    buffer->used += EncodeCodepoint(c, writer->outputEncoding, &buffer->bytes[buffer->used]);
-    return JSON_Success;
+   if (buffer->used + LONGEST_ENCODING_SEQUENCE > sizeof(buffer->bytes) &&
+         !WriteBuffer_Flush(buffer, writer))
+      return JSON_Failure;
+
+   buffer->used += EncodeCodepoint(c, writer->outputEncoding, &buffer->bytes[buffer->used]);
+   return JSON_Success;
 }
 
 static JSON_Status WriteBuffer_WriteHexEscapeSequence(WriteBuffer buffer, JSON_Writer writer, Codepoint c)
 {
-    if (c >= FIRST_NON_BMP_CODEPOINT)
-    {
-        /* Non-BMP codepoints must be hex-escaped by escaping the UTF-16
-           surrogate pair for the codepoint. We put the leading surrogate
-           in the low 16 bits of c so that it gets written first, then
-           the second pass through the loop will write out the trailing
-           surrogate. x*/
-        c = SURROGATES_FROM_CODEPOINT(c);
-        c = (c << 16) | (c >> 16);
-    }
-    do
-    {
-        static const byte hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
-        byte escapeSequence[6];
-        int i;
-        escapeSequence[0] = '\\';
-        escapeSequence[1] = 'u';
-        escapeSequence[2] = hexDigits[(c >> 12) & 0xF];
-        escapeSequence[3] = hexDigits[(c >> 8) & 0xF];
-        escapeSequence[4] = hexDigits[(c >> 4) & 0xF];
-        escapeSequence[5] = hexDigits[c & 0xF];
-        for (i = 0; i < sizeof(escapeSequence); i++)
-        {
-            if (!WriteBuffer_WriteCodepoint(buffer, writer, escapeSequence[i]))
-            {
-                return JSON_Failure;
-            }
-        }
-        c >>= 16;
-    } while (c);
-    return JSON_Success;
+   if (c >= FIRST_NON_BMP_CODEPOINT)
+   {
+      /* Non-BMP codepoints must be hex-escaped by escaping the UTF-16
+         surrogate pair for the codepoint. We put the leading surrogate
+         in the low 16 bits of c so that it gets written first, then
+         the second pass through the loop will write out the trailing
+         surrogate. x*/
+      c = SURROGATES_FROM_CODEPOINT(c);
+      c = (c << 16) | (c >> 16);
+   }
+   do
+   {
+      static const byte hexDigits[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+      byte escapeSequence[6];
+      int i;
+      escapeSequence[0] = '\\';
+      escapeSequence[1] = 'u';
+      escapeSequence[2] = hexDigits[(c >> 12) & 0xF];
+      escapeSequence[3] = hexDigits[(c >> 8) & 0xF];
+      escapeSequence[4] = hexDigits[(c >> 4) & 0xF];
+      escapeSequence[5] = hexDigits[c & 0xF];
+      for (i = 0; i < sizeof(escapeSequence); i++)
+      {
+         if (!WriteBuffer_WriteCodepoint(buffer, writer, escapeSequence[i]))
+            return JSON_Failure;
+      }
+      c >>= 16;
+   } while (c);
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Writer_OutputString(JSON_Writer writer, const byte* pBytes, size_t length, Encoding encoding)
 {
-    static const byte quoteUTF[] = { 0, 0, 0, '"', 0, 0, 0 };
-    static const byte* const quoteEncodings[5] = { quoteUTF + 3, quoteUTF + 3, quoteUTF + 2, quoteUTF + 3, quoteUTF };
+   static const byte quoteUTF[] = { 0, 0, 0, '"', 0, 0, 0 };
+   static const byte* const quoteEncodings[5] = { quoteUTF + 3, quoteUTF + 3, quoteUTF + 2, quoteUTF + 3, quoteUTF };
 
-    const byte* pQuoteEncoded = quoteEncodings[writer->outputEncoding - 1];
-    size_t minSequenceLength = SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
-    DecoderData decoderData;
-    WriteBufferData bufferData;
-    size_t i = 0;
+   const byte* pQuoteEncoded = quoteEncodings[writer->outputEncoding - 1];
+   size_t minSequenceLength = SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
+   DecoderData decoderData;
+   WriteBufferData bufferData;
+   size_t i = 0;
 
-    WriteBuffer_Reset(&bufferData);
+   WriteBuffer_Reset(&bufferData);
 
-    /* Start quote. */
-    if (!WriteBuffer_WriteBytes(&bufferData, writer, pQuoteEncoded, minSequenceLength))
-    {
-        return JSON_Failure;
-    }
+   /* Start quote. */
+   if (!WriteBuffer_WriteBytes(&bufferData, writer, pQuoteEncoded, minSequenceLength))
+      return JSON_Failure;
 
-    /* String contents. */
-    Decoder_Reset(&decoderData);
-    while (i < length)
-    {
-        DecoderOutput output = Decoder_ProcessByte(&decoderData, encoding, pBytes[i]);
-        DecoderResultCode result = DECODER_RESULT_CODE(output);
-        Codepoint c;
-        Codepoint escapeCharacter;
-        switch (result)
-        {
-        case SEQUENCE_PENDING:
+   /* String contents. */
+   Decoder_Reset(&decoderData);
+   while (i < length)
+   {
+      DecoderOutput output = Decoder_ProcessByte(&decoderData, encoding, pBytes[i]);
+      DecoderResultCode result = DECODER_RESULT_CODE(output);
+      Codepoint c;
+      Codepoint escapeCharacter;
+      switch (result)
+      {
+         case SEQUENCE_PENDING:
             i++;
             break;
 
-        case SEQUENCE_COMPLETE:
+         case SEQUENCE_COMPLETE:
             c = DECODER_CODEPOINT(output);
             escapeCharacter = JSON_Writer_GetCodepointEscapeCharacter(writer, c);
             switch (escapeCharacter)
             {
-            case 0:
-                /* Output the codepoint as a normal encoding sequence. */
-                if (!WriteBuffer_WriteCodepoint(&bufferData, writer, c))
-                {
-                    return JSON_Failure;
-                }
-                break;
+               case 0:
+                  /* Output the codepoint as a normal encoding sequence. */
+                  if (!WriteBuffer_WriteCodepoint(&bufferData, writer, c))
+                     return JSON_Failure;
+                  break;
 
-            case 'u':
-                /* Output the codepoint as 1 or 2 hex escape sequences. */
-                if (!WriteBuffer_WriteHexEscapeSequence(&bufferData, writer, c))
-                {
-                    return JSON_Failure;
-                }
-                break;
+               case 'u':
+                  /* Output the codepoint as 1 or 2 hex escape sequences. */
+                  if (!WriteBuffer_WriteHexEscapeSequence(&bufferData, writer, c))
+                     return JSON_Failure;
+                  break;
 
-            default:
-                /* Output the codepoint as a simple escape sequence. */
-                if (!WriteBuffer_WriteCodepoint(&bufferData, writer, '\\') ||
-                    !WriteBuffer_WriteCodepoint(&bufferData, writer, escapeCharacter))
-                {
-                    return JSON_Failure;
-                }
-                break;
+               default:
+                  /* Output the codepoint as a simple escape sequence. */
+                  if (!WriteBuffer_WriteCodepoint(&bufferData, writer, '\\') ||
+                        !WriteBuffer_WriteCodepoint(&bufferData, writer, escapeCharacter))
+                     return JSON_Failure;
+                  break;
             }
             i++;
             break;
 
-        case SEQUENCE_INVALID_INCLUSIVE:
+         case SEQUENCE_INVALID_INCLUSIVE:
             i++;
             /* fallthrough */
-        case SEQUENCE_INVALID_EXCLUSIVE:
+         case SEQUENCE_INVALID_EXCLUSIVE:
             if (GET_FLAGS(writer->flags, WRITER_REPLACE_INVALID))
             {
-                if (!WriteBuffer_WriteHexEscapeSequence(&bufferData, writer, REPLACEMENT_CHARACTER_CODEPOINT))
-                {
-                    return JSON_Failure;
-                }
+               if (!WriteBuffer_WriteHexEscapeSequence(&bufferData, writer, REPLACEMENT_CHARACTER_CODEPOINT))
+                  return JSON_Failure;
             }
             else
             {
-                /* Output whatever valid bytes we've accumulated before failing. */
-                if (WriteBuffer_Flush(&bufferData, writer))
-                {
-                    JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
-                }
-                return JSON_Failure;
+               /* Output whatever valid bytes we've accumulated before failing. */
+               if (WriteBuffer_Flush(&bufferData, writer))
+                  JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
+               return JSON_Failure;
             }
             break;
-        }
-    }
-    if (Decoder_SequencePending(&decoderData))
-    {
-        if (GET_FLAGS(writer->flags, WRITER_REPLACE_INVALID))
-        {
-            if (!WriteBuffer_WriteHexEscapeSequence(&bufferData, writer, REPLACEMENT_CHARACTER_CODEPOINT))
-            {
-                return JSON_Failure;
-            }
-        }
-        else
-        {
-            /* Output whatever valid bytes we've accumulated before failing. */
-            if (WriteBuffer_Flush(&bufferData, writer))
-            {
-                JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
-            }
+      }
+   }
+   if (Decoder_SequencePending(&decoderData))
+   {
+      if (GET_FLAGS(writer->flags, WRITER_REPLACE_INVALID))
+      {
+         if (!WriteBuffer_WriteHexEscapeSequence(&bufferData, writer, REPLACEMENT_CHARACTER_CODEPOINT))
             return JSON_Failure;
-        }
-    }
+      }
+      else
+      {
+         /* Output whatever valid bytes we've accumulated before failing. */
+         if (WriteBuffer_Flush(&bufferData, writer))
+            JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
+         return JSON_Failure;
+      }
+   }
 
-    /* End quote. */
-    if (!WriteBuffer_WriteBytes(&bufferData, writer, pQuoteEncoded, minSequenceLength) ||
-        !WriteBuffer_Flush(&bufferData, writer))
-    {
-        return JSON_Failure;
-    }
-    return JSON_Success;
+   /* End quote. */
+   if (!WriteBuffer_WriteBytes(&bufferData, writer, pQuoteEncoded, minSequenceLength) ||
+         !WriteBuffer_Flush(&bufferData, writer))
+      return JSON_Failure;
+   return JSON_Success;
 }
 
 static LexerState LexNumberCharacter(LexerState state, Codepoint c)
 {
-    switch (state)
-    {
-    case LEXING_WHITESPACE:
-        if (c == '-')
-        {
+   switch (state)
+   {
+      case LEXING_WHITESPACE:
+         if (c == '-')
             state = LEXING_NUMBER_AFTER_MINUS;
-        }
-        else if (c == '0')
-        {
+         else if (c == '0')
             state = LEXING_NUMBER_AFTER_LEADING_ZERO;
-        }
-        else if (c >= '1' && c <= '9')
-        {
+         else if (c >= '1' && c <= '9')
             state = LEXING_NUMBER_DECIMAL_DIGITS;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
+         break;
 
-    case LEXING_NUMBER_AFTER_MINUS:
-        if (c == '0')
-        {
+      case LEXING_NUMBER_AFTER_MINUS:
+         if (c == '0')
             state = LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO;
-        }
-        else if (c >= '1' && c <= '9')
-        {
+         else if (c >= '1' && c <= '9')
             state = LEXING_NUMBER_DECIMAL_DIGITS;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
+         break;
 
-    case LEXING_NUMBER_AFTER_LEADING_ZERO:
-    case LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO:
-        if (c == '.')
-        {
+      case LEXING_NUMBER_AFTER_LEADING_ZERO:
+      case LEXING_NUMBER_AFTER_LEADING_NEGATIVE_ZERO:
+         if (c == '.')
             state = LEXING_NUMBER_AFTER_DOT;
-        }
-        else if (c == 'e' || c == 'E')
-        {
+         else if (c == 'e' || c == 'E')
             state = LEXING_NUMBER_AFTER_E;
-        }
-        else if ((c == 'x' || c == 'X') && state == LEXING_NUMBER_AFTER_LEADING_ZERO)
-        {
+         else if ((c == 'x' || c == 'X') && state == LEXING_NUMBER_AFTER_LEADING_ZERO)
             state = LEXING_NUMBER_AFTER_X;
-        }
-        else if (c == EOF_CODEPOINT)
-        {
+         else if (c == EOF_CODEPOINT)
             state = LEXING_WHITESPACE;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
+         break;
 
-    case LEXING_NUMBER_AFTER_X:
-        if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-        {
+      case LEXING_NUMBER_AFTER_X:
+         if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
             state = LEXING_NUMBER_HEX_DIGITS;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
+         break;
 
-    case LEXING_NUMBER_HEX_DIGITS:
-        if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
-        {
+      case LEXING_NUMBER_HEX_DIGITS:
+         if ((c >= '0' && c <= '9') || (c >= 'A' && c <= 'F') || (c >= 'a' && c <= 'f'))
+         {
             /* Still LEXING_NUMBER_HEX_DIGITS. */
-        }
-        else if (c == EOF_CODEPOINT)
-        {
+         }
+         else if (c == EOF_CODEPOINT)
             state = LEXING_WHITESPACE;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
+         break;
 
-    case LEXING_NUMBER_DECIMAL_DIGITS:
-        if (c >= '0' && c <= '9')
-        {
+      case LEXING_NUMBER_DECIMAL_DIGITS:
+         if (c >= '0' && c <= '9')
+         {
             /* Still LEXING_NUMBER_DECIMAL_DIGITS. */
-        }
-        else if (c == '.')
-        {
+         }
+         else if (c == '.')
             state = LEXING_NUMBER_AFTER_DOT;
-        }
-        else if (c == 'e' || c == 'E')
-        {
+         else if (c == 'e' || c == 'E')
             state = LEXING_NUMBER_AFTER_E;
-        }
-        else if (c == EOF_CODEPOINT)
-        {
+         else if (c == EOF_CODEPOINT)
             state = LEXING_WHITESPACE;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
+         break;
 
-    case LEXING_NUMBER_AFTER_DOT:
-        if (c >= '0' && c <= '9')
-        {
+      case LEXING_NUMBER_AFTER_DOT:
+         if (c >= '0' && c <= '9')
             state = LEXING_NUMBER_FRACTIONAL_DIGITS;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
+         break;
 
-    case LEXING_NUMBER_FRACTIONAL_DIGITS:
-        if (c >= '0' && c <= '9')
-        {
+      case LEXING_NUMBER_FRACTIONAL_DIGITS:
+         if (c >= '0' && c <= '9')
+         {
             /* Still LEXING_NUMBER_FRACTIONAL_DIGITS. */
-        }
-        else if (c == 'e' || c == 'E')
-        {
+         }
+         else if (c == 'e' || c == 'E')
             state = LEXING_NUMBER_AFTER_E;
-        }
-        else if (c == EOF_CODEPOINT)
-        {
+         else if (c == EOF_CODEPOINT)
             state = LEXING_WHITESPACE;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
+         break;
 
-    case LEXING_NUMBER_AFTER_E:
-        if (c == '+' || c == '-')
-        {
+      case LEXING_NUMBER_AFTER_E:
+         if (c == '+' || c == '-')
             state = LEXING_NUMBER_AFTER_EXPONENT_SIGN;
-        }
-        else if (c >= '0' && c <= '9')
-        {
+         else if (c >= '0' && c <= '9')
             state = LEXING_NUMBER_EXPONENT_DIGITS;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
+         break;
 
-    case LEXING_NUMBER_AFTER_EXPONENT_SIGN:
-        if (c >= '0' && c <= '9')
-        {
+      case LEXING_NUMBER_AFTER_EXPONENT_SIGN:
+         if (c >= '0' && c <= '9')
             state = LEXING_NUMBER_EXPONENT_DIGITS;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
+         break;
 
-    case LEXING_NUMBER_EXPONENT_DIGITS:
-        if (c >= '0' && c <= '9')
-        {
+      case LEXING_NUMBER_EXPONENT_DIGITS:
+         if (c >= '0' && c <= '9')
+         {
             /* Still LEXING_NUMBER_EXPONENT_DIGITS. */
-        }
-        else if (c == EOF_CODEPOINT)
-        {
+         }
+         else if (c == EOF_CODEPOINT)
             state = LEXING_WHITESPACE;
-        }
-        else
-        {
+         else
             state = LEXER_ERROR;
-        }
-        break;
-    }
-    return state;
+         break;
+   }
+   return state;
 }
 
 static JSON_Status JSON_Writer_OutputNumber(JSON_Writer writer, const byte* pBytes, size_t length, Encoding encoding)
 {
-    DecoderData decoderData;
-    WriteBufferData bufferData;
-    LexerState lexerState = LEXING_WHITESPACE;
-    size_t i;
-    Decoder_Reset(&decoderData);
-    WriteBuffer_Reset(&bufferData);
-    for (i = 0; i < length; i++)
-    {
-        DecoderOutput output = Decoder_ProcessByte(&decoderData, encoding, pBytes[i]);
-        DecoderResultCode result = DECODER_RESULT_CODE(output);
-        Codepoint c;
-        switch (result)
-        {
-        case SEQUENCE_PENDING:
+   DecoderData decoderData;
+   WriteBufferData bufferData;
+   LexerState lexerState = LEXING_WHITESPACE;
+   size_t i;
+   Decoder_Reset(&decoderData);
+   WriteBuffer_Reset(&bufferData);
+   for (i = 0; i < length; i++)
+   {
+      DecoderOutput output = Decoder_ProcessByte(&decoderData, encoding, pBytes[i]);
+      DecoderResultCode result = DECODER_RESULT_CODE(output);
+      Codepoint c;
+      switch (result)
+      {
+         case SEQUENCE_PENDING:
             break;
 
-        case SEQUENCE_COMPLETE:
+         case SEQUENCE_COMPLETE:
             c = DECODER_CODEPOINT(output);
             lexerState = LexNumberCharacter(lexerState, c);
             if (lexerState == LEXER_ERROR)
             {
-                /* Output whatever valid bytes we've accumulated before failing. */
-                if (WriteBuffer_Flush(&bufferData, writer))
-                {
-                    JSON_Writer_SetError(writer, JSON_Error_InvalidNumber);
-                }
-                return JSON_Failure;
+               /* Output whatever valid bytes we've accumulated before failing. */
+               if (WriteBuffer_Flush(&bufferData, writer))
+                  JSON_Writer_SetError(writer, JSON_Error_InvalidNumber);
+               return JSON_Failure;
             }
             if (!WriteBuffer_WriteCodepoint(&bufferData, writer, c))
-            {
-                return JSON_Failure;
-            }
+               return JSON_Failure;
             break;
 
-        case SEQUENCE_INVALID_INCLUSIVE:
-        case SEQUENCE_INVALID_EXCLUSIVE:
+         case SEQUENCE_INVALID_INCLUSIVE:
+         case SEQUENCE_INVALID_EXCLUSIVE:
             /* Output whatever valid bytes we've accumulated before failing. */
             if (WriteBuffer_Flush(&bufferData, writer))
-            {
-                JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
-            }
+               JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
             return JSON_Failure;
-        }
-    }
-    if (!WriteBuffer_Flush(&bufferData, writer))
-    {
-        return JSON_Failure;
-    }
-    if (Decoder_SequencePending(&decoderData))
-    {
-        JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
-        return JSON_Failure;
-    }
-    if (LexNumberCharacter(lexerState, EOF_CODEPOINT) == LEXER_ERROR)
-    {
-        JSON_Writer_SetError(writer, JSON_Error_InvalidNumber);
-        return JSON_Failure;
-    }
-    return JSON_Success;
+      }
+   }
+   if (!WriteBuffer_Flush(&bufferData, writer))
+      return JSON_Failure;
+   if (Decoder_SequencePending(&decoderData))
+   {
+      JSON_Writer_SetError(writer, JSON_Error_InvalidEncodingSequence);
+      return JSON_Failure;
+   }
+   if (LexNumberCharacter(lexerState, EOF_CODEPOINT) == LEXER_ERROR)
+   {
+      JSON_Writer_SetError(writer, JSON_Error_InvalidNumber);
+      return JSON_Failure;
+   }
+   return JSON_Success;
 }
 
 #define SPACES_PER_CHUNK 8
 static JSON_Status JSON_Writer_OutputSpaces(JSON_Writer writer, size_t numberOfSpaces)
 {
-    static const byte spacesUTF8[SPACES_PER_CHUNK] = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' };
-    static const byte spacesUTF16[SPACES_PER_CHUNK * 2 + 1] = { 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0 };
-    static const byte spacesUTF32[SPACES_PER_CHUNK * 4 + 3] = { 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0 };
-    static const byte* const spacesEncodings[5] = { spacesUTF8, spacesUTF16 + 1, spacesUTF16, spacesUTF32 + 3, spacesUTF32 };
+   static const byte spacesUTF8[SPACES_PER_CHUNK] = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' };
+   static const byte spacesUTF16[SPACES_PER_CHUNK * 2 + 1] = { 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0, ' ', 0 };
+   static const byte spacesUTF32[SPACES_PER_CHUNK * 4 + 3] = { 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0, ' ', 0, 0, 0 };
+   static const byte* const spacesEncodings[5] = { spacesUTF8, spacesUTF16 + 1, spacesUTF16, spacesUTF32 + 3, spacesUTF32 };
 
-    size_t encodedLength = SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
-    const byte* encoded = spacesEncodings[writer->outputEncoding - 1];
-    while (numberOfSpaces > SPACES_PER_CHUNK)
-    {
-        if (!JSON_Writer_OutputBytes(writer, encoded, SPACES_PER_CHUNK * encodedLength))
-        {
-            return JSON_Failure;
-        }
-        numberOfSpaces -= SPACES_PER_CHUNK;
-    }
-    if (!JSON_Writer_OutputBytes(writer, encoded, numberOfSpaces * encodedLength))
-    {
-        return JSON_Failure;
-    }
-    return JSON_Success;
+   size_t encodedLength = SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
+   const byte* encoded = spacesEncodings[writer->outputEncoding - 1];
+   while (numberOfSpaces > SPACES_PER_CHUNK)
+   {
+      if (!JSON_Writer_OutputBytes(writer, encoded, SPACES_PER_CHUNK * encodedLength))
+         return JSON_Failure;
+      numberOfSpaces -= SPACES_PER_CHUNK;
+   }
+
+   if (!JSON_Writer_OutputBytes(writer, encoded, numberOfSpaces * encodedLength))
+      return JSON_Failure;
+   return JSON_Success;
 }
 
 static JSON_Status JSON_Writer_WriteSimpleToken(JSON_Writer writer, Symbol token, const byte* const* encodings, size_t length)
 {
-    JSON_Status status = JSON_Failure;
-    if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
-    {
-        size_t encodedLength = length * SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
-        SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
-        if (JSON_Writer_ProcessToken(writer, token) &&
+   JSON_Status status = JSON_Failure;
+   if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
+   {
+      size_t encodedLength = length * SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
+      SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
+      if (JSON_Writer_ProcessToken(writer, token) &&
             JSON_Writer_OutputBytes(writer, encodings[writer->outputEncoding - 1], encodedLength))
-        {
-            status = JSON_Success;
-        }
-        SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-    }
-    return status;
+         status = JSON_Success;
+      SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
+   }
+   return status;
 }
 
 /* Writer API functions. */
 
 JSON_Writer JSON_CALL JSON_Writer_Create(const JSON_MemorySuite* pMemorySuite)
 {
-    JSON_Writer writer;
-    JSON_MemorySuite memorySuite;
-    if (pMemorySuite)
-    {
-        memorySuite = *pMemorySuite;
-        if (!memorySuite.realloc || !memorySuite.free)
-        {
-            /* The full memory suite must be specified. */
-            return NULL;
-        }
-    }
-    else
-    {
-        memorySuite = defaultMemorySuite;
-    }
-    writer = (JSON_Writer)memorySuite.realloc(memorySuite.userData, NULL, sizeof(struct JSON_Writer_Data));
-    if (!writer)
-    {
-        return NULL;
-    }
-    writer->memorySuite = memorySuite;
-    JSON_Writer_ResetData(writer, 0/* isInitialized */);
-    return writer;
+   JSON_Writer writer;
+   JSON_MemorySuite memorySuite;
+   if (pMemorySuite)
+   {
+      memorySuite = *pMemorySuite;
+      /* The full memory suite must be specified. */
+      if (!memorySuite.realloc || !memorySuite.free)
+         return NULL;
+   }
+   else
+      memorySuite = defaultMemorySuite;
+
+   writer = (JSON_Writer)memorySuite.realloc(memorySuite.userData, NULL, sizeof(struct JSON_Writer_Data));
+
+   if (!writer)
+      return NULL;
+
+   writer->memorySuite = memorySuite;
+   JSON_Writer_ResetData(writer, 0/* isInitialized */);
+   return writer;
 }
 
 JSON_Status JSON_CALL JSON_Writer_Free(JSON_Writer writer)
 {
-    if (!writer || GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS_ON(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-    Grammarian_FreeAllocations(&writer->grammarianData, &writer->memorySuite);
-    writer->memorySuite.free(writer->memorySuite.userData, writer);
-    return JSON_Success;
+   if (!writer || GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API))
+      return JSON_Failure;
+
+   SET_FLAGS_ON(WriterState, writer->state, WRITER_IN_PROTECTED_API);
+   Grammarian_FreeAllocations(&writer->grammarianData, &writer->memorySuite);
+   writer->memorySuite.free(writer->memorySuite.userData, writer);
+   return JSON_Success;
 }
 
 JSON_Status JSON_CALL JSON_Writer_Reset(JSON_Writer writer)
 {
-    if (!writer || GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS_ON(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-    JSON_Writer_ResetData(writer, 1/* isInitialized */);
-    /* Note that JSON_Writer_ResetData() unset WRITER_IN_PROTECTED_API for us. */
-    return JSON_Success;
+   if (!writer || GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API))
+      return JSON_Failure;
+
+   SET_FLAGS_ON(WriterState, writer->state, WRITER_IN_PROTECTED_API);
+   JSON_Writer_ResetData(writer, 1/* isInitialized */);
+   /* Note that JSON_Writer_ResetData() unset WRITER_IN_PROTECTED_API for us. */
+   return JSON_Success;
 }
 
 void* JSON_CALL JSON_Writer_GetUserData(JSON_Writer writer)
 {
-    return writer ? writer->userData : NULL;
+   return writer ? writer->userData : NULL;
 }
 
 JSON_Status JSON_CALL JSON_Writer_SetUserData(JSON_Writer writer, void* userData)
 {
-    if (!writer)
-    {
-        return JSON_Failure;
-    }
-    writer->userData = userData;
-    return JSON_Success;
+   if (!writer)
+      return JSON_Failure;
+
+   writer->userData = userData;
+   return JSON_Success;
 }
 
 JSON_Encoding JSON_CALL JSON_Writer_GetOutputEncoding(JSON_Writer writer)
 {
-    return writer ? (JSON_Encoding)writer->outputEncoding : JSON_UTF8;
+   return writer ? (JSON_Encoding)writer->outputEncoding : JSON_UTF8;
 }
 
 JSON_Status JSON_CALL JSON_Writer_SetOutputEncoding(JSON_Writer writer, JSON_Encoding encoding)
 {
-    if (!writer || GET_FLAGS(writer->state, WRITER_STARTED) || encoding <= JSON_UnknownEncoding || encoding > JSON_UTF32BE)
-    {
-        return JSON_Failure;
-    }
-    writer->outputEncoding = (Encoding)encoding;
-    return JSON_Success;
+   if (!writer || GET_FLAGS(writer->state, WRITER_STARTED) || encoding <= JSON_UnknownEncoding || encoding > JSON_UTF32BE)
+      return JSON_Failure;
+
+   writer->outputEncoding = (Encoding)encoding;
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Writer_GetUseCRLF(JSON_Writer writer)
 {
-    return (writer && GET_FLAGS(writer->flags, WRITER_USE_CRLF)) ? JSON_True : JSON_False;
+   return (writer && GET_FLAGS(writer->flags, WRITER_USE_CRLF)) ? JSON_True : JSON_False;
 }
 
 JSON_Status JSON_CALL JSON_Writer_SetUseCRLF(JSON_Writer writer, JSON_Boolean useCRLF)
 {
-    if (!writer || GET_FLAGS(writer->state, WRITER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(WriterFlags, writer->flags, WRITER_USE_CRLF, useCRLF);
-    return JSON_Success;
+   if (!writer || GET_FLAGS(writer->state, WRITER_STARTED))
+      return JSON_Failure;
+
+   SET_FLAGS(WriterFlags, writer->flags, WRITER_USE_CRLF, useCRLF);
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Writer_GetReplaceInvalidEncodingSequences(JSON_Writer writer)
 {
-    return (writer && GET_FLAGS(writer->flags, WRITER_REPLACE_INVALID)) ? JSON_True : JSON_False;
+   return (writer && GET_FLAGS(writer->flags, WRITER_REPLACE_INVALID)) ? JSON_True : JSON_False;
 }
 
 JSON_Status JSON_CALL JSON_Writer_SetReplaceInvalidEncodingSequences(JSON_Writer writer, JSON_Boolean replaceInvalidEncodingSequences)
 {
-    if (!writer || GET_FLAGS(writer->state, WRITER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(WriterFlags, writer->flags, WRITER_REPLACE_INVALID, replaceInvalidEncodingSequences);
-    return JSON_Success;
+   if (!writer || GET_FLAGS(writer->state, WRITER_STARTED))
+      return JSON_Failure;
+
+   SET_FLAGS(WriterFlags, writer->flags, WRITER_REPLACE_INVALID, replaceInvalidEncodingSequences);
+   return JSON_Success;
 }
 
 JSON_Boolean JSON_CALL JSON_Writer_GetEscapeAllNonASCIICharacters(JSON_Writer writer)
 {
-    return (writer && GET_FLAGS(writer->flags, WRITER_ESCAPE_NON_ASCII)) ? JSON_True : JSON_False;
+   return (writer && GET_FLAGS(writer->flags, WRITER_ESCAPE_NON_ASCII)) ? JSON_True : JSON_False;
 }
 
 JSON_Status JSON_CALL JSON_Writer_SetEscapeAllNonASCIICharacters(JSON_Writer writer, JSON_Boolean escapeAllNonASCIICharacters)
 {
-    if (!writer || GET_FLAGS(writer->state, WRITER_STARTED))
-    {
-        return JSON_Failure;
-    }
-    SET_FLAGS(WriterFlags, writer->flags, WRITER_ESCAPE_NON_ASCII, escapeAllNonASCIICharacters);
-    return JSON_Success;
+   if (!writer || GET_FLAGS(writer->state, WRITER_STARTED))
+      return JSON_Failure;
+
+   SET_FLAGS(WriterFlags, writer->flags, WRITER_ESCAPE_NON_ASCII, escapeAllNonASCIICharacters);
+   return JSON_Success;
 }
 
 JSON_Error JSON_CALL JSON_Writer_GetError(JSON_Writer writer)
 {
-    return writer ? (JSON_Error)writer->error : JSON_Error_None;
+   return writer ? (JSON_Error)writer->error : JSON_Error_None;
 }
 
 JSON_Writer_OutputHandler JSON_CALL JSON_Writer_GetOutputHandler(JSON_Writer writer)
 {
-    return writer ? writer->outputHandler : NULL;
+   return writer ? writer->outputHandler : NULL;
 }
 
 JSON_Status JSON_CALL JSON_Writer_SetOutputHandler(JSON_Writer writer, JSON_Writer_OutputHandler handler)
 {
-    if (!writer)
-    {
-        return JSON_Failure;
-    }
-    writer->outputHandler = handler;
-    return JSON_Success;
+   if (!writer)
+      return JSON_Failure;
+
+   writer->outputHandler = handler;
+   return JSON_Success;
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteNull(JSON_Writer writer)
 {
-    static const byte nullUTF8[] = { 'n', 'u', 'l', 'l' };
-    static const byte nullUTF16[] = { 0, 'n', 0, 'u', 0, 'l', 0, 'l', 0 };
-    static const byte nullUTF32[] = { 0, 0, 0, 'n', 0, 0, 0, 'u', 0, 0, 0, 'l', 0, 0, 0, 'l', 0, 0, 0 };
-    static const byte* const nullEncodings[5] = { nullUTF8, nullUTF16 + 1, nullUTF16, nullUTF32 + 3, nullUTF32 };
+   static const byte nullUTF8[] = { 'n', 'u', 'l', 'l' };
+   static const byte nullUTF16[] = { 0, 'n', 0, 'u', 0, 'l', 0, 'l', 0 };
+   static const byte nullUTF32[] = { 0, 0, 0, 'n', 0, 0, 0, 'u', 0, 0, 0, 'l', 0, 0, 0, 'l', 0, 0, 0 };
+   static const byte* const nullEncodings[5] = { nullUTF8, nullUTF16 + 1, nullUTF16, nullUTF32 + 3, nullUTF32 };
 
-    return JSON_Writer_WriteSimpleToken(writer, T_NULL, nullEncodings, sizeof(nullUTF8));
+   return JSON_Writer_WriteSimpleToken(writer, T_NULL, nullEncodings, sizeof(nullUTF8));
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteBoolean(JSON_Writer writer, JSON_Boolean value)
 {
-    static const byte trueUTF8[] = { 't', 'r', 'u', 'e' };
-    static const byte trueUTF16[] = { 0, 't', 0, 'r', 0, 'u', 0, 'e', 0 };
-    static const byte trueUTF32[] = { 0, 0, 0, 't', 0, 0, 0, 'r', 0, 0, 0, 'u', 0, 0, 0, 'e', 0, 0, 0 };
-    static const byte* const trueEncodings[5] = { trueUTF8, trueUTF16 + 1, trueUTF16, trueUTF32 + 3, trueUTF32 };
+   static const byte trueUTF8[] = { 't', 'r', 'u', 'e' };
+   static const byte trueUTF16[] = { 0, 't', 0, 'r', 0, 'u', 0, 'e', 0 };
+   static const byte trueUTF32[] = { 0, 0, 0, 't', 0, 0, 0, 'r', 0, 0, 0, 'u', 0, 0, 0, 'e', 0, 0, 0 };
+   static const byte* const trueEncodings[5] = { trueUTF8, trueUTF16 + 1, trueUTF16, trueUTF32 + 3, trueUTF32 };
 
-    static const byte falseUTF8[] = { 'f', 'a', 'l', 's', 'e' };
-    static const byte falseUTF16[] = { 0, 'f', 0, 'a', 0, 'l', 0, 's', 0, 'e', 0 };
-    static const byte falseUTF32[] = { 0, 0, 0, 'f', 0, 0, 0, 'a', 0, 0, 0, 'l', 0, 0, 0, 's', 0, 0, 0, 'e', 0, 0, 0 };
-    static const byte* const falseEncodings[5] = { falseUTF8, falseUTF16 + 1, falseUTF16, falseUTF32 + 3, falseUTF32 };
+   static const byte falseUTF8[] = { 'f', 'a', 'l', 's', 'e' };
+   static const byte falseUTF16[] = { 0, 'f', 0, 'a', 0, 'l', 0, 's', 0, 'e', 0 };
+   static const byte falseUTF32[] = { 0, 0, 0, 'f', 0, 0, 0, 'a', 0, 0, 0, 'l', 0, 0, 0, 's', 0, 0, 0, 'e', 0, 0, 0 };
+   static const byte* const falseEncodings[5] = { falseUTF8, falseUTF16 + 1, falseUTF16, falseUTF32 + 3, falseUTF32 };
 
-    Symbol token;
-    const byte* const* encodings;
-    size_t length;
-    if (value)
-    {
-        token = T_TRUE;
-        encodings = trueEncodings;
-        length = sizeof(trueUTF8);
-    }
-    else
-    {
-        token = T_FALSE;
-        encodings = falseEncodings;
-        length = sizeof(falseUTF8);
-    }
-    return JSON_Writer_WriteSimpleToken(writer, token, encodings, length);
+   Symbol token;
+   const byte* const* encodings;
+   size_t length;
+   if (value)
+   {
+      token = T_TRUE;
+      encodings = trueEncodings;
+      length = sizeof(trueUTF8);
+   }
+   else
+   {
+      token = T_FALSE;
+      encodings = falseEncodings;
+      length = sizeof(falseUTF8);
+   }
+   return JSON_Writer_WriteSimpleToken(writer, token, encodings, length);
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteString(JSON_Writer writer, const char* pValue, size_t length, JSON_Encoding encoding)
 {
-    JSON_Status status = JSON_Failure;
-    if (writer && (pValue || !length) && encoding > JSON_UnknownEncoding && encoding <= JSON_UTF32BE &&
-        !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
-    {
-        SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
-        if (JSON_Writer_ProcessToken(writer, T_STRING))
-        {
-            status = JSON_Writer_OutputString(writer, (const byte*)pValue, length, (Encoding)encoding);
-        }
-        SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-    }
-    return status;
+   JSON_Status status = JSON_Failure;
+   if (writer && (pValue || !length) && encoding > JSON_UnknownEncoding && encoding <= JSON_UTF32BE &&
+         !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
+   {
+      SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
+      if (JSON_Writer_ProcessToken(writer, T_STRING))
+         status = JSON_Writer_OutputString(writer, (const byte*)pValue, length, (Encoding)encoding);
+
+      SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
+   }
+   return status;
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteNumber(JSON_Writer writer, const char* pValue, size_t length, JSON_Encoding encoding)
 {
-    JSON_Status status = JSON_Failure;
-    if (writer && pValue && length && encoding > JSON_UnknownEncoding && encoding <= JSON_UTF32BE &&
-        !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
-    {
-        SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
-        if (JSON_Writer_ProcessToken(writer, T_NUMBER))
-        {
-            status = JSON_Writer_OutputNumber(writer, (const byte*)pValue, length, (Encoding)encoding);
-        }
-        SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-    }
-    return status;
+   JSON_Status status = JSON_Failure;
+   if (writer && pValue && length && encoding > JSON_UnknownEncoding && encoding <= JSON_UTF32BE &&
+         !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
+   {
+      SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
+      if (JSON_Writer_ProcessToken(writer, T_NUMBER))
+         status = JSON_Writer_OutputNumber(writer, (const byte*)pValue, length, (Encoding)encoding);
+
+      SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
+   }
+   return status;
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteSpecialNumber(JSON_Writer writer, JSON_SpecialNumber value)
 {
-    static const byte nanUTF8[] = { 'N', 'a', 'N' };
-    static const byte nanUTF16[] = { 0, 'N', 0, 'a', 0, 'N', 0 };
-    static const byte nanUTF32[] = { 0, 0, 0, 'N', 0, 0, 0, 'a', 0, 0, 0, 'N', 0, 0, 0 };
-    static const byte* const nanEncodings[5] = { nanUTF8, nanUTF16 + 1, nanUTF16, nanUTF32 + 3, nanUTF32 };
+   static const byte nanUTF8[] = { 'N', 'a', 'N' };
+   static const byte nanUTF16[] = { 0, 'N', 0, 'a', 0, 'N', 0 };
+   static const byte nanUTF32[] = { 0, 0, 0, 'N', 0, 0, 0, 'a', 0, 0, 0, 'N', 0, 0, 0 };
+   static const byte* const nanEncodings[5] = { nanUTF8, nanUTF16 + 1, nanUTF16, nanUTF32 + 3, nanUTF32 };
 
-    static const byte ninfUTF8[] = { '-', 'I', 'n', 'f', 'i', 'n', 'i', 't', 'y' };
-    static const byte ninfUTF16[] = { 0, '-', 0, 'I', 0, 'n', 0, 'f', 0, 'i', 0, 'n', 0, 'i', 0, 't', 0, 'y', 0 };
-    static const byte ninfUTF32[] = { 0, 0, 0, '-', 0, 0, 0, 'I', 0, 0, 0, 'n', 0, 0, 0, 'f', 0, 0, 0, 'i', 0, 0, 0, 'n', 0, 0, 0, 'i', 0, 0, 0, 't', 0, 0, 0, 'y', 0, 0, 0 };
-    static const byte* const infinityEncodings[5] = { ninfUTF8 + 1, ninfUTF16 + 3, ninfUTF16 + 2, ninfUTF32 + 7, ninfUTF32 + 4 };
-    static const byte* const negativeInfinityEncodings[5] = { ninfUTF8, ninfUTF16 + 1, ninfUTF16, ninfUTF32 + 3, ninfUTF32 };
+   static const byte ninfUTF8[] = { '-', 'I', 'n', 'f', 'i', 'n', 'i', 't', 'y' };
+   static const byte ninfUTF16[] = { 0, '-', 0, 'I', 0, 'n', 0, 'f', 0, 'i', 0, 'n', 0, 'i', 0, 't', 0, 'y', 0 };
+   static const byte ninfUTF32[] = { 0, 0, 0, '-', 0, 0, 0, 'I', 0, 0, 0, 'n', 0, 0, 0, 'f', 0, 0, 0, 'i', 0, 0, 0, 'n', 0, 0, 0, 'i', 0, 0, 0, 't', 0, 0, 0, 'y', 0, 0, 0 };
+   static const byte* const infinityEncodings[5] = { ninfUTF8 + 1, ninfUTF16 + 3, ninfUTF16 + 2, ninfUTF32 + 7, ninfUTF32 + 4 };
+   static const byte* const negativeInfinityEncodings[5] = { ninfUTF8, ninfUTF16 + 1, ninfUTF16, ninfUTF32 + 3, ninfUTF32 };
 
-    Symbol token;
-    const byte* const* encodings;
-    size_t length;
-    if (value == JSON_Infinity)
-    {
-        token = T_INFINITY;
-        encodings = infinityEncodings;
-        length = sizeof(ninfUTF8) - 1/* - */;
-    }
-    else if (value == JSON_NegativeInfinity)
-    {
-        token = T_NEGATIVE_INFINITY;
-        encodings = negativeInfinityEncodings;
-        length = sizeof(ninfUTF8);
-    }
-    else
-    {
-        token = T_NAN;
-        encodings = nanEncodings;
-        length = sizeof(nanUTF8);
-    }
-    return JSON_Writer_WriteSimpleToken(writer, token, encodings, length);
+   Symbol token;
+   const byte* const* encodings;
+   size_t length;
+   if (value == JSON_Infinity)
+   {
+      token = T_INFINITY;
+      encodings = infinityEncodings;
+      length = sizeof(ninfUTF8) - 1/* - */;
+   }
+   else if (value == JSON_NegativeInfinity)
+   {
+      token = T_NEGATIVE_INFINITY;
+      encodings = negativeInfinityEncodings;
+      length = sizeof(ninfUTF8);
+   }
+   else
+   {
+      token = T_NAN;
+      encodings = nanEncodings;
+      length = sizeof(nanUTF8);
+   }
+   return JSON_Writer_WriteSimpleToken(writer, token, encodings, length);
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteStartObject(JSON_Writer writer)
 {
-    static const byte utf[] = { 0, 0, 0, '{', 0, 0, 0 };
-    static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
+   static const byte utf[] = { 0, 0, 0, '{', 0, 0, 0 };
+   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
 
-    return JSON_Writer_WriteSimpleToken(writer, T_LEFT_CURLY, encodings, 1);
+   return JSON_Writer_WriteSimpleToken(writer, T_LEFT_CURLY, encodings, 1);
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteEndObject(JSON_Writer writer)
 {
-    static const byte utf[] = { 0, 0, 0, '}', 0, 0, 0 };
-    static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
+   static const byte utf[] = { 0, 0, 0, '}', 0, 0, 0 };
+   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
 
-    return JSON_Writer_WriteSimpleToken(writer, T_RIGHT_CURLY, encodings, 1);
+   return JSON_Writer_WriteSimpleToken(writer, T_RIGHT_CURLY, encodings, 1);
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteStartArray(JSON_Writer writer)
 {
-    static const byte utf[] = { 0, 0, 0, '[', 0, 0, 0 };
-    static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
+   static const byte utf[] = { 0, 0, 0, '[', 0, 0, 0 };
+   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
 
-    return JSON_Writer_WriteSimpleToken(writer, T_LEFT_SQUARE, encodings, 1);
+   return JSON_Writer_WriteSimpleToken(writer, T_LEFT_SQUARE, encodings, 1);
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteEndArray(JSON_Writer writer)
 {
-    static const byte utf[] = { 0, 0, 0, ']', 0, 0, 0 };
-    static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
+   static const byte utf[] = { 0, 0, 0, ']', 0, 0, 0 };
+   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
 
-    return JSON_Writer_WriteSimpleToken(writer, T_RIGHT_SQUARE, encodings, 1);
+   return JSON_Writer_WriteSimpleToken(writer, T_RIGHT_SQUARE, encodings, 1);
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteColon(JSON_Writer writer)
 {
-    static const byte utf[] = { 0, 0, 0, ':', 0, 0, 0 };
-    static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
+   static const byte utf[] = { 0, 0, 0, ':', 0, 0, 0 };
+   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
 
-    return JSON_Writer_WriteSimpleToken(writer, T_COLON, encodings, 1);
+   return JSON_Writer_WriteSimpleToken(writer, T_COLON, encodings, 1);
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteComma(JSON_Writer writer)
 {
-    static const byte utf[] = { 0, 0, 0, ',', 0, 0, 0 };
-    static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
+   static const byte utf[] = { 0, 0, 0, ',', 0, 0, 0 };
+   static const byte* const encodings[5] = { utf + 3, utf + 3, utf + 2, utf + 3, utf };
 
-    return JSON_Writer_WriteSimpleToken(writer, T_COMMA, encodings, 1);
+   return JSON_Writer_WriteSimpleToken(writer, T_COMMA, encodings, 1);
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteSpace(JSON_Writer writer, size_t numberOfSpaces)
 {
-    JSON_Status status = JSON_Failure;
-    if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
-    {
-        SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
-        status = JSON_Writer_OutputSpaces(writer, numberOfSpaces);
-        SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-    }
-    return status;
+   JSON_Status status = JSON_Failure;
+   if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
+   {
+      SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
+      status = JSON_Writer_OutputSpaces(writer, numberOfSpaces);
+      SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
+   }
+   return status;
 }
 
 JSON_Status JSON_CALL JSON_Writer_WriteNewLine(JSON_Writer writer)
 {
-    static const byte lfUTF[] = { 0, 0, 0, LINE_FEED_CODEPOINT, 0, 0, 0 };
-    static const byte* const lfEncodings[5] = { lfUTF + 3, lfUTF + 3, lfUTF + 2, lfUTF + 3, lfUTF };
+   static const byte lfUTF[] = { 0, 0, 0, LINE_FEED_CODEPOINT, 0, 0, 0 };
+   static const byte* const lfEncodings[5] = { lfUTF + 3, lfUTF + 3, lfUTF + 2, lfUTF + 3, lfUTF };
 
-    static const byte crlfUTF8[] = { CARRIAGE_RETURN_CODEPOINT, LINE_FEED_CODEPOINT };
-    static const byte crlfUTF16[] = { 0, CARRIAGE_RETURN_CODEPOINT, 0, LINE_FEED_CODEPOINT, 0 };
-    static const byte crlfUTF32[] = { 0, 0, 0, CARRIAGE_RETURN_CODEPOINT, 0, 0, 0, LINE_FEED_CODEPOINT, 0, 0, 0 };
-    static const byte* const crlfEncodings[5] = { crlfUTF8, crlfUTF16 + 1, crlfUTF16, crlfUTF32 + 3, crlfUTF32 };
+   static const byte crlfUTF8[] = { CARRIAGE_RETURN_CODEPOINT, LINE_FEED_CODEPOINT };
+   static const byte crlfUTF16[] = { 0, CARRIAGE_RETURN_CODEPOINT, 0, LINE_FEED_CODEPOINT, 0 };
+   static const byte crlfUTF32[] = { 0, 0, 0, CARRIAGE_RETURN_CODEPOINT, 0, 0, 0, LINE_FEED_CODEPOINT, 0, 0, 0 };
+   static const byte* const crlfEncodings[5] = { crlfUTF8, crlfUTF16 + 1, crlfUTF16, crlfUTF32 + 3, crlfUTF32 };
 
-    JSON_Status status = JSON_Failure;
-    if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
-    {
-        const byte* const* encodings;
-        size_t length;
-        size_t encodedLength;
-        SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
-        if (GET_FLAGS(writer->flags, WRITER_USE_CRLF))
-        {
-            encodings = crlfEncodings;
-            length = 2;
-        }
-        else
-        {
-            encodings = lfEncodings;
-            length = 1;
-        }
-        encodedLength = length * SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
-        if (JSON_Writer_OutputBytes(writer, encodings[writer->outputEncoding - 1], encodedLength))
-        {
-            status = JSON_Success;
-        }
-        SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
-    }
-    return status;
+   JSON_Status status = JSON_Failure;
+   if (writer && !GET_FLAGS(writer->state, WRITER_IN_PROTECTED_API) && writer->error == JSON_Error_None)
+   {
+      const byte* const* encodings;
+      size_t length;
+      size_t encodedLength;
+      SET_FLAGS_ON(WriterState, writer->state, WRITER_STARTED | WRITER_IN_PROTECTED_API);
+      if (GET_FLAGS(writer->flags, WRITER_USE_CRLF))
+      {
+         encodings = crlfEncodings;
+         length = 2;
+      }
+      else
+      {
+         encodings = lfEncodings;
+         length = 1;
+      }
+      encodedLength = length * SHORTEST_ENCODING_SEQUENCE(writer->outputEncoding);
+      if (JSON_Writer_OutputBytes(writer, encodings[writer->outputEncoding - 1], encodedLength))
+      {
+         status = JSON_Success;
+      }
+      SET_FLAGS_OFF(WriterState, writer->state, WRITER_IN_PROTECTED_API);
+   }
+   return status;
 }
 
 #endif /* JSON_NO_WRITER */
@@ -4149,46 +3902,46 @@ JSON_Status JSON_CALL JSON_Writer_WriteNewLine(JSON_Writer writer)
 
 const JSON_Version* JSON_CALL JSON_LibraryVersion(void)
 {
-    static JSON_Version version = { JSON_MAJOR_VERSION, JSON_MINOR_VERSION, JSON_MICRO_VERSION };
-    return &version;
+   static JSON_Version version = { JSON_MAJOR_VERSION, JSON_MINOR_VERSION, JSON_MICRO_VERSION };
+   return &version;
 }
 
 const char* JSON_CALL JSON_ErrorString(JSON_Error error)
 {
-    /* This array must match the order and number of the JSON_Error enum. */
-    static const char* errorStrings[] =
-    {
-    /* JSON_Error_None */                            "no error",
-    /* JSON_Error_OutOfMemory */                     "could not allocate enough memory",
-    /* JSON_Error_AbortedByHandler */                "the operation was aborted by a handler",
-    /* JSON_Error_BOMNotAllowed */                   "the input begins with a byte-order mark (BOM), which is not allowed by RFC 4627",
-    /* JSON_Error_InvalidEncodingSequence */         "the input contains a byte or sequence of bytes that is not valid for the input encoding",
-    /* JSON_Error_UnknownToken */                    "the input contains an unknown token",
-    /* JSON_Error_UnexpectedToken */                 "the input contains an unexpected token",
-    /* JSON_Error_IncompleteToken */                 "the input ends in the middle of a token",
-    /* JSON_Error_MoreTokensExpected */              "the input ends when more tokens are expected",
-    /* JSON_Error_UnescapedControlCharacter */       "the input contains a string containing an unescaped control character (U+0000 - U+001F)",
-    /* JSON_Error_InvalidEscapeSequence */           "the input contains a string containing an invalid escape sequence",
-    /* JSON_Error_UnpairedSurrogateEscapeSequence */ "the input contains a string containing an unmatched UTF-16 surrogate codepoint",
-    /* JSON_Error_TooLongString */                   "the input contains a string that is too long",
-    /* JSON_Error_InvalidNumber */                   "the input contains an invalid number",
-    /* JSON_Error_TooLongNumber */                   "the input contains a number that is too long",
-    /* JSON_Error_DuplicateObjectMember */           "the input contains an object with duplicate members",
-    /* JSON_Error_StoppedAfterEmbeddedDocument */    "the end of the embedded document was reached"
-    };
-    return ((unsigned int)error < (sizeof(errorStrings) / sizeof(errorStrings[0])))
-        ? errorStrings[error]
-        : "";
+   /* This array must match the order and number of the JSON_Error enum. */
+   static const char* errorStrings[] =
+   {
+      /* JSON_Error_None */                            "no error",
+      /* JSON_Error_OutOfMemory */                     "could not allocate enough memory",
+      /* JSON_Error_AbortedByHandler */                "the operation was aborted by a handler",
+      /* JSON_Error_BOMNotAllowed */                   "the input begins with a byte-order mark (BOM), which is not allowed by RFC 4627",
+      /* JSON_Error_InvalidEncodingSequence */         "the input contains a byte or sequence of bytes that is not valid for the input encoding",
+      /* JSON_Error_UnknownToken */                    "the input contains an unknown token",
+      /* JSON_Error_UnexpectedToken */                 "the input contains an unexpected token",
+      /* JSON_Error_IncompleteToken */                 "the input ends in the middle of a token",
+      /* JSON_Error_MoreTokensExpected */              "the input ends when more tokens are expected",
+      /* JSON_Error_UnescapedControlCharacter */       "the input contains a string containing an unescaped control character (U+0000 - U+001F)",
+      /* JSON_Error_InvalidEscapeSequence */           "the input contains a string containing an invalid escape sequence",
+      /* JSON_Error_UnpairedSurrogateEscapeSequence */ "the input contains a string containing an unmatched UTF-16 surrogate codepoint",
+      /* JSON_Error_TooLongString */                   "the input contains a string that is too long",
+      /* JSON_Error_InvalidNumber */                   "the input contains an invalid number",
+      /* JSON_Error_TooLongNumber */                   "the input contains a number that is too long",
+      /* JSON_Error_DuplicateObjectMember */           "the input contains an object with duplicate members",
+      /* JSON_Error_StoppedAfterEmbeddedDocument */    "the end of the embedded document was reached"
+   };
+   return ((unsigned int)error < (sizeof(errorStrings) / sizeof(errorStrings[0])))
+      ? errorStrings[error]
+      : "";
 }
 
 static const uint32_t endianEncodings = (((uint32_t)JSON_UTF32BE) << 24) | (((uint32_t)JSON_UTF16BE) << 16) | (((uint32_t)JSON_UTF16LE) << 8) | ((uint32_t)JSON_UTF32LE);
 
 JSON_Encoding JSON_CALL JSON_NativeUTF16Encoding(void)
 {
-    return (JSON_Encoding)(((byte*)&endianEncodings)[1]);
+   return (JSON_Encoding)(((byte*)&endianEncodings)[1]);
 }
 
 JSON_Encoding JSON_CALL JSON_NativeUTF32Encoding(void)
 {
-    return (JSON_Encoding)(((byte*)&endianEncodings)[0]);
+   return (JSON_Encoding)(((byte*)&endianEncodings)[0]);
 }
diff --git a/libretro-common/formats/png/rpng.c b/libretro-common/formats/png/rpng.c
index 3d9877eb6a..56c506d429 100644
--- a/libretro-common/formats/png/rpng.c
+++ b/libretro-common/formats/png/rpng.c
@@ -33,6 +33,7 @@
 #include <formats/image.h>
 #include <formats/rpng.h>
 #include <streams/trans_stream.h>
+#include <string/stdstring.h>
 
 #include "rpng_internal.h"
 
@@ -152,7 +153,7 @@ static enum png_chunk_type png_chunk_type(const struct png_chunk *chunk)
 
    for (i = 0; i < ARRAY_SIZE(chunk_map); i++)
    {
-      if (memcmp(chunk->type, chunk_map[i].id, 4) == 0)
+      if (string_is_equal_fast(chunk->type, chunk_map[i].id, 4))
          return chunk_map[i].type;
    }
 
@@ -1153,7 +1154,7 @@ bool rpng_start(rpng_t *rpng)
    for (i = 0; i < 8; i++)
       header[i] = rpng->buff_data[i];
 
-   if (memcmp(header, png_magic, sizeof(png_magic)) != 0)
+   if (string_is_not_equal_fast(header, png_magic, sizeof(png_magic)))
       return false;
 
    rpng->buff_data += 8;
diff --git a/libretro-common/formats/png/rpng_encode.c b/libretro-common/formats/png/rpng_encode.c
index c0d044ddf8..fe46e03598 100644
--- a/libretro-common/formats/png/rpng_encode.c
+++ b/libretro-common/formats/png/rpng_encode.c
@@ -311,7 +311,6 @@ static bool rpng_save_image(const char *path,
          {
             filter = 4;
             chosen_filtered = paeth_filtered;
-            min_sad = paeth_score;
          }
 
          *encode_target++ = filter;
diff --git a/libretro-common/formats/wav/rwav.c b/libretro-common/formats/wav/rwav.c
index 4929495db0..f2d082bc5e 100644
--- a/libretro-common/formats/wav/rwav.c
+++ b/libretro-common/formats/wav/rwav.c
@@ -56,7 +56,7 @@ void rwav_init(rwav_iterator_t* iter, rwav_t* out, const void* buf, size_t size)
    out->samples = NULL;
 }
 
-int rwav_iterate(rwav_iterator_t *iter)
+enum rwav_state rwav_iterate(rwav_iterator_t *iter)
 {
    size_t s;
    uint16_t *u16       = NULL;
@@ -149,7 +149,10 @@ int rwav_iterate(rwav_iterator_t *iter)
                s -= 2;
             }
          }
-         return iter->i < rwav->subchunk2size ? RWAV_ITERATE_MORE : RWAV_ITERATE_DONE;
+
+         if (iter->i < rwav->subchunk2size)
+            return RWAV_ITERATE_MORE;
+         return RWAV_ITERATE_DONE;
    }
    
    return RWAV_ITERATE_ERROR;
diff --git a/libretro-common/include/audio/audio_mixer.h b/libretro-common/include/audio/audio_mixer.h
index 7e00581879..d278be866a 100644
--- a/libretro-common/include/audio/audio_mixer.h
+++ b/libretro-common/include/audio/audio_mixer.h
@@ -25,16 +25,28 @@
 
 #include <stdint.h>
 #include <stddef.h>
+#include <stdlib.h>
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <boolean.h>
 #include <retro_common_api.h>
 
 RETRO_BEGIN_DECLS
 
+enum audio_mixer_type
+{
+   AUDIO_MIXER_TYPE_NONE = 0,
+   AUDIO_MIXER_TYPE_WAV,
+   AUDIO_MIXER_TYPE_OGG
+};
+
 typedef struct audio_mixer_sound audio_mixer_sound_t;
 typedef struct audio_mixer_voice audio_mixer_voice_t;
 
-typedef void (*audio_mixer_stop_cb_t)(audio_mixer_voice_t* voice, unsigned reason);
+typedef void (*audio_mixer_stop_cb_t)(audio_mixer_sound_t* sound, unsigned reason);
 
 /* Reasons passed to the stop callback. */
 #define AUDIO_MIXER_SOUND_FINISHED 0
@@ -45,8 +57,8 @@ void audio_mixer_init(unsigned rate);
 
 void audio_mixer_done(void);
 
-audio_mixer_sound_t* audio_mixer_load_wav(const char* path);
-audio_mixer_sound_t* audio_mixer_load_ogg(const char* path);
+audio_mixer_sound_t* audio_mixer_load_wav(void *buffer, int32_t size);
+audio_mixer_sound_t* audio_mixer_load_ogg(void *buffer, int32_t size);
 
 void audio_mixer_destroy(audio_mixer_sound_t* sound);
 
diff --git a/libretro-common/include/formats/rwav.h b/libretro-common/include/formats/rwav.h
index 0c7b705d23..5407de832d 100644
--- a/libretro-common/include/formats/rwav.h
+++ b/libretro-common/include/formats/rwav.h
@@ -70,7 +70,7 @@ void rwav_init(rwav_iterator_t* iter, rwav_t* out, const void* buf, size_t size)
  * the rwav_t structure passed to rwav_init is ready to be used. The iterator does not
  * have to be freed.
  */
-int rwav_iterate(rwav_iterator_t *iter);
+enum rwav_state rwav_iterate(rwav_iterator_t *iter);
 
 /**
  * Loads the entire data in one go.
diff --git a/libretro-common/include/net/net_compat.h b/libretro-common/include/net/net_compat.h
index 1abcbc5e86..dd7a1d5c81 100644
--- a/libretro-common/include/net/net_compat.h
+++ b/libretro-common/include/net/net_compat.h
@@ -238,4 +238,6 @@ bool network_init(void);
  **/
 void network_deinit(void);
 
+const char *inet_ntop_compat(int af, const void *src, char *dst, socklen_t cnt);
+
 #endif
diff --git a/libretro-common/include/queues/task_queue.h b/libretro-common/include/queues/task_queue.h
index 332af4760d..5910c15dd6 100644
--- a/libretro-common/include/queues/task_queue.h
+++ b/libretro-common/include/queues/task_queue.h
@@ -43,53 +43,6 @@ enum task_type
 };
 
 
-enum task_queue_ctl_state
-{
-   TASK_QUEUE_CTL_NONE = 0,
-
-   /**
-    * Calls func for every running task
-    * until it returns true.
-    * Returns a task or NULL if not found.
-    */
-   TASK_QUEUE_CTL_FIND,
-
-   /**
-    * Calls func for every running task when handler
-    * parameter matches task handler, allowing the
-    * list parameter to be filled with user-defined
-    * data.
-    */
-   TASK_QUEUE_CTL_RETRIEVE,
-
-   /* Blocks until all tasks have finished.
-    * This must only be called from the main thread. */
-   TASK_QUEUE_CTL_WAIT,
-
-   /* Checks for finished tasks
-    * Takes the finished tasks, if any,
-    * and runs their callbacks.
-    * This must only be called from the main thread. */
-   TASK_QUEUE_CTL_CHECK,
-
-   /* Pushes a task
-    * The task will start as soon as possible. */
-   TASK_QUEUE_CTL_PUSH,
-
-   /* Sends a signal to terminate all the tasks.
-    *
-    * This won't terminate the tasks immediately.
-    * They will finish as soon as possible.
-    *
-    * This must only be called from the main thread. */
-   TASK_QUEUE_CTL_RESET,
-
-   /**
-    * Signals a task to end without waiting for
-    * it to complete. */
-   TASK_QUEUE_CTL_CANCEL
- };
-
 typedef struct retro_task retro_task_t;
 typedef void (*retro_task_callback_t)(void *task_data,
       void *user_data, const char *error);
@@ -177,8 +130,6 @@ typedef struct task_retriever_data
    task_retriever_info_t *list;
 } task_retriever_data_t;
 
-bool task_queue_ctl(enum task_queue_ctl_state state, void *data);
-
 void *task_queue_retriever_info_next(task_retriever_info_t **link);
 
 void task_queue_retriever_info_free(task_retriever_info_t *list);
@@ -224,6 +175,43 @@ void task_queue_unset_threaded(void);
 
 bool task_queue_is_threaded(void);
 
+/**		
+ * Calls func for every running task		
+ * until it returns true.		
+ * Returns a task or NULL if not found.		
+ */
+bool task_queue_find(task_finder_data_t *find_data);
+
+/**		
+ * Calls func for every running task when handler		
+ * parameter matches task handler, allowing the		
+ * list parameter to be filled with user-defined		
+ * data.		
+ */
+void task_queue_retrieve(task_retriever_data_t *data);
+
+ /* Checks for finished tasks		
+  * Takes the finished tasks, if any,		
+  * and runs their callbacks.		
+  * This must only be called from the main thread. */
+void task_queue_check(void);
+
+/* Pushes a task		
+ * The task will start as soon as possible. */		
+void task_queue_push(retro_task_t *task);
+
+/* Blocks until all tasks have finished.		
+ * This must only be called from the main thread. */
+void task_queue_wait(void);
+
+/* Sends a signal to terminate all the tasks.		
+ *		
+ * This won't terminate the tasks immediately.		
+ * They will finish as soon as possible.		
+ *		
+ * This must only be called from the main thread. */
+void task_queue_reset(void);
+
 /* Deinitializes the task system.
  * This deinitializes the task system.
  * The tasks that are running at
diff --git a/libretro-common/include/string/stdstring.h b/libretro-common/include/string/stdstring.h
index 07bedb931b..845d636948 100644
--- a/libretro-common/include/string/stdstring.h
+++ b/libretro-common/include/string/stdstring.h
@@ -48,6 +48,9 @@ static INLINE bool string_is_equal(const char *a, const char *b)
    return (*(const unsigned char*)a - *(const unsigned char*)b) == 0;
 }
 
+#define string_is_not_equal_fast(a, b, size) (memcmp(a, b, size) != 0)
+#define string_is_equal_fast(a, b, size) (memcmp(a, b, size) == 0)
+
 static INLINE bool string_is_equal_noncase(const char *a, const char *b)
 {
    int result;
diff --git a/libretro-common/lists/dir_list.c b/libretro-common/lists/dir_list.c
index 8aa3955064..9e9fcd9310 100644
--- a/libretro-common/lists/dir_list.c
+++ b/libretro-common/lists/dir_list.c
@@ -124,7 +124,7 @@ static int parse_dir_entry(const char *name, char *file_path,
    if (!include_dirs && is_dir)
       return 1;
 
-   if ((memcmp(name, ".", 1) == 0) || (memcmp(name, "..", 2) == 0))
+   if (string_is_equal_fast(name, ".", 1) || string_is_equal_fast(name, "..", 2))
       return 1;
 
    if (!is_dir && ext_list &&
diff --git a/libretro-common/net/net_compat.c b/libretro-common/net/net_compat.c
index de603b5083..938cb51274 100644
--- a/libretro-common/net/net_compat.c
+++ b/libretro-common/net/net_compat.c
@@ -92,7 +92,7 @@ char *inet_ntoa(struct SceNetInAddr in)
 {
 	static char ip_addr[INET_ADDRSTRLEN + 1];
 
-	if(sceNetInetNtop(AF_INET, &in, ip_addr, INET_ADDRSTRLEN) == NULL)
+   if (inet_ntop_compat(AF_INET, &in, ip_addr, INET_ADDRSTRLEN) == NULL)
 		strlcpy(ip_addr, "Invalid", sizeof(ip_addr));
 
 	return ip_addr;
@@ -336,7 +336,7 @@ void network_deinit(void)
 
 uint16_t inet_htons(uint16_t hostshort)
 {
-#ifdef VITA
+#if defined(VITA) || defined(__ORBIS__)
    return sceNetHtons(hostshort);
 #else
    return htons(hostshort);
@@ -345,7 +345,7 @@ uint16_t inet_htons(uint16_t hostshort)
 
 int inet_ptrton(int af, const char *src, void *dst)
 {
-#if defined(VITA)
+#if defined(VITA) || defined(__ORBIS__)
    return sceNetInetPton(af, src, dst);	
 #elif defined(GEKKO) || defined(_WIN32)
    /* TODO/FIXME - should use InetPton on Vista and later */
@@ -354,3 +354,40 @@ int inet_ptrton(int af, const char *src, void *dst)
    return inet_pton(af, src, dst);
 #endif
 }
+
+struct in_addr6_compat
+{
+   unsigned char ip_addr[16];
+};
+
+const char *inet_ntop_compat(int af, const void *src, char *dst, socklen_t cnt)
+{
+#if defined(VITA) || defined(__ORBIS__)
+   return sceNetInetNtop(af,src,dst,cnt);
+#else
+   if (af == AF_INET)
+   {
+      struct sockaddr_in in;
+      memset(&in, 0, sizeof(in));
+      in.sin_family = AF_INET;
+      memcpy(&in.sin_addr, src, sizeof(struct in_addr));
+      getnameinfo((struct sockaddr *)&in, sizeof(struct
+               sockaddr_in), dst, cnt, NULL, 0, NI_NUMERICHOST);
+      return dst;
+   }
+#if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY)
+   else if (af == AF_INET6)
+   {
+      struct sockaddr_in6 in;
+      memset(&in, 0, sizeof(in));
+      in.sin6_family = AF_INET6;
+      memcpy(&in.sin6_addr, src, sizeof(struct in_addr6_compat));
+      getnameinfo((struct sockaddr *)&in, sizeof(struct
+               sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
+      return dst;
+   }
+#endif
+
+   return NULL;
+#endif
+}
diff --git a/libretro-common/net/net_http.c b/libretro-common/net/net_http.c
index 4bf6b28382..a4ec2c4652 100644
--- a/libretro-common/net/net_http.c
+++ b/libretro-common/net/net_http.c
@@ -324,7 +324,7 @@ struct http_t *net_http_new(struct http_connection_t *conn)
       net_http_send_str(fd, &error, "\r\n");
    }
 
-   if (conn->methodcopy && (memcmp(conn->methodcopy, "POST", 4) == 0))
+   if (conn->methodcopy && (string_is_equal_fast(conn->methodcopy, "POST", 4)))
    {
       size_t post_len, len;
       char *len_str        = NULL;
@@ -361,7 +361,7 @@ struct http_t *net_http_new(struct http_connection_t *conn)
    net_http_send_str(fd, &error, "Connection: close\r\n");
    net_http_send_str(fd, &error, "\r\n");
 
-   if (conn->methodcopy && (memcmp(conn->methodcopy, "POST", 4) == 0))
+   if (conn->methodcopy && (string_is_equal_fast(conn->methodcopy, "POST", 4)))
       net_http_send_str(fd, &error, conn->postdatacopy);
 
    if (error)
diff --git a/libretro-common/queues/task_queue.c b/libretro-common/queues/task_queue.c
index 3ff959ce78..b8782e8399 100644
--- a/libretro-common/queues/task_queue.c
+++ b/libretro-common/queues/task_queue.c
@@ -577,82 +577,74 @@ bool task_queue_is_threaded(void)
    return task_threaded_enable;
 }
 
-bool task_queue_ctl(enum task_queue_ctl_state state, void *data)
+bool task_queue_find(task_finder_data_t *find_data)
+{
+   if (!impl_current->find(find_data->func, find_data->userdata))
+      return false;
+   return true;
+}
+
+void task_queue_retrieve(task_retriever_data_t *data)
+{
+   impl_current->retrieve(data);
+}
+
+void task_queue_check(void)
 {
-   switch (state)
-   {
-      case TASK_QUEUE_CTL_FIND:
-         {
-            task_finder_data_t *find_data = (task_finder_data_t*)data;
-            if (!impl_current->find(find_data->func, find_data->userdata))
-               return false;
-         }
-         break;
-      case TASK_QUEUE_CTL_RETRIEVE:
-         impl_current->retrieve((task_retriever_data_t*)data);
-         break;
-      case TASK_QUEUE_CTL_CHECK:
-         {
 #ifdef HAVE_THREADS
-            bool current_threaded = (impl_current == &impl_threaded);
-            bool want_threaded    = task_queue_is_threaded();
+   bool current_threaded = (impl_current == &impl_threaded);
+   bool want_threaded    = task_queue_is_threaded();
 
-            if (want_threaded != current_threaded)
-               task_queue_deinit();
+   if (want_threaded != current_threaded)
+      task_queue_deinit();
 
-            if (!impl_current)
-               task_queue_init(want_threaded, msg_push_bak);
+   if (!impl_current)
+      task_queue_init(want_threaded, msg_push_bak);
 #endif
 
-            impl_current->gather();
-         }
-         break;
-      case TASK_QUEUE_CTL_PUSH:
+   impl_current->gather();
+}
+
+void task_queue_push(retro_task_t *task)
+{
+   /* Ignore this task if a related one is already running */
+   if (task->type == TASK_TYPE_BLOCKING)
+   {
+      retro_task_t *running = NULL;
+      bool found = false;
+
+      SLOCK_LOCK(queue_lock);
+      running = tasks_running.front;
+
+      for (; running; running = running->next)
+      {
+         if (running->type == TASK_TYPE_BLOCKING)
          {
-            retro_task_t *task = (retro_task_t*)data;
-
-            /* Ignore this task if a related one is already running */
-            if (task->type == TASK_TYPE_BLOCKING)
-            {
-               retro_task_t *running = NULL;
-               bool found = false;
-
-               SLOCK_LOCK(queue_lock);
-               running = tasks_running.front;
-
-               for (; running; running = running->next)
-               {
-                  if (running->type == TASK_TYPE_BLOCKING)
-                  {
-                     found = true;
-                     break;
-                  }
-               }
-
-               SLOCK_UNLOCK(queue_lock);
-
-               /* skip this task, user must try again later */
-               if (found)
-                  break;
-            }
-
-            /* The lack of NULL checks in the following functions
-             * is proposital to ensure correct control flow by the users. */
-            impl_current->push_running(task);
+            found = true;
             break;
          }
-      case TASK_QUEUE_CTL_RESET:
-         impl_current->reset();
-         break;
-      case TASK_QUEUE_CTL_WAIT:
-         impl_current->wait();
-         break;
-      case TASK_QUEUE_CTL_NONE:
-      default:
-         break;
+      }
+
+      SLOCK_UNLOCK(queue_lock);
+
+      /* skip this task, user must try again later */
+      if (found)
+         return;
    }
 
-   return true;
+   /* The lack of NULL checks in the following functions
+    * is proposital to ensure correct control flow by the users. */
+   impl_current->push_running(task);
+}
+
+void task_queue_wait(void)
+{
+   impl_current->wait();
+}
+
+void task_queue_reset(void)
+{
+   impl_current->reset();
 }
 
 /**
diff --git a/libretro-common/streams/trans_stream_zlib.c b/libretro-common/streams/trans_stream_zlib.c
index 23007d99d6..6e2179552e 100644
--- a/libretro-common/streams/trans_stream_zlib.c
+++ b/libretro-common/streams/trans_stream_zlib.c
@@ -71,7 +71,7 @@ static void zlib_inflate_stream_free(void *data)
 static bool zlib_deflate_define(void *data, const char *prop, uint32_t val)
 {
    struct zlib_trans_stream *z = (struct zlib_trans_stream *) data;
-   if (memcmp(prop, "level", 5) == 0)
+   if (string_is_equal_fast(prop, "level", 5))
    {
       z->ex = (int) val;
       return true;
@@ -82,7 +82,7 @@ static bool zlib_deflate_define(void *data, const char *prop, uint32_t val)
 static bool zlib_inflate_define(void *data, const char *prop, uint32_t val)
 {
    struct zlib_trans_stream *z = (struct zlib_trans_stream *) data;
-   if (memcmp(prop, "window_bits", 11) == 0)
+   if (string_is_equal_fast(prop, "window_bits", 11))
    {
       z->ex = (int) val;
       return true;
diff --git a/libretro-db/libretrodb.c b/libretro-db/libretrodb.c
index 051a307c58..3c8dd8756f 100644
--- a/libretro-db/libretrodb.c
+++ b/libretro-db/libretrodb.c
@@ -273,18 +273,13 @@ static int libretrodb_find_index(libretrodb_t *db, const char *index_name,
    return -1;
 }
 
-static int node_compare(const void *a, const void *b, void *ctx)
-{
-   return memcmp(a, b, *(uint8_t *)ctx);
-}
-
 static int binsearch(const void *buff, const void *item,
       uint64_t count, uint8_t field_size, uint64_t *offset)
 {
    int mid            = (int)(count / 2);
    int item_size      = field_size + sizeof(uint64_t);
    uint64_t *current  = (uint64_t *)buff + (mid * item_size);
-   int rv             = node_compare(current, item, &field_size);
+   int rv             = memcmp(current, item, field_size);
 
    if (rv == 0)
    {
@@ -458,6 +453,11 @@ static uint64_t libretrodb_tell(libretrodb_t *db)
    return filestream_seek(db->fd, 0, SEEK_CUR);
 }
 
+static int node_compare(const void *a, const void *b, void *ctx)
+{
+   return memcmp(a, b, *(uint8_t *)ctx);
+}
+
 int libretrodb_create_index(libretrodb_t *db,
       const char *name, const char *field_name)
 {
diff --git a/location/location_driver.c b/location/location_driver.c
index d1dd32d782..193f36c90b 100644
--- a/location/location_driver.c
+++ b/location/location_driver.c
@@ -26,7 +26,6 @@
 #include "../core.h"
 #include "../driver.h"
 #include "../retroarch.h"
-#include "../runloop.h"
 #include "../list_special.h"
 #include "../verbosity.h"
 
diff --git a/managers/cheat_manager.c b/managers/cheat_manager.c
index 10d4974d51..b0e824f3b1 100644
--- a/managers/cheat_manager.c
+++ b/managers/cheat_manager.c
@@ -36,7 +36,7 @@
 #include "cheat_manager.h"
 
 #include "../msg_hash.h"
-#include "../runloop.h"
+#include "../retroarch.h"
 #include "../dynamic.h"
 #include "../core.h"
 #include "../verbosity.h"
diff --git a/menu/cbs/menu_cbs_cancel.c b/menu/cbs/menu_cbs_cancel.c
index aa0faab289..e7fe3fff1c 100644
--- a/menu/cbs/menu_cbs_cancel.c
+++ b/menu/cbs/menu_cbs_cancel.c
@@ -17,7 +17,6 @@
 #include <string/stdstring.h>
 
 #include "../menu_driver.h"
-#include "../menu_navigation.h"
 #include "../menu_cbs.h"
 #include "../../msg_hash.h"
 
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index bc159d93f0..0ff2f66845 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -33,7 +33,7 @@
 #include "../../configuration.h"
 #include "../../core.h"
 #include "../../core_info.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 
 #ifndef BIND_ACTION_DEFERRED_PUSH
diff --git a/menu/cbs/menu_cbs_down.c b/menu/cbs/menu_cbs_down.c
index 62fefa3497..1e74665d62 100644
--- a/menu/cbs/menu_cbs_down.c
+++ b/menu/cbs/menu_cbs_down.c
@@ -14,7 +14,6 @@
  */
 
 #include "../menu_driver.h"
-#include "../menu_navigation.h"
 #include "../menu_cbs.h"
 
 #ifndef BIND_ACTION_DOWN
@@ -27,7 +26,7 @@ static int action_bind_down_generic(unsigned type, const char *label)
 {
    size_t scroll_accel    = 0;
    unsigned scroll_speed  = 0;
-   if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel))
+   if (!menu_driver_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel))
       return -1;
 
    scroll_speed = (unsigned)((MAX(scroll_accel, 2) - 2) / 4 + 1);
@@ -35,7 +34,7 @@ static int action_bind_down_generic(unsigned type, const char *label)
    if (menu_entries_get_size() <= 0)
       return 0;
 
-   menu_navigation_ctl(MENU_NAVIGATION_CTL_INCREMENT, &scroll_speed);
+   menu_driver_ctl(MENU_NAVIGATION_CTL_INCREMENT, &scroll_speed);
 
    return 0;
 }
diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c
index 2b5e775f24..dc99bbf803 100644
--- a/menu/cbs/menu_cbs_get_value.c
+++ b/menu/cbs/menu_cbs_get_value.c
@@ -26,7 +26,6 @@
 #include "../menu_animation.h"
 #include "../menu_cbs.h"
 #include "../menu_shader.h"
-#include "../menu_display.h"
 
 #include "../../tasks/tasks_internal.h"
 #include "../../input/input_config.h"
@@ -39,7 +38,7 @@
 #include "../../managers/cheat_manager.h"
 #include "../../performance_counters.h"
 #include "../../paths.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../wifi/wifi_driver.h"
 
 #ifndef BIND_ACTION_GET_VALUE
@@ -1456,7 +1455,7 @@ static void menu_action_setting_disp_set_label_core_options(file_list_t* list,
    *s = '\0';
    *w = 19;
 
-   if (runloop_ctl(RUNLOOP_CTL_CORE_OPTIONS_LIST_GET, &coreopts))
+   if (rarch_ctl(RARCH_CTL_CORE_OPTIONS_LIST_GET, &coreopts))
    {
       core_opt = core_option_manager_get_val(coreopts,
             type - MENU_SETTINGS_CORE_OPTION_START);
diff --git a/menu/cbs/menu_cbs_info.c b/menu/cbs/menu_cbs_info.c
index f4d2e708a8..f3c6507910 100644
--- a/menu/cbs/menu_cbs_info.c
+++ b/menu/cbs/menu_cbs_info.c
@@ -16,7 +16,6 @@
 #include <compat/strl.h>
 
 #include "../menu_driver.h"
-#include "../menu_navigation.h"
 #include "../menu_cbs.h"
 
 #include "../widgets/menu_dialog.h"
diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 3f7210ad67..f0451e1302 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -28,7 +28,6 @@
 #include "../menu_input.h"
 #include "../menu_setting.h"
 #include "../menu_shader.h"
-#include "../menu_navigation.h"
 
 #include "../widgets/menu_list.h"
 
@@ -38,7 +37,6 @@
 #include "../../managers/cheat_manager.h"
 #include "../../file_path_special.h"
 #include "../../retroarch.h"
-#include "../../runloop.h"
 
 #ifndef BIND_ACTION_LEFT
 #define BIND_ACTION_LEFT(cbs, name) \
@@ -120,7 +118,7 @@ static int action_left_scroll(unsigned type, const char *label,
    unsigned scroll_speed = 0, fast_scroll_speed = 0;
    size_t selection      = menu_navigation_get_selection();
 
-   if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel))
+   if (!menu_driver_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel))
       return false;
 
    scroll_speed          = (unsigned)((MAX(scroll_accel, 2) - 2) / 4 + 1);
@@ -129,14 +127,13 @@ static int action_left_scroll(unsigned type, const char *label,
    if (selection > fast_scroll_speed)
    {
       size_t idx  = selection - fast_scroll_speed;
-      bool scroll = true;
       menu_navigation_set_selection(idx);
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
+      menu_driver_navigation_set(true);
    }
    else
    {
       bool pending_push = false;
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
+      menu_driver_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
    }
 
    return 0;
@@ -370,7 +367,7 @@ static int core_setting_left(unsigned type, const char *label,
 {
    unsigned idx     = type - MENU_SETTINGS_CORE_OPTION_START;
 
-   runloop_ctl(RUNLOOP_CTL_CORE_OPTION_PREV, &idx);
+   rarch_ctl(RARCH_CTL_CORE_OPTION_PREV, &idx);
 
    return 0;
 }
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 036c31efa6..b0eb67991f 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -28,10 +28,8 @@
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
-#include "../menu_display.h"
 #include "../menu_setting.h"
 #include "../menu_shader.h"
-#include "../menu_navigation.h"
 #include "../widgets/menu_dialog.h"
 #include "../widgets/menu_filebrowser.h"
 #include "../widgets/menu_input_dialog.h"
@@ -48,7 +46,6 @@
 #include "../../input/input_remapping.h"
 #include "../../paths.h"
 #include "../../retroarch.h"
-#include "../../runloop.h"
 #include "../../verbosity.h"
 #include "../../lakka.h"
 #include "../../wifi/wifi_driver.h"
@@ -58,12 +55,6 @@
 #include "../../network/netplay/netplay_discovery.h"
 #endif
 
-typedef struct
-{
-   enum msg_hash_enums enum_idx;
-   char path[PATH_MAX_LENGTH];
-} menu_file_transfer_t;
-
 enum
 {
    ACTION_OK_LOAD_PRESET = 0,
@@ -97,14 +88,7 @@ unsigned rpl_entry_selection_ptr                 = 0;
 unsigned rdb_entry_start_game_selection_ptr      = 0;
 size_t                     hack_shader_pass      = 0;
 
-/* HACK - we have to find some way to pass state inbetween
- * function pointer callback functions that don't necessarily
- * call each other. */
-char *core_buf                                   = NULL;
-size_t core_len                                  = 0;
-
 #ifdef HAVE_NETWORKING
-
 #ifdef HAVE_LAKKA
 static char lakka_project[128];
 
@@ -124,111 +108,12 @@ static char *lakka_get_project(void)
 }
 #endif
 
-static void cb_net_generic_subdir(void *task_data, void *user_data, const char *err)
-{
-   char subdir_path[PATH_MAX_LENGTH];
-   http_transfer_data_t *data        = (http_transfer_data_t*)task_data;
-   menu_file_transfer_t *state       = (menu_file_transfer_t*)user_data;
-
-   subdir_path[0] = '\0';
-
-   if (!data || err)
-      goto finish;
-
-   memcpy(subdir_path, data->data, data->len * sizeof(char));
-   subdir_path[data->len] = '\0';
-
-finish:
-   if (!err && !strstr(subdir_path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
-   {
-      char parent_dir[PATH_MAX_LENGTH];
-
-      parent_dir[0] = '\0';
-
-      fill_pathname_parent_dir(parent_dir,
-            state->path, sizeof(parent_dir));
-
-      /*generic_action_ok_displaylist_push(parent_dir, NULL,
-            subdir_path, 0, 0, 0, ACTION_OK_DL_CORE_CONTENT_DIRS_SUBDIR_LIST);*/
-   }
-
-   if (err)
-      RARCH_ERR("%s: %s\n", msg_hash_to_str(MSG_DOWNLOAD_FAILED), err);
-
-   if (data)
-   {
-      if (data->data)
-         free(data->data);
-      free(data);
-   }
-
-   if (user_data)
-      free(user_data);
-}
+void cb_net_generic_subdir(void *task_data, void *user_data, const char *err);
 
 /* defined in menu_cbs_deferred_push */
-static void cb_net_generic(void *task_data, void *user_data, const char *err)
-{
-   bool refresh                = false;
-   http_transfer_data_t *data  = (http_transfer_data_t*)task_data;
-   menu_file_transfer_t *state = (menu_file_transfer_t*)user_data;
-
-   if (core_buf)
-      free(core_buf);
-
-
-   core_buf = NULL;
-   core_len = 0;
-
-   if (!data || err)
-      goto finish;
-
-   core_buf = (char*)malloc((data->len+1) * sizeof(char));
-
-   if (!core_buf)
-      goto finish;
-
-   memcpy(core_buf, data->data, data->len * sizeof(char));
-   core_buf[data->len] = '\0';
-   core_len      = data->len;
-
-finish:
-   refresh = true;
-   menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh);
-
-   if (err)
-      RARCH_ERR("%s: %s\n", msg_hash_to_str(MSG_DOWNLOAD_FAILED), err);
-
-   if (data)
-   {
-      if (data->data)
-         free(data->data);
-      free(data);
-   }
-
-   if (!err && !strstr(state->path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
-   {
-      char parent_dir[PATH_MAX_LENGTH];
-      menu_file_transfer_t *transf     = NULL;
-
-      parent_dir[0] = '\0';
-
-      fill_pathname_parent_dir(parent_dir,
-            state->path, sizeof(parent_dir));
-      strlcat(parent_dir, file_path_str(FILE_PATH_INDEX_DIRS_URL), sizeof(parent_dir));
-
-      transf           = (menu_file_transfer_t*)calloc(1, sizeof(*transf));
-      strlcpy(transf->path, parent_dir, sizeof(transf->path));
-
-      task_push_http_transfer(parent_dir, true, "index_dirs", cb_net_generic_subdir, transf);
-   }
-
-   if (state)
-      free(state);
-}
+void cb_net_generic(void *task_data, void *user_data, const char *err);
 #endif
 
-
 int generic_action_ok_displaylist_push(const char *path,
       const char *new_path,
       const char *label, unsigned type, size_t idx, size_t entry_idx,
@@ -238,6 +123,7 @@ int generic_action_ok_displaylist_push(const char *path,
    char tmp[PATH_MAX_LENGTH];
    char parent_dir[PATH_MAX_LENGTH];
    char action_path[PATH_MAX_LENGTH];
+   char lpl_basename[PATH_MAX_LENGTH];
    enum menu_displaylist_ctl_state dl_type = DISPLAYLIST_NONE;
    menu_displaylist_info_t      info       = {0};
    const char           *menu_label        = NULL;
@@ -253,7 +139,7 @@ int generic_action_ok_displaylist_push(const char *path,
    if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
       return menu_cbs_exit();
 
-   new_path_tmp[0] = tmp[0] = parent_dir[0] = action_path[0] = '\0';
+   new_path_tmp[0] = tmp[0] = parent_dir[0] = action_path[0] = lpl_basename[0] = '\0';
 
    menu_entries_get_last_stack(&menu_path, &menu_label, NULL, &enum_idx, NULL);
 
@@ -364,7 +250,6 @@ int generic_action_ok_displaylist_push(const char *path,
          dl_type                 = DISPLAYLIST_GENERIC;
          break;
       case ACTION_OK_DL_FILE_BROWSER_SELECT_DIR:
-         filebrowser_set_type(FILEBROWSER_SELECT_DIR);
          if (path)
             strlcpy(menu->deferred_path, path,
                   sizeof(menu->deferred_path));
@@ -464,7 +349,6 @@ int generic_action_ok_displaylist_push(const char *path,
          dl_type            = DISPLAYLIST_GENERIC;
          break;
       case ACTION_OK_DL_CONTENT_COLLECTION_LIST:
-         filebrowser_set_type(FILEBROWSER_SELECT_COLLECTION);
          info.type          = type;
          info.directory_ptr = idx;
          info_path          = settings->paths.directory_playlist;
@@ -551,6 +435,9 @@ int generic_action_ok_displaylist_push(const char *path,
                settings->paths.path_content_database,
                path, sizeof(tmp));
 
+         fill_pathname_base_noext(lpl_basename, path, sizeof(lpl_basename));
+         menu_driver_set_thumbnail_system(lpl_basename, sizeof(lpl_basename));
+
          info.directory_ptr = idx;
          info_path          = tmp;
          info_label         = msg_hash_to_str(
@@ -1107,7 +994,7 @@ static int generic_action_ok(const char *path,
             if (config_replace(settings->bools.config_save_on_exit, action_path))
             {
                bool pending_push = false;
-               menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
+               menu_driver_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
                ret = -1;
             }
          }
@@ -1684,7 +1571,14 @@ static int action_ok_lookup_setting(const char *path,
 static int action_ok_menu_wallpaper(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   filebrowser_set_type(FILEBROWSER_SELECT_FILE);
+   filebrowser_set_type(FILEBROWSER_SELECT_IMAGE);
+   return action_ok_lookup_setting(path, label, type, idx, entry_idx);
+}
+
+static int action_ok_menu_font(const char *path,
+      const char *label, unsigned type, size_t idx, size_t entry_idx)
+{
+   filebrowser_set_type(FILEBROWSER_SELECT_FONT);
    return action_ok_lookup_setting(path, label, type, idx, entry_idx);
 }
 
@@ -3383,6 +3277,7 @@ static int action_ok_browse_url_list(const char *path,
 static int action_ok_content_collection_list(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
+   filebrowser_set_type(FILEBROWSER_SELECT_COLLECTION);
    return generic_action_ok_displaylist_push(path, NULL, label, type, idx,
          entry_idx, ACTION_OK_DL_CONTENT_COLLECTION_LIST);
 }
@@ -3433,6 +3328,7 @@ static int action_ok_push_content_list(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
    settings_t            *settings   = config_get_ptr();
+   filebrowser_set_type(FILEBROWSER_SELECT_FILE);
    return generic_action_ok_displaylist_push(path,
          settings->paths.directory_menu_content, label, type, idx,
          entry_idx, ACTION_OK_DL_CONTENT_LIST);
@@ -3448,6 +3344,105 @@ static int action_ok_push_scan_file(const char *path,
 }
 
 #ifdef HAVE_NETWORKING
+struct netplay_host_list *lan_hosts;
+int lan_room_count;
+void netplay_refresh_rooms_menu(file_list_t *list)
+{
+   char s[PATH_MAX_LENGTH];
+   int i                                = 0;
+   int j                                = 0;
+
+   menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, list);
+
+   if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) &&
+      netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_SERVER, NULL))
+   {
+      menu_entries_append_enum(list,
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_DISABLE_HOST),
+            msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_DISCONNECT),
+            MENU_ENUM_LABEL_NETPLAY_DISCONNECT,
+            MENU_SETTING_ACTION, 0, 0);
+   }
+   else if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL) &&
+      !netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_SERVER, NULL) &&
+      netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_CONNECTED, NULL))
+   {
+      menu_entries_append_enum(list,
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_DISCONNECT),
+            msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_DISCONNECT),
+            MENU_ENUM_LABEL_NETPLAY_DISCONNECT,
+            MENU_SETTING_ACTION, 0, 0);
+   }
+   else
+   {
+      menu_entries_append_enum(list,
+            msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST),
+            msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST),
+            MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST,
+            MENU_SETTING_ACTION, 0, 0);
+   }
+
+   menu_entries_append_enum(list,
+         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_REFRESH_ROOMS),
+         msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS),
+         MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS,
+         MENU_SETTING_ACTION, 0, 0);
+
+   if (netplay_room_count != 0)
+   {
+      RARCH_LOG ("Found %d rooms...\n", netplay_room_count);
+
+      for (i = 0; i < netplay_room_count; i++)
+      {
+         /* Uncomment this to debug mismatched room parameters*/
+#if 0
+         RARCH_LOG("Room Data: %d\n"
+               "Nickname:         %s\n"
+               "Address:          %s\n"
+               "Port:             %d\n"
+               "Core:             %s\n"
+               "Core Version:     %s\n"
+               "Game:             %s\n"
+               "Game CRC:         %08x\n"
+               "Timestamp:        %d\n", room_data->elems[j + 6].data,
+               netplay_room_list[i].nickname,
+               netplay_room_list[i].address,
+               netplay_room_list[i].port,
+               netplay_room_list[i].corename,
+               netplay_room_list[i].coreversion,
+               netplay_room_list[i].gamename,
+               netplay_room_list[i].gamecrc,
+               netplay_room_list[i].timestamp);
+#endif
+         j+=8;
+         if (netplay_room_list[i].lan)
+         {
+            snprintf(s, sizeof(s),
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME_LAN),
+               netplay_room_list[i].nickname);
+         }
+         else
+         {
+            snprintf(s, sizeof(s),
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME),
+               netplay_room_list[i].nickname);
+         }
+
+         menu_entries_append_enum(list,
+               s,
+               msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM),
+               MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM,
+               MENU_ROOM, 0, 0);
+      }
+
+      netplay_rooms_free();
+   }
+}
+
+#ifndef INET6_ADDRSTRLEN
+#define INET6_ADDRSTRLEN 46
+#endif
+
 static void netplay_refresh_rooms_cb(void *task_data, void *user_data, const char *err)
 {
    char buf[PATH_MAX_LENGTH];
@@ -3489,15 +3484,10 @@ finish:
       {
          char s[PATH_MAX_LENGTH];
          int i                                = 0;
-         int j                                = 0;
          int k                                = 0;
-         int lan_room_count                   = 0;
-         struct netplay_host_list *lan_hosts  = NULL;
          file_list_t *file_list               = menu_entries_get_selection_buf_ptr(0);
 
-#if 1
          netplay_discovery_driver_ctl(RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES, &lan_hosts);
-#endif
          if (lan_hosts)
             lan_room_count                    = (int)lan_hosts->size;
 
@@ -3515,85 +3505,13 @@ finish:
             calloc(netplay_room_count + lan_room_count,
                   sizeof(struct netplay_room));
 
-         menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, file_list);
-         menu_entries_append_enum(file_list,
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST),
-               msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST),
-               MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST,
-               MENU_SETTING_ACTION, 0, 0);
-         menu_entries_append_enum(file_list,
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_REFRESH_ROOMS),
-               msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS),
-               MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS,
-               MENU_SETTING_ACTION, 0, 0);
-
-         if (netplay_room_count != 0)
-         {
-            RARCH_LOG ("Found %d rooms...\n", netplay_room_count);
-
-            for (i = 0; i < netplay_room_count; i++)
-            {
-               memcpy(&netplay_room_list[i], netplay_room_get(i), sizeof(netplay_room_list[i]));
-
-               /*strlcpy(netplay_room_list[i].nickname,
-                     room_data->elems[j + 0].data,
-                     sizeof(netplay_room_list[i].nickname));
-               strlcpy(netplay_room_list[i].address,
-                     room_data->elems[j + 1].data,
-                     sizeof(netplay_room_list[i].address));
-               strlcpy(netplay_room_list[i].corename,
-                     room_data->elems[j + 3].data,
-                     sizeof(netplay_room_list[i].corename));
-               strlcpy(netplay_room_list[i].coreversion,
-                     room_data->elems[j + 4].data,
-                     sizeof(netplay_room_list[i].coreversion));
-               strlcpy(netplay_room_list[i].gamename,
-                     room_data->elems[j + 5].data,
-                     sizeof(netplay_room_list[i].gamename));
-
-               netplay_room_list[i].port      = atoi(room_data->elems[j + 2].data);
-               netplay_room_list[i].gamecrc   = atoi(room_data->elems[j + 6].data);
-               netplay_room_list[i].timestamp = atoi(room_data->elems[j + 7].data);*/
-
-               /* Uncomment this to debug mismatched room parameters*/
-#if 0
-               RARCH_LOG("Room Data: %d\n"
-                     "Nickname:         %s\n"
-                     "Address:          %s\n"
-                     "Port:             %d\n"
-                     "Core:             %s\n"
-                     "Core Version:     %s\n"
-                     "Game:             %s\n"
-                     "Game CRC:         %08x\n"
-                     "Timestamp:        %d\n", room_data->elems[j + 6].data,
-                     netplay_room_list[i].nickname,
-                     netplay_room_list[i].address,
-                     netplay_room_list[i].port,
-                     netplay_room_list[i].corename,
-                     netplay_room_list[i].coreversion,
-                     netplay_room_list[i].gamename,
-                     netplay_room_list[i].gamecrc,
-                     netplay_room_list[i].timestamp);
-#endif
-               j+=8;
-
-               snprintf(s, sizeof(s),
-                     msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME),
-                     netplay_room_list[i].nickname);
-
-               menu_entries_append_enum(file_list,
-                     s,
-                     msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM),
-                     MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM,
-                     MENU_ROOM, 0, 0);
-            }
-
-            netplay_rooms_free();
-         }
+         for (i = 0; i < netplay_room_count; i++)
+            memcpy(&netplay_room_list[i], netplay_room_get(i), sizeof(netplay_room_list[i]));
 
          if (lan_room_count != 0)
          {
             struct netplay_host *host = NULL;
+
             for (host = &lan_hosts->hosts[k]; i < netplay_room_count + lan_room_count; i++)
             {
                struct sockaddr *address = NULL;
@@ -3604,9 +3522,21 @@ finish:
 
                address = &host->addr;
 
-               strlcpy(netplay_room_list[i].address,
-                     inet_ntoa(((struct sockaddr_in*)(address))->sin_addr),
-                     sizeof(netplay_room_list[i].address));
+               if (address->sa_family == AF_INET)
+               {
+                   struct sockaddr_in *sin = (struct sockaddr_in *) address;
+                   inet_ntop_compat(AF_INET, &sin->sin_addr, 
+                      netplay_room_list[i].address, INET6_ADDRSTRLEN);
+               }
+#if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY)
+               else if (address->sa_family == AF_INET6)
+               {
+                  struct sockaddr_in6 *sin = (struct sockaddr_in6 *) address;
+                  inet_ntop_compat(AF_INET6, &sin->sin6_addr, 
+                     netplay_room_list[i].address, INET6_ADDRSTRLEN);
+               }
+#endif
+
                strlcpy(netplay_room_list[i].corename,
                      host->core,
                      sizeof(netplay_room_list[i].corename));
@@ -3620,20 +3550,15 @@ finish:
                netplay_room_list[i].port      = 55435;
                netplay_room_list[i].gamecrc   = host->content_crc;
                netplay_room_list[i].timestamp = 0;
+               netplay_room_list[i].lan = true;
 
                snprintf(s, sizeof(s),
                      msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME_LAN),
                      netplay_room_list[i].nickname);
-
-               menu_entries_append_enum(file_list,
-                     s,
-                     msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM),
-                     MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM,
-                     MENU_ROOM, 0, 0);
-               k++;
             }
             netplay_room_count += lan_room_count;
          }
+         netplay_refresh_rooms_menu(file_list);
       }
    }
 
@@ -3652,11 +3577,14 @@ finish:
 
 }
 
+void netplay_lan_scan_callback(void *task_data,
+                               void *user_data, const char *error);
+
 static int action_ok_push_netplay_refresh_rooms(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
    char url [2048] = "http://newlobby.libretro.com/list/";
-   task_push_netplay_lan_scan();
+   task_push_netplay_lan_scan(netplay_lan_scan_callback);
    task_push_http_transfer(url, true, NULL, netplay_refresh_rooms_cb, NULL);
    return 0;
 }
@@ -3688,7 +3616,7 @@ static int action_ok_push_downloads_dir(const char *path,
 {
    settings_t            *settings   = config_get_ptr();
 
-   filebrowser_clear_type();
+   filebrowser_set_type(FILEBROWSER_SELECT_FILE);
    return generic_action_ok_displaylist_push(path, settings->paths.directory_core_assets,
          msg_hash_to_str(MENU_ENUM_LABEL_FAVORITES),
          type, idx,
@@ -3712,6 +3640,7 @@ int action_ok_push_generic_list(const char *path,
 int action_ok_push_filebrowser_list_dir_select(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
+   filebrowser_set_type(FILEBROWSER_SELECT_DIR);
    strlcpy(filebrowser_label, label, sizeof(filebrowser_label));
    return generic_action_ok_displaylist_push(path, NULL, label, type, idx,
          entry_idx, ACTION_OK_DL_FILE_BROWSER_SELECT_DIR);
@@ -4102,9 +4031,7 @@ static void action_ok_netplay_enable_client_hostname_cb(
    }
 
    menu_input_dialog_end();
-
-   /* Force the menu to close */
-   rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
+   rarch_menu_running_finished();
 }
 #endif
 
@@ -4244,6 +4171,9 @@ static int menu_cbs_init_bind_ok_compare_label(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_MENU_WALLPAPER:
             BIND_ACTION_OK(cbs, action_ok_menu_wallpaper);
             break;
+         case MENU_ENUM_LABEL_VIDEO_FONT_PATH:
+            BIND_ACTION_OK(cbs, action_ok_menu_font);
+            break;
          case MENU_ENUM_LABEL_BROWSE_START:
             BIND_ACTION_OK(cbs, action_ok_browse_url_start);
             break;
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 1f2b05a302..b5a04cec8c 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -28,7 +28,6 @@
 #include "../menu_input.h"
 #include "../menu_setting.h"
 #include "../menu_shader.h"
-#include "../menu_navigation.h"
 
 #include "../widgets/menu_list.h"
 
@@ -38,7 +37,6 @@
 #include "../../managers/cheat_manager.h"
 #include "../../file_path_special.h"
 #include "../../retroarch.h"
-#include "../../runloop.h"
 #include "../../ui/ui_companion_driver.h"
 
 #ifndef BIND_ACTION_RIGHT
@@ -130,7 +128,7 @@ static int action_right_scroll(unsigned type, const char *label,
    unsigned scroll_speed = 0, fast_scroll_speed = 0;
    size_t selection      = menu_navigation_get_selection();
 
-   if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel))
+   if (!menu_driver_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel))
       return false;
 
    scroll_speed      = (unsigned)((MAX(scroll_accel, 2) - 2) / 4 + 1);
@@ -139,15 +137,14 @@ static int action_right_scroll(unsigned type, const char *label,
    if (selection  + fast_scroll_speed < (menu_entries_get_size()))
    {
       size_t idx  = selection + fast_scroll_speed;
-      bool scroll = true;
 
       menu_navigation_set_selection(idx);
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
+      menu_driver_navigation_set(true);
    }
    else
    {
       if ((menu_entries_get_size() > 0))
-         menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_LAST, NULL);
+         menu_driver_ctl(MENU_NAVIGATION_CTL_SET_LAST, NULL);
    }
 
    return 0;
@@ -367,7 +364,7 @@ int core_setting_right(unsigned type, const char *label,
 {
    unsigned idx     = type - MENU_SETTINGS_CORE_OPTION_START;
 
-   runloop_ctl(RUNLOOP_CTL_CORE_OPTION_NEXT, &idx);
+   rarch_ctl(RARCH_CTL_CORE_OPTION_NEXT, &idx);
 
    return 0;
 }
diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index 6d404d61d4..c10d364426 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -96,7 +96,7 @@ static int action_select_default(const char *path, const char *label, unsigned t
    if (action != MENU_ACTION_NOOP)
        ret = menu_entry_action(&entry, (unsigned)idx, action);
 
-   task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
+   task_queue_check();
     
    return ret;
 }
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index 0c07b0656d..68cbed8a70 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -24,7 +24,6 @@
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
 #include "../menu_input.h"
-#include "../menu_display.h"
 #include "../menu_setting.h"
 #include "../menu_shader.h"
 
@@ -34,10 +33,9 @@
 #include "../../managers/core_option_manager.h"
 #include "../../managers/cheat_manager.h"
 #include "../../retroarch.h"
-#include "../../runloop.h"
 #include "../../performance_counters.h"
 
-#include "../../gfx/video_shader_driver.h"
+#include "../../gfx/video_driver.h"
 
 #include "../../input/input_config.h"
 #include "../../input/input_remapping.h"
@@ -197,7 +195,7 @@ static int action_start_core_setting(unsigned type,
    unsigned idx                = type - MENU_SETTINGS_CORE_OPTION_START;
    core_option_manager_t *coreopts = NULL;
    
-   if (runloop_ctl(RUNLOOP_CTL_CORE_OPTIONS_LIST_GET, &coreopts))
+   if (rarch_ctl(RARCH_CTL_CORE_OPTIONS_LIST_GET, &coreopts))
       core_option_manager_set_default(coreopts, idx);
 
    return 0;
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index e17d79d962..2a9d754631 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -353,9 +353,13 @@ static int action_bind_sublabel_netplay_room(
    if (i < 1)
       return 0;
 
-   snprintf(s,len, "%s (%s)\n%s (%08x)", 
+   snprintf(s,len, "%s (%s)\n%s (%08x)\nType: %s (%s)", 
       netplay_room_list[i - 2].corename, netplay_room_list[i - 2].coreversion, 
-      netplay_room_list[i - 2].gamename, netplay_room_list[i - 2].gamecrc);
+      netplay_room_list[i - 2].gamename, netplay_room_list[i - 2].gamecrc,
+      netplay_room_list[i - 2].lan ? "LAN game" : 
+      (netplay_room_list[i - 2].host_method == NETPLAY_HOST_METHOD_MITM ? 
+      "MITM game" : "Lobby game"), netplay_room_list[i - 2].address);
+
 #if 0
    strlcpy(s, netplay_room_list[i - 2].corename, len);
 #endif
diff --git a/menu/cbs/menu_cbs_up.c b/menu/cbs/menu_cbs_up.c
index 23a74e7c14..6de2a17d64 100644
--- a/menu/cbs/menu_cbs_up.c
+++ b/menu/cbs/menu_cbs_up.c
@@ -15,7 +15,6 @@
 
 #include "../menu_driver.h"
 #include "../menu_cbs.h"
-#include "../menu_navigation.h"
 
 #ifndef BIND_ACTION_UP
 #define BIND_ACTION_UP(cbs, name) \
@@ -27,7 +26,7 @@ static int action_bind_up_generic(unsigned type, const char *label)
 {
    size_t scroll_accel    = 0;
    unsigned scroll_speed  = 0;
-   if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel))
+   if (!menu_driver_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL, &scroll_accel))
       return -1;
 
    scroll_speed           = (unsigned)((MAX(scroll_accel, 2) - 2) / 4 + 1);
@@ -35,7 +34,7 @@ static int action_bind_up_generic(unsigned type, const char *label)
    if (menu_entries_get_size() <= 0)
       return 0;
 
-   menu_navigation_ctl(MENU_NAVIGATION_CTL_DECREMENT, &scroll_speed);
+   menu_driver_ctl(MENU_NAVIGATION_CTL_DECREMENT, &scroll_speed);
 
    return 0;
 }
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 02b68e5580..b85484b185 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -43,8 +43,6 @@
 
 #include "../menu_driver.h"
 #include "../menu_animation.h"
-#include "../menu_navigation.h"
-#include "../menu_display.h"
 #include "../menu_event.h"
 
 #include "../widgets/menu_input_dialog.h"
@@ -54,7 +52,6 @@
 #include "../../core.h"
 #include "../../configuration.h"
 #include "../../retroarch.h"
-#include "../../runloop.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"
 
@@ -561,7 +558,7 @@ static void mui_compute_entries_box(mui_handle_t* mui, int width)
    }
 }
 
-static void mui_render(void *data)
+static void mui_render(void *data, bool is_idle)
 {
    menu_animation_ctx_delta_t delta;
    float delta_time;
@@ -674,11 +671,7 @@ static void mui_render_label_value(mui_handle_t *mui, mui_node_t *node,
    uintptr_t texture_switch        = 0;
    bool do_draw_text               = false;
    size_t usable_width             = width - (mui->margin * 2);
-#ifdef VITA
-   uint32_t sublabel_color         = 0xff888888;
-#else
    uint32_t sublabel_color         = 0x888888ff;
-#endif
 
    label_str[0] = value_str[0]     = 
       sublabel_str[0]              = '\0';
@@ -970,15 +963,10 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
    char title_buf[255];
    char title_msg[255];
 
-#ifdef VITA
-   uint32_t black_opaque_54        = 0x8a000000;
-   uint32_t black_opaque_87        = 0xde000000;
-   uint32_t white_opaque_70        = 0xb3ffffff;
-#else
    uint32_t black_opaque_54        = 0x0000008a;
    uint32_t black_opaque_87        = 0x000000de;
    uint32_t white_opaque_70        = 0xffffffb3;
-#endif
+
    /* https://material.google.com/style/color.html#color-color-palette */
    /* Hex values converted to RGB normalized decimals, alpha set to 1 */
    float blue_500[16]              = {0};
@@ -1255,7 +1243,8 @@ static void mui_frame(void *data, video_frame_info_t *video_info)
    node             = (mui_node_t*)menu_entries_get_userdata_at_offset(
          list, selection);
 
-   menu_display_draw_quad(
+   if (node)
+      menu_display_draw_quad(
       0,
       header_height - mui->scroll_y + node->y,
       width,
@@ -2090,6 +2079,8 @@ menu_ctx_driver_t menu_ctx_mui = {
    NULL,
    NULL,
    NULL,
+   NULL,
+   NULL,
    mui_osk_ptr_at_pos,
    NULL,
    NULL,
diff --git a/menu/drivers/menu_generic.c b/menu/drivers/menu_generic.c
index 08ff50fb2e..ed9ee8518d 100644
--- a/menu/drivers/menu_generic.c
+++ b/menu/drivers/menu_generic.c
@@ -22,8 +22,6 @@
 #include "menu_generic.h"
 
 #include "../menu_driver.h"
-#include "../menu_display.h"
-#include "../menu_navigation.h"
 #include "../widgets/menu_dialog.h"
 #include "../widgets/menu_input_bind_dialog.h"
 
diff --git a/menu/drivers/nuklear.c b/menu/drivers/nuklear.c
index 8d0dcc773b..b5b72179f4 100644
--- a/menu/drivers/nuklear.c
+++ b/menu/drivers/nuklear.c
@@ -37,14 +37,12 @@
 
 #include "../menu_driver.h"
 #include "../menu_animation.h"
-#include "../menu_navigation.h"
-#include "../menu_display.h"
 
 #include "../../core.h"
 #include "../../core_info.h"
 #include "../../configuration.h"
 #include "../../frontend/frontend_driver.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"
 
@@ -540,8 +538,13 @@ menu_ctx_driver_t menu_ctx_nuklear = {
    NULL,
    NULL,
    "nuklear",
-   NULL,
-   NULL,
-   NULL,
-   NULL
+   NULL,  /* environ */
+   NULL,  /* pointer_tap */
+   NULL,  /* update_thumbnail_path */
+   NULL,  /* update_thumbnail_image */
+   NULL,  /* set_thumbnail_system */
+   NULL,  /* set_thumbnail_content */
+   NULL,  /* osk_ptr_at_pos */
+   NULL,  /* update_savestate_thumbnail_path */
+   NULL,  /* update_savestate_thumbnail_image */
 };
diff --git a/menu/drivers/nuklear/nk_common.c b/menu/drivers/nuklear/nk_common.c
index e0c6360223..57c55c4853 100644
--- a/menu/drivers/nuklear/nk_common.c
+++ b/menu/drivers/nuklear/nk_common.c
@@ -29,8 +29,8 @@
 
 #include "nk_common.h"
 
-#include "../../menu_display.h"
-#include "../../../gfx/video_shader_driver.h"
+#include "../../menu_driver.h"
+#include "../../../gfx/video_driver.h"
 
 #ifdef HAVE_GLSL
 #include "../../../gfx/drivers/gl_shaders/pipeline_nuklear.glsl.vert.h"
diff --git a/menu/drivers/nuklear/nk_menu.h b/menu/drivers/nuklear/nk_menu.h
index 6957887c1a..0016083ee8 100644
--- a/menu/drivers/nuklear/nk_menu.h
+++ b/menu/drivers/nuklear/nk_menu.h
@@ -21,9 +21,9 @@
 #define _NK_MENU_H
 
 #include "nk_common.h"
-#include "../../menu_display.h"
-#include "../../menu_input.h"
 
+#include "../../menu_driver.h"
+#include "../../menu_input.h"
 
 enum
 {
diff --git a/menu/drivers/null.c b/menu/drivers/null.c
index d2f6fc3f9a..55a6bdc5f3 100644
--- a/menu/drivers/null.c
+++ b/menu/drivers/null.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 
 #include "../menu_driver.h"
-#include "../menu_display.h"
 
 menu_ctx_driver_t menu_ctx_null = {
   NULL,  /* set_texture */
@@ -56,8 +55,13 @@ menu_ctx_driver_t menu_ctx_null = {
   NULL,  /* bind_init */
   NULL,  /* load_image */
   "null",
-  NULL,
-  NULL,
-  NULL, /* update_thumbnail_path */
-  NULL, /* update_thumbnail_image */
+  NULL,  /* environ */
+  NULL,  /* pointer_tap */
+  NULL,  /* update_thumbnail_path */
+  NULL,  /* update_thumbnail_image */
+  NULL,  /* set_thumbnail_system */
+  NULL,  /* set_thumbnail_content */
+  NULL,  /* osk_ptr_at_pos */
+  NULL,  /* update_savestate_thumbnail_path */
+  NULL,  /* update_savestate_thumbnail_image */
 };
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index eea6d6d7eb..22b124f96c 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -40,13 +40,10 @@
 
 #include "../menu_driver.h"
 #include "../menu_animation.h"
-#include "../menu_display.h"
-#include "../menu_navigation.h"
 
 #include "../widgets/menu_input_dialog.h"
 
 #include "../../configuration.h"
-#include "../../runloop.h"
 #include "../../gfx/drivers_font_renderer/bitmap.h"
 
 #define RGUI_TERM_START_X(width)        (width / 21)
@@ -389,7 +386,7 @@ static void rgui_frame(void *data, video_frame_info_t *video_info)
    rgui->frame_count++;
 }
 
-static void rgui_render(void *data)
+static void rgui_render(void *data, bool is_idle)
 {
    menu_animation_ctx_ticker_t ticker;
    unsigned x, y;
@@ -416,7 +413,7 @@ static void rgui_render(void *data)
             && menu_driver_is_alive() && !msg_force)
          return;
 
-      if (runloop_ctl(RUNLOOP_CTL_IS_IDLE, NULL))
+      if (is_idle)
          return;
 
       if (!menu_display_get_update_pending())
@@ -854,14 +851,13 @@ static int rgui_pointer_tap(void *data,
    }
    else if (ptr <= (menu_entries_get_size() - 1))
    {
-      bool scroll              = false;
       size_t selection         = menu_navigation_get_selection();
 
       if (ptr == selection && cbs && cbs->action_select)
          return menu_entry_action(entry, (unsigned)selection, MENU_ACTION_SELECT);
 
       menu_navigation_set_selection(ptr);
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
+      menu_driver_navigation_set(false);
    }
 
    return 0;
@@ -903,5 +899,10 @@ menu_ctx_driver_t menu_ctx_rgui = {
    rgui_environ,
    rgui_pointer_tap,
    NULL,
+   NULL,
+   NULL,
+   NULL,
+   NULL,
+   NULL,
    NULL
 };
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 09b72eab23..bb26c2c61c 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -43,21 +43,19 @@
 
 #include "../menu_driver.h"
 #include "../menu_animation.h"
-#include "../menu_display.h"
-#include "../menu_navigation.h"
 
 #include "../widgets/menu_entry.h"
 #include "../widgets/menu_list.h"
 #include "../widgets/menu_input_dialog.h"
 #include "../widgets/menu_osk.h"
+#include "../widgets/menu_filebrowser.h"
 
 #include "../menu_event.h"
 
 #include "../../verbosity.h"
 #include "../../configuration.h"
-#include "../../retroarch.h"
 #include "../../playlist.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 
 #include "../../tasks/tasks_internal.h"
 
@@ -195,6 +193,8 @@ typedef struct xmb_handle
    float savestate_thumbnail_width;
    float savestate_thumbnail_height;
    char background_file_path[PATH_MAX_LENGTH];
+   char thumbnail_system[PATH_MAX_LENGTH];
+   char thumbnail_content[PATH_MAX_LENGTH];
    char thumbnail_file_path[PATH_MAX_LENGTH];
    char savestate_thumbnail_file_path[PATH_MAX_LENGTH];
    uint64_t frame_count;
@@ -927,7 +927,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
          return;
       }
    }
-   else if (xmb_list_get_selection(xmb) <= XMB_SYSTEM_TAB_SETTINGS)
+   else if (filebrowser_get_type() != FILEBROWSER_NONE)
    {
       xmb->thumbnail_file_path[0] = '\0';
       xmb->thumbnail = 0;
@@ -941,7 +941,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
       playlist_get_index(playlist, i,
             NULL, NULL, NULL, &core_name, NULL, NULL);
 
-      if (core_name && (memcmp(core_name, "imageviewer", 11) == 0))
+      if (core_name && string_is_equal_fast(core_name, "imageviewer", 11))
       {
          strlcpy(xmb->thumbnail_file_path, entry.label,
                sizeof(xmb->thumbnail_file_path));
@@ -952,7 +952,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
    fill_pathname_join(
          xmb->thumbnail_file_path,
          settings->paths.directory_thumbnails,
-         xmb->title_name,
+         xmb->thumbnail_system,
          sizeof(xmb->thumbnail_file_path));
 
    fill_pathname_join(xmb->thumbnail_file_path, xmb->thumbnail_file_path,
@@ -963,7 +963,7 @@ static void xmb_update_thumbnail_path(void *data, unsigned i)
     * http://datomatic.no-intro.org/stuff/The%20Official%20No-Intro%20Convention%20(20071030).zip
     * Replace these characters in the entry name with underscores.
     */
-   tmp = strdup(entry.path);
+   tmp = strdup(xmb->thumbnail_content);
 
    while((scrub_char_pointer = strpbrk(tmp, "&*/:`<>?\\|")))
       *scrub_char_pointer = '_';
@@ -1011,9 +1011,9 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i)
    xmb->savestate_thumbnail_file_path[0] = '\0';
 
    if (     (settings->bools.savestate_thumbnail_enable)
-         && ((memcmp(entry.label, "state_slot", 10) == 0)
-         || (memcmp(entry.label, "loadstate", 9) == 0)
-         || (memcmp(entry.label, "savestate", 9) == 0)))
+         && ((string_is_equal_fast(entry.label, "state_slot", 10))
+         || (string_is_equal_fast(entry.label, "loadstate", 9))
+         || (string_is_equal_fast(entry.label, "savestate", 9))))
    {
       char path[PATH_MAX_LENGTH];
       global_t         *global = global_get_ptr();
@@ -1051,10 +1051,37 @@ static void xmb_update_thumbnail_image(void *data)
    if (path_file_exists(xmb->thumbnail_file_path))
       task_push_image_load(xmb->thumbnail_file_path,
             menu_display_handle_thumbnail_upload, NULL);
-   else if (xmb->depth == 1)
+   else
       xmb->thumbnail = 0;
 }
 
+static void xmb_set_thumbnail_system(void *data, char*s, size_t len)
+{
+   xmb_handle_t *xmb = (xmb_handle_t*)data;
+   if (!xmb)
+      return;
+
+   strlcpy(xmb->thumbnail_system, s, len);
+}
+
+static void xmb_reset_thumbnail_content(void *data)
+{
+   xmb_handle_t *xmb = (xmb_handle_t*)data;
+   if (!xmb)
+      return;
+   memset(xmb->thumbnail_content, 0, sizeof(xmb->thumbnail_content));
+   xmb->thumbnail_content[0] = '\0';
+}
+
+static void xmb_set_thumbnail_content(void *data, char *s, size_t len)
+{
+   xmb_handle_t *xmb = (xmb_handle_t*)data;
+   if (!xmb)
+      return;
+
+   strlcpy(xmb->thumbnail_content, s, len);
+}
+
 static void xmb_update_savestate_thumbnail_image(void *data)
 {
    xmb_handle_t *xmb = (xmb_handle_t*)data;
@@ -1071,6 +1098,7 @@ static void xmb_update_savestate_thumbnail_image(void *data)
 static void xmb_selection_pointer_changed(
       xmb_handle_t *xmb, bool allow_animations)
 {
+   menu_entry_t e;
    unsigned i, end, height;
    menu_animation_ctx_tag_t tag;
    size_t num                 = 0;
@@ -1084,6 +1112,19 @@ static void xmb_selection_pointer_changed(
    if (!xmb)
       return;
 
+   e.path[0]       = '\0';
+   e.label[0]      = '\0';
+   e.sublabel[0]   = '\0';
+   e.value[0]      = '\0';
+   e.rich_label[0] = '\0';
+   e.enum_idx      = MSG_UNKNOWN;
+   e.entry_idx     = 0;
+   e.idx           = 0;
+   e.type          = 0;
+   e.spacing       = 0;
+
+   menu_entry_get(&e, 0, selection, NULL, true);
+
    end       = (unsigned)menu_entries_get_end();
    threshold = xmb->icon.size*10;
 
@@ -1110,17 +1151,35 @@ static void xmb_selection_pointer_changed(
 
       if (i == selection)
       {
-         unsigned depth = (unsigned)xmb_list_get_size(xmb, MENU_LIST_PLAIN);
+         unsigned depth  = (unsigned)xmb_list_get_size(xmb, MENU_LIST_PLAIN);
+         size_t xmb_list = xmb_list_get_selection(xmb);
 
          ia             = xmb->items.active.alpha;
          iz             = xmb->items.active.zoom;
 
          if (!string_is_equal(xmb_thumbnails_ident(),
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF))
-               && (depth == 1 || xmb_list_get_selection(xmb) <= XMB_SYSTEM_TAB_SETTINGS))
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF)))
          {
-            xmb_update_thumbnail_path(xmb, i);
-            xmb_update_thumbnail_image(xmb);
+            if (xmb_list > XMB_SYSTEM_TAB_SETTINGS && depth == 1)
+            {
+               xmb_set_thumbnail_content(xmb, e.path, sizeof(e.path));
+               xmb_update_thumbnail_path(xmb, i);
+               xmb_update_thumbnail_image(xmb);
+            }
+            else if (((e.type == FILE_TYPE_IMAGE || e.type == FILE_TYPE_IMAGEVIEWER ||
+                        e.type == FILE_TYPE_RDB || e.type == FILE_TYPE_RDB_ENTRY)
+               && xmb_list <= XMB_SYSTEM_TAB_SETTINGS))
+            {
+               xmb_set_thumbnail_content(xmb, e.path, sizeof(e.path));
+               xmb_update_thumbnail_path(xmb, i);
+               xmb_update_thumbnail_image(xmb);
+            }
+            else if (filebrowser_get_type() != FILEBROWSER_NONE)
+            {
+               xmb_reset_thumbnail_content(xmb);
+               xmb_update_thumbnail_path(xmb, i);
+               xmb_update_thumbnail_image(xmb);
+            }
          }
          xmb_update_savestate_thumbnail_path(xmb, i);
          xmb_update_savestate_thumbnail_image(xmb);
@@ -1306,7 +1365,12 @@ static void xmb_list_open_new(xmb_handle_t *xmb,
    menu_entries_ctl(MENU_ENTRIES_CTL_SET_START, &skip);
 
    if (xmb_list_get_selection(xmb) <= XMB_SYSTEM_TAB_SETTINGS)
+   {
+      if (xmb->depth < 4)
+         xmb_reset_thumbnail_content(xmb);
       xmb_update_thumbnail_path(xmb, 0);
+      xmb_update_thumbnail_image(xmb);
+   }
 }
 
 static xmb_node_t *xmb_node_allocate_userdata(xmb_handle_t *xmb, unsigned i)
@@ -1557,6 +1621,7 @@ static void xmb_list_switch_horizontal_list(xmb_handle_t *xmb)
 
 static void xmb_list_switch(xmb_handle_t *xmb)
 {
+   menu_entry_t e;
    menu_animation_ctx_entry_t entry;
    int dir                    = -1;
    file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
@@ -1591,6 +1656,21 @@ static void xmb_list_switch(xmb_handle_t *xmb)
    if (!string_is_equal(xmb_thumbnails_ident(),
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_OFF)))
    {
+      e.path[0]       = '\0';
+      e.label[0]      = '\0';
+      e.sublabel[0]   = '\0';
+      e.value[0]      = '\0';
+      e.rich_label[0] = '\0';
+      e.enum_idx      = MSG_UNKNOWN;
+      e.entry_idx     = 0;
+      e.idx           = 0;
+      e.type          = 0;
+      e.spacing       = 0;
+
+      menu_entry_get(&e, 0, selection, NULL, true);
+
+      xmb_set_thumbnail_content(xmb, e.path, sizeof(e.path));
+
       xmb_update_thumbnail_path(xmb, 0);
       xmb_update_thumbnail_image(xmb);
    }
@@ -2353,7 +2433,7 @@ static void xmb_draw_items(
    menu_display_blend_end();
 }
 
-static void xmb_render(void *data)
+static void xmb_render(void *data, bool is_idle)
 {
    size_t i;
    float delta_time;
@@ -2414,7 +2494,7 @@ static void xmb_render(void *data)
 
 static bool xmb_shader_pipeline_active(video_frame_info_t *video_info)
 {
-   if (memcmp(menu_driver_ident(), "xmb", 3) != 0)
+   if (string_is_not_equal_fast(menu_driver_ident(), "xmb", 3))
       return false;
    if (video_info->menu_shader_pipeline == XMB_SHADER_PIPELINE_WALLPAPER)
       return false;
@@ -4084,13 +4164,12 @@ static int xmb_pointer_tap(void *userdata,
    }
    else if (ptr <= (menu_entries_get_size() - 1))
    {
-      bool scroll              = false;
       size_t selection         = menu_navigation_get_selection();
       if (ptr == selection && cbs && cbs->action_select)
          return (unsigned)menu_entry_action(entry, (unsigned)selection, MENU_ACTION_SELECT);
 
       menu_navigation_set_selection(ptr);
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
+      menu_driver_navigation_set(false);
    }
 
    return 0;
@@ -4133,6 +4212,8 @@ menu_ctx_driver_t menu_ctx_xmb = {
    xmb_pointer_tap,
    xmb_update_thumbnail_path,
    xmb_update_thumbnail_image,
+   xmb_set_thumbnail_system,
+   xmb_set_thumbnail_content,
    xmb_osk_ptr_at_pos,
    xmb_update_savestate_thumbnail_path,
    xmb_update_savestate_thumbnail_image
diff --git a/menu/drivers/xui.cpp b/menu/drivers/xui.cpp
index 24171bbfb4..e379503444 100644
--- a/menu/drivers/xui.cpp
+++ b/menu/drivers/xui.cpp
@@ -35,16 +35,13 @@
 #include "../widgets/menu_entry.h"
 #include "../menu_entries.h"
 #include "../menu_input.h"
-#include "../menu_navigation.h"
 #include "../menu_setting.h"
-#include "../menu_display.h"
 #include "../widgets/menu_input_dialog.h"
 
 #include "../../gfx/video_driver.h"
-#include "../../gfx/video_context_driver.h"
 
 #include "../../configuration.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 
 #include "../../gfx/drivers/d3d.h"
 
@@ -441,13 +438,13 @@ static void xui_frame(void *data, video_frame_info_t *video_info)
 
    XuiRenderSetViewTransform( app.GetDC(), &matOrigView );
 
-   runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_PULL, &message);
+   rarch_ctl(RARCH_CTL_MSG_QUEUE_PULL, &message);
 
    if (message)
       xui_render_message(message);
    else
    {
-      runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_PULL, &message);
+      rarch_ctl(RARCH_CTL_MSG_QUEUE_PULL, &message);
 
       if (message)
          xui_render_message(message);
@@ -464,9 +461,12 @@ static void blit_line(int x, int y, const char *message, bool green)
 
 static void xui_render_background(void)
 {
+#if 0
+   /* TODO/FIXME - refactor this */
    if (menu_display_libretro_running())
       XuiElementSetShow(m_background, FALSE);
    else
+#endif
       XuiElementSetShow(m_background, TRUE);
 }
 
@@ -533,7 +533,7 @@ static void xui_set_list_text(int index, const wchar_t* leftText,
    }
 }
 
-static void xui_render(void *data)
+static void xui_render(void *data, bool is_idle)
 {
    size_t end, i, selection, fb_pitch;
    unsigned fb_width, fb_height;
@@ -724,6 +724,8 @@ menu_ctx_driver_t menu_ctx_xui = {
    NULL,          /* pointer_tap */
    NULL,          /* update_thumbnail_path */
    NULL,          /* update_thumbnail_image */
+   NULL,          /* set_thumbnail_system */
+   NULL,          /* set_thumbnail_content */
    NULL,          /* osk_ptr_at_pos */
    NULL,          /* update_savestate_thumbnail_path */
    NULL           /* update_savestate_thumbnail_image */
diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c
index 497adb73ac..6af0ef74f4 100644
--- a/menu/drivers/zarch.c
+++ b/menu/drivers/zarch.c
@@ -42,15 +42,13 @@
 #include "../menu_driver.h"
 #include "../menu_animation.h"
 #include "../widgets/menu_entry.h"
-#include "../menu_display.h"
-#include "../menu_navigation.h"
 #include "../../retroarch.h"
 
 #include "../../gfx/font_driver.h"
 
 #include "../../core_info.h"
 #include "../../configuration.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../verbosity.h"
 #include "../../tasks/tasks_internal.h"
 
@@ -1181,8 +1179,13 @@ menu_ctx_driver_t menu_ctx_zarch = {
    NULL,
    zarch_load_image,
    "zarch",
-   NULL,
-   NULL,
-   NULL,
-   NULL
+   NULL,  /* environ */
+   NULL,  /* pointer_tap */
+   NULL,  /* update_thumbnail_path */
+   NULL,  /* update_thumbnail_image */
+   NULL,  /* set_thumbnail_system */
+   NULL,  /* set_thumbnail_content */
+   NULL,  /* osk_ptr_at_pos */
+   NULL,  /* update_savestate_thumbnail_path */
+   NULL,  /* update_savestate_thumbnail_image */
 };
diff --git a/menu/drivers_display/menu_display_caca.c b/menu/drivers_display/menu_display_caca.c
index 85973b4300..a1f795789c 100644
--- a/menu/drivers_display/menu_display_caca.c
+++ b/menu/drivers_display/menu_display_caca.c
@@ -21,9 +21,9 @@
 
 #include "../../config.def.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_context_driver.h"
+#include "../../gfx/video_driver.h"
 
-#include "../menu_display.h"
+#include "../menu_driver.h"
 
 static void *menu_display_caca_get_default_mvp(void)
 {
diff --git a/menu/drivers_display/menu_display_ctr.c b/menu/drivers_display/menu_display_ctr.c
index 401929a6ee..93b34449f3 100644
--- a/menu/drivers_display/menu_display_ctr.c
+++ b/menu/drivers_display/menu_display_ctr.c
@@ -19,12 +19,11 @@
 #include "../../config.h"
 #endif
 
-#include "../menu_display.h"
+#include "../menu_driver.h"
 
 #include "../../retroarch.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_context_driver.h"
-#include "../../gfx/video_shader_driver.h"
+#include "../../gfx/video_driver.h"
 #include "../../gfx/common/ctr_common.h"
 #include "../../gfx/drivers/ctr_gu.h"
 #include "../../ctr/gpu_old.h"
diff --git a/menu/drivers_display/menu_display_d3d.cpp b/menu/drivers_display/menu_display_d3d.cpp
index 4ea27cf5c9..17bbe447b1 100644
--- a/menu/drivers_display/menu_display_d3d.cpp
+++ b/menu/drivers_display/menu_display_d3d.cpp
@@ -21,11 +21,11 @@
 #include "../../config.h"
 #endif
 
-#include "../menu_display.h"
+#include "../menu_driver.h"
 
 #include "../../retroarch.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_context_driver.h"
+#include "../../gfx/video_driver.h"
 #include "../../gfx/drivers/d3d.h"
 #include "../../gfx/common/d3d_common.h"
 
@@ -172,15 +172,6 @@ static void menu_display_d3d_draw(void *data)
    menu_display_d3d_viewport(draw);
    menu_display_d3d_bind_texture(draw);
 
-#if 0
-   mat = (math_matrix_4x4*)draw->matrix_data;
-   if (!mat)
-      mat                         = (math_matrix_4x4*)
-         menu_display_d3d_get_default_mvp();
-   video_shader_driver_set_coords(draw->coords);
-   video_shader_driver_set_mvp(mat);
-#endif
-
    d3d_draw_primitive(d3d->dev, (D3DPRIMITIVETYPE)
          menu_display_prim_to_d3d_enum(draw->prim_type),
          0, draw->coords->vertices);
@@ -189,11 +180,10 @@ static void menu_display_d3d_draw(void *data)
 static void menu_display_d3d_draw_pipeline(void *data)
 {
 #if defined(HAVE_HLSL) || defined(HAVE_CG)
-   video_shader_ctx_info_t shader_info;
    menu_display_ctx_draw_t *draw     = (menu_display_ctx_draw_t*)data;
    struct uniform_info uniform_param = {0};
    static float t                    = 0;
-   video_coord_array_t *ca             = NULL;
+   video_coord_array_t *ca           = NULL;
 
    ca = menu_display_get_coords_array();
 
@@ -207,11 +197,6 @@ static void menu_display_d3d_draw_pipeline(void *data)
       case VIDEO_SHADER_MENU:
       case VIDEO_SHADER_MENU_2:
       case VIDEO_SHADER_MENU_3:
-         shader_info.data                = NULL;
-         shader_info.idx                 = draw->pipeline.id;
-         shader_info.set_active          = true;
-
-         video_shader_driver_use(shader_info);
 
          t += 0.01;
 
@@ -224,7 +209,6 @@ static void menu_display_d3d_draw_pipeline(void *data)
          uniform_param.lookup.ident      = "time";
          uniform_param.result.f.v0       = t;
 
-         video_shader_driver_set_parameter(uniform_param);
          break;
    }
 #endif
diff --git a/menu/drivers_display/menu_display_gdi.c b/menu/drivers_display/menu_display_gdi.c
index b131ff9015..5ad2db0c45 100644
--- a/menu/drivers_display/menu_display_gdi.c
+++ b/menu/drivers_display/menu_display_gdi.c
@@ -21,9 +21,9 @@
 
 #include "../../config.def.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_context_driver.h"
+#include "../../gfx/video_driver.h"
 
-#include "../menu_display.h"
+#include "../menu_driver.h"
 
 #if defined(_WIN32) && !defined(_XBOX)
 #include "../../gfx/common/win32_common.h"
diff --git a/menu/drivers_display/menu_display_gl.c b/menu/drivers_display/menu_display_gl.c
index e0f8b83dbb..fd70b56de2 100644
--- a/menu/drivers_display/menu_display_gl.c
+++ b/menu/drivers_display/menu_display_gl.c
@@ -21,11 +21,10 @@
 
 #include "../../retroarch.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_context_driver.h"
-#include "../../gfx/video_shader_driver.h"
+#include "../../gfx/video_driver.h"
 #include "../../gfx/common/gl_common.h"
 
-#include "../menu_display.h"
+#include "../menu_driver.h"
 
 static const GLfloat gl_vertexes[] = {
    0, 0,
diff --git a/menu/drivers_display/menu_display_null.c b/menu/drivers_display/menu_display_null.c
index 67b2628da2..c4fbe5df57 100644
--- a/menu/drivers_display/menu_display_null.c
+++ b/menu/drivers_display/menu_display_null.c
@@ -19,9 +19,9 @@
 #include <retro_miscellaneous.h>
 
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_context_driver.h"
+#include "../../gfx/video_driver.h"
 
-#include "../menu_display.h"
+#include "../menu_driver.h"
 
 static void *menu_display_null_get_default_mvp(void)
 {
diff --git a/menu/drivers_display/menu_display_vga.c b/menu/drivers_display/menu_display_vga.c
index 7ec9814d41..d6c38bbbda 100644
--- a/menu/drivers_display/menu_display_vga.c
+++ b/menu/drivers_display/menu_display_vga.c
@@ -21,9 +21,9 @@
 
 #include "../../config.def.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_context_driver.h"
+#include "../../gfx/video_driver.h"
 
-#include "../menu_display.h"
+#include "../menu_driver.h"
 
 static void *menu_display_vga_get_default_mvp(void)
 {
diff --git a/menu/drivers_display/menu_display_vita2d.c b/menu/drivers_display/menu_display_vita2d.c
index 385f679a7c..1d2a5601fc 100644
--- a/menu/drivers_display/menu_display_vita2d.c
+++ b/menu/drivers_display/menu_display_vita2d.c
@@ -21,12 +21,11 @@
 #include "../../config.h"
 #endif
 
-#include "../menu_display.h"
+#include "../menu_driver.h"
 
 #include "../../retroarch.h"
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_context_driver.h"
-#include "../../gfx/video_shader_driver.h"
+#include "../../gfx/video_driver.h"
 #include "../../gfx/common/vita2d_common.h"
 #include "../../defines/psp_defines.h"
 
diff --git a/menu/drivers_display/menu_display_vulkan.c b/menu/drivers_display/menu_display_vulkan.c
index 669ae31733..5b7577b088 100644
--- a/menu/drivers_display/menu_display_vulkan.c
+++ b/menu/drivers_display/menu_display_vulkan.c
@@ -20,12 +20,11 @@
 #include "../../config.h"
 #endif
 
-#include "../menu_display.h"
+#include "../menu_driver.h"
 
 #include "../../gfx/font_driver.h"
-#include "../../gfx/video_context_driver.h"
+#include "../../gfx/video_driver.h"
 #include "../../gfx/common/vulkan_common.h"
-#include "../../gfx/video_shader_driver.h"
 
 /* Will do Y-flip later, but try to make it similar to GL. */
 static const float vk_vertexes[] = {
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 930bd07679..b7fb5d809d 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -103,10 +103,14 @@ enum
    ACTION_OK_DL_CONTENT_SETTINGS
 };
 
+typedef struct
+{
+   enum msg_hash_enums enum_idx;
+   char path[PATH_MAX_LENGTH];
+} menu_file_transfer_t;
+
 /* FIXME - Externs, refactor */
 extern size_t hack_shader_pass;
-extern char *core_buf;
-extern size_t core_len;
 extern unsigned rpl_entry_selection_ptr;
 
 /* Function callbacks */
diff --git a/menu/menu_content.c b/menu/menu_content.c
index bcb3a195b9..8eafc352b7 100644
--- a/menu/menu_content.c
+++ b/menu/menu_content.c
@@ -26,7 +26,6 @@
 
 #include "menu_content.h"
 #include "menu_driver.h"
-#include "menu_display.h"
 #include "menu_shader.h"
 
 #include "../core_info.h"
diff --git a/menu/menu_display.c b/menu/menu_display.c
deleted file mode 100644
index 05576bb547..0000000000
--- a/menu/menu_display.c
+++ /dev/null
@@ -1,1224 +0,0 @@
-/*  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
- *
- *  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 <time.h>
-
-#include <retro_assert.h>
-#include <queues/message_queue.h>
-#include <retro_miscellaneous.h>
-#include <formats/image.h>
-#include <file/file_path.h>
-#include <string/stdstring.h>
-
-#ifdef HAVE_CONFIG_H
-#include "../config.h"
-#endif
-
-#ifdef HAVE_THREADS
-#include "../gfx/video_thread_wrapper.h"
-#endif
-
-#include "../config.def.h"
-#include "../retroarch.h"
-#include "../configuration.h"
-#include "../runloop.h"
-#include "../core.h"
-#include "../gfx/video_driver.h"
-#include "../gfx/video_thread_wrapper.h"
-#include "../verbosity.h"
-
-#include "menu_driver.h"
-#include "menu_animation.h"
-#include "menu_display.h"
-
-#define PARTICLES_COUNT            100
-
-uintptr_t menu_display_white_texture;
-
-static enum menu_toggle_reason menu_display_toggle_reason = MENU_TOGGLE_REASON_NONE;
-
-static video_coord_array_t menu_disp_ca;
-
-static unsigned menu_display_framebuf_width      = 0;
-static unsigned menu_display_framebuf_height     = 0;
-static size_t menu_display_framebuf_pitch        = 0;
-static unsigned menu_display_header_height       = 0;
-static bool menu_display_msg_force               = false;
-static bool menu_display_font_alloc_framebuf     = false;
-static bool menu_display_framebuf_dirty          = false;
-static const uint8_t *menu_display_font_framebuf = NULL;
-static msg_queue_t *menu_display_msg_queue       = NULL;
-static menu_display_ctx_driver_t *menu_disp      = NULL;
-
-static menu_display_ctx_driver_t *menu_display_ctx_drivers[] = {
-#ifdef HAVE_D3D
-   &menu_display_ctx_d3d,
-#endif
-#ifdef HAVE_OPENGL
-   &menu_display_ctx_gl,
-#endif
-#ifdef HAVE_VULKAN
-   &menu_display_ctx_vulkan,
-#endif
-#ifdef HAVE_VITA2D
-   &menu_display_ctx_vita2d,
-#endif
-#ifdef _3DS
-   &menu_display_ctx_ctr,
-#endif
-#ifdef HAVE_CACA
-   &menu_display_ctx_caca,
-#endif
-#if defined(_WIN32) && !defined(_XBOX)
-   &menu_display_ctx_gdi,
-#endif
-#ifdef DJGPP
-   &menu_display_ctx_vga,
-#endif
-   &menu_display_ctx_null,
-   NULL,
-};
-
-enum menu_toggle_reason menu_display_toggle_get_reason(void)
-{
-  return menu_display_toggle_reason;
-}
-
-void menu_display_toggle_set_reason(enum menu_toggle_reason reason)
-{
-  menu_display_toggle_reason = reason;
-}
-
-static const char *menu_video_get_ident(bool video_is_threaded)
-{
-#ifdef HAVE_THREADS
-   if (video_is_threaded)
-      return video_thread_get_ident();
-#endif
-
-   return video_driver_get_ident();
-}
-
-static bool menu_display_check_compatibility(
-      enum menu_display_driver_type type,
-      bool video_is_threaded)
-{
-   const char *video_driver = menu_video_get_ident(video_is_threaded);
-
-   switch (type)
-   {
-      case MENU_VIDEO_DRIVER_GENERIC:
-         return true;
-      case MENU_VIDEO_DRIVER_OPENGL:
-         if (memcmp(video_driver, "gl", 2) == 0)
-            return true;
-         break;
-      case MENU_VIDEO_DRIVER_VULKAN:
-         if (memcmp(video_driver, "vulkan", 6) == 0)
-            return true;
-         break;
-      case MENU_VIDEO_DRIVER_DIRECT3D:
-         if (memcmp(video_driver, "d3d", 3) == 0)
-            return true;
-         break;
-      case MENU_VIDEO_DRIVER_VITA2D:
-         if (memcmp(video_driver, "vita2d", 6) == 0)
-            return true;
-         break;
-      case MENU_VIDEO_DRIVER_CTR:
-         if (memcmp(video_driver, "ctr", 3) == 0)
-            return true;
-         break;
-      case MENU_VIDEO_DRIVER_CACA:
-         if (memcmp(video_driver, "caca", 4) == 0)
-            return true;
-         break;
-      case MENU_VIDEO_DRIVER_GDI:
-         if (memcmp(video_driver, "gdi", 3) == 0)
-            return true;
-         break;
-      case MENU_VIDEO_DRIVER_VGA:
-         if (memcmp(video_driver, "vga", 3) == 0)
-            return true;
-         break;
-   }
-
-   return false;
-}
-
-void menu_display_timedate(menu_display_ctx_datetime_t *datetime)
-{
-   time_t time_;
-
-   if (!datetime)
-      return;
-
-   time(&time_);
-
-   switch (datetime->time_mode)
-   {
-      case 0: /* Date and time */
-         strftime(datetime->s, datetime->len,
-               "%Y-%m-%d %H:%M:%S", localtime(&time_));
-         break;
-      case 1: /* Date */
-         strftime(datetime->s, datetime->len,
-               "%Y-%m-%d", localtime(&time_));
-         break;
-      case 2: /* Time */
-         strftime(datetime->s, datetime->len,
-               "%H:%M:%S", localtime(&time_));
-         break;
-      case 3: /* Time (hours-minutes) */
-         strftime(datetime->s, datetime->len,
-               "%H:%M", localtime(&time_));
-         break;
-      case 4: /* Date and time, without year and seconds */
-         strftime(datetime->s, datetime->len,
-               "%d/%m %H:%M", localtime(&time_));
-         break;
-   }
-}
-
-void menu_display_blend_begin(void)
-{
-   if (!menu_disp || !menu_disp->blend_begin)
-      return;
-   menu_disp->blend_begin();
-}
-
-void menu_display_blend_end(void)
-{
-   if (!menu_disp || !menu_disp->blend_end)
-      return;
-   menu_disp->blend_end();
-}
-
-void menu_display_font_free(font_data_t *font)
-{
-   font_driver_free(font);
-}
-
-static font_data_t *menu_display_font_main_init(menu_display_ctx_font_t *font,
-      bool is_threaded)
-{
-   font_data_t *font_data = NULL;
-
-   if (!font || !menu_disp)
-      return NULL;
-
-   if (!menu_disp->font_init_first((void**)&font_data,
-            video_driver_get_ptr(false),
-            font->path, font->size, is_threaded))
-      return NULL;
-
-   return font_data;
-}
-
-font_data_t *menu_display_font(enum application_special_type type, float font_size,
-      bool is_threaded)
-{
-   menu_display_ctx_font_t font_info;
-   char fontpath[PATH_MAX_LENGTH];
-
-   fontpath[0] = '\0';
-
-   fill_pathname_application_special(fontpath, sizeof(fontpath), type);
-
-   font_info.path = fontpath;
-   font_info.size = font_size;
-
-   return menu_display_font_main_init(&font_info, is_threaded);
-}
-
-void menu_display_font_bind_block(font_data_t *font, void *block)
-{
-   font_driver_bind_block(font, block);
-}
-
-bool menu_display_font_flush_block(unsigned width, unsigned height,
-      font_data_t *font)
-{
-   font_driver_flush(width, height, font);
-   font_driver_bind_block(font, NULL);
-   return true;
-}
-
-void menu_display_framebuffer_deinit(void)
-{
-   menu_display_framebuf_width  = 0;
-   menu_display_framebuf_height = 0;
-   menu_display_framebuf_pitch  = 0;
-}
-
-void menu_display_deinit(void)
-{
-   if (menu_display_msg_queue)
-      msg_queue_free(menu_display_msg_queue);
-
-   video_coord_array_free(&menu_disp_ca);
-   menu_display_msg_queue       = NULL;
-   menu_display_msg_force       = false;
-   menu_display_header_height   = 0;
-   menu_disp                    = NULL;
-
-   menu_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
-   menu_display_framebuffer_deinit();
-}
-
-bool menu_display_init(void)
-{
-   menu_display_msg_queue  = msg_queue_new(8);
-   menu_disp_ca.allocated  =  0;
-   return true;
-}
-
-void menu_display_coords_array_reset(void)
-{
-   menu_disp_ca.coords.vertices = 0;
-}
-
-video_coord_array_t *menu_display_get_coords_array(void)
-{
-   return &menu_disp_ca;
-}
-
-const uint8_t *menu_display_get_font_framebuffer(void)
-{
-   return menu_display_font_framebuf;
-}
-
-void menu_display_set_font_framebuffer(const uint8_t *buffer)
-{
-   menu_display_font_framebuf = buffer;
-}
-
-bool menu_display_libretro_running(void)
-{
-   settings_t *settings = config_get_ptr();
-   if (!settings->bools.menu_pause_libretro)
-   {
-      if (rarch_ctl(RARCH_CTL_IS_INITED, NULL)
-            && !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
-         return true;
-   }
-   return false;
-}
-
-bool menu_display_libretro(void)
-{
-   video_driver_set_texture_enable(true, false);
-
-   if (menu_display_libretro_running())
-   {
-      if (!input_driver_is_libretro_input_blocked())
-         input_driver_set_libretro_input_blocked();
-
-      core_run();
-
-      input_driver_unset_libretro_input_blocked();
-      return true;
-   }
-
-   if (runloop_ctl(RUNLOOP_CTL_IS_IDLE, NULL))
-      return true; /* Maybe return false here for indication of idleness? */
-   return video_driver_cached_frame();
-}
-
-void menu_display_get_fb_size(unsigned *fb_width,
-      unsigned *fb_height, size_t *fb_pitch)
-{
-   *fb_width  = menu_display_framebuf_width;
-   *fb_height = menu_display_framebuf_height;
-   *fb_pitch  = menu_display_framebuf_pitch;
-}
-
-void menu_display_set_width(unsigned width)
-{
-   menu_display_framebuf_width = width;
-}
-
-void menu_display_set_height(unsigned height)
-{
-   menu_display_framebuf_height = height;
-}
-
-void menu_display_set_header_height(unsigned height)
-{
-   menu_display_header_height = height;
-}
-
-unsigned menu_display_get_header_height(void)
-{
-   return menu_display_header_height;
-}
-
-size_t menu_display_get_framebuffer_pitch(void)
-{
-   return menu_display_framebuf_pitch;
-}
-
-void menu_display_set_framebuffer_pitch(size_t pitch)
-{
-   menu_display_framebuf_pitch = pitch;
-}
-
-bool menu_display_get_msg_force(void)
-{
-   return menu_display_msg_force;
-}
-
-void menu_display_set_msg_force(bool state)
-{
-   menu_display_msg_force = state;
-}
-
-bool menu_display_get_font_data_init(void)
-{
-   return menu_display_font_alloc_framebuf;
-}
-
-void menu_display_set_font_data_init(bool state)
-{
-   menu_display_font_alloc_framebuf = state;
-}
-
-bool menu_display_get_update_pending(void)
-{
-   if (menu_animation_is_active())
-      return true;
-   if (menu_display_get_framebuffer_dirty_flag())
-      return true;
-   return false;
-}
-
-void menu_display_set_viewport(unsigned width, unsigned height)
-{
-   video_driver_set_viewport(width, height, true, false);
-}
-
-void menu_display_unset_viewport(unsigned width, unsigned height)
-{
-   video_driver_set_viewport(width, height, false, true);
-}
-
-bool menu_display_get_framebuffer_dirty_flag(void)
-{
-   return menu_display_framebuf_dirty;
-}
-
-void menu_display_set_framebuffer_dirty_flag(void)
-{
-   menu_display_framebuf_dirty = true;
-}
-
-void menu_display_unset_framebuffer_dirty_flag(void)
-{
-   menu_display_framebuf_dirty = false;
-}
-
-float menu_display_get_dpi(void)
-{
-   gfx_ctx_metrics_t metrics;
-   settings_t *settings = config_get_ptr();
-   float            dpi = menu_dpi_override_value;
-
-   if (!settings)
-      return true;
-
-   metrics.type  = DISPLAY_METRIC_DPI;
-   metrics.value = &dpi;
-
-   if (settings->bools.menu_dpi_override_enable)
-      return settings->uints.menu_dpi_override_value;
-   else if (!video_context_driver_get_metrics(&metrics) || !dpi)
-      return menu_dpi_override_value;
-
-   return dpi;
-}
-
-bool menu_display_init_first_driver(bool video_is_threaded)
-{
-   unsigned i;
-
-   for (i = 0; menu_display_ctx_drivers[i]; i++)
-   {
-      if (!menu_display_check_compatibility(
-               menu_display_ctx_drivers[i]->type,
-               video_is_threaded))
-         continue;
-
-      RARCH_LOG("[Menu]: Found menu display driver: \"%s\".\n",
-            menu_display_ctx_drivers[i]->ident);
-      menu_disp = menu_display_ctx_drivers[i];
-      return true;
-   }
-   return false;
-}
-
-bool menu_display_restore_clear_color(void)
-{
-   if (!menu_disp || !menu_disp->restore_clear_color)
-      return false;
-   menu_disp->restore_clear_color();
-   return true;
-}
-
-void menu_display_clear_color(menu_display_ctx_clearcolor_t *color)
-{
-   if (!menu_disp || !menu_disp->clear_color)
-      return;
-   menu_disp->clear_color(color);
-}
-
-void menu_display_draw(menu_display_ctx_draw_t *draw)
-{
-   if (!menu_disp || !draw || !menu_disp->draw)
-      return;
-
-   /* TODO - edge case */
-   if (draw->height <= 0)
-      draw->height = 1;
-
-   menu_disp->draw(draw);
-}
-
-void menu_display_draw_pipeline(menu_display_ctx_draw_t *draw)
-{
-   if (!menu_disp || !draw || !menu_disp->draw_pipeline)
-      return;
-   menu_disp->draw_pipeline(draw);
-}
-
-void menu_display_draw_bg(menu_display_ctx_draw_t *draw,
-      video_frame_info_t *video_info, bool add_opacity_to_wallpaper)
-{
-   static struct video_coords coords;
-   const float *new_vertex       = NULL;
-   const float *new_tex_coord    = NULL;
-   if (!menu_disp || !draw)
-      return;
-
-   new_vertex           = draw->vertex;
-   new_tex_coord        = draw->tex_coord;
-
-   if (!new_vertex)
-      new_vertex        = menu_disp->get_default_vertices();
-   if (!new_tex_coord)
-      new_tex_coord     = menu_disp->get_default_tex_coords();
-
-   coords.vertices      = (unsigned)draw->vertex_count;
-   coords.vertex        = new_vertex;
-   coords.tex_coord     = new_tex_coord;
-   coords.lut_tex_coord = new_tex_coord;
-   coords.color         = (const float*)draw->color;
-
-   draw->coords      = &coords;
-
-   if (!video_info->libretro_running && !draw->pipeline.active)
-      add_opacity_to_wallpaper = true;
-
-   if (add_opacity_to_wallpaper)
-      menu_display_set_alpha(draw->color, video_info->menu_wallpaper_opacity);
-
-   if (!draw->texture)
-      draw->texture     = menu_display_white_texture;
-
-   draw->matrix_data = (math_matrix_4x4*)menu_disp->get_default_mvp();
-}
-
-void menu_display_draw_gradient(menu_display_ctx_draw_t *draw,
-      video_frame_info_t *video_info)
-{
-   draw->texture       = 0;
-   draw->x             = 0;
-   draw->y             = 0;
-
-   menu_display_draw_bg(draw, video_info, false);
-   menu_display_draw(draw);
-}
-
-void menu_display_draw_quad(
-      int x, int y, unsigned w, unsigned h,
-      unsigned width, unsigned height,
-      float *color)
-{
-   menu_display_ctx_draw_t draw;
-   struct video_coords coords;
-
-   coords.vertices      = 4;
-   coords.vertex        = NULL;
-   coords.tex_coord     = NULL;
-   coords.lut_tex_coord = NULL;
-   coords.color         = color;
-
-   menu_display_blend_begin();
-
-   draw.x           = x;
-   draw.y           = (int)height - y - (int)h;
-   draw.width       = w;
-   draw.height      = h;
-   draw.coords      = &coords;
-   draw.matrix_data = NULL;
-   draw.texture     = menu_display_white_texture;
-   draw.prim_type   = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
-   draw.pipeline.id = 0;
-
-   menu_display_draw(&draw);
-   menu_display_blend_end();
-}
-
-void menu_display_draw_texture(
-      int x, int y, unsigned w, unsigned h,
-      unsigned width, unsigned height,
-      float *color, uintptr_t texture)
-{
-   menu_display_ctx_draw_t draw;
-   menu_display_ctx_rotate_draw_t rotate_draw;
-   struct video_coords coords;
-   math_matrix_4x4 mymat;
-   rotate_draw.matrix       = &mymat;
-   rotate_draw.rotation     = 0.0;
-   rotate_draw.scale_x      = 1.0;
-   rotate_draw.scale_y      = 1.0;
-   rotate_draw.scale_z      = 1;
-   rotate_draw.scale_enable = true;
-   coords.vertices          = 4;
-   coords.vertex            = NULL;
-   coords.tex_coord         = NULL;
-   coords.lut_tex_coord     = NULL;
-   draw.width               = w;
-   draw.height              = h;
-   draw.coords              = &coords;
-   draw.matrix_data         = &mymat;
-   draw.prim_type           = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
-   draw.pipeline.id         = 0;
-   coords.color             = (const float*)color;
-
-   menu_display_rotate_z(&rotate_draw);
-
-   draw.texture             = texture;
-   draw.x                   = x;
-   draw.y                   = height - y;
-   menu_display_draw(&draw);
-}
-
-/* Draw the texture split into 9 sections, without scaling the corners.
- * The middle sections will only scale in the X axis, and the side
- * sections will only scale in the Y axis. */
-void menu_display_draw_texture_slice(
-      int x, int y, unsigned w, unsigned h,
-      unsigned new_w, unsigned new_h,
-      unsigned width, unsigned height,
-      float *color, unsigned offset, float scale_factor, uintptr_t texture)
-{
-   menu_display_ctx_draw_t draw;
-   menu_display_ctx_rotate_draw_t rotate_draw;
-   struct video_coords coords;
-   math_matrix_4x4 mymat;
-   unsigned i;
-   float V_BL[2], V_BR[2], V_TL[2], V_TR[2], T_BL[2], T_BR[2], T_TL[2], T_TR[2];
-
-   /* need space for the coordinates of two triangles in a strip, so 8 vertices */
-   float *tex_coord  = (float*)malloc(8 * sizeof(float));
-   float *vert_coord = (float*)malloc(8 * sizeof(float));
-   float *colors     = (float*)malloc(16 * sizeof(float));
-
-   /* normalized width/height of the amount to offset from the corners,
-    * for both the vertex and texture coordinates */
-   float vert_woff   = (offset * scale_factor) / (float)width;
-   float vert_hoff   = (offset * scale_factor) / (float)height;
-   float tex_woff    = offset / (float)w;
-   float tex_hoff    = offset / (float)h;
-
-   /* the width/height of the middle sections of both the scaled and original image */
-   float vert_scaled_mid_width  = (new_w - (offset * scale_factor * 2)) / (float)width;
-   float vert_scaled_mid_height = (new_h - (offset * scale_factor * 2)) / (float)height;
-   float tex_mid_width          = (w - (offset * 2)) / (float)w;
-   float tex_mid_height         = (h - (offset * 2)) / (float)h;
-
-   /* normalized coordinates for the start position of the image */
-   float norm_x                 = x / (float)width;
-   float norm_y                 = (height - y) / (float)height;
-
-   /* the four vertices of the top-left corner of the image,
-    * used as a starting point for all the other sections */
-   V_BL[0] = norm_x;
-   V_BL[1] = norm_y;
-   V_BR[0] = norm_x + vert_woff;
-   V_BR[1] = norm_y;
-   V_TL[0] = norm_x;
-   V_TL[1] = norm_y + vert_hoff;
-   V_TR[0] = norm_x + vert_woff;
-   V_TR[1] = norm_y + vert_hoff;
-   T_BL[0] = 0.0f;
-   T_BL[1] = tex_hoff;
-   T_BR[0] = tex_woff;
-   T_BR[1] = tex_hoff;
-   T_TL[0] = 0.0f;
-   T_TL[1] = 0.0f;
-   T_TR[0] = tex_woff;
-   T_TR[1] = 0.0f;
-
-   for (i = 0; i < (16 * sizeof(float)) / sizeof(colors[0]); i++)
-      colors[i] = 1.0f;
-
-   rotate_draw.matrix       = &mymat;
-   rotate_draw.rotation     = 0.0;
-   rotate_draw.scale_x      = 1.0;
-   rotate_draw.scale_y      = 1.0;
-   rotate_draw.scale_z      = 1;
-   rotate_draw.scale_enable = true;
-   coords.vertices          = 4;
-   coords.vertex            = vert_coord;
-   coords.tex_coord         = tex_coord;
-   coords.lut_tex_coord     = NULL;
-   draw.width               = width;
-   draw.height              = height;
-   draw.coords              = &coords;
-   draw.matrix_data         = &mymat;
-   draw.prim_type           = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
-   draw.pipeline.id         = 0;
-   coords.color             = (const float*)colors;
-
-   menu_display_rotate_z(&rotate_draw);
-
-   draw.texture             = texture;
-   draw.x                   = 0;
-   draw.y                   = 0;
-
-   /* vertex coords are specfied bottom-up in this order: BL BR TL TR */
-   /* texture coords are specfied top-down in this order: BL BR TL TR */
-
-   /* If someone wants to change this to not draw several times, the
-    * coordinates will need to be modified because of the triangle strip usage. */
-
-   /* top-left corner */
-   vert_coord[0] = V_BL[0];
-   vert_coord[1] = V_BL[1];
-   vert_coord[2] = V_BR[0];
-   vert_coord[3] = V_BR[1];
-   vert_coord[4] = V_TL[0];
-   vert_coord[5] = V_TL[1];
-   vert_coord[6] = V_TR[0];
-   vert_coord[7] = V_TR[1];
-
-   tex_coord[0] = T_BL[0];
-   tex_coord[1] = T_BL[1];
-   tex_coord[2] = T_BR[0];
-   tex_coord[3] = T_BR[1];
-   tex_coord[4] = T_TL[0];
-   tex_coord[5] = T_TL[1];
-   tex_coord[6] = T_TR[0];
-   tex_coord[7] = T_TR[1];
-
-   menu_display_draw(&draw);
-
-   /* top-middle section */
-   vert_coord[0] = V_BL[0] + vert_woff;
-   vert_coord[1] = V_BL[1];
-   vert_coord[2] = V_BR[0] + vert_scaled_mid_width;
-   vert_coord[3] = V_BR[1];
-   vert_coord[4] = V_TL[0] + vert_woff;
-   vert_coord[5] = V_TL[1];
-   vert_coord[6] = V_TR[0] + vert_scaled_mid_width;
-   vert_coord[7] = V_TR[1];
-
-   tex_coord[0] = T_BL[0] + tex_woff;
-   tex_coord[1] = T_BL[1];
-   tex_coord[2] = T_BR[0] + tex_mid_width;
-   tex_coord[3] = T_BR[1];
-   tex_coord[4] = T_TL[0] + tex_woff;
-   tex_coord[5] = T_TL[1];
-   tex_coord[6] = T_TR[0] + tex_mid_width;
-   tex_coord[7] = T_TR[1];
-
-   menu_display_draw(&draw);
-
-   /* top-right corner */
-   vert_coord[0] = V_BL[0] + vert_woff + vert_scaled_mid_width;
-   vert_coord[1] = V_BL[1];
-   vert_coord[2] = V_BR[0] + vert_scaled_mid_width + vert_woff;
-   vert_coord[3] = V_BR[1];
-   vert_coord[4] = V_TL[0] + vert_woff + vert_scaled_mid_width;
-   vert_coord[5] = V_TL[1];
-   vert_coord[6] = V_TR[0] + vert_scaled_mid_width + vert_woff;
-   vert_coord[7] = V_TR[1];
-
-   tex_coord[0] = T_BL[0] + tex_woff + tex_mid_width;
-   tex_coord[1] = T_BL[1];
-   tex_coord[2] = T_BR[0] + tex_mid_width + tex_woff;
-   tex_coord[3] = T_BR[1];
-   tex_coord[4] = T_TL[0] + tex_woff + tex_mid_width;
-   tex_coord[5] = T_TL[1];
-   tex_coord[6] = T_TR[0] + tex_mid_width + tex_woff;
-   tex_coord[7] = T_TR[1];
-
-   menu_display_draw(&draw);
-
-   /* middle-left section */
-   vert_coord[0] = V_BL[0];
-   vert_coord[1] = V_BL[1] - vert_scaled_mid_height;
-   vert_coord[2] = V_BR[0];
-   vert_coord[3] = V_BR[1] - vert_scaled_mid_height;
-   vert_coord[4] = V_TL[0];
-   vert_coord[5] = V_TL[1] - vert_hoff;
-   vert_coord[6] = V_TR[0];
-   vert_coord[7] = V_TR[1] - vert_hoff;
-
-   tex_coord[0] = T_BL[0];
-   tex_coord[1] = T_BL[1] + tex_mid_height;
-   tex_coord[2] = T_BR[0];
-   tex_coord[3] = T_BR[1] + tex_mid_height;
-   tex_coord[4] = T_TL[0];
-   tex_coord[5] = T_TL[1] + tex_hoff;
-   tex_coord[6] = T_TR[0];
-   tex_coord[7] = T_TR[1] + tex_hoff;
-
-   menu_display_draw(&draw);
-
-   /* center section */
-   vert_coord[0] = V_BL[0] + vert_woff;
-   vert_coord[1] = V_BL[1] - vert_scaled_mid_height;
-   vert_coord[2] = V_BR[0] + vert_scaled_mid_width;
-   vert_coord[3] = V_BR[1] - vert_scaled_mid_height;
-   vert_coord[4] = V_TL[0] + vert_woff;
-   vert_coord[5] = V_TL[1] - vert_hoff;
-   vert_coord[6] = V_TR[0] + vert_scaled_mid_width;
-   vert_coord[7] = V_TR[1] - vert_hoff;
-
-   tex_coord[0] = T_BL[0] + tex_woff;
-   tex_coord[1] = T_BL[1] + tex_mid_height;
-   tex_coord[2] = T_BR[0] + tex_mid_width;
-   tex_coord[3] = T_BR[1] + tex_mid_height;
-   tex_coord[4] = T_TL[0] + tex_woff;
-   tex_coord[5] = T_TL[1] + tex_hoff;
-   tex_coord[6] = T_TR[0] + tex_mid_width;
-   tex_coord[7] = T_TR[1] + tex_hoff;
-
-   menu_display_draw(&draw);
-
-   /* middle-right section */
-   vert_coord[0] = V_BL[0] + vert_woff + vert_scaled_mid_width;
-   vert_coord[1] = V_BL[1] - vert_scaled_mid_height;
-   vert_coord[2] = V_BR[0] + vert_woff + vert_scaled_mid_width;
-   vert_coord[3] = V_BR[1] - vert_scaled_mid_height;
-   vert_coord[4] = V_TL[0] + vert_woff + vert_scaled_mid_width;
-   vert_coord[5] = V_TL[1] - vert_hoff;
-   vert_coord[6] = V_TR[0] + vert_woff + vert_scaled_mid_width;
-   vert_coord[7] = V_TR[1] - vert_hoff;
-
-   tex_coord[0] = T_BL[0] + tex_woff + tex_mid_width;
-   tex_coord[1] = T_BL[1] + tex_mid_height;
-   tex_coord[2] = T_BR[0] + tex_woff + tex_mid_width;
-   tex_coord[3] = T_BR[1] + tex_mid_height;
-   tex_coord[4] = T_TL[0] + tex_woff + tex_mid_width;
-   tex_coord[5] = T_TL[1] + tex_hoff;
-   tex_coord[6] = T_TR[0] + tex_woff + tex_mid_width;
-   tex_coord[7] = T_TR[1] + tex_hoff;
-
-   menu_display_draw(&draw);
-
-   /* bottom-left corner */
-   vert_coord[0] = V_BL[0];
-   vert_coord[1] = V_BL[1] - vert_hoff - vert_scaled_mid_height;
-   vert_coord[2] = V_BR[0];
-   vert_coord[3] = V_BR[1] - vert_hoff - vert_scaled_mid_height;
-   vert_coord[4] = V_TL[0];
-   vert_coord[5] = V_TL[1] - vert_hoff - vert_scaled_mid_height;
-   vert_coord[6] = V_TR[0];
-   vert_coord[7] = V_TR[1] - vert_hoff - vert_scaled_mid_height;
-
-   tex_coord[0] = T_BL[0];
-   tex_coord[1] = T_BL[1] + tex_hoff + tex_mid_height;
-   tex_coord[2] = T_BR[0];
-   tex_coord[3] = T_BR[1] + tex_hoff + tex_mid_height;
-   tex_coord[4] = T_TL[0];
-   tex_coord[5] = T_TL[1] + tex_hoff + tex_mid_height;
-   tex_coord[6] = T_TR[0];
-   tex_coord[7] = T_TR[1] + tex_hoff + tex_mid_height;
-
-   menu_display_draw(&draw);
-
-   /* bottom-middle section */
-   vert_coord[0] = V_BL[0] + vert_woff;
-   vert_coord[1] = V_BL[1] - vert_hoff - vert_scaled_mid_height;
-   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[6] = V_TR[0] + vert_scaled_mid_width;
-   vert_coord[7] = V_TR[1] - 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[6] = T_TR[0] + tex_mid_width;
-   tex_coord[7] = T_TR[1] + tex_mid_height;
-
-   menu_display_draw(&draw);
-
-   /* bottom-right corner */
-   vert_coord[0] = V_BL[0] + vert_woff + vert_scaled_mid_width;
-   vert_coord[1] = V_BL[1] - vert_hoff - vert_scaled_mid_height;
-   vert_coord[2] = V_BR[0] + vert_scaled_mid_width + vert_woff;
-   vert_coord[3] = V_BR[1] - vert_hoff - vert_scaled_mid_height;
-   vert_coord[4] = V_TL[0] + vert_woff + vert_scaled_mid_width;
-   vert_coord[5] = V_TL[1] - vert_hoff - vert_scaled_mid_height;
-   vert_coord[6] = V_TR[0] + vert_scaled_mid_width + vert_woff;
-   vert_coord[7] = V_TR[1] - vert_hoff - vert_scaled_mid_height;
-
-   tex_coord[0] = T_BL[0] + tex_woff + tex_mid_width;
-   tex_coord[1] = T_BL[1] + tex_hoff + tex_mid_height;
-   tex_coord[2] = T_BR[0] + tex_woff + tex_mid_width;
-   tex_coord[3] = T_BR[1] + tex_hoff + tex_mid_height;
-   tex_coord[4] = T_TL[0] + tex_woff + tex_mid_width;
-   tex_coord[5] = T_TL[1] + tex_hoff + tex_mid_height;
-   tex_coord[6] = T_TR[0] + tex_woff + tex_mid_width;
-   tex_coord[7] = T_TR[1] + tex_hoff + tex_mid_height;
-
-   menu_display_draw(&draw);
-
-   free(colors);
-   free(vert_coord);
-   free(tex_coord);
-}
-
-void menu_display_rotate_z(menu_display_ctx_rotate_draw_t *draw)
-{
-#if !defined(VITA)
-   math_matrix_4x4 matrix_rotated, matrix_scaled;
-   math_matrix_4x4 *b = NULL;
-
-   if (!draw || !menu_disp || !menu_disp->get_default_mvp)
-      return;
-
-   b = (math_matrix_4x4*)menu_disp->get_default_mvp();
-
-   matrix_4x4_rotate_z(matrix_rotated, draw->rotation);
-   matrix_4x4_multiply(*draw->matrix, matrix_rotated, *b);
-
-   if (!draw->scale_enable)
-      return;
-
-   matrix_4x4_scale(matrix_scaled,
-         draw->scale_x, draw->scale_y, draw->scale_z);
-   matrix_4x4_multiply(*draw->matrix, matrix_scaled, *draw->matrix);
-#endif
-}
-
-bool menu_display_get_tex_coords(menu_display_ctx_coord_draw_t *draw)
-{
-   if (!draw)
-      return false;
-
-   if (!menu_disp || !menu_disp->get_default_tex_coords)
-      return false;
-
-   draw->ptr = menu_disp->get_default_tex_coords();
-   return true;
-}
-
-void menu_display_handle_thumbnail_upload(void *task_data,
-      void *user_data, const char *err)
-{
-   menu_ctx_load_image_t load_image_info;
-   struct texture_image *img = (struct texture_image*)task_data;
-
-   load_image_info.data = img;
-   load_image_info.type = MENU_IMAGE_THUMBNAIL;
-
-   menu_driver_ctl(RARCH_MENU_CTL_LOAD_IMAGE, &load_image_info);
-
-   image_texture_free(img);
-   free(img);
-   free(user_data);
-}
-
-void menu_display_handle_savestate_thumbnail_upload(void *task_data,
-      void *user_data, const char *err)
-{
-   menu_ctx_load_image_t load_image_info;
-   struct texture_image *img = (struct texture_image*)task_data;
-
-   load_image_info.data = img;
-   load_image_info.type = MENU_IMAGE_SAVESTATE_THUMBNAIL;
-
-   menu_driver_ctl(RARCH_MENU_CTL_LOAD_IMAGE, &load_image_info);
-
-   image_texture_free(img);
-   free(img);
-   free(user_data);
-}
-
-void menu_display_handle_wallpaper_upload(void *task_data,
-      void *user_data, const char *err)
-{
-   menu_ctx_load_image_t load_image_info;
-   struct texture_image *img = (struct texture_image*)task_data;
-
-   load_image_info.data = img;
-   load_image_info.type = MENU_IMAGE_WALLPAPER;
-
-   menu_driver_ctl(RARCH_MENU_CTL_LOAD_IMAGE, &load_image_info);
-   image_texture_free(img);
-   free(img);
-   free(user_data);
-}
-
-void menu_display_allocate_white_texture(void)
-{
-   struct texture_image ti;
-   static const uint8_t white_data[] = { 0xff, 0xff, 0xff, 0xff };
-
-   ti.width  = 1;
-   ti.height = 1;
-   ti.pixels = (uint32_t*)&white_data;
-
-   if (menu_display_white_texture)
-      video_driver_texture_unload(&menu_display_white_texture);
-
-   video_driver_texture_load(&ti,
-         TEXTURE_FILTER_NEAREST, &menu_display_white_texture);
-}
-
-void menu_display_draw_cursor(
-      float *color, float cursor_size, uintptr_t texture,
-      float x, float y, unsigned width, unsigned height)
-{
-   menu_display_ctx_draw_t draw;
-   struct video_coords coords;
-   settings_t *settings = config_get_ptr();
-   bool cursor_visible  = settings->bools.video_fullscreen ||
-       !video_driver_has_windowed();
-
-   if (!settings->bools.menu_mouse_enable)
-      return;
-   if (!cursor_visible)
-      return;
-
-   coords.vertices      = 4;
-   coords.vertex        = NULL;
-   coords.tex_coord     = NULL;
-   coords.lut_tex_coord = NULL;
-   coords.color         = (const float*)color;
-
-   menu_display_blend_begin();
-
-   draw.x               = x - (cursor_size / 2);
-   draw.y               = (int)height - y - (cursor_size / 2);
-   draw.width           = cursor_size;
-   draw.height          = cursor_size;
-   draw.coords          = &coords;
-   draw.matrix_data     = NULL;
-   draw.texture         = texture;
-   draw.prim_type       = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
-
-   menu_display_draw(&draw);
-   menu_display_blend_end();
-}
-
-static INLINE float menu_display_scalef(float val,
-      float oldmin, float oldmax, float newmin, float newmax)
-{
-   return (((val - oldmin) * (newmax - newmin)) / (oldmax - oldmin)) + newmin;
-}
-
-static INLINE float menu_display_randf(float min, float max)
-{
-   return (rand() * ((max - min) / RAND_MAX)) + min;
-}
-
-void menu_display_push_quad(
-      unsigned width, unsigned height,
-      const float *colors, int x1, int y1,
-      int x2, int y2)
-{
-   float vertex[8];
-   video_coords_t coords;
-   menu_display_ctx_coord_draw_t coord_draw;
-   video_coord_array_t *ca = menu_display_get_coords_array();
-
-   vertex[0]             = x1 / (float)width;
-   vertex[1]             = y1 / (float)height;
-   vertex[2]             = x2 / (float)width;
-   vertex[3]             = y1 / (float)height;
-   vertex[4]             = x1 / (float)width;
-   vertex[5]             = y2 / (float)height;
-   vertex[6]             = x2 / (float)width;
-   vertex[7]             = y2 / (float)height;
-
-   coord_draw.ptr        = NULL;
-
-   menu_display_get_tex_coords(&coord_draw);
-
-   coords.color          = colors;
-   coords.vertex         = vertex;
-   coords.tex_coord      = coord_draw.ptr;
-   coords.lut_tex_coord  = coord_draw.ptr;
-   coords.vertices       = 3;
-
-   video_coord_array_append(ca, &coords, 3);
-
-   coords.color         += 4;
-   coords.vertex        += 2;
-   coords.tex_coord     += 2;
-   coords.lut_tex_coord += 2;
-
-   video_coord_array_append(ca, &coords, 3);
-}
-
-void menu_display_snow(int width, int height)
-{
-   struct display_particle
-   {
-      float x, y;
-      float xspeed, yspeed;
-      float alpha;
-      bool alive;
-   };
-   static struct display_particle particles[PARTICLES_COUNT] = {{0}};
-   static int timeout      = 0;
-   unsigned i, max_gen     = 2;
-
-   for (i = 0; i < PARTICLES_COUNT; ++i)
-   {
-      struct display_particle *p = (struct display_particle*)&particles[i];
-
-      if (p->alive)
-      {
-         int16_t mouse_x  = menu_input_mouse_state(MENU_MOUSE_X_AXIS);
-
-         p->y            += p->yspeed;
-         p->x            += menu_display_scalef(mouse_x, 0, width, -0.3, 0.3);
-         p->x            += p->xspeed;
-
-         p->alive         = p->y >= 0 && p->y < height
-            && p->x >= 0 && p->x < width;
-      }
-      else if (max_gen > 0 && timeout <= 0)
-      {
-         p->xspeed = menu_display_randf(-0.2, 0.2);
-         p->yspeed = menu_display_randf(1, 2);
-         p->y      = 0;
-         p->x      = rand() % width;
-         p->alpha  = (float)rand() / (float)RAND_MAX;
-         p->alive  = true;
-
-         max_gen--;
-      }
-   }
-
-   if (max_gen == 0)
-      timeout = 3;
-   else
-      timeout--;
-
-   for (i = 0; i < PARTICLES_COUNT; ++i)
-   {
-      unsigned j;
-      float alpha, colors[16];
-      struct display_particle *p = &particles[i];
-
-      if (!p->alive)
-         continue;
-
-      alpha = menu_display_randf(0, 100) > 90 ? p->alpha/2 : p->alpha;
-
-      for (j = 0; j < 16; j++)
-      {
-         colors[j] = 1;
-         if (j == 3 || j == 7 || j == 11 || j == 15)
-            colors[j] = alpha;
-      }
-
-      menu_display_push_quad(width, height,
-            colors, p->x-2, p->y-2, p->x+2, p->y+2);
-
-      j++;
-   }
-}
-
-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)
-{
-   struct font_params params;
-
-   /* Don't draw outside of the screen */
-   if (x < -64 || x > width + 64
-         || y < -64 || y > height + 64)
-      return;
-
-   params.x           = x / width;
-   params.y           = 1.0f - y / height;
-   params.scale       = scale;
-   params.drop_mod    = 0.0f;
-   params.drop_x      = 0.0f;
-   params.drop_y      = 0.0f;
-   params.color       = color;
-   params.full_screen = true;
-   params.text_align  = text_align;
-
-   if (shadows_enable)
-   {
-      params.drop_x      = shadow_offset;
-      params.drop_y      = -shadow_offset;
-      params.drop_alpha  = 0.35f;
-   }
-
-   video_driver_set_osd_msg(text, &params, (void*)font);
-}
-
-void menu_display_set_alpha(float *color, float alpha_value)
-{
-   if (!color)
-      return;
-   color[3] = color[7] = color[11] = color[15] = alpha_value;
-}
-
-void menu_display_reset_textures_list(const char *texture_path, const char *iconpath,
-      uintptr_t *item, enum texture_filter_type filter_type)
-{
-   struct texture_image ti;
-   char path[PATH_MAX_LENGTH];
-
-   path[0]                     = '\0';
-
-   ti.width                    = 0;
-   ti.height                   = 0;
-   ti.pixels                   = NULL;
-   ti.supports_rgba            = video_driver_supports_rgba();
-
-   if (!string_is_empty(texture_path))
-      fill_pathname_join(path, iconpath, texture_path, sizeof(path));
-
-   if (string_is_empty(path) || !path_file_exists(path))
-      return;
-
-   if (!image_texture_load(&ti, path))
-      return;
-
-   video_driver_texture_load(&ti,
-         filter_type, item);
-   image_texture_free(&ti);
-}
diff --git a/menu/menu_display.h b/menu/menu_display.h
deleted file mode 100644
index 11f480705f..0000000000
--- a/menu/menu_display.h
+++ /dev/null
@@ -1,318 +0,0 @@
-/*  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
- *
- *  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 __MENU_DISPLAY_H__
-#define __MENU_DISPLAY_H__
-
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <boolean.h>
-#include <retro_common_api.h>
-#include <gfx/math/matrix_4x4.h>
-
-#include "../file_path_special.h"
-#include "../gfx/font_driver.h"
-#include "../gfx/video_context_driver.h"
-#include "../gfx/video_coord_array.h"
-
-RETRO_BEGIN_DECLS
-
-enum materialui_color_theme
-{
-   MATERIALUI_THEME_BLUE = 0,
-   MATERIALUI_THEME_BLUE_GREY,
-   MATERIALUI_THEME_DARK_BLUE,
-   MATERIALUI_THEME_GREEN,
-   MATERIALUI_THEME_RED,
-   MATERIALUI_THEME_YELLOW,
-   MATERIALUI_THEME_NVIDIA_SHIELD,
-   MATERIALUI_THEME_LAST
-};
-
-enum xmb_color_theme
-{
-   XMB_THEME_LEGACY_RED  = 0,
-   XMB_THEME_DARK_PURPLE,
-   XMB_THEME_MIDNIGHT_BLUE,
-   XMB_THEME_GOLDEN,
-   XMB_THEME_ELECTRIC_BLUE,
-   XMB_THEME_APPLE_GREEN,
-   XMB_THEME_UNDERSEA,
-   XMB_THEME_VOLCANIC_RED,
-   XMB_THEME_DARK,
-   XMB_THEME_WALLPAPER,
-   XMB_THEME_LAST
-};
-
-enum xmb_icon_theme
-{
-   XMB_ICON_THEME_MONOCHROME = 0,
-   XMB_ICON_THEME_FLATUI,
-   XMB_ICON_THEME_RETROACTIVE,
-   XMB_ICON_THEME_PIXEL,
-   XMB_ICON_THEME_NEOACTIVE,
-   XMB_ICON_THEME_SYSTEMATIC,
-   XMB_ICON_THEME_DOTART,
-   XMB_ICON_THEME_CUSTOM,
-   XMB_ICON_THEME_LAST
-};
-
-enum xmb_shader_pipeline
-{
-   XMB_SHADER_PIPELINE_WALLPAPER = 0,
-   XMB_SHADER_PIPELINE_SIMPLE_RIBBON,
-   XMB_SHADER_PIPELINE_RIBBON,
-   XMB_SHADER_PIPELINE_SIMPLE_SNOW,
-   XMB_SHADER_PIPELINE_SNOW,
-   XMB_SHADER_PIPELINE_BOKEH,
-   XMB_SHADER_PIPELINE_LAST
-};
-
-enum menu_display_prim_type
-{
-   MENU_DISPLAY_PRIM_NONE = 0,
-   MENU_DISPLAY_PRIM_TRIANGLESTRIP,
-   MENU_DISPLAY_PRIM_TRIANGLES
-};
-
-enum menu_display_driver_type
-{
-   MENU_VIDEO_DRIVER_GENERIC = 0,
-   MENU_VIDEO_DRIVER_OPENGL,
-   MENU_VIDEO_DRIVER_VULKAN,
-   MENU_VIDEO_DRIVER_DIRECT3D,
-   MENU_VIDEO_DRIVER_VITA2D,
-   MENU_VIDEO_DRIVER_CTR,
-   MENU_VIDEO_DRIVER_CACA,
-   MENU_VIDEO_DRIVER_GDI,
-   MENU_VIDEO_DRIVER_VGA
-};
-
-typedef struct menu_display_ctx_clearcolor
-{
-   float r;
-   float g;
-   float b;
-   float a;
-} menu_display_ctx_clearcolor_t;
-
-typedef struct menu_display_frame_info
-{
-   bool shadows_enable;
-} menu_display_frame_info_t;
-
-typedef struct menu_display_ctx_draw
-{
-   float x;
-   float y;
-   unsigned width;
-   unsigned height;
-   struct video_coords *coords;
-   void *matrix_data;
-   uintptr_t texture;
-   enum menu_display_prim_type prim_type;
-   float *color;
-   const float *vertex;
-   const float *tex_coord;
-   size_t vertex_count;
-   struct
-   {
-      unsigned id;
-      const void *backend_data;
-      size_t backend_data_size;
-      bool active;
-   } pipeline;
-} menu_display_ctx_draw_t;
-
-typedef struct menu_display_ctx_rotate_draw
-{
-   math_matrix_4x4 *matrix;
-   float rotation;
-   float scale_x;
-   float scale_y;
-   float scale_z;
-   bool scale_enable;
-} menu_display_ctx_rotate_draw_t;
-
-typedef struct menu_display_ctx_coord_draw
-{
-   const float *ptr;
-} menu_display_ctx_coord_draw_t;
-
-typedef struct menu_display_ctx_datetime
-{
-   char *s;
-   size_t len;
-   unsigned time_mode;
-} menu_display_ctx_datetime_t;
-
-typedef struct menu_display_ctx_driver
-{
-   void (*draw)(void *data);
-   void (*draw_pipeline)(void *data);
-   void (*viewport)(void *data);
-   void (*blend_begin)(void);
-   void (*blend_end)(void);
-   void (*restore_clear_color)(void);
-   void (*clear_color)(menu_display_ctx_clearcolor_t *clearcolor);
-   void *(*get_default_mvp)(void);
-   const float *(*get_default_vertices)(void);
-   const float *(*get_default_tex_coords)(void);
-   bool (*font_init_first)(
-         void **font_handle, void *video_data,
-         const char *font_path, float font_size,
-         bool is_threaded);
-   enum menu_display_driver_type type;
-   const char *ident;
-} menu_display_ctx_driver_t;
-
-typedef struct menu_display_ctx_font
-{
-   const char *path;
-   float size;
-} menu_display_ctx_font_t;
-
-typedef uintptr_t menu_texture_item;
-
-enum menu_toggle_reason
-{
-  MENU_TOGGLE_REASON_NONE = 0,
-  MENU_TOGGLE_REASON_USER,
-  MENU_TOGGLE_REASON_MESSAGE
-};
-
-enum menu_toggle_reason menu_display_toggle_get_reason(void);
-void menu_display_toggle_set_reason(enum menu_toggle_reason reason);
-
-void menu_display_blend_begin(void);
-void menu_display_blend_end(void);
-
-void menu_display_font_free(font_data_t *font);
-void menu_display_font_bind_block(font_data_t *font, void *block);
-bool menu_display_font_flush_block(unsigned width, unsigned height, font_data_t *font);
-
-void menu_display_framebuffer_deinit(void);
-
-void menu_display_deinit(void);
-bool menu_display_init(void);
-
-void menu_display_coords_array_reset(void);
-video_coord_array_t *menu_display_get_coords_array(void);
-const uint8_t *menu_display_get_font_framebuffer(void);
-void menu_display_set_font_framebuffer(const uint8_t *buffer);
-bool menu_display_libretro_running(void);
-bool menu_display_libretro(void);
-
-void menu_display_set_width(unsigned width);
-void menu_display_get_fb_size(unsigned *fb_width, unsigned *fb_height,
-      size_t *fb_pitch);
-void menu_display_set_height(unsigned height);
-void menu_display_set_header_height(unsigned height);
-unsigned menu_display_get_header_height(void);
-size_t menu_display_get_framebuffer_pitch(void);
-void menu_display_set_framebuffer_pitch(size_t pitch);
-
-bool menu_display_get_msg_force(void);
-void menu_display_set_msg_force(bool state);
-bool menu_display_get_font_data_init(void);
-void menu_display_set_font_data_init(bool state);
-bool menu_display_get_update_pending(void);
-void menu_display_set_viewport(unsigned width, unsigned height);
-void menu_display_unset_viewport(unsigned width, unsigned height);
-bool menu_display_get_framebuffer_dirty_flag(void);
-void menu_display_set_framebuffer_dirty_flag(void);
-void menu_display_unset_framebuffer_dirty_flag(void);
-float menu_display_get_dpi(void);
-bool menu_display_init_first_driver(bool video_is_threaded);
-bool menu_display_restore_clear_color(void);
-void menu_display_clear_color(menu_display_ctx_clearcolor_t *color);
-void menu_display_draw(menu_display_ctx_draw_t *draw);
-
-void menu_display_draw_pipeline(menu_display_ctx_draw_t *draw);
-void menu_display_draw_bg(
-      menu_display_ctx_draw_t *draw,
-      video_frame_info_t *video_info,
-      bool add_opacity);
-void menu_display_draw_gradient(
-      menu_display_ctx_draw_t *draw,
-      video_frame_info_t *video_info);
-void menu_display_draw_quad(int x, int y, unsigned w, unsigned h,
-      unsigned width, unsigned height,
-      float *color);
-void menu_display_draw_texture(int x, int y, unsigned w, unsigned h,
-      unsigned width, unsigned height,
-      float *color, uintptr_t texture);
-void menu_display_draw_texture_slice(int x, int y, unsigned w, unsigned h,
-      unsigned new_w, unsigned new_h, unsigned width, unsigned height,
-      float *color, unsigned offset, float scale_factor, uintptr_t texture);
-void menu_display_rotate_z(menu_display_ctx_rotate_draw_t *draw);
-bool menu_display_get_tex_coords(menu_display_ctx_coord_draw_t *draw);
-
-void menu_display_timedate(menu_display_ctx_datetime_t *datetime);
-
-void menu_display_handle_wallpaper_upload(void *task_data,
-      void *user_data, const char *err);
-
-void menu_display_handle_thumbnail_upload(void *task_data,
-      void *user_data, const char *err);
-
-void menu_display_handle_savestate_thumbnail_upload(void *task_data,
-      void *user_data, const char *err);
-
-void menu_display_push_quad(
-      unsigned width, unsigned height,
-      const float *colors, int x1, int y1,
-      int x2, int y2);
-
-void menu_display_snow(int width, int height);
-
-void menu_display_allocate_white_texture(void);
-
-void menu_display_draw_cursor(
-      float *color, float cursor_size, uintptr_t texture,
-      float x, float y, unsigned width, unsigned height);
-
-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);
-
-void menu_display_set_alpha(float *color, float alpha_value);
-
-font_data_t *menu_display_font(enum application_special_type type, float font_size,
-      bool video_is_threaded);
-
-void menu_display_reset_textures_list(const char *texture_path, const char *iconpath,
-      uintptr_t *item, enum texture_filter_type filter_type);
-
-extern uintptr_t menu_display_white_texture;
-
-extern menu_display_ctx_driver_t menu_display_ctx_gl;
-extern menu_display_ctx_driver_t menu_display_ctx_vulkan;
-extern menu_display_ctx_driver_t menu_display_ctx_d3d;
-extern menu_display_ctx_driver_t menu_display_ctx_vita2d;
-extern menu_display_ctx_driver_t menu_display_ctx_ctr;
-extern menu_display_ctx_driver_t menu_display_ctx_caca;
-extern menu_display_ctx_driver_t menu_display_ctx_gdi;
-extern menu_display_ctx_driver_t menu_display_ctx_vga;
-extern menu_display_ctx_driver_t menu_display_ctx_null;
-
-RETRO_END_DECLS
-
-#endif
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index 4d227ffadf..705777b11f 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -42,6 +42,7 @@
 
 #ifdef HAVE_NETWORKING
 #include <net/net_http_parse.h>
+#include "../../network/netplay/netplay.h"
 #include "../network/netplay/netplay_discovery.h"
 #endif
 
@@ -51,7 +52,6 @@
 
 #include "menu_content.h"
 #include "menu_driver.h"
-#include "menu_navigation.h"
 #include "menu_shader.h"
 #include "widgets/menu_dialog.h"
 #include "widgets/menu_list.h"
@@ -65,11 +65,10 @@
 #include "../managers/core_option_manager.h"
 #include "../paths.h"
 #include "../retroarch.h"
-#include "../runloop.h"
 #include "../core.h"
 #include "../frontend/frontend_driver.h"
 #include "../ui/ui_companion_driver.h"
-#include "../gfx/video_shader_driver.h"
+#include "../gfx/video_driver.h"
 #include "../config.features.h"
 #include "../version_git.h"
 #include "../input/input_config.h"
@@ -84,7 +83,109 @@ static char new_lbl_entry[4096]         = {0};
 static char new_entry[4096]             = {0};
 static enum msg_hash_enums new_type     = MSG_UNKNOWN;
 
+/* HACK - we have to find some way to pass state inbetween
+ * function pointer callback functions that don't necessarily
+ * call each other. */
+static char *core_buf                   = NULL;
+static size_t core_len                  = 0;
+
 #ifdef HAVE_NETWORKING
+void cb_net_generic_subdir(void *task_data, void *user_data, const char *err)
+{
+   char subdir_path[PATH_MAX_LENGTH];
+   http_transfer_data_t *data        = (http_transfer_data_t*)task_data;
+   menu_file_transfer_t *state       = (menu_file_transfer_t*)user_data;
+
+   subdir_path[0] = '\0';
+
+   if (!data || err)
+      goto finish;
+
+   memcpy(subdir_path, data->data, data->len * sizeof(char));
+   subdir_path[data->len] = '\0';
+
+finish:
+   if (!err && !strstr(subdir_path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
+   {
+      char parent_dir[PATH_MAX_LENGTH];
+
+      parent_dir[0] = '\0';
+
+      fill_pathname_parent_dir(parent_dir,
+            state->path, sizeof(parent_dir));
+
+      /*generic_action_ok_displaylist_push(parent_dir, NULL,
+            subdir_path, 0, 0, 0, ACTION_OK_DL_CORE_CONTENT_DIRS_SUBDIR_LIST);*/
+   }
+
+   if (data)
+   {
+      if (data->data)
+         free(data->data);
+      free(data);
+   }
+
+   if (user_data)
+      free(user_data);
+}
+
+void cb_net_generic(void *task_data, void *user_data, const char *err)
+{
+   bool refresh                = false;
+   http_transfer_data_t *data  = (http_transfer_data_t*)task_data;
+   menu_file_transfer_t *state = (menu_file_transfer_t*)user_data;
+
+   if (core_buf)
+      free(core_buf);
+
+
+   core_buf = NULL;
+   core_len = 0;
+
+   if (!data || err)
+      goto finish;
+
+   core_buf = (char*)malloc((data->len+1) * sizeof(char));
+
+   if (!core_buf)
+      goto finish;
+
+   memcpy(core_buf, data->data, data->len * sizeof(char));
+   core_buf[data->len] = '\0';
+   core_len      = data->len;
+
+finish:
+   refresh = true;
+   menu_entries_ctl(MENU_ENTRIES_CTL_UNSET_REFRESH, &refresh);
+
+   if (data)
+   {
+      if (data->data)
+         free(data->data);
+      free(data);
+   }
+
+   if (!err && !strstr(state->path, file_path_str(FILE_PATH_INDEX_DIRS_URL)))
+   {
+      char parent_dir[PATH_MAX_LENGTH];
+      menu_file_transfer_t *transf     = NULL;
+
+      parent_dir[0] = '\0';
+
+      fill_pathname_parent_dir(parent_dir,
+            state->path, sizeof(parent_dir));
+      strlcat(parent_dir, file_path_str(FILE_PATH_INDEX_DIRS_URL), sizeof(parent_dir));
+
+      transf           = (menu_file_transfer_t*)calloc(1, sizeof(*transf));
+      strlcpy(transf->path, parent_dir, sizeof(transf->path));
+
+      task_push_http_transfer(parent_dir, true, "index_dirs", cb_net_generic_subdir, transf);
+   }
+
+   if (state)
+      free(state);
+}
+
 static void print_buf_lines(file_list_t *list, char *buf,
       const char *label, int buf_size,
       enum msg_file_type type, bool append, bool extended)
@@ -187,7 +288,7 @@ static void print_buf_lines(file_list_t *list, char *buf,
 
                   if (!string_is_empty(last))
                   {
-                     if (memcmp(last, "_libretro", 9) != 0)
+                     if (string_is_not_equal_fast(last, "_libretro", 9))
                         *last = '\0';
                   }
 
@@ -250,7 +351,7 @@ static int menu_displaylist_parse_netplay(
          msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS),
          MENU_ENUM_LABEL_NETPLAY_LAN_SCAN_SETTINGS, MENU_SETTING_GROUP, 0, 0);
 
-   if (memcmp(settings->arrays.menu_driver, "xmb", 3) != 0)
+   if (string_is_not_equal_fast(settings->arrays.menu_driver, "xmb", 3))
       menu_entries_append_enum(info->list,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_TAB),
             msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_TAB),
@@ -680,6 +781,24 @@ static int menu_displaylist_parse_system_info(menu_displaylist_info_t *info)
             MENU_ENUM_LABEL_SYSTEM_INFO_ENTRY,
             MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
 
+#ifdef HAVE_LAKKA
+      if (frontend->get_lakka_version)
+      {
+         frontend->get_lakka_version(tmp2, sizeof(tmp2));
+
+         fill_pathname_noext(tmp,
+               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LAKKA_VERSION),
+               ": ",
+               sizeof(tmp));
+         strlcat(tmp, frontend->get_lakka_version ?
+               tmp2 : msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE),
+               sizeof(tmp));
+         menu_entries_append_enum(info->list, tmp, "",
+               MENU_ENUM_LABEL_SYSTEM_INFO_ENTRY,
+               MENU_SETTINGS_CORE_INFO_NONE, 0, 0);
+      }
+#endif
+
       if (frontend->get_name)
       {
          frontend->get_name(tmp2, sizeof(tmp2));
@@ -1709,6 +1828,9 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
 
    fill_short_pathname_representation_noext(path_base, info->path,
          sizeof(path_base));
+
+   menu_driver_set_thumbnail_system(path_base, sizeof(path_base));
+
    strlcat(path_base,
          file_path_str(FILE_PATH_LPL_EXTENSION),
          sizeof(path_base));
@@ -1734,6 +1856,12 @@ static int menu_displaylist_parse_database_entry(menu_displaylist_info_t *info)
 
       snprintf(crc_str, sizeof(crc_str), "%08X", db_info_entry->crc32);
 
+      if (db_info_entry->name)
+         menu_driver_set_thumbnail_content(db_info_entry->name, strlen(db_info_entry->name)); 
+
+      menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH, NULL);
+      menu_driver_ctl(RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE, NULL);
+
       if (playlist)
       {
          for (j = 0; j < playlist_size(playlist); j++)
@@ -2617,6 +2745,8 @@ static int menu_displaylist_parse_horizontal_list(
          item->path,
          sizeof(path_playlist));
 
+   menu_driver_set_thumbnail_system(lpl_basename, sizeof(lpl_basename));
+
    menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_INIT, (void*)path_playlist);
 
    strlcpy(menu->db_playlist_file,
@@ -2629,7 +2759,7 @@ static int menu_displaylist_parse_horizontal_list(
 
    playlist_qsort(playlist);
 
-   if (memcmp(lpl_basename, "content_history", 15) == 0)
+   if (string_is_equal_fast(lpl_basename, "content_history", 15))
       is_historylist = true;
 
    menu_displaylist_parse_playlist(info,
@@ -2901,7 +3031,7 @@ static int menu_displaylist_parse_information_list(
          MENU_SETTING_ACTION, 0, 0);
 #endif
 
-   if (runloop_ctl(RUNLOOP_CTL_IS_PERFCNT_ENABLE, NULL))
+   if (rarch_ctl(RARCH_CTL_IS_PERFCNT_ENABLE, NULL))
    {
       menu_entries_append_enum(info->list,
             msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FRONTEND_COUNTERS),
@@ -2996,36 +3126,7 @@ static int menu_displaylist_parse_netplay_room_list(
 {
 
 #ifdef HAVE_NETWORKING
-   menu_entries_append_enum(info->list,
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ENABLE_HOST),
-         msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST),
-         MENU_ENUM_LABEL_NETPLAY_ENABLE_HOST,
-         MENU_SETTING_ACTION, 0, 0);
-   menu_entries_append_enum(info->list,
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_REFRESH_ROOMS),
-         msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS),
-         MENU_ENUM_LABEL_NETPLAY_REFRESH_ROOMS,
-         MENU_SETTING_ACTION, 0, 0);
-   
-   if (netplay_room_count > 0)
-   {
-      unsigned i;
-      for (i = 0; i < (unsigned)netplay_room_count; i++)
-      {
-         char s[PATH_MAX_LENGTH];
-
-         s[0] = '\0';
-
-         snprintf(s, sizeof(s),
-               msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETPLAY_ROOM_NICKNAME), netplay_room_list[i].nickname);
-         menu_entries_append_enum(info->list,
-               s,
-               msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM),
-               MENU_ENUM_LABEL_CONNECT_NETPLAY_ROOM,
-               MENU_ROOM, 0, 0);
-
-      }
-   }
+   netplay_refresh_rooms_menu(info->list);
 #endif
 
    return 0;
@@ -3211,12 +3312,12 @@ static int menu_displaylist_parse_options_remappings(
    unsigned p, retro_id;
    rarch_system_info_t *system = NULL;
    menu_handle_t       *menu   = NULL;
-   settings_t        *settings = config_get_ptr();
+   unsigned max_users          = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
 
    if (!menu_driver_ctl(RARCH_MENU_CTL_DRIVER_DATA_GET, &menu))
       return -1;
 
-   for (p = 0; p < settings->uints.input_max_users; p++)
+   for (p = 0; p < max_users; p++)
    {
       char key_type[PATH_MAX_LENGTH];
       char key_analog[PATH_MAX_LENGTH];
@@ -3255,7 +3356,7 @@ static int menu_displaylist_parse_options_remappings(
 
    if (system)
    {
-      for (p = 0; p < settings->uints.input_max_users; p++)
+      for (p = 0; p < max_users; p++)
       {
          for (retro_id = 0; retro_id < RARCH_FIRST_CUSTOM_BIND + 4; retro_id++)
          {
@@ -3675,7 +3776,7 @@ static bool menu_displaylist_push_list_process(menu_displaylist_info_t *info)
    if (info->need_navigation_clear)
    {
       bool pending_push = true;
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
+      menu_driver_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
    }
 
    if (info->need_entries_refresh)
@@ -3742,7 +3843,7 @@ static bool menu_displaylist_push_list_process(menu_displaylist_info_t *info)
    if (info->need_push)
    {
       info->label_hash = msg_hash_calculate(info->label);
-      menu_driver_ctl(RARCH_MENU_CTL_POPULATE_ENTRIES, info);
+      menu_driver_populate_entries(info);
       ui_companion_driver_notify_list_loaded(info->list, info->menu_list);
    }
 
@@ -3959,6 +4060,88 @@ static void menu_displaylist_parse_playlist_history(
          (void*)menu->db_playlist_file);
 }
 
+#ifdef HAVE_NETWORKING
+static void wifi_scan_callback(void *task_data,
+                               void *user_data, const char *error)
+{
+   unsigned i;
+   file_list_t *file_list        = NULL;
+   struct string_list *ssid_list = NULL;
+
+   const char *path              = NULL;
+   const char *label             = NULL;
+   unsigned menu_type            = 0;
+   enum msg_hash_enums enum_idx  = MSG_UNKNOWN;
+
+   menu_entries_get_last_stack(&path, &label, &menu_type, &enum_idx, NULL);
+
+   /* Don't push the results if we left the wifi menu */
+   if (!string_is_equal(label,
+         msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_WIFI_SETTINGS_LIST)))
+      return;
+
+   file_list = menu_entries_get_selection_buf_ptr(0);
+   menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, file_list);
+
+   ssid_list = string_list_new();
+
+   driver_wifi_get_ssids(ssid_list);
+
+   for (i = 0; i < ssid_list->size; i++)
+   {
+      const char *ssid = ssid_list->elems[i].data;
+      menu_entries_append_enum(file_list,
+            ssid,
+            msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_WIFI),
+            MENU_ENUM_LABEL_CONNECT_WIFI,
+            MENU_WIFI, 0, 0);
+   }
+
+   string_list_free(ssid_list);
+}
+
+void netplay_lan_scan_callback(void *task_data,
+                               void *user_data, const char *error)
+{
+   struct netplay_host_list *netplay_hosts = NULL;
+   enum msg_hash_enums enum_idx            = MSG_UNKNOWN;
+   unsigned menu_type                      = 0;
+   const char *label                       = NULL;
+   const char *path                        = NULL;
+
+   menu_entries_get_last_stack(&path, &label, &menu_type, &enum_idx, NULL);
+
+   /* Don't push the results if we left the LAN scan menu */
+   if (!string_is_equal(label,
+         msg_hash_to_str(
+            MENU_ENUM_LABEL_DEFERRED_NETPLAY_LAN_SCAN_SETTINGS_LIST)))
+      return;
+
+   if (!netplay_discovery_driver_ctl(
+            RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES,
+            (void *) &netplay_hosts))
+      return;
+
+   if (netplay_hosts->size > 0)
+   {
+      unsigned i;
+      file_list_t *file_list = menu_entries_get_selection_buf_ptr(0);
+
+      menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, file_list);
+
+      for (i = 0; i < netplay_hosts->size; i++)
+      {
+         struct netplay_host *host = &netplay_hosts->hosts[i];
+         menu_entries_append_enum(file_list,
+               host->nick,
+               msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_CONNECT_TO),
+               MENU_ENUM_LABEL_NETPLAY_CONNECT_TO,
+               MENU_NETPLAY_LAN_SCAN, 0, 0);
+      }
+   }
+}
+#endif
+
 bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 {
    size_t i;
@@ -3994,7 +4177,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
    disp_list.info = info;
    disp_list.type = type;
 
-   if (menu_driver_ctl(RARCH_MENU_CTL_LIST_PUSH, &disp_list))
+   if (menu_driver_push_list(&disp_list))
       return true;
 
    switch (type)
@@ -4795,7 +4978,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          info->need_push    = true;
          break;
       case DISPLAYLIST_WIFI_SETTINGS_LIST:
-         if (memcmp(settings->arrays.wifi_driver, "null", 4) == 0)
+         if (string_is_equal_fast(settings->arrays.wifi_driver, "null", 4))
             menu_entries_append_enum(info->list,
                   msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_NETWORKS_FOUND),
                   msg_hash_to_str(MENU_ENUM_LABEL_NO_NETWORKS_FOUND),
@@ -4809,7 +4992,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 
             if (ssid_list->size == 0)
             {
-               task_push_wifi_scan();
+               task_push_wifi_scan(wifi_scan_callback);
 
                menu_entries_append_enum(info->list,
                      msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_NETWORKS_FOUND),
@@ -4925,12 +5108,15 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                   PARSE_ONLY_UINT, false) != -1)
                count++;
 
-            for(user = 0; user < settings->uints.input_max_users; user++)
             {
-               if (menu_displaylist_parse_settings_enum(menu, info,
-                     (enum msg_hash_enums)(MENU_ENUM_LABEL_NETWORK_REMOTE_USER_1_ENABLE + user),
-                     PARSE_ONLY_BOOL, false) != -1)
-                  count++;
+               unsigned max_users          = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
+               for(user = 0; user < max_users; user++)
+               {
+                  if (menu_displaylist_parse_settings_enum(menu, info,
+                           (enum msg_hash_enums)(MENU_ENUM_LABEL_NETWORK_REMOTE_USER_1_ENABLE + user),
+                           PARSE_ONLY_BOOL, false) != -1)
+                     count++;
+               }
             }
 
             if (menu_displaylist_parse_settings_enum(menu, info,
@@ -4963,7 +5149,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 
             if (!hosts || hosts->size == 0)
             {
-               task_push_netplay_lan_scan();
+               task_push_netplay_lan_scan(netplay_lan_scan_callback);
 
                menu_entries_append_enum(info->list,
                      msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NO_NETPLAY_HOSTS_FOUND),
@@ -5381,7 +5567,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
 
          {
             unsigned user;
-            for (user = 0; user < settings->uints.input_max_users; user++)
+            unsigned max_users          = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
+            for (user = 0; user < max_users; user++)
             {
                menu_displaylist_parse_settings_enum(menu, info,
                      (enum msg_hash_enums)(MENU_ENUM_LABEL_INPUT_USER_1_BINDS + user),
@@ -5411,7 +5598,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
                MENU_ENUM_LABEL_LOGGING_SETTINGS,   PARSE_ACTION, false);
          ret = menu_displaylist_parse_settings_enum(menu, info,
                MENU_ENUM_LABEL_FRAME_THROTTLE_SETTINGS,   PARSE_ACTION, false);
-         if (memcmp(settings->arrays.record_driver, "null", 4) != 0)
+         if (string_is_not_equal_fast(settings->arrays.record_driver, "null", 4))
             ret = menu_displaylist_parse_settings_enum(menu, info,
                   MENU_ENUM_LABEL_RECORDING_SETTINGS,   PARSE_ACTION, false);
          ret = menu_displaylist_parse_settings_enum(menu, info,
@@ -6172,15 +6359,15 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          info->need_push = true;
          break;
       case DISPLAYLIST_CORE_OPTIONS:
-         if (runloop_ctl(RUNLOOP_CTL_HAS_CORE_OPTIONS, NULL))
+         if (rarch_ctl(RARCH_CTL_HAS_CORE_OPTIONS, NULL))
          {
             size_t opts = 0;
 
-            runloop_ctl(RUNLOOP_CTL_GET_CORE_OPTION_SIZE, &opts);
+            rarch_ctl(RARCH_CTL_GET_CORE_OPTION_SIZE, &opts);
 
             if (settings->bools.game_specific_options)
             {
-               if (!runloop_ctl(RUNLOOP_CTL_IS_GAME_OPTIONS_ACTIVE, NULL))
+               if (!rarch_ctl(RARCH_CTL_IS_GAME_OPTIONS_ACTIVE, NULL))
                   menu_entries_append_enum(info->list,
                         msg_hash_to_str(
                            MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS_CREATE),
@@ -6209,7 +6396,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
             {
                core_option_manager_t *coreopts = NULL;
 
-               runloop_ctl(RUNLOOP_CTL_CORE_OPTIONS_LIST_GET, &coreopts);
+               rarch_ctl(RARCH_CTL_CORE_OPTIONS_LIST_GET, &coreopts);
 
                for (i = 0; i < opts; i++)
                   menu_entries_append_enum(info->list,
@@ -6346,7 +6533,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data)
          strlcpy(info->exts, "filt", sizeof(info->exts));
          break;
       case DISPLAYLIST_IMAGES:
-         if (filebrowser_get_type() != FILEBROWSER_SELECT_FILE)
+         if (     (filebrowser_get_type() != FILEBROWSER_SELECT_FILE)
+               && (filebrowser_get_type() != FILEBROWSER_SELECT_IMAGE))
             filebrowser_clear_type();
          info->type_default = FILE_TYPE_IMAGE;
          {
diff --git a/menu/menu_displaylist.h b/menu/menu_displaylist.h
index 11774301ca..539757ad58 100644
--- a/menu/menu_displaylist.h
+++ b/menu/menu_displaylist.h
@@ -206,7 +206,9 @@ typedef struct menu_displaylist_ctx_entry
 } menu_displaylist_ctx_entry_t;
 
 bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type, void *data);
-
+#ifdef HAVE_NETWORKING
+void netplay_refresh_rooms_menu(file_list_t *list);
+#endif
 RETRO_END_DECLS
 
 #endif
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 6060df062f..50a688a673 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -16,8 +16,12 @@
  */
 
 #include <string.h>
+#include <time.h>
 
 #include <compat/strl.h>
+#include <queues/message_queue.h>
+#include <retro_miscellaneous.h>
+#include <formats/image.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
 
@@ -25,17 +29,23 @@
 #include "../config.h"
 #endif
 
+#ifdef HAVE_THREADS
+#include "../gfx/video_thread_wrapper.h"
+#endif
+
+#include "../gfx/video_driver.h"
+
 #include "menu_animation.h"
 #include "menu_driver.h"
 #include "menu_cbs.h"
-#include "menu_display.h"
 #include "menu_event.h"
-#include "menu_navigation.h"
 #include "widgets/menu_dialog.h"
 #include "widgets/menu_list.h"
 #include "menu_shader.h"
 
+#include "../config.def.h"
 #include "../content.h"
+#include "../core.h"
 #include "../configuration.h"
 #include "../dynamic.h"
 #include "../driver.h"
@@ -45,9 +55,12 @@
 #include "../list_special.h"
 #include "../tasks/tasks_internal.h"
 #include "../ui/ui_companion_driver.h"
-#include "../runloop.h"
 #include "../verbosity.h"
 
+#define SCROLL_INDEX_SIZE          (2 * (26 + 2) + 1)
+
+#define PARTICLES_COUNT            100
+
 static const menu_ctx_driver_t *menu_ctx_drivers[] = {
 #if defined(HAVE_XUI)
    &menu_ctx_xui,
@@ -71,6 +84,55 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
    NULL
 };
 
+static menu_display_ctx_driver_t *menu_display_ctx_drivers[] = {
+#ifdef HAVE_D3D
+   &menu_display_ctx_d3d,
+#endif
+#ifdef HAVE_OPENGL
+   &menu_display_ctx_gl,
+#endif
+#ifdef HAVE_VULKAN
+   &menu_display_ctx_vulkan,
+#endif
+#ifdef HAVE_VITA2D
+   &menu_display_ctx_vita2d,
+#endif
+#ifdef _3DS
+   &menu_display_ctx_ctr,
+#endif
+#ifdef HAVE_CACA
+   &menu_display_ctx_caca,
+#endif
+#if defined(_WIN32) && !defined(_XBOX)
+   &menu_display_ctx_gdi,
+#endif
+#ifdef DJGPP
+   &menu_display_ctx_vga,
+#endif
+   &menu_display_ctx_null,
+   NULL,
+};
+
+
+uintptr_t menu_display_white_texture;
+
+static video_coord_array_t menu_disp_ca;
+
+static enum 
+menu_toggle_reason menu_display_toggle_reason    = MENU_TOGGLE_REASON_NONE;
+
+static unsigned menu_display_framebuf_width      = 0;
+static unsigned menu_display_framebuf_height     = 0;
+static size_t menu_display_framebuf_pitch        = 0;
+static unsigned menu_display_header_height       = 0;
+static bool menu_display_has_windowed            = false;
+static bool menu_display_msg_force               = false;
+static bool menu_display_font_alloc_framebuf     = false;
+static bool menu_display_framebuf_dirty          = false;
+static const uint8_t *menu_display_font_framebuf = NULL;
+static msg_queue_t *menu_display_msg_queue       = NULL;
+static menu_display_ctx_driver_t *menu_disp      = NULL;
+
 static struct retro_system_info menu_driver_system;
 static bool menu_driver_pending_quick_menu      = false;
 static bool menu_driver_prevent_populate        = false;
@@ -86,6 +148,1115 @@ static menu_handle_t *menu_driver_data          = NULL;
 static const menu_ctx_driver_t *menu_driver_ctx = NULL;
 static void *menu_userdata                      = NULL;
 
+/* Quick jumping indices with L/R.
+ * Rebuilt when parsing directory. */
+static size_t scroll_index_list[SCROLL_INDEX_SIZE];
+static unsigned scroll_index_size               = 0;
+static unsigned scroll_acceleration             = 0;
+static size_t menu_driver_selection_ptr         = 0;
+
+enum menu_toggle_reason menu_display_toggle_get_reason(void)
+{
+  return menu_display_toggle_reason;
+}
+
+void menu_display_toggle_set_reason(enum menu_toggle_reason reason)
+{
+  menu_display_toggle_reason = reason;
+}
+
+static const char *menu_video_get_ident(bool video_is_threaded)
+{
+#ifdef HAVE_THREADS
+   if (video_is_threaded)
+      return video_thread_get_ident();
+#endif
+
+   return video_driver_get_ident();
+}
+
+static bool menu_display_check_compatibility(
+      enum menu_display_driver_type type,
+      bool video_is_threaded)
+{
+   const char *video_driver = menu_video_get_ident(video_is_threaded);
+
+   switch (type)
+   {
+      case MENU_VIDEO_DRIVER_GENERIC:
+         return true;
+      case MENU_VIDEO_DRIVER_OPENGL:
+         if (string_is_equal_fast(video_driver, "gl", 2))
+            return true;
+         break;
+      case MENU_VIDEO_DRIVER_VULKAN:
+         if (string_is_equal_fast(video_driver, "vulkan", 6))
+            return true;
+         break;
+      case MENU_VIDEO_DRIVER_DIRECT3D:
+         if (string_is_equal_fast(video_driver, "d3d", 3))
+            return true;
+         break;
+      case MENU_VIDEO_DRIVER_VITA2D:
+         if (string_is_equal_fast(video_driver, "vita2d", 6))
+            return true;
+         break;
+      case MENU_VIDEO_DRIVER_CTR:
+         if (string_is_equal_fast(video_driver, "ctr", 3))
+            return true;
+         break;
+      case MENU_VIDEO_DRIVER_CACA:
+         if (string_is_equal_fast(video_driver, "caca", 4))
+            return true;
+         break;
+      case MENU_VIDEO_DRIVER_GDI:
+         if (string_is_equal_fast(video_driver, "gdi", 3))
+            return true;
+         break;
+      case MENU_VIDEO_DRIVER_VGA:
+         if (string_is_equal_fast(video_driver, "vga", 3))
+            return true;
+         break;
+   }
+
+   return false;
+}
+
+void menu_display_timedate(menu_display_ctx_datetime_t *datetime)
+{
+   time_t time_;
+
+   if (!datetime)
+      return;
+
+   time(&time_);
+
+   switch (datetime->time_mode)
+   {
+      case 0: /* Date and time */
+         strftime(datetime->s, datetime->len,
+               "%Y-%m-%d %H:%M:%S", localtime(&time_));
+         break;
+      case 1: /* Date */
+         strftime(datetime->s, datetime->len,
+               "%Y-%m-%d", localtime(&time_));
+         break;
+      case 2: /* Time */
+         strftime(datetime->s, datetime->len,
+               "%H:%M:%S", localtime(&time_));
+         break;
+      case 3: /* Time (hours-minutes) */
+         strftime(datetime->s, datetime->len,
+               "%H:%M", localtime(&time_));
+         break;
+      case 4: /* Date and time, without year and seconds */
+         strftime(datetime->s, datetime->len,
+               "%d/%m %H:%M", localtime(&time_));
+         break;
+   }
+}
+
+void menu_display_blend_begin(void)
+{
+   if (!menu_disp || !menu_disp->blend_begin)
+      return;
+   menu_disp->blend_begin();
+}
+
+void menu_display_blend_end(void)
+{
+   if (!menu_disp || !menu_disp->blend_end)
+      return;
+   menu_disp->blend_end();
+}
+
+void menu_display_font_free(font_data_t *font)
+{
+   font_driver_free(font);
+}
+
+static font_data_t *menu_display_font_main_init(menu_display_ctx_font_t *font,
+      bool is_threaded)
+{
+   font_data_t *font_data = NULL;
+
+   if (!font || !menu_disp)
+      return NULL;
+
+   if (!menu_disp->font_init_first((void**)&font_data,
+            video_driver_get_ptr(false),
+            font->path, font->size, is_threaded))
+      return NULL;
+
+   return font_data;
+}
+
+font_data_t *menu_display_font(enum application_special_type type, float font_size,
+      bool is_threaded)
+{
+   menu_display_ctx_font_t font_info;
+   char fontpath[PATH_MAX_LENGTH];
+
+   fontpath[0] = '\0';
+
+   fill_pathname_application_special(fontpath, sizeof(fontpath), type);
+
+   font_info.path = fontpath;
+   font_info.size = font_size;
+
+   return menu_display_font_main_init(&font_info, is_threaded);
+}
+
+void menu_display_font_bind_block(font_data_t *font, void *block)
+{
+   font_driver_bind_block(font, block);
+}
+
+bool menu_display_font_flush_block(unsigned width, unsigned height,
+      font_data_t *font)
+{
+   font_driver_flush(width, height, font);
+   font_driver_bind_block(font, NULL);
+   return true;
+}
+
+void menu_display_coords_array_reset(void)
+{
+   menu_disp_ca.coords.vertices = 0;
+}
+
+video_coord_array_t *menu_display_get_coords_array(void)
+{
+   return &menu_disp_ca;
+}
+
+const uint8_t *menu_display_get_font_framebuffer(void)
+{
+   return menu_display_font_framebuf;
+}
+
+void menu_display_set_font_framebuffer(const uint8_t *buffer)
+{
+   menu_display_font_framebuf = buffer;
+}
+
+static bool menu_display_libretro_running(
+      bool rarch_is_inited, 
+      bool rarch_is_dummy_core)
+{
+   settings_t *settings = config_get_ptr();
+   if (!settings->bools.menu_pause_libretro)
+   {
+      if (rarch_is_inited && !rarch_is_dummy_core)
+         return true;
+   }
+   return false;
+}
+
+bool menu_display_libretro(bool is_idle, bool rarch_is_inited, bool rarch_is_dummy_core)
+{
+   video_driver_set_texture_enable(true, false);
+
+   if (menu_display_libretro_running(rarch_is_inited, rarch_is_dummy_core))
+   {
+      if (!input_driver_is_libretro_input_blocked())
+         input_driver_set_libretro_input_blocked();
+
+      core_run();
+
+      input_driver_unset_libretro_input_blocked();
+      return true;
+   }
+
+   if (is_idle)
+      return true; /* Maybe return false here for indication of idleness? */
+   return video_driver_cached_frame();
+}
+
+void menu_display_get_fb_size(unsigned *fb_width,
+      unsigned *fb_height, size_t *fb_pitch)
+{
+   *fb_width  = menu_display_framebuf_width;
+   *fb_height = menu_display_framebuf_height;
+   *fb_pitch  = menu_display_framebuf_pitch;
+}
+
+void menu_display_set_width(unsigned width)
+{
+   menu_display_framebuf_width = width;
+}
+
+void menu_display_set_height(unsigned height)
+{
+   menu_display_framebuf_height = height;
+}
+
+void menu_display_set_header_height(unsigned height)
+{
+   menu_display_header_height = height;
+}
+
+unsigned menu_display_get_header_height(void)
+{
+   return menu_display_header_height;
+}
+
+size_t menu_display_get_framebuffer_pitch(void)
+{
+   return menu_display_framebuf_pitch;
+}
+
+void menu_display_set_framebuffer_pitch(size_t pitch)
+{
+   menu_display_framebuf_pitch = pitch;
+}
+
+bool menu_display_get_msg_force(void)
+{
+   return menu_display_msg_force;
+}
+
+void menu_display_set_msg_force(bool state)
+{
+   menu_display_msg_force = state;
+}
+
+bool menu_display_get_font_data_init(void)
+{
+   return menu_display_font_alloc_framebuf;
+}
+
+void menu_display_set_font_data_init(bool state)
+{
+   menu_display_font_alloc_framebuf = state;
+}
+
+bool menu_display_get_update_pending(void)
+{
+   if (menu_animation_is_active())
+      return true;
+   if (menu_display_get_framebuffer_dirty_flag())
+      return true;
+   return false;
+}
+
+void menu_display_set_viewport(unsigned width, unsigned height)
+{
+   video_driver_set_viewport(width, height, true, false);
+}
+
+void menu_display_unset_viewport(unsigned width, unsigned height)
+{
+   video_driver_set_viewport(width, height, false, true);
+}
+
+bool menu_display_get_framebuffer_dirty_flag(void)
+{
+   return menu_display_framebuf_dirty;
+}
+
+void menu_display_set_framebuffer_dirty_flag(void)
+{
+   menu_display_framebuf_dirty = true;
+}
+
+void menu_display_unset_framebuffer_dirty_flag(void)
+{
+   menu_display_framebuf_dirty = false;
+}
+
+float menu_display_get_dpi(void)
+{
+   gfx_ctx_metrics_t metrics;
+   settings_t *settings = config_get_ptr();
+   float            dpi = menu_dpi_override_value;
+
+   if (!settings)
+      return true;
+
+   metrics.type  = DISPLAY_METRIC_DPI;
+   metrics.value = &dpi;
+
+   if (settings->bools.menu_dpi_override_enable)
+      return settings->uints.menu_dpi_override_value;
+   else if (!video_context_driver_get_metrics(&metrics) || !dpi)
+      return menu_dpi_override_value;
+
+   return dpi;
+}
+
+bool menu_display_init_first_driver(bool video_is_threaded)
+{
+   unsigned i;
+
+   for (i = 0; menu_display_ctx_drivers[i]; i++)
+   {
+      if (!menu_display_check_compatibility(
+               menu_display_ctx_drivers[i]->type,
+               video_is_threaded))
+         continue;
+
+      RARCH_LOG("[Menu]: Found menu display driver: \"%s\".\n",
+            menu_display_ctx_drivers[i]->ident);
+      menu_disp = menu_display_ctx_drivers[i];
+      return true;
+   }
+   return false;
+}
+
+bool menu_display_restore_clear_color(void)
+{
+   if (!menu_disp || !menu_disp->restore_clear_color)
+      return false;
+   menu_disp->restore_clear_color();
+   return true;
+}
+
+void menu_display_clear_color(menu_display_ctx_clearcolor_t *color)
+{
+   if (!menu_disp || !menu_disp->clear_color)
+      return;
+   menu_disp->clear_color(color);
+}
+
+void menu_display_draw(menu_display_ctx_draw_t *draw)
+{
+   if (!menu_disp || !draw || !menu_disp->draw)
+      return;
+
+   /* TODO - edge case */
+   if (draw->height <= 0)
+      draw->height = 1;
+
+   menu_disp->draw(draw);
+}
+
+void menu_display_draw_pipeline(menu_display_ctx_draw_t *draw)
+{
+   if (!menu_disp || !draw || !menu_disp->draw_pipeline)
+      return;
+   menu_disp->draw_pipeline(draw);
+}
+
+void menu_display_draw_bg(menu_display_ctx_draw_t *draw,
+      video_frame_info_t *video_info, bool add_opacity_to_wallpaper)
+{
+   static struct video_coords coords;
+   const float *new_vertex       = NULL;
+   const float *new_tex_coord    = NULL;
+   if (!menu_disp || !draw)
+      return;
+
+   new_vertex           = draw->vertex;
+   new_tex_coord        = draw->tex_coord;
+
+   if (!new_vertex)
+      new_vertex        = menu_disp->get_default_vertices();
+   if (!new_tex_coord)
+      new_tex_coord     = menu_disp->get_default_tex_coords();
+
+   coords.vertices      = (unsigned)draw->vertex_count;
+   coords.vertex        = new_vertex;
+   coords.tex_coord     = new_tex_coord;
+   coords.lut_tex_coord = new_tex_coord;
+   coords.color         = (const float*)draw->color;
+
+   draw->coords      = &coords;
+
+   if (!video_info->libretro_running && !draw->pipeline.active)
+      add_opacity_to_wallpaper = true;
+
+   if (add_opacity_to_wallpaper)
+      menu_display_set_alpha(draw->color, video_info->menu_wallpaper_opacity);
+
+   if (!draw->texture)
+      draw->texture     = menu_display_white_texture;
+
+   draw->matrix_data = (math_matrix_4x4*)menu_disp->get_default_mvp();
+}
+
+void menu_display_draw_gradient(menu_display_ctx_draw_t *draw,
+      video_frame_info_t *video_info)
+{
+   draw->texture       = 0;
+   draw->x             = 0;
+   draw->y             = 0;
+
+   menu_display_draw_bg(draw, video_info, false);
+   menu_display_draw(draw);
+}
+
+void menu_display_draw_quad(
+      int x, int y, unsigned w, unsigned h,
+      unsigned width, unsigned height,
+      float *color)
+{
+   menu_display_ctx_draw_t draw;
+   struct video_coords coords;
+
+   coords.vertices      = 4;
+   coords.vertex        = NULL;
+   coords.tex_coord     = NULL;
+   coords.lut_tex_coord = NULL;
+   coords.color         = color;
+
+   menu_display_blend_begin();
+
+   draw.x           = x;
+   draw.y           = (int)height - y - (int)h;
+   draw.width       = w;
+   draw.height      = h;
+   draw.coords      = &coords;
+   draw.matrix_data = NULL;
+   draw.texture     = menu_display_white_texture;
+   draw.prim_type   = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
+   draw.pipeline.id = 0;
+
+   menu_display_draw(&draw);
+   menu_display_blend_end();
+}
+
+void menu_display_draw_texture(
+      int x, int y, unsigned w, unsigned h,
+      unsigned width, unsigned height,
+      float *color, uintptr_t texture)
+{
+   menu_display_ctx_draw_t draw;
+   menu_display_ctx_rotate_draw_t rotate_draw;
+   struct video_coords coords;
+   math_matrix_4x4 mymat;
+   rotate_draw.matrix       = &mymat;
+   rotate_draw.rotation     = 0.0;
+   rotate_draw.scale_x      = 1.0;
+   rotate_draw.scale_y      = 1.0;
+   rotate_draw.scale_z      = 1;
+   rotate_draw.scale_enable = true;
+   coords.vertices          = 4;
+   coords.vertex            = NULL;
+   coords.tex_coord         = NULL;
+   coords.lut_tex_coord     = NULL;
+   draw.width               = w;
+   draw.height              = h;
+   draw.coords              = &coords;
+   draw.matrix_data         = &mymat;
+   draw.prim_type           = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
+   draw.pipeline.id         = 0;
+   coords.color             = (const float*)color;
+
+   menu_display_rotate_z(&rotate_draw);
+
+   draw.texture             = texture;
+   draw.x                   = x;
+   draw.y                   = height - y;
+   menu_display_draw(&draw);
+}
+
+/* Draw the texture split into 9 sections, without scaling the corners.
+ * The middle sections will only scale in the X axis, and the side
+ * sections will only scale in the Y axis. */
+void menu_display_draw_texture_slice(
+      int x, int y, unsigned w, unsigned h,
+      unsigned new_w, unsigned new_h,
+      unsigned width, unsigned height,
+      float *color, unsigned offset, float scale_factor, uintptr_t texture)
+{
+   menu_display_ctx_draw_t draw;
+   menu_display_ctx_rotate_draw_t rotate_draw;
+   struct video_coords coords;
+   math_matrix_4x4 mymat;
+   unsigned i;
+   float V_BL[2], V_BR[2], V_TL[2], V_TR[2], T_BL[2], T_BR[2], T_TL[2], T_TR[2];
+
+   /* need space for the coordinates of two triangles in a strip, so 8 vertices */
+   float *tex_coord  = (float*)malloc(8 * sizeof(float));
+   float *vert_coord = (float*)malloc(8 * sizeof(float));
+   float *colors     = (float*)malloc(16 * sizeof(float));
+
+   /* normalized width/height of the amount to offset from the corners,
+    * for both the vertex and texture coordinates */
+   float vert_woff   = (offset * scale_factor) / (float)width;
+   float vert_hoff   = (offset * scale_factor) / (float)height;
+   float tex_woff    = offset / (float)w;
+   float tex_hoff    = offset / (float)h;
+
+   /* the width/height of the middle sections of both the scaled and original image */
+   float vert_scaled_mid_width  = (new_w - (offset * scale_factor * 2)) / (float)width;
+   float vert_scaled_mid_height = (new_h - (offset * scale_factor * 2)) / (float)height;
+   float tex_mid_width          = (w - (offset * 2)) / (float)w;
+   float tex_mid_height         = (h - (offset * 2)) / (float)h;
+
+   /* normalized coordinates for the start position of the image */
+   float norm_x                 = x / (float)width;
+   float norm_y                 = (height - y) / (float)height;
+
+   /* the four vertices of the top-left corner of the image,
+    * used as a starting point for all the other sections */
+   V_BL[0] = norm_x;
+   V_BL[1] = norm_y;
+   V_BR[0] = norm_x + vert_woff;
+   V_BR[1] = norm_y;
+   V_TL[0] = norm_x;
+   V_TL[1] = norm_y + vert_hoff;
+   V_TR[0] = norm_x + vert_woff;
+   V_TR[1] = norm_y + vert_hoff;
+   T_BL[0] = 0.0f;
+   T_BL[1] = tex_hoff;
+   T_BR[0] = tex_woff;
+   T_BR[1] = tex_hoff;
+   T_TL[0] = 0.0f;
+   T_TL[1] = 0.0f;
+   T_TR[0] = tex_woff;
+   T_TR[1] = 0.0f;
+
+   for (i = 0; i < (16 * sizeof(float)) / sizeof(colors[0]); i++)
+      colors[i] = 1.0f;
+
+   rotate_draw.matrix       = &mymat;
+   rotate_draw.rotation     = 0.0;
+   rotate_draw.scale_x      = 1.0;
+   rotate_draw.scale_y      = 1.0;
+   rotate_draw.scale_z      = 1;
+   rotate_draw.scale_enable = true;
+   coords.vertices          = 4;
+   coords.vertex            = vert_coord;
+   coords.tex_coord         = tex_coord;
+   coords.lut_tex_coord     = NULL;
+   draw.width               = width;
+   draw.height              = height;
+   draw.coords              = &coords;
+   draw.matrix_data         = &mymat;
+   draw.prim_type           = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
+   draw.pipeline.id         = 0;
+   coords.color             = (const float*)colors;
+
+   menu_display_rotate_z(&rotate_draw);
+
+   draw.texture             = texture;
+   draw.x                   = 0;
+   draw.y                   = 0;
+
+   /* vertex coords are specfied bottom-up in this order: BL BR TL TR */
+   /* texture coords are specfied top-down in this order: BL BR TL TR */
+
+   /* If someone wants to change this to not draw several times, the
+    * coordinates will need to be modified because of the triangle strip usage. */
+
+   /* top-left corner */
+   vert_coord[0] = V_BL[0];
+   vert_coord[1] = V_BL[1];
+   vert_coord[2] = V_BR[0];
+   vert_coord[3] = V_BR[1];
+   vert_coord[4] = V_TL[0];
+   vert_coord[5] = V_TL[1];
+   vert_coord[6] = V_TR[0];
+   vert_coord[7] = V_TR[1];
+
+   tex_coord[0] = T_BL[0];
+   tex_coord[1] = T_BL[1];
+   tex_coord[2] = T_BR[0];
+   tex_coord[3] = T_BR[1];
+   tex_coord[4] = T_TL[0];
+   tex_coord[5] = T_TL[1];
+   tex_coord[6] = T_TR[0];
+   tex_coord[7] = T_TR[1];
+
+   menu_display_draw(&draw);
+
+   /* top-middle section */
+   vert_coord[0] = V_BL[0] + vert_woff;
+   vert_coord[1] = V_BL[1];
+   vert_coord[2] = V_BR[0] + vert_scaled_mid_width;
+   vert_coord[3] = V_BR[1];
+   vert_coord[4] = V_TL[0] + vert_woff;
+   vert_coord[5] = V_TL[1];
+   vert_coord[6] = V_TR[0] + vert_scaled_mid_width;
+   vert_coord[7] = V_TR[1];
+
+   tex_coord[0] = T_BL[0] + tex_woff;
+   tex_coord[1] = T_BL[1];
+   tex_coord[2] = T_BR[0] + tex_mid_width;
+   tex_coord[3] = T_BR[1];
+   tex_coord[4] = T_TL[0] + tex_woff;
+   tex_coord[5] = T_TL[1];
+   tex_coord[6] = T_TR[0] + tex_mid_width;
+   tex_coord[7] = T_TR[1];
+
+   menu_display_draw(&draw);
+
+   /* top-right corner */
+   vert_coord[0] = V_BL[0] + vert_woff + vert_scaled_mid_width;
+   vert_coord[1] = V_BL[1];
+   vert_coord[2] = V_BR[0] + vert_scaled_mid_width + vert_woff;
+   vert_coord[3] = V_BR[1];
+   vert_coord[4] = V_TL[0] + vert_woff + vert_scaled_mid_width;
+   vert_coord[5] = V_TL[1];
+   vert_coord[6] = V_TR[0] + vert_scaled_mid_width + vert_woff;
+   vert_coord[7] = V_TR[1];
+
+   tex_coord[0] = T_BL[0] + tex_woff + tex_mid_width;
+   tex_coord[1] = T_BL[1];
+   tex_coord[2] = T_BR[0] + tex_mid_width + tex_woff;
+   tex_coord[3] = T_BR[1];
+   tex_coord[4] = T_TL[0] + tex_woff + tex_mid_width;
+   tex_coord[5] = T_TL[1];
+   tex_coord[6] = T_TR[0] + tex_mid_width + tex_woff;
+   tex_coord[7] = T_TR[1];
+
+   menu_display_draw(&draw);
+
+   /* middle-left section */
+   vert_coord[0] = V_BL[0];
+   vert_coord[1] = V_BL[1] - vert_scaled_mid_height;
+   vert_coord[2] = V_BR[0];
+   vert_coord[3] = V_BR[1] - vert_scaled_mid_height;
+   vert_coord[4] = V_TL[0];
+   vert_coord[5] = V_TL[1] - vert_hoff;
+   vert_coord[6] = V_TR[0];
+   vert_coord[7] = V_TR[1] - vert_hoff;
+
+   tex_coord[0] = T_BL[0];
+   tex_coord[1] = T_BL[1] + tex_mid_height;
+   tex_coord[2] = T_BR[0];
+   tex_coord[3] = T_BR[1] + tex_mid_height;
+   tex_coord[4] = T_TL[0];
+   tex_coord[5] = T_TL[1] + tex_hoff;
+   tex_coord[6] = T_TR[0];
+   tex_coord[7] = T_TR[1] + tex_hoff;
+
+   menu_display_draw(&draw);
+
+   /* center section */
+   vert_coord[0] = V_BL[0] + vert_woff;
+   vert_coord[1] = V_BL[1] - vert_scaled_mid_height;
+   vert_coord[2] = V_BR[0] + vert_scaled_mid_width;
+   vert_coord[3] = V_BR[1] - vert_scaled_mid_height;
+   vert_coord[4] = V_TL[0] + vert_woff;
+   vert_coord[5] = V_TL[1] - vert_hoff;
+   vert_coord[6] = V_TR[0] + vert_scaled_mid_width;
+   vert_coord[7] = V_TR[1] - vert_hoff;
+
+   tex_coord[0] = T_BL[0] + tex_woff;
+   tex_coord[1] = T_BL[1] + tex_mid_height;
+   tex_coord[2] = T_BR[0] + tex_mid_width;
+   tex_coord[3] = T_BR[1] + tex_mid_height;
+   tex_coord[4] = T_TL[0] + tex_woff;
+   tex_coord[5] = T_TL[1] + tex_hoff;
+   tex_coord[6] = T_TR[0] + tex_mid_width;
+   tex_coord[7] = T_TR[1] + tex_hoff;
+
+   menu_display_draw(&draw);
+
+   /* middle-right section */
+   vert_coord[0] = V_BL[0] + vert_woff + vert_scaled_mid_width;
+   vert_coord[1] = V_BL[1] - vert_scaled_mid_height;
+   vert_coord[2] = V_BR[0] + vert_woff + vert_scaled_mid_width;
+   vert_coord[3] = V_BR[1] - vert_scaled_mid_height;
+   vert_coord[4] = V_TL[0] + vert_woff + vert_scaled_mid_width;
+   vert_coord[5] = V_TL[1] - vert_hoff;
+   vert_coord[6] = V_TR[0] + vert_woff + vert_scaled_mid_width;
+   vert_coord[7] = V_TR[1] - vert_hoff;
+
+   tex_coord[0] = T_BL[0] + tex_woff + tex_mid_width;
+   tex_coord[1] = T_BL[1] + tex_mid_height;
+   tex_coord[2] = T_BR[0] + tex_woff + tex_mid_width;
+   tex_coord[3] = T_BR[1] + tex_mid_height;
+   tex_coord[4] = T_TL[0] + tex_woff + tex_mid_width;
+   tex_coord[5] = T_TL[1] + tex_hoff;
+   tex_coord[6] = T_TR[0] + tex_woff + tex_mid_width;
+   tex_coord[7] = T_TR[1] + tex_hoff;
+
+   menu_display_draw(&draw);
+
+   /* bottom-left corner */
+   vert_coord[0] = V_BL[0];
+   vert_coord[1] = V_BL[1] - vert_hoff - vert_scaled_mid_height;
+   vert_coord[2] = V_BR[0];
+   vert_coord[3] = V_BR[1] - vert_hoff - vert_scaled_mid_height;
+   vert_coord[4] = V_TL[0];
+   vert_coord[5] = V_TL[1] - vert_hoff - vert_scaled_mid_height;
+   vert_coord[6] = V_TR[0];
+   vert_coord[7] = V_TR[1] - vert_hoff - vert_scaled_mid_height;
+
+   tex_coord[0] = T_BL[0];
+   tex_coord[1] = T_BL[1] + tex_hoff + tex_mid_height;
+   tex_coord[2] = T_BR[0];
+   tex_coord[3] = T_BR[1] + tex_hoff + tex_mid_height;
+   tex_coord[4] = T_TL[0];
+   tex_coord[5] = T_TL[1] + tex_hoff + tex_mid_height;
+   tex_coord[6] = T_TR[0];
+   tex_coord[7] = T_TR[1] + tex_hoff + tex_mid_height;
+
+   menu_display_draw(&draw);
+
+   /* bottom-middle section */
+   vert_coord[0] = V_BL[0] + vert_woff;
+   vert_coord[1] = V_BL[1] - vert_hoff - vert_scaled_mid_height;
+   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[6] = V_TR[0] + vert_scaled_mid_width;
+   vert_coord[7] = V_TR[1] - 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[6] = T_TR[0] + tex_mid_width;
+   tex_coord[7] = T_TR[1] + tex_mid_height;
+
+   menu_display_draw(&draw);
+
+   /* bottom-right corner */
+   vert_coord[0] = V_BL[0] + vert_woff + vert_scaled_mid_width;
+   vert_coord[1] = V_BL[1] - vert_hoff - vert_scaled_mid_height;
+   vert_coord[2] = V_BR[0] + vert_scaled_mid_width + vert_woff;
+   vert_coord[3] = V_BR[1] - vert_hoff - vert_scaled_mid_height;
+   vert_coord[4] = V_TL[0] + vert_woff + vert_scaled_mid_width;
+   vert_coord[5] = V_TL[1] - vert_hoff - vert_scaled_mid_height;
+   vert_coord[6] = V_TR[0] + vert_scaled_mid_width + vert_woff;
+   vert_coord[7] = V_TR[1] - vert_hoff - vert_scaled_mid_height;
+
+   tex_coord[0] = T_BL[0] + tex_woff + tex_mid_width;
+   tex_coord[1] = T_BL[1] + tex_hoff + tex_mid_height;
+   tex_coord[2] = T_BR[0] + tex_woff + tex_mid_width;
+   tex_coord[3] = T_BR[1] + tex_hoff + tex_mid_height;
+   tex_coord[4] = T_TL[0] + tex_woff + tex_mid_width;
+   tex_coord[5] = T_TL[1] + tex_hoff + tex_mid_height;
+   tex_coord[6] = T_TR[0] + tex_woff + tex_mid_width;
+   tex_coord[7] = T_TR[1] + tex_hoff + tex_mid_height;
+
+   menu_display_draw(&draw);
+
+   free(colors);
+   free(vert_coord);
+   free(tex_coord);
+}
+
+void menu_display_rotate_z(menu_display_ctx_rotate_draw_t *draw)
+{
+#if !defined(VITA)
+   math_matrix_4x4 matrix_rotated, matrix_scaled;
+   math_matrix_4x4 *b = NULL;
+
+   if (!draw || !menu_disp || !menu_disp->get_default_mvp)
+      return;
+
+   b = (math_matrix_4x4*)menu_disp->get_default_mvp();
+
+   matrix_4x4_rotate_z(matrix_rotated, draw->rotation);
+   matrix_4x4_multiply(*draw->matrix, matrix_rotated, *b);
+
+   if (!draw->scale_enable)
+      return;
+
+   matrix_4x4_scale(matrix_scaled,
+         draw->scale_x, draw->scale_y, draw->scale_z);
+   matrix_4x4_multiply(*draw->matrix, matrix_scaled, *draw->matrix);
+#endif
+}
+
+bool menu_display_get_tex_coords(menu_display_ctx_coord_draw_t *draw)
+{
+   if (!draw)
+      return false;
+
+   if (!menu_disp || !menu_disp->get_default_tex_coords)
+      return false;
+
+   draw->ptr = menu_disp->get_default_tex_coords();
+   return true;
+}
+
+void menu_display_handle_thumbnail_upload(void *task_data,
+      void *user_data, const char *err)
+{
+   menu_ctx_load_image_t load_image_info;
+   struct texture_image *img = (struct texture_image*)task_data;
+
+   load_image_info.data = img;
+   load_image_info.type = MENU_IMAGE_THUMBNAIL;
+
+   menu_driver_load_image(&load_image_info);
+
+   image_texture_free(img);
+   free(img);
+   free(user_data);
+}
+
+void menu_display_handle_savestate_thumbnail_upload(void *task_data,
+      void *user_data, const char *err)
+{
+   menu_ctx_load_image_t load_image_info;
+   struct texture_image *img = (struct texture_image*)task_data;
+
+   load_image_info.data = img;
+   load_image_info.type = MENU_IMAGE_SAVESTATE_THUMBNAIL;
+
+   menu_driver_load_image(&load_image_info);
+
+   image_texture_free(img);
+   free(img);
+   free(user_data);
+}
+
+void menu_display_handle_wallpaper_upload(void *task_data,
+      void *user_data, const char *err)
+{
+   menu_ctx_load_image_t load_image_info;
+   struct texture_image *img = (struct texture_image*)task_data;
+
+   load_image_info.data = img;
+   load_image_info.type = MENU_IMAGE_WALLPAPER;
+
+   menu_driver_load_image(&load_image_info);
+   image_texture_free(img);
+   free(img);
+   free(user_data);
+}
+
+void menu_display_allocate_white_texture(void)
+{
+   struct texture_image ti;
+   static const uint8_t white_data[] = { 0xff, 0xff, 0xff, 0xff };
+
+   ti.width  = 1;
+   ti.height = 1;
+   ti.pixels = (uint32_t*)&white_data;
+
+   if (menu_display_white_texture)
+      video_driver_texture_unload(&menu_display_white_texture);
+
+   video_driver_texture_load(&ti,
+         TEXTURE_FILTER_NEAREST, &menu_display_white_texture);
+}
+
+void menu_display_draw_cursor(
+      float *color, float cursor_size, uintptr_t texture,
+      float x, float y, unsigned width, unsigned height)
+{
+   menu_display_ctx_draw_t draw;
+   struct video_coords coords;
+   settings_t *settings = config_get_ptr();
+   bool cursor_visible  = settings->bools.video_fullscreen ||
+       !menu_display_has_windowed;
+
+   if (!settings->bools.menu_mouse_enable)
+      return;
+   if (!cursor_visible)
+      return;
+
+   coords.vertices      = 4;
+   coords.vertex        = NULL;
+   coords.tex_coord     = NULL;
+   coords.lut_tex_coord = NULL;
+   coords.color         = (const float*)color;
+
+   menu_display_blend_begin();
+
+   draw.x               = x - (cursor_size / 2);
+   draw.y               = (int)height - y - (cursor_size / 2);
+   draw.width           = cursor_size;
+   draw.height          = cursor_size;
+   draw.coords          = &coords;
+   draw.matrix_data     = NULL;
+   draw.texture         = texture;
+   draw.prim_type       = MENU_DISPLAY_PRIM_TRIANGLESTRIP;
+
+   menu_display_draw(&draw);
+   menu_display_blend_end();
+}
+
+static INLINE float menu_display_scalef(float val,
+      float oldmin, float oldmax, float newmin, float newmax)
+{
+   return (((val - oldmin) * (newmax - newmin)) / (oldmax - oldmin)) + newmin;
+}
+
+static INLINE float menu_display_randf(float min, float max)
+{
+   return (rand() * ((max - min) / RAND_MAX)) + min;
+}
+
+void menu_display_push_quad(
+      unsigned width, unsigned height,
+      const float *colors, int x1, int y1,
+      int x2, int y2)
+{
+   float vertex[8];
+   video_coords_t coords;
+   menu_display_ctx_coord_draw_t coord_draw;
+   video_coord_array_t *ca = menu_display_get_coords_array();
+
+   vertex[0]             = x1 / (float)width;
+   vertex[1]             = y1 / (float)height;
+   vertex[2]             = x2 / (float)width;
+   vertex[3]             = y1 / (float)height;
+   vertex[4]             = x1 / (float)width;
+   vertex[5]             = y2 / (float)height;
+   vertex[6]             = x2 / (float)width;
+   vertex[7]             = y2 / (float)height;
+
+   coord_draw.ptr        = NULL;
+
+   menu_display_get_tex_coords(&coord_draw);
+
+   coords.color          = colors;
+   coords.vertex         = vertex;
+   coords.tex_coord      = coord_draw.ptr;
+   coords.lut_tex_coord  = coord_draw.ptr;
+   coords.vertices       = 3;
+
+   video_coord_array_append(ca, &coords, 3);
+
+   coords.color         += 4;
+   coords.vertex        += 2;
+   coords.tex_coord     += 2;
+   coords.lut_tex_coord += 2;
+
+   video_coord_array_append(ca, &coords, 3);
+}
+
+void menu_display_snow(int width, int height)
+{
+   struct display_particle
+   {
+      float x, y;
+      float xspeed, yspeed;
+      float alpha;
+      bool alive;
+   };
+   static struct display_particle particles[PARTICLES_COUNT] = {{0}};
+   static int timeout      = 0;
+   unsigned i, max_gen     = 2;
+
+   for (i = 0; i < PARTICLES_COUNT; ++i)
+   {
+      struct display_particle *p = (struct display_particle*)&particles[i];
+
+      if (p->alive)
+      {
+         int16_t mouse_x  = menu_input_mouse_state(MENU_MOUSE_X_AXIS);
+
+         p->y            += p->yspeed;
+         p->x            += menu_display_scalef(mouse_x, 0, width, -0.3, 0.3);
+         p->x            += p->xspeed;
+
+         p->alive         = p->y >= 0 && p->y < height
+            && p->x >= 0 && p->x < width;
+      }
+      else if (max_gen > 0 && timeout <= 0)
+      {
+         p->xspeed = menu_display_randf(-0.2, 0.2);
+         p->yspeed = menu_display_randf(1, 2);
+         p->y      = 0;
+         p->x      = rand() % width;
+         p->alpha  = (float)rand() / (float)RAND_MAX;
+         p->alive  = true;
+
+         max_gen--;
+      }
+   }
+
+   if (max_gen == 0)
+      timeout = 3;
+   else
+      timeout--;
+
+   for (i = 0; i < PARTICLES_COUNT; ++i)
+   {
+      unsigned j;
+      float alpha, colors[16];
+      struct display_particle *p = &particles[i];
+
+      if (!p->alive)
+         continue;
+
+      alpha = menu_display_randf(0, 100) > 90 ? p->alpha/2 : p->alpha;
+
+      for (j = 0; j < 16; j++)
+      {
+         colors[j] = 1;
+         if (j == 3 || j == 7 || j == 11 || j == 15)
+            colors[j] = alpha;
+      }
+
+      menu_display_push_quad(width, height,
+            colors, p->x-2, p->y-2, p->x+2, p->y+2);
+
+      j++;
+   }
+}
+
+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)
+{
+   struct font_params params;
+
+   /* Don't draw outside of the screen */
+   if (x < -64 || x > width + 64
+         || y < -64 || y > height + 64)
+      return;
+
+   params.x           = x / width;
+   params.y           = 1.0f - y / height;
+   params.scale       = scale;
+   params.drop_mod    = 0.0f;
+   params.drop_x      = 0.0f;
+   params.drop_y      = 0.0f;
+   params.color       = color;
+   params.full_screen = true;
+   params.text_align  = text_align;
+
+   if (shadows_enable)
+   {
+      params.drop_x      = shadow_offset;
+      params.drop_y      = -shadow_offset;
+      params.drop_alpha  = 0.35f;
+   }
+
+   video_driver_set_osd_msg(text, &params, (void*)font);
+}
+
+void menu_display_set_alpha(float *color, float alpha_value)
+{
+   if (!color)
+      return;
+   color[3] = color[7] = color[11] = color[15] = alpha_value;
+}
+
+void menu_display_reset_textures_list(const char *texture_path, const char *iconpath,
+      uintptr_t *item, enum texture_filter_type filter_type)
+{
+   struct texture_image ti;
+   char path[PATH_MAX_LENGTH];
+
+   path[0]                     = '\0';
+
+   ti.width                    = 0;
+   ti.height                   = 0;
+   ti.pixels                   = NULL;
+   ti.supports_rgba            = video_driver_supports_rgba();
+
+   if (!string_is_empty(texture_path))
+      fill_pathname_join(path, iconpath, texture_path, sizeof(path));
+
+   if (string_is_empty(path) || !path_file_exists(path))
+      return;
+
+   if (!image_texture_load(&ti, path))
+      return;
+
+   video_driver_texture_load(&ti,
+         filter_type, item);
+   image_texture_free(&ti);
+}
+
 bool menu_driver_is_binding_state(void)
 {
    return menu_driver_is_binding;
@@ -217,8 +1388,10 @@ static bool menu_init(menu_handle_t *menu_data)
 
    menu_shader_manager_init();
 
-   if (!menu_display_init())
-      return false;
+   menu_display_msg_queue    = msg_queue_new(8);
+   menu_disp_ca.allocated    =  0;
+
+   menu_display_has_windowed = video_driver_has_windowed();
 
    return true;
 }
@@ -242,21 +1415,23 @@ static void menu_driver_toggle(bool on)
    retro_keyboard_event_t *key_event          = NULL;
    retro_keyboard_event_t *frontend_key_event = NULL;
    settings_t                 *settings       = config_get_ptr();
+   bool pause_libretro                        = settings ? settings->bools.menu_pause_libretro : false;
 
    menu_driver_toggled = on;
 
    if (!on)
       menu_display_toggle_set_reason(MENU_TOGGLE_REASON_NONE);
 
-   menu_driver_ctl(RARCH_MENU_CTL_TOGGLE, &on);
+   if (menu_driver_ctx && menu_driver_ctx->toggle)
+      menu_driver_ctx->toggle(menu_userdata, on);
 
    if (on)
       menu_driver_alive = true;
    else
       menu_driver_alive = false;
 
-   runloop_ctl(RUNLOOP_CTL_FRONTEND_KEY_EVENT_GET, &frontend_key_event);
-   runloop_ctl(RUNLOOP_CTL_KEY_EVENT_GET,          &key_event);
+   rarch_ctl(RARCH_CTL_FRONTEND_KEY_EVENT_GET, &frontend_key_event);
+   rarch_ctl(RARCH_CTL_KEY_EVENT_GET,          &key_event);
 
    if (menu_driver_alive)
    {
@@ -268,7 +1443,7 @@ static void menu_driver_toggle(bool on)
       /* Stop all rumbling before entering the menu. */
       command_event(CMD_EVENT_RUMBLE_STOP, NULL);
 
-      if (settings && settings->bools.menu_pause_libretro)
+      if (pause_libretro)
          command_event(CMD_EVENT_AUDIO_STOP, NULL);
 
       /* Override keyboard callback to redirect to menu instead.
@@ -279,24 +1454,21 @@ static void menu_driver_toggle(bool on)
          *frontend_key_event        = *key_event;
          *key_event                 = menu_input_key_event;
 
-         runloop_ctl(RUNLOOP_CTL_SET_FRAME_TIME_LAST, NULL);
+         rarch_ctl(RARCH_CTL_SET_FRAME_TIME_LAST, NULL);
       }
    }
    else
    {
-      if (!runloop_ctl(RUNLOOP_CTL_IS_SHUTDOWN, NULL))
+      if (!rarch_ctl(RARCH_CTL_IS_SHUTDOWN, NULL))
          driver_set_nonblock_state();
 
-      if (settings && settings->bools.menu_pause_libretro)
+      if (pause_libretro)
          command_event(CMD_EVENT_AUDIO_START, NULL);
 
       /* Restore libretro keyboard callback. */
       if (key_event && frontend_key_event)
          *key_event = *frontend_key_event;
    }
-
-   /* Prevent stray input */
-   input_driver_set_flushing_input();
 }
 
 const char *menu_driver_ident(void)
@@ -314,26 +1486,8 @@ void menu_driver_frame(video_frame_info_t *video_info)
       menu_driver_ctx->frame(menu_userdata, video_info);
 }
 
-/**
- * menu_update_libretro_info:
- *
- * Update menu state which depends on config.
- **/
-static void menu_update_libretro_info(void)
-{
-   struct retro_system_info *info = NULL;
-
-   menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_GET,
-         &info);
-
-   if (!info)
-      return;
-
-   command_event(CMD_EVENT_CORE_INFO_INIT, NULL);
-   command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
-}
-
-bool menu_driver_render(bool is_idle)
+bool menu_driver_render(bool is_idle, bool rarch_is_inited,
+      bool rarch_is_dummy_core)
 {
    if (!menu_driver_data)
       return false;
@@ -366,11 +1520,11 @@ bool menu_driver_render(bool is_idle)
       menu_animation_update_time(settings->bools.menu_timedate_enable);
 
       if (menu_driver_ctx->render)
-         menu_driver_ctx->render(menu_userdata);
+         menu_driver_ctx->render(menu_userdata, is_idle);
    }
 
    if (menu_driver_alive && !is_idle)
-      menu_display_libretro();
+      menu_display_libretro(is_idle, rarch_is_inited, rarch_is_dummy_core);
 
    if (menu_driver_ctx->set_texture)
       menu_driver_ctx->set_texture();
@@ -446,34 +1600,11 @@ bool menu_driver_list_clear(void *data)
    return true;
 }
 
-void menu_driver_increment_navigation(void)
-{
-   if (menu_driver_ctx->navigation_increment)
-      menu_driver_ctx->navigation_increment(menu_userdata);
-}
-
-void menu_driver_decrement_navigation(void)
-{
-   if (menu_driver_ctx->navigation_decrement)
-      menu_driver_ctx->navigation_decrement(menu_userdata);
-}
-
-static bool menu_driver_context_reset(bool video_is_threaded)
-{
-   if (!menu_driver_ctx || !menu_driver_ctx->context_reset)
-      return false;
-   menu_driver_ctx->context_reset(menu_userdata, video_is_threaded);
-   return true;
-}
-
 static bool menu_driver_init_internal(bool video_is_threaded)
 {
-   settings_t *settings  = config_get_ptr();
-   menu_update_libretro_info();
-   if (menu_driver_data)
-      return true;
+   settings_t *settings           = config_get_ptr();
 
-   menu_driver_data = (menu_handle_t*)
+   menu_driver_data               = (menu_handle_t*)
       menu_driver_ctx->init(&menu_userdata, video_is_threaded);
 
    if (!menu_driver_data || !menu_init(menu_driver_data))
@@ -499,11 +1630,66 @@ static bool menu_driver_init_internal(bool video_is_threaded)
 
 bool menu_driver_init(bool video_is_threaded)
 {
-   if (menu_driver_init_internal(video_is_threaded))
-         return menu_driver_context_reset(video_is_threaded);
+   struct retro_system_info *info = &menu_driver_system;
+
+   if (info)
+   {
+      /* Update menu state which depends on config. */
+      command_event(CMD_EVENT_CORE_INFO_INIT, NULL);
+      command_event(CMD_EVENT_LOAD_CORE_PERSIST, NULL);
+   }
+
+   if (menu_driver_data || menu_driver_init_internal(video_is_threaded))
+   {
+      if (menu_driver_ctx && menu_driver_ctx->context_reset)
+         menu_driver_ctx->context_reset(menu_userdata, video_is_threaded);
+   }
    return false;
 }
 
+void menu_driver_navigation_set(bool scroll)
+{
+   if (menu_driver_ctx->navigation_set)
+      menu_driver_ctx->navigation_set(menu_userdata, scroll);
+}
+
+void menu_driver_populate_entries(menu_displaylist_info_t *info)
+{
+   if (menu_driver_ctx->populate_entries)
+      menu_driver_ctx->populate_entries(
+            menu_userdata, info->path,
+            info->label, info->type);
+}
+
+bool menu_driver_load_image(menu_ctx_load_image_t *load_image_info)
+{
+   if (menu_driver_ctx && menu_driver_ctx->load_image)
+      return menu_driver_ctx->load_image(menu_userdata,
+            load_image_info->data, load_image_info->type);
+   return false;
+}
+
+bool menu_driver_push_list(menu_ctx_displaylist_t *disp_list)
+{
+   if (menu_driver_ctx->list_push)
+      if (menu_driver_ctx->list_push(menu_driver_data,
+               menu_userdata, disp_list->info, disp_list->type) == 0)
+         return true;
+   return false;
+}
+
+void menu_driver_set_thumbnail_system(char *s, size_t len)
+{
+   if (menu_driver_ctx && menu_driver_ctx->set_thumbnail_system)
+      menu_driver_ctx->set_thumbnail_system(menu_userdata, s, len);
+}
+
+void menu_driver_set_thumbnail_content(char *s, size_t len)
+{
+   if (menu_driver_ctx && menu_driver_ctx->set_thumbnail_content)
+      menu_driver_ctx->set_thumbnail_content(menu_userdata, s, len);
+}
+
 bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
 {
    switch (state)
@@ -638,16 +1824,27 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
       case RARCH_MENU_CTL_OWNS_DRIVER:
          return menu_driver_data_own;
       case RARCH_MENU_CTL_DEINIT:
-         menu_driver_ctl(RARCH_MENU_CTL_CONTEXT_DESTROY, NULL);
-         if (menu_driver_ctl(RARCH_MENU_CTL_OWNS_DRIVER, NULL))
+         if (menu_driver_ctx && menu_driver_ctx->context_destroy)
+            menu_driver_ctx->context_destroy(menu_userdata);
+
+         if (menu_driver_data_own)
             return true;
+
          menu_driver_ctl(RARCH_MENU_CTL_PLAYLIST_FREE, NULL);
          menu_shader_manager_free();
 
          if (menu_driver_data)
          {
+            unsigned i;
+
+            scroll_acceleration       = 0;
+            menu_driver_selection_ptr = 0;
+            scroll_index_size         = 0;
+
+            for (i = 0; i < SCROLL_INDEX_SIZE; i++)
+               scroll_index_list[i] = 0;
+
             menu_input_ctl(MENU_INPUT_CTL_DEINIT, NULL);
-            menu_navigation_ctl(MENU_NAVIGATION_CTL_DEINIT, NULL);
 
             if (menu_driver_ctx && menu_driver_ctx->free)
                menu_driver_ctx->free(menu_userdata);
@@ -657,7 +1854,21 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
             menu_userdata = NULL;
 
             menu_driver_ctl(RARCH_MENU_CTL_SYSTEM_INFO_DEINIT, NULL);
-            menu_display_deinit();
+            if (menu_display_msg_queue)
+               msg_queue_free(menu_display_msg_queue);
+
+            video_coord_array_free(&menu_disp_ca);
+            menu_display_msg_queue       = NULL;
+            menu_display_msg_force       = false;
+            menu_display_header_height   = 0;
+            menu_disp                    = NULL;
+            menu_display_has_windowed    = false;
+
+            menu_animation_ctl(MENU_ANIMATION_CTL_DEINIT, NULL);
+
+            menu_display_framebuf_width  = 0;
+            menu_display_framebuf_height = 0;
+            menu_display_framebuf_pitch  = 0;
             menu_entries_ctl(MENU_ENTRIES_CTL_DEINIT, NULL);
 
             command_event(CMD_EVENT_HISTORY_DEINIT, NULL);
@@ -684,67 +1895,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
       case RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT:
          menu_driver_load_no_content = false;
          break;
-      case RARCH_MENU_CTL_NAVIGATION_SET:
-         {
-            bool *scroll = (bool*)data;
-
-            if (!scroll)
-               return false;
-            if (menu_driver_ctx->navigation_set)
-               menu_driver_ctx->navigation_set(menu_userdata, *scroll);
-         }
-         break;
-      case RARCH_MENU_CTL_NAVIGATION_SET_LAST:
-         if (menu_driver_ctx->navigation_set_last)
-            menu_driver_ctx->navigation_set_last(menu_userdata);
-         break;
-      case RARCH_MENU_CTL_NAVIGATION_ASCEND_ALPHABET:
-         {
-            size_t *ptr_out = (size_t*)data;
-
-            if (!ptr_out)
-               return false;
-
-            if (menu_driver_ctx->navigation_ascend_alphabet)
-               menu_driver_ctx->navigation_ascend_alphabet(
-                     menu_userdata, ptr_out);
-         }
-         break;
-      case RARCH_MENU_CTL_NAVIGATION_DESCEND_ALPHABET:
-         {
-            size_t *ptr_out = (size_t*)data;
-
-            if (!ptr_out)
-               return false;
-
-            if (menu_driver_ctx->navigation_descend_alphabet)
-               menu_driver_ctx->navigation_descend_alphabet(
-                     menu_userdata, ptr_out);
-         }
-         break;
-      case RARCH_MENU_CTL_NAVIGATION_CLEAR:
-         {
-            bool *pending_push = (bool*)data;
-
-            if (!pending_push)
-               return false;
-            if (menu_driver_ctx->navigation_clear)
-               menu_driver_ctx->navigation_clear(
-                     menu_userdata, pending_push);
-         }
-         break;
-      case RARCH_MENU_CTL_POPULATE_ENTRIES:
-         {
-            menu_displaylist_info_t *info = (menu_displaylist_info_t*)data;
-
-            if (!info)
-               return false;
-            if (menu_driver_ctx->populate_entries)
-               menu_driver_ctx->populate_entries(
-                     menu_userdata, info->path,
-                     info->label, info->type);
-         }
-         break;
       case RARCH_MENU_CTL_LIST_GET_ENTRY:
          {
             menu_ctx_list_t *list = (menu_ctx_list_t*)data;
@@ -798,26 +1948,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
             }
          }
          break;
-      case RARCH_MENU_CTL_LIST_PUSH:
-         {
-            menu_ctx_displaylist_t *disp_list = (menu_ctx_displaylist_t*)data;
-
-            if (menu_driver_ctx->list_push)
-               if (menu_driver_ctx->list_push(menu_driver_data,
-                        menu_userdata, disp_list->info, disp_list->type) == 0)
-                  return true;
-         }
-         return false;
-      case RARCH_MENU_CTL_TOGGLE:
-         {
-            bool *on = (bool*)data;
-            if (!on)
-               return false;
-
-            if (menu_driver_ctx && menu_driver_ctx->toggle)
-               menu_driver_ctx->toggle(menu_userdata, *on);
-         }
-         break;
       case RARCH_MENU_CTL_REFRESH:
          {
 #if 0
@@ -829,11 +1959,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
 #endif
          }
          break;
-      case RARCH_MENU_CTL_CONTEXT_DESTROY:
-         if (!menu_driver_ctx || !menu_driver_ctx->context_destroy)
-            return false;
-         menu_driver_ctx->context_destroy(menu_userdata);
-         break;
       case RARCH_MENU_CTL_LIST_SET_SELECTION:
          {
             file_list_t *list = (file_list_t*)data;
@@ -866,15 +1991,6 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
                   list->label, list->idx);
          }
          break;
-      case RARCH_MENU_CTL_LOAD_IMAGE:
-         {
-            menu_ctx_load_image_t *load_image_info =
-               (menu_ctx_load_image_t*)data;
-            if (!menu_driver_ctx || !menu_driver_ctx->load_image)
-               return false;
-            return menu_driver_ctx->load_image(menu_userdata,
-                  load_image_info->data, load_image_info->type);
-         }
       case RARCH_MENU_CTL_ENVIRONMENT:
          {
             menu_ctx_environment_t *menu_environ =
@@ -991,6 +2107,165 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
             menu_driver_ctx->update_savestate_thumbnail_image(menu_userdata);
          }
          break;
+      case MENU_NAVIGATION_CTL_CLEAR:
+         {
+            bool *pending_push = (bool*)data;
+
+            menu_navigation_set_selection(0);
+            menu_driver_navigation_set(true);
+
+            if (pending_push)
+               if (menu_driver_ctx->navigation_clear)
+                  menu_driver_ctx->navigation_clear(
+                        menu_userdata, pending_push);
+         }
+         break;
+      case MENU_NAVIGATION_CTL_INCREMENT:
+         {
+            settings_t *settings   = config_get_ptr();
+            unsigned scroll_speed  = *((unsigned*)data);
+            size_t  menu_list_size = menu_entries_get_size();
+            bool wraparound_enable = settings->bools.menu_navigation_wraparound_enable;
+
+            if (menu_driver_selection_ptr >= menu_list_size - 1
+                  && !wraparound_enable)
+               return false;
+
+            if ((menu_driver_selection_ptr + scroll_speed) < menu_list_size)
+            {
+               size_t idx  = menu_driver_selection_ptr + scroll_speed;
+
+               menu_navigation_set_selection(idx);
+               menu_driver_navigation_set(true);
+            }
+            else
+            {
+               if (wraparound_enable)
+               {
+                  bool pending_push = false;
+                  menu_driver_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
+               }
+               else if (menu_list_size > 0)
+                  menu_driver_ctl(MENU_NAVIGATION_CTL_SET_LAST,  NULL);
+            }
+            
+            if (menu_driver_ctx->navigation_increment)
+               menu_driver_ctx->navigation_increment(menu_userdata);
+         }
+         break;
+      case MENU_NAVIGATION_CTL_DECREMENT:
+         {
+            size_t idx             = 0;
+            settings_t *settings   = config_get_ptr();
+            unsigned scroll_speed  = *((unsigned*)data);
+            size_t  menu_list_size = menu_entries_get_size();
+            bool wraparound_enable = settings->bools.menu_navigation_wraparound_enable;
+
+            if (menu_driver_selection_ptr == 0 && !wraparound_enable)
+               return false;
+
+            if (menu_driver_selection_ptr >= scroll_speed)
+               idx = menu_driver_selection_ptr - scroll_speed;
+            else
+            {
+               idx  = menu_list_size - 1;
+               if (!wraparound_enable)
+                  idx = 0;
+            }
+
+            menu_navigation_set_selection(idx);
+            menu_driver_navigation_set(true);
+
+            if (menu_driver_ctx->navigation_decrement)
+               menu_driver_ctx->navigation_decrement(menu_userdata);
+         }
+         break;
+      case MENU_NAVIGATION_CTL_SET_LAST:
+         {
+            size_t menu_list_size = menu_entries_get_size();
+            size_t new_selection  = menu_list_size - 1;
+            menu_navigation_set_selection(new_selection);
+
+            if (menu_driver_ctx->navigation_set_last)
+               menu_driver_ctx->navigation_set_last(menu_userdata);
+         }
+         break;
+      case MENU_NAVIGATION_CTL_ASCEND_ALPHABET:
+         {
+            size_t i               = 0;
+            size_t  menu_list_size = menu_entries_get_size();
+
+            if (!scroll_index_size)
+               return false;
+
+            if (menu_driver_selection_ptr == scroll_index_list[scroll_index_size - 1])
+               menu_driver_selection_ptr = menu_list_size - 1;
+            else
+            {
+               while (i < scroll_index_size - 1
+                     && scroll_index_list[i + 1] <= menu_driver_selection_ptr)
+                  i++;
+               menu_driver_selection_ptr = scroll_index_list[i + 1];
+
+               if (menu_driver_selection_ptr >= menu_list_size)
+                  menu_driver_selection_ptr = menu_list_size - 1;
+            }
+
+            if (menu_driver_ctx->navigation_ascend_alphabet)
+               menu_driver_ctx->navigation_ascend_alphabet(
+                     menu_userdata, &menu_driver_selection_ptr);
+         }
+         break;
+      case MENU_NAVIGATION_CTL_DESCEND_ALPHABET:
+         {
+            size_t i        = 0;
+
+            if (!scroll_index_size)
+               return false;
+
+            if (menu_driver_selection_ptr == 0)
+               return false;
+
+            i   = scroll_index_size - 1;
+
+            while (i && scroll_index_list[i - 1] >= menu_driver_selection_ptr)
+               i--;
+
+            if (i > 0)
+               menu_driver_selection_ptr = scroll_index_list[i - 1];
+
+            if (menu_driver_ctx->navigation_descend_alphabet)
+               menu_driver_ctx->navigation_descend_alphabet(
+                     menu_userdata, &menu_driver_selection_ptr);
+         }
+         break;
+      case MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES:
+         scroll_index_size = 0;
+         break;
+      case MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX:
+         {
+            size_t *sel = (size_t*)data;
+            if (!sel)
+               return false;
+            scroll_index_list[scroll_index_size++] = *sel;
+         }
+         break;
+      case MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL:
+         {
+            size_t *sel = (size_t*)data;
+            if (!sel)
+               return false;
+            *sel = scroll_acceleration;
+         }
+         break;
+      case MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL:
+         {
+            size_t *sel = (size_t*)data;
+            if (!sel)
+               return false;
+            scroll_acceleration = (unsigned)(*sel);
+         }
+         break;
       default:
       case RARCH_MENU_CTL_NONE:
          break;
@@ -998,3 +2273,13 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
 
    return true;
 }
+
+size_t menu_navigation_get_selection(void)
+{
+   return menu_driver_selection_ptr;
+}
+
+void menu_navigation_set_selection(size_t val)
+{
+   menu_driver_selection_ptr = val;
+}
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 3013d1d763..2b6e747ae3 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -26,12 +26,16 @@
 
 #include <boolean.h>
 #include <retro_common_api.h>
+#include <gfx/math/matrix_4x4.h>
 
 #include "widgets/menu_entry.h"
 #include "menu_input.h"
 #include "menu_entries.h"
 
-#include "../gfx/video_shader_driver.h"
+#include "../gfx/video_driver.h"
+#include "../file_path_special.h"
+#include "../gfx/font_driver.h"
+#include "../gfx/video_coord_array.h"
 
 RETRO_BEGIN_DECLS
 
@@ -82,11 +86,6 @@ enum rarch_menu_ctl_state
 {
    RARCH_MENU_CTL_NONE = 0,
    RARCH_MENU_CTL_REFRESH,
-   RARCH_MENU_CTL_NAVIGATION_SET,
-   RARCH_MENU_CTL_NAVIGATION_CLEAR,
-   RARCH_MENU_CTL_NAVIGATION_SET_LAST,
-   RARCH_MENU_CTL_NAVIGATION_ASCEND_ALPHABET,
-   RARCH_MENU_CTL_NAVIGATION_DESCEND_ALPHABET,
    RARCH_MENU_CTL_SET_PENDING_QUICK_MENU,
    RARCH_MENU_CTL_SET_PENDING_QUIT,
    RARCH_MENU_CTL_SET_PENDING_SHUTDOWN,
@@ -110,11 +109,7 @@ enum rarch_menu_ctl_state
    RARCH_MENU_CTL_PLAYLIST_FREE,
    RARCH_MENU_CTL_PLAYLIST_INIT,
    RARCH_MENU_CTL_PLAYLIST_GET,
-   RARCH_MENU_CTL_TOGGLE,
-   RARCH_MENU_CTL_CONTEXT_DESTROY,
-   RARCH_MENU_CTL_POPULATE_ENTRIES,
    RARCH_MENU_CTL_FIND_DRIVER,
-   RARCH_MENU_CTL_LOAD_IMAGE,
    RARCH_MENU_CTL_LIST_FREE,
    RARCH_MENU_CTL_LIST_SET_SELECTION,
    RARCH_MENU_CTL_LIST_GET_SELECTION,
@@ -122,7 +117,6 @@ enum rarch_menu_ctl_state
    RARCH_MENU_CTL_LIST_GET_ENTRY,
    RARCH_MENU_CTL_LIST_CACHE,
    RARCH_MENU_CTL_LIST_INSERT,
-   RARCH_MENU_CTL_LIST_PUSH,
    RARCH_MENU_CTL_ENVIRONMENT,
    RARCH_MENU_CTL_DRIVER_DATA_GET,
    RARCH_MENU_CTL_POINTER_TAP,
@@ -133,7 +127,17 @@ enum rarch_menu_ctl_state
    RARCH_MENU_CTL_UPDATE_THUMBNAIL_PATH,
    RARCH_MENU_CTL_UPDATE_THUMBNAIL_IMAGE,
    RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_PATH,
-   RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_IMAGE
+   RARCH_MENU_CTL_UPDATE_SAVESTATE_THUMBNAIL_IMAGE,
+   MENU_NAVIGATION_CTL_CLEAR,
+   MENU_NAVIGATION_CTL_INCREMENT,
+   MENU_NAVIGATION_CTL_DECREMENT,
+   MENU_NAVIGATION_CTL_SET_LAST,
+   MENU_NAVIGATION_CTL_DESCEND_ALPHABET,
+   MENU_NAVIGATION_CTL_ASCEND_ALPHABET,
+   MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES,
+   MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX,
+   MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL,
+   MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL
 };
 
 enum menu_settings_type
@@ -206,6 +210,98 @@ enum menu_settings_type
    MENU_SETTINGS_LAST
 };
 
+enum materialui_color_theme
+{
+   MATERIALUI_THEME_BLUE = 0,
+   MATERIALUI_THEME_BLUE_GREY,
+   MATERIALUI_THEME_DARK_BLUE,
+   MATERIALUI_THEME_GREEN,
+   MATERIALUI_THEME_RED,
+   MATERIALUI_THEME_YELLOW,
+   MATERIALUI_THEME_NVIDIA_SHIELD,
+   MATERIALUI_THEME_LAST
+};
+
+enum xmb_color_theme
+{
+   XMB_THEME_LEGACY_RED  = 0,
+   XMB_THEME_DARK_PURPLE,
+   XMB_THEME_MIDNIGHT_BLUE,
+   XMB_THEME_GOLDEN,
+   XMB_THEME_ELECTRIC_BLUE,
+   XMB_THEME_APPLE_GREEN,
+   XMB_THEME_UNDERSEA,
+   XMB_THEME_VOLCANIC_RED,
+   XMB_THEME_DARK,
+   XMB_THEME_WALLPAPER,
+   XMB_THEME_LAST
+};
+
+enum xmb_icon_theme
+{
+   XMB_ICON_THEME_MONOCHROME = 0,
+   XMB_ICON_THEME_FLATUI,
+   XMB_ICON_THEME_RETROACTIVE,
+   XMB_ICON_THEME_PIXEL,
+   XMB_ICON_THEME_NEOACTIVE,
+   XMB_ICON_THEME_SYSTEMATIC,
+   XMB_ICON_THEME_DOTART,
+   XMB_ICON_THEME_CUSTOM,
+   XMB_ICON_THEME_LAST
+};
+
+enum xmb_shader_pipeline
+{
+   XMB_SHADER_PIPELINE_WALLPAPER = 0,
+   XMB_SHADER_PIPELINE_SIMPLE_RIBBON,
+   XMB_SHADER_PIPELINE_RIBBON,
+   XMB_SHADER_PIPELINE_SIMPLE_SNOW,
+   XMB_SHADER_PIPELINE_SNOW,
+   XMB_SHADER_PIPELINE_BOKEH,
+   XMB_SHADER_PIPELINE_LAST
+};
+
+enum menu_display_prim_type
+{
+   MENU_DISPLAY_PRIM_NONE = 0,
+   MENU_DISPLAY_PRIM_TRIANGLESTRIP,
+   MENU_DISPLAY_PRIM_TRIANGLES
+};
+
+enum menu_display_driver_type
+{
+   MENU_VIDEO_DRIVER_GENERIC = 0,
+   MENU_VIDEO_DRIVER_OPENGL,
+   MENU_VIDEO_DRIVER_VULKAN,
+   MENU_VIDEO_DRIVER_DIRECT3D,
+   MENU_VIDEO_DRIVER_VITA2D,
+   MENU_VIDEO_DRIVER_CTR,
+   MENU_VIDEO_DRIVER_CACA,
+   MENU_VIDEO_DRIVER_GDI,
+   MENU_VIDEO_DRIVER_VGA
+};
+
+enum menu_toggle_reason
+{
+  MENU_TOGGLE_REASON_NONE = 0,
+  MENU_TOGGLE_REASON_USER,
+  MENU_TOGGLE_REASON_MESSAGE
+};
+
+typedef struct menu_display_ctx_clearcolor
+{
+   float r;
+   float g;
+   float b;
+   float a;
+} menu_display_ctx_clearcolor_t;
+
+typedef struct menu_display_frame_info
+{
+   bool shadows_enable;
+} menu_display_frame_info_t;
+
+
 typedef struct
 {
    char deferred_path[PATH_MAX_LENGTH];
@@ -221,12 +317,63 @@ typedef struct
    char db_playlist_file[PATH_MAX_LENGTH];
 } menu_handle_t;
 
+typedef struct menu_display_ctx_draw
+{
+   float x;
+   float y;
+   unsigned width;
+   unsigned height;
+   struct video_coords *coords;
+   void *matrix_data;
+   uintptr_t texture;
+   enum menu_display_prim_type prim_type;
+   float *color;
+   const float *vertex;
+   const float *tex_coord;
+   size_t vertex_count;
+   struct
+   {
+      unsigned id;
+      const void *backend_data;
+      size_t backend_data_size;
+      bool active;
+   } pipeline;
+} menu_display_ctx_draw_t;
+
+typedef struct menu_display_ctx_rotate_draw
+{
+   math_matrix_4x4 *matrix;
+   float rotation;
+   float scale_x;
+   float scale_y;
+   float scale_z;
+   bool scale_enable;
+} menu_display_ctx_rotate_draw_t;
+
+typedef struct menu_display_ctx_coord_draw
+{
+   const float *ptr;
+} menu_display_ctx_coord_draw_t;
+
+typedef struct menu_display_ctx_datetime
+{
+   char *s;
+   size_t len;
+   unsigned time_mode;
+} menu_display_ctx_datetime_t;
+
+typedef struct menu_display_ctx_font
+{
+   const char *path;
+   float size;
+} menu_display_ctx_font_t;
+
 typedef struct menu_ctx_driver
 {
    void  (*set_texture)(void);
    void  (*render_messagebox)(void *data, const char *msg);
    int   (*iterate)(void *data, void *userdata, enum menu_action action);
-   void  (*render)(void *data);
+   void  (*render)(void *data, bool is_idle);
    void  (*frame)(void *data, video_frame_info_t *video_info);
    void* (*init)(void**, bool);
    void  (*free)(void*);
@@ -266,6 +413,8 @@ typedef struct menu_ctx_driver
          menu_entry_t *entry, unsigned action);
    void (*update_thumbnail_path)(void *data, unsigned i);
    void (*update_thumbnail_image)(void *data);
+   void (*set_thumbnail_system)(void *data, char* s, size_t len);
+   void (*set_thumbnail_content)(void *data, char* s, size_t len);
    int  (*osk_ptr_at_pos)(void *data, int x, int y, unsigned width, unsigned height);
    void (*update_savestate_thumbnail_path)(void *data, unsigned i);
    void (*update_savestate_thumbnail_image)(void *data);
@@ -379,7 +528,7 @@ extern unsigned int rdb_entry_start_game_selection_ptr;
 
 const char *menu_driver_ident(void);
 
-bool menu_driver_render(bool is_idle);
+bool menu_driver_render(bool is_idle, bool is_inited, bool is_dummy);
 
 bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data);
 
@@ -397,12 +546,157 @@ bool menu_driver_iterate(menu_ctx_iterate_t *iterate);
 
 bool menu_driver_list_clear(void *data);
 
-void menu_driver_increment_navigation(void);
+void menu_driver_navigation_set(bool scroll);
 
-void menu_driver_decrement_navigation(void);
+void menu_driver_populate_entries(menu_displaylist_info_t *info);
+
+bool menu_driver_load_image(menu_ctx_load_image_t *load_image_info);
+
+bool menu_driver_push_list(menu_ctx_displaylist_t *disp_list);
 
 bool menu_driver_init(bool video_is_threaded);
 
+void menu_driver_set_thumbnail_system(char *s, size_t len);
+
+void menu_driver_set_thumbnail_content(char *s, size_t len);
+
+size_t menu_navigation_get_selection(void);
+
+void menu_navigation_set_selection(size_t val);
+
+typedef struct menu_display_ctx_driver
+{
+   void (*draw)(void *data);
+   void (*draw_pipeline)(void *data);
+   void (*viewport)(void *data);
+   void (*blend_begin)(void);
+   void (*blend_end)(void);
+   void (*restore_clear_color)(void);
+   void (*clear_color)(menu_display_ctx_clearcolor_t *clearcolor);
+   void *(*get_default_mvp)(void);
+   const float *(*get_default_vertices)(void);
+   const float *(*get_default_tex_coords)(void);
+   bool (*font_init_first)(
+         void **font_handle, void *video_data,
+         const char *font_path, float font_size,
+         bool is_threaded);
+   enum menu_display_driver_type type;
+   const char *ident;
+} menu_display_ctx_driver_t;
+
+typedef uintptr_t menu_texture_item;
+
+enum menu_toggle_reason menu_display_toggle_get_reason(void);
+void menu_display_toggle_set_reason(enum menu_toggle_reason reason);
+
+void menu_display_blend_begin(void);
+void menu_display_blend_end(void);
+
+void menu_display_font_free(font_data_t *font);
+void menu_display_font_bind_block(font_data_t *font, void *block);
+bool menu_display_font_flush_block(unsigned width, unsigned height, font_data_t *font);
+
+void menu_display_coords_array_reset(void);
+video_coord_array_t *menu_display_get_coords_array(void);
+const uint8_t *menu_display_get_font_framebuffer(void);
+void menu_display_set_font_framebuffer(const uint8_t *buffer);
+bool menu_display_libretro(bool is_idle, bool is_inited, bool is_dummy);
+
+void menu_display_set_width(unsigned width);
+void menu_display_get_fb_size(unsigned *fb_width, unsigned *fb_height,
+      size_t *fb_pitch);
+void menu_display_set_height(unsigned height);
+void menu_display_set_header_height(unsigned height);
+unsigned menu_display_get_header_height(void);
+size_t menu_display_get_framebuffer_pitch(void);
+void menu_display_set_framebuffer_pitch(size_t pitch);
+
+bool menu_display_get_msg_force(void);
+void menu_display_set_msg_force(bool state);
+bool menu_display_get_font_data_init(void);
+void menu_display_set_font_data_init(bool state);
+bool menu_display_get_update_pending(void);
+void menu_display_set_viewport(unsigned width, unsigned height);
+void menu_display_unset_viewport(unsigned width, unsigned height);
+bool menu_display_get_framebuffer_dirty_flag(void);
+void menu_display_set_framebuffer_dirty_flag(void);
+void menu_display_unset_framebuffer_dirty_flag(void);
+float menu_display_get_dpi(void);
+bool menu_display_init_first_driver(bool video_is_threaded);
+bool menu_display_restore_clear_color(void);
+void menu_display_clear_color(menu_display_ctx_clearcolor_t *color);
+void menu_display_draw(menu_display_ctx_draw_t *draw);
+
+void menu_display_draw_pipeline(menu_display_ctx_draw_t *draw);
+void menu_display_draw_bg(
+      menu_display_ctx_draw_t *draw,
+      video_frame_info_t *video_info,
+      bool add_opacity);
+void menu_display_draw_gradient(
+      menu_display_ctx_draw_t *draw,
+      video_frame_info_t *video_info);
+void menu_display_draw_quad(int x, int y, unsigned w, unsigned h,
+      unsigned width, unsigned height,
+      float *color);
+void menu_display_draw_texture(int x, int y, unsigned w, unsigned h,
+      unsigned width, unsigned height,
+      float *color, uintptr_t texture);
+void menu_display_draw_texture_slice(int x, int y, unsigned w, unsigned h,
+      unsigned new_w, unsigned new_h, unsigned width, unsigned height,
+      float *color, unsigned offset, float scale_factor, uintptr_t texture);
+void menu_display_rotate_z(menu_display_ctx_rotate_draw_t *draw);
+bool menu_display_get_tex_coords(menu_display_ctx_coord_draw_t *draw);
+
+void menu_display_timedate(menu_display_ctx_datetime_t *datetime);
+
+void menu_display_handle_wallpaper_upload(void *task_data,
+      void *user_data, const char *err);
+
+void menu_display_handle_thumbnail_upload(void *task_data,
+      void *user_data, const char *err);
+
+void menu_display_handle_savestate_thumbnail_upload(void *task_data,
+      void *user_data, const char *err);
+
+void menu_display_push_quad(
+      unsigned width, unsigned height,
+      const float *colors, int x1, int y1,
+      int x2, int y2);
+
+void menu_display_snow(int width, int height);
+
+void menu_display_allocate_white_texture(void);
+
+void menu_display_draw_cursor(
+      float *color, float cursor_size, uintptr_t texture,
+      float x, float y, unsigned width, unsigned height);
+
+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);
+
+void menu_display_set_alpha(float *color, float alpha_value);
+
+font_data_t *menu_display_font(enum application_special_type type, float font_size,
+      bool video_is_threaded);
+
+void menu_display_reset_textures_list(const char *texture_path, const char *iconpath,
+      uintptr_t *item, enum texture_filter_type filter_type);
+
+extern uintptr_t menu_display_white_texture;
+
+extern menu_display_ctx_driver_t menu_display_ctx_gl;
+extern menu_display_ctx_driver_t menu_display_ctx_vulkan;
+extern menu_display_ctx_driver_t menu_display_ctx_d3d;
+extern menu_display_ctx_driver_t menu_display_ctx_vita2d;
+extern menu_display_ctx_driver_t menu_display_ctx_ctr;
+extern menu_display_ctx_driver_t menu_display_ctx_caca;
+extern menu_display_ctx_driver_t menu_display_ctx_gdi;
+extern menu_display_ctx_driver_t menu_display_ctx_vga;
+extern menu_display_ctx_driver_t menu_display_ctx_null;
+
 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 413e7f745f..00a82fda3f 100644
--- a/menu/menu_entries.c
+++ b/menu/menu_entries.c
@@ -22,12 +22,11 @@
 
 #include "menu_driver.h"
 #include "menu_cbs.h"
-#include "menu_navigation.h"
 
 #include "widgets/menu_list.h"
 
 #include "../core.h"
-#include "../runloop.h"
+#include "../retroarch.h"
 #include "../version.h"
 
 void menu_entries_get_at_offset(const file_list_t *list, size_t idx,
@@ -144,8 +143,8 @@ static void menu_entries_build_scroll_indices(file_list_t *list)
    if (!list || !list->size)
       return;
 
-   menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES, NULL);
-   menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &scroll_value);
+   menu_driver_ctl(MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES, NULL);
+   menu_driver_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &scroll_value);
 
    current        = menu_entries_elem_get_first_char(list, 0);
    current_is_dir = menu_entries_elem_is_dir(list, 0);
@@ -156,7 +155,7 @@ static void menu_entries_build_scroll_indices(file_list_t *list)
       bool is_dir = menu_entries_elem_is_dir(list, (unsigned)i);
 
       if ((current_is_dir && !is_dir) || (first > current))
-         menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &i);
+         menu_driver_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &i);
 
       current        = first;
       current_is_dir = is_dir;
@@ -164,7 +163,7 @@ static void menu_entries_build_scroll_indices(file_list_t *list)
 
 
    scroll_value = list->size - 1;
-   menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &scroll_value);
+   menu_driver_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &scroll_value);
 }
 
 /**
@@ -187,14 +186,13 @@ static bool menu_entries_refresh(void *data)
    if ((selection >= list_size) && list_size)
    {
       size_t idx  = list_size - 1;
-      bool scroll = true;
       menu_navigation_set_selection(idx);
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
+      menu_driver_navigation_set(true);
    }
    else if (!list_size)
    {
       bool pending_push = true;
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
+      menu_driver_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
    }
 
    return true;
diff --git a/menu/menu_event.c b/menu/menu_event.c
index a0b3d64d96..a20a9344f6 100644
--- a/menu/menu_event.c
+++ b/menu/menu_event.c
@@ -31,11 +31,9 @@
 
 #include "menu_driver.h"
 #include "menu_animation.h"
-#include "menu_display.h"
-#include "menu_navigation.h"
 
 #include "../configuration.h"
-#include "../runloop_defines.h"
+#include "../retroarch.h"
 #include "../tasks/tasks_internal.h"
 
 static unsigned char menu_keyboard_key_state[RETROK_LAST] = {0};
@@ -162,7 +160,7 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
          first_held           = false;
          trigger_input |= input & input_repeat;
 
-         menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL,
+         menu_driver_ctl(MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL,
                &new_scroll_accel);
 
          new_scroll_accel = MIN(new_scroll_accel + 1, 64);
@@ -178,7 +176,7 @@ unsigned menu_event(uint64_t input, uint64_t trigger_input)
    }
 
    if (set_scroll)
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL,
+      menu_driver_ctl(MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL,
             &new_scroll_accel);
 
    menu_animation_ctl(MENU_ANIMATION_CTL_DELTA_TIME, &delta_time);
diff --git a/menu/menu_input.c b/menu/menu_input.c
index 5b44e0da88..0a9488fddb 100644
--- a/menu/menu_input.c
+++ b/menu/menu_input.c
@@ -30,7 +30,6 @@
 #include "menu_driver.h"
 #include "menu_input.h"
 #include "menu_animation.h"
-#include "menu_navigation.h"
 #include "menu_event.h"
 
 #include "../configuration.h"
@@ -288,13 +287,13 @@ static int menu_input_mouse_frame(
    if (BIT64_GET(mouse_state, MENU_MOUSE_ACTION_WHEEL_DOWN))
    {
       unsigned increment_by = 1;
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_INCREMENT, &increment_by);
+      menu_driver_ctl(MENU_NAVIGATION_CTL_INCREMENT, &increment_by);
    }
 
    if (BIT64_GET(mouse_state, MENU_MOUSE_ACTION_WHEEL_UP))
    {
       unsigned decrement_by = 1;
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_DECREMENT, &decrement_by);
+      menu_driver_ctl(MENU_NAVIGATION_CTL_DECREMENT, &decrement_by);
    }
 
    if (BIT64_GET(mouse_state, MENU_MOUSE_ACTION_HORIZ_WHEEL_UP))
@@ -436,8 +435,6 @@ static int menu_input_pointer_post_iterate(
       metrics.type  = DISPLAY_METRIC_DPI;
       metrics.value = &dpi;
 
-      video_context_driver_get_metrics(&metrics);
-
       menu_input->pointer.counter++;
 
       if (menu_input->pointer.counter == 1 &&
@@ -466,23 +463,26 @@ static int menu_input_pointer_post_iterate(
          pointer_old_y                     = pointer_y;
          pointer_oldpressed[0]             = true;
       }
-      else if (abs(pointer_x - start_x) > (dpi / 10)
-            || abs(pointer_y - start_y) > (dpi / 10))
+      else if (video_context_driver_get_metrics(&metrics))
       {
-         float s, delta_time;
+         if (abs(pointer_x - start_x) > (dpi / 10)
+               || abs(pointer_y - start_y) > (dpi / 10))
+         {
+            float s, delta_time;
 
-         menu_input_ctl(MENU_INPUT_CTL_SET_POINTER_DRAGGED, NULL);
-         menu_input->pointer.dx            = pointer_x - pointer_old_x;
-         menu_input->pointer.dy            = pointer_y - pointer_old_y;
-         pointer_old_x                     = pointer_x;
-         pointer_old_y                     = pointer_y;
+            menu_input_ctl(MENU_INPUT_CTL_SET_POINTER_DRAGGED, NULL);
+            menu_input->pointer.dx            = pointer_x - pointer_old_x;
+            menu_input->pointer.dy            = pointer_y - pointer_old_y;
+            pointer_old_x                     = pointer_x;
+            pointer_old_y                     = pointer_y;
 
-         menu_animation_ctl(MENU_ANIMATION_CTL_DELTA_TIME, &delta_time);
+            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;
-         accel1                    = menu_input->pointer.accel;
+            s = menu_input->pointer.dy;
+            menu_input->pointer.accel = (accel0 + accel1 + s) / 3;
+            accel0                    = accel1;
+            accel1                    = menu_input->pointer.accel;
+         }
       }
    }
    else
diff --git a/menu/menu_input.h b/menu/menu_input.h
index 7efac468f3..8f7d982512 100644
--- a/menu/menu_input.h
+++ b/menu/menu_input.h
@@ -18,11 +18,9 @@
 #ifndef _MENU_INPUT_H
 #define _MENU_INPUT_H
 
+#include <stdint.h>
 #include <retro_common_api.h>
 
-#include "../input/input_driver.h"
-#include "../input/input_keyboard.h"
-
 RETRO_BEGIN_DECLS
 
 enum menu_action
diff --git a/menu/menu_navigation.c b/menu/menu_navigation.c
deleted file mode 100644
index 0b11918795..0000000000
--- a/menu/menu_navigation.c
+++ /dev/null
@@ -1,237 +0,0 @@
-/*  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 <stddef.h>
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#include <boolean.h>
-
-#include "../configuration.h"
-#include "menu_driver.h"
-#include "menu_navigation.h"
-
-static size_t selection_ptr            = 0;
-
-size_t menu_navigation_get_selection(void)
-{
-   return selection_ptr;
-}
-
-void menu_navigation_set_selection(size_t val)
-{
-   selection_ptr = val;
-}
-
-bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
-{
-   /* Quick jumping indices with L/R.
-    * Rebuilt when parsing directory. */
-   static struct scroll_indices
-   {
-      size_t list[2 * (26 + 2) + 1];
-      unsigned size;
-   } scroll_index;
-   static unsigned scroll_acceleration    = 0;
-
-   switch (state)
-   {
-      case MENU_NAVIGATION_CTL_DEINIT:
-         scroll_acceleration = 0;
-         selection_ptr       = 0;
-         memset(&scroll_index, 0, sizeof(struct scroll_indices));
-         break;
-      case MENU_NAVIGATION_CTL_CLEAR:
-         {
-            bool scroll        = true;
-            menu_navigation_set_selection(0);
-            menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
-            menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_CLEAR, data);
-         }
-         break;
-      case MENU_NAVIGATION_CTL_INCREMENT:
-         {
-            settings_t *settings   = config_get_ptr();
-            unsigned *scroll_speed = (unsigned*)data;
-            size_t  menu_list_size = menu_entries_get_size();
-            bool wraparound_enable = settings->bools.menu_navigation_wraparound_enable;
-
-            if (!scroll_speed)
-               return false;
-
-            if (selection_ptr >= menu_list_size - 1
-                  && !wraparound_enable)
-               return false;
-
-            if ((selection_ptr + (*scroll_speed)) < menu_list_size)
-            {
-               size_t idx  = selection_ptr + (*scroll_speed);
-               bool scroll = true;
-
-               menu_navigation_set_selection(idx);
-               menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
-               menu_navigation_ctl(MENU_NAVIGATION_CTL_INCREMENT, NULL);
-            }
-            else
-            {
-               if (wraparound_enable)
-               {
-                  bool pending_push = false;
-                  menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR, &pending_push);
-               }
-               else
-               {
-                  if (menu_list_size > 0)
-                  {
-                     menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_LAST,  NULL);
-                     menu_navigation_ctl(MENU_NAVIGATION_CTL_INCREMENT, NULL);
-                  }
-               }
-            }
-            
-            menu_driver_increment_navigation();
-         }
-         break;
-      case MENU_NAVIGATION_CTL_DECREMENT:
-         {
-            size_t idx             = 0;
-            bool scroll            = true;
-            settings_t *settings   = config_get_ptr();
-            unsigned *scroll_speed = (unsigned*)data;
-            size_t  menu_list_size = menu_entries_get_size();
-            bool wraparound_enable = settings->bools.menu_navigation_wraparound_enable;
-
-            if (!scroll_speed)
-               return false;
-
-            if (selection_ptr == 0 && !wraparound_enable)
-               return false;
-
-            if (selection_ptr >= *scroll_speed)
-               idx = selection_ptr - *scroll_speed;
-            else
-            {
-               idx  = menu_list_size - 1;
-               if (!wraparound_enable)
-                  idx = 0;
-            }
-
-            menu_navigation_set_selection(idx);
-            menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
-            menu_navigation_ctl(MENU_NAVIGATION_CTL_DECREMENT, NULL);
-
-            menu_driver_decrement_navigation();
-
-         }
-         break;
-      case MENU_NAVIGATION_CTL_SET:
-         menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, data);
-         break;
-      case MENU_NAVIGATION_CTL_SET_LAST:
-         {
-            size_t  menu_list_size = menu_entries_get_size();
-            size_t new_selection = menu_list_size - 1;
-            menu_navigation_set_selection(new_selection);
-            menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET_LAST, NULL);
-         }
-         break;
-      case MENU_NAVIGATION_CTL_ASCEND_ALPHABET:
-         {
-            size_t i = 0, ptr;
-            size_t *ptr_out        = (size_t*)&selection_ptr;
-            size_t  menu_list_size = menu_entries_get_size();
-
-            if (!scroll_index.size || !ptr_out)
-               return false;
-
-            ptr = *ptr_out;
-
-            if (ptr == scroll_index.list[scroll_index.size - 1])
-            {
-               *ptr_out = menu_list_size - 1;
-               menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_ASCEND_ALPHABET, ptr_out);
-               return true;
-            }
-
-            while (i < scroll_index.size - 1
-                  && scroll_index.list[i + 1] <= ptr)
-               i++;
-            *ptr_out = scroll_index.list[i + 1];
-
-            if (*ptr_out >= menu_list_size)
-               *ptr_out = menu_list_size - 1;
-
-            menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_ASCEND_ALPHABET, ptr_out);
-         }
-         break;
-      case MENU_NAVIGATION_CTL_DESCEND_ALPHABET:
-         {
-            size_t i = 0, ptr;
-            size_t *ptr_out = (size_t*)&selection_ptr;
-
-            if (!scroll_index.size || !ptr_out)
-               return false;
-
-            ptr = *ptr_out;
-
-            if (ptr == 0)
-               return false;
-
-            i   = scroll_index.size - 1;
-
-            while (i && scroll_index.list[i - 1] >= ptr)
-               i--;
-            *ptr_out = scroll_index.list[i - 1];
-
-            menu_driver_ctl(
-                  RARCH_MENU_CTL_NAVIGATION_DESCEND_ALPHABET, ptr_out);
-         }
-         break;
-      case MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES:
-         scroll_index.size = 0;
-         break;
-      case MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX:
-         {
-            size_t *sel = (size_t*)data;
-            if (!sel)
-               return false;
-            scroll_index.list[scroll_index.size++] = *sel;
-         }
-         break;
-      case MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL:
-         {
-            size_t *sel = (size_t*)data;
-            if (!sel)
-               return false;
-            *sel = scroll_acceleration;
-         }
-         break;
-      case MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL:
-         {
-            size_t *sel = (size_t*)data;
-            if (!sel)
-               return false;
-            scroll_acceleration = (unsigned)(*sel);
-         }
-         break;
-      case MENU_NAVIGATION_CTL_NONE:
-         break;
-   }
-
-   return true;
-}
diff --git a/menu/menu_navigation.h b/menu/menu_navigation.h
deleted file mode 100644
index ff96f03ce8..0000000000
--- a/menu/menu_navigation.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*  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 _MENU_NAVIGATION_H
-#define _MENU_NAVIGATION_H
-
-#include <stddef.h>
-
-#include <boolean.h>
-#include <retro_common_api.h>
-
-RETRO_BEGIN_DECLS
-
-enum menu_navigation_ctl_state
-{
-   MENU_NAVIGATION_CTL_NONE = 0,
-   MENU_NAVIGATION_CTL_CLEAR,
-   MENU_NAVIGATION_CTL_DEINIT,
-   MENU_NAVIGATION_CTL_INCREMENT,
-   MENU_NAVIGATION_CTL_DECREMENT,
-   MENU_NAVIGATION_CTL_SET,
-   MENU_NAVIGATION_CTL_SET_LAST,
-   MENU_NAVIGATION_CTL_DESCEND_ALPHABET,
-   MENU_NAVIGATION_CTL_ASCEND_ALPHABET,
-   MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES,
-   MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX,
-   MENU_NAVIGATION_CTL_SET_SCROLL_ACCEL,
-   MENU_NAVIGATION_CTL_GET_SCROLL_ACCEL
-};
-
-size_t menu_navigation_get_selection(void);
-
-void menu_navigation_set_selection(size_t val);
-
-bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 79b841c595..08982b2e13 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -54,9 +54,7 @@
 #include "menu_setting.h"
 #include "menu_driver.h"
 #include "menu_animation.h"
-#include "menu_display.h"
 #include "menu_input.h"
-#include "menu_navigation.h"
 
 #include "../core.h"
 #include "../configuration.h"
@@ -67,7 +65,6 @@
 #include "../paths.h"
 #include "../dynamic.h"
 #include "../list_special.h"
-#include "../runloop.h"
 #include "../verbosity.h"
 #include "../camera/camera_driver.h"
 #include "../wifi/wifi_driver.h"
@@ -513,7 +510,6 @@ static void setting_get_string_representation_uint_user_language(void *data,
       char *s, size_t len)
 {
    const char *modes[RETRO_LANGUAGE_LAST];
-   settings_t      *settings = config_get_ptr();
 
    modes[RETRO_LANGUAGE_ENGLISH]                = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_ENGLISH);
    modes[RETRO_LANGUAGE_JAPANESE]               = msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LANG_JAPANESE);
@@ -532,8 +528,7 @@ static void setting_get_string_representation_uint_user_language(void *data,
    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);
 
-   if (settings)
-      strlcpy(s, modes[settings->uints.user_language], len);
+   strlcpy(s, modes[*msg_hash_get_uint(MSG_HASH_USER_LANGUAGE)], len);
 }
 #endif
 
@@ -1246,6 +1241,7 @@ static int setting_action_left_bind_device(void *data, bool wraparound)
 {
    unsigned index_offset;
    unsigned               *p = NULL;
+   unsigned max_users        = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
    rarch_setting_t *setting  = (rarch_setting_t*)data;
    settings_t      *settings = config_get_ptr();
 
@@ -1256,8 +1252,8 @@ static int setting_action_left_bind_device(void *data, bool wraparound)
 
    p = &settings->uints.input_joypad_map[index_offset];
 
-   if ((*p) >= settings->uints.input_max_users)
-      *p = settings->uints.input_max_users - 1;
+   if ((*p) >= max_users)
+      *p = max_users - 1;
    else if ((*p) > 0)
       (*p)--;
 
@@ -1268,6 +1264,7 @@ static int setting_action_right_bind_device(void *data, bool wraparound)
 {
    unsigned index_offset;
    unsigned               *p = NULL;
+   unsigned max_users        = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
    rarch_setting_t *setting  = (rarch_setting_t*)data;
    settings_t      *settings = config_get_ptr();
 
@@ -1278,7 +1275,7 @@ static int setting_action_right_bind_device(void *data, bool wraparound)
 
    p = &settings->uints.input_joypad_map[index_offset];
 
-   if (*p < settings->uints.input_max_users)
+   if (*p < max_users)
       (*p)++;
 
    return 0;
@@ -1405,6 +1402,7 @@ static void get_string_representation_bind_device(void * data, char *s,
       size_t len)
 {
    unsigned index_offset, map = 0;
+   unsigned max_users        = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
    rarch_setting_t *setting  = (rarch_setting_t*)data;
    settings_t      *settings = config_get_ptr();
 
@@ -1414,7 +1412,7 @@ static void get_string_representation_bind_device(void * data, char *s,
    index_offset = setting->index_offset;
    map          = settings->uints.input_joypad_map[index_offset];
 
-   if (map < settings->uints.input_max_users)
+   if (map < max_users)
    {
       const char *device_name = input_config_get_device_name(map);
 
@@ -1642,21 +1640,19 @@ void general_write_handler(void *data)
          settings->uints.input_joypad_map[4] = *setting->value.target.integer;
          break;
       case MENU_ENUM_LABEL_LOG_VERBOSITY:
-         {
-            if (setting 
-                  && setting->value.target.boolean 
-                  && *setting->value.target.boolean)
-               verbosity_enable();
-            else
-               verbosity_disable();
+         if (setting 
+               && setting->value.target.boolean 
+               && *setting->value.target.boolean)
+            verbosity_enable();
+         else
+            verbosity_disable();
 
-            if (setting 
-                  && setting->value.target.boolean
-                  && *setting->value.target.boolean)
-               retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL);
-            else
-               retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL);
-         }
+         if (setting 
+               && setting->value.target.boolean
+               && *setting->value.target.boolean)
+            retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL);
+         else
+            retroarch_override_setting_unset(RARCH_OVERRIDE_SETTING_VERBOSITY, NULL);
          break;
       case MENU_ENUM_LABEL_VIDEO_SMOOTH:
          video_driver_set_filtering(1, settings->bools.video_smooth);
@@ -2232,7 +2228,7 @@ static bool setting_append_list(
                   parent_group);
          }
 
-         if (memcmp(settings->arrays.menu_driver, "xmb", 3) != 0)
+         if (string_is_not_equal_fast(settings->arrays.menu_driver, "xmb", 3))
          {
             CONFIG_ACTION(
                   list, list_info,
@@ -2553,7 +2549,7 @@ static bool setting_append_list(
                parent_group);
          settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
 
-         if (memcmp(settings->arrays.wifi_driver, "null", 4) != 0)
+         if (string_is_not_equal_fast(settings->arrays.wifi_driver, "null", 4))
          {
             CONFIG_ACTION(
                   list, list_info,
@@ -2916,7 +2912,7 @@ static bool setting_append_list(
             START_SUB_GROUP(list, list_info, "Performance Counters", &group_info, &subgroup_info,
                   parent_group);
 
-            runloop_ctl(RUNLOOP_CTL_GET_PERFCNT, &tmp_b);
+            rarch_ctl(RARCH_CTL_GET_PERFCNT, &tmp_b);
 
             CONFIG_BOOL(
                   list, list_info,
@@ -3251,7 +3247,7 @@ static bool setting_append_list(
                &setting_get_string_representation_st_float_video_refresh_rate_auto;
             settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
 
-            if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+            if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
             {
                CONFIG_BOOL(
                      list, list_info,
@@ -3605,7 +3601,7 @@ static bool setting_append_list(
             settings_data_list_current_add_flags(list, list_info, SD_FLAG_CMD_APPLY_AUTO);
             settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
 
-            if (memcmp(settings->arrays.video_driver, "gl", 2) == 0)
+            if (string_is_equal_fast(settings->arrays.video_driver, "gl", 2))
             {
                CONFIG_BOOL(
                      list, list_info,
@@ -3971,7 +3967,7 @@ static bool setting_append_list(
          settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
 
 #ifdef HAVE_WASAPI
-         if (memcmp(settings->arrays.audio_driver, "wasapi", 6) == 0)
+         if (string_is_equal_fast(settings->arrays.audio_driver, "wasapi", 6))
          {
             CONFIG_BOOL(
                   list, list_info,
@@ -4037,7 +4033,7 @@ static bool setting_append_list(
 
             CONFIG_UINT(
                   list, list_info,
-                  &settings->uints.input_max_users,
+                  input_driver_get_uint(INPUT_ACTION_MAX_USERS),
                   MENU_ENUM_LABEL_INPUT_MAX_USERS,
                   MENU_ENUM_LABEL_VALUE_INPUT_MAX_USERS,
                   input_max_users,
@@ -4286,7 +4282,7 @@ static bool setting_append_list(
 
             CONFIG_FLOAT(
                   list, list_info,
-                  &settings->floats.input_axis_threshold,
+                  input_driver_get_float(INPUT_ACTION_AXIS_THRESHOLD),
                   MENU_ENUM_LABEL_INPUT_AXIS_THRESHOLD,
                   MENU_ENUM_LABEL_VALUE_INPUT_AXIS_THRESHOLD,
                   axis_threshold,
@@ -4791,7 +4787,7 @@ static bool setting_append_list(
 
          START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group);
 
-         if (memcmp(settings->arrays.menu_driver, "rgui", 4) != 0)
+         if (string_is_not_equal_fast(settings->arrays.menu_driver, "rgui", 4))
          {
             CONFIG_PATH(
                   list, list_info,
@@ -4823,7 +4819,7 @@ static bool setting_append_list(
             settings_data_list_current_add_flags(list, list_info, SD_FLAG_LAKKA_ADVANCED);
          }
 
-         if (memcmp(settings->arrays.menu_driver, "xmb", 3) == 0)
+         if (string_is_equal_fast(settings->arrays.menu_driver, "xmb", 3))
          {
             CONFIG_BOOL(
                   list, list_info,
@@ -5023,7 +5019,7 @@ static bool setting_append_list(
          START_SUB_GROUP(list, list_info, "Display", &group_info, &subgroup_info, parent_group);
 
          /* only GLUI uses these values, don't show them on other drivers */
-         if (memcmp(settings->arrays.menu_driver, "glui", 4) == 0)
+         if (string_is_equal_fast(settings->arrays.menu_driver, "glui", 4))
          {
             CONFIG_BOOL(
                   list, list_info,
@@ -5056,7 +5052,7 @@ static bool setting_append_list(
 
 #ifdef HAVE_XMB
          /* only XMB uses these values, don't show them on other drivers */
-         if (memcmp(settings->arrays.menu_driver, "xmb", 3) == 0)
+         if (string_is_equal_fast(settings->arrays.menu_driver, "xmb", 3))
          {
             CONFIG_UINT(
                   list, list_info,
@@ -5277,7 +5273,7 @@ static bool setting_append_list(
 
 #ifdef HAVE_MATERIALUI
          /* only MaterialUI uses these values, don't show them on other drivers */
-         if (memcmp(settings->arrays.menu_driver, "glui", 4) == 0)
+         if (string_is_equal_fast(settings->arrays.menu_driver, "glui", 4))
          {
             CONFIG_UINT(
                   list, list_info,
@@ -5337,7 +5333,7 @@ static bool setting_append_list(
                general_read_handler,
                SD_FLAG_ADVANCED);
 
-         if (memcmp(settings->arrays.menu_driver, "xmb", 3) == 0)
+         if (string_is_equal_fast(settings->arrays.menu_driver, "xmb", 3))
          {
             CONFIG_UINT(
                   list, list_info,
@@ -5437,7 +5433,7 @@ static bool setting_append_list(
 
          START_SUB_GROUP(list, list_info, "State", &group_info, &subgroup_info, parent_group);
 
-         if (memcmp(settings->arrays.record_driver, "null", 4) != 0)
+         if (string_is_not_equal_fast(settings->arrays.record_driver, "null", 4))
          {
             CONFIG_BOOL(
                   list, list_info,
@@ -5518,7 +5514,7 @@ static bool setting_append_list(
          menu_settings_list_current_add_cmd(list, list_info, CMD_EVENT_REINIT);
 #endif
 
-         if (memcmp(ui_companion_driver_get_ident(), "null", 4) != 0)
+         if (string_is_not_equal_fast(ui_companion_driver_get_ident(), "null", 4))
          {
             CONFIG_BOOL(
                   list, list_info,
@@ -6055,31 +6051,34 @@ static bool setting_append_list(
             settings_data_list_current_add_flags(list, list_info, SD_FLAG_ADVANCED);
             /* TODO/FIXME - add enum_idx */
 
-            for(user = 0; user < settings->uints.input_max_users; user++)
             {
-               char s1[64], s2[64];
+               unsigned max_users        = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
+               for(user = 0; user < max_users; user++)
+               {
+                  char s1[64], s2[64];
 
-               snprintf(s1, sizeof(s1), "%s_user_p%d", msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_REMOTE_ENABLE), user + 1);
-               snprintf(s2, sizeof(s2), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETWORK_USER_REMOTE_ENABLE), user + 1);
+                  snprintf(s1, sizeof(s1), "%s_user_p%d", msg_hash_to_str(MENU_ENUM_LABEL_NETWORK_REMOTE_ENABLE), user + 1);
+                  snprintf(s2, sizeof(s2), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NETWORK_USER_REMOTE_ENABLE), user + 1);
 
 
-               CONFIG_BOOL_ALT(
-                     list, list_info,
-                     &settings->bools.network_remote_enable_user[user],
-                     /* todo: figure out this value, it's working fine but I don't think this is correct */
-                     strdup(s1),
-                     strdup(s2),
-                     false,
-                     MENU_ENUM_LABEL_VALUE_OFF,
-                     MENU_ENUM_LABEL_VALUE_ON,
-                     &group_info,
-                     &subgroup_info,
-                     parent_group,
-                     general_write_handler,
-                     general_read_handler,
-                     SD_FLAG_ADVANCED);
-               settings_data_list_current_add_free_flags(list, list_info, SD_FREE_FLAG_NAME | SD_FREE_FLAG_SHORT);
-               menu_settings_list_current_add_enum_idx(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_NETWORK_REMOTE_USER_1_ENABLE + user));
+                  CONFIG_BOOL_ALT(
+                        list, list_info,
+                        &settings->bools.network_remote_enable_user[user],
+                        /* todo: figure out this value, it's working fine but I don't think this is correct */
+                        strdup(s1),
+                        strdup(s2),
+                        false,
+                        MENU_ENUM_LABEL_VALUE_OFF,
+                        MENU_ENUM_LABEL_VALUE_ON,
+                        &group_info,
+                        &subgroup_info,
+                        parent_group,
+                        general_write_handler,
+                        general_read_handler,
+                        SD_FLAG_ADVANCED);
+                  settings_data_list_current_add_free_flags(list, list_info, SD_FREE_FLAG_NAME | SD_FREE_FLAG_SHORT);
+                  menu_settings_list_current_add_enum_idx(list, list_info, (enum msg_hash_enums)(MENU_ENUM_LABEL_NETWORK_REMOTE_USER_1_ENABLE + user));
+               }
             }
 
             CONFIG_BOOL(
@@ -6217,7 +6216,7 @@ static bool setting_append_list(
 #ifdef HAVE_LANGEXTRA
          CONFIG_UINT(
                list, list_info,
-               &settings->uints.user_language,
+               msg_hash_get_uint(MSG_HASH_USER_LANGUAGE),
                MENU_ENUM_LABEL_USER_LANGUAGE,
                MENU_ENUM_LABEL_VALUE_USER_LANGUAGE,
                def_user_language,
@@ -6533,7 +6532,7 @@ static bool setting_append_list(
                general_write_handler,
                general_read_handler);
 
-         if (memcmp(settings->arrays.record_driver, "null", 4) != 0)
+         if (string_is_not_equal_fast(settings->arrays.record_driver, "null", 4))
          {
             CONFIG_DIR(
                   list, list_info,
@@ -6689,7 +6688,7 @@ static bool setting_append_list(
          START_SUB_GROUP(list, list_info, "State",
                &group_info, &subgroup_info, parent_group);
 
-         if (memcmp(settings->arrays.camera_driver, "null", 4) != 0)
+         if (string_is_not_equal_fast(settings->arrays.camera_driver, "null", 4))
          {
             CONFIG_BOOL(
                   list, list_info,
@@ -6707,7 +6706,7 @@ static bool setting_append_list(
                   SD_FLAG_NONE);
          }
 
-         if (memcmp(settings->arrays.location_driver, "null", 4) != 0)
+         if (string_is_not_equal_fast(settings->arrays.location_driver, "null", 4))
          {
             CONFIG_BOOL(
                   list, list_info,
diff --git a/menu/menu_shader.h b/menu/menu_shader.h
index 1c14e69b49..76f1f5ad84 100644
--- a/menu/menu_shader.h
+++ b/menu/menu_shader.h
@@ -19,7 +19,7 @@
 
 #include <retro_common_api.h>
 
-#include "../gfx/video_shader_driver.h"
+#include "../gfx/video_driver.h"
 
 RETRO_BEGIN_DECLS
 
diff --git a/menu/widgets/menu_dialog.c b/menu/widgets/menu_dialog.c
index 4ebeb1bbc2..f4e7549283 100644
--- a/menu/widgets/menu_dialog.c
+++ b/menu/widgets/menu_dialog.c
@@ -27,7 +27,6 @@
 
 #include "menu_dialog.h"
 
-#include "../menu_display.h"
 #include "../menu_driver.h"
 
 #include "../../retroarch.h"
diff --git a/menu/widgets/menu_entry.c b/menu/widgets/menu_entry.c
index 12d1923135..81f341319f 100644
--- a/menu/widgets/menu_entry.c
+++ b/menu/widgets/menu_entry.c
@@ -21,7 +21,6 @@
 #include "menu_input_dialog.h"
 
 #include "../menu_driver.h"
-#include "../menu_navigation.h"
 
 /* This file provides an abstraction of the currently displayed
  * menu.
@@ -503,10 +502,10 @@ int menu_entry_action(menu_entry_t *entry, unsigned i, enum menu_action action)
             ret = cbs->action_down(entry->type, entry->label);
          break;
       case MENU_ACTION_SCROLL_UP:
-         menu_navigation_ctl(MENU_NAVIGATION_CTL_DESCEND_ALPHABET, NULL);
+         menu_driver_ctl(MENU_NAVIGATION_CTL_DESCEND_ALPHABET, NULL);
          break;
       case MENU_ACTION_SCROLL_DOWN:
-         menu_navigation_ctl(MENU_NAVIGATION_CTL_ASCEND_ALPHABET, NULL);
+         menu_driver_ctl(MENU_NAVIGATION_CTL_ASCEND_ALPHABET, NULL);
          break;
       case MENU_ACTION_CANCEL:
          if (cbs && cbs->action_cancel)
diff --git a/menu/widgets/menu_filebrowser.c b/menu/widgets/menu_filebrowser.c
index 7d141667f3..b2f9203ed3 100644
--- a/menu/widgets/menu_filebrowser.c
+++ b/menu/widgets/menu_filebrowser.c
@@ -49,8 +49,7 @@ void filebrowser_clear_type(void)
 
 void filebrowser_set_type(enum filebrowser_enums type)
 {
-   if (filebrowser_types != FILEBROWSER_SELECT_FILE)
-      filebrowser_types = type;
+   filebrowser_types = type;
 }
 
 void filebrowser_parse(void *data, unsigned type_data)
@@ -141,7 +140,10 @@ void filebrowser_parse(void *data, unsigned type_data)
                break;
             case RARCH_PLAIN_FILE:
             default:
-               file_type = (enum msg_file_type)info->type_default;
+               if (filebrowser_types == FILEBROWSER_SELECT_FONT)
+                  file_type = FILE_TYPE_FONT;
+               else
+                  file_type = (enum msg_file_type)info->type_default;
                switch (type)
                {
                   /* in case of deferred_core_list we have to interpret
@@ -206,7 +208,7 @@ void filebrowser_parse(void *data, unsigned type_data)
                   else
                      file_type = FILE_TYPE_IMAGE;
 #endif
-                  if (filebrowser_types == FILEBROWSER_SELECT_FILE)
+                  if (filebrowser_types == FILEBROWSER_SELECT_IMAGE)
                      file_type = FILE_TYPE_IMAGE;
                   break;
                default:
@@ -265,12 +267,6 @@ void filebrowser_parse(void *data, unsigned type_data)
             MENU_SETTING_NO_ITEM, 0, 0);
    }
 
-   /* We don't want to show 'filter by extension' for this. */
-   if (filebrowser_types == FILEBROWSER_SELECT_DIR)
-      goto end;
-   if (filebrowser_types == FILEBROWSER_SCAN_DIR)
-      goto end;
-
 end:
    menu_entries_prepend(info->list,
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PARENT_DIRECTORY),
diff --git a/menu/widgets/menu_filebrowser.h b/menu/widgets/menu_filebrowser.h
index c1d3794b59..cbc25daa65 100644
--- a/menu/widgets/menu_filebrowser.h
+++ b/menu/widgets/menu_filebrowser.h
@@ -30,6 +30,8 @@ enum filebrowser_enums
    FILEBROWSER_SELECT_DIR,
    FILEBROWSER_SCAN_DIR,
    FILEBROWSER_SELECT_FILE,
+   FILEBROWSER_SELECT_IMAGE,
+   FILEBROWSER_SELECT_FONT,
    FILEBROWSER_SELECT_COLLECTION
 };
 
diff --git a/menu/widgets/menu_input_bind_dialog.c b/menu/widgets/menu_input_bind_dialog.c
index 0e23e163f1..197cdf8cc2 100644
--- a/menu/widgets/menu_input_bind_dialog.c
+++ b/menu/widgets/menu_input_bind_dialog.c
@@ -21,8 +21,9 @@
 #include "menu_input_bind_dialog.h"
 
 #include "../menu_driver.h"
-#include "../menu_navigation.h"
 
+#include "../../input/input_driver.h"
+#include "../../input/input_keyboard.h"
 #include "../../input/input_config.h"
 
 #include "../../configuration.h"
@@ -347,12 +348,12 @@ static bool menu_input_key_bind_poll_find_trigger(
       struct menu_bind_state *new_state)
 {
    unsigned i;
-   settings_t *settings = config_get_ptr();
+   unsigned max_users   = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
 
    if (!state || !new_state)
       return false;
 
-   for (i = 0; i < settings->uints.input_max_users; i++)
+   for (i = 0; i < max_users; i++)
    {
       if (!menu_input_key_bind_poll_find_trigger_pad(
                state, new_state, i))
diff --git a/menu/widgets/menu_input_dialog.c b/menu/widgets/menu_input_dialog.c
index 2f6e091bda..dd9fe1ea5e 100644
--- a/menu/widgets/menu_input_dialog.c
+++ b/menu/widgets/menu_input_dialog.c
@@ -19,7 +19,6 @@
 #include "menu_input_dialog.h"
 
 #include "../menu_driver.h"
-#include "../menu_navigation.h"
 #include "../../input/input_driver.h"
 
 static const char **menu_input_dialog_keyboard_buffer      = {NULL};
@@ -39,9 +38,8 @@ static void menu_input_search_cb(void *userdata, const char *str)
 
    if (str && *str && file_list_search(selection_buf, str, &idx))
    {
-      bool scroll = true;
       menu_navigation_set_selection(idx);
-      menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
+      menu_driver_navigation_set(true);
    }
 
    menu_input_dialog_end();
diff --git a/menu/widgets/menu_list.c b/menu/widgets/menu_list.c
index b6cfab843a..f135686458 100644
--- a/menu/widgets/menu_list.c
+++ b/menu/widgets/menu_list.c
@@ -20,7 +20,6 @@
 #include "menu_list.h"
 
 #include "../menu_driver.h"
-#include "../menu_navigation.h"
 
 struct menu_list
 {
diff --git a/menu/widgets/menu_osk.c b/menu/widgets/menu_osk.c
index 94b2e0aa18..d853d9d52d 100644
--- a/menu/widgets/menu_osk.c
+++ b/menu/widgets/menu_osk.c
@@ -98,16 +98,16 @@ void menu_event_osk_append(int ptr)
       menu_event_set_osk_idx(OSK_LOWERCASE_LATIN);
    else if (string_is_equal(osk_grid[ptr],"\xe2\x8a\x95")) /* plus sign (next button) */
 #else
-   if (memcmp(osk_grid[ptr], "Bksp", 4) == 0)
+   if (string_is_equal_fast(osk_grid[ptr], "Bksp", 4))
       input_keyboard_event(true, '\x7f', '\x7f', 0, RETRO_DEVICE_KEYBOARD);
-   else if (memcmp(osk_grid[ptr], "Enter", 5) == 0)
+   else if (string_is_equal_fast(osk_grid[ptr], "Enter", 5))
       input_keyboard_event(true, '\n', '\n', 0, RETRO_DEVICE_KEYBOARD);
    else
-   if (memcmp(osk_grid[ptr], "Upper", 5) == 0)
+   if (string_is_equal_fast(osk_grid[ptr], "Upper", 5))
       menu_event_set_osk_idx(OSK_UPPERCASE_LATIN);
-   else if (memcmp(osk_grid[ptr], "Lower", 5) == 0)
+   else if (string_is_equal_fast(osk_grid[ptr], "Lower", 5))
       menu_event_set_osk_idx(OSK_LOWERCASE_LATIN);
-   else if (memcmp(osk_grid[ptr], "Next", 4) == 0)
+   else if (string_is_equal_fast(osk_grid[ptr], "Next", 4))
 #endif
       if (menu_event_get_osk_idx() < OSK_TYPE_LAST - 1)
          menu_event_set_osk_idx((enum osk_type)(menu_event_get_osk_idx() + 1));
diff --git a/movie.c b/movie.c
index 5b3179b82b..4034ee3712 100644
--- a/movie.c
+++ b/movie.c
@@ -27,7 +27,6 @@
 #include "core.h"
 #include "content.h"
 #include "retroarch.h"
-#include "runloop.h"
 #include "msg_hash.h"
 #include "verbosity.h"
 
@@ -557,19 +556,15 @@ static bool runloop_check_movie_init(void)
 
 bool bsv_movie_check(void)
 {
-   if (bsv_movie_state_handle && bsv_movie_state.movie_playback)
+   if (!bsv_movie_state_handle)
+      return runloop_check_movie_init();
+
+   if (bsv_movie_state.movie_playback)
    {
       if (!bsv_movie_state.movie_end)
          return false;
       return bsv_movie_check_movie_playback();
    }
 
-   if (!bsv_movie_state_handle)
-   {
-      if (bsv_movie_state_handle)
-         return false;
-      return runloop_check_movie_init();
-   }
-
    return runloop_check_movie_record();
 }
diff --git a/msg_hash.c b/msg_hash.c
index f8a3c4db50..ab27ba1e14 100644
--- a/msg_hash.c
+++ b/msg_hash.c
@@ -27,18 +27,14 @@
 
 #include "msg_hash.h"
 
-#include "configuration.h"
+static unsigned uint_user_language;
 
 int menu_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
 {
    int ret = -1;
-   settings_t *settings = config_get_ptr();
-
-   if (!settings)
-      goto end;
 
 #ifdef HAVE_LANGEXTRA
-   switch (settings->uints.user_language)
+   switch (uint_user_language)
    {
       case RETRO_LANGUAGE_FRENCH:
          ret = menu_hash_get_help_fr_enum(msg, s, len);
@@ -87,20 +83,15 @@ int menu_hash_get_help_enum(enum msg_hash_enums msg, char *s, size_t len)
    if (ret == 0)
       return ret;
 
-end:
    return menu_hash_get_help_us_enum(msg, s, len);
 }
 
 const char *msg_hash_to_str(enum msg_hash_enums msg)
 {
    const char *ret = NULL;
-   settings_t *settings = config_get_ptr();
-
-   if (!settings)
-      goto end;
 
 #ifdef HAVE_LANGEXTRA
-   switch (settings->uints.user_language)
+   switch (uint_user_language)
    {
       case RETRO_LANGUAGE_FRENCH:
          ret = msg_hash_to_str_fr(msg);
@@ -149,10 +140,9 @@ const char *msg_hash_to_str(enum msg_hash_enums msg)
    }
 #endif
 
-   if (ret && (memcmp(ret, "null", 4) != 0))
+   if (ret && string_is_not_equal_fast(ret, "null", 4))
       return ret;
 
-end:
    return msg_hash_to_str_us(msg);
 }
 
@@ -379,3 +369,28 @@ enum msg_file_type msg_hash_to_file_type(uint32_t hash)
 
    return FILE_TYPE_NONE;
 }
+
+unsigned *msg_hash_get_uint(enum msg_hash_action type)
+{
+   switch (type)
+   {
+      case MSG_HASH_USER_LANGUAGE:
+         return &uint_user_language;
+      case MSG_HASH_NONE:
+         break;
+   }
+
+   return NULL;
+}
+
+void msg_hash_set_uint(enum msg_hash_action type, unsigned val)
+{
+   switch (type)
+   {
+      case MSG_HASH_USER_LANGUAGE:
+         uint_user_language = val;
+         break;
+      case MSG_HASH_NONE:
+         break;
+   }
+}
diff --git a/msg_hash.h b/msg_hash.h
index 905c6b7557..1920cdbdf0 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -29,6 +29,12 @@
 
 RETRO_BEGIN_DECLS
 
+enum msg_hash_action
+{
+   MSG_HASH_NONE = 0,
+   MSG_HASH_USER_LANGUAGE
+};
+
 enum msg_file_type
 {
    FILE_TYPE_NONE = 0,
@@ -916,6 +922,7 @@ enum msg_hash_enums
 
    /* Netplay */
    MENU_LABEL(NETPLAY_ENABLE_HOST),
+   MENU_LABEL(NETPLAY_DISABLE_HOST),
    MENU_LABEL(NETPLAY_ENABLE_CLIENT),
    MENU_LABEL(NETPLAY_DISCONNECT),
    MENU_LABEL(NETPLAY_SETTINGS),
@@ -1382,6 +1389,7 @@ enum msg_hash_enums
 
    /* System information */
 
+   MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_LAKKA_VERSION,
    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_DYNAMIC_SUPPORT,
    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_BUILD_DATE,
    MENU_ENUM_LABEL_VALUE_SYSTEM_INFO_GIT_VERSION,
@@ -1874,6 +1882,10 @@ 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);
 
+unsigned *msg_hash_get_uint(enum msg_hash_action type);
+
+void msg_hash_set_uint(enum msg_hash_action type, unsigned val);
+
 uint32_t msg_hash_calculate(const char *s);
 
 RETRO_END_DECLS
diff --git a/network/httpserver/httpserver.c b/network/httpserver/httpserver.c
index 77b7c79a16..b996aed4aa 100644
--- a/network/httpserver/httpserver.c
+++ b/network/httpserver/httpserver.c
@@ -25,7 +25,7 @@
 #include <compat/zlib.h>
 
 #include "../../core.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../core.h"
 #include "../../gfx/video_driver.h"
 #include "../../managers/core_option_manager.h"
@@ -380,7 +380,7 @@ static int httpserver_handle_basic_info(struct mg_connection* conn, void* cbdata
    }
 
    mg_printf(conn, "],\"coreOptions\":[");
-   runloop_ctl(RUNLOOP_CTL_CORE_OPTIONS_LIST_GET, (void*)&core_opts);
+   rarch_ctl(RARCH_CTL_CORE_OPTIONS_LIST_GET, (void*)&core_opts);
    opts = core_opts->opts;
 
    for (p = 0; p < core_opts->size; p++, opts++)
diff --git a/network/netplay/netplay.h b/network/netplay/netplay.h
index 38b04326ab..387a355348 100644
--- a/network/netplay/netplay.h
+++ b/network/netplay/netplay.h
@@ -40,6 +40,8 @@ enum rarch_netplay_ctl_state
    RARCH_NETPLAY_CTL_ENABLE_CLIENT,
    RARCH_NETPLAY_CTL_DISABLE,
    RARCH_NETPLAY_CTL_IS_ENABLED,
+   RARCH_NETPLAY_CTL_IS_SERVER,
+   RARCH_NETPLAY_CTL_IS_CONNECTED,
    RARCH_NETPLAY_CTL_IS_DATA_INITED,
    RARCH_NETPLAY_CTL_PAUSE,
    RARCH_NETPLAY_CTL_UNPAUSE,
diff --git a/network/netplay/netplay_discovery.c b/network/netplay/netplay_discovery.c
index 36d720fde4..8d45a86a3e 100644
--- a/network/netplay/netplay_discovery.c
+++ b/network/netplay/netplay_discovery.c
@@ -43,7 +43,7 @@
 #include <compat/strl.h>
 #include <net/net_compat.h>
 
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../version.h"
 #include "netplay.h"
 #include "netplay_discovery.h"
diff --git a/network/netplay/netplay_discovery.h b/network/netplay/netplay_discovery.h
index 6bc2b1eba7..5148a8af9a 100644
--- a/network/netplay/netplay_discovery.h
+++ b/network/netplay/netplay_discovery.h
@@ -74,6 +74,7 @@ struct netplay_room
    int  host_method;
    bool has_password;
    bool has_spectate_password;
+   bool lan;
    bool fixed;
    struct netplay_room *next;
 };
diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c
index 2c471f063b..f700f859fe 100644
--- a/network/netplay/netplay_frontend.c
+++ b/network/netplay/netplay_frontend.c
@@ -24,17 +24,17 @@
 #include <string/stdstring.h>
 #include <net/net_http.h>
 
+#include <file/file_path.h>
+
 #include "netplay_private.h"
 
 #include "../../configuration.h"
 #include "../../input/input_driver.h"
-#include "../../runloop.h"
-
 #include "../../tasks/tasks_internal.h"
-#include <file/file_path.h>
 #include "../../file_path_special.h"
 #include "../../paths.h"
 #include "../../command.h"
+#include "../../retroarch.h"
 
 /* Only used before init_netplay */
 static bool netplay_enabled = false;
@@ -1124,10 +1124,13 @@ static void netplay_toggle_play_spectate(netplay_t *netplay)
 bool netplay_disconnect(netplay_t *netplay)
 {
    size_t i;
+
    if (!netplay)
       return true;
    for (i = 0; i < netplay->connections_size; i++)
       netplay_hangup(netplay, &netplay->connections[i]);
+
+   deinit_netplay();
    return true;
 }
 
@@ -1137,6 +1140,7 @@ void deinit_netplay(void)
    {
       netplay_free(netplay_data);
       netplay_enabled = false;
+      netplay_is_client = false;
       is_mitm = false;
    }
    netplay_data = NULL;
@@ -1271,6 +1275,13 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data)
             ret = false;
             goto done;
 
+         case RARCH_NETPLAY_CTL_IS_SERVER:
+            ret = netplay_enabled && !netplay_is_client;
+            goto done;
+
+         case RARCH_NETPLAY_CTL_IS_CONNECTED:
+            ret = false;
+            goto done;
          default:
             goto done;
       }
@@ -1287,6 +1298,12 @@ bool netplay_driver_ctl(enum rarch_netplay_ctl_state state, void *data)
          goto done;
       case RARCH_NETPLAY_CTL_IS_ENABLED:
          goto done;
+      case RARCH_NETPLAY_CTL_IS_SERVER:
+         ret = netplay_enabled && !netplay_is_client;
+         goto done;
+      case RARCH_NETPLAY_CTL_IS_CONNECTED:
+         ret = netplay_data->is_connected;
+         goto done;
       case RARCH_NETPLAY_CTL_POST_FRAME:
          netplay_post_frame(netplay_data);
          break;
diff --git a/network/netplay/netplay_handshake.c b/network/netplay/netplay_handshake.c
index 95464ae402..d7176243cb 100644
--- a/network/netplay/netplay_handshake.c
+++ b/network/netplay/netplay_handshake.c
@@ -33,7 +33,6 @@
 #include "../../configuration.h"
 #include "../../content.h"
 #include "../../retroarch.h"
-#include "../../runloop.h"
 #include "../../version.h"
 #include "../../input/input_config.h"
 
@@ -41,10 +40,13 @@
 #include "../../menu/widgets/menu_input_dialog.h"
 #endif
 
+/* TODO/FIXME - replace netplay_log_connection with calls
+ * to inet_ntop_compat and move runloop message queue pushing
+ * outside */
 #ifndef HAVE_SOCKET_LEGACY
 /* Custom inet_ntop. Win32 doesn't seem to support this ... */
 void netplay_log_connection(const struct sockaddr_storage *their_addr,
-      unsigned slot, const char *nick)
+      unsigned slot, const char *nick, char *s, size_t len)
 {
    union
    {
@@ -55,11 +57,8 @@ void netplay_log_connection(const struct sockaddr_storage *their_addr,
    const char *str               = NULL;
    char buf_v4[INET_ADDRSTRLEN]  = {0};
    char buf_v6[INET6_ADDRSTRLEN] = {0};
-   char msg[512];
 
-   msg[0] = '\0';
-
-   u.storage = their_addr;
+   u.storage                     = their_addr;
 
    switch (their_addr->ss_family)
    {
@@ -97,36 +96,23 @@ void netplay_log_connection(const struct sockaddr_storage *their_addr,
 
    if (str)
    {
-      snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_GOT_CONNECTION_FROM_NAME),
+      snprintf(s, len, msg_hash_to_str(MSG_GOT_CONNECTION_FROM_NAME),
             nick, str);
-      runloop_msg_queue_push(msg, 1, 180, false);
-      RARCH_LOG("%s\n", msg);
    }
    else
    {
-      snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_GOT_CONNECTION_FROM),
+      snprintf(s, len, msg_hash_to_str(MSG_GOT_CONNECTION_FROM),
             nick);
-      runloop_msg_queue_push(msg, 1, 180, false);
-      RARCH_LOG("%s\n", msg);
    }
-   RARCH_LOG("%s %u\n", msg_hash_to_str(MSG_CONNECTION_SLOT),
-         slot);
 }
 
 #else
 void netplay_log_connection(const struct sockaddr_storage *their_addr,
-      unsigned slot, const char *nick)
+      unsigned slot, const char *nick, char *s, size_t len)
 {
-   char msg[512];
-
-   msg[0] = '\0';
-
-   snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_GOT_CONNECTION_FROM),
+   /* Stub code - will need to be implemented */
+   snprintf(s, len, msg_hash_to_str(MSG_GOT_CONNECTION_FROM),
          nick);
-   runloop_msg_queue_push(msg, 1, 180, false);
-   RARCH_LOG("%s\n", msg);
-   RARCH_LOG("%s %u\n",
-         msg_hash_to_str(MSG_CONNECTION_SLOT), slot);
 }
 
 #endif
@@ -139,11 +125,11 @@ void netplay_log_connection(const struct sockaddr_storage *their_addr,
  */
 uint32_t netplay_impl_magic(void)
 {
-   size_t i, len;
+   size_t i;
    uint32_t res                        = 0;
    const char *ver                     = PACKAGE_VERSION;
+   size_t len                          = strlen(ver);
 
-   len = strlen(ver);
    for (i = 0; i < len; i++)
       res ^= ver[i] << (i & 0xf);
 
@@ -186,17 +172,18 @@ static bool netplay_endian_mismatch(uint32_t pma, uint32_t pmb)
 
 static unsigned long simple_rand_next = 1;
 
-static int simple_rand()
+static int simple_rand(void)
 {
    simple_rand_next = simple_rand_next * 1103515245 + 12345;
    return((unsigned)(simple_rand_next/65536) % 32768);
 }
 
-static void simple_srand(unsigned int seed) {
+static void simple_srand(unsigned int seed)
+{
    simple_rand_next = seed;
 }
 
-static uint32_t simple_rand_uint32()
+static uint32_t simple_rand_uint32(void)
 {
    uint32_t parts[3];
    parts[0] = simple_rand();
@@ -215,14 +202,17 @@ static uint32_t simple_rand_uint32()
 bool netplay_handshake_init_send(netplay_t *netplay,
    struct netplay_connection *connection)
 {
-   uint32_t header[4] = {0};
+   uint32_t header[4];
    settings_t *settings = config_get_ptr();
 
    header[0] = htonl(netplay_impl_magic());
    header[1] = htonl(netplay_platform_magic());
    header[2] = htonl(NETPLAY_COMPRESSION_SUPPORTED);
+   header[3] = 0;
+
    if (netplay->is_server &&
-       (settings->paths.netplay_password[0] || settings->paths.netplay_spectate_password[0]))
+       (settings->paths.netplay_password[0] || 
+        settings->paths.netplay_spectate_password[0]))
    {
       /* Demand a password */
       if (simple_rand_next == 1)
@@ -296,7 +286,7 @@ static void handshake_password(void *ignore, const char *line)
 
 #ifdef HAVE_MENU
    menu_input_dialog_end();
-   rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
+   rarch_menu_running_finished();
 #endif
 }
 #endif
@@ -310,15 +300,19 @@ static void handshake_password(void *ignore, const char *line)
 bool netplay_handshake_init(netplay_t *netplay,
    struct netplay_connection *connection, bool *had_input)
 {
-   uint32_t header[4] = {0};
    ssize_t recvd;
-   const char *dmsg;
    struct nick_buf_s nick_buf;
-   uint32_t local_pmagic, remote_pmagic;
-   uint32_t compression;
-   struct compression_transcoder *ctrans;
+   uint32_t header[4];
+   uint32_t local_pmagic                 = 0;
+   uint32_t remote_pmagic                = 0;
+   uint32_t compression                  = 0;
+   struct compression_transcoder *ctrans = NULL;
+   const char *dmsg                      = NULL;
 
-   dmsg = NULL;
+   header[0] = 0;
+   header[1] = 0;
+   header[2] = 0;
+   header[3] = 0;
 
    RECV(header, sizeof(header))
    {
@@ -333,8 +327,9 @@ bool netplay_handshake_init(netplay_t *netplay,
    }
 
    /* We only care about platform magic if our core is quirky */
-   local_pmagic = netplay_platform_magic();
+   local_pmagic  = netplay_platform_magic();
    remote_pmagic = ntohl(header[1]);
+
    if ((netplay->quirks & NETPLAY_QUIRK_ENDIAN_DEPENDENT) &&
        netplay_endian_mismatch(local_pmagic, remote_pmagic))
    {
@@ -351,8 +346,9 @@ bool netplay_handshake_init(netplay_t *netplay,
    }
 
    /* Check what compression is supported */
-   compression = ntohl(header[2]);
+   compression  = ntohl(header[2]);
    compression &= NETPLAY_COMPRESSION_SUPPORTED;
+
    if (compression & NETPLAY_COMPRESSION_ZLIB)
    {
       ctrans = &netplay->compress_zlib;
@@ -375,13 +371,14 @@ bool netplay_handshake_init(netplay_t *netplay,
       }
       connection->compression_supported = 0;
    }
+
    if (!ctrans->decompression_backend)
       ctrans->decompression_backend = ctrans->compression_backend->reverse;
 
    /* Allocate our compression stream */
    if (!ctrans->compression_stream)
    {
-      ctrans->compression_stream = ctrans->compression_backend->stream_new();
+      ctrans->compression_stream   = ctrans->compression_backend->stream_new();
       ctrans->decompression_stream = ctrans->decompression_backend->stream_new();
    }
    if (!ctrans->compression_stream || !ctrans->decompression_stream)
@@ -395,7 +392,7 @@ bool netplay_handshake_init(netplay_t *netplay,
    {
 #ifdef HAVE_MENU
       menu_input_ctx_line_t line;
-      rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
+      rarch_menu_running();
 #endif
 
       handshake_password_netplay = netplay;
@@ -435,29 +432,37 @@ error:
    return false;
 }
 
-static void netplay_handshake_ready(netplay_t *netplay, struct netplay_connection *connection)
+static void netplay_handshake_ready(netplay_t *netplay,
+      struct netplay_connection *connection)
 {
    char msg[512];
+   msg[0] = '\0';
 
    if (netplay->is_server)
    {
-      netplay_log_connection(&connection->addr, (unsigned)(connection - netplay->connections), connection->nick);
+      unsigned slot = (unsigned)(connection - netplay->connections);
+      
+      netplay_log_connection(&connection->addr,
+            slot, connection->nick, msg, sizeof(msg));
+
+      RARCH_LOG("%s %u\n", msg_hash_to_str(MSG_CONNECTION_SLOT), slot);
 
       /* Send them the savestate */
-      if (!(netplay->quirks & (NETPLAY_QUIRK_NO_SAVESTATES|NETPLAY_QUIRK_NO_TRANSMISSION)))
-      {
+      if (!(netplay->quirks & 
+               (NETPLAY_QUIRK_NO_SAVESTATES|NETPLAY_QUIRK_NO_TRANSMISSION)))
          netplay->force_send_savestate = true;
-      }
    }
    else
    {
+      netplay->is_connected = true;
       snprintf(msg, sizeof(msg), "%s: \"%s\"",
             msg_hash_to_str(MSG_CONNECTED_TO),
             connection->nick);
-      RARCH_LOG("%s\n", msg);
-      runloop_msg_queue_push(msg, 1, 180, false);
    }
 
+   RARCH_LOG("%s\n", msg);
+   runloop_msg_queue_push(msg, 1, 180, false);
+
    /* Unstall if we were waiting for this */
    if (netplay->stall == NETPLAY_STALL_NO_CONNECTION)
        netplay->stall = NETPLAY_STALL_NONE;
@@ -468,7 +473,8 @@ static void netplay_handshake_ready(netplay_t *netplay, struct netplay_connectio
  *
  * Send an INFO command.
  */
-bool netplay_handshake_info(netplay_t *netplay, struct netplay_connection *connection)
+bool netplay_handshake_info(netplay_t *netplay,
+      struct netplay_connection *connection)
 {
    struct info_buf_s info_buf;
    uint32_t      content_crc      = 0;
@@ -481,13 +487,17 @@ bool netplay_handshake_info(netplay_t *netplay, struct netplay_connection *conne
    /* Get our core info */
    if (core_info)
    {
-      strlcpy(info_buf.core_name, core_info->info.library_name, sizeof(info_buf.core_name));
-      strlcpy(info_buf.core_version, core_info->info.library_version, sizeof(info_buf.core_version));
+      strlcpy(info_buf.core_name,
+            core_info->info.library_name, sizeof(info_buf.core_name));
+      strlcpy(info_buf.core_version,
+            core_info->info.library_version, sizeof(info_buf.core_version));
    }
    else
    {
-      strlcpy(info_buf.core_name,    "UNKNOWN", sizeof(info_buf.core_name));
-      strlcpy(info_buf.core_version, "UNKNOWN", sizeof(info_buf.core_version));
+      strlcpy(info_buf.core_name,
+            "UNKNOWN", sizeof(info_buf.core_name));
+      strlcpy(info_buf.core_version,
+            "UNKNOWN", sizeof(info_buf.core_version));
    }
 
    /* Get our content CRC */
@@ -512,17 +522,18 @@ bool netplay_handshake_info(netplay_t *netplay, struct netplay_connection *conne
  *
  * Send a SYNC command.
  */
-bool netplay_handshake_sync(netplay_t *netplay, struct netplay_connection *connection)
+bool netplay_handshake_sync(netplay_t *netplay,
+      struct netplay_connection *connection)
 {
    /* If we're the server, now we send sync info */
    size_t i;
    int matchct;
-   uint32_t device;
    uint32_t cmd[5];
-   uint32_t connected_players;
    retro_ctx_memory_info_t mem_info;
-   size_t nicklen, nickmangle;
-   bool nick_matched;
+   uint32_t device            = 0;
+   uint32_t connected_players = 0;
+   size_t nicklen, nickmangle = 0;
+   bool nick_matched          = false;
 
    autosave_lock();
    mem_info.id = RETRO_MEMORY_SAVE_RAM;
@@ -585,7 +596,8 @@ bool netplay_handshake_sync(netplay_t *netplay, struct netplay_connection *conne
       if (nick_matched)
       {
          /* Somebody has this nick, make a new one! */
-         snprintf(connection->nick + nickmangle, NETPLAY_NICK_LEN - nickmangle, " (%d)", ++matchct);
+         snprintf(connection->nick + nickmangle,
+               NETPLAY_NICK_LEN - nickmangle, " (%d)", ++matchct);
          connection->nick[NETPLAY_NICK_LEN - 1] = '\0';
       }
    } while (nick_matched);
@@ -655,7 +667,9 @@ bool netplay_handshake_pre_nick(netplay_t *netplay,
    if (netplay->is_server)
    {
       settings_t *settings = config_get_ptr();
-      if (settings->paths.netplay_password[0] || settings->paths.netplay_spectate_password[0])
+
+      if (  settings->paths.netplay_password[0] || 
+            settings->paths.netplay_spectate_password[0])
       {
          /* There's a password, so just put them in PRE_PASSWORD mode */
          connection->mode = NETPLAY_CONNECTION_PRE_PASSWORD;
@@ -694,7 +708,7 @@ bool netplay_handshake_pre_password(netplay_t *netplay,
    char password[8+NETPLAY_PASS_LEN]; /* 8 for salt */
    ssize_t recvd;
    char msg[512];
-   bool correct;
+   bool correct         = false;
    settings_t *settings = config_get_ptr();
 
    msg[0] = '\0';
@@ -724,9 +738,14 @@ bool netplay_handshake_pre_password(netplay_t *netplay,
 
    if (settings->paths.netplay_password[0])
    {
-      strlcpy(password + 8, settings->paths.netplay_password, sizeof(password)-8);
-      sha256_hash(corr_password_buf.password, (uint8_t *) password, strlen(password));
-      if (!memcmp(password_buf.password, corr_password_buf.password, sizeof(password_buf.password)))
+      strlcpy(password + 8,
+            settings->paths.netplay_password, sizeof(password)-8);
+
+      sha256_hash(corr_password_buf.password,
+            (uint8_t *) password, strlen(password));
+
+      if (!memcmp(password_buf.password,
+               corr_password_buf.password, sizeof(password_buf.password)))
       {
          correct = true;
          connection->can_play = true;
@@ -734,9 +753,14 @@ bool netplay_handshake_pre_password(netplay_t *netplay,
    }
    if (settings->paths.netplay_spectate_password[0])
    {
-      strlcpy(password + 8, settings->paths.netplay_spectate_password, sizeof(password)-8);
-      sha256_hash(corr_password_buf.password, (uint8_t *) password, strlen(password));
-      if (!memcmp(password_buf.password, corr_password_buf.password, sizeof(password_buf.password)))
+      strlcpy(password + 8,
+            settings->paths.netplay_spectate_password, sizeof(password)-8);
+
+      sha256_hash(corr_password_buf.password,
+            (uint8_t *) password, strlen(password));
+
+      if (!memcmp(password_buf.password,
+               corr_password_buf.password, sizeof(password_buf.password)))
          correct = true;
    }
 
@@ -809,8 +833,10 @@ bool netplay_handshake_pre_info(netplay_t *netplay,
 
    if (core_info)
    {
-      if (strncmp(info_buf.core_name, core_info->info.library_name, sizeof(info_buf.core_name)) ||
-          strncmp(info_buf.core_version, core_info->info.library_version, sizeof(info_buf.core_version)))
+      if (strncmp(info_buf.core_name,
+               core_info->info.library_name, sizeof(info_buf.core_name)) ||
+          strncmp(info_buf.core_version,
+             core_info->info.library_version, sizeof(info_buf.core_version)))
       {
          dmsg = msg_hash_to_str(MSG_NETPLAY_IMPLEMENTATIONS_DIFFER);
          goto error;
@@ -921,26 +947,30 @@ bool netplay_handshake_pre_sync(netplay_t *netplay,
    /* And the flip state */
    RECV(&flip_frame, sizeof(flip_frame))
       return false;
-   flip_frame = ntohl(flip_frame);
-   netplay->flip = !!flip_frame;
+
+   flip_frame          = ntohl(flip_frame);
+   netplay->flip       = !!flip_frame;
    netplay->flip_frame = flip_frame;
 
    /* Set our frame counters as requested */
-   netplay->self_frame_count = netplay->run_frame_count =
-      netplay->other_frame_count = netplay->unread_frame_count =
+   netplay->self_frame_count      = netplay->run_frame_count    =
+      netplay->other_frame_count  = netplay->unread_frame_count =
       netplay->server_frame_count = new_frame_count;
+
    for (i = 0; i < netplay->buffer_size; i++)
    {
       struct delta_frame *ptr = &netplay->buffer[i];
-      ptr->used = false;
+
+      ptr->used               = false;
 
       if (i == netplay->self_ptr)
       {
          /* Clear out any current data but still use this frame */
          if (!netplay_delta_frame_ready(netplay, ptr, 0))
             return false;
-         ptr->frame = new_frame_count;
-         ptr->have_local = true;
+
+         ptr->frame       = new_frame_count;
+         ptr->have_local  = true;
          netplay->run_ptr = netplay->other_ptr = netplay->unread_ptr =
             netplay->server_ptr = i;
 
@@ -950,7 +980,7 @@ bool netplay_handshake_pre_sync(netplay_t *netplay,
    {
       if (connected_players & (1<<i))
       {
-         netplay->read_ptr[i] = netplay->self_ptr;
+         netplay->read_ptr[i]         = netplay->self_ptr;
          netplay->read_frame_count[i] = netplay->self_frame_count;
       }
    }
@@ -960,19 +990,23 @@ bool netplay_handshake_pre_sync(netplay_t *netplay,
    {
       RECV(&device, sizeof(device))
          return false;
+
       pad.port   = (unsigned)i;
       pad.device = ntohl(device);
+
       core_set_controller_port_device(&pad);
    }
 
    /* Get our nick */
    RECV(new_nick, NETPLAY_NICK_LEN)
       return false;
+
    if (strncmp(netplay->nick, new_nick, NETPLAY_NICK_LEN))
    {
       char msg[512];
       strlcpy(netplay->nick, new_nick, NETPLAY_NICK_LEN);
-      snprintf(msg, sizeof(msg), msg_hash_to_str(MSG_NETPLAY_CHANGED_NICK), netplay->nick);
+      snprintf(msg, sizeof(msg),
+            msg_hash_to_str(MSG_NETPLAY_CHANGED_NICK), netplay->nick);
       RARCH_LOG("%s\n", msg);
       runloop_msg_queue_push(msg, 1, 180, false);
    }
@@ -1029,8 +1063,8 @@ bool netplay_handshake_pre_sync(netplay_t *netplay,
    /* Ask to switch to playing mode if we should */
    if (!settings->bools.netplay_start_as_spectator)
       return netplay_cmd_mode(netplay, connection, NETPLAY_CONNECTION_PLAYING);
-   else
-      return true;
+
+   return true;
 }
 
 /**
@@ -1041,13 +1075,10 @@ bool netplay_handshake_pre_sync(netplay_t *netplay,
 bool netplay_handshake(netplay_t *netplay,
    struct netplay_connection *connection, bool *had_input)
 {
-   bool ret;
+   bool ret = false;
 
    switch (connection->mode)
    {
-      case NETPLAY_CONNECTION_NONE:
-         /* Huh?! */
-         return false;
       case NETPLAY_CONNECTION_INIT:
          ret = netplay_handshake_init(netplay, connection, had_input);
          break;
@@ -1063,6 +1094,7 @@ bool netplay_handshake(netplay_t *netplay,
       case NETPLAY_CONNECTION_PRE_SYNC:
          ret = netplay_handshake_pre_sync(netplay, connection, had_input);
          break;
+      case NETPLAY_CONNECTION_NONE:
       default:
          return false;
    }
diff --git a/network/netplay/netplay_init.c b/network/netplay/netplay_init.c
index cf02a2d001..59e743072f 100644
--- a/network/netplay/netplay_init.c
+++ b/network/netplay/netplay_init.c
@@ -31,7 +31,7 @@
 #include "netplay_discovery.h"
 
 #include "../../autosave.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 
 #if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY)
 #define HAVE_INET6 1
@@ -423,6 +423,7 @@ netplay_t *netplay_new(void *direct_host, const char *server, uint16_t port,
    netplay->connected_players = 0;
    netplay->player_max        = 1;
    netplay->is_server         = (direct_host == NULL && server == NULL);
+   netplay->is_connected      = false;;
    netplay->nat_traversal     = netplay->is_server ? nat_traversal : false;
    netplay->stateless_mode    = stateless_mode;
    netplay->check_frames      = check_frames;
diff --git a/network/netplay/netplay_io.c b/network/netplay/netplay_io.c
index f1106dad1d..66a6d97a0c 100644
--- a/network/netplay/netplay_io.c
+++ b/network/netplay/netplay_io.c
@@ -25,7 +25,7 @@
 #include "netplay_private.h"
 
 #include "../../configuration.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../tasks/tasks_internal.h"
 
 #if 0
@@ -111,6 +111,7 @@ void netplay_hangup(netplay_t *netplay, struct netplay_connection *connection)
    else
    {
       dmsg = msg_hash_to_str(MSG_NETPLAY_CLIENT_HANGUP);
+      netplay->is_connected = false;
    }
    RARCH_LOG("%s\n", dmsg);
    runloop_msg_queue_push(dmsg, 1, 180, false);
diff --git a/network/netplay/netplay_private.h b/network/netplay/netplay_private.h
index 272c96cfae..2f49860eac 100644
--- a/network/netplay/netplay_private.h
+++ b/network/netplay/netplay_private.h
@@ -330,6 +330,9 @@ struct netplay
    /* Are we the server? */
    bool is_server;
 
+   /* Are we the connected? */
+   bool is_connected;
+
    /* Our nickname */
    char nick[NETPLAY_NICK_LEN];
 
diff --git a/network/netplay/netplay_room_parse.c b/network/netplay/netplay_room_parse.c
index e62fb28325..a3f6429987 100644
--- a/network/netplay/netplay_room_parse.c
+++ b/network/netplay/netplay_room_parse.c
@@ -103,7 +103,7 @@ static JSON_Parser_HandlerResult JSON_CALL StringHandler(JSON_Parser parser, cha
    {
       if (pValue && length)
       {
-         if (pCtx->cur_field && memcmp(pCtx->cur_field, "game_crc", 8) == 0)
+         if (pCtx->cur_field && string_is_equal_fast(pCtx->cur_field, "game_crc", 8))
          {
             /* CRC comes in as a string but it is stored as an unsigned casted to int */
             *((int*)pCtx->cur_member) = (int)strtoul(pValue, NULL, 16);
@@ -185,7 +185,7 @@ static JSON_Parser_HandlerResult JSON_CALL ObjectMemberHandler(JSON_Parser parse
    if (!pValue || !length)
       return JSON_Parser_Continue;
 
-   if (pCtx->state == STATE_OBJECT_START && memcmp(pValue, "fields", 6) == 0)
+   if (pCtx->state == STATE_OBJECT_START && string_is_equal_fast(pValue, "fields", 6))
       pCtx->state = STATE_FIELDS_START;
 
    if (pCtx->state == STATE_FIELDS_OBJECT_START)
@@ -195,46 +195,46 @@ static JSON_Parser_HandlerResult JSON_CALL ObjectMemberHandler(JSON_Parser parse
 
       pCtx->cur_field = strdup(pValue);
 
-      if (memcmp(pValue, "username", 8) == 0)
+      if (string_is_equal_fast(pValue, "username", 8))
       {
          pCtx->cur_member = &rooms->cur->nickname;
          pCtx->cur_member_size = sizeof(rooms->cur->nickname);
       }
-      else if (memcmp(pValue, "game_name", 9) == 0)
+      else if (string_is_equal_fast(pValue, "game_name", 9))
       {
          pCtx->cur_member = &rooms->cur->gamename;
          pCtx->cur_member_size = sizeof(rooms->cur->gamename);
       }
-      else if (memcmp(pValue, "core_name", 9) == 0)
+      else if (string_is_equal_fast(pValue, "core_name", 9))
       {
          pCtx->cur_member = &rooms->cur->corename;
          pCtx->cur_member_size = sizeof(rooms->cur->corename);
       }
-      else if (memcmp(pValue, "ip", 2) == 0)
+      else if (string_is_equal_fast(pValue, "ip", 2))
       {
          pCtx->cur_member = &rooms->cur->address;
          pCtx->cur_member_size = sizeof(rooms->cur->address);
       }
-      else if (memcmp(pValue, "port", 4) == 0)
+      else if (string_is_equal_fast(pValue, "port", 4))
          pCtx->cur_member = &rooms->cur->port;
-      else if (memcmp(pValue, "game_crc", 8) == 0)
+      else if (string_is_equal_fast(pValue, "game_crc", 8))
          pCtx->cur_member = &rooms->cur->gamecrc;
-      else if (memcmp(pValue, "core_version", 12) == 0)
+      else if (string_is_equal_fast(pValue, "core_version", 12))
       {
          pCtx->cur_member = &rooms->cur->coreversion;
          pCtx->cur_member_size = sizeof(rooms->cur->coreversion);
       }
-      else if (memcmp(pValue, "has_password", 12) == 0)
+      else if (string_is_equal_fast(pValue, "has_password", 12))
          pCtx->cur_member = &rooms->cur->has_password;
-      else if (memcmp(pValue, "has_spectate_password", 21) == 0)
+      else if (string_is_equal_fast(pValue, "has_spectate_password", 21))
          pCtx->cur_member = &rooms->cur->has_spectate_password;
-      else if (memcmp(pValue, "fixed", 5) == 0)
+      else if (string_is_equal_fast(pValue, "fixed", 5))
          pCtx->cur_member = &rooms->cur->fixed;
-      else if (memcmp(pValue, "mitm_ip", 7) == 0)
+      else if (string_is_equal_fast(pValue, "mitm_ip", 7))
          pCtx->cur_member = &rooms->cur->mitm_address;
-      else if (memcmp(pValue, "mitm_port", 9) == 0)
+      else if (string_is_equal_fast(pValue, "mitm_port", 9))
          pCtx->cur_member = &rooms->cur->mitm_port;
-      else if (memcmp(pValue, "host_method", 11) == 0)
+      else if (string_is_equal_fast(pValue, "host_method", 11))
          pCtx->cur_member = &rooms->cur->host_method;
       else
       {
diff --git a/paths.c b/paths.c
index 3752c9193b..fd36464cc4 100644
--- a/paths.c
+++ b/paths.c
@@ -42,7 +42,6 @@
 #include "core.h"
 #include "msg_hash.h"
 #include "retroarch.h"
-#include "runloop.h"
 #include "verbosity.h"
 #include "tasks/tasks_internal.h"
 
diff --git a/performance_counters.c b/performance_counters.c
index e1661ffcc6..95437300d5 100644
--- a/performance_counters.c
+++ b/performance_counters.c
@@ -27,7 +27,7 @@
 
 #include "performance_counters.h"
 
-#include "runloop.h"
+#include "retroarch.h"
 #include "verbosity.h"
 
 #ifdef _WIN32
@@ -64,7 +64,7 @@ unsigned retro_get_perf_count_libretro(void)
 void rarch_perf_register(struct retro_perf_counter *perf)
 {
    if (
-            !runloop_ctl(RUNLOOP_CTL_IS_PERFCNT_ENABLE, NULL)
+            !rarch_ctl(RARCH_CTL_IS_PERFCNT_ENABLE, NULL)
          || perf->registered
          || perf_ptr_rarch >= MAX_COUNTERS
       )
@@ -107,7 +107,7 @@ static void log_counters(struct retro_perf_counter **counters, unsigned num)
 
 void rarch_perf_log(void)
 {
-   if (!runloop_ctl(RUNLOOP_CTL_IS_PERFCNT_ENABLE, NULL))
+   if (!rarch_ctl(RARCH_CTL_IS_PERFCNT_ENABLE, NULL))
       return;
 
    RARCH_LOG("[PERF]: Performance counters (RetroArch):\n");
diff --git a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj
index 4b2ab92e6d..6020be055d 100644
--- a/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj
+++ b/pkg/apple/RetroArch_iOS.xcodeproj/project.pbxproj
@@ -372,11 +372,14 @@
 				LastUpgradeCheck = 0450;
 				ORGANIZATIONNAME = RetroArch;
 				TargetAttributes = {
+					0FDA2A701BE1AFA800F2B5DA = {
+						DevelopmentTeam = UK699V5ZS8;
+					};
 					503700861ACA18E400A51A37 = {
-						DevelopmentTeam = YLQUB5DVUQ;
+						DevelopmentTeam = UK699V5ZS8;
 					};
 					96AFAE2416C1D4EA009DE44C = {
-						DevelopmentTeam = YLQUB5DVUQ;
+						DevelopmentTeam = UK699V5ZS8;
 					};
 				};
 			};
@@ -502,6 +505,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
+				DEVELOPMENT_TEAM = UK699V5ZS8;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
@@ -583,6 +587,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
+				DEVELOPMENT_TEAM = UK699V5ZS8;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
@@ -718,6 +723,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
+				DEVELOPMENT_TEAM = UK699V5ZS8;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
@@ -778,6 +784,7 @@
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch6;
 				PRODUCT_NAME = "RetroArch copy";
 				PROVISIONING_PROFILE = "";
 				VALID_ARCHS = armv7;
@@ -795,6 +802,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
+				DEVELOPMENT_TEAM = UK699V5ZS8;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
@@ -905,6 +913,7 @@
 					"-DHAVE_SHADERPIPELINE",
 					"-D_LZMA_UINT32_IS_ULONG",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArch6;
 				PRODUCT_NAME = "RetroArch copy";
 				PROVISIONING_PROFILE = "";
 				VALID_ARCHS = armv7;
@@ -1070,6 +1079,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
+				DEVELOPMENT_TEAM = UK699V5ZS8;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
@@ -1132,6 +1142,7 @@
 					"-DHAVE_BTSTACK",
 					"-DHAVE_AVFOUNDATION",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchG;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				VALID_ARCHS = armv7;
@@ -1150,6 +1161,7 @@
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_RESOURCE_RULES_PATH = "$(SDKROOT)/ResourceRules.plist";
+				DEVELOPMENT_TEAM = UK699V5ZS8;
 				ENABLE_BITCODE = NO;
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				GCC_PREFIX_HEADER = "";
@@ -1266,6 +1278,7 @@
 					"-DHAVE_BTSTACK",
 					"-DHAVE_AVFOUNDATION",
 				);
+				PRODUCT_BUNDLE_IDENTIFIER = com.libretro.RetroArchG;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE = "";
 				VALID_ARCHS = armv7;
diff --git a/record/record_driver.c b/record/record_driver.c
index 5adb9842db..467d24e9d5 100644
--- a/record/record_driver.c
+++ b/record/record_driver.c
@@ -31,7 +31,6 @@
 #include "../driver.h"
 #include "../gfx/video_driver.h"
 #include "../retroarch.h"
-#include "../runloop.h"
 #include "../verbosity.h"
 #include "../msg_hash.h"
 #include "../list_special.h"
diff --git a/retroarch.c b/retroarch.c
index 259827db50..70fa72e2b4 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -25,11 +25,13 @@
 #endif
 
 #include <stdlib.h>
+#include <stdarg.h>
 #include <stdint.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>
 #include <setjmp.h>
+#include <math.h>
 
 #include <boolean.h>
 #include <string/stdstring.h>
@@ -37,11 +39,14 @@
 
 #include <compat/strl.h>
 #include <compat/getopt.h>
+#include <audio/audio_mixer.h>
 #include <compat/posix_string.h>
 #include <file/file_path.h>
 #include <retro_stat.h>
 #include <retro_assert.h>
 #include <retro_miscellaneous.h>
+#include <queues/message_queue.h>
+#include <queues/task_queue.h>
 #include <rthreads/rthreads.h>
 #include <features/features_cpu.h>
 
@@ -55,33 +60,54 @@
 
 #ifdef HAVE_MENU
 #include "menu/menu_driver.h"
+#include "menu/menu_event.h"
+#include "menu/widgets/menu_dialog.h"
+#endif
+
+#ifdef HAVE_CHEEVOS
+#include "cheevos/cheevos.h"
 #endif
 
 #ifdef HAVE_NETWORKING
 #include "network/netplay/netplay.h"
 #endif
 
+#if defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB)
+#include "network/httpserver/httpserver.h"
+#endif
+
+#ifdef HAVE_THREADS
+#include <rthreads/rthreads.h>
+#endif
+
+#include "autosave.h"
 #include "config.features.h"
 #include "content.h"
 #include "core_type.h"
 #include "core_info.h"
 #include "dynamic.h"
 #include "driver.h"
+#include "input/input_driver.h"
 #include "input/input_config.h"
+#include "input/input_keyboard.h"
 #include "msg_hash.h"
 #include "movie.h"
 #include "dirs.h"
 #include "paths.h"
 #include "file_path_special.h"
+#include "ui/ui_companion_driver.h"
 #include "verbosity.h"
 
 #include "frontend/frontend_driver.h"
 #include "audio/audio_driver.h"
+#include "camera/camera_driver.h"
 #include "record/record_driver.h"
 #include "core.h"
 #include "configuration.h"
-#include "runloop.h"
+#include "list_special.h"
+#include "managers/core_option_manager.h"
 #include "managers/cheat_manager.h"
+#include "managers/state_manager.h"
 #include "tasks/tasks_internal.h"
 
 #include "version.h"
@@ -98,6 +124,15 @@
    retroarch_fail(1, "validate_cpu_features()"); \
 } while(0)
 
+#ifdef HAVE_ZLIB
+#define DEFAULT_EXT "zip"
+#else
+#define DEFAULT_EXT ""
+#endif
+
+#define runloop_cmd_triggered(trigger_input, id) (BIT64_GET(trigger_input, id))
+#define runloop_cmd_pressed(old_input, id)       (BIT64_GET(old_input, id))
+
 /* Descriptive names for options without short variant.
  *
  * Please keep the name in sync with the option name.
@@ -125,11 +160,35 @@ enum
    RA_OPT_MAX_FRAMES
 };
 
+enum  runloop_state
+{
+   RUNLOOP_STATE_NONE = 0,
+   RUNLOOP_STATE_ITERATE,
+   RUNLOOP_STATE_SLEEP,
+   RUNLOOP_STATE_MENU_ITERATE,
+   RUNLOOP_STATE_END,
+   RUNLOOP_STATE_QUIT
+};
+
+typedef struct runloop_ctx_msg_info
+{
+   const char *msg;
+   unsigned prio;
+   unsigned duration;
+   bool flush;
+} runloop_ctx_msg_info_t;
+
 static jmp_buf error_sjlj_context;
 static enum rarch_core_type current_core_type           = CORE_TYPE_PLAIN;
 static enum rarch_core_type explicit_current_core_type  = CORE_TYPE_PLAIN;
 static char error_string[255]                           = {0};
 
+#ifdef HAVE_THREAD_STORAGE
+static sthread_tls_t rarch_tls;
+const void *MAGIC_POINTER                               = (void*)0xB16B00B5;
+#endif
+
+
 static retro_bits_t has_set_libretro_device;
 static bool has_set_core                                = false;
 static bool has_set_username                            = false;
@@ -151,6 +210,105 @@ static bool has_set_ups_pref                            = false;
 static bool has_set_bps_pref                            = false;
 static bool has_set_ips_pref                            = false;
 
+static bool rarch_is_sram_load_disabled                 = false;
+static bool rarch_is_sram_save_disabled                 = false;
+static bool rarch_use_sram                              = false;
+static bool rarch_ups_pref                              = false;
+static bool rarch_bps_pref                              = false;
+static bool rarch_ips_pref                              = false;
+static bool rarch_patch_blocked                         = false;
+
+static rarch_system_info_t runloop_system;
+static struct retro_frame_time_callback runloop_frame_time;
+static retro_keyboard_event_t runloop_key_event            = NULL;
+static retro_keyboard_event_t runloop_frontend_key_event   = NULL;
+static core_option_manager_t *runloop_core_options         = NULL;
+#ifdef HAVE_THREADS
+static slock_t *_runloop_msg_queue_lock                    = NULL;
+#endif
+static msg_queue_t *runloop_msg_queue                      = NULL;
+static unsigned runloop_pending_windowed_scale             = 0;
+static retro_usec_t runloop_frame_time_last                = 0;
+static unsigned runloop_max_frames                         = 0;
+static bool runloop_force_nonblock                         = false;
+static bool runloop_paused                                 = false;
+static bool runloop_idle                                   = false;
+static bool runloop_exec                                   = false;
+static bool runloop_slowmotion                             = false;
+static bool runloop_shutdown_initiated                     = false;
+static bool runloop_core_shutdown_initiated                = false;
+static bool runloop_perfcnt_enable                         = false;
+static bool runloop_overrides_active                       = false;
+static bool runloop_game_options_active                    = false;
+static bool runloop_missing_bios                           = false;
+static bool runloop_autosave                               = false;
+static retro_time_t frame_limit_minimum_time               = 0.0;
+static retro_time_t frame_limit_last_time                  = 0.0;
+
+static void retroarch_msg_queue_deinit(void)
+{
+   if (!runloop_msg_queue)
+      return;
+
+#ifdef HAVE_THREADS
+   slock_lock(_runloop_msg_queue_lock);
+#endif
+
+   msg_queue_free(runloop_msg_queue);
+
+#ifdef HAVE_THREADS
+   slock_unlock(_runloop_msg_queue_lock);
+#endif
+
+#ifdef HAVE_THREADS
+   slock_free(_runloop_msg_queue_lock);
+   _runloop_msg_queue_lock = NULL;
+#endif
+
+   runloop_msg_queue = NULL;
+}
+
+static void retroarch_msg_queue_init(void)
+{
+   retroarch_msg_queue_deinit();
+   runloop_msg_queue = msg_queue_new(8);
+   retro_assert(runloop_msg_queue);
+
+#ifdef HAVE_THREADS
+   _runloop_msg_queue_lock = slock_new();
+   retro_assert(_runloop_msg_queue_lock);
+#endif
+}
+
+static void global_free(void)
+{
+   global_t *global = NULL;
+   command_event(CMD_EVENT_TEMPORARY_CONTENT_DEINIT, NULL);
+
+   path_deinit_subsystem();
+   command_event(CMD_EVENT_RECORD_DEINIT, NULL);
+   command_event(CMD_EVENT_LOG_FILE_DEINIT, NULL);
+
+   rarch_block_config_read               = false;
+   rarch_is_sram_load_disabled           = false;
+   rarch_is_sram_save_disabled           = false;
+   rarch_use_sram                        = false;
+   rarch_bps_pref                        = false;
+   rarch_ips_pref                        = false;
+   rarch_ups_pref                        = false;
+   rarch_patch_blocked                   = false;
+   runloop_overrides_active              = false;
+
+   core_unset_input_descriptors();
+
+   global = global_get_ptr();
+   path_clear_all();
+   dir_clear_all();
+   memset(global, 0, sizeof(struct global));
+   retroarch_override_setting_free_state();
+}
+
+
 static void retroarch_print_features(void)
 {
    puts("");
@@ -482,15 +640,15 @@ static void retroarch_parse_input(int argc, char *argv[])
 
    retroarch_override_setting_free_state();
 
-   rarch_ctl(RARCH_CTL_USERNAME_UNSET, NULL);
-   rarch_ctl(RARCH_CTL_UNSET_UPS_PREF, NULL);
-   rarch_ctl(RARCH_CTL_UNSET_IPS_PREF, NULL);
-   rarch_ctl(RARCH_CTL_UNSET_BPS_PREF, NULL);
+   has_set_username                      = false;
+   rarch_ups_pref                        = false;
+   rarch_ips_pref                        = false;
+   rarch_bps_pref                        = false;
    *global->name.ups                     = '\0';
    *global->name.bps                     = '\0';
    *global->name.ips                     = '\0';
 
-   runloop_ctl(RUNLOOP_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
+   rarch_ctl(RARCH_CTL_UNSET_OVERRIDES_ACTIVE, NULL);
 
    /* Make sure we can call retroarch_parse_input several times ... */
    optind    = 0;
@@ -580,7 +738,7 @@ static void retroarch_parse_input(int argc, char *argv[])
             break;
 
          case 'f':
-            rarch_ctl(RARCH_CTL_SET_FORCE_FULLSCREEN, NULL);
+            rarch_force_fullscreen = true;
             break;
 
          case 'S':
@@ -648,7 +806,7 @@ static void retroarch_parse_input(int argc, char *argv[])
             }
             else if (path_file_exists(optarg))
             {
-               runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, optarg);
+               rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, optarg);
                retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_LIBRETRO, NULL);
 
                /* We requested explicit core, so use PLAIN core type. */
@@ -678,16 +836,16 @@ static void retroarch_parse_input(int argc, char *argv[])
             break;
 
          case 'M':
-            if (memcmp(optarg, "noload-nosave", 13) == 0)
+            if (string_is_equal_fast(optarg, "noload-nosave", 13))
             {
-               rarch_ctl(RARCH_CTL_SET_SRAM_LOAD_DISABLED, NULL);
-               rarch_ctl(RARCH_CTL_SET_SRAM_SAVE_DISABLED, NULL);
+               rarch_is_sram_load_disabled = true;
+               rarch_is_sram_save_disabled = true;
             }
-            else if (memcmp(optarg, "noload-save", 11) == 0)
-               rarch_ctl(RARCH_CTL_SET_SRAM_LOAD_DISABLED, NULL);
-            else if (memcmp(optarg, "load-nosave", 11) == 0)
-               rarch_ctl(RARCH_CTL_SET_SRAM_SAVE_DISABLED, NULL);
-            else if (memcmp(optarg, "load-save", 9) != 0)
+            else if (string_is_equal_fast(optarg, "noload-save", 11))
+               rarch_is_sram_load_disabled = true;
+            else if (string_is_equal_fast(optarg, "load-nosave", 11))
+               rarch_is_sram_save_disabled = true;
+            else if (string_is_not_equal_fast(optarg, "load-save", 9))
             {
                RARCH_ERR("Invalid argument in --sram-mode.\n");
                retroarch_print_help(argv[0]);
@@ -762,21 +920,21 @@ static void retroarch_parse_input(int argc, char *argv[])
          case RA_OPT_BPS:
             strlcpy(global->name.bps, optarg,
                   sizeof(global->name.bps));
-            rarch_ctl(RARCH_CTL_SET_BPS_PREF, NULL);
+            rarch_bps_pref = true;
             retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_BPS_PREF, NULL);
             break;
 
          case 'U':
             strlcpy(global->name.ups, optarg,
                   sizeof(global->name.ups));
-            rarch_ctl(RARCH_CTL_SET_UPS_PREF, NULL);
+            rarch_ups_pref = true;
             retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_UPS_PREF, NULL);
             break;
 
          case RA_OPT_IPS:
             strlcpy(global->name.ips, optarg,
                   sizeof(global->name.ips));
-            rarch_ctl(RARCH_CTL_SET_IPS_PREF, NULL);
+            rarch_ips_pref = true;
             retroarch_override_setting_set(RARCH_OVERRIDE_SETTING_IPS_PREF, NULL);
             break;
 
@@ -795,7 +953,9 @@ static void retroarch_parse_input(int argc, char *argv[])
          case RA_OPT_NICK:
             {
                settings_t *settings  = config_get_ptr();
-               rarch_ctl(RARCH_CTL_USERNAME_SET, NULL);
+
+               has_set_username = true;
+
                strlcpy(settings->paths.username, optarg,
                      sizeof(settings->paths.username));
             }
@@ -822,10 +982,7 @@ static void retroarch_parse_input(int argc, char *argv[])
             break;
 
          case RA_OPT_MAX_FRAMES:
-            {
-               unsigned max_frames = (unsigned)strtoul(optarg, NULL, 10);
-               runloop_ctl(RUNLOOP_CTL_SET_MAX_FRAMES, &max_frames);
-            }
+            runloop_max_frames  = (unsigned)strtoul(optarg, NULL, 10);
             break;
 
          case RA_OPT_SUBSYSTEM:
@@ -912,7 +1069,7 @@ static bool retroarch_init_state(void)
    video_driver_set_active();
    audio_driver_set_active();
 
-   rarch_ctl(RARCH_CTL_UNSET_FORCE_FULLSCREEN, NULL);
+   rarch_force_fullscreen = false;
 
    return true;
 }
@@ -1069,7 +1226,7 @@ bool retroarch_main_init(int argc, char *argv[])
    retroarch_validate_cpu_features();
    config_load();
 
-   runloop_ctl(RUNLOOP_CTL_TASK_INIT, NULL);
+   rarch_ctl(RARCH_CTL_TASK_INIT, NULL);
 
    retroarch_main_init_media();
 
@@ -1128,21 +1285,77 @@ error:
    return false;
 }
 
+bool retroarch_is_on_main_thread(void)
+{
+#ifdef HAVE_THREAD_STORAGE
+   if (sthread_tls_get(&rarch_tls) != MAGIC_POINTER)
+      return false;
+#endif
+   return true;
+}
+
+void rarch_menu_running(void)
+{
+#ifdef HAVE_MENU
+   menu_driver_ctl(RARCH_MENU_CTL_SET_TOGGLE, NULL);
+   /* Prevent stray input */
+   input_driver_set_flushing_input();
+#endif
+#ifdef HAVE_OVERLAY
+   {
+      settings_t *settings                    = config_get_ptr();
+      if (settings && settings->bools.input_overlay_hide_in_menu)
+         command_event(CMD_EVENT_OVERLAY_DEINIT, NULL);
+   }
+#endif
+}
+
+void rarch_menu_running_finished(void)
+{
+#ifdef HAVE_MENU
+   menu_driver_ctl(RARCH_MENU_CTL_UNSET_TOGGLE, NULL);
+   /* Prevent stray input */
+   input_driver_set_flushing_input();
+#endif
+   video_driver_set_texture_enable(false, false);
+#ifdef HAVE_OVERLAY
+   {
+      settings_t *settings                    = config_get_ptr();
+      if (settings && settings->bools.input_overlay_hide_in_menu)
+         command_event(CMD_EVENT_OVERLAY_INIT, NULL);
+   }
+#endif
+}
+
+/**
+ * rarch_game_specific_options:
+ *
+ * Returns: true (1) if a game specific core
+ * options path has been found,
+ * otherwise false (0).
+ **/
+static bool rarch_game_specific_options(char **output)
+{
+   char game_path[8192];
+
+   game_path[0] ='\0';
+
+   if (!retroarch_validate_game_options(game_path,
+            sizeof(game_path), false))
+         return false;
+
+   if (!config_file_exists(game_path))
+      return false;
+
+   RARCH_LOG("%s %s\n",
+         msg_hash_to_str(MSG_GAME_SPECIFIC_CORE_OPTIONS_FOUND_AT),
+         game_path);
+   *output = strdup(game_path);
+   return true;
+}
 
 bool rarch_ctl(enum rarch_ctl_state state, void *data)
 {
-   static bool rarch_is_sram_load_disabled = false;
-   static bool rarch_is_sram_save_disabled = false;
-   static bool rarch_use_sram              = false;
-   static bool rarch_ups_pref              = false;
-   static bool rarch_bps_pref              = false;
-   static bool rarch_ips_pref              = false;
-   static bool rarch_patch_blocked         = false;
-#ifdef HAVE_THREAD_STORAGE
-   static sthread_tls_t rarch_tls;
-   const void *MAGIC_POINTER = (void*)0xB16B00B5;
-#endif
-
    switch(state)
    {
       case RARCH_CTL_IS_PATCH_BLOCKED:
@@ -1155,30 +1368,19 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          break;
       case RARCH_CTL_IS_BPS_PREF:
          return rarch_bps_pref;
-      case RARCH_CTL_SET_BPS_PREF:
-         rarch_bps_pref = true;
-         break;
       case RARCH_CTL_UNSET_BPS_PREF:
          rarch_bps_pref = false;
          break;
       case RARCH_CTL_IS_UPS_PREF:
          return rarch_ups_pref;
-      case RARCH_CTL_SET_UPS_PREF:
-         rarch_ups_pref = true;
-         break;
       case RARCH_CTL_UNSET_UPS_PREF:
          rarch_ups_pref = false;
          break;
       case RARCH_CTL_IS_IPS_PREF:
          return rarch_ips_pref;
-      case RARCH_CTL_SET_IPS_PREF:
-         rarch_ips_pref = true;
-         break;
       case RARCH_CTL_UNSET_IPS_PREF:
          rarch_ips_pref = false;
          break;
-      case RARCH_CTL_IS_PLAIN_CORE:
-         return (current_core_type == CORE_TYPE_PLAIN);
       case RARCH_CTL_IS_DUMMY_CORE:
          return (current_core_type == CORE_TYPE_DUMMY);
       case RARCH_CTL_USERNAME_SET:
@@ -1198,31 +1400,27 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          rarch_block_config_read = false;
          rarch_force_fullscreen  = false;
 
-         runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_DEINIT, NULL);
+         retroarch_msg_queue_deinit();
          driver_ctl(RARCH_DRIVER_CTL_UNINIT_ALL, NULL);
          command_event(CMD_EVENT_LOG_FILE_DEINIT, NULL);
 
-         runloop_ctl(RUNLOOP_CTL_STATE_FREE,  NULL);
-         runloop_ctl(RUNLOOP_CTL_GLOBAL_FREE, NULL);
-         runloop_ctl(RUNLOOP_CTL_DATA_DEINIT, NULL);
+         rarch_ctl(RARCH_CTL_STATE_FREE,  NULL);
+         global_free();
+         rarch_ctl(RARCH_CTL_DATA_DEINIT, NULL);
          config_free();
          break;
-      case RARCH_CTL_DEINIT:
-         if (!rarch_ctl(RARCH_CTL_IS_INITED, NULL))
-            return false;
-
-         driver_ctl(RARCH_DRIVER_CTL_UNINIT_ALL, NULL);
-         break;
       case RARCH_CTL_PREINIT:
 
          command_event(CMD_EVENT_HISTORY_DEINIT, NULL);
 
          config_init();
 
-         runloop_ctl(RUNLOOP_CTL_CLEAR_STATE, NULL);
+         driver_ctl(RARCH_DRIVER_CTL_DEINIT,  NULL);
+         rarch_ctl(RARCH_CTL_STATE_FREE,  NULL);
+         global_free();
          break;
       case RARCH_CTL_MAIN_DEINIT:
-         if (!rarch_ctl(RARCH_CTL_IS_INITED, NULL))
+         if (!rarch_is_inited)
             return false;
          command_event(CMD_EVENT_NETPLAY_DEINIT, NULL);
          command_event(CMD_EVENT_COMMAND_DEINIT, NULL);
@@ -1252,7 +1450,9 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
 #endif
          break;
       case RARCH_CTL_INIT:
-         rarch_ctl(RARCH_CTL_DEINIT, NULL);
+         if (rarch_is_inited)
+            driver_ctl(RARCH_DRIVER_CTL_UNINIT_ALL, NULL);
+
 #ifdef HAVE_THREAD_STORAGE
          sthread_tls_create(&rarch_tls);
          sthread_tls_set(&rarch_tls, MAGIC_POINTER);
@@ -1263,34 +1463,13 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
             for (i = 0; i < MAX_USERS; i++)
                input_config_set_device(i, RETRO_DEVICE_JOYPAD);
          }
-         runloop_ctl(RUNLOOP_CTL_HTTPSERVER_INIT, NULL);
-         runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_INIT, NULL);
-         break;
-      case RARCH_CTL_SET_PATHS_REDIRECT:
-         {
-            bool contentless = false;
-            bool is_inited   = false;
-            content_get_status(&contentless, &is_inited);
-
-            path_set_redirect();
-         }
+         rarch_ctl(RARCH_CTL_HTTPSERVER_INIT, NULL);
+         retroarch_msg_queue_init();
          break;
       case RARCH_CTL_IS_SRAM_LOAD_DISABLED:
          return rarch_is_sram_load_disabled;
-      case RARCH_CTL_SET_SRAM_LOAD_DISABLED:
-         rarch_is_sram_load_disabled = true;
-         break;
-      case RARCH_CTL_UNSET_SRAM_LOAD_DISABLED:
-         rarch_is_sram_load_disabled = false;
-         break;
       case RARCH_CTL_IS_SRAM_SAVE_DISABLED:
          return rarch_is_sram_save_disabled;
-      case RARCH_CTL_SET_SRAM_SAVE_DISABLED:
-         rarch_is_sram_save_disabled = true;
-         break;
-      case RARCH_CTL_UNSET_SRAM_SAVE_DISABLED:
-         rarch_is_sram_save_disabled = false;
-         break;
       case RARCH_CTL_IS_SRAM_USED:
          return rarch_use_sram;
       case RARCH_CTL_SET_SRAM_ENABLE:
@@ -1298,7 +1477,7 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
             bool contentless = false;
             bool is_inited   = false;
             content_get_status(&contentless, &is_inited);
-            rarch_use_sram = rarch_ctl(RARCH_CTL_IS_PLAIN_CORE, NULL)
+            rarch_use_sram = (current_core_type == CORE_TYPE_PLAIN)
                && !contentless;
          }
          break;
@@ -1308,14 +1487,6 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
       case RARCH_CTL_UNSET_SRAM_ENABLE:
          rarch_use_sram = false;
          break;
-      case RARCH_CTL_SET_FORCE_FULLSCREEN:
-         rarch_force_fullscreen = true;
-         break;
-      case RARCH_CTL_UNSET_FORCE_FULLSCREEN:
-         rarch_force_fullscreen = false;
-         break;
-      case RARCH_CTL_IS_FORCE_FULLSCREEN:
-         return rarch_force_fullscreen;
       case RARCH_CTL_SET_BLOCK_CONFIG_READ:
          rarch_block_config_read = true;
          break;
@@ -1324,37 +1495,344 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
          break;
       case RARCH_CTL_IS_BLOCK_CONFIG_READ:
          return rarch_block_config_read;
-      case RARCH_CTL_MENU_RUNNING:
-#ifdef HAVE_MENU
-         menu_driver_ctl(RARCH_MENU_CTL_SET_TOGGLE, NULL);
-#endif
-#ifdef HAVE_OVERLAY
-         {
-            settings_t *settings                    = config_get_ptr();
-            if (settings && settings->bools.input_overlay_hide_in_menu)
-               command_event(CMD_EVENT_OVERLAY_DEINIT, NULL);
-         }
-#endif
+      case RARCH_CTL_SYSTEM_INFO_INIT:
+         core_get_system_info(&runloop_system.info);
+
+         if (!runloop_system.info.library_name)
+            runloop_system.info.library_name = msg_hash_to_str(MSG_UNKNOWN);
+         if (!runloop_system.info.library_version)
+            runloop_system.info.library_version = "v0";
+
+         video_driver_set_title_buf();
+
+         strlcpy(runloop_system.valid_extensions,
+               runloop_system.info.valid_extensions ?
+               runloop_system.info.valid_extensions : DEFAULT_EXT,
+               sizeof(runloop_system.valid_extensions));
          break;
-      case RARCH_CTL_MENU_RUNNING_FINISHED:
-#ifdef HAVE_MENU
-         menu_driver_ctl(RARCH_MENU_CTL_UNSET_TOGGLE, NULL);
-#endif
-         video_driver_set_texture_enable(false, false);
-#ifdef HAVE_OVERLAY
+      case RARCH_CTL_GET_CORE_OPTION_SIZE:
          {
-            settings_t *settings                    = config_get_ptr();
-            if (settings && settings->bools.input_overlay_hide_in_menu)
-               command_event(CMD_EVENT_OVERLAY_INIT, NULL);
+            unsigned *idx = (unsigned*)data;
+            if (!idx)
+               return false;
+            *idx = (unsigned)core_option_manager_size(runloop_core_options);
          }
-#endif
          break;
-      case RARCH_CTL_IS_MAIN_THREAD:
-#ifdef HAVE_THREAD_STORAGE
-         return sthread_tls_get(&rarch_tls) == MAGIC_POINTER;
+      case RARCH_CTL_HAS_CORE_OPTIONS:
+         return runloop_core_options;
+      case RARCH_CTL_CORE_OPTIONS_LIST_GET:
+         {
+            core_option_manager_t **coreopts = (core_option_manager_t**)data;
+            if (!coreopts)
+               return false;
+            *coreopts = runloop_core_options;
+         }
+         break;
+      case RARCH_CTL_SYSTEM_INFO_FREE:
+
+         /* No longer valid. */
+         if (runloop_system.subsystem.data)
+            free(runloop_system.subsystem.data);
+         runloop_system.subsystem.data = NULL;
+         runloop_system.subsystem.size = 0;
+
+         if (runloop_system.ports.data)
+            free(runloop_system.ports.data);
+         runloop_system.ports.data = NULL;
+         runloop_system.ports.size = 0;
+
+         if (runloop_system.mmaps.descriptors)
+            free((void *)runloop_system.mmaps.descriptors);
+         runloop_system.mmaps.descriptors     = NULL;
+         runloop_system.mmaps.num_descriptors = 0;
+
+         runloop_key_event          = NULL;
+         runloop_frontend_key_event = NULL;
+
+         audio_driver_unset_callback();
+         memset(&runloop_system, 0, sizeof(rarch_system_info_t));
+         break;
+      case RARCH_CTL_SET_FRAME_TIME_LAST:
+         runloop_frame_time_last        = 0;
+         break;
+      case RARCH_CTL_SET_OVERRIDES_ACTIVE:
+         runloop_overrides_active = true;
+         break;
+      case RARCH_CTL_UNSET_OVERRIDES_ACTIVE:
+         runloop_overrides_active = false;
+         break;
+      case RARCH_CTL_IS_OVERRIDES_ACTIVE:
+         return runloop_overrides_active;
+      case RARCH_CTL_SET_MISSING_BIOS:
+         runloop_missing_bios = true;
+         break;
+      case RARCH_CTL_UNSET_MISSING_BIOS:
+         runloop_missing_bios = false;
+         break;
+      case RARCH_CTL_IS_MISSING_BIOS:
+         return runloop_missing_bios;
+      case RARCH_CTL_IS_GAME_OPTIONS_ACTIVE:
+         return runloop_game_options_active;
+      case RARCH_CTL_SET_FRAME_LIMIT:
+         {
+            settings_t *settings       = config_get_ptr();
+            struct retro_system_av_info *av_info =
+               video_viewport_get_system_av_info();
+            float fastforward_ratio              =
+               (settings->floats.fastforward_ratio == 0.0f)
+               ? 1.0f : settings->floats.fastforward_ratio;
+
+            frame_limit_last_time    = cpu_features_get_time_usec();
+            frame_limit_minimum_time = (retro_time_t)roundf(1000000.0f
+                  / (av_info->timing.fps * fastforward_ratio));
+         }
+         break;
+      case RARCH_CTL_GET_PERFCNT:
+         {
+            bool **perfcnt = (bool**)data;
+            if (!perfcnt)
+               return false;
+            *perfcnt = &runloop_perfcnt_enable;
+         }
+         break;
+      case RARCH_CTL_SET_PERFCNT_ENABLE:
+         runloop_perfcnt_enable = true;
+         break;
+      case RARCH_CTL_UNSET_PERFCNT_ENABLE:
+         runloop_perfcnt_enable = false;
+         break;
+      case RARCH_CTL_IS_PERFCNT_ENABLE:
+         return runloop_perfcnt_enable;
+      case RARCH_CTL_SET_NONBLOCK_FORCED:
+         runloop_force_nonblock = true;
+         break;
+      case RARCH_CTL_UNSET_NONBLOCK_FORCED:
+         runloop_force_nonblock = false;
+         break;
+      case RARCH_CTL_IS_NONBLOCK_FORCED:
+         return runloop_force_nonblock;
+      case RARCH_CTL_SET_FRAME_TIME:
+         {
+            const struct retro_frame_time_callback *info =
+               (const struct retro_frame_time_callback*)data;
+#ifdef HAVE_NETWORKING
+            /* retro_run() will be called in very strange and
+             * mysterious ways, have to disable it. */
+            if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
+               return false;
+#endif
+            runloop_frame_time = *info;
+         }
+         break;
+      case RARCH_CTL_GET_WINDOWED_SCALE:
+         {
+            unsigned **scale = (unsigned**)data;
+            if (!scale)
+               return false;
+            *scale       = (unsigned*)&runloop_pending_windowed_scale;
+         }
+         break;
+      case RARCH_CTL_SET_WINDOWED_SCALE:
+         {
+            unsigned *idx = (unsigned*)data;
+            if (!idx)
+               return false;
+            runloop_pending_windowed_scale = *idx;
+         }
+         break;
+      case RARCH_CTL_SET_LIBRETRO_PATH:
+         return path_set(RARCH_PATH_CORE, (const char*)data);
+      case RARCH_CTL_FRAME_TIME_FREE:
+         memset(&runloop_frame_time, 0,
+               sizeof(struct retro_frame_time_callback));
+         runloop_frame_time_last           = 0;
+         runloop_max_frames                = 0;
+         break;
+      case RARCH_CTL_STATE_FREE:
+         runloop_perfcnt_enable            = false;
+         runloop_idle                      = false;
+         runloop_paused                    = false;
+         runloop_slowmotion                = false;
+         runloop_overrides_active          = false;
+         runloop_autosave                  = false;
+         rarch_ctl(RARCH_CTL_FRAME_TIME_FREE, NULL);
+         break;
+      case RARCH_CTL_IS_IDLE:
+         return runloop_idle;
+      case RARCH_CTL_SET_IDLE:
+         {
+            bool *ptr = (bool*)data;
+            if (!ptr)
+               return false;
+            runloop_idle = *ptr;
+         }
+         break;
+      case RARCH_CTL_SET_PAUSED:
+         {
+            bool *ptr = (bool*)data;
+            if (!ptr)
+               return false;
+            runloop_paused = *ptr;
+         }
+         break;
+      case RARCH_CTL_IS_PAUSED:
+         return runloop_paused;
+      case RARCH_CTL_TASK_INIT:
+         {
+#ifdef HAVE_THREADS
+            settings_t *settings = config_get_ptr();
+            bool threaded_enable = settings->bools.threaded_data_runloop_enable;
 #else
-         return true;
+            bool threaded_enable = false;
 #endif
+            task_queue_deinit();
+            task_queue_init(threaded_enable, runloop_msg_queue_push);
+         }
+         break;
+      case RARCH_CTL_SET_CORE_SHUTDOWN:
+         runloop_core_shutdown_initiated = true;
+         break;
+      case RARCH_CTL_SET_SHUTDOWN:
+         runloop_shutdown_initiated = true;
+         break;
+      case RARCH_CTL_IS_SHUTDOWN:
+         return runloop_shutdown_initiated;
+      case RARCH_CTL_DATA_DEINIT:
+         task_queue_deinit();
+         break;
+      case RARCH_CTL_IS_CORE_OPTION_UPDATED:
+         if (!runloop_core_options)
+            return false;
+         return  core_option_manager_updated(runloop_core_options);
+      case RARCH_CTL_CORE_OPTION_PREV:
+         {
+            unsigned *idx = (unsigned*)data;
+            if (!idx)
+               return false;
+            core_option_manager_prev(runloop_core_options, *idx);
+            if (ui_companion_is_on_foreground())
+               ui_companion_driver_notify_refresh();
+         }
+         break;
+      case RARCH_CTL_CORE_OPTION_NEXT:
+         {
+            unsigned *idx = (unsigned*)data;
+            if (!idx)
+               return false;
+            core_option_manager_next(runloop_core_options, *idx);
+            if (ui_companion_is_on_foreground())
+               ui_companion_driver_notify_refresh();
+         }
+         break;
+      case RARCH_CTL_CORE_OPTIONS_GET:
+         {
+            struct retro_variable *var = (struct retro_variable*)data;
+
+            if (!runloop_core_options || !var)
+               return false;
+
+            RARCH_LOG("Environ GET_VARIABLE %s:\n", var->key);
+            core_option_manager_get(runloop_core_options, var);
+            RARCH_LOG("\t%s\n", var->value ? var->value :
+                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE));
+         }
+         break;
+      case RARCH_CTL_CORE_OPTIONS_INIT:
+         {
+            settings_t *settings              = config_get_ptr();
+            char *game_options_path           = NULL;
+            bool ret                          = false;
+            const struct retro_variable *vars =
+               (const struct retro_variable*)data;
+
+            if (settings && settings->bools.game_specific_options)
+               ret = rarch_game_specific_options(&game_options_path);
+
+            if(ret)
+            {
+               runloop_game_options_active = true;
+               runloop_core_options        =
+                  core_option_manager_new(game_options_path, vars);
+               free(game_options_path);
+            }
+            else
+            {
+               char buf[PATH_MAX_LENGTH];
+               const char *options_path          = NULL;
+
+               buf[0] = '\0';
+
+               if (settings)
+                  options_path = settings->paths.path_core_options;
+
+               if (string_is_empty(options_path) && !path_is_empty(RARCH_PATH_CONFIG))
+               {
+                  fill_pathname_resolve_relative(buf, path_get(RARCH_PATH_CONFIG),
+                        file_path_str(FILE_PATH_CORE_OPTIONS_CONFIG), sizeof(buf));
+                  options_path = buf;
+               }
+
+               runloop_game_options_active = false;
+
+               if (!string_is_empty(options_path))
+                  runloop_core_options =
+                     core_option_manager_new(options_path, vars);
+            }
+
+         }
+         break;
+      case RARCH_CTL_CORE_OPTIONS_DEINIT:
+         {
+            if (!runloop_core_options)
+               return false;
+
+            /* check if game options file was just created and flush
+               to that file instead */
+            if(!path_is_empty(RARCH_PATH_CORE_OPTIONS))
+            {
+               core_option_manager_flush_game_specific(runloop_core_options,
+                     path_get(RARCH_PATH_CORE_OPTIONS));
+               path_clear(RARCH_PATH_CORE_OPTIONS);
+            }
+            else
+               core_option_manager_flush(runloop_core_options);
+
+            if (runloop_game_options_active)
+               runloop_game_options_active = false;
+
+            if (runloop_core_options)
+               core_option_manager_free(runloop_core_options);
+            runloop_core_options          = NULL;
+         }
+         break;
+      case RARCH_CTL_KEY_EVENT_GET:
+         {
+            retro_keyboard_event_t **key_event =
+               (retro_keyboard_event_t**)data;
+            if (!key_event)
+               return false;
+            *key_event = &runloop_key_event;
+         }
+         break;
+      case RARCH_CTL_FRONTEND_KEY_EVENT_GET:
+         {
+            retro_keyboard_event_t **key_event =
+               (retro_keyboard_event_t**)data;
+            if (!key_event)
+               return false;
+            *key_event = &runloop_frontend_key_event;
+         }
+         break;
+      case RARCH_CTL_HTTPSERVER_INIT:
+#if defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB)
+         httpserver_init(8888);
+#endif
+         break;
+      case RARCH_CTL_HTTPSERVER_DESTROY:
+#if defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB)
+         httpserver_destroy();
+#endif
+         break;
       case RARCH_CTL_NONE:
       default:
          return false;
@@ -1363,6 +1841,10 @@ bool rarch_ctl(enum rarch_ctl_state state, void *data)
    return true;
 }
 
+bool retroarch_is_forced_fullscreen(void)
+{
+   return rarch_force_fullscreen;
+}
 
 bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, void *data)
 {
@@ -1676,10 +2158,661 @@ bool retroarch_main_quit(void)
 #endif
 #endif
 
-   runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
-#ifdef HAVE_MENU
-   rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
-#endif
+   runloop_shutdown_initiated = true;
+   rarch_menu_running_finished();
 
    return true;
 }
+
+global_t *global_get_ptr(void)
+{
+   static struct global g_extern;
+   return &g_extern;
+}
+
+
+void runloop_msg_queue_push(const char *msg,
+      unsigned prio, unsigned duration,
+      bool flush)
+{
+   runloop_ctx_msg_info_t msg_info;
+
+#ifdef HAVE_THREADS
+   slock_lock(_runloop_msg_queue_lock);
+#endif
+
+   if (flush)
+      msg_queue_clear(runloop_msg_queue);
+
+   msg_info.msg      = msg;
+   msg_info.prio     = prio;
+   msg_info.duration = duration;
+   msg_info.flush    = flush;
+
+   if (runloop_msg_queue)
+   {
+      msg_queue_push(runloop_msg_queue, msg_info.msg,
+            msg_info.prio, msg_info.duration);
+
+      if (ui_companion_is_on_foreground())
+      {
+         const ui_companion_driver_t *ui = ui_companion_get_ptr();
+         if (ui->msg_queue_push)
+            ui->msg_queue_push(msg_info.msg,
+                  msg_info.prio, msg_info.duration, msg_info.flush);
+      }
+   }
+
+#ifdef HAVE_THREADS
+   slock_unlock(_runloop_msg_queue_lock);
+#endif
+}
+
+
+void runloop_get_status(bool *is_paused, bool *is_idle, 
+      bool *is_slowmotion, bool *is_perfcnt_enable)
+{
+   *is_paused         = runloop_paused;
+   *is_idle           = runloop_idle;
+   *is_slowmotion     = runloop_slowmotion;
+   *is_perfcnt_enable = runloop_perfcnt_enable;
+}
+
+bool runloop_msg_queue_pull(const char **ret)
+{
+   if (!ret)
+      return false;
+#ifdef HAVE_THREADS
+   slock_lock(_runloop_msg_queue_lock);
+#endif
+   *ret = msg_queue_pull(runloop_msg_queue);
+#ifdef HAVE_THREADS
+   slock_unlock(_runloop_msg_queue_lock);
+#endif
+   return true;
+}
+
+/* Time to exit out of the main loop?
+ * Reasons for exiting:
+ * a) Shutdown environment callback was invoked.
+ * b) Quit key was pressed.
+ * c) Frame count exceeds or equals maximum amount of frames to run.
+ * d) Video driver no longer alive.
+ * e) End of BSV movie and BSV EOF exit is true. (TODO/FIXME - explain better)
+ */
+#define time_to_exit(quit_key_pressed) (runloop_shutdown_initiated || quit_key_pressed || !is_alive || bsv_movie_is_end_of_file() || ((runloop_max_frames != 0) && (frame_count >= runloop_max_frames)) || runloop_exec)
+
+#define runloop_check_cheevos() (settings->bools.cheevos_enable && cheevos_loaded && (!cheats_are_enabled && !cheats_were_enabled))
+
+static enum runloop_state runloop_check_state(
+      settings_t *settings,
+      uint64_t current_input,
+      uint64_t old_input,
+      uint64_t trigger_input,
+      bool input_driver_is_nonblock,
+      bool menu_is_alive,
+      unsigned *sleep_ms)
+{
+   static bool old_focus            = true;
+#ifdef HAVE_OVERLAY
+   static char prev_overlay_restore = false;
+#endif
+#ifdef HAVE_NETWORKING
+   bool tmp                         = false;
+#endif
+   bool is_focused                  = false;
+   bool is_alive                    = false;
+   uint64_t frame_count             = 0;
+   bool focused                     = true;
+   bool pause_pressed               = runloop_cmd_triggered(trigger_input, RARCH_PAUSE_TOGGLE);
+   bool pause_nonactive             = settings->bools.pause_nonactive;
+
+   video_driver_get_status(&frame_count, &is_alive, &is_focused);
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_OVERLAY_NEXT))
+      command_event(CMD_EVENT_OVERLAY_NEXT, NULL);
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY))
+   {
+      bool fullscreen_toggled = !runloop_paused
+#ifdef HAVE_MENU
+         || menu_is_alive;
+#endif
+
+      if (fullscreen_toggled)
+         command_event(CMD_EVENT_FULLSCREEN_TOGGLE, NULL);
+   }
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_GRAB_MOUSE_TOGGLE))
+      command_event(CMD_EVENT_GRAB_MOUSE_TOGGLE, NULL);
+
+
+#ifdef HAVE_OVERLAY
+   if (input_keyboard_ctl(
+            RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL))
+   {
+      prev_overlay_restore  = false;
+      command_event(CMD_EVENT_OVERLAY_INIT, NULL);
+   }
+   else if (prev_overlay_restore)
+   {
+      if (!settings->bools.input_overlay_hide_in_menu)
+         command_event(CMD_EVENT_OVERLAY_INIT, NULL);
+      prev_overlay_restore = false;
+   }
+#endif
+
+   if (time_to_exit(runloop_cmd_press(trigger_input, RARCH_QUIT_KEY)))
+   {
+      if (runloop_exec)
+         runloop_exec = false;
+
+      if (runloop_core_shutdown_initiated && settings->bools.load_dummy_on_core_shutdown)
+      {
+         content_ctx_info_t content_info;
+
+         content_info.argc               = 0;
+         content_info.argv               = NULL;
+         content_info.args               = NULL;
+         content_info.environ_get        = NULL;
+
+         if (!task_push_start_dummy_core(&content_info))
+         {
+            retroarch_main_quit();
+            return RUNLOOP_STATE_QUIT;
+         }
+
+         /* Loads dummy core instead of exiting RetroArch completely.
+          * Aborts core shutdown if invoked. */
+         runloop_shutdown_initiated      = false;
+         runloop_core_shutdown_initiated = false;
+      }
+      else
+      {
+         retroarch_main_quit();
+         return RUNLOOP_STATE_QUIT;
+      }
+   }
+
+#ifdef HAVE_MENU
+   if (menu_is_alive)
+   {
+      menu_ctx_iterate_t iter;
+      core_poll();
+
+      {
+         enum menu_action action = (enum menu_action)menu_event(current_input, trigger_input);
+         bool focused            = pause_nonactive ? is_focused : true;
+
+         focused                 = focused && !ui_companion_is_on_foreground();
+
+         iter.action             = action;
+
+         if (!menu_driver_iterate(&iter))
+            rarch_menu_running_finished();
+
+         if (focused || !runloop_idle)
+            menu_driver_render(runloop_idle, rarch_is_inited,
+                  (current_core_type == CORE_TYPE_DUMMY)
+                  )
+                  ;
+
+         if (!focused)
+            return RUNLOOP_STATE_SLEEP;
+
+         if (action == MENU_ACTION_QUIT && !menu_driver_is_binding_state())
+            return RUNLOOP_STATE_QUIT;
+      }
+   }
+#endif
+
+   if (runloop_idle)
+      return RUNLOOP_STATE_SLEEP;
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_GAME_FOCUS_TOGGLE))
+      command_event(CMD_EVENT_GAME_FOCUS_TOGGLE, (void*)(intptr_t)0);
+
+#ifdef HAVE_MENU
+   if (menu_event_kb_is_set(RETROK_F1) == 1)
+   {
+      if (menu_driver_is_alive())
+      {
+         if (rarch_is_inited && (current_core_type != CORE_TYPE_DUMMY))
+         {
+            rarch_menu_running_finished();
+            menu_event_kb_set(false, RETROK_F1);
+         }
+      }
+   }
+   else if ((!menu_event_kb_is_set(RETROK_F1) && 
+            runloop_cmd_triggered(trigger_input, RARCH_MENU_TOGGLE)) ||
+         (current_core_type == CORE_TYPE_DUMMY))
+   {
+      if (menu_driver_is_alive())
+      {
+         if (rarch_is_inited && (current_core_type != CORE_TYPE_DUMMY))
+            rarch_menu_running_finished();
+      }
+      else
+      {
+        menu_display_toggle_set_reason(MENU_TOGGLE_REASON_USER);
+        rarch_menu_running();
+      }
+   }
+   else
+      menu_event_kb_set(false, RETROK_F1);
+
+   if (menu_driver_is_alive())
+   {
+      if (!settings->bools.menu_throttle_framerate && !settings->floats.fastforward_ratio)
+         return RUNLOOP_STATE_MENU_ITERATE;
+
+      return RUNLOOP_STATE_END;
+   }
+#endif
+
+   if (pause_nonactive)
+      focused                = is_focused;
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_SCREENSHOT))
+      command_event(CMD_EVENT_TAKE_SCREENSHOT, NULL);
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_MUTE))
+      command_event(CMD_EVENT_AUDIO_MUTE_TOGGLE, NULL);
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_OSK))
+   {
+      if (input_keyboard_ctl(
+               RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL))
+         input_keyboard_ctl(
+               RARCH_INPUT_KEYBOARD_CTL_UNSET_LINEFEED_ENABLED, NULL);
+      else
+         input_keyboard_ctl(
+               RARCH_INPUT_KEYBOARD_CTL_SET_LINEFEED_ENABLED, NULL);
+   }
+
+   if (runloop_cmd_press(current_input, RARCH_VOLUME_UP))
+      command_event(CMD_EVENT_VOLUME_UP, NULL);
+   else if (runloop_cmd_press(current_input, RARCH_VOLUME_DOWN))
+      command_event(CMD_EVENT_VOLUME_DOWN, NULL);
+
+#ifdef HAVE_NETWORKING
+   tmp = runloop_cmd_triggered(trigger_input, RARCH_NETPLAY_FLIP);
+   netplay_driver_ctl(RARCH_NETPLAY_CTL_FLIP_PLAYERS, &tmp);
+   tmp = runloop_cmd_triggered(trigger_input, RARCH_NETPLAY_GAME_WATCH);
+   if (tmp)
+      netplay_driver_ctl(RARCH_NETPLAY_CTL_GAME_WATCH, NULL);
+   tmp = runloop_cmd_triggered(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY);
+#endif
+
+   /* Check if libretro pause key was pressed. If so, pause or
+    * unpause the libretro core. */
+
+   /* FRAMEADVANCE will set us into pause mode. */
+   pause_pressed |= !runloop_paused 
+      && runloop_cmd_triggered(trigger_input, RARCH_FRAMEADVANCE);
+
+   if (focused && pause_pressed)
+      command_event(CMD_EVENT_PAUSE_TOGGLE, NULL);
+   else if (focused && !old_focus)
+      command_event(CMD_EVENT_UNPAUSE, NULL);
+   else if (!focused && old_focus)
+      command_event(CMD_EVENT_PAUSE, NULL);
+
+   old_focus = focused;
+
+   if (!focused)
+      return RUNLOOP_STATE_SLEEP;
+
+   if (runloop_paused)
+   {
+      /* check pause state */
+
+      bool check_is_oneshot = runloop_cmd_triggered(trigger_input,
+            RARCH_FRAMEADVANCE)
+         || runloop_cmd_press(current_input, RARCH_REWIND);
+      if (runloop_cmd_triggered(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY))
+      {
+         command_event(CMD_EVENT_FULLSCREEN_TOGGLE, NULL);
+         if (!runloop_idle)
+            video_driver_cached_frame();
+      }
+
+      if (!check_is_oneshot)
+         return RUNLOOP_STATE_SLEEP;
+   }
+
+   /* To avoid continous switching if we hold the button down, we require
+    * that the button must go from pressed to unpressed back to pressed
+    * to be able to toggle between then.
+    */
+   if (runloop_cmd_triggered(trigger_input, RARCH_FAST_FORWARD_KEY))
+   {
+      if (input_driver_is_nonblock)
+         input_driver_unset_nonblock_state();
+      else
+         input_driver_set_nonblock_state();
+      driver_set_nonblock_state();
+   }
+   else if ((runloop_cmd_pressed(old_input, RARCH_FAST_FORWARD_HOLD_KEY) 
+         != runloop_cmd_press(current_input, RARCH_FAST_FORWARD_HOLD_KEY)))
+   {
+      if (runloop_cmd_press(current_input, RARCH_FAST_FORWARD_HOLD_KEY))
+         input_driver_set_nonblock_state();
+      else
+         input_driver_unset_nonblock_state();
+      driver_set_nonblock_state();
+   }
+
+   /* Checks if the state increase/decrease keys have been pressed 
+    * for this frame. */
+   if (runloop_cmd_triggered(trigger_input, RARCH_STATE_SLOT_PLUS))
+   {
+      char msg[128];
+      int new_state_slot = settings->ints.state_slot + 1;
+
+      msg[0] = '\0';
+
+      configuration_set_int(settings, settings->ints.state_slot, new_state_slot);
+
+      snprintf(msg, sizeof(msg), "%s: %d",
+            msg_hash_to_str(MSG_STATE_SLOT),
+            settings->ints.state_slot);
+
+      runloop_msg_queue_push(msg, 2, 180, true);
+
+      RARCH_LOG("%s\n", msg);
+   }
+   else if (runloop_cmd_triggered(trigger_input, RARCH_STATE_SLOT_MINUS))
+   {
+      char msg[128];
+      int new_state_slot = settings->ints.state_slot - 1;
+
+      msg[0] = '\0';
+
+      if (settings->ints.state_slot > 0)
+      {
+         configuration_set_int(settings, settings->ints.state_slot, new_state_slot);
+      }
+
+      snprintf(msg, sizeof(msg), "%s: %d",
+            msg_hash_to_str(MSG_STATE_SLOT),
+            settings->ints.state_slot);
+
+      runloop_msg_queue_push(msg, 2, 180, true);
+
+      RARCH_LOG("%s\n", msg);
+   }
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_SAVE_STATE_KEY))
+      command_event(CMD_EVENT_SAVE_STATE, NULL);
+   else if (runloop_cmd_triggered(trigger_input, RARCH_LOAD_STATE_KEY))
+      command_event(CMD_EVENT_LOAD_STATE, NULL);
+
+#ifdef HAVE_CHEEVOS
+   if (!settings->bools.cheevos_hardcore_mode_enable)
+#endif
+   {
+      char s[128];
+      unsigned t = 0;
+
+      s[0] = '\0';
+
+      if (state_manager_check_rewind(runloop_cmd_press(current_input, RARCH_REWIND),
+            settings->uints.rewind_granularity, runloop_paused, s, sizeof(s), &t))
+         runloop_msg_queue_push(s, 0, t, true);
+   }
+
+   runloop_slowmotion = runloop_cmd_press(current_input, RARCH_SLOWMOTION);
+
+   if (runloop_slowmotion)
+   {
+      /* Checks if slowmotion toggle/hold was being pressed and/or held. */
+      if (settings->bools.video_black_frame_insertion)
+      {
+         if (!runloop_idle)
+            video_driver_cached_frame();
+      }
+
+      if (state_manager_frame_is_reversed())
+         runloop_msg_queue_push(
+               msg_hash_to_str(MSG_SLOW_MOTION_REWIND), 2, 30, true);
+      else
+         runloop_msg_queue_push(
+               msg_hash_to_str(MSG_SLOW_MOTION), 2, 30, true);
+   }
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_MOVIE_RECORD_TOGGLE))
+      bsv_movie_check();
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_SHADER_NEXT) ||
+      runloop_cmd_triggered(trigger_input, RARCH_SHADER_PREV))
+      dir_check_shader(
+            runloop_cmd_triggered(trigger_input, RARCH_SHADER_NEXT),
+            runloop_cmd_triggered(trigger_input, RARCH_SHADER_PREV));
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_DISK_EJECT_TOGGLE))
+      command_event(CMD_EVENT_DISK_EJECT_TOGGLE, NULL);
+   else if (runloop_cmd_triggered(trigger_input, RARCH_DISK_NEXT))
+      command_event(CMD_EVENT_DISK_NEXT, NULL);
+   else if (runloop_cmd_triggered(trigger_input, RARCH_DISK_PREV))
+      command_event(CMD_EVENT_DISK_PREV, NULL);
+
+   if (runloop_cmd_triggered(trigger_input, RARCH_RESET))
+   {
+      command_event(CMD_EVENT_RESET, NULL);
+#if 0
+      task_push_audio_mixer_load("/home/squarepusher/SumertimeBlues.ogg",
+            NULL, NULL);
+#endif
+   }
+
+   cheat_manager_state_checks(
+         runloop_cmd_triggered(trigger_input, RARCH_CHEAT_INDEX_PLUS),
+         runloop_cmd_triggered(trigger_input, RARCH_CHEAT_INDEX_MINUS),
+         runloop_cmd_triggered(trigger_input, RARCH_CHEAT_TOGGLE));
+
+   return RUNLOOP_STATE_ITERATE;
+}
+
+#ifdef HAVE_NETWORKING
+/* FIXME: This is an ugly way to tell Netplay this... */
+#define runloop_netplay_pause() netplay_driver_ctl(RARCH_NETPLAY_CTL_PAUSE, NULL)
+#else
+#define runloop_netplay_pause() ((void)0)
+#endif
+
+void runloop_set(enum runloop_action action)
+{
+   switch (action)
+   {
+      case RUNLOOP_ACTION_AUTOSAVE:
+         runloop_autosave = true;
+         break;
+      case RUNLOOP_ACTION_NONE:
+         break;
+   }
+}
+
+void runloop_unset(enum runloop_action action)
+{
+   switch (action)
+   {
+      case RUNLOOP_ACTION_AUTOSAVE:
+         runloop_autosave = false;
+         break;
+      case RUNLOOP_ACTION_NONE:
+         break;
+   }
+}
+
+/**
+ * runloop_iterate:
+ *
+ * Run Libretro core in RetroArch for one frame.
+ *
+ * Returns: 0 on success, 1 if we have to wait until
+ * button input in order to wake up the loop,
+ * -1 if we forcibly quit out of the RetroArch iteration loop.
+ **/
+int runloop_iterate(unsigned *sleep_ms)
+{
+   unsigned i;
+   retro_time_t current, target, to_sleep_ms;
+   uint64_t trigger_input                       = 0;
+   static uint64_t last_input                   = 0;
+   bool input_driver_is_nonblock                = false;
+   settings_t *settings                         = config_get_ptr();
+   uint64_t old_input                           = last_input;
+#ifdef HAVE_MENU
+   bool menu_is_alive                           = menu_driver_is_alive();
+#else
+   bool menu_is_alive                           = false;
+#endif
+   unsigned max_users                           = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
+   uint64_t current_input                       =
+
+#ifdef HAVE_MENU
+      menu_is_alive ? 
+      input_menu_keys_pressed(settings, old_input,
+            &last_input, &trigger_input, runloop_paused,
+            &input_driver_is_nonblock) :
+#endif
+      input_keys_pressed(settings, old_input, &last_input,
+            &trigger_input, runloop_paused,
+            &input_driver_is_nonblock);
+
+   if (runloop_frame_time.callback)
+   {
+      /* Updates frame timing if frame timing callback is in use by the core.
+       * Limits frame time if fast forward ratio throttle is enabled. */
+
+      retro_time_t current     = cpu_features_get_time_usec();
+      retro_time_t delta       = current - runloop_frame_time_last;
+      bool is_locked_fps       = (runloop_paused ||
+                                  input_driver_is_nonblock) |
+                                  !!recording_data;
+
+
+      if (!runloop_frame_time_last || is_locked_fps)
+         delta = runloop_frame_time.reference;
+
+      if (!is_locked_fps && runloop_slowmotion)
+         delta /= settings->floats.slowmotion_ratio;
+
+      runloop_frame_time_last = current;
+
+      if (is_locked_fps)
+         runloop_frame_time_last = 0;
+
+      runloop_frame_time.callback(delta);
+   }
+
+   switch ((enum runloop_state)
+         runloop_check_state(
+            settings,
+            current_input,
+            old_input,
+            trigger_input,
+            input_driver_is_nonblock,
+            menu_is_alive,
+            sleep_ms))
+   {
+      case RUNLOOP_STATE_QUIT:
+         frame_limit_last_time = 0.0;
+         command_event(CMD_EVENT_QUIT, NULL);
+         return -1;
+      case RUNLOOP_STATE_SLEEP:
+         core_poll();
+         runloop_netplay_pause();
+         *sleep_ms = 10;
+         return 1;
+      case RUNLOOP_STATE_END:
+         core_poll();
+         runloop_netplay_pause();
+         goto end;
+      case RUNLOOP_STATE_MENU_ITERATE:
+         core_poll();
+         runloop_netplay_pause();
+         return 0;
+      case RUNLOOP_STATE_ITERATE:
+      case RUNLOOP_STATE_NONE:
+         break;
+   }
+
+   if (runloop_autosave)
+      autosave_lock();
+
+   bsv_movie_set_frame_start();
+
+   camera_driver_poll();
+
+   /* Update binds for analog dpad modes. */
+   for (i = 0; i < max_users; i++)
+   {
+      struct retro_keybind *general_binds = input_config_binds[i];
+      struct retro_keybind *auto_binds    = input_autoconf_binds[i];
+      enum analog_dpad_mode dpad_mode     = (enum analog_dpad_mode)settings->uints.input_analog_dpad_mode[i];
+
+      if (dpad_mode == ANALOG_DPAD_NONE)
+         continue;
+
+      input_push_analog_dpad(general_binds, dpad_mode);
+      input_push_analog_dpad(auto_binds,    dpad_mode);
+   }
+
+   if ((settings->uints.video_frame_delay > 0) && !input_driver_is_nonblock)
+      retro_sleep(settings->uints.video_frame_delay);
+
+   core_run();
+
+#ifdef HAVE_CHEEVOS
+   if (runloop_check_cheevos())
+      cheevos_test();
+#endif
+
+   for (i = 0; i < max_users; i++)
+   {
+      struct retro_keybind *general_binds = input_config_binds[i];
+      struct retro_keybind *auto_binds    = input_autoconf_binds[i];
+      enum analog_dpad_mode dpad_mode     = (enum analog_dpad_mode)settings->uints.input_analog_dpad_mode[i];
+
+      if (dpad_mode == ANALOG_DPAD_NONE)
+         continue;
+
+      input_pop_analog_dpad(general_binds);
+      input_pop_analog_dpad(auto_binds);
+   }
+
+   bsv_movie_set_frame_end();
+
+   if (runloop_autosave)
+      autosave_unlock();
+
+   if (!settings->floats.fastforward_ratio)
+      return 0;
+
+end:
+
+   current                        = cpu_features_get_time_usec();
+   target                         = frame_limit_last_time +
+      frame_limit_minimum_time;
+   to_sleep_ms                    = (target - current) / 1000;
+
+   if (to_sleep_ms > 0)
+   {
+      *sleep_ms = (unsigned)to_sleep_ms;
+      /* Combat jitter a bit. */
+      frame_limit_last_time += frame_limit_minimum_time;
+      return 1;
+   }
+
+   frame_limit_last_time  = cpu_features_get_time_usec();
+
+   return 0;
+}
+
+rarch_system_info_t *runloop_get_system_info(void)
+{
+   return &runloop_system;
+}
diff --git a/retroarch.h b/retroarch.h
index 3e22d5ac08..5f9024350b 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -17,11 +17,17 @@
 #ifndef __RETROARCH_H
 #define __RETROARCH_H
 
-#include <boolean.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdlib.h>
 
 #include <retro_common_api.h>
+#include <boolean.h>
 
 #include "core_type.h"
+#include "core.h"
+
+#define runloop_cmd_press(current_input, id)     (BIT64_GET(current_input, id))
 
 RETRO_BEGIN_DECLS
 
@@ -29,10 +35,6 @@ enum rarch_ctl_state
 {
    RARCH_CTL_NONE = 0,
 
-   /* Will teardown drivers and clears all
-    * internal state of the program. */
-   RARCH_CTL_DEINIT,
-
    /* Initialize all drivers. */
    RARCH_CTL_INIT,
 
@@ -41,22 +43,13 @@ enum rarch_ctl_state
 
    RARCH_CTL_IS_INITED,
 
-   RARCH_CTL_IS_PLAIN_CORE,
-
    RARCH_CTL_IS_DUMMY_CORE,
 
    RARCH_CTL_PREINIT,
 
    RARCH_CTL_DESTROY,
 
-   /* Menu running? */
-   RARCH_CTL_MENU_RUNNING,
-   RARCH_CTL_MENU_RUNNING_FINISHED,
-
-   RARCH_CTL_SET_PATHS_REDIRECT,
-
    RARCH_CTL_IS_BPS_PREF,
-   RARCH_CTL_SET_BPS_PREF,
    RARCH_CTL_UNSET_BPS_PREF,
 
    RARCH_CTL_IS_PATCH_BLOCKED,
@@ -64,11 +57,9 @@ enum rarch_ctl_state
    RARCH_CTL_UNSET_PATCH_BLOCKED,
 
    RARCH_CTL_IS_UPS_PREF,
-   RARCH_CTL_SET_UPS_PREF,
    RARCH_CTL_UNSET_UPS_PREF,
 
    RARCH_CTL_IS_IPS_PREF,
-   RARCH_CTL_SET_IPS_PREF,
    RARCH_CTL_UNSET_IPS_PREF,
 
    RARCH_CTL_IS_SRAM_USED,
@@ -77,17 +68,7 @@ enum rarch_ctl_state
    RARCH_CTL_UNSET_SRAM_ENABLE,
 
    RARCH_CTL_IS_SRAM_LOAD_DISABLED,
-   RARCH_CTL_SET_SRAM_LOAD_DISABLED,
-   RARCH_CTL_UNSET_SRAM_LOAD_DISABLED,
-
    RARCH_CTL_IS_SRAM_SAVE_DISABLED,
-   RARCH_CTL_SET_SRAM_SAVE_DISABLED,
-   RARCH_CTL_UNSET_SRAM_SAVE_DISABLED,
-
-   /* Force fullscreen */
-   RARCH_CTL_SET_FORCE_FULLSCREEN,
-   RARCH_CTL_UNSET_FORCE_FULLSCREEN,
-   RARCH_CTL_IS_FORCE_FULLSCREEN,
 
    /* Block config read */
    RARCH_CTL_SET_BLOCK_CONFIG_READ,
@@ -99,7 +80,76 @@ enum rarch_ctl_state
    RARCH_CTL_USERNAME_SET,
    RARCH_CTL_USERNAME_UNSET,
 
-   RARCH_CTL_IS_MAIN_THREAD
+   RARCH_CTL_SET_FRAME_LIMIT,
+
+   RARCH_CTL_TASK_INIT,
+
+   RARCH_CTL_FRAME_TIME_FREE,
+   RARCH_CTL_SET_FRAME_TIME_LAST,
+   RARCH_CTL_SET_FRAME_TIME,
+
+   RARCH_CTL_IS_IDLE,
+   RARCH_CTL_SET_IDLE,
+
+   RARCH_CTL_GET_WINDOWED_SCALE,
+   RARCH_CTL_SET_WINDOWED_SCALE,
+
+   RARCH_CTL_IS_OVERRIDES_ACTIVE,
+   RARCH_CTL_SET_OVERRIDES_ACTIVE,
+   RARCH_CTL_UNSET_OVERRIDES_ACTIVE,
+
+   RARCH_CTL_IS_MISSING_BIOS,
+   RARCH_CTL_SET_MISSING_BIOS,
+   RARCH_CTL_UNSET_MISSING_BIOS,
+
+   RARCH_CTL_IS_GAME_OPTIONS_ACTIVE,
+
+   RARCH_CTL_IS_NONBLOCK_FORCED,
+   RARCH_CTL_SET_NONBLOCK_FORCED,
+   RARCH_CTL_UNSET_NONBLOCK_FORCED,
+
+   RARCH_CTL_SET_LIBRETRO_PATH,
+
+   RARCH_CTL_IS_PAUSED,
+   RARCH_CTL_SET_PAUSED,
+
+   RARCH_CTL_SET_CORE_SHUTDOWN,
+
+   RARCH_CTL_SET_SHUTDOWN,
+   RARCH_CTL_IS_SHUTDOWN,
+
+   /* Runloop state */
+   RARCH_CTL_STATE_FREE,
+
+   /* Performance counters */
+   RARCH_CTL_GET_PERFCNT,
+   RARCH_CTL_SET_PERFCNT_ENABLE,
+   RARCH_CTL_UNSET_PERFCNT_ENABLE,
+   RARCH_CTL_IS_PERFCNT_ENABLE,
+
+   /* Key event */
+   RARCH_CTL_FRONTEND_KEY_EVENT_GET,
+   RARCH_CTL_KEY_EVENT_GET,
+   RARCH_CTL_DATA_DEINIT,
+
+   /* Core options */
+   RARCH_CTL_HAS_CORE_OPTIONS,
+   RARCH_CTL_GET_CORE_OPTION_SIZE,
+   RARCH_CTL_IS_CORE_OPTION_UPDATED,
+   RARCH_CTL_CORE_OPTIONS_LIST_GET,
+   RARCH_CTL_CORE_OPTION_PREV,
+   RARCH_CTL_CORE_OPTION_NEXT,
+   RARCH_CTL_CORE_OPTIONS_GET,
+   RARCH_CTL_CORE_OPTIONS_INIT,
+   RARCH_CTL_CORE_OPTIONS_DEINIT,
+
+   /* System info */
+   RARCH_CTL_SYSTEM_INFO_INIT,
+   RARCH_CTL_SYSTEM_INFO_FREE,
+
+   /* HTTP server */
+   RARCH_CTL_HTTPSERVER_INIT,
+   RARCH_CTL_HTTPSERVER_DESTROY
 };
 
 enum rarch_capabilities
@@ -129,6 +179,12 @@ enum rarch_override_setting
    RARCH_OVERRIDE_SETTING_LAST
 };
 
+enum runloop_action
+{
+   RUNLOOP_ACTION_NONE = 0,
+   RUNLOOP_ACTION_AUTOSAVE
+};
+
 struct rarch_main_wrap
 {
    int argc;
@@ -144,6 +200,73 @@ struct rarch_main_wrap
    bool touched;
 };
 
+typedef struct rarch_resolution
+{
+   unsigned idx;
+   unsigned id;
+} rarch_resolution_t;
+
+/* All run-time- / command line flag-related globals go here. */
+
+typedef struct global
+{
+   struct
+   {
+      char savefile[8192];
+      char savestate[8192];
+      char cheatfile[8192];
+      char ups[8192];
+      char bps[8192];
+      char ips[8192];
+      char remapfile[8192];
+   } name;
+
+   /* Recording. */
+   struct
+   {
+      char path[8192];
+      char config[8192];
+      unsigned width;
+      unsigned height;
+
+      size_t gpu_width;
+      size_t gpu_height;
+      char output_dir[8192];
+      char config_dir[8192];
+      bool use_output_dir;
+   } record;
+
+   /* Settings and/or global state that is specific to 
+    * a console-style implementation. */
+   struct
+   {
+      struct
+      {
+         struct
+         {
+            rarch_resolution_t current;
+            rarch_resolution_t initial;
+            uint32_t *list;
+            unsigned count;
+            bool check;
+         } resolutions;
+
+         unsigned gamma_correction;
+         unsigned int flicker_filter_index;
+         unsigned char soft_filter_index;
+         bool pal_enable;
+         bool pal60_enable;
+      } screen;
+
+      struct
+      {
+         bool system_bgm_enable;
+      } sound;
+
+      bool flickerfilter_enable;
+      bool softfilter_enable;
+   } console;
+} global_t;
 
 bool rarch_ctl(enum rarch_ctl_state state, void *data);
 
@@ -160,6 +283,8 @@ bool retroarch_override_setting_is_set(enum rarch_override_setting enum_idx, voi
 
 bool retroarch_validate_game_options(char *s, size_t len, bool mkdir);
 
+bool retroarch_is_forced_fullscreen(void);
+
 void retroarch_set_current_core_type(enum rarch_core_type type, bool explicitly_set);
 
 /**
@@ -184,6 +309,41 @@ bool retroarch_main_init(int argc, char *argv[]);
 
 bool retroarch_main_quit(void);
 
+global_t *global_get_ptr(void);
+
+/**
+ * runloop_iterate:
+ *
+ * Run Libretro core in RetroArch for one frame.
+ *
+ * Returns: 0 on successful run, 
+ * Returns 1 if we have to wait until button input in order 
+ * to wake up the loop.
+ * Returns -1 if we forcibly quit out of the 
+ * RetroArch iteration loop. 
+ **/
+int runloop_iterate(unsigned *sleep_ms);
+
+void runloop_msg_queue_push(const char *msg, unsigned prio,
+      unsigned duration, bool flush);
+
+bool runloop_msg_queue_pull(const char **ret);
+
+void runloop_get_status(bool *is_paused, bool *is_idle, bool *is_slowmotion,
+      bool *is_perfcnt_enable);
+
+void runloop_set(enum runloop_action action);
+
+void runloop_unset(enum runloop_action action);
+
+void rarch_menu_running(void);
+
+void rarch_menu_running_finished(void);
+
+bool retroarch_is_on_main_thread(void);
+
+rarch_system_info_t *runloop_get_system_info(void);
+
 RETRO_END_DECLS
 
 #endif
diff --git a/runloop.c b/runloop.c
deleted file mode 100644
index 0e3a8dc44f..0000000000
--- a/runloop.c
+++ /dev/null
@@ -1,1233 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2017 - Daniel De Matteis
- *  Copyright (C) 2012-2015 - Michael Lelli
- *  Copyright (C) 2014-2015 - Jay McCarthy
- *  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 <stdarg.h>
-#include <math.h>
-
-#include <compat/strl.h>
-#include <retro_assert.h>
-#include <file/file_path.h>
-#include <queues/message_queue.h>
-#include <queues/task_queue.h>
-#include <string/stdstring.h>
-#include <features/features_cpu.h>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef HAVE_THREADS
-#include <rthreads/rthreads.h>
-#endif
-
-#ifdef HAVE_CHEEVOS
-#include "cheevos/cheevos.h"
-#endif
-
-#ifdef HAVE_MENU
-#include "menu/menu_display.h"
-#include "menu/menu_driver.h"
-#include "menu/menu_event.h"
-#include "menu/widgets/menu_dialog.h"
-#endif
-
-#ifdef HAVE_NETWORKING
-#include "network/netplay/netplay.h"
-#endif
-
-#if defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB)
-#include "network/httpserver/httpserver.h"
-#endif
-
-#include "autosave.h"
-#include "command.h"
-#include "configuration.h"
-#include "driver.h"
-#include "movie.h"
-#include "dirs.h"
-#include "paths.h"
-#include "retroarch.h"
-#include "runloop.h"
-#include "file_path_special.h"
-#include "managers/core_option_manager.h"
-#include "managers/cheat_manager.h"
-#include "managers/state_manager.h"
-#include "list_special.h"
-#include "audio/audio_driver.h"
-#include "camera/camera_driver.h"
-#include "record/record_driver.h"
-#include "input/input_config.h"
-#include "input/input_driver.h"
-#include "ui/ui_companion_driver.h"
-#include "core.h"
-
-#include "msg_hash.h"
-
-#include "input/input_keyboard.h"
-#include "tasks/tasks_internal.h"
-#include "verbosity.h"
-
-#ifdef HAVE_ZLIB
-#define DEFAULT_EXT "zip"
-#else
-#define DEFAULT_EXT ""
-#endif
-
-#define runloop_cmd_triggered(trigger_input, id) (BIT64_GET(trigger_input, id))
-#define runloop_cmd_pressed(old_input, id)       (BIT64_GET(old_input, id))
-
-enum  runloop_state
-{
-   RUNLOOP_STATE_NONE = 0,
-   RUNLOOP_STATE_ITERATE,
-   RUNLOOP_STATE_SLEEP,
-   RUNLOOP_STATE_MENU_ITERATE,
-   RUNLOOP_STATE_END,
-   RUNLOOP_STATE_QUIT
-};
-
-typedef struct runloop_ctx_msg_info
-{
-   const char *msg;
-   unsigned prio;
-   unsigned duration;
-   bool flush;
-} runloop_ctx_msg_info_t;
-
-static rarch_system_info_t runloop_system;
-static struct retro_frame_time_callback runloop_frame_time;
-static retro_keyboard_event_t runloop_key_event            = NULL;
-static retro_keyboard_event_t runloop_frontend_key_event   = NULL;
-static core_option_manager_t *runloop_core_options         = NULL;
-#ifdef HAVE_THREADS
-static slock_t *_runloop_msg_queue_lock                    = NULL;
-#endif
-static msg_queue_t *runloop_msg_queue                      = NULL;
-static unsigned runloop_pending_windowed_scale             = 0;
-static retro_usec_t runloop_frame_time_last                = 0;
-static unsigned runloop_max_frames                         = false;
-static bool runloop_force_nonblock                         = false;
-static bool runloop_paused                                 = false;
-static bool runloop_idle                                   = false;
-static bool runloop_exec                                   = false;
-static bool runloop_slowmotion                             = false;
-static bool runloop_shutdown_initiated                     = false;
-static bool runloop_core_shutdown_initiated                = false;
-static bool runloop_perfcnt_enable                         = false;
-static bool runloop_overrides_active                       = false;
-static bool runloop_game_options_active                    = false;
-static bool runloop_missing_bios                           = false;
-static bool runloop_autosave                               = false;
-static retro_time_t frame_limit_minimum_time               = 0.0;
-static retro_time_t frame_limit_last_time                  = 0.0;
-
-global_t *global_get_ptr(void)
-{
-   static struct global g_extern;
-   return &g_extern;
-}
-
-void runloop_msg_queue_push(const char *msg,
-      unsigned prio, unsigned duration,
-      bool flush)
-{
-   runloop_ctx_msg_info_t msg_info;
-
-#ifdef HAVE_THREADS
-   slock_lock(_runloop_msg_queue_lock);
-#endif
-
-   if (flush)
-      msg_queue_clear(runloop_msg_queue);
-
-   msg_info.msg      = msg;
-   msg_info.prio     = prio;
-   msg_info.duration = duration;
-   msg_info.flush    = flush;
-
-   if (runloop_msg_queue)
-   {
-      msg_queue_push(runloop_msg_queue, msg_info.msg,
-            msg_info.prio, msg_info.duration);
-
-      if (ui_companion_is_on_foreground())
-      {
-         const ui_companion_driver_t *ui = ui_companion_get_ptr();
-         if (ui->msg_queue_push)
-            ui->msg_queue_push(msg_info.msg,
-                  msg_info.prio, msg_info.duration, msg_info.flush);
-      }
-   }
-
-#ifdef HAVE_THREADS
-   slock_unlock(_runloop_msg_queue_lock);
-#endif
-}
-
-/**
- * rarch_game_specific_options:
- *
- * Returns: true (1) if a game specific core
- * options path has been found,
- * otherwise false (0).
- **/
-static bool rarch_game_specific_options(char **output)
-{
-   char game_path[8192];
-
-   game_path[0] ='\0';
-
-   if (!retroarch_validate_game_options(game_path,
-            sizeof(game_path), false))
-         return false;
-
-   if (!config_file_exists(game_path))
-      return false;
-
-   RARCH_LOG("%s %s\n",
-         msg_hash_to_str(MSG_GAME_SPECIFIC_CORE_OPTIONS_FOUND_AT),
-         game_path);
-   *output = strdup(game_path);
-   return true;
-}
-
-void runloop_get_status(bool *is_paused, bool *is_idle, 
-      bool *is_slowmotion, bool *is_perfcnt_enable)
-{
-   *is_paused         = runloop_paused;
-   *is_idle           = runloop_idle;
-   *is_slowmotion     = runloop_slowmotion;
-   *is_perfcnt_enable = runloop_perfcnt_enable;
-}
-
-bool runloop_msg_queue_pull(const char **ret)
-{
-   if (!ret)
-      return false;
-#ifdef HAVE_THREADS
-   slock_lock(_runloop_msg_queue_lock);
-#endif
-   *ret = msg_queue_pull(runloop_msg_queue);
-#ifdef HAVE_THREADS
-   slock_unlock(_runloop_msg_queue_lock);
-#endif
-   return true;
-}
-
-bool runloop_ctl(enum runloop_ctl_state state, void *data)
-{
-
-   switch (state)
-   {
-      case RUNLOOP_CTL_SYSTEM_INFO_INIT:
-         core_get_system_info(&runloop_system.info);
-
-         if (!runloop_system.info.library_name)
-            runloop_system.info.library_name = msg_hash_to_str(MSG_UNKNOWN);
-         if (!runloop_system.info.library_version)
-            runloop_system.info.library_version = "v0";
-
-         video_driver_set_title_buf();
-
-         strlcpy(runloop_system.valid_extensions,
-               runloop_system.info.valid_extensions ?
-               runloop_system.info.valid_extensions : DEFAULT_EXT,
-               sizeof(runloop_system.valid_extensions));
-         break;
-      case RUNLOOP_CTL_GET_CORE_OPTION_SIZE:
-         {
-            unsigned *idx = (unsigned*)data;
-            if (!idx)
-               return false;
-            *idx = (unsigned)core_option_manager_size(runloop_core_options);
-         }
-         break;
-      case RUNLOOP_CTL_HAS_CORE_OPTIONS:
-         return runloop_core_options;
-      case RUNLOOP_CTL_CORE_OPTIONS_LIST_GET:
-         {
-            core_option_manager_t **coreopts = (core_option_manager_t**)data;
-            if (!coreopts)
-               return false;
-            *coreopts = runloop_core_options;
-         }
-         break;
-      case RUNLOOP_CTL_SYSTEM_INFO_FREE:
-
-         /* No longer valid. */
-         if (runloop_system.subsystem.data)
-            free(runloop_system.subsystem.data);
-         runloop_system.subsystem.data = NULL;
-         runloop_system.subsystem.size = 0;
-
-         if (runloop_system.ports.data)
-            free(runloop_system.ports.data);
-         runloop_system.ports.data = NULL;
-         runloop_system.ports.size = 0;
-
-         if (runloop_system.mmaps.descriptors)
-            free((void *)runloop_system.mmaps.descriptors);
-         runloop_system.mmaps.descriptors     = NULL;
-         runloop_system.mmaps.num_descriptors = 0;
-
-         runloop_key_event          = NULL;
-         runloop_frontend_key_event = NULL;
-
-         audio_driver_unset_callback();
-         memset(&runloop_system, 0, sizeof(rarch_system_info_t));
-         break;
-      case RUNLOOP_CTL_SET_FRAME_TIME_LAST:
-         runloop_frame_time_last        = 0;
-         break;
-      case RUNLOOP_CTL_SET_OVERRIDES_ACTIVE:
-         runloop_overrides_active = true;
-         break;
-      case RUNLOOP_CTL_UNSET_OVERRIDES_ACTIVE:
-         runloop_overrides_active = false;
-         break;
-      case RUNLOOP_CTL_IS_OVERRIDES_ACTIVE:
-         return runloop_overrides_active;
-      case RUNLOOP_CTL_SET_MISSING_BIOS:
-         runloop_missing_bios = true;
-         break;
-      case RUNLOOP_CTL_UNSET_MISSING_BIOS:
-         runloop_missing_bios = false;
-         break;
-      case RUNLOOP_CTL_IS_MISSING_BIOS:
-         return runloop_missing_bios;
-      case RUNLOOP_CTL_IS_GAME_OPTIONS_ACTIVE:
-         return runloop_game_options_active;
-      case RUNLOOP_CTL_SET_FRAME_LIMIT:
-         {
-            settings_t *settings       = config_get_ptr();
-            struct retro_system_av_info *av_info =
-               video_viewport_get_system_av_info();
-            float fastforward_ratio              =
-               (settings->floats.fastforward_ratio == 0.0f)
-               ? 1.0f : settings->floats.fastforward_ratio;
-
-            frame_limit_last_time    = cpu_features_get_time_usec();
-            frame_limit_minimum_time = (retro_time_t)roundf(1000000.0f
-                  / (av_info->timing.fps * fastforward_ratio));
-         }
-         break;
-      case RUNLOOP_CTL_GET_PERFCNT:
-         {
-            bool **perfcnt = (bool**)data;
-            if (!perfcnt)
-               return false;
-            *perfcnt = &runloop_perfcnt_enable;
-         }
-         break;
-      case RUNLOOP_CTL_SET_PERFCNT_ENABLE:
-         runloop_perfcnt_enable = true;
-         break;
-      case RUNLOOP_CTL_UNSET_PERFCNT_ENABLE:
-         runloop_perfcnt_enable = false;
-         break;
-      case RUNLOOP_CTL_IS_PERFCNT_ENABLE:
-         return runloop_perfcnt_enable;
-      case RUNLOOP_CTL_SET_NONBLOCK_FORCED:
-         runloop_force_nonblock = true;
-         break;
-      case RUNLOOP_CTL_UNSET_NONBLOCK_FORCED:
-         runloop_force_nonblock = false;
-         break;
-      case RUNLOOP_CTL_IS_NONBLOCK_FORCED:
-         return runloop_force_nonblock;
-      case RUNLOOP_CTL_SET_FRAME_TIME:
-         {
-            const struct retro_frame_time_callback *info =
-               (const struct retro_frame_time_callback*)data;
-#ifdef HAVE_NETWORKING
-            /* retro_run() will be called in very strange and
-             * mysterious ways, have to disable it. */
-            if (netplay_driver_ctl(RARCH_NETPLAY_CTL_IS_ENABLED, NULL))
-               return false;
-#endif
-            runloop_frame_time = *info;
-         }
-         break;
-      case RUNLOOP_CTL_GET_WINDOWED_SCALE:
-         {
-            unsigned **scale = (unsigned**)data;
-            if (!scale)
-               return false;
-            *scale       = (unsigned*)&runloop_pending_windowed_scale;
-         }
-         break;
-      case RUNLOOP_CTL_SET_WINDOWED_SCALE:
-         {
-            unsigned *idx = (unsigned*)data;
-            if (!idx)
-               return false;
-            runloop_pending_windowed_scale = *idx;
-         }
-         break;
-      case RUNLOOP_CTL_SET_LIBRETRO_PATH:
-         return path_set(RARCH_PATH_CORE, (const char*)data);
-      case RUNLOOP_CTL_FRAME_TIME_FREE:
-         memset(&runloop_frame_time, 0,
-               sizeof(struct retro_frame_time_callback));
-         runloop_frame_time_last           = 0;
-         runloop_max_frames                = 0;
-         break;
-      case RUNLOOP_CTL_STATE_FREE:
-         runloop_perfcnt_enable            = false;
-         runloop_idle                      = false;
-         runloop_paused                    = false;
-         runloop_slowmotion                = false;
-         runloop_overrides_active          = false;
-         runloop_autosave                  = false;
-         runloop_ctl(RUNLOOP_CTL_FRAME_TIME_FREE, NULL);
-         break;
-      case RUNLOOP_CTL_GLOBAL_FREE:
-         {
-            global_t *global = NULL;
-            command_event(CMD_EVENT_TEMPORARY_CONTENT_DEINIT, NULL);
-
-            path_deinit_subsystem();
-            command_event(CMD_EVENT_RECORD_DEINIT, NULL);
-            command_event(CMD_EVENT_LOG_FILE_DEINIT, NULL);
-
-            rarch_ctl(RARCH_CTL_UNSET_BLOCK_CONFIG_READ, NULL);
-            rarch_ctl(RARCH_CTL_UNSET_SRAM_LOAD_DISABLED, NULL);
-            rarch_ctl(RARCH_CTL_UNSET_SRAM_SAVE_DISABLED, NULL);
-            rarch_ctl(RARCH_CTL_UNSET_SRAM_ENABLE, NULL);
-            rarch_ctl(RARCH_CTL_UNSET_BPS_PREF, NULL);
-            rarch_ctl(RARCH_CTL_UNSET_IPS_PREF, NULL);
-            rarch_ctl(RARCH_CTL_UNSET_UPS_PREF, NULL);
-            rarch_ctl(RARCH_CTL_UNSET_PATCH_BLOCKED, NULL);
-            runloop_overrides_active   = false;
-
-            core_unset_input_descriptors();
-
-            global = global_get_ptr();
-            path_clear_all();
-            dir_clear_all();
-            memset(global, 0, sizeof(struct global));
-            retroarch_override_setting_free_state();
-         }
-         break;
-      case RUNLOOP_CTL_CLEAR_STATE:
-         driver_ctl(RARCH_DRIVER_CTL_DEINIT,  NULL);
-         runloop_ctl(RUNLOOP_CTL_STATE_FREE,  NULL);
-         runloop_ctl(RUNLOOP_CTL_GLOBAL_FREE, NULL);
-         break;
-      case RUNLOOP_CTL_SET_MAX_FRAMES:
-         {
-            unsigned *ptr = (unsigned*)data;
-            if (!ptr)
-               return false;
-            runloop_max_frames = *ptr;
-         }
-         break;
-      case RUNLOOP_CTL_IS_IDLE:
-         return runloop_idle;
-      case RUNLOOP_CTL_SET_IDLE:
-         {
-            bool *ptr = (bool*)data;
-            if (!ptr)
-               return false;
-            runloop_idle = *ptr;
-         }
-         break;
-      case RUNLOOP_CTL_SET_PAUSED:
-         {
-            bool *ptr = (bool*)data;
-            if (!ptr)
-               return false;
-            runloop_paused = *ptr;
-         }
-         break;
-      case RUNLOOP_CTL_IS_PAUSED:
-         return runloop_paused;
-      case RUNLOOP_CTL_MSG_QUEUE_DEINIT:
-         if (!runloop_msg_queue)
-            return true;
-
-#ifdef HAVE_THREADS
-         slock_lock(_runloop_msg_queue_lock);
-#endif
-
-         msg_queue_free(runloop_msg_queue);
-
-#ifdef HAVE_THREADS
-         slock_unlock(_runloop_msg_queue_lock);
-#endif
-
-#ifdef HAVE_THREADS
-         slock_free(_runloop_msg_queue_lock);
-         _runloop_msg_queue_lock = NULL;
-#endif
-
-         runloop_msg_queue = NULL;
-         break;
-      case RUNLOOP_CTL_MSG_QUEUE_INIT:
-         runloop_ctl(RUNLOOP_CTL_MSG_QUEUE_DEINIT, NULL);
-         runloop_msg_queue = msg_queue_new(8);
-         retro_assert(runloop_msg_queue);
-
-#ifdef HAVE_THREADS
-         _runloop_msg_queue_lock = slock_new();
-         retro_assert(_runloop_msg_queue_lock);
-#endif
-         break;
-      case RUNLOOP_CTL_TASK_INIT:
-         {
-#ifdef HAVE_THREADS
-            settings_t *settings = config_get_ptr();
-            bool threaded_enable = settings->bools.threaded_data_runloop_enable;
-#else
-            bool threaded_enable = false;
-#endif
-            task_queue_deinit();
-            task_queue_init(threaded_enable, runloop_msg_queue_push);
-         }
-         break;
-      case RUNLOOP_CTL_SET_CORE_SHUTDOWN:
-         runloop_core_shutdown_initiated = true;
-         break;
-      case RUNLOOP_CTL_SET_SHUTDOWN:
-         runloop_shutdown_initiated = true;
-         break;
-      case RUNLOOP_CTL_IS_SHUTDOWN:
-         return runloop_shutdown_initiated;
-      case RUNLOOP_CTL_DATA_DEINIT:
-         task_queue_deinit();
-         break;
-      case RUNLOOP_CTL_IS_CORE_OPTION_UPDATED:
-         if (!runloop_core_options)
-            return false;
-         return  core_option_manager_updated(runloop_core_options);
-      case RUNLOOP_CTL_CORE_OPTION_PREV:
-         {
-            unsigned *idx = (unsigned*)data;
-            if (!idx)
-               return false;
-            core_option_manager_prev(runloop_core_options, *idx);
-            if (ui_companion_is_on_foreground())
-               ui_companion_driver_notify_refresh();
-         }
-         break;
-      case RUNLOOP_CTL_CORE_OPTION_NEXT:
-         {
-            unsigned *idx = (unsigned*)data;
-            if (!idx)
-               return false;
-            core_option_manager_next(runloop_core_options, *idx);
-            if (ui_companion_is_on_foreground())
-               ui_companion_driver_notify_refresh();
-         }
-         break;
-      case RUNLOOP_CTL_CORE_OPTIONS_GET:
-         {
-            struct retro_variable *var = (struct retro_variable*)data;
-
-            if (!runloop_core_options || !var)
-               return false;
-
-            RARCH_LOG("Environ GET_VARIABLE %s:\n", var->key);
-            core_option_manager_get(runloop_core_options, var);
-            RARCH_LOG("\t%s\n", var->value ? var->value :
-                  msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE));
-         }
-         break;
-      case RUNLOOP_CTL_CORE_OPTIONS_INIT:
-         {
-            settings_t *settings              = config_get_ptr();
-            char *game_options_path           = NULL;
-            bool ret                          = false;
-            const struct retro_variable *vars =
-               (const struct retro_variable*)data;
-
-            if (settings && settings->bools.game_specific_options)
-               ret = rarch_game_specific_options(&game_options_path);
-
-            if(ret)
-            {
-               runloop_game_options_active = true;
-               runloop_core_options        =
-                  core_option_manager_new(game_options_path, vars);
-               free(game_options_path);
-            }
-            else
-            {
-               char buf[PATH_MAX_LENGTH];
-               const char *options_path          = NULL;
-
-               buf[0] = '\0';
-
-               if (settings)
-                  options_path = settings->paths.path_core_options;
-
-               if (string_is_empty(options_path) && !path_is_empty(RARCH_PATH_CONFIG))
-               {
-                  fill_pathname_resolve_relative(buf, path_get(RARCH_PATH_CONFIG),
-                        file_path_str(FILE_PATH_CORE_OPTIONS_CONFIG), sizeof(buf));
-                  options_path = buf;
-               }
-
-               runloop_game_options_active = false;
-
-               if (!string_is_empty(options_path))
-                  runloop_core_options =
-                     core_option_manager_new(options_path, vars);
-            }
-
-         }
-         break;
-      case RUNLOOP_CTL_CORE_OPTIONS_FREE:
-         if (runloop_core_options)
-            core_option_manager_free(runloop_core_options);
-         runloop_core_options          = NULL;
-         break;
-      case RUNLOOP_CTL_CORE_OPTIONS_DEINIT:
-         {
-            if (!runloop_core_options)
-               return false;
-
-            /* check if game options file was just created and flush
-               to that file instead */
-            if(!path_is_empty(RARCH_PATH_CORE_OPTIONS))
-            {
-               core_option_manager_flush_game_specific(runloop_core_options,
-                     path_get(RARCH_PATH_CORE_OPTIONS));
-               path_clear(RARCH_PATH_CORE_OPTIONS);
-            }
-            else
-               core_option_manager_flush(runloop_core_options);
-
-            if (runloop_game_options_active)
-               runloop_game_options_active = false;
-
-            runloop_ctl(RUNLOOP_CTL_CORE_OPTIONS_FREE, NULL);
-         }
-         break;
-      case RUNLOOP_CTL_KEY_EVENT_GET:
-         {
-            retro_keyboard_event_t **key_event =
-               (retro_keyboard_event_t**)data;
-            if (!key_event)
-               return false;
-            *key_event = &runloop_key_event;
-         }
-         break;
-      case RUNLOOP_CTL_FRONTEND_KEY_EVENT_GET:
-         {
-            retro_keyboard_event_t **key_event =
-               (retro_keyboard_event_t**)data;
-            if (!key_event)
-               return false;
-            *key_event = &runloop_frontend_key_event;
-         }
-         break;
-      case RUNLOOP_CTL_HTTPSERVER_INIT:
-#if defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB)
-         httpserver_init(8888);
-#endif
-         break;
-      case RUNLOOP_CTL_HTTPSERVER_DESTROY:
-#if defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB)
-         httpserver_destroy();
-#endif
-         break;
-      case RUNLOOP_CTL_NONE:
-      default:
-         break;
-   }
-
-   return true;
-}
-
-/* Time to exit out of the main loop?
- * Reasons for exiting:
- * a) Shutdown environment callback was invoked.
- * b) Quit key was pressed.
- * c) Frame count exceeds or equals maximum amount of frames to run.
- * d) Video driver no longer alive.
- * e) End of BSV movie and BSV EOF exit is true. (TODO/FIXME - explain better)
- */
-#define time_to_exit(quit_key_pressed) (runloop_shutdown_initiated || quit_key_pressed || !is_alive || bsv_movie_is_end_of_file() || (runloop_max_frames && (frame_count >= runloop_max_frames)) || runloop_exec)
-
-#define runloop_check_cheevos() (settings->bools.cheevos_enable && cheevos_loaded && (!cheats_are_enabled && !cheats_were_enabled))
-
-static enum runloop_state runloop_check_state(
-      settings_t *settings,
-      uint64_t current_input,
-      uint64_t old_input,
-      uint64_t trigger_input,
-      bool input_driver_is_nonblock,
-      unsigned *sleep_ms)
-{
-   static bool old_focus            = true;
-#ifdef HAVE_OVERLAY
-   static char prev_overlay_restore = false;
-#endif
-#ifdef HAVE_NETWORKING
-   bool tmp                         = false;
-#endif
-   bool is_focused                  = false;
-   bool is_alive                    = false;
-   uint64_t frame_count             = 0;
-   bool focused                     = true;
-   bool pause_pressed               = runloop_cmd_triggered(trigger_input, RARCH_PAUSE_TOGGLE);
-
-   video_driver_get_status(&frame_count, &is_alive, &is_focused);
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_OVERLAY_NEXT))
-      command_event(CMD_EVENT_OVERLAY_NEXT, NULL);
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY))
-   {
-      bool fullscreen_toggled = !runloop_paused
-#ifdef HAVE_MENU
-       || menu_driver_is_alive();
-#endif
-      ;
-
-      if (fullscreen_toggled)
-         command_event(CMD_EVENT_FULLSCREEN_TOGGLE, NULL);
-   }
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_GRAB_MOUSE_TOGGLE))
-      command_event(CMD_EVENT_GRAB_MOUSE_TOGGLE, NULL);
-
-
-#ifdef HAVE_OVERLAY
-   if (input_keyboard_ctl(
-            RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL))
-   {
-      prev_overlay_restore  = false;
-      command_event(CMD_EVENT_OVERLAY_INIT, NULL);
-   }
-   else if (prev_overlay_restore)
-   {
-      if (!settings->bools.input_overlay_hide_in_menu)
-         command_event(CMD_EVENT_OVERLAY_INIT, NULL);
-      prev_overlay_restore = false;
-   }
-#endif
-
-   if (time_to_exit(runloop_cmd_press(trigger_input, RARCH_QUIT_KEY)))
-   {
-      if (runloop_exec)
-         runloop_exec = false;
-
-      if (runloop_core_shutdown_initiated && settings->bools.load_dummy_on_core_shutdown)
-      {
-         content_ctx_info_t content_info;
-
-         content_info.argc               = 0;
-         content_info.argv               = NULL;
-         content_info.args               = NULL;
-         content_info.environ_get        = NULL;
-
-         if (!task_push_start_dummy_core(&content_info))
-         {
-            retroarch_main_quit();
-            return RUNLOOP_STATE_QUIT;
-         }
-
-         /* Loads dummy core instead of exiting RetroArch completely.
-          * Aborts core shutdown if invoked. */
-         runloop_shutdown_initiated      = false;
-         runloop_core_shutdown_initiated = false;
-      }
-      else
-      {
-         retroarch_main_quit();
-         return RUNLOOP_STATE_QUIT;
-      }
-   }
-
-#ifdef HAVE_MENU
-   if (menu_driver_is_alive())
-   {
-      menu_ctx_iterate_t iter;
-      core_poll();
-
-      {
-         enum menu_action action = (enum menu_action)menu_event(current_input, trigger_input);
-         bool focused            = settings->bools.pause_nonactive ? is_focused : true;
-
-         focused                 = focused && !ui_companion_is_on_foreground();
-
-         iter.action             = action;
-
-         if (!menu_driver_iterate(&iter))
-            rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
-
-         if (focused || !runloop_idle)
-            menu_driver_render(runloop_idle);
-
-         if (!focused)
-            return RUNLOOP_STATE_SLEEP;
-
-         if (action == MENU_ACTION_QUIT && !menu_driver_is_binding_state())
-            return RUNLOOP_STATE_QUIT;
-      }
-   }
-#endif
-
-   if (runloop_idle)
-      return RUNLOOP_STATE_SLEEP;
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_GAME_FOCUS_TOGGLE))
-      command_event(CMD_EVENT_GAME_FOCUS_TOGGLE, (void*)(intptr_t)0);
-
-#ifdef HAVE_MENU
-   if (menu_event_kb_is_set(RETROK_F1) == 1)
-   {
-      if (menu_driver_is_alive())
-      {
-         if (rarch_ctl(RARCH_CTL_IS_INITED, NULL) &&
-               !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
-         {
-            rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
-            menu_event_kb_set(false, RETROK_F1);
-         }
-      }
-   }
-   else if ((!menu_event_kb_is_set(RETROK_F1) && 
-            runloop_cmd_triggered(trigger_input, RARCH_MENU_TOGGLE)) ||
-         rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
-   {
-      if (menu_driver_is_alive())
-      {
-         if (rarch_ctl(RARCH_CTL_IS_INITED, NULL) &&
-               !rarch_ctl(RARCH_CTL_IS_DUMMY_CORE, NULL))
-            rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
-      }
-      else
-      {
-        menu_display_toggle_set_reason(MENU_TOGGLE_REASON_USER);
-        rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
-      }
-   }
-   else
-      menu_event_kb_set(false, RETROK_F1);
-
-   if (menu_driver_is_alive())
-   {
-      if (!settings->bools.menu_throttle_framerate && !settings->floats.fastforward_ratio)
-         return RUNLOOP_STATE_MENU_ITERATE;
-
-      return RUNLOOP_STATE_END;
-   }
-#endif
-
-   if (settings->bools.pause_nonactive)
-      focused                = is_focused;
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_SCREENSHOT))
-      command_event(CMD_EVENT_TAKE_SCREENSHOT, NULL);
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_MUTE))
-      command_event(CMD_EVENT_AUDIO_MUTE_TOGGLE, NULL);
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_OSK))
-   {
-      if (input_keyboard_ctl(
-               RARCH_INPUT_KEYBOARD_CTL_IS_LINEFEED_ENABLED, NULL))
-         input_keyboard_ctl(
-               RARCH_INPUT_KEYBOARD_CTL_UNSET_LINEFEED_ENABLED, NULL);
-      else
-         input_keyboard_ctl(
-               RARCH_INPUT_KEYBOARD_CTL_SET_LINEFEED_ENABLED, NULL);
-   }
-
-   if (runloop_cmd_press(current_input, RARCH_VOLUME_UP))
-      command_event(CMD_EVENT_VOLUME_UP, NULL);
-   else if (runloop_cmd_press(current_input, RARCH_VOLUME_DOWN))
-      command_event(CMD_EVENT_VOLUME_DOWN, NULL);
-
-#ifdef HAVE_NETWORKING
-   tmp = runloop_cmd_triggered(trigger_input, RARCH_NETPLAY_FLIP);
-   netplay_driver_ctl(RARCH_NETPLAY_CTL_FLIP_PLAYERS, &tmp);
-   tmp = runloop_cmd_triggered(trigger_input, RARCH_NETPLAY_GAME_WATCH);
-   if (tmp)
-      netplay_driver_ctl(RARCH_NETPLAY_CTL_GAME_WATCH, NULL);
-   tmp = runloop_cmd_triggered(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY);
-#endif
-
-   /* Check if libretro pause key was pressed. If so, pause or
-    * unpause the libretro core. */
-
-   /* FRAMEADVANCE will set us into pause mode. */
-   pause_pressed |= !runloop_paused 
-      && runloop_cmd_triggered(trigger_input, RARCH_FRAMEADVANCE);
-
-   if (focused && pause_pressed)
-      command_event(CMD_EVENT_PAUSE_TOGGLE, NULL);
-   else if (focused && !old_focus)
-      command_event(CMD_EVENT_UNPAUSE, NULL);
-   else if (!focused && old_focus)
-      command_event(CMD_EVENT_PAUSE, NULL);
-
-   old_focus = focused;
-
-   if (!focused)
-      return RUNLOOP_STATE_SLEEP;
-
-   if (runloop_paused)
-   {
-      /* check pause state */
-
-      bool check_is_oneshot = runloop_cmd_triggered(trigger_input,
-            RARCH_FRAMEADVANCE)
-         || runloop_cmd_press(current_input, RARCH_REWIND);
-      if (runloop_cmd_triggered(trigger_input, RARCH_FULLSCREEN_TOGGLE_KEY))
-      {
-         command_event(CMD_EVENT_FULLSCREEN_TOGGLE, NULL);
-         if (!runloop_idle)
-            video_driver_cached_frame();
-      }
-
-      if (!check_is_oneshot)
-         return RUNLOOP_STATE_SLEEP;
-   }
-
-   /* To avoid continous switching if we hold the button down, we require
-    * that the button must go from pressed to unpressed back to pressed
-    * to be able to toggle between then.
-    */
-   if (runloop_cmd_triggered(trigger_input, RARCH_FAST_FORWARD_KEY))
-   {
-      if (input_driver_is_nonblock)
-         input_driver_unset_nonblock_state();
-      else
-         input_driver_set_nonblock_state();
-      driver_set_nonblock_state();
-   }
-   else if ((runloop_cmd_pressed(old_input, RARCH_FAST_FORWARD_HOLD_KEY) 
-         != runloop_cmd_press(current_input, RARCH_FAST_FORWARD_HOLD_KEY)))
-   {
-      if (runloop_cmd_press(current_input, RARCH_FAST_FORWARD_HOLD_KEY))
-         input_driver_set_nonblock_state();
-      else
-         input_driver_unset_nonblock_state();
-      driver_set_nonblock_state();
-   }
-
-   /* Checks if the state increase/decrease keys have been pressed 
-    * for this frame. */
-   if (runloop_cmd_triggered(trigger_input, RARCH_STATE_SLOT_PLUS))
-   {
-      char msg[128];
-      int new_state_slot = settings->ints.state_slot + 1;
-
-      msg[0] = '\0';
-
-      configuration_set_int(settings, settings->ints.state_slot, new_state_slot);
-
-      snprintf(msg, sizeof(msg), "%s: %d",
-            msg_hash_to_str(MSG_STATE_SLOT),
-            settings->ints.state_slot);
-
-      runloop_msg_queue_push(msg, 2, 180, true);
-
-      RARCH_LOG("%s\n", msg);
-   }
-   else if (runloop_cmd_triggered(trigger_input, RARCH_STATE_SLOT_MINUS))
-   {
-      char msg[128];
-      int new_state_slot = settings->ints.state_slot - 1;
-
-      msg[0] = '\0';
-
-      if (settings->ints.state_slot > 0)
-      {
-         configuration_set_int(settings, settings->ints.state_slot, new_state_slot);
-      }
-
-      snprintf(msg, sizeof(msg), "%s: %d",
-            msg_hash_to_str(MSG_STATE_SLOT),
-            settings->ints.state_slot);
-
-      runloop_msg_queue_push(msg, 2, 180, true);
-
-      RARCH_LOG("%s\n", msg);
-   }
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_SAVE_STATE_KEY))
-      command_event(CMD_EVENT_SAVE_STATE, NULL);
-   else if (runloop_cmd_triggered(trigger_input, RARCH_LOAD_STATE_KEY))
-      command_event(CMD_EVENT_LOAD_STATE, NULL);
-
-#ifdef HAVE_CHEEVOS
-   if (!settings->bools.cheevos_hardcore_mode_enable)
-#endif
-   {
-      char s[128];
-      unsigned t = 0;
-
-      s[0] = '\0';
-
-      if (state_manager_check_rewind(runloop_cmd_press(current_input, RARCH_REWIND),
-            settings->uints.rewind_granularity, runloop_paused, s, sizeof(s), &t))
-         runloop_msg_queue_push(s, 0, t, true);
-   }
-
-   runloop_slowmotion = runloop_cmd_press(current_input, RARCH_SLOWMOTION);
-
-   if (runloop_slowmotion)
-   {
-      /* Checks if slowmotion toggle/hold was being pressed and/or held. */
-      if (settings->bools.video_black_frame_insertion)
-      {
-         if (!runloop_idle)
-            video_driver_cached_frame();
-      }
-
-      if (state_manager_frame_is_reversed())
-         runloop_msg_queue_push(
-               msg_hash_to_str(MSG_SLOW_MOTION_REWIND), 2, 30, true);
-      else
-         runloop_msg_queue_push(
-               msg_hash_to_str(MSG_SLOW_MOTION), 2, 30, true);
-   }
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_MOVIE_RECORD_TOGGLE))
-      bsv_movie_check();
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_SHADER_NEXT) ||
-      runloop_cmd_triggered(trigger_input, RARCH_SHADER_PREV))
-      dir_check_shader(
-            runloop_cmd_triggered(trigger_input, RARCH_SHADER_NEXT),
-            runloop_cmd_triggered(trigger_input, RARCH_SHADER_PREV));
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_DISK_EJECT_TOGGLE))
-      command_event(CMD_EVENT_DISK_EJECT_TOGGLE, NULL);
-   else if (runloop_cmd_triggered(trigger_input, RARCH_DISK_NEXT))
-      command_event(CMD_EVENT_DISK_NEXT, NULL);
-   else if (runloop_cmd_triggered(trigger_input, RARCH_DISK_PREV))
-      command_event(CMD_EVENT_DISK_PREV, NULL);
-
-   if (runloop_cmd_triggered(trigger_input, RARCH_RESET))
-      command_event(CMD_EVENT_RESET, NULL);
-
-   cheat_manager_state_checks(
-         runloop_cmd_triggered(trigger_input, RARCH_CHEAT_INDEX_PLUS),
-         runloop_cmd_triggered(trigger_input, RARCH_CHEAT_INDEX_MINUS),
-         runloop_cmd_triggered(trigger_input, RARCH_CHEAT_TOGGLE));
-
-   return RUNLOOP_STATE_ITERATE;
-}
-
-#ifdef HAVE_NETWORKING
-/* FIXME: This is an ugly way to tell Netplay this... */
-#define runloop_netplay_pause() netplay_driver_ctl(RARCH_NETPLAY_CTL_PAUSE, NULL)
-#else
-#define runloop_netplay_pause() ((void)0)
-#endif
-
-void runloop_set(enum runloop_action action)
-{
-   switch (action)
-   {
-      case RUNLOOP_ACTION_AUTOSAVE:
-         runloop_autosave = true;
-         break;
-      case RUNLOOP_ACTION_NONE:
-         break;
-   }
-}
-
-void runloop_unset(enum runloop_action action)
-{
-   switch (action)
-   {
-      case RUNLOOP_ACTION_AUTOSAVE:
-         runloop_autosave = false;
-         break;
-      case RUNLOOP_ACTION_NONE:
-         break;
-   }
-}
-
-/**
- * runloop_iterate:
- *
- * Run Libretro core in RetroArch for one frame.
- *
- * Returns: 0 on success, 1 if we have to wait until
- * button input in order to wake up the loop,
- * -1 if we forcibly quit out of the RetroArch iteration loop.
- **/
-int runloop_iterate(unsigned *sleep_ms)
-{
-   unsigned i;
-   retro_time_t current, target, to_sleep_ms;
-   uint64_t trigger_input                       = 0;
-   static uint64_t last_input                   = 0;
-   bool input_driver_is_nonblock                = false;
-   settings_t *settings                         = config_get_ptr();
-   uint64_t old_input                           = last_input;
-#ifdef HAVE_MENU
-   bool menu_is_alive                           = menu_driver_is_alive();
-#else
-   bool menu_is_alive                           = false;
-#endif
-   unsigned max_users                           = settings->uints.input_max_users;
-   uint64_t current_input                       =
-
-#ifdef HAVE_MENU
-      menu_is_alive ? 
-      input_menu_keys_pressed(settings, old_input,
-            &last_input, &trigger_input, runloop_paused,
-            &input_driver_is_nonblock) :
-#endif
-      input_keys_pressed(settings, old_input, &last_input,
-            &trigger_input, runloop_paused,
-            &input_driver_is_nonblock);
-
-   if (runloop_frame_time.callback)
-   {
-      /* Updates frame timing if frame timing callback is in use by the core.
-       * Limits frame time if fast forward ratio throttle is enabled. */
-
-      retro_time_t current     = cpu_features_get_time_usec();
-      retro_time_t delta       = current - runloop_frame_time_last;
-      bool is_locked_fps       = (runloop_paused ||
-                                  input_driver_is_nonblock) |
-                                  !!recording_data;
-
-
-      if (!runloop_frame_time_last || is_locked_fps)
-         delta = runloop_frame_time.reference;
-
-      if (!is_locked_fps && runloop_slowmotion)
-         delta /= settings->floats.slowmotion_ratio;
-
-      runloop_frame_time_last = current;
-
-      if (is_locked_fps)
-         runloop_frame_time_last = 0;
-
-      runloop_frame_time.callback(delta);
-   }
-
-   switch ((enum runloop_state)
-         runloop_check_state(
-            settings,
-            current_input,
-            old_input,
-            trigger_input,
-            input_driver_is_nonblock,
-            sleep_ms))
-   {
-      case RUNLOOP_STATE_QUIT:
-         frame_limit_last_time = 0.0;
-         command_event(CMD_EVENT_QUIT, NULL);
-         return -1;
-      case RUNLOOP_STATE_SLEEP:
-         core_poll();
-         runloop_netplay_pause();
-         *sleep_ms = 10;
-         return 1;
-      case RUNLOOP_STATE_END:
-         core_poll();
-         runloop_netplay_pause();
-         goto end;
-      case RUNLOOP_STATE_MENU_ITERATE:
-         core_poll();
-         runloop_netplay_pause();
-         return 0;
-      case RUNLOOP_STATE_ITERATE:
-      case RUNLOOP_STATE_NONE:
-         break;
-   }
-
-   if (runloop_autosave)
-      autosave_lock();
-
-   bsv_movie_set_frame_start();
-
-   camera_driver_poll();
-
-   /* Update binds for analog dpad modes. */
-   for (i = 0; i < max_users; i++)
-   {
-      struct retro_keybind *general_binds = input_config_binds[i];
-      struct retro_keybind *auto_binds    = input_autoconf_binds[i];
-      enum analog_dpad_mode dpad_mode     = (enum analog_dpad_mode)settings->uints.input_analog_dpad_mode[i];
-
-      if (dpad_mode == ANALOG_DPAD_NONE)
-         continue;
-
-      input_push_analog_dpad(general_binds, dpad_mode);
-      input_push_analog_dpad(auto_binds,    dpad_mode);
-   }
-
-   if ((settings->uints.video_frame_delay > 0) && !input_driver_is_nonblock)
-      retro_sleep(settings->uints.video_frame_delay);
-
-   core_run();
-
-#ifdef HAVE_CHEEVOS
-   if (runloop_check_cheevos())
-      cheevos_test();
-#endif
-
-   for (i = 0; i < max_users; i++)
-   {
-      struct retro_keybind *general_binds = input_config_binds[i];
-      struct retro_keybind *auto_binds    = input_autoconf_binds[i];
-      enum analog_dpad_mode dpad_mode     = (enum analog_dpad_mode)settings->uints.input_analog_dpad_mode[i];
-
-      if (dpad_mode == ANALOG_DPAD_NONE)
-         continue;
-
-      input_pop_analog_dpad(general_binds);
-      input_pop_analog_dpad(auto_binds);
-   }
-
-   bsv_movie_set_frame_end();
-
-   if (runloop_autosave)
-      autosave_unlock();
-
-   if (!settings->floats.fastforward_ratio)
-      return 0;
-
-end:
-
-   current                        = cpu_features_get_time_usec();
-   target                         = frame_limit_last_time +
-      frame_limit_minimum_time;
-   to_sleep_ms                    = (target - current) / 1000;
-
-   if (to_sleep_ms > 0)
-   {
-      *sleep_ms = (unsigned)to_sleep_ms;
-      /* Combat jitter a bit. */
-      frame_limit_last_time += frame_limit_minimum_time;
-      return 1;
-   }
-
-   frame_limit_last_time  = cpu_features_get_time_usec();
-
-   return 0;
-}
-
-rarch_system_info_t *runloop_get_system_info(void)
-{
-   return &runloop_system;
-}
diff --git a/runloop.h b/runloop.h
deleted file mode 100644
index 363dae314e..0000000000
--- a/runloop.h
+++ /dev/null
@@ -1,222 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2011-2016 - Daniel De Matteis
- *  Copyright (C) 2016 - 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/>.
- */
-
-#ifndef __RETROARCH_RUNLOOP_H
-#define __RETROARCH_RUNLOOP_H
-
-#include <stdint.h>
-#include <stddef.h>
-#include <stdlib.h>
-#include <boolean.h>
-#include <retro_common_api.h>
-
-#include "core.h"
-#include "runloop_defines.h"
-
-RETRO_BEGIN_DECLS
-
-enum runloop_action
-{
-   RUNLOOP_ACTION_NONE = 0,
-   RUNLOOP_ACTION_AUTOSAVE
-};
-
-enum runloop_ctl_state
-{
-   RUNLOOP_CTL_NONE = 0,
-
-   RUNLOOP_CTL_SET_FRAME_LIMIT,
-
-   RUNLOOP_CTL_TASK_INIT,
-
-   RUNLOOP_CTL_FRAME_TIME_FREE,
-   RUNLOOP_CTL_SET_FRAME_TIME_LAST,
-   RUNLOOP_CTL_SET_FRAME_TIME,
-
-   RUNLOOP_CTL_IS_IDLE,
-   RUNLOOP_CTL_SET_IDLE,
-
-   RUNLOOP_CTL_GET_WINDOWED_SCALE,
-   RUNLOOP_CTL_SET_WINDOWED_SCALE,
-
-   RUNLOOP_CTL_IS_OVERRIDES_ACTIVE,
-   RUNLOOP_CTL_SET_OVERRIDES_ACTIVE,
-   RUNLOOP_CTL_UNSET_OVERRIDES_ACTIVE,
-
-   RUNLOOP_CTL_IS_MISSING_BIOS,
-   RUNLOOP_CTL_SET_MISSING_BIOS,
-   RUNLOOP_CTL_UNSET_MISSING_BIOS,
-
-   RUNLOOP_CTL_IS_GAME_OPTIONS_ACTIVE,
-
-   RUNLOOP_CTL_IS_NONBLOCK_FORCED,
-   RUNLOOP_CTL_SET_NONBLOCK_FORCED,
-   RUNLOOP_CTL_UNSET_NONBLOCK_FORCED,
-
-   RUNLOOP_CTL_SET_LIBRETRO_PATH,
-
-   RUNLOOP_CTL_IS_PAUSED,
-   RUNLOOP_CTL_SET_PAUSED,
-   RUNLOOP_CTL_SET_MAX_FRAMES,
-   RUNLOOP_CTL_GLOBAL_FREE,
-
-   RUNLOOP_CTL_SET_CORE_SHUTDOWN,
-
-   RUNLOOP_CTL_SET_SHUTDOWN,
-   RUNLOOP_CTL_IS_SHUTDOWN,
-
-   /* Runloop state */
-   RUNLOOP_CTL_CLEAR_STATE,
-   RUNLOOP_CTL_STATE_FREE,
-
-   /* Performance counters */
-   RUNLOOP_CTL_GET_PERFCNT,
-   RUNLOOP_CTL_SET_PERFCNT_ENABLE,
-   RUNLOOP_CTL_UNSET_PERFCNT_ENABLE,
-   RUNLOOP_CTL_IS_PERFCNT_ENABLE,
-
-   /* Key event */
-   RUNLOOP_CTL_FRONTEND_KEY_EVENT_GET,
-   RUNLOOP_CTL_KEY_EVENT_GET,
-   RUNLOOP_CTL_DATA_DEINIT,
-
-   /* Message queue */
-   RUNLOOP_CTL_MSG_QUEUE_INIT,
-   RUNLOOP_CTL_MSG_QUEUE_DEINIT,
-
-   /* Core options */
-   RUNLOOP_CTL_HAS_CORE_OPTIONS,
-   RUNLOOP_CTL_GET_CORE_OPTION_SIZE,
-   RUNLOOP_CTL_IS_CORE_OPTION_UPDATED,
-   RUNLOOP_CTL_CORE_OPTIONS_LIST_GET,
-   RUNLOOP_CTL_CORE_OPTION_PREV,
-   RUNLOOP_CTL_CORE_OPTION_NEXT,
-   RUNLOOP_CTL_CORE_OPTIONS_GET,
-   RUNLOOP_CTL_CORE_OPTIONS_INIT,
-   RUNLOOP_CTL_CORE_OPTIONS_DEINIT,
-   RUNLOOP_CTL_CORE_OPTIONS_FREE,
-
-   /* System info */
-   RUNLOOP_CTL_SYSTEM_INFO_INIT,
-   RUNLOOP_CTL_SYSTEM_INFO_FREE,
-
-   /* HTTP server */
-   RUNLOOP_CTL_HTTPSERVER_INIT,
-   RUNLOOP_CTL_HTTPSERVER_DESTROY
-};
-
-typedef struct rarch_resolution
-{
-   unsigned idx;
-   unsigned id;
-} rarch_resolution_t;
-
-/* All run-time- / command line flag-related globals go here. */
-
-typedef struct global
-{
-   struct
-   {
-      char savefile[8192];
-      char savestate[8192];
-      char cheatfile[8192];
-      char ups[8192];
-      char bps[8192];
-      char ips[8192];
-      char remapfile[8192];
-   } name;
-
-   /* Recording. */
-   struct
-   {
-      char path[8192];
-      char config[8192];
-      unsigned width;
-      unsigned height;
-
-      size_t gpu_width;
-      size_t gpu_height;
-      char output_dir[8192];
-      char config_dir[8192];
-      bool use_output_dir;
-   } record;
-
-   /* Settings and/or global state that is specific to 
-    * a console-style implementation. */
-   struct
-   {
-      struct
-      {
-         struct
-         {
-            rarch_resolution_t current;
-            rarch_resolution_t initial;
-            uint32_t *list;
-            unsigned count;
-            bool check;
-         } resolutions;
-
-         unsigned gamma_correction;
-         unsigned int flicker_filter_index;
-         unsigned char soft_filter_index;
-         bool pal_enable;
-         bool pal60_enable;
-      } screen;
-
-      struct
-      {
-         bool system_bgm_enable;
-      } sound;
-
-      bool flickerfilter_enable;
-      bool softfilter_enable;
-   } console;
-} global_t;
-
-global_t *global_get_ptr(void);
-
-/**
- * runloop_iterate:
- *
- * Run Libretro core in RetroArch for one frame.
- *
- * Returns: 0 on successful run, 
- * Returns 1 if we have to wait until button input in order 
- * to wake up the loop.
- * Returns -1 if we forcibly quit out of the 
- * RetroArch iteration loop. 
- **/
-int runloop_iterate(unsigned *sleep_ms);
-
-void runloop_msg_queue_push(const char *msg, unsigned prio,
-      unsigned duration, bool flush);
-
-bool runloop_msg_queue_pull(const char **ret);
-
-void runloop_get_status(bool *is_paused, bool *is_idle, bool *is_slowmotion,
-      bool *is_perfcnt_enable);
-
-bool runloop_ctl(enum runloop_ctl_state state, void *data);
-
-void runloop_set(enum runloop_action action);
-
-void runloop_unset(enum runloop_action action);
-
-rarch_system_info_t *runloop_get_system_info(void);
-
-RETRO_END_DECLS
-
-#endif
diff --git a/runloop_defines.h b/runloop_defines.h
deleted file mode 100644
index d57f473437..0000000000
--- a/runloop_defines.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*  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/>.
- */
-
-#ifndef __RETROARCH_RUNLOOP_DEFINES_H
-#define __RETROARCH_RUNLOOP_DEFINES_H
-
-#define runloop_cmd_press(current_input, id)     (BIT64_GET(current_input, id))
-
-#endif
diff --git a/setting_list.c b/setting_list.c
index dca4568aae..909ce638e0 100644
--- a/setting_list.c
+++ b/setting_list.c
@@ -386,9 +386,9 @@ int setting_set_with_string_representation(rarch_setting_t* setting,
          strlcpy(setting->value.target.string, value, setting->size);
          break;
       case ST_BOOL:
-         if (memcmp(value, "true", 4) == 0)
+         if (string_is_equal_fast(value, "true", 4))
             *setting->value.target.boolean = true;
-         else if (memcmp(value, "false", 5) == 0)
+         else if (string_is_equal_fast(value, "false", 5))
             *setting->value.target.boolean = false;
          break;
       default:
diff --git a/tasks/task_audio_mixer.c b/tasks/task_audio_mixer.c
new file mode 100644
index 0000000000..cbf0b4c6fa
--- /dev/null
+++ b/tasks/task_audio_mixer.c
@@ -0,0 +1,224 @@
+/*  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 "tasks_internal.h"
+
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+
+#include <file/nbio.h>
+#include <audio/audio_mixer.h>
+#include <compat/strl.h>
+#include <retro_miscellaneous.h>
+
+#include "../audio/audio_driver.h"
+
+#include "../file_path_special.h"
+#include "../verbosity.h"
+
+#include "tasks_internal.h"
+
+struct audio_mixer_handle
+{
+   nbio_buf_t *buffer;
+   bool copy_data_over;
+   bool is_finished;
+   enum audio_mixer_type type;
+   char path[4095];
+};
+
+static void task_audio_mixer_load_free(retro_task_t *task)
+{
+   nbio_handle_t       *nbio        = (nbio_handle_t*)task->state;
+   struct audio_mixer_handle *image = (struct audio_mixer_handle*)nbio->data;
+
+   if (image)
+   {
+      if (image->buffer)
+         free(image->buffer);
+   }
+
+   if (nbio->data)
+      free(nbio->data);
+   nbio_free(nbio->handle);
+   free(nbio);
+}
+
+static int cb_nbio_audio_mixer_load(void *data, size_t len)
+{
+   nbio_handle_t *nbio             = (nbio_handle_t*)data; 
+   struct audio_mixer_handle *image= (struct audio_mixer_handle*)nbio->data;
+   void *ptr                       = nbio_get_ptr(nbio->handle, &len);
+   nbio_buf_t *buffer              = (nbio_buf_t*)calloc(1, sizeof(*image->buffer));
+
+   if (!buffer)
+      return -1;
+
+   image->buffer                   = buffer;
+   image->buffer->buf              = ptr;
+   image->buffer->bufsize          = len;
+   image->copy_data_over           = true;
+   nbio->is_finished               = true;
+
+   return 0;
+}
+
+static void task_audio_mixer_handle_upload_ogg(void *task_data,
+      void *user_data, const char *err)
+{
+   audio_mixer_stream_params_t params;
+   nbio_buf_t             *img = (nbio_buf_t*)task_data;
+
+   if (!img)
+      return;
+
+   params.volume               = 1.0f;
+   params.type                 = AUDIO_MIXER_TYPE_OGG;
+   params.state                = AUDIO_STREAM_STATE_PLAYING;
+   params.buf                  = img->buf;
+   params.bufsize              = img->bufsize;
+   params.cb                   = NULL;
+
+   audio_driver_mixer_add_stream(&params);
+
+   free(img);
+   free(user_data);
+}
+
+static void task_audio_mixer_handle_upload_wav(void *task_data,
+      void *user_data, const char *err)
+{
+   audio_mixer_stream_params_t params;
+   nbio_buf_t *img = (nbio_buf_t*)task_data;
+
+   if (!img)
+      return;
+
+   params.volume               = 1.0f;
+   params.type                 = AUDIO_MIXER_TYPE_WAV;
+   params.state                = AUDIO_STREAM_STATE_PLAYING;
+   params.buf                  = img->buf;
+   params.bufsize              = img->bufsize;
+   params.cb                   = NULL;
+
+   audio_driver_mixer_add_stream(&params);
+
+   free(img);
+   free(user_data);
+}
+
+bool task_audio_mixer_load_handler(retro_task_t *task)
+{
+   nbio_handle_t             *nbio  = (nbio_handle_t*)task->state;
+   struct audio_mixer_handle *image = (struct audio_mixer_handle*)nbio->data;
+
+   if (       
+         nbio->is_finished 
+         && (image && !image->is_finished)
+         && (image->copy_data_over)
+         && (!task_get_cancelled(task)))
+   {
+      nbio_buf_t *img = (nbio_buf_t*)calloc(1, sizeof(*img));
+
+      if (img)
+      {
+         img->buf     = image->buffer->buf;
+         img->bufsize = image->buffer->bufsize;
+      }
+
+      task_set_data(task, img);
+
+      image->copy_data_over = false;
+      image->is_finished    = true;
+
+
+      return false;
+   }
+
+   return true;
+}
+
+bool task_push_audio_mixer_load(const char *fullpath, retro_task_callback_t cb, void *user_data)
+{
+   nbio_handle_t             *nbio    = NULL;
+   struct audio_mixer_handle   *image = NULL;
+   retro_task_t                   *t  = (retro_task_t*)calloc(1, sizeof(*t));
+
+   if (!t)
+      goto error;
+
+   nbio               = (nbio_handle_t*)calloc(1, sizeof(*nbio));
+
+   if (!nbio)
+      goto error;
+
+   strlcpy(nbio->path, fullpath, sizeof(nbio->path));
+
+   image              = (struct audio_mixer_handle*)calloc(1, sizeof(*image));   
+   if (!image)
+      goto error;
+
+   image->is_finished = false;
+
+   strlcpy(image->path, fullpath, sizeof(image->path));
+
+   nbio->type         = NBIO_TYPE_NONE;
+   image->type        = AUDIO_MIXER_TYPE_NONE;
+
+   if (strstr(fullpath, file_path_str(FILE_PATH_WAV_EXTENSION)))
+   {
+      image->type     = AUDIO_MIXER_TYPE_WAV;
+      nbio->type      = NBIO_TYPE_WAV;
+      t->callback     = task_audio_mixer_handle_upload_wav;
+   }
+   else if (strstr(fullpath, file_path_str(FILE_PATH_OGG_EXTENSION)))
+   {
+      image->type     = AUDIO_MIXER_TYPE_OGG;
+      nbio->type      = NBIO_TYPE_OGG;
+      t->callback     = task_audio_mixer_handle_upload_ogg;
+   }
+
+   nbio->data         = (struct audio_mixer_handle*)image;
+   nbio->is_finished  = false;
+   nbio->cb           = &cb_nbio_audio_mixer_load;
+   nbio->status       = NBIO_STATUS_INIT;
+
+   t->state           = nbio;
+   t->handler         = task_file_load_handler;
+   t->cleanup         = task_audio_mixer_load_free;
+   t->user_data       = user_data;
+
+   task_queue_push(t);
+
+   return true;
+
+error:
+   if (nbio)
+   {
+      if (nbio->data)
+         free(nbio->data);
+      nbio_free(nbio->handle);
+      free(nbio);
+   }
+   if (t)
+      free(t);
+
+   RARCH_ERR("[audio mixer load] Failed to open '%s': %s.\n",
+         fullpath, strerror(errno));
+
+   return false;
+}
diff --git a/tasks/task_autodetect.c b/tasks/task_autodetect.c
index 000e72d3c7..1c25aed910 100644
--- a/tasks/task_autodetect.c
+++ b/tasks/task_autodetect.c
@@ -33,23 +33,26 @@
 
 #include "tasks_internal.h"
 
-typedef struct autoconfig_disconnect
+typedef struct autoconfig_disconnect autoconfig_disconnect_t;
+typedef struct autoconfig_params     autoconfig_params_t;
+
+struct autoconfig_disconnect
 {
    unsigned idx;
    char msg[255];
-} autoconfig_disconnect_t;
+};
 
-typedef struct autoconfig_params
+struct autoconfig_params
 {
    char  name[255];
    char  driver[255];
    char  display_name[255];
-   unsigned idx;
+   char autoconfig_directory[4096];
    int32_t vid;
    int32_t pid;
+   unsigned idx;
    uint32_t max_users;
-   char autoconfig_directory[4096];
-} autoconfig_params_t;
+};
 
 static bool input_autoconfigured[MAX_USERS];
 static unsigned input_device_name_index[MAX_USERS];
@@ -157,7 +160,7 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
    input_autoconfigure_joypad_conf(conf,
          input_autoconf_binds[params->idx]);
 
-   if (memcmp(device_type, "remote", 6) == 0)
+   if (string_is_equal_fast(device_type, "remote", 6))
    {
       static bool remote_is_bound        = false;
 
@@ -165,7 +168,10 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
             string_is_empty(display_name) ? params->name : display_name);
 
       if(!remote_is_bound)
+      {
+         task_free_title(task);
          task_set_title(task, strdup(msg));
+      }
       remote_is_bound = true;
       if (params->idx == 0)
          input_autoconfigure_swap_override = true;
@@ -186,7 +192,10 @@ static void input_autoconfigure_joypad_add(config_file_t *conf,
       }
 
       if (!block_osd_spam)
+      {
+         task_free_title(task);
          task_set_title(task, strdup(msg));
+      }
    }
 
 
@@ -313,14 +322,7 @@ static void input_autoconfigure_connect_handler(retro_task_t *task)
       char msg[255];
 
       msg[0] = '\0';
-#ifndef ANDROID
-      RARCH_LOG("[Autodetect]: no profiles found for %s (%d/%d).\n",
-            params->name, params->vid, params->pid);
-
-      snprintf(msg, sizeof(msg), "%s (%ld/%ld) %s.",
-            params->name, (long)params->vid, (long)params->pid,
-            msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED));
-#else
+#ifdef ANDROID
       strlcpy(params->name, "Android Gamepad", sizeof(params->name));
       if(input_autoconfigure_joypad_from_conf_internal(params, task))
       {
@@ -331,7 +333,15 @@ static void input_autoconfigure_connect_handler(retro_task_t *task)
                params->name, (long)params->vid, (long)params->pid,
                msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED_FALLBACK));
       }
+#else
+      RARCH_LOG("[Autodetect]: no profiles found for %s (%d/%d).\n",
+            params->name, params->vid, params->pid);
+
+      snprintf(msg, sizeof(msg), "%s (%ld/%ld) %s.",
+            params->name, (long)params->vid, (long)params->pid,
+            msg_hash_to_str(MSG_DEVICE_NOT_CONFIGURED));
 #endif
+      task_free_title(task);
       task_set_title(task, strdup(msg));
    }
 
@@ -377,7 +387,7 @@ bool input_autoconfigure_disconnect(unsigned i, const char *ident)
    task->state   = state;
    task->handler = input_autoconfigure_disconnect_handler;
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return true;
 
@@ -453,7 +463,7 @@ bool input_autoconfigure_connect(
    state->idx       = idx;
    state->vid       = vid;
    state->pid       = pid;
-   state->max_users = settings->uints.input_max_users;
+   state->max_users = *(input_driver_get_uint(INPUT_ACTION_MAX_USERS));
 
    input_config_set_device_name(state->idx, state->name);
    input_config_set_pid(state->idx, state->pid);
@@ -472,7 +482,7 @@ bool input_autoconfigure_connect(
    task->state   = state;
    task->handler = input_autoconfigure_connect_handler;
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return true;
 
diff --git a/tasks/task_content.c b/tasks/task_content.c
index 77caf2358b..8762bc9e05 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -85,7 +85,6 @@
 #include "../msg_hash.h"
 #include "../content.h"
 #include "../dynamic.h"
-#include "../runloop.h"
 #include "../retroarch.h"
 #include "../file_path_special.h"
 #include "../core.h"
@@ -97,15 +96,18 @@
 
 #define MAX_ARGS 32
 
-typedef struct content_stream
+typedef struct content_stream content_stream_t;
+typedef struct content_information_ctx content_information_ctx_t;
+
+struct content_stream
 {
    uint32_t a;
    const uint8_t *b;
    size_t c;
    uint32_t crc;
-} content_stream_t;
+};
 
-typedef struct content_information_ctx
+struct content_information_ctx
 {
    struct
    {
@@ -113,10 +115,17 @@ typedef struct content_information_ctx
       unsigned size;
    } subsystem;
 
+   char *name_ips;
+   char *name_bps;
+   char *name_ups;
+
    char *valid_extensions;
    char *directory_cache;
    char *directory_system;
 
+   bool is_ips_pref;
+   bool is_bps_pref;
+   bool is_ups_pref;
    bool history_list_enable;
    bool block_extract;
    bool need_fullpath;
@@ -126,25 +135,13 @@ typedef struct content_information_ctx
    bool check_firmware_before_loading;
 
    struct string_list *temporary_content;
-} content_information_ctx_t;
+};
 
 static struct string_list *temporary_content                  = NULL;
 static bool _content_is_inited                                = false;
 static bool core_does_not_need_content                        = false;
 static uint32_t content_rom_crc                               = 0;
 
-/**
- * content_file_read:
- * @path             : path to file.
- * @buf              : buffer to allocate and read the contents of the
- *                     file into. Needs to be freed manually.
- * @length           : Number of items read, -1 on error.
- *
- * Read the contents of a file into @buf. Will call file_archive_compressed_read
- * if path contains a compressed file, otherwise will call filestream_read_file().
- *
- * Returns: 1 if file read, 0 on error.
- */
 static int content_file_read(const char *path, void **buf, ssize_t *length)
 {
 #ifdef HAVE_COMPRESSION
@@ -280,7 +277,7 @@ static bool content_load(content_ctx_info_t *info)
    if (!retroarch_main_init(wrap_args->argc, wrap_args->argv))
    {
       retval = false;
-      goto error;
+      goto end;
    }
 
 #ifdef HAVE_MENU
@@ -295,7 +292,7 @@ static bool content_load(content_ctx_info_t *info)
    frontend_driver_process_args(rarch_argc_ptr, rarch_argv_ptr);
    frontend_driver_content_loaded();
 
-error:
+end:
    for (i = 0; i < ARRAY_SIZE(argv_copy); i++)
       free(argv_copy[i]);
    free(wrap_args);
@@ -323,6 +320,7 @@ static bool load_content_into_memory(
 
    RARCH_LOG("%s: %s.\n",
          msg_hash_to_str(MSG_LOADING_CONTENT_FILE), path);
+
    if (!content_file_read(path, (void**) &ret_buf, length))
       return false;
 
@@ -336,16 +334,15 @@ static bool load_content_into_memory(
 
       /* Attempt to apply a patch. */
       if (!content_ctx->patch_is_blocked)
-      {
-         global_t *global = global_get_ptr();
-         if (global)
-            patch_content(
-                  global->name.ips,
-                  global->name.bps,
-                  global->name.ups,
-                  (uint8_t**)&ret_buf,
-                  (void*)length);
-      }
+         patch_content(
+               content_ctx->is_ips_pref,
+               content_ctx->is_bps_pref,
+               content_ctx->is_ups_pref,
+               content_ctx->name_ips,
+               content_ctx->name_bps,
+               content_ctx->name_ups,
+               (uint8_t**)&ret_buf,
+               (void*)length);
 
       content_rom_crc = encoding_crc32(0, ret_buf, *length);
 
@@ -498,19 +495,16 @@ static bool content_file_load(
       const struct string_list *content,
       content_information_ctx_t *content_ctx,
       char **error_string,
-      const struct retro_subsystem_info *special
+      const struct retro_subsystem_info *special,
+      struct string_list *additional_path_allocs
       )
 {
    unsigned i;
    retro_ctx_load_content_info_t load_info;
    char msg[1024];
-   struct string_list *additional_path_allocs = string_list_new();
 
    msg[0] = '\0';
 
-   if (!additional_path_allocs)
-      return false;
-
    for (i = 0; i < content->size; i++)
    {
       int         attr     = content->elems[i].attr.i;
@@ -525,7 +519,7 @@ static bool content_file_load(
                sizeof(msg)
                );
          *error_string = strdup(msg);
-         goto error;
+         return false;
       }
 
       info[i].path = NULL;
@@ -548,7 +542,7 @@ static bool content_file_load(
                   msg_hash_to_str(MSG_COULD_NOT_READ_CONTENT_FILE),
                   path);
             *error_string = strdup(msg);
-            goto error;
+            return false;
          }
 
          info[i].size = len;
@@ -568,7 +562,7 @@ static bool content_file_load(
                   &info[i], i,
                   additional_path_allocs, need_fullpath, path,
                   error_string))
-            goto error;
+            return false;
 #endif
       }
    }
@@ -582,7 +576,7 @@ static bool content_file_load(
       snprintf(msg, sizeof(msg),
             "%s.", msg_hash_to_str(MSG_FAILED_TO_LOAD_CONTENT));
       *error_string = strdup(msg);
-      goto error;
+      return false;
    }
 
 #ifdef HAVE_CHEEVOS
@@ -595,14 +589,7 @@ static bool content_file_load(
    }
 #endif
 
-   string_list_free(additional_path_allocs);
-
    return true;
-
-error:
-   string_list_free(additional_path_allocs);
-   
-   return false;
 }
 
 static const struct retro_subsystem_info *content_file_init_subsystem(
@@ -728,25 +715,20 @@ static bool content_file_init_set_attribs(
  **/
 static bool content_file_init(
       content_information_ctx_t *content_ctx,
+      struct string_list *content,
       char **error_string)
 {
    struct retro_game_info               *info = NULL;
-   struct string_list *content                = NULL;
-   bool ret                                   = path_is_empty(RARCH_PATH_SUBSYSTEM) 
+   bool ret                                   = 
+      path_is_empty(RARCH_PATH_SUBSYSTEM) 
       ? true : false;
-   const struct retro_subsystem_info *special = path_is_empty(RARCH_PATH_SUBSYSTEM) 
+   const struct retro_subsystem_info *special = 
+      path_is_empty(RARCH_PATH_SUBSYSTEM) 
       ? NULL : content_file_init_subsystem(content_ctx, error_string, &ret);
 
-   if (!ret)
-      goto error;
-
-   content = string_list_new();
-
-   if (!content)
-      goto error;
-
-   if (!content_file_init_set_attribs(content, special, content_ctx, error_string))
-      goto error;
+   if (  !ret || 
+         !content_file_init_set_attribs(content, special, content_ctx, error_string))
+      return false;
 
    info                   = (struct retro_game_info*)
       calloc(content->size, sizeof(*info));
@@ -754,8 +736,10 @@ static bool content_file_init(
    if (info)
    {
       unsigned i;
+      struct string_list *additional_path_allocs = string_list_new();
       ret = content_file_load(info, content, content_ctx, error_string,
-            special);
+            special, additional_path_allocs);
+      string_list_free(additional_path_allocs);
 
       for (i = 0; i < content->size; i++)
          free((void*)info[i].data);
@@ -763,9 +747,6 @@ static bool content_file_init(
       free(info);
    }
 
-error:
-   if (content)
-      string_list_free(content);
    return ret;
 }
 
@@ -828,7 +809,21 @@ static bool task_load_content(content_ctx_info_t *content_info,
    name[0] = msg[0] = '\0';
 
    if (!content_load(content_info))
-      goto error;
+   {
+      if (launched_from_menu)
+      {
+         if (!path_is_empty(RARCH_PATH_CONTENT) && !string_is_empty(name))
+         {
+            snprintf(msg, sizeof(msg), "%s %s.\n",
+                  msg_hash_to_str(MSG_FAILED_TO_LOAD),
+                  name);
+            *error_string = strdup(msg);
+         }
+      }
+      if (string_is_empty(name))
+         *error_string = strdup("This core requires a content file.\n");
+      return false;
+   }
 
    content_get_status(&contentless, &is_inited);
 
@@ -917,21 +912,6 @@ static bool task_load_content(content_ctx_info_t *content_info,
    }
 
    return true;
-
-error:
-   if (launched_from_menu)
-   {
-      if (!path_is_empty(RARCH_PATH_CONTENT) && !string_is_empty(name))
-      {
-         snprintf(msg, sizeof(msg), "%s %s.\n",
-               msg_hash_to_str(MSG_FAILED_TO_LOAD),
-               name);
-         *error_string = strdup(msg);
-      }
-   }
-   if (string_is_empty(name))
-      *error_string = strdup("This core requires a content file.\n");
-   return false;
 }
 
 #ifdef HAVE_MENU
@@ -947,9 +927,7 @@ static bool command_event_cmd_exec(const char *data,
    content_info.argv        = NULL;
    content_info.args        = NULL;
    content_info.environ_get = NULL;
-#ifdef HAVE_MENU
    content_info.environ_get = menu_content_environment_get;
-#endif
 #endif
 
    if (path_get(RARCH_PATH_CONTENT) != (void*)data)
@@ -1015,19 +993,26 @@ static bool firmware_update_status(
 bool task_push_start_dummy_core(content_ctx_info_t *content_info)
 {
    content_information_ctx_t content_ctx;
-  
+   bool ret                                   = true;
    char *error_string                         = NULL;
+   global_t *global                           = global_get_ptr();
    settings_t *settings                       = config_get_ptr();
 
    if (!content_info)
       return false;
 
    content_ctx.check_firmware_before_loading  = settings->bools.check_firmware_before_loading;
+   content_ctx.is_ips_pref                    = rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
+   content_ctx.is_bps_pref                    = rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
+   content_ctx.is_ups_pref                    = rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
    content_ctx.patch_is_blocked               = rarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
-   content_ctx.bios_is_missing                = runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL);
+   content_ctx.bios_is_missing                = rarch_ctl(RARCH_CTL_IS_MISSING_BIOS, NULL);
    content_ctx.history_list_enable            = false;
    content_ctx.directory_system               = NULL;
    content_ctx.directory_cache                = NULL;
+   content_ctx.name_ips                       = NULL;
+   content_ctx.name_bps                       = NULL;
+   content_ctx.name_ups                       = NULL;
    content_ctx.valid_extensions               = NULL;
    content_ctx.block_extract                  = false;
    content_ctx.need_fullpath                  = false;
@@ -1038,6 +1023,16 @@ bool task_push_start_dummy_core(content_ctx_info_t *content_info)
 
    content_ctx.history_list_enable            = settings->bools.history_list_enable;
 
+   if (global)
+   {
+      if (!string_is_empty(global->name.ips))
+         content_ctx.name_ips                 = strdup(global->name.ips);
+      if (!string_is_empty(global->name.bps))
+         content_ctx.name_bps                 = strdup(global->name.bps);
+      if (!string_is_empty(global->name.ups))
+         content_ctx.name_ups                 = strdup(global->name.ups);
+   }
+
    if (!string_is_empty(settings->paths.directory_system))
       content_ctx.directory_system            = strdup(settings->paths.directory_system);
 
@@ -1054,33 +1049,34 @@ bool task_push_start_dummy_core(content_ctx_info_t *content_info)
 #ifdef HAVE_MENU
    menu_driver_ctl(RARCH_MENU_CTL_UNSET_LOAD_NO_CONTENT, NULL);
 #endif
-   runloop_ctl(RUNLOOP_CTL_STATE_FREE, NULL);
-   runloop_ctl(RUNLOOP_CTL_DATA_DEINIT, NULL);
-   runloop_ctl(RUNLOOP_CTL_TASK_INIT, NULL);
+   rarch_ctl(RARCH_CTL_STATE_FREE, NULL);
+   rarch_ctl(RARCH_CTL_DATA_DEINIT, NULL);
+   rarch_ctl(RARCH_CTL_TASK_INIT, NULL);
 
    /* Load content */
    if (!task_load_content(content_info, &content_ctx,
             false, false, &error_string))
-      goto error;
-
-   if (content_ctx.directory_system)
-      free(content_ctx.directory_system);
-
-   return true;
-
-error:
-
-   if (error_string)
    {
-      runloop_msg_queue_push(error_string, 2, 90, true);
-      RARCH_ERR(error_string);
-      free(error_string);
+      if (error_string)
+      {
+         runloop_msg_queue_push(error_string, 2, 90, true);
+         RARCH_ERR(error_string);
+         free(error_string);
+      }
+
+      ret =  false;
    }
 
+   if (content_ctx.name_ips)
+      free(content_ctx.name_ips);
+   if (content_ctx.name_bps)
+      free(content_ctx.name_bps);
+   if (content_ctx.name_ups)
+      free(content_ctx.name_ups);
    if (content_ctx.directory_system)
       free(content_ctx.directory_system);
 
-   return false;
+   return ret;
 }
 
 #ifdef HAVE_MENU
@@ -1093,15 +1089,23 @@ bool task_push_load_content_from_playlist_from_menu(
 {
    content_information_ctx_t content_ctx;
   
+   bool ret                                   = true;
    char *error_string                         = NULL;
+   global_t *global                           = global_get_ptr();
    settings_t *settings                       = config_get_ptr();
 
    content_ctx.check_firmware_before_loading  = settings->bools.check_firmware_before_loading;
+   content_ctx.is_ips_pref                    = rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
+   content_ctx.is_bps_pref                    = rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
+   content_ctx.is_ups_pref                    = rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
    content_ctx.patch_is_blocked               = rarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
-   content_ctx.bios_is_missing                = runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL);
+   content_ctx.bios_is_missing                = rarch_ctl(RARCH_CTL_IS_MISSING_BIOS, NULL);
    content_ctx.history_list_enable            = false;
    content_ctx.directory_system               = NULL;
    content_ctx.directory_cache                = NULL;
+   content_ctx.name_ips                       = NULL;
+   content_ctx.name_bps                       = NULL;
+   content_ctx.name_ups                       = NULL;
    content_ctx.valid_extensions               = NULL;
    content_ctx.block_extract                  = false;
    content_ctx.need_fullpath                  = false;
@@ -1112,11 +1116,21 @@ bool task_push_load_content_from_playlist_from_menu(
 
    content_ctx.history_list_enable            = settings->bools.history_list_enable;
 
+   if (global)
+   {
+      if (!string_is_empty(global->name.ips))
+         content_ctx.name_ips                 = strdup(global->name.ips);
+      if (!string_is_empty(global->name.bps))
+         content_ctx.name_bps                 = strdup(global->name.bps);
+      if (!string_is_empty(global->name.ups))
+         content_ctx.name_ups                 = strdup(global->name.ups);
+   }
+
    if (!string_is_empty(settings->paths.directory_system))
       content_ctx.directory_system            = strdup(settings->paths.directory_system);
 
    /* Set libretro core path */
-   runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
+   rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, (void*)core_path);
 
    /* Is content required by this core? */
    if (fullpath)
@@ -1128,10 +1142,23 @@ bool task_push_load_content_from_playlist_from_menu(
     * execute the new core from this point. If this returns false,
     * we assume we can dynamically load the core. */
    if (!command_event_cmd_exec(fullpath, &content_ctx, CONTENT_MODE_LOAD_NONE, &error_string))
-      goto error;
+   {
+      if (error_string)
+      {
+         runloop_msg_queue_push(error_string, 2, 90, true);
+         RARCH_ERR(error_string);
+         free(error_string);
+      }
+
+      rarch_menu_running();
+
+      ret = false;
+      goto end;
+   }
+
 #ifndef HAVE_DYNAMIC
-   runloop_ctl(RUNLOOP_CTL_SET_SHUTDOWN, NULL);
-   rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
+   rarch_ctl(RARCH_CTL_SET_SHUTDOWN, NULL);
+   rarch_menu_running_finished();
 #endif
 
    /* Load core */
@@ -1139,26 +1166,17 @@ bool task_push_load_content_from_playlist_from_menu(
    command_event(CMD_EVENT_LOAD_CORE, NULL);
 #endif
 
+end:
+   if (content_ctx.name_ips)
+      free(content_ctx.name_ips);
+   if (content_ctx.name_bps)
+      free(content_ctx.name_bps);
+   if (content_ctx.name_ups)
+      free(content_ctx.name_ups);
    if (content_ctx.directory_system)
       free(content_ctx.directory_system);
 
-   return true;
-
-error:
-
-   if (error_string)
-   {
-      runloop_msg_queue_push(error_string, 2, 90, true);
-      RARCH_ERR(error_string);
-      free(error_string);
-   }
-
-   rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
-
-   if (content_ctx.directory_system)
-      free(content_ctx.directory_system);
-
-   return false;
+   return ret;
 }
 #endif
 
@@ -1166,18 +1184,26 @@ bool task_push_start_current_core(content_ctx_info_t *content_info)
 {
    content_information_ctx_t content_ctx;
   
+   bool ret                                   = true;
    char *error_string                         = NULL;
+   global_t *global                           = global_get_ptr();
    settings_t *settings                       = config_get_ptr();
 
    if (!content_info)
       return false;
 
    content_ctx.check_firmware_before_loading  = settings->bools.check_firmware_before_loading;
+   content_ctx.is_ips_pref                    = rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
+   content_ctx.is_bps_pref                    = rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
+   content_ctx.is_ups_pref                    = rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
    content_ctx.patch_is_blocked               = rarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
-   content_ctx.bios_is_missing                = runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL);
+   content_ctx.bios_is_missing                = rarch_ctl(RARCH_CTL_IS_MISSING_BIOS, NULL);
    content_ctx.history_list_enable            = false;
    content_ctx.directory_system               = NULL;
    content_ctx.directory_cache                = NULL;
+   content_ctx.name_ips                       = NULL;
+   content_ctx.name_bps                       = NULL;
+   content_ctx.name_ups                       = NULL;
    content_ctx.valid_extensions               = NULL;
    content_ctx.block_extract                  = false;
    content_ctx.need_fullpath                  = false;
@@ -1188,6 +1214,16 @@ bool task_push_start_current_core(content_ctx_info_t *content_info)
 
    content_ctx.history_list_enable            = settings->bools.history_list_enable;
 
+   if (global)
+   {
+      if (!string_is_empty(global->name.ips))
+         content_ctx.name_ips                 = strdup(global->name.ips);
+      if (!string_is_empty(global->name.bps))
+         content_ctx.name_bps                 = strdup(global->name.bps);
+      if (!string_is_empty(global->name.ups))
+         content_ctx.name_ups                 = strdup(global->name.ups);
+   }
+
    if (!string_is_empty(settings->paths.directory_system))
       content_ctx.directory_system            = strdup(settings->paths.directory_system);
 
@@ -1209,35 +1245,36 @@ bool task_push_start_current_core(content_ctx_info_t *content_info)
 
    if (!task_load_content(content_info, &content_ctx,
             true, false, &error_string))
-      goto error;
+   {
+      if (error_string)
+      {
+         runloop_msg_queue_push(error_string, 2, 90, true);
+         RARCH_ERR(error_string);
+         free(error_string);
+      }
+
+      rarch_menu_running();
+
+      ret = false;
+      goto end;
+   }
 
 #ifdef HAVE_MENU
    /* Push quick menu onto menu stack */
    menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
 #endif
 
+end:
+   if (content_ctx.name_ips)
+      free(content_ctx.name_ips);
+   if (content_ctx.name_bps)
+      free(content_ctx.name_bps);
+   if (content_ctx.name_ups)
+      free(content_ctx.name_ups);
    if (content_ctx.directory_system)
       free(content_ctx.directory_system);
 
-   return true;
-
-error:
-
-   if (error_string)
-   {
-      runloop_msg_queue_push(error_string, 2, 90, true);
-      RARCH_ERR(error_string);
-      free(error_string);
-   }
-
-#ifdef HAVE_MENU
-   rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
-#endif
-
-   if (content_ctx.directory_system)
-      free(content_ctx.directory_system);
-
-   return false;
+   return ret;
 }
 
 bool task_push_load_new_core(
@@ -1249,7 +1286,7 @@ bool task_push_load_new_core(
       void *user_data)
 {
    /* Set libretro core path */
-   runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
+   rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, (void*)core_path);
 
    /* Load core */
    command_event(CMD_EVENT_LOAD_CORE, NULL);
@@ -1278,15 +1315,23 @@ bool task_push_load_content_with_new_core_from_menu(
 {
    content_information_ctx_t content_ctx;
   
+   bool ret                                   = true;
    char *error_string                         = NULL;
+   global_t *global                           = global_get_ptr();
    settings_t *settings                       = config_get_ptr();
 
    content_ctx.check_firmware_before_loading  = settings->bools.check_firmware_before_loading;
+   content_ctx.is_ips_pref                    = rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
+   content_ctx.is_bps_pref                    = rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
+   content_ctx.is_ups_pref                    = rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
    content_ctx.patch_is_blocked               = rarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
-   content_ctx.bios_is_missing                = runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL);
+   content_ctx.bios_is_missing                = rarch_ctl(RARCH_CTL_IS_MISSING_BIOS, NULL);
    content_ctx.history_list_enable            = false;
    content_ctx.directory_system               = NULL;
    content_ctx.directory_cache                = NULL;
+   content_ctx.name_ips                       = NULL;
+   content_ctx.name_bps                       = NULL;
+   content_ctx.name_ups                       = NULL;
    content_ctx.valid_extensions               = NULL;
    content_ctx.block_extract                  = false;
    content_ctx.need_fullpath                  = false;
@@ -1297,6 +1342,16 @@ bool task_push_load_content_with_new_core_from_menu(
 
    content_ctx.history_list_enable            = settings->bools.history_list_enable;
 
+   if (global)
+   {
+      if (!string_is_empty(global->name.ips))
+         content_ctx.name_ips                 = strdup(global->name.ips);
+      if (!string_is_empty(global->name.bps))
+         content_ctx.name_bps                 = strdup(global->name.bps);
+      if (!string_is_empty(global->name.ups))
+         content_ctx.name_ups                 = strdup(global->name.ups);
+   }
+
    if (!string_is_empty(settings->paths.directory_system))
       content_ctx.directory_system            = strdup(settings->paths.directory_system);
 
@@ -1304,7 +1359,7 @@ bool task_push_load_content_with_new_core_from_menu(
    path_set(RARCH_PATH_CONTENT, fullpath);
 
    /* Set libretro core path */
-   runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
+   rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, (void*)core_path);
 
 #ifdef HAVE_DYNAMIC
    /* Load core */
@@ -1327,12 +1382,10 @@ bool task_push_load_content_with_new_core_from_menu(
          free(error_string);
       }
 
-      rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
+      rarch_menu_running();
 
-      if (content_ctx.directory_system)
-         free(content_ctx.directory_system);
-
-      return false;
+      ret = false;
+      goto end;
    }
 
 #else
@@ -1345,10 +1398,17 @@ bool task_push_load_content_with_new_core_from_menu(
    if (type != CORE_TYPE_DUMMY)
       menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
 
+end:
+   if (content_ctx.name_ips)
+      free(content_ctx.name_ips);
+   if (content_ctx.name_bps)
+      free(content_ctx.name_bps);
+   if (content_ctx.name_ups)
+      free(content_ctx.name_ups);
    if (content_ctx.directory_system)
       free(content_ctx.directory_system);
 
-   return true;
+   return ret;
 }
 #endif
 
@@ -1359,14 +1419,21 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
 
    bool ret                                   = false;
    char *error_string                         = NULL;
+   global_t *global                           = global_get_ptr();
    settings_t *settings                       = config_get_ptr();
 
    content_ctx.check_firmware_before_loading  = settings->bools.check_firmware_before_loading;
+   content_ctx.is_ips_pref                    = rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
+   content_ctx.is_bps_pref                    = rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
+   content_ctx.is_ups_pref                    = rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
    content_ctx.patch_is_blocked               = rarch_ctl(RARCH_CTL_IS_PATCH_BLOCKED, NULL);
-   content_ctx.bios_is_missing                = runloop_ctl(RUNLOOP_CTL_IS_MISSING_BIOS, NULL);
+   content_ctx.bios_is_missing                = rarch_ctl(RARCH_CTL_IS_MISSING_BIOS, NULL);
    content_ctx.history_list_enable            = false;
    content_ctx.directory_system               = NULL;
    content_ctx.directory_cache                = NULL;
+   content_ctx.name_ips                       = NULL;
+   content_ctx.name_bps                       = NULL;
+   content_ctx.name_ups                       = NULL;
    content_ctx.valid_extensions               = NULL;
    content_ctx.block_extract                  = false;
    content_ctx.need_fullpath                  = false;
@@ -1377,6 +1444,16 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
 
    content_ctx.history_list_enable            = settings->bools.history_list_enable;
 
+   if (global)
+   {
+      if (!string_is_empty(global->name.ips))
+         content_ctx.name_ips                 = strdup(global->name.ips);
+      if (!string_is_empty(global->name.bps))
+         content_ctx.name_bps                 = strdup(global->name.bps);
+      if (!string_is_empty(global->name.ups))
+         content_ctx.name_ups                 = strdup(global->name.ups);
+   }
+
    if (!string_is_empty(settings->paths.directory_system))
       content_ctx.directory_system            = strdup(settings->paths.directory_system);
 
@@ -1390,6 +1467,12 @@ static bool task_load_content_callback(content_ctx_info_t *content_info,
 
    ret = task_load_content(content_info, &content_ctx, true, loading_from_cli, &error_string);
 
+   if (content_ctx.name_ips)
+      free(content_ctx.name_ips);
+   if (content_ctx.name_bps)
+      free(content_ctx.name_bps);
+   if (content_ctx.name_ups)
+      free(content_ctx.name_ups);
    if (content_ctx.directory_system)
       free(content_ctx.directory_system);
 
@@ -1419,7 +1502,7 @@ bool task_push_load_content_with_new_core_from_companion_ui(
    path_set(RARCH_PATH_CONTENT, fullpath);
 
    /* Set libretro core path */
-   runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)core_path);
+   rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, (void*)core_path);
 #ifdef HAVE_DYNAMIC
    command_event(CMD_EVENT_LOAD_CORE, NULL);
 #endif
@@ -1448,16 +1531,6 @@ bool task_push_load_content_from_cli(
    if (!task_load_content_callback(content_info, true, true))
       return false;
 
-#if 0
-   /* If we launch content from CLI, we might want to push the
-    * Quick Menu here */
-   /* Push quick menu onto menu stack */
-#ifdef HAVE_MENU
-   if (type != CORE_TYPE_DUMMY)
-      menu_driver_ctl(RARCH_MENU_CTL_SET_PENDING_QUICK_MENU, NULL);
-#endif
-#endif
-
    return true;
 }
 
@@ -1477,9 +1550,7 @@ bool task_push_start_builtin_core(
    /* Load content */
    if (!task_load_content_callback(content_info, true, false))
    {
-#ifdef HAVE_MENU
-      rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
-#endif
+      rarch_menu_running();
       return false;
    }
 
@@ -1528,7 +1599,7 @@ bool task_push_load_content_with_core_from_menu(
    /* Load content */
    if (!task_load_content_callback(content_info, true, false))
    {
-      rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
+      rarch_menu_running();
       return false;
    }
 
@@ -1602,16 +1673,24 @@ bool content_init(void)
 
    bool ret                                   = true;
    char *error_string                         = NULL;
+   struct string_list *content                = NULL;
+   global_t *global                           = global_get_ptr();
    settings_t *settings                       = config_get_ptr();
    rarch_system_info_t *sys_info              = runloop_get_system_info();
 
    temporary_content                          = string_list_new();
 
    content_ctx.check_firmware_before_loading  = settings->bools.check_firmware_before_loading;
+   content_ctx.is_ips_pref                    = rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
+   content_ctx.is_bps_pref                    = rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
+   content_ctx.is_ups_pref                    = rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
    content_ctx.temporary_content              = temporary_content;
    content_ctx.history_list_enable            = false;
    content_ctx.directory_system               = NULL;
    content_ctx.directory_cache                = NULL;
+   content_ctx.name_ips                       = NULL;
+   content_ctx.name_bps                       = NULL;
+   content_ctx.name_ups                       = NULL;
    content_ctx.valid_extensions               = NULL;
    content_ctx.block_extract                  = false;
    content_ctx.need_fullpath                  = false;
@@ -1620,6 +1699,16 @@ bool content_init(void)
 
    content_ctx.subsystem.data                 = NULL;
    content_ctx.subsystem.size                 = 0;
+
+   if (global)
+   {
+      if (!string_is_empty(global->name.ips))
+         content_ctx.name_ips                 = strdup(global->name.ips);
+      if (!string_is_empty(global->name.bps))
+         content_ctx.name_bps                 = strdup(global->name.bps);
+      if (!string_is_empty(global->name.ups))
+         content_ctx.name_ups                 = strdup(global->name.ups);
+   }
    
    if (sys_info)
    {
@@ -1640,18 +1729,25 @@ bool content_init(void)
       content_ctx.subsystem.size              = sys_info->subsystem.size;
    }
 
+   _content_is_inited = true;
+   content            = string_list_new();
+
    if (     !temporary_content 
-         || !content_file_init(&content_ctx, &error_string))
+         || !content_file_init(&content_ctx, content, &error_string))
    {
       content_deinit();
 
-      ret = false;
-      goto end;
+      ret                = false;
    }
 
-   _content_is_inited = true;
+   string_list_free(content);
 
-end:
+   if (content_ctx.name_ips)
+      free(content_ctx.name_ips);
+   if (content_ctx.name_bps)
+      free(content_ctx.name_bps);
+   if (content_ctx.name_ups)
+      free(content_ctx.name_ups);
    if (content_ctx.directory_system)
       free(content_ctx.directory_system);
    if (content_ctx.directory_cache)
diff --git a/tasks/task_database.c b/tasks/task_database.c
index 5a1b59ffb0..42f119a65d 100644
--- a/tasks/task_database.c
+++ b/tasks/task_database.c
@@ -32,7 +32,7 @@
 #include "../list_special.h"
 #include "../msg_hash.h"
 #include "../playlist.h"
-#include "../runloop.h"
+#include "../retroarch.h"
 #include "../verbosity.h"
 #include "../core_info.h"
 
@@ -62,6 +62,15 @@ typedef struct db_handle
    char content_database_path[4096];
 } db_handle_t;
 
+int find_first_data_track(const char* cue_path,
+      int32_t* offset, char* track_path, size_t max_len);
+
+int detect_system(const char* track_path, const char** system_name);
+
+int detect_ps1_game(const char *track_path, char *game_id);
+
+int detect_psp_game(const char *track_path, char *game_id);
+
 static void database_info_set_type(database_info_handle_t *handle, enum database_type type)
 {
    if (!handle)
@@ -131,13 +140,13 @@ static int iso_get_serial(database_state_handle_t *db_state,
    if (rv < 0)
       return rv;
 
-   if (memcmp(system_name, "psp", 3) == 0)
+   if (string_is_equal_fast(system_name, "psp", 3))
    {
       if (detect_psp_game(name, serial) == 0)
          return 0;
       RARCH_LOG("%s '%s'\n", msg_hash_to_str(MSG_FOUND_DISK_LABEL), serial);
    }
-   else if (memcmp(system_name, "ps1", 3) == 0)
+   else if (string_is_equal_fast(system_name, "ps1", 3))
    {
       if (detect_ps1_game(name, serial) == 0)
          return 0;
@@ -727,7 +736,7 @@ bool task_push_dbscan(
    if (db->handle)
       db->handle->status = DATABASE_STATUS_ITERATE_BEGIN;
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, t);
+   task_queue_push(t);
 
    return true;
 
diff --git a/tasks/task_database_cue.c b/tasks/task_database_cue.c
index 9e43c965b6..663583c0aa 100644
--- a/tasks/task_database_cue.c
+++ b/tasks/task_database_cue.c
@@ -278,31 +278,31 @@ int detect_psp_game(const char *track_path, char *game_id)
       {
          game_id[5] = '\0';
          if (
-             (memcmp(game_id, "ULES-", 5) == 0)
-          || (memcmp(game_id, "ULUS-", 5) == 0)
-          || (memcmp(game_id, "ULJS-", 5) == 0)
+             (string_is_equal_fast(game_id, "ULES-", 5))
+          || (string_is_equal_fast(game_id, "ULUS-", 5))
+          || (string_is_equal_fast(game_id, "ULJS-", 5))
 
-          || (memcmp(game_id, "ULEM-", 5) == 0)
-          || (memcmp(game_id, "ULUM-", 5) == 0)
-          || (memcmp(game_id, "ULJM-", 5) == 0)
+          || (string_is_equal_fast(game_id, "ULEM-", 5))
+          || (string_is_equal_fast(game_id, "ULUM-", 5))
+          || (string_is_equal_fast(game_id, "ULJM-", 5))
 
-          || (memcmp(game_id, "UCES-", 5) == 0)
-          || (memcmp(game_id, "UCUS-", 5) == 0)
-          || (memcmp(game_id, "UCJS-", 5) == 0)
-          || (memcmp(game_id, "UCAS-", 5) == 0)
+          || (string_is_equal_fast(game_id, "UCES-", 5))
+          || (string_is_equal_fast(game_id, "UCUS-", 5))
+          || (string_is_equal_fast(game_id, "UCJS-", 5))
+          || (string_is_equal_fast(game_id, "UCAS-", 5))
 
-          || (memcmp(game_id, "NPEH-", 5) == 0)
-          || (memcmp(game_id, "NPUH-", 5) == 0)
-          || (memcmp(game_id, "NPJH-", 5) == 0)
+          || (string_is_equal_fast(game_id, "NPEH-", 5))
+          || (string_is_equal_fast(game_id, "NPUH-", 5))
+          || (string_is_equal_fast(game_id, "NPJH-", 5))
 
-          || (memcmp(game_id, "NPEG-", 5) == 0)
-          || (memcmp(game_id, "NPUG-", 5) == 0)
-          || (memcmp(game_id, "NPJG-", 5) == 0)
-          || (memcmp(game_id, "NPHG-", 5) == 0)
+          || (string_is_equal_fast(game_id, "NPEG-", 5))
+          || (string_is_equal_fast(game_id, "NPUG-", 5))
+          || (string_is_equal_fast(game_id, "NPJG-", 5))
+          || (string_is_equal_fast(game_id, "NPHG-", 5))
 
-          || (memcmp(game_id, "NPEZ-", 5) == 0)
-          || (memcmp(game_id, "NPUZ-", 5) == 0)
-          || (memcmp(game_id, "NPJZ-", 5) == 0)
+          || (string_is_equal_fast(game_id, "NPEZ-", 5))
+          || (string_is_equal_fast(game_id, "NPUZ-", 5))
+          || (string_is_equal_fast(game_id, "NPJZ-", 5))
          )
          {
             filestream_seek(fd, pos, SEEK_SET);
@@ -354,7 +354,7 @@ int detect_system(const char *track_path, const char **system_name)
          goto clean;
       }
 
-      if (memcmp(MAGIC_NUMBERS[i].magic, magic, MAGIC_LEN) == 0)
+      if (string_is_equal_fast(MAGIC_NUMBERS[i].magic, magic, MAGIC_LEN))
       {
          *system_name = MAGIC_NUMBERS[i].system_name;
          rv = 0;
@@ -366,7 +366,7 @@ int detect_system(const char *track_path, const char **system_name)
    if (filestream_read(fd, magic, 8) > 0)
    {
       magic[8] = '\0';
-      if (memcmp(magic, "PSP GAME", 8) == 0)
+      if (string_is_equal_fast(magic, "PSP GAME", 8))
       {
          *system_name = "psp\0";
          rv = 0;
@@ -403,7 +403,7 @@ int find_first_data_track(const char *cue_path,
 
    while (get_token(fd, tmp_token, MAX_TOKEN_LEN) > 0)
    {
-      if (memcmp(tmp_token, "FILE", 4) == 0)
+      if (string_is_equal_fast(tmp_token, "FILE", 4))
       {
          char cue_dir[PATH_MAX_LENGTH];
 
@@ -415,13 +415,13 @@ int find_first_data_track(const char *cue_path,
          fill_pathname_join(track_path, cue_dir, tmp_token, max_len);
 
       }
-      else if (memcmp(tmp_token, "TRACK", 5) == 0)
+      else if (string_is_equal_fast(tmp_token, "TRACK", 5))
       {
          int m, s, f;
          get_token(fd, tmp_token, MAX_TOKEN_LEN);
          get_token(fd, tmp_token, MAX_TOKEN_LEN);
 
-         if (memcmp(tmp_token, "AUDIO", 5) == 0)
+         if (string_is_equal_fast(tmp_token, "AUDIO", 5))
             continue;
 
          find_token(fd, "INDEX");
diff --git a/tasks/task_decompress.c b/tasks/task_decompress.c
index e0efb224fb..098026a1c5 100644
--- a/tasks/task_decompress.c
+++ b/tasks/task_decompress.c
@@ -247,7 +247,7 @@ bool task_check_decompress(const char *source_file)
    find_data.userdata = (void *)source_file;
 
    /* Return whether decompressing is in progress or not */
-   return task_queue_ctl(TASK_QUEUE_CTL_FIND, &find_data);
+   return task_queue_find(&find_data);
 }
 
 bool task_push_decompress(
@@ -332,7 +332,7 @@ bool task_push_decompress(
 
    t->title       = strdup(tmp);
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, t);
+   task_queue_push(t);
 
    return true;
 
diff --git a/tasks/task_file_transfer.c b/tasks/task_file_transfer.c
index f3ea334268..e52921e22c 100644
--- a/tasks/task_file_transfer.c
+++ b/tasks/task_file_transfer.c
@@ -16,19 +16,16 @@
 #include <string.h>
 #include <errno.h>
 #include <file/nbio.h>
-#include <formats/image.h>
 #include <compat/strl.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
-#include <lists/string_list.h>
-#include <rhash.h>
 
 #include <string/stdstring.h>
 
 #include "tasks_internal.h"
-#include "../file_path_special.h"
 #include "../verbosity.h"
 
+bool task_image_load_handler(retro_task_t *task);
+
 static int task_file_transfer_iterate_transfer(nbio_handle_t *nbio)
 {
    size_t i;
@@ -76,24 +73,13 @@ void task_file_load_handler(retro_task_t *task)
          case NBIO_STATUS_INIT:
             if (nbio && !string_is_empty(nbio->path))
             {
-               const char *fullpath  = nbio->path;
-               struct nbio_t *handle = nbio_open(fullpath, NBIO_READ);
+               struct nbio_t *handle = nbio_open(nbio->path, NBIO_READ);
 
                if (handle)
                {
                   nbio->handle       = handle;
                   nbio->status       = NBIO_STATUS_TRANSFER;
 
-                  if (strstr(fullpath, file_path_str(FILE_PATH_PNG_EXTENSION)))
-                     nbio->image_type = IMAGE_TYPE_PNG;
-                  else if (strstr(fullpath, file_path_str(FILE_PATH_JPEG_EXTENSION)) 
-                        || strstr(fullpath, file_path_str(FILE_PATH_JPG_EXTENSION)))
-                     nbio->image_type = IMAGE_TYPE_JPEG;
-                  else if (strstr(fullpath, file_path_str(FILE_PATH_BMP_EXTENSION)))
-                     nbio->image_type = IMAGE_TYPE_BMP;
-                  else if (strstr(fullpath, file_path_str(FILE_PATH_TGA_EXTENSION)))
-                     nbio->image_type = IMAGE_TYPE_TGA;
-
                   nbio_begin_read(handle);
                   return;
                }
@@ -104,28 +90,32 @@ void task_file_load_handler(retro_task_t *task)
          case NBIO_STATUS_TRANSFER_PARSE:
             if (task_file_transfer_iterate_parse(nbio) == -1)
                task_set_cancelled(task, true);
-            nbio->status = NBIO_STATUS_TRANSFER_PARSE_FREE;
+            nbio->status = NBIO_STATUS_TRANSFER_FINISHED;
             break;
          case NBIO_STATUS_TRANSFER:
             if (task_file_transfer_iterate_transfer(nbio) == -1)
                nbio->status = NBIO_STATUS_TRANSFER_PARSE;
             break;
-         case NBIO_STATUS_TRANSFER_PARSE_FREE:
-         case NBIO_STATUS_POLL:
-         default:
+         case NBIO_STATUS_TRANSFER_FINISHED:
             break;
       }
 
-      switch (nbio->image_type)
+      switch (nbio->type)
       {
-         case IMAGE_TYPE_PNG:
-         case IMAGE_TYPE_JPEG:
-         case IMAGE_TYPE_TGA:
-         case IMAGE_TYPE_BMP:
+         case NBIO_TYPE_PNG:
+         case NBIO_TYPE_JPEG:
+         case NBIO_TYPE_TGA:
+         case NBIO_TYPE_BMP:
             if (!task_image_load_handler(task))
                task_set_finished(task, true);
             break;
-         case 0:
+         case NBIO_TYPE_OGG:
+         case NBIO_TYPE_WAV:
+            if (!task_audio_mixer_load_handler(task))
+               task_set_finished(task, true);
+            break;
+         case NBIO_TYPE_NONE:
+         default:
             if (nbio->is_finished)
                task_set_finished(task, true);
             break;
diff --git a/tasks/task_http.c b/tasks/task_http.c
index d37186acf8..72b911ad40 100644
--- a/tasks/task_http.c
+++ b/tasks/task_http.c
@@ -13,17 +13,15 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdlib.h>
+
 #include <net/net_http.h>
-#include <queues/message_queue.h>
-#include <lists/string_list.h>
 #include <string/stdstring.h>
 #include <compat/strl.h>
 #include <file/file_path.h>
-#include <file/archive_file.h>
 #include <net/net_compat.h>
 #include <retro_stat.h>
 
-#include "../msg_hash.h"
 #include "../verbosity.h"
 #include "tasks_internal.h"
 
@@ -37,13 +35,13 @@ enum http_status_enum
    HTTP_STATUS_TRANSFER_PARSE_FREE
 };
 
-typedef struct http_transfer_info
+struct http_transfer_info
 {
    char url[255];
    int progress;
-} http_transfer_info_t;
+};
 
-typedef struct http_handle
+struct http_handle
 {
    struct
    {
@@ -56,7 +54,10 @@ typedef struct http_handle
    transfer_cb_t  cb;
    unsigned status;
    bool error;
-} http_handle_t;
+};
+
+typedef struct http_transfer_info http_transfer_info_t;
+typedef struct http_handle http_handle_t;
 
 static int task_http_con_iterate_transfer(http_handle_t *http)
 {
@@ -235,7 +236,9 @@ static bool task_http_retriever(retro_task_t *task, void *data)
    return true;
 }
 
-static void* task_push_http_transfer_generic(struct http_connection_t *conn, const char *url, bool mute, const char *type,
+static void* task_push_http_transfer_generic(
+      struct http_connection_t *conn,
+      const char *url, bool mute, const char *type,
       retro_task_callback_t cb, void *user_data)
 {
    task_finder_data_t find_data;
@@ -252,7 +255,7 @@ static void* task_push_http_transfer_generic(struct http_connection_t *conn, con
    find_data.userdata = (void*)url;
 
    /* Concurrent download of the same file is not allowed */
-   if (task_queue_ctl(TASK_QUEUE_CTL_FIND, &find_data))
+   if (task_queue_find(&find_data))
    {
       RARCH_LOG("[http] '%s'' is already being downloaded.\n", url);
       return NULL;
@@ -292,7 +295,7 @@ static void* task_push_http_transfer_generic(struct http_connection_t *conn, con
 
    t->title                = strdup(tmp);
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, t);
+   task_queue_push(t);
 
    return t;
 
@@ -305,7 +308,8 @@ error:
    return NULL;
 }
 
-void* task_push_http_transfer(const char *url, bool mute, const char *type,
+void* task_push_http_transfer(const char *url, bool mute,
+      const char *type,
       retro_task_callback_t cb, void *user_data)
 {
    struct http_connection_t *conn;
@@ -315,14 +319,16 @@ void* task_push_http_transfer(const char *url, bool mute, const char *type,
    return task_push_http_transfer_generic(conn, url, mute, type, cb, user_data);
 }
 
-void* task_push_http_post_transfer(const char *url, const char *post_data, bool mute,
+void* task_push_http_post_transfer(const char *url,
+      const char *post_data, bool mute,
       const char *type, retro_task_callback_t cb, void *user_data)
 {
    struct http_connection_t *conn;
 
    conn = net_http_connection_new(url, "POST", post_data);
 
-   return task_push_http_transfer_generic(conn, url, mute, type, cb, user_data);
+   return task_push_http_transfer_generic(conn,
+         url, mute, type, cb, user_data);
 }
 
 task_retriever_info_t *http_task_get_transfer_list(void)
@@ -335,6 +341,7 @@ task_retriever_info_t *http_task_get_transfer_list(void)
    retrieve_data.func         = task_http_retriever;
 
    /* Build list of current HTTP transfers and return it */
-   task_queue_ctl(TASK_QUEUE_CTL_RETRIEVE, &retrieve_data);
+   task_queue_retrieve(&retrieve_data);
+
    return retrieve_data.list;
 }
diff --git a/tasks/task_image.c b/tasks/task_image.c
index d9240bbb1d..d69cf17d7d 100644
--- a/tasks/task_image.c
+++ b/tasks/task_image.c
@@ -14,16 +14,14 @@
  */
 
 #include <stdint.h>
+#include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 
 #include <file/nbio.h>
 #include <formats/image.h>
 #include <compat/strl.h>
-#include <retro_assert.h>
 #include <retro_miscellaneous.h>
-#include <lists/string_list.h>
-#include <rhash.h>
 
 #include "../gfx/video_driver.h"
 #include "../file_path_special.h"
@@ -33,16 +31,16 @@
 
 enum image_status_enum
 {
-   IMAGE_STATUS_POLL = 0,
+   IMAGE_STATUS_NONE = 0,
    IMAGE_STATUS_TRANSFER,
    IMAGE_STATUS_TRANSFER_PARSE,
    IMAGE_STATUS_PROCESS_TRANSFER,
-   IMAGE_STATUS_PROCESS_TRANSFER_PARSE,
-   IMAGE_STATUS_TRANSFER_PARSE_FREE
+   IMAGE_STATUS_PROCESS_TRANSFER_PARSE
 };
 
 struct nbio_image_handle
 {
+   enum image_type_enum type;
    struct texture_image ti;
    bool is_blocking;
    bool is_blocking_on_processing;
@@ -88,29 +86,14 @@ static int cb_image_menu_upload_generic(void *data, size_t len)
    return 0;
 }
 
-static int task_image_iterate_transfer_parse(nbio_handle_t *nbio)
-{
-   struct nbio_image_handle *image = (struct nbio_image_handle*)nbio->data;
-
-   if (image->handle && image->cb)
-   {
-      size_t len = 0;
-      image->cb(nbio, len);
-   }
-
-   return 0;
-}
-
 static int task_image_process(
-      nbio_handle_t *nbio,
+      struct nbio_image_handle *image,
       unsigned *width,
       unsigned *height)
 {
-   struct nbio_image_handle *image = (struct nbio_image_handle*)nbio->data;
-
    int retval = image_transfer_process(
          image->handle,
-         nbio->image_type,
+         image->type,
          &image->ti.pixels, image->size, width, height);
 
    if (retval == IMAGE_PROCESS_ERROR)
@@ -122,60 +105,36 @@ static int task_image_process(
    return retval;
 }
 
-static int cb_image_menu_generic(nbio_handle_t *nbio)
-{
-   int retval                      = 0;
-   unsigned width                  = 0;
-   unsigned height                 = 0;
-   struct nbio_image_handle *image = (struct nbio_image_handle*)nbio->data;
-
-   if (!image)
-      return -1;
-
-   retval = task_image_process(nbio, &width, &height);
-
-   switch (retval)
-   {
-      case IMAGE_PROCESS_ERROR:
-      case IMAGE_PROCESS_ERROR_END:
-         return -1;
-      default:
-         break;
-   }
-
-   image->is_blocking_on_processing         = (retval != IMAGE_PROCESS_END);
-   image->is_finished                       = (retval == IMAGE_PROCESS_END);
-
-   return 0;
-}
-
 static int cb_image_menu_thumbnail(void *data, size_t len)
 {
-   nbio_handle_t        *nbio = (nbio_handle_t*)data; 
-   struct nbio_image_handle *image = (struct nbio_image_handle*)nbio->data;
+   unsigned width                   = 0;
+   unsigned height                  = 0;
+   nbio_handle_t        *nbio       = (nbio_handle_t*)data; 
+   struct nbio_image_handle *image  = (struct nbio_image_handle*)nbio->data;
+   int retval                       = task_image_process(image, &width, &height);
 
-   if (cb_image_menu_generic(nbio) != 0)
+   if ((retval == IMAGE_PROCESS_ERROR)    ||
+       (retval == IMAGE_PROCESS_ERROR_END)
+      )
       return -1;
 
-   image->cb = &cb_image_menu_upload_generic;
+   image->is_blocking_on_processing = (retval != IMAGE_PROCESS_END);
+   image->is_finished               = (retval == IMAGE_PROCESS_END);
+   image->cb                        = &cb_image_menu_upload_generic;
 
    return 0;
 }
 
-static int task_image_iterate_process_transfer(nbio_handle_t *nbio)
+static int task_image_iterate_process_transfer(struct nbio_image_handle *image)
 {
    unsigned i;
    int retval                      = 0;
    unsigned width                  = 0;
    unsigned height                 = 0;
-   struct nbio_image_handle *image = (struct nbio_image_handle*)nbio->data;
-
-   if (!image)
-      return -1;
 
    for (i = 0; i < image->processing_pos_increment; i++)
    {
-      retval = task_image_process(nbio,
+      retval = task_image_process(image,
                &width, &height);
       if (retval != IMAGE_PROCESS_NEXT)
          break;
@@ -188,107 +147,76 @@ static int task_image_iterate_process_transfer(nbio_handle_t *nbio)
    return -1;
 }
 
-static int task_image_iterate_transfer(nbio_handle_t *nbio)
+static void task_image_cleanup(nbio_handle_t *nbio)
 {
-   unsigned i;
    struct nbio_image_handle *image = (struct nbio_image_handle*)nbio->data;
 
-   if (!image)
-      goto error;
-
-   if (image->is_finished)
-      return 0;
-
-   for (i = 0; i < image->pos_increment; i++)
+   if (image)
    {
-      if (!image_transfer_iterate(image->handle, nbio->image_type))
-         goto error;
+      image_transfer_free(image->handle, image->type);
+
+      image->handle                 = NULL;
+      image->cb                     = NULL;
    }
-
-   return 0;
-
-error:
-   return -1;
-}
-
-static void task_image_load_free_internal(nbio_handle_t *nbio)
-{
-   struct nbio_image_handle *image = (struct nbio_image_handle*)nbio->data;
-
-   if (!image)
-      return;
-
-   image_transfer_free(image->handle, nbio->image_type);
-
-   image->handle                 = NULL;
-   image->cb                     = NULL;
-}
-
-static int cb_nbio_generic(nbio_handle_t *nbio, size_t *len)
-{
-   void      *ptr                  = NULL;
-   struct nbio_image_handle *image = (struct nbio_image_handle*)nbio->data;
-
-   if (!image || !image->handle)
-      goto error;
-
-   ptr = nbio_get_ptr(nbio->handle, len);
-
-   if (!ptr)
-      goto error;
-
-   image_transfer_set_buffer_ptr(image->handle, nbio->image_type, ptr);
-
-   image->size                     = *len;
-   image->pos_increment            = (*len / 2) ? ((unsigned)(*len / 2)) : 1;
-   image->processing_pos_increment = (*len / 4) ?
-       ((unsigned)(*len / 4)) : 1;
-
-   if (!image_transfer_start(image->handle, nbio->image_type))
-      goto error;
-
-   image->is_blocking   = false;
-   image->is_finished   = false;
-   nbio->is_finished    = true;
-
-   return 0;
-
-error:
-   task_image_load_free_internal(nbio);
    if (nbio->data)
       free(nbio->data);
-   nbio->data = NULL;
-   return -1;
+   nbio_free(nbio->handle);
+   nbio->data        = NULL;
+   nbio->handle      = NULL;
+}
+
+static void task_image_load_free(retro_task_t *task)
+{
+   nbio_handle_t       *nbio  = task ? (nbio_handle_t*)task->state : NULL;
+
+   if (nbio)
+   {
+      task_image_cleanup(nbio);
+      free(nbio);
+   }
 }
 
 static int cb_nbio_image_menu_thumbnail(void *data, size_t len)
 {
-   struct nbio_image_handle *image = NULL;
-   void *handle               = NULL;
-   nbio_handle_t *nbio        = (nbio_handle_t*)data; 
-
-   if (!nbio)
-      goto error;
-
-   handle = image_transfer_new(nbio->image_type);
+   void *ptr                       = NULL;
+   nbio_handle_t *nbio             = (nbio_handle_t*)data; 
+   struct nbio_image_handle *image = nbio ? 
+      (struct nbio_image_handle*)nbio->data : NULL;
+   void *handle                    = image ? image_transfer_new(image->type) : NULL;
 
    if (!handle)
-      goto error;
+      return -1;
 
-   image         = (struct nbio_image_handle*)nbio->data;
- 
-   image->handle = handle;
-   image->size   = len;
-   image->cb     = &cb_image_menu_thumbnail;
+   image->handle                   = handle;
+   image->size                     = len;
+   image->cb                       = &cb_image_menu_thumbnail;
 
-   return cb_nbio_generic(nbio, &len);
+   ptr                             = nbio_get_ptr(nbio->handle, &len);
 
-error:
-   return -1;
+   image_transfer_set_buffer_ptr(image->handle, image->type, ptr);
+
+   image->size                     = len;
+   image->pos_increment            = (len / 2) ? 
+      ((unsigned)(len / 2)) : 1;
+   image->processing_pos_increment = (len / 4) ?
+       ((unsigned)(len / 4)) : 1;
+
+   if (!image_transfer_start(image->handle, image->type))
+   {
+      task_image_cleanup(nbio);
+      return -1;
+   }
+
+   image->is_blocking              = false;
+   image->is_finished              = false;
+   nbio->is_finished               = true;
+
+   return 0;
 }
 
 bool task_image_load_handler(retro_task_t *task)
 {
+   unsigned i;
    nbio_handle_t            *nbio  = (nbio_handle_t*)task->state;
    struct nbio_image_handle *image = (struct nbio_image_handle*)nbio->data;
 
@@ -297,26 +225,40 @@ bool task_image_load_handler(retro_task_t *task)
       switch (image->status)
       {
          case IMAGE_STATUS_PROCESS_TRANSFER:
-            if (task_image_iterate_process_transfer(nbio) == -1)
+            if (image && task_image_iterate_process_transfer(image) == -1)
                image->status = IMAGE_STATUS_PROCESS_TRANSFER_PARSE;
             break;
          case IMAGE_STATUS_TRANSFER_PARSE:
-            task_image_iterate_transfer_parse(nbio);
+            if (image->handle && image->cb)
+            {
+               size_t len = 0;
+               image->cb(nbio, len);
+            }
             if (image->is_blocking_on_processing)
                image->status = IMAGE_STATUS_PROCESS_TRANSFER;
             break;
          case IMAGE_STATUS_TRANSFER:
-            if (!image->is_blocking)
-               if (task_image_iterate_transfer(nbio) == -1)
-                  image->status = IMAGE_STATUS_TRANSFER_PARSE;
+            if (!image->is_blocking && !image->is_finished)
+            {
+               for (i = 0; i < image->pos_increment; i++)
+               {
+                  if (!image_transfer_iterate(image->handle, image->type))
+                  {
+                     image->status = IMAGE_STATUS_TRANSFER_PARSE;
+                     break;
+                  }
+               }
+            }
             break;
          case IMAGE_STATUS_PROCESS_TRANSFER_PARSE:
-            task_image_iterate_transfer_parse(nbio);
+            if (image->handle && image->cb)
+            {
+               size_t len = 0;
+               image->cb(nbio, len);
+            }
             if (!image->is_finished)
                break;
-         case IMAGE_STATUS_TRANSFER_PARSE_FREE:
-         case IMAGE_STATUS_POLL:
-         default:
+         case IMAGE_STATUS_NONE:
             break;
       }
    }
@@ -325,12 +267,17 @@ bool task_image_load_handler(retro_task_t *task)
          && (image && image->is_finished )
          && (!task_get_cancelled(task)))
    {
-      void *data = malloc(sizeof(image->ti));
+      struct texture_image *img = (struct texture_image*)malloc(sizeof(struct texture_image));
 
-      if (data)
-         memcpy(data, &image->ti, sizeof(image->ti));
+      if (img)
+      {
+         img->width         = image->ti.width;
+         img->height        = image->ti.height;
+         img->pixels        = image->ti.pixels;
+         img->supports_rgba = image->ti.supports_rgba;
+      }
 
-      task_set_data(task, data);
+      task_set_data(task, img);
 
       return false;
    }
@@ -361,6 +308,31 @@ bool task_push_image_load(const char *fullpath, retro_task_callback_t cb, void *
    if (!image)
       goto error;
 
+   nbio->type         = NBIO_TYPE_NONE;
+   image->type        = IMAGE_TYPE_NONE;
+
+   if (strstr(fullpath, file_path_str(FILE_PATH_PNG_EXTENSION)))
+   {
+      nbio->type      = NBIO_TYPE_PNG;
+      image->type     = IMAGE_TYPE_PNG;
+   }
+   else if (strstr(fullpath, file_path_str(FILE_PATH_JPEG_EXTENSION)) 
+         || strstr(fullpath, file_path_str(FILE_PATH_JPG_EXTENSION)))
+   {
+      nbio->type      = NBIO_TYPE_JPEG;
+      image->type     = IMAGE_TYPE_JPEG;
+   }
+   else if (strstr(fullpath, file_path_str(FILE_PATH_BMP_EXTENSION)))
+   {
+      nbio->type      = NBIO_TYPE_BMP;
+      image->type     = IMAGE_TYPE_BMP;
+   }
+   else if (strstr(fullpath, file_path_str(FILE_PATH_TGA_EXTENSION)))
+   {
+      nbio->type      = NBIO_TYPE_TGA;
+      image->type     = IMAGE_TYPE_TGA;
+   }
+
    image->status      = IMAGE_STATUS_TRANSFER;
 
    nbio->data         = (struct nbio_image_handle*)image;
@@ -369,13 +341,13 @@ bool task_push_image_load(const char *fullpath, retro_task_callback_t cb, void *
    nbio->status       = NBIO_STATUS_INIT;
 
 
-   t->state     = nbio;
-   t->handler   = task_file_load_handler;
-   t->cleanup   = task_image_load_free;
-   t->callback  = cb;
-   t->user_data = user_data;
+   t->state           = nbio;
+   t->handler         = task_file_load_handler;
+   t->cleanup         = task_image_load_free;
+   t->callback        = cb;
+   t->user_data       = user_data;
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, t);
+   task_queue_push(t);
 
    return true;
 
@@ -391,19 +363,3 @@ error_msg:
 
    return false;
 }
-
-void task_image_load_free(retro_task_t *task)
-{
-   nbio_handle_t       *nbio  = task ? (nbio_handle_t*)task->state : NULL;
-
-   if (nbio)
-   {
-      task_image_load_free_internal(nbio);
-      if (nbio->data)
-         free(nbio->data);
-      nbio_free(nbio->handle);
-      nbio->data        = NULL;
-      nbio->handle      = NULL;
-      free(nbio);
-   }
-}
diff --git a/tasks/task_netplay_find_content.c b/tasks/task_netplay_find_content.c
index 5f2fb6b226..077ad1a468 100644
--- a/tasks/task_netplay_find_content.c
+++ b/tasks/task_netplay_find_content.c
@@ -34,7 +34,7 @@
 #include "../playlist.h"
 #include "../command.h"
 #include "../core_info.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 
 typedef struct
 {
@@ -61,7 +61,7 @@ static void netplay_crc_scan_callback(void *task_data,
 
 #ifdef HAVE_MENU
    if (!string_is_empty(state->core_path) && !string_is_empty(state->content_path) &&
-       memcmp(state->content_path, "N/A", 3) != 0)
+       string_is_not_equal_fast(state->content_path, "N/A", 3))
    {
       command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);
       task_push_load_content_with_new_core_from_menu(
@@ -73,7 +73,7 @@ static void netplay_crc_scan_callback(void *task_data,
    else
 #endif
       if (!string_is_empty(state->core_path) && !string_is_empty(state->content_path) &&
-      memcmp(state->content_path, "N/A", 3) == 0)
+      string_is_equal_fast(state->content_path, "N/A", 3))
    {
       content_ctx_info_t content_info = {0};
 
@@ -102,12 +102,14 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
    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);
 
    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);
       free(state);
@@ -115,11 +117,11 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
    }
 
    if (state->lpl_list->size == 0 && 
-      memcmp(state->content_path, "N/A", 3) != 0)
+      string_is_not_equal_fast(state->content_path, "N/A", 3))
       goto no_playlists;
 
    /* Core requires content */
-   if (memcmp(state->content_path, "N/A", 3) != 0)
+   if (string_is_not_equal_fast(state->content_path, "N/A", 3))
    {
       /* CRC matching */
       if (!string_is_equal(state->content_crc, "00000000|crc"))
@@ -149,6 +151,7 @@ static void task_netplay_crc_scan_handler(retro_task_t *task)
                   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);
@@ -209,6 +212,7 @@ filename_matching:
                   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);
@@ -232,6 +236,7 @@ filename_matching:
       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);
       return;
@@ -240,6 +245,7 @@ filename_matching:
 no_playlists:
    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);
    command_event(CMD_EVENT_NETPLAY_INIT_DIRECT_DEFERRED, state->hostname);
@@ -251,6 +257,7 @@ bool task_push_netplay_crc_scan(uint32_t crc, char* name,
       const char *hostname, const char *core_name)
 {
    unsigned i;
+   union string_list_elem_attr attr;
    core_info_list_t *info      = NULL;
    settings_t        *settings = config_get_ptr();
    retro_task_t          *task = (retro_task_t *)calloc(1, sizeof(*task));
@@ -275,6 +282,8 @@ bool task_push_netplay_crc_scan(uint32_t crc, char* name,
    state->lpl_list = dir_list_new(settings->paths.directory_playlist,
          NULL, true, true, true, false);
 
+   attr.i = 0;
+   string_list_append(state->lpl_list, settings->paths.path_content_history, attr);
    state->found = false;
 
    for (i=0; i < info->count; i++)
@@ -289,7 +298,7 @@ bool task_push_netplay_crc_scan(uint32_t crc, char* name,
       {
          strlcpy(state->core_path, info->list[i].path, sizeof(state->core_path));
 
-         if ((memcmp(state->content_path, "N/A", 3) != 0) && 
+         if (string_is_not_equal_fast(state->content_path, "N/A", 3) && 
             !string_is_empty(info->list[i].supported_extensions))
          {
             strlcpy(state->core_extensions,
@@ -307,7 +316,7 @@ bool task_push_netplay_crc_scan(uint32_t crc, char* name,
    task->callback       = netplay_crc_scan_callback;
    task->title          = strdup("Looking for matching content...");
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return true;
 
diff --git a/tasks/task_netplay_lan_scan.c b/tasks/task_netplay_lan_scan.c
index ca77d9ba28..81fce66732 100644
--- a/tasks/task_netplay_lan_scan.c
+++ b/tasks/task_netplay_lan_scan.c
@@ -26,55 +26,6 @@
 #include "../verbosity.h"
 #include "../network/netplay/netplay_discovery.h"
 
-#ifdef HAVE_MENU
-#include "../menu/menu_entries.h"
-#include "../menu/menu_driver.h"
-#endif
-
-static void netplay_lan_scan_callback(void *task_data,
-                               void *user_data, const char *error)
-{
-   struct netplay_host_list *netplay_hosts = NULL;
-
-#ifdef HAVE_MENU
-   enum msg_hash_enums enum_idx            = MSG_UNKNOWN;
-   unsigned menu_type                      = 0;
-   const char *label                       = NULL;
-   const char *path                        = NULL;
-
-   menu_entries_get_last_stack(&path, &label, &menu_type, &enum_idx, NULL);
-
-   /* Don't push the results if we left the LAN scan menu */
-   if (!string_is_equal(label,
-         msg_hash_to_str(
-            MENU_ENUM_LABEL_DEFERRED_NETPLAY_LAN_SCAN_SETTINGS_LIST)))
-      return;
-
-   if (!netplay_discovery_driver_ctl(
-            RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES,
-            (void *) &netplay_hosts))
-      return;
-
-   if (netplay_hosts->size > 0)
-   {
-      unsigned i;
-      file_list_t *file_list = menu_entries_get_selection_buf_ptr(0);
-
-      menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, file_list);
-
-      for (i = 0; i < netplay_hosts->size; i++)
-      {
-         struct netplay_host *host = &netplay_hosts->hosts[i];
-         menu_entries_append_enum(file_list,
-               host->nick,
-               msg_hash_to_str(MENU_ENUM_LABEL_NETPLAY_CONNECT_TO),
-               MENU_ENUM_LABEL_NETPLAY_CONNECT_TO,
-               MENU_NETPLAY_LAN_SCAN, 0, 0);
-      }
-   }
-#endif
-}
-
 static void task_netplay_lan_scan_handler(retro_task_t *task)
 {
    if (init_netplay_discovery())
@@ -86,13 +37,12 @@ static void task_netplay_lan_scan_handler(retro_task_t *task)
    }
 
    task_set_progress(task, 100);
-   task_set_title(task, strdup(msg_hash_to_str(MSG_NETPLAY_LAN_SCANNING)));
    task_set_finished(task, true);
 
    return;
 }
 
-bool task_push_netplay_lan_scan(void)
+bool task_push_netplay_lan_scan(retro_task_callback_t cb)
 {
    retro_task_t *task = (retro_task_t*)calloc(1, sizeof(*task));
 
@@ -101,15 +51,15 @@ bool task_push_netplay_lan_scan(void)
 
    task->type     = TASK_TYPE_BLOCKING;
    task->handler  = task_netplay_lan_scan_handler;
-   task->callback = netplay_lan_scan_callback;
+   task->callback = cb;
    task->title    = strdup(msg_hash_to_str(MSG_NETPLAY_LAN_SCANNING));
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return true;
 }
 
-bool task_push_netplay_lan_scan_rooms(void)
+bool task_push_netplay_lan_scan_rooms(retro_task_callback_t cb)
 {
    retro_task_t *task = (retro_task_t*)calloc(1, sizeof(*task));
 
@@ -118,10 +68,10 @@ bool task_push_netplay_lan_scan_rooms(void)
 
    task->type     = TASK_TYPE_BLOCKING;
    task->handler  = task_netplay_lan_scan_handler;
-   task->callback = netplay_lan_scan_callback;
+   task->callback = cb;
    task->title    = strdup(msg_hash_to_str(MSG_NETPLAY_LAN_SCANNING));
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return true;
 }
diff --git a/tasks/task_netplay_nat_traversal.c b/tasks/task_netplay_nat_traversal.c
index c0546a1091..fbec5c61cc 100644
--- a/tasks/task_netplay_nat_traversal.c
+++ b/tasks/task_netplay_nat_traversal.c
@@ -87,7 +87,7 @@ bool task_push_netplay_nat_traversal(void *nat_traversal_state, uint16_t port)
    task->callback = netplay_nat_traversal_callback;
    task->task_data = ntsd;
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return true;
 #else
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 9679807fdc..5fb2464922 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -33,25 +33,25 @@
 #include "../configuration.h"
 #include "../verbosity.h"
 
-typedef struct
+typedef struct overlay_loader overlay_loader_t;
+
+struct overlay_loader
 {
    enum overlay_status state;
    enum overlay_image_transfer_status loading_status;
    config_file_t *conf;
    char *overlay_path;
+   struct overlay *overlays;
+   struct overlay *active;
+   bool overlay_enable;
+   bool overlay_hide_in_menu;
+   size_t resolve_pos;
    unsigned size;
    unsigned pos;
    unsigned pos_increment;
-   struct overlay *overlays;
-   struct overlay *active;
-   size_t resolve_pos;
-
-   bool overlay_enable;
-   bool overlay_hide_in_menu;
    float overlay_opacity;
    float overlay_scale;
-
-} overlay_loader_t;
+};
 
 static void task_overlay_image_done(struct overlay *overlay)
 {
@@ -760,7 +760,8 @@ bool task_push_overlay_load_default(
    /* Prevent overlay from being loaded if it already is being loaded */
    find_data.func     = task_overlay_finder;
    find_data.userdata = (void*)overlay_path;
-   if (task_queue_ctl(TASK_QUEUE_CTL_FIND, &find_data))
+
+   if (task_queue_find(&find_data))
       goto error;
 
    conf = config_file_new(overlay_path);
@@ -800,7 +801,7 @@ bool task_push_overlay_load_default(
    t->callback              = cb;
    t->user_data             = user_data;
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, t);
+   task_queue_push(t);
 
    return true;
 
diff --git a/tasks/task_patch.c b/tasks/task_patch.c
index 869d5eee69..4c8ae0af3b 100644
--- a/tasks/task_patch.c
+++ b/tasks/task_patch.c
@@ -33,7 +33,6 @@
 #include <encodings/crc32.h>
 
 #include "../msg_hash.h"
-#include "../retroarch.h"
 #include "../verbosity.h"
 
 enum bps_mode
@@ -62,22 +61,37 @@ enum patch_error
 
 struct bps_data
 {
-   const uint8_t *modify_data, *source_data; 
+   const uint8_t *modify_data;
+   const uint8_t *source_data;
    uint8_t *target_data;
-   size_t modify_length, source_length, target_length;
-   size_t modify_offset, source_offset, target_offset;
-   uint32_t modify_checksum, source_checksum, target_checksum;
-
-   size_t source_relative_offset, target_relative_offset, output_offset;
+   size_t modify_length;
+   size_t source_length;
+   size_t target_length;
+   size_t modify_offset;
+   size_t source_offset;
+   size_t target_offset;
+   uint32_t modify_checksum;
+   uint32_t source_checksum;
+   uint32_t target_checksum;
+   size_t source_relative_offset;
+   size_t target_relative_offset;
+   size_t output_offset;
 };
 
 struct ups_data
 {
-   const uint8_t *patch_data, *source_data; 
+   const uint8_t *patch_data;
+   const uint8_t *source_data; 
    uint8_t *target_data;
-   unsigned patch_length, source_length, target_length;
-   unsigned patch_offset, source_offset, target_offset;
-   unsigned patch_checksum, source_checksum, target_checksum;
+   unsigned patch_length;
+   unsigned source_length;
+   unsigned target_length;
+   unsigned patch_offset;
+   unsigned source_offset;
+   unsigned target_offset;
+   unsigned patch_checksum;
+   unsigned source_checksum;
+   unsigned target_checksum;
 };
 
 typedef enum patch_error (*patch_func_t)(const uint8_t*, size_t,
@@ -85,7 +99,7 @@ typedef enum patch_error (*patch_func_t)(const uint8_t*, size_t,
 
 static uint8_t bps_read(struct bps_data *bps)
 {
-   uint8_t data = bps->modify_data[bps->modify_offset++];
+   uint8_t data         = bps->modify_data[bps->modify_offset++];
    bps->modify_checksum = ~(encoding_crc32(
          ~bps->modify_checksum, &data, 1));
    return data;
@@ -110,9 +124,6 @@ static uint64_t bps_decode(struct bps_data *bps)
 
 static void bps_write(struct bps_data *bps, uint8_t data)
 {
-   if (!bps)
-      return;
-
    bps->target_data[bps->output_offset++] = data;
    bps->target_checksum = ~(encoding_crc32(~bps->target_checksum, &data, 1));
 }
@@ -127,7 +138,7 @@ static enum patch_error bps_apply_patch(
    size_t modify_source_size;
    size_t modify_target_size;
    size_t modify_markup_size;
-   struct bps_data bps = {0};
+   struct bps_data bps;
    uint32_t modify_source_checksum = 0;
    uint32_t modify_target_checksum = 0;
    uint32_t modify_modify_checksum = 0;
@@ -135,22 +146,32 @@ static enum patch_error bps_apply_patch(
    if (modify_length < 19)
       return PATCH_PATCH_TOO_SMALL;
 
-   bps.modify_data     = modify_data;
-   bps.modify_length   = modify_length;
-   bps.target_data     = target_data;
-   bps.target_length   = *target_length;
-   bps.source_data     = source_data;
-   bps.source_length   = source_length;
-   bps.modify_checksum = ~0;
-   bps.target_checksum = ~0;
+   bps.modify_data            = modify_data;
+   bps.source_data            = source_data;
+   bps.target_data            = target_data;
+   bps.modify_length          = modify_length;
+   bps.source_length          = source_length;
+   bps.target_length          = *target_length;
+   bps.modify_offset          = 0;
+   bps.source_offset          = 0;
+   bps.target_offset          = 0;
+   bps.modify_checksum        = ~0;
+   bps.source_checksum        = 0;
+   bps.target_checksum        = ~0;
+   bps.source_relative_offset = 0;
+   bps.target_relative_offset = 0;
+   bps.output_offset          = 0;
 
-   if ((bps_read(&bps) != 'B') || (bps_read(&bps) != 'P') ||
-         (bps_read(&bps) != 'S') || (bps_read(&bps) != '1'))
+   if (  (bps_read(&bps) != 'B') || 
+         (bps_read(&bps) != 'P') ||
+         (bps_read(&bps) != 'S') || 
+         (bps_read(&bps) != '1'))
       return PATCH_PATCH_INVALID_HEADER;
 
    modify_source_size  = bps_decode(&bps);
    modify_target_size  = bps_decode(&bps);
    modify_markup_size  = bps_decode(&bps);
+
    for (i = 0; i < modify_markup_size; i++)
       bps_read(&bps);
 
@@ -294,13 +315,13 @@ static enum patch_error ups_apply_patch(
       uint8_t *targetdata, size_t *targetlength)
 {
    size_t i;
+   struct ups_data data;
    unsigned source_read_length;
    unsigned target_read_length;
    uint32_t patch_result_checksum;
    uint32_t patch_read_checksum  = 0;
    uint32_t source_read_checksum = 0;
    uint32_t target_read_checksum = 0;
-   struct ups_data data          = {0};
 
    data.patch_data      = patchdata;
    data.source_data     = sourcedata;
@@ -308,31 +329,37 @@ static enum patch_error ups_apply_patch(
    data.patch_length    = (unsigned)patchlength;
    data.source_length   = (unsigned)sourcelength;
    data.target_length   = (unsigned)*targetlength;
+   data.patch_offset    = 0;
+   data.source_offset   = 0;
+   data.target_offset   = 0;
    data.patch_checksum  = ~0;
    data.source_checksum = ~0;
    data.target_checksum = ~0;
 
    if (data.patch_length < 18) 
       return PATCH_PATCH_INVALID;
-   if (ups_patch_read(&data) != 'U') 
-      return PATCH_PATCH_INVALID;
-   if (ups_patch_read(&data) != 'P') 
-      return PATCH_PATCH_INVALID;
-   if (ups_patch_read(&data) != 'S') 
-      return PATCH_PATCH_INVALID;
-   if (ups_patch_read(&data) != '1') 
+
+   if (
+         (ups_patch_read(&data) != 'U') ||
+         (ups_patch_read(&data) != 'P') ||
+         (ups_patch_read(&data) != 'S') ||
+         (ups_patch_read(&data) != '1')
+      )
       return PATCH_PATCH_INVALID;
 
    source_read_length = (unsigned)ups_decode(&data);
    target_read_length = (unsigned)ups_decode(&data);
 
-   if (data.source_length != source_read_length
-         && data.source_length != target_read_length) 
+   if (     (data.source_length != source_read_length)
+         && (data.source_length != target_read_length)) 
       return PATCH_SOURCE_INVALID;
+
    *targetlength = (data.source_length == source_read_length ?
          target_read_length : source_read_length);
+
    if (data.target_length < *targetlength) 
       return PATCH_TARGET_TOO_SMALL;
+
    data.target_length = (unsigned)*targetlength;
 
    while (data.patch_offset < data.patch_length - 12) 
@@ -475,47 +502,26 @@ static enum patch_error ips_apply_patch(
 
 static bool apply_patch_content(uint8_t **buf,
       ssize_t *size, const char *patch_desc, const char *patch_path,
-      patch_func_t func)
+      patch_func_t func, void *patch_data, ssize_t patch_size)
 {
-   size_t target_size;
-   ssize_t patch_size;
-   void *patch_data         = NULL;
    enum patch_error err     = PATCH_UNKNOWN;
-   bool success             = false;
-   uint8_t *patched_content = NULL;
    ssize_t ret_size         = *size;
    uint8_t *ret_buf         = *buf;
-   
-   if (!path_is_valid(patch_path))
-      return false;
-
-   if (!filestream_read_file(patch_path, &patch_data, &patch_size))
-      return false;
-
-   if (patch_size < 0)
-   {
-      free(patch_data);
-      return false;
-   }
-
-   if (!path_file_exists(patch_path))
-   {
-      free(patch_data);
-      return false;
-   }
+   size_t target_size       = ret_size * 4; /* Just to be sure. */
+   uint8_t *patched_content = (uint8_t*)malloc(target_size);
 
    RARCH_LOG("Found %s file in \"%s\", attempting to patch ...\n",
          patch_desc, patch_path);
 
-   target_size = ret_size * 4; /* Just to be sure. */
-
-   patched_content = (uint8_t*)malloc(target_size);
-
    if (!patched_content)
    {
       RARCH_ERR("%s\n",
             msg_hash_to_str(MSG_FAILED_TO_ALLOCATE_MEMORY_FOR_PATCHED_CONTENT));
-      goto error;
+
+      *buf  = ret_buf;
+      *size = ret_size;
+
+      return false;
    }
 
    err = func((const uint8_t*)patch_data, patch_size, ret_buf,
@@ -526,7 +532,9 @@ static bool apply_patch_content(uint8_t **buf,
       RARCH_LOG("%s (%s).\n",
             msg_hash_to_str(MSG_FATAL_ERROR_RECEIVED_IN),
             patch_desc);
-      success = true;
+      free(ret_buf);
+      *buf  = patched_content;
+      *size = target_size;
    }
    else
       RARCH_ERR("%s %s: %s #%u\n",
@@ -535,30 +543,33 @@ static bool apply_patch_content(uint8_t **buf,
             msg_hash_to_str(MSG_ERROR),
             (unsigned)err);
 
-   if (success)
-   {
-      free(ret_buf);
-      *buf = patched_content;
-      *size = target_size;
-   }
-
-   free(patch_data);
    return true;
-
-error:
-   *buf = ret_buf;
-   *size = ret_size;
-   free(patch_data);
-
-   return false;
 }
 
 static bool try_bps_patch(bool allow_bps, const char *name_bps,
       uint8_t **buf, ssize_t *size)
 {
    if (allow_bps && !string_is_empty(name_bps))
-      return apply_patch_content(buf, size, "BPS", name_bps,
-            bps_apply_patch);
+      if (path_is_valid(name_bps) && path_file_exists(name_bps))
+      {
+         ssize_t patch_size;
+         bool ret                 = false;
+         void *patch_data         = NULL;
+
+         if (!filestream_read_file(name_bps, &patch_data, &patch_size))
+            return false;
+
+         if (patch_size >= 0)
+         {
+            ret                      = apply_patch_content(
+                  buf, size, "BPS", name_bps,
+                  bps_apply_patch, patch_data, patch_size);
+         }
+
+         if (patch_data)
+            free(patch_data);
+         return ret;
+      }
    return false;
 }
 
@@ -566,8 +577,26 @@ static bool try_ups_patch(bool allow_ups, const char *name_ups,
       uint8_t **buf, ssize_t *size)
 {
    if (allow_ups && !string_is_empty(name_ups))
-      return apply_patch_content(buf, size, "UPS", name_ups,
-            ups_apply_patch);
+      if (path_is_valid(name_ups) && path_file_exists(name_ups))
+      {
+         ssize_t patch_size;
+         bool ret                 = false;
+         void *patch_data         = NULL;
+
+         if (!filestream_read_file(name_ups, &patch_data, &patch_size))
+            return false;
+
+         if (patch_size >= 0)
+         {
+            ret                      = apply_patch_content(
+                  buf, size, "UPS", name_ups,
+                  ups_apply_patch, patch_data, patch_size);
+         }
+
+         if (patch_data)
+            free(patch_data);
+         return ret;
+      }
    return false;
 }
 
@@ -575,7 +604,26 @@ static bool try_ips_patch(bool allow_ips,
       const char *name_ips, uint8_t **buf, ssize_t *size)
 {
    if (allow_ips && !string_is_empty(name_ips))
-      return apply_patch_content(buf, size, "IPS", name_ips, ips_apply_patch);
+      if (path_is_valid(name_ips) && path_file_exists(name_ips))
+      {
+         ssize_t patch_size;
+         bool ret                 = false;
+         void *patch_data         = NULL;
+
+         if (!filestream_read_file(name_ips, &patch_data, &patch_size))
+            return false;
+
+         if (patch_size >= 0)
+         {
+            ret                      = apply_patch_content(
+                  buf, size, "IPS", name_ips,
+                  ips_apply_patch, patch_data, patch_size);
+         }
+
+         if (patch_data)
+            free(patch_data);
+         return ret;
+      }
    return false;
 }
 
@@ -588,6 +636,9 @@ static bool try_ips_patch(bool allow_ips,
  *
  **/
 static void patch_content(
+      bool is_ips_pref,
+      bool is_bps_pref,
+      bool is_ups_pref,
       const char *name_ips,
       const char *name_bps,
       const char *name_ups,
@@ -595,9 +646,6 @@ static void patch_content(
       void *data)
 {
    ssize_t *size    = (ssize_t*)data;
-   bool is_ips_pref = rarch_ctl(RARCH_CTL_IS_IPS_PREF, NULL);
-   bool is_bps_pref = rarch_ctl(RARCH_CTL_IS_BPS_PREF, NULL);
-   bool is_ups_pref = rarch_ctl(RARCH_CTL_IS_UPS_PREF, NULL);
    bool allow_ups   = !is_bps_pref && !is_ips_pref;
    bool allow_ips   = !is_ups_pref && !is_bps_pref;
    bool allow_bps   = !is_ups_pref && !is_ips_pref;
diff --git a/tasks/task_powerstate.c b/tasks/task_powerstate.c
index 028e7f741f..654a1a11cb 100644
--- a/tasks/task_powerstate.c
+++ b/tasks/task_powerstate.c
@@ -22,11 +22,13 @@
 static int              power_percent = 0;
 static enum frontend_powerstate state = FRONTEND_POWERSTATE_NONE;
 
-typedef struct
+typedef struct powerstate powerstate_t;
+
+struct powerstate
 {
    int percent;
    enum frontend_powerstate state;
-} powerstate_t;
+};
 
 enum frontend_powerstate get_last_powerstate(int *percent)
 {
@@ -73,5 +75,5 @@ void task_push_get_powerstate(void)
    task->callback = task_powerstate_cb;
    task->mute     = true;
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 }
diff --git a/tasks/task_save.c b/tasks/task_save.c
index 03a6c34a8d..fa190b6d28 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -33,6 +33,7 @@
 #include <rthreads/rthreads.h>
 #include <file/file_path.h>
 #include <retro_miscellaneous.h>
+#include <string/stdstring.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../core.h"
@@ -45,6 +46,7 @@
 #include "../core.h"
 #include "../file_path_special.h"
 #include "../configuration.h"
+#include "../gfx/video_driver.h"
 #include "../msg_hash.h"
 #include "../retroarch.h"
 #include "../verbosity.h"
@@ -91,6 +93,7 @@ typedef struct
    bool mute;
    int state_slot;
    bool thumbnail_enable;
+   bool has_valid_framebuffer;
 } save_task_state_t;
 
 typedef save_task_state_t load_task_data_t;
@@ -147,8 +150,8 @@ static void autosave_thread(void *data)
       bool differ;
 
       slock_lock(save->lock);
-      differ = memcmp(save->buffer, save->retro_buffer,
-            save->bufsize) != 0;
+      differ = string_is_not_equal_fast(save->buffer, save->retro_buffer,
+            save->bufsize);
       if (differ)
          memcpy(save->buffer, save->retro_buffer, save->bufsize);
       slock_unlock(save->lock);
@@ -207,26 +210,26 @@ static autosave_t *autosave_new(const char *path,
       const void *data, size_t size,
       unsigned interval)
 {
-   autosave_t *handle   = (autosave_t*)calloc(1, sizeof(*handle));
+   autosave_t *handle            = (autosave_t*)calloc(1, sizeof(*handle));
    if (!handle)
       goto error;
 
-   handle->bufsize      = size;
-   handle->interval     = interval;
-   handle->path         = path;
-   handle->buffer       = malloc(size);
-   handle->retro_buffer = data;
+   handle->bufsize               = size;
+   handle->interval              = interval;
+   handle->path                  = path;
+   handle->buffer                = malloc(size);
+   handle->retro_buffer          = data;
 
    if (!handle->buffer)
       goto error;
 
    memcpy(handle->buffer, handle->retro_buffer, handle->bufsize);
 
-   handle->lock         = slock_new();
-   handle->cond_lock    = slock_new();
-   handle->cond         = scond_new();
+   handle->lock                  = slock_new();
+   handle->cond_lock             = slock_new();
+   handle->cond                  = scond_new();
 
-   handle->thread       = sthread_create(autosave_thread, handle);
+   handle->thread                = sthread_create(autosave_thread, handle);
 
    return handle;
 
@@ -644,18 +647,19 @@ static bool task_push_undo_save_state(const char *path, void *data, size_t size)
       goto error;
 
    strlcpy(state->path, path, sizeof(state->path));
-   state->data       = data;
-   state->size       = size;
-   state->undo_save  = true;
-   state->state_slot = settings->ints.state_slot;
+   state->data                   = data;
+   state->size                   = size;
+   state->undo_save              = true;
+   state->state_slot             = settings->ints.state_slot;
+   state->has_valid_framebuffer  = video_driver_cached_frame_has_valid_framebuffer();
 
-   task->type        = TASK_TYPE_BLOCKING;
-   task->state       = state;
-   task->handler     = task_save_handler;
-   task->callback    = undo_save_state_cb;
-   task->title       = strdup(msg_hash_to_str(MSG_UNDOING_SAVE_STATE));
+   task->type                    = TASK_TYPE_BLOCKING;
+   task->state                   = state;
+   task->handler                 = task_save_handler;
+   task->callback                = undo_save_state_cb;
+   task->title                   = strdup(msg_hash_to_str(MSG_UNDOING_SAVE_STATE));
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return true;
 
@@ -977,7 +981,7 @@ static void save_state_cb(void *task_data,
    char               *path = strdup(state->path);
 
    if (state->thumbnail_enable)
-      take_screenshot(path, true);
+      take_screenshot(path, true, state->has_valid_framebuffer);
 
    free(path);
 }
@@ -1006,6 +1010,7 @@ static void task_push_save_state(const char *path, void *data, size_t size, bool
    state->mute             = autosave; /* don't show OSD messages if we are auto-saving */
    state->thumbnail_enable = settings->bools.savestate_thumbnail_enable;
    state->state_slot       = settings->ints.state_slot;
+   state->has_valid_framebuffer  = video_driver_cached_frame_has_valid_framebuffer();
 
    task->type              = TASK_TYPE_BLOCKING;
    task->state             = state;
@@ -1014,7 +1019,7 @@ static void task_push_save_state(const char *path, void *data, size_t size, bool
    task->title             = strdup(msg_hash_to_str(MSG_SAVING_STATE));
    task->mute              = state->mute;
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return;
 
@@ -1076,6 +1081,7 @@ static void task_push_load_and_save_state(const char *path, void *data,
    state->autosave   = autosave;
    state->mute       = autosave; /* don't show OSD messages if we are auto-saving */
    state->state_slot = settings->ints.state_slot;
+   state->has_valid_framebuffer  = video_driver_cached_frame_has_valid_framebuffer();
 
    task->state       = state;
    task->type        = TASK_TYPE_BLOCKING;
@@ -1084,7 +1090,7 @@ static void task_push_load_and_save_state(const char *path, void *data,
    task->title       = strdup(msg_hash_to_str(MSG_LOADING_STATE));
    task->mute        = state->mute;
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return;
 
@@ -1139,7 +1145,7 @@ bool content_save_state(const char *path, bool save_to_disk, bool autosave)
    {
       if (save_to_disk)
       {
-         if (path_file_exists(path))
+         if (path_file_exists(path) && !autosave)
          {
             /* Before overwritting the savestate file, load it into a buffer
             to allow undo_save_state() to work */
@@ -1212,6 +1218,7 @@ bool content_load_state(const char *path,
    state->load_to_backup_buffer = load_to_backup_buffer;
    state->autoload              = autoload;
    state->state_slot            = settings->ints.state_slot;
+   state->has_valid_framebuffer  = video_driver_cached_frame_has_valid_framebuffer();
 
    task->type                   = TASK_TYPE_BLOCKING;
    task->state                  = state;
@@ -1219,7 +1226,7 @@ bool content_load_state(const char *path,
    task->callback               = content_load_state_cb;
    task->title                  = strdup(msg_hash_to_str(MSG_LOADING_STATE));
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return true;
 
diff --git a/tasks/task_screenshot.c b/tasks/task_screenshot.c
index 84fff0873a..990839e7f6 100644
--- a/tasks/task_screenshot.c
+++ b/tasks/task_screenshot.c
@@ -50,7 +50,7 @@
 
 #include "../defaults.h"
 #include "../configuration.h"
-#include "../runloop.h"
+#include "../retroarch.h"
 #include "../paths.h"
 #include "../msg_hash.h"
 
@@ -58,7 +58,9 @@
 
 #include "tasks_internal.h"
 
-typedef struct
+typedef struct screenshot_task_state screenshot_task_state_t;
+
+struct screenshot_task_state
 {
 #ifdef _XBOX1
    D3DSurface *surf;
@@ -78,7 +80,7 @@ typedef struct
    bool is_paused;
    bool history_list_enable;
    unsigned pixel_format_type;
-} screenshot_task_state_t;
+};
 
 /**
  * task_screenshot_handler:
@@ -265,7 +267,7 @@ static bool screenshot_dump(
    if (!savestate)
       task->title    = strdup(msg_hash_to_str(MSG_TAKING_SCREENSHOT));
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return true;
 }
@@ -334,7 +336,7 @@ static bool take_screenshot_raw(const char *name_base, void *userbuf,
 }
 
 static bool take_screenshot_choice(const char *name_base, bool savestate,
-      bool is_paused, bool is_idle)
+      bool is_paused, bool is_idle, bool has_valid_framebuffer)
 {
    size_t old_pitch;
    unsigned old_width, old_height;
@@ -362,7 +364,7 @@ static bool take_screenshot_choice(const char *name_base, bool savestate,
 #endif
    }
 
-   if (!video_driver_cached_frame_has_valid_framebuffer())
+   if (!has_valid_framebuffer)
       return take_screenshot_raw(name_base, NULL, savestate, is_idle, is_paused);
 
    if (!video_driver_supports_read_frame_raw())
@@ -387,7 +389,7 @@ static bool take_screenshot_choice(const char *name_base, bool savestate,
    return ret;
 }
 
-bool take_screenshot(const char *name_base, bool silence)
+bool take_screenshot(const char *name_base, bool silence, bool has_valid_framebuffer)
 {
    bool is_paused         = false;
    bool is_idle           = false;
@@ -397,7 +399,8 @@ bool take_screenshot(const char *name_base, bool silence)
 
    runloop_get_status(&is_paused, &is_idle, &is_slowmotion, &is_perfcnt_enable);
 
-   ret       = take_screenshot_choice(name_base, silence, is_paused, is_idle);
+   ret       = take_screenshot_choice(name_base, silence, is_paused, is_idle,
+         has_valid_framebuffer);
 
    if (is_paused && !is_idle)
          video_driver_cached_frame();
diff --git a/tasks/task_wifi.c b/tasks/task_wifi.c
index 050766d301..ed94efca78 100644
--- a/tasks/task_wifi.c
+++ b/tasks/task_wifi.c
@@ -15,108 +15,42 @@
 
 #include <string.h>
 #include <errno.h>
-#include <file/nbio.h>
-#include <formats/image.h>
 #include <compat/strl.h>
 #include <retro_assert.h>
 #include <retro_miscellaneous.h>
-#include <lists/string_list.h>
-#include <rhash.h>
 #include <string/stdstring.h>
 
 #include "tasks_internal.h"
 #include "../verbosity.h"
 #include "../wifi/wifi_driver.h"
-#include "../menu/menu_entries.h"
-#include "../menu/menu_driver.h"
-
-typedef struct
-{
-   struct string_list *ssid_list;
-} wifi_handle_t;
-
-static void wifi_scan_callback(void *task_data,
-                               void *user_data, const char *error)
-{
-   unsigned i;
-   file_list_t *file_list        = NULL;
-   struct string_list *ssid_list = NULL;
-
-#ifdef HAVE_MENU
-   const char *path              = NULL;
-   const char *label             = NULL;
-   unsigned menu_type            = 0;
-   enum msg_hash_enums enum_idx  = MSG_UNKNOWN;
-
-   menu_entries_get_last_stack(&path, &label, &menu_type, &enum_idx, NULL);
-
-   /* Don't push the results if we left the wifi menu */
-   if (!string_is_equal(label,
-         msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_WIFI_SETTINGS_LIST)))
-      return;
-
-   file_list = menu_entries_get_selection_buf_ptr(0);
-   menu_entries_ctl(MENU_ENTRIES_CTL_CLEAR, file_list);
-#endif
-
-   ssid_list = string_list_new();
-
-   driver_wifi_get_ssids(ssid_list);
-
-#ifdef HAVE_MENU
-   for (i = 0; i < ssid_list->size; i++)
-   {
-      const char *ssid = ssid_list->elems[i].data;
-      menu_entries_append_enum(file_list,
-            ssid,
-            msg_hash_to_str(MENU_ENUM_LABEL_CONNECT_WIFI),
-            MENU_ENUM_LABEL_CONNECT_WIFI,
-            MENU_WIFI, 0, 0);
-   }
-#endif
-
-   string_list_free(ssid_list);
-}
 
 static void task_wifi_scan_handler(retro_task_t *task)
 {
    driver_wifi_scan();
 
    task_set_progress(task, 100);
+   task_free_title(task);
    task_set_title(task, strdup(msg_hash_to_str(MSG_WIFI_SCAN_COMPLETE)));
    task_set_finished(task, true);
-
-   return;
 }
 
-bool task_push_wifi_scan(void)
+bool task_push_wifi_scan(retro_task_callback_t cb)
 {
    retro_task_t   *task = (retro_task_t *)calloc(1, sizeof(*task));
-   wifi_handle_t *state = (wifi_handle_t*)calloc(1, sizeof(*state));
 
-   if (!task || !state)
-      goto error;
-
-   state->ssid_list     = string_list_new();
+   if (!task)
+      return false;
 
    /* blocking means no other task can run while this one is running, 
     * which is the default */
    task->type           = TASK_TYPE_BLOCKING;
-   task->state          = state;
+   task->state          = NULL;
    task->handler        = task_wifi_scan_handler;
-   task->callback       = wifi_scan_callback;
+   task->callback       = cb;
    task->title          = strdup(msg_hash_to_str(
                            MSG_SCANNING_WIRELESS_NETWORKS));
 
-   task_queue_ctl(TASK_QUEUE_CTL_PUSH, task);
+   task_queue_push(task);
 
    return true;
-
-error:
-   if (state)
-      free(state);
-   if (task)
-      free(task);
-
-   return false;
 }
diff --git a/tasks/tasks_internal.h b/tasks/tasks_internal.h
index 4fe49bc630..bb74a2d3a3 100644
--- a/tasks/tasks_internal.h
+++ b/tasks/tasks_internal.h
@@ -24,7 +24,6 @@
 
 #include <queues/message_queue.h>
 #include <queues/task_queue.h>
-#include <formats/image.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
@@ -39,6 +38,12 @@ RETRO_BEGIN_DECLS
 
 typedef int (*transfer_cb_t)(void *data, size_t len);
 
+typedef struct nbio_buf
+{
+   void *buf;
+   unsigned bufsize;
+} nbio_buf_t;
+
 enum content_mode_load
 {
    CONTENT_MODE_LOAD_NONE = 0,
@@ -50,10 +55,9 @@ enum content_mode_load
 enum nbio_status_enum
 {
    NBIO_STATUS_INIT = 0,
-   NBIO_STATUS_POLL,
    NBIO_STATUS_TRANSFER,
    NBIO_STATUS_TRANSFER_PARSE,
-   NBIO_STATUS_TRANSFER_PARSE_FREE
+   NBIO_STATUS_TRANSFER_FINISHED
 };
 
 enum nbio_status_flags
@@ -62,9 +66,20 @@ enum nbio_status_flags
    NBIO_FLAG_IMAGE_SUPPORTS_RGBA
 };
 
+enum nbio_type
+{
+   NBIO_TYPE_NONE = 0,
+   NBIO_TYPE_JPEG,
+   NBIO_TYPE_PNG,
+   NBIO_TYPE_TGA,
+   NBIO_TYPE_BMP,
+   NBIO_TYPE_OGG,
+   NBIO_TYPE_WAV
+};
+
 typedef struct nbio_handle
 {
-   enum image_type_enum image_type;
+   enum nbio_type type;
    void *data;
    bool is_finished;
    transfer_cb_t  cb;
@@ -91,13 +106,15 @@ void *task_push_http_post_transfer(const char *url, const char *post_data, bool
 
 task_retriever_info_t *http_task_get_transfer_list(void);
 
-bool task_push_wifi_scan(void);
+bool task_push_wifi_scan(retro_task_callback_t cb);
 
-bool task_push_netplay_lan_scan(void);
+bool task_push_netplay_lan_scan(retro_task_callback_t cb);
 
 bool task_push_netplay_crc_scan(uint32_t crc, char* name,
       const char *hostname, const char *corename);
 
+bool task_push_netplay_lan_scan_rooms(retro_task_callback_t cb);
+
 bool task_push_netplay_nat_traversal(void *nat_traversal_state, uint16_t port);
 
 #endif
@@ -118,19 +135,8 @@ bool task_push_overlay_load_default(
         retro_task_callback_t cb, void *user_data);
 #endif
     
-int find_first_data_track(const char* cue_path,
-      int32_t* offset, char* track_path, size_t max_len);
-
-int detect_system(const char* track_path, const char** system_name);
-
-int detect_ps1_game(const char *track_path, char *game_id);
-
-int detect_psp_game(const char *track_path, char *game_id);
-
 bool task_check_decompress(const char *source_file);
 
-bool task_image_load_handler(retro_task_t *task);
-
 bool task_push_decompress(
       const char *source_file,
       const char *target_dir,
@@ -203,11 +209,11 @@ bool task_push_load_content_with_core_from_menu(
       void *user_data);
 #endif
 
-void task_image_load_free(retro_task_t *task);
-
 void task_file_load_handler(retro_task_t *task);
 
-bool take_screenshot(const char *path, bool silence);
+bool task_audio_mixer_load_handler(retro_task_t *task);
+
+bool take_screenshot(const char *path, bool silence, bool has_valid_framebuffer);
 
 bool event_load_save_files(void);
 
@@ -241,6 +247,8 @@ void task_push_get_powerstate(void);
 
 enum frontend_powerstate get_last_powerstate(int *percent);
 
+bool task_push_audio_mixer_load(const char *fullpath, retro_task_callback_t cb, void *user_data);
+
 extern const char* const input_builtin_autoconfs[];
 
 RETRO_END_DECLS
diff --git a/ui/drivers/cocoa/cocoatouch_menu.m b/ui/drivers/cocoa/cocoatouch_menu.m
index e65a058a68..40ea236f79 100644
--- a/ui/drivers/cocoa/cocoatouch_menu.m
+++ b/ui/drivers/cocoa/cocoatouch_menu.m
@@ -30,11 +30,11 @@
 #include "../../../input/drivers/cocoa_input.h"
 
 #include "../../../configuration.h"
-#include "../../../runloop.h"
+#include "../../../retroarch.h"
 
 #ifdef HAVE_MENU
 #include "../../../menu/widgets/menu_entry.h"
-#include "../../../menu/menu_navigation.h"
+#include "../../../menu/menu_driver.h"
 #include "../../../menu/drivers/menu_generic.h"
 #endif
 
@@ -769,7 +769,7 @@ didSelectRowAtIndexPath:(NSIndexPath *)indexPath
 - (void)menuSelect: (uint32_t) i
 {
    menu_entry_select(i);
-   task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
+   task_queue_check();
 }
 
 - (void)menuBack
diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m
index 913f94f5db..84a8215af3 100644
--- a/ui/drivers/ui_cocoa.m
+++ b/ui/drivers/ui_cocoa.m
@@ -34,7 +34,6 @@
 #include "../../paths.h"
 #include "../../core.h"
 #include "../../retroarch.h"
-#include "../../runloop.h"
 #include "../../tasks/tasks_internal.h"
 
 id apple_platform;
@@ -240,7 +239,7 @@ static char** waiting_argv;
        ret = runloop_iterate(&sleep_ms);
        if (ret == 1 && sleep_ms > 0)
           retro_sleep(sleep_ms);
-       task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
+       task_queue_check();
        while(CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.002, FALSE) == kCFRunLoopRunHandledSource);
        if (ret == -1)
           break;
@@ -330,7 +329,7 @@ static void open_core_handler(ui_browser_window_state_t *state, bool result)
 
     settings_t *settings = config_get_ptr();
                 
-    runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, (void*)state->result);
+    rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, (void*)state->result);
     ui_companion_event_command(CMD_EVENT_LOAD_CORE);
                 
     if (menu_driver_ctl(RARCH_MENU_CTL_HAS_LOAD_NO_CONTENT, NULL)
@@ -482,7 +481,7 @@ static void open_document_handler(ui_browser_window_state_t *state, bool result)
    if (sender_tag >= 10 && sender_tag <= 19)
    {
       unsigned idx = (sender_tag - (10-1));
-      runloop_ctl(RUNLOOP_CTL_SET_WINDOWED_SCALE, &idx);
+      rarch_ctl(RARCH_CTL_SET_WINDOWED_SCALE, &idx);
       cmd = CMD_EVENT_RESIZE_WINDOWED_SCALE;
    }
 
diff --git a/ui/drivers/ui_cocoatouch.m b/ui/drivers/ui_cocoatouch.m
index 1517502fc2..a2890981ee 100644
--- a/ui/drivers/ui_cocoatouch.m
+++ b/ui/drivers/ui_cocoatouch.m
@@ -22,18 +22,18 @@
 
 #include <file/file_path.h>
 #include <queues/task_queue.h>
+#include <string/stdstring.h>
 
 #include "cocoa/cocoa_common.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
-#include "../../configuration.h"
-#include "../../frontend/frontend.h"
-#include "../../runloop.h"
 
 #ifdef HAVE_MENU
 #include "../../menu/menu_setting.h"
@@ -55,9 +55,9 @@ static void rarch_enable_ui(void)
 
    ui_companion_set_foreground(true);
 
-   runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
-   runloop_ctl(RUNLOOP_CTL_SET_IDLE,   &boolean);
-   rarch_ctl(RARCH_CTL_MENU_RUNNING, NULL);
+   rarch_ctl(RARCH_CTL_SET_PAUSED, &boolean);
+   rarch_ctl(RARCH_CTL_SET_IDLE,   &boolean);
+   rarch_menu_running();
 }
 
 static void rarch_disable_ui(void)
@@ -66,9 +66,9 @@ static void rarch_disable_ui(void)
 
    ui_companion_set_foreground(false);
 
-   runloop_ctl(RUNLOOP_CTL_SET_PAUSED, &boolean);
-   runloop_ctl(RUNLOOP_CTL_SET_IDLE,   &boolean);
-   rarch_ctl(RARCH_CTL_MENU_RUNNING_FINISHED, NULL);
+   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
@@ -89,7 +89,7 @@ static void rarch_draw_observer(CFRunLoopObserverRef observer,
 
    if (ret == 1 && !ui_companion_is_on_foreground() && sleep_ms > 0)
       retro_sleep(sleep_ms);
-   task_queue_ctl(TASK_QUEUE_CTL_CHECK, NULL);
+   task_queue_check();
 
    if (ret == -1)
    {
@@ -98,7 +98,7 @@ static void rarch_draw_observer(CFRunLoopObserverRef observer,
       return;
    }
 
-   if (runloop_ctl(RUNLOOP_CTL_IS_IDLE, NULL))
+   if (rarch_ctl(RARCH_CTL_IS_IDLE, NULL))
       return;
    CFRunLoopWakeUp(CFRunLoopGetMain());
 }
@@ -485,10 +485,11 @@ enum
    /* Get enabled orientations */
    apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskAll;
    
-   if (memcmp(apple_frontend_settings.orientations, "landscape", 9) == 0)
+   if (string_is_equal_fast(apple_frontend_settings.orientations, "landscape", 9))
       apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskLandscape;
-   else if (memcmp(apple_frontend_settings.orientations, "portrait", 8) == 0)
-      apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown;
+   else if (string_is_equal_fast(apple_frontend_settings.orientations, "portrait", 8))
+      apple_frontend_settings.orientation_flags = UIInterfaceOrientationMaskPortrait 
+         | UIInterfaceOrientationMaskPortraitUpsideDown;
 }
 
 - (void)mainMenuRefresh 
diff --git a/ui/drivers/ui_qt.cpp b/ui/drivers/ui_qt.cpp
index cdbce779f6..7f71aa121e 100644
--- a/ui/drivers/ui_qt.cpp
+++ b/ui/drivers/ui_qt.cpp
@@ -35,7 +35,7 @@
 #include "../ui_companion_driver.h"
 #include "../../core.h"
 #include "../../configuration.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../tasks/tasks_internal.h"
 
 #ifdef HAVE_QT_WRAPPER
diff --git a/ui/drivers/ui_win32.c b/ui/drivers/ui_win32.c
index 13eb35d553..e5943ec2b2 100644
--- a/ui/drivers/ui_win32.c
+++ b/ui/drivers/ui_win32.c
@@ -49,9 +49,8 @@
 #include "../../configuration.h"
 #include "../../driver.h"
 #include "../../paths.h"
-#include "../../runloop.h"
-#include "../../gfx/video_context_driver.h"
-#include "../../gfx/video_shader_driver.h"
+#include "../../retroarch.h"
+#include "../../gfx/video_driver.h"
 #include "../../tasks/tasks_internal.h"
 
 #include "../../gfx/common/gl_common.h"
@@ -627,7 +626,7 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
             switch (mode)
             {
                case ID_M_LOAD_CORE:
-                  runloop_ctl(RUNLOOP_CTL_SET_LIBRETRO_PATH, win32_file);
+                  rarch_ctl(RARCH_CTL_SET_LIBRETRO_PATH, win32_file);
                   cmd         = CMD_EVENT_LOAD_CORE;
                   break;
                case ID_M_LOAD_CONTENT:
@@ -695,7 +694,7 @@ LRESULT win32_menu_loop(HWND owner, WPARAM wparam)
          if (mode >= ID_M_WINDOW_SCALE_1X && mode <= ID_M_WINDOW_SCALE_10X)
          {
             unsigned idx = (mode - (ID_M_WINDOW_SCALE_1X-1));
-            runloop_ctl(RUNLOOP_CTL_SET_WINDOWED_SCALE, &idx);
+            rarch_ctl(RARCH_CTL_SET_WINDOWED_SCALE, &idx);
             cmd = CMD_EVENT_RESIZE_WINDOWED_SCALE;
          }
          else if (mode == ID_M_STATE_INDEX_AUTO)
diff --git a/ui/drivers/win32/ui_win32_window.cpp b/ui/drivers/win32/ui_win32_window.cpp
index afa19a8346..8a0d1e981a 100644
--- a/ui/drivers/win32/ui_win32_window.cpp
+++ b/ui/drivers/win32/ui_win32_window.cpp
@@ -47,7 +47,7 @@
 
 #include "../../ui_companion_driver.h"
 #include "../../../driver.h"
-#include "../../../runloop.h"
+#include "../../../retroarch.h"
 #include "../../../tasks/tasks_internal.h"
 
 static void ui_window_win32_destroy(void *data)
diff --git a/ui/ui_companion_driver.c b/ui/ui_companion_driver.c
index 980d2311fa..78832a4f42 100644
--- a/ui/ui_companion_driver.c
+++ b/ui/ui_companion_driver.c
@@ -91,12 +91,7 @@ bool ui_companion_is_on_foreground(void)
  **/
 const ui_companion_driver_t *ui_companion_init_first(void)
 {
-   unsigned i;
-
-   for (i = 0; ui_companion_drivers[i]; i++)
-      return ui_companion_drivers[i];
-
-   return NULL;
+   return ui_companion_drivers[0];
 }
 
 const ui_companion_driver_t *ui_companion_get_ptr(void)
diff --git a/wifi/drivers/connmanctl.c b/wifi/drivers/connmanctl.c
index 5af68d2f4d..ddf6f7a6fc 100644
--- a/wifi/drivers/connmanctl.c
+++ b/wifi/drivers/connmanctl.c
@@ -19,7 +19,7 @@
 #include <retro_miscellaneous.h>
 
 #include "../wifi_driver.h"
-#include "../../runloop.h"
+#include "../../retroarch.h"
 #include "../../lakka.h"
 
 static bool connman_cache[256] = {0};