diff --git a/.github/workflows/SourceRelease.yml b/.github/workflows/SourceRelease.yml
new file mode 100644
index 000000000000..c89434d17e9f
--- /dev/null
+++ b/.github/workflows/SourceRelease.yml
@@ -0,0 +1,49 @@
+name: CI Generate Source Only Tarball
+
+# Trigger whenever a release and/or is created
+on:
+  release:
+    types:
+      - created
+  push:
+    tags:
+      - "v*.*"
+
+jobs:
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    steps:
+
+    - uses: actions/checkout@v4
+      with:
+        submodules: recursive
+
+    - name: archive
+      id: archive
+      run: |
+        VERSION=${GITHUB_REF##*/}
+        test -z "$VERSION" && VERSION=${{ github.event.release.tag_name }}
+        VERSION=$(printf "%s\n" "$VERSION" | sed 's/^v//')
+        PKGNAME="retroarch-sourceonly-$VERSION"
+        mkdir -p /tmp/$PKGNAME
+        mv * /tmp/$PKGNAME
+        mv /tmp/$PKGNAME .
+        rm -rf $PKGNAME/pkg || true
+        rm -rf $PKGNAME/wii/libogc || true
+        rm -rf $PKGNAME/deps/glslang/glslang/Test || true
+        rm -rf $PKGNAME/deps/SPIRV-Cross/reference || true
+        rm -rf $PKGNAME/gfx/include/userland || true
+        find $PKGNAME/ -type f -name '*.a' -delete || true
+        find $PKGNAME/ -type f -name '*.lib' -delete || true
+        find $PKGNAME/ -type f -name '*.dylib' -delete || true
+        find $PKGNAME/ -type f -name '*.so.*' -delete || true
+        find $PKGNAME/ -type f -name '*.dll' -delete || true
+        TARBALL=$PKGNAME.tar.xz
+        tar cJf $TARBALL $PKGNAME
+        echo "tarball=$TARBALL" >> $GITHUB_OUTPUT
+
+    - name: upload tarball
+      uses: softprops/action-gh-release@v2
+      with:
+        files: ${{ steps.archive.outputs.tarball }}
diff --git a/.github/workflows/crowdin-daily.yml b/.github/workflows/crowdin-daily.yml
index cb2eb994e206..c75dc130e60e 100644
--- a/.github/workflows/crowdin-daily.yml
+++ b/.github/workflows/crowdin-daily.yml
@@ -16,12 +16,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Java JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 18
           distribution: zulu
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Checkout
diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml
index 2e1079528dec..5ee309af9e93 100644
--- a/.github/workflows/crowdin.yml
+++ b/.github/workflows/crowdin.yml
@@ -18,12 +18,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Setup Java JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 18
           distribution: zulu
       - name: Setup Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: '3.10'
       - name: Checkout
diff --git a/.github/workflows/webOS.yml b/.github/workflows/webOS.yml
index 425c02c9c105..669afa50ec73 100644
--- a/.github/workflows/webOS.yml
+++ b/.github/workflows/webOS.yml
@@ -18,7 +18,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Download ares-cli-rs
-        uses: robinraju/release-downloader@v1.9
+        uses: robinraju/release-downloader@v1.11
         with:
           repository: "webosbrew/ares-cli-rs"
           latest: true
@@ -32,7 +32,7 @@ jobs:
         run: sudo apt-get -yq install ./temp/*.deb
 
       - name: Download webOS NDK
-        uses: robinraju/release-downloader@v1.9
+        uses: robinraju/release-downloader@v1.11
         with:
           repository: "openlgtv/buildroot-nc4"
           latest: true
diff --git a/Makefile.common b/Makefile.common
index 2a715f4786a2..17c5e401853d 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1305,6 +1305,9 @@ ifeq ($(HAVE_X11), 1)
    ifeq ($(HAVE_XCB),1)
       LIBS += -lX11-xcb
    endif
+   ifeq ($(HAVE_XSCRNSAVER),1)
+      LIBS += -lXss
+   endif
    ifneq ($(HAVE_OPENGLES), 1)
       OBJ += gfx/drivers_context/x_ctx.o
    endif
diff --git a/audio/common/alsa.c b/audio/common/alsa.c
index f1b011a2e8e5..445ecb2017d2 100644
--- a/audio/common/alsa.c
+++ b/audio/common/alsa.c
@@ -19,8 +19,9 @@
 #include <alsa/asoundlib.h>
 #include <asm-generic/errno.h>
 
+#include "alsa.h"
+
 #include "../audio_driver.h"
-#include "../common/alsa.h"
 #include "../../verbosity.h"
 
 int alsa_init_pcm(snd_pcm_t **pcm,
diff --git a/audio/common/alsa.h b/audio/common/alsa.h
index d459c21c746e..013a4e7103a3 100644
--- a/audio/common/alsa.h
+++ b/audio/common/alsa.h
@@ -18,8 +18,9 @@
 #define _RETROARCH_ALSA
 
 #include <boolean.h>
-#include "queues/fifo_queue.h"
-#include "rthreads/rthreads.h"
+#include <queues/fifo_queue.h>
+#include <rthreads/rthreads.h>
+
 /* Header file for common functions that are used by alsa and alsathread. */
 
 /**
diff --git a/audio/common/alsathread.h b/audio/common/alsathread.h
index dafa5be8e050..b137b1fff692 100644
--- a/audio/common/alsathread.h
+++ b/audio/common/alsathread.h
@@ -19,9 +19,9 @@
 
 #include <alsa/asoundlib.h>
 #include <boolean.h>
-#include "queues/fifo_queue.h"
-#include "rthreads/rthreads.h"
-#include "./alsa.h"
+#include <queues/fifo_queue.h>
+#include <rthreads/rthreads.h>
+#include "alsa.h"
 
 typedef struct alsa_thread_info
 {
diff --git a/audio/common/mmdevice_common.c b/audio/common/mmdevice_common.c
index 6801693b907e..c0c14979ddb8 100644
--- a/audio/common/mmdevice_common.c
+++ b/audio/common/mmdevice_common.c
@@ -21,7 +21,6 @@
 #include "mmdevice_common.h"
 #include "mmdevice_common_inline.h"
 
-
 char* mmdevice_name(IMMDevice *device)
 {
    HRESULT hr;
diff --git a/audio/common/wasapi.c b/audio/common/wasapi.c
index b94a3ed20ec9..639dda79d8e3 100644
--- a/audio/common/wasapi.c
+++ b/audio/common/wasapi.c
@@ -15,17 +15,18 @@
  */
 
 #include "wasapi.h"
-#include <stdio.h>
 #ifdef HAVE_MICROPHONE
-#include "audio/microphone_driver.h"
+#include "../microphone_driver.h"
 #endif
-#include "queues/fifo_queue.h"
-#include "lists/string_list.h"
-#include "configuration.h"
-#include "verbosity.h"
-#include "string/stdstring.h"
+#include <string/stdstring.h>
+#include <queues/fifo_queue.h>
+#include <lists/string_list.h>
+
 #include "mmdevice_common.h"
 
+#include "../../configuration.h"
+#include "../../verbosity.h"
+
 const char *hresult_name(HRESULT hr)
 {
    switch (hr)
diff --git a/audio/common/wasapi.h b/audio/common/wasapi.h
index 9393e2a01ed7..154313ab36b7 100644
--- a/audio/common/wasapi.h
+++ b/audio/common/wasapi.h
@@ -23,8 +23,8 @@
 #ifndef RETROARCH_COMMON_WASAPI_H
 #define RETROARCH_COMMON_WASAPI_H
 
-#include "../common/mmdevice_common_inline.h"
-#include "boolean.h"
+#include "mmdevice_common_inline.h"
+#include <boolean.h>
 
 /* Shared buffer size replacement placeholders */
 #define WASAPI_SH_BUFFER_AUDIO_LATENCY 0
@@ -37,4 +37,4 @@ IMMDevice *wasapi_init_device(const char *id, EDataFlow data_flow);
 IAudioClient *wasapi_init_client(IMMDevice *device, bool *exclusive,
                                  bool *float_fmt, unsigned *rate, unsigned latency, unsigned channels);
 
-#endif /* RETROARCH_COMMON_WASAPI_H */
\ No newline at end of file
+#endif /* RETROARCH_COMMON_WASAPI_H */
diff --git a/audio/microphone_driver.c b/audio/microphone_driver.c
index f5a667cf86f0..7174311495a5 100644
--- a/audio/microphone_driver.c
+++ b/audio/microphone_driver.c
@@ -19,6 +19,7 @@
 #include <audio/conversion/float_to_s16.h>
 #include <retro_assert.h>
 #include <string/stdstring.h>
+#include <lists/string_list.h>
 #include <audio/conversion/dual_mono.h>
 
 #include "microphone_driver.h"
diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c
index 097b4708ec09..745e45001e67 100644
--- a/cheevos/cheevos.c
+++ b/cheevos/cheevos.c
@@ -398,15 +398,15 @@ static void rcheevos_show_mastery_placard(void)
 #if defined (HAVE_GFX_WIDGETS)
       if (gfx_widgets_ready())
       {
+         char msg[128];
+         char badge_name[32];
          const char* displayname = rc_client_get_user_info(rcheevos_locals.client)->display_name;
          const bool content_runtime_log = settings->bools.content_runtime_log;
          const bool content_runtime_log_aggr = settings->bools.content_runtime_log_aggregate;
-         char badge_name[32];
-         char msg[128];
          size_t len = strlcpy(msg, displayname, sizeof(msg));
 
-         if (len < sizeof(msg) - 12 &&
-            (content_runtime_log || content_runtime_log_aggr))
+         if (len < sizeof(msg) - 12
+            && (content_runtime_log || content_runtime_log_aggr))
          {
             const char* content_path = path_get(RARCH_PATH_CONTENT);
             const char* core_path = path_get(RARCH_PATH_CORE);
@@ -422,7 +422,7 @@ static void rcheevos_show_mastery_placard(void)
                runtime_log_add_runtime_usec(runtime_log,
                   runloop_state->core_runtime_usec);
 
-               len += snprintf(msg + len, sizeof(msg) - len, " | ");
+               len += strlcpy(msg + len, " | ", sizeof(msg) - len);
                runtime_log_get_runtime_str(runtime_log, msg + len, sizeof(msg) - len);
                msg[sizeof(msg) - 1] = '\0';
 
@@ -430,7 +430,8 @@ static void rcheevos_show_mastery_placard(void)
             }
          }
 
-         snprintf(badge_name, sizeof(badge_name), "i%s", game->badge_name);
+         len = strlcpy(badge_name, "i", sizeof(badge_name));
+         strlcpy(badge_name + len, game->badge_name, sizeof(badge_name) - len);
          gfx_widgets_push_achievement(title, msg, badge_name);
       }
       else
@@ -474,8 +475,10 @@ static void rcheevos_award_achievement(const rc_client_achievement_t* cheevo)
 #endif
       {
          char buffer[256];
-         snprintf(buffer, sizeof(buffer), "%s: %s",
-            msg_hash_to_str(MSG_ACHIEVEMENT_UNLOCKED), cheevo->title);
+         size_t _len = strlcpy(buffer, msg_hash_to_str(MSG_ACHIEVEMENT_UNLOCKED),
+               sizeof(buffer));
+         _len += strlcpy(buffer + _len, ": ", sizeof(buffer) - _len);
+         strlcpy(buffer + _len, cheevo->title, sizeof(buffer) - _len);
          runloop_msg_queue_push(buffer, 0, 2 * 60, false, NULL,
             MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          runloop_msg_queue_push(cheevo->description, 0, 3 * 60, false, NULL,
@@ -558,12 +561,13 @@ static void rcheevos_lboard_started(const rc_client_leaderboard_t* lboard)
    if (settings->bools.cheevos_visibility_lboard_start)
    {
       char buffer[256];
+      size_t _len = strlcpy(buffer, msg_hash_to_str(MSG_LEADERBOARD_STARTED),
+            sizeof(buffer));
+      _len += strlcpy(buffer + _len, ": ", sizeof(buffer) - _len);
+      _len += strlcpy(buffer + _len, lboard->title, sizeof(buffer) - _len);
       if (lboard->description && *lboard->description)
-         snprintf(buffer, sizeof(buffer), "%s: %s - %s",
-            msg_hash_to_str(MSG_LEADERBOARD_STARTED), lboard->title, lboard->description);
-      else
-         snprintf(buffer, sizeof(buffer), "%s: %s",
-            msg_hash_to_str(MSG_LEADERBOARD_STARTED), lboard->title);
+         snprintf(buffer + _len, sizeof(buffer) - _len, "- %s",
+            lboard->description);
 
       runloop_msg_queue_push(buffer, 0, 2 * 60, false, NULL,
          MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@@ -623,8 +627,9 @@ static void rcheevos_client_log_message(const char* message, const rc_client_t*
 static void rcheevos_server_error(const char* api_name, const char* message)
 {
    char buffer[256];
-   snprintf(buffer, sizeof(buffer), "%s failed: %s", api_name, message);
-
+   size_t _len = strlcpy(buffer, api_name, sizeof(buffer));
+   _len += strlcpy(buffer + _len, " failed: ", sizeof(buffer) - _len);
+   _len += strlcpy(buffer + _len, message, sizeof(buffer) - _len);
    runloop_msg_queue_push(buffer, 0, 4 * 60, false, NULL,
       MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_ERROR);
 }
@@ -786,8 +791,10 @@ void rcheevos_award_achievement(rcheevos_locals_t* locals,
 #endif
       {
          char buffer[256];
-         snprintf(buffer, sizeof(buffer), "%s: %s",
-            msg_hash_to_str(MSG_ACHIEVEMENT_UNLOCKED), cheevo->title);
+         size_t _len = strlcpy(buffer, msg_hash_to_str(MSG_ACHIEVEMENT_UNLOCKED),
+               sizeof(buffer));
+         _len += strlcpy(buffer + _len, ": ", sizeof(buffer) - _len);
+         _len += strlcpy(buffer + _len, cheevo->title, sizeof(buffer) - _len);
          runloop_msg_queue_push(buffer, 0, 2 * 60, false, NULL,
             MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
          runloop_msg_queue_push(cheevo->description, 0, 3 * 60, false, NULL,
@@ -867,7 +874,8 @@ static void rcheevos_assign_leaderboard_tracker_ids(rcheevos_locals_t* locals)
    unsigned tracker_id;
    char buffer[32];
 
-   for (; lboard < end; ++lboard) {
+   for (; lboard < end; ++lboard)
+   {
       if (lboard->active_tracker_id != 0xFF)
          continue;
 
@@ -875,7 +883,8 @@ static void rcheevos_assign_leaderboard_tracker_ids(rcheevos_locals_t* locals)
       if (locals->active_lboard_trackers != 0 && lboard->value_hash != 0)
       {
          scan = locals->game.leaderboards;
-         for (; scan < end; ++scan) {
+         for (; scan < end; ++scan)
+         {
             if (scan->active_tracker_id == 0 || scan->active_tracker_id == 0xFF)
                continue;
 
@@ -983,7 +992,6 @@ static void rcheevos_lboard_canceled(rcheevos_ralboard_t * lboard,
       bool widgets_ready)
 {
    const settings_t *settings = config_get_ptr();
-   char buffer[256];
    if (!lboard)
       return;
 
@@ -997,8 +1005,11 @@ static void rcheevos_lboard_canceled(rcheevos_ralboard_t * lboard,
 
    if (settings->bools.cheevos_visibility_lboard_cancel)
    {
-      snprintf(buffer, sizeof(buffer), "%s: %s",
-            msg_hash_to_str(MSG_LEADERBOARD_FAILED), lboard->title);
+      char buffer[256];
+      size_t _len = strlcpy(buffer, msg_hash_to_str(MSG_LEADERBOARD_FAILED),
+            sizeof(buffer));
+      _len += strlcpy(buffer + _len, ": ",  sizeof(buffer) - _len);
+      strlcpy(buffer + _len, lboard->title, sizeof(buffer) - _len);
       runloop_msg_queue_push(buffer, 0, 2 * 60, false, NULL,
             MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
    }
@@ -1032,12 +1043,13 @@ static void rcheevos_lboard_started(
 
    if (settings->bools.cheevos_visibility_lboard_start)
    {
+      size_t _len = strlcpy(buffer, msg_hash_to_str(MSG_LEADERBOARD_STARTED),
+            sizeof(buffer));
+      _len += strlcpy(buffer + _len, ": ", sizeof(buffer) - _len);
+      _len += strlcpy(buffer + _len, lboard->title, sizeof(buffer) - _len);
       if (lboard->description && *lboard->description)
-         snprintf(buffer, sizeof(buffer), "%s: %s - %s",
-               msg_hash_to_str(MSG_LEADERBOARD_STARTED), lboard->title, lboard->description);
-      else
-         snprintf(buffer, sizeof(buffer), "%s: %s",
-               msg_hash_to_str(MSG_LEADERBOARD_STARTED), lboard->title);
+         snprintf(buffer + _len, sizeof(buffer) - _len, "- %s",
+               lboard->description);
 
       runloop_msg_queue_push(buffer, 0, 2 * 60, false, NULL,
             MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@@ -1782,6 +1794,7 @@ void rcheevos_validate_config_settings(void)
       if (!rc_libretro_is_setting_allowed(disallowed_settings, key, val))
       {
          char buffer[128];
+         /* TODO/FIXME - localize */
          snprintf(buffer, sizeof(buffer), "Hardcore paused. Setting not allowed: %s=%s", key, val);
          CHEEVOS_LOG(RCHEEVOS_TAG "%s\n", buffer);
          rcheevos_pause_hardcore();
@@ -2344,7 +2357,8 @@ static void rcheevos_show_game_placard(void)
       if (gfx_widgets_ready())
       {
          char badge_name[32];
-         snprintf(badge_name, sizeof(badge_name), "i%s", game->badge_name);
+         size_t _len = strlcpy(badge_name, "i", sizeof(badge_name));
+         _len += strlcpy(badge_name + _len, game->badge_name, sizeof(badge_name) - _len);
          gfx_widgets_push_achievement(game->title, msg, badge_name);
       }
       else
@@ -2407,12 +2421,13 @@ static void rcheevos_client_login_callback(int result,
    const char* error_message, rc_client_t* client, void* userdata)
 {
    const rc_client_user_t* user;
-   char msg[256] = "";
 
    if (result != RC_OK)
    {
-      snprintf(msg, sizeof(msg), "RetroAchievements login failed: %s",
-         error_message);
+      char msg[256];
+      size_t _len = strlcpy(msg, "RetroAchievements login failed: ",
+            sizeof(msg));
+      _len += strlcpy(msg + _len, error_message, sizeof(msg) - _len);
       CHEEVOS_LOG(RCHEEVOS_TAG "%s\n", msg);
       runloop_msg_queue_push(msg, 0, 2 * 60, false, NULL,
          MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
@@ -2444,6 +2459,7 @@ static void rcheevos_client_login_callback(int result,
       if (settings->bools.cheevos_visibility_account)
       {
          /* TODO/FIXME - localize */
+         char msg[256];
          snprintf(msg, sizeof(msg),
             "RetroAchievements: Logged in as \"%s\".",
             user->display_name);
@@ -2595,9 +2611,9 @@ void rcheevos_show_mastery_placard(void)
 #if defined (HAVE_GFX_WIDGETS)
       if (gfx_widgets_ready())
       {
+         char msg[128];
          const bool content_runtime_log      = settings->bools.content_runtime_log;
          const bool content_runtime_log_aggr = settings->bools.content_runtime_log_aggregate;
-         char msg[128];
          size_t len = strlcpy(msg, rcheevos_locals.displayname, sizeof(msg));
 
          if (len < sizeof(msg) - 12 &&
diff --git a/config.def.h b/config.def.h
index ba04fd8a961d..df67372ef1e7 100644
--- a/config.def.h
+++ b/config.def.h
@@ -69,6 +69,14 @@
 #define DEFAULT_ASPECT_RATIO 1.3333f
 #endif
 
+#define DEFAULT_VIEWPORT_BIAS_X 0.5
+#define DEFAULT_VIEWPORT_BIAS_Y 0.5
+
+#if defined(RARCH_MOBILE)
+#define DEFAULT_VIEWPORT_BIAS_PORTRAIT_X 0.5
+#define DEFAULT_VIEWPORT_BIAS_PORTRAIT_Y 0.0
+#endif
+
 #if defined(GEKKO)
 #define DEFAULT_MOUSE_SCALE 1
 #endif
diff --git a/configuration.c b/configuration.c
index 2371165abf6d..8335986000b9 100644
--- a/configuration.c
+++ b/configuration.c
@@ -1769,6 +1769,8 @@ static struct config_bool_setting *populate_settings_bool(
    SETTING_BOOL("location_allow",                &settings->bools.location_allow, true, false, false);
    SETTING_BOOL("cloud_sync_enable",             &settings->bools.cloud_sync_enable, true, false, false);
    SETTING_BOOL("cloud_sync_destructive",        &settings->bools.cloud_sync_destructive, true, false, false);
+   SETTING_BOOL("cloud_sync_sync_saves",         &settings->bools.cloud_sync_sync_saves, true, true, false);
+   SETTING_BOOL("cloud_sync_sync_configs",       &settings->bools.cloud_sync_sync_configs, true, true, false);
    SETTING_BOOL("discord_allow",                 &settings->bools.discord_enable, true, false, false);
 #ifdef HAVE_MIST
    SETTING_BOOL("steam_rich_presence_enable",    &settings->bools.steam_rich_presence_enable, true, false, false);
@@ -2255,6 +2257,12 @@ static struct config_float_setting *populate_settings_float(
 #endif
 
    SETTING_FLOAT("video_aspect_ratio",           &settings->floats.video_aspect_ratio, true, DEFAULT_ASPECT_RATIO, false);
+   SETTING_FLOAT("video_viewport_bias_x",        &settings->floats.video_viewport_bias_x, true, DEFAULT_VIEWPORT_BIAS_X, false);
+   SETTING_FLOAT("video_viewport_bias_y",        &settings->floats.video_viewport_bias_y, true, DEFAULT_VIEWPORT_BIAS_Y, false);
+#if defined(RARCH_MOBILE)
+   SETTING_FLOAT("video_viewport_bias_portrait_x", &settings->floats.video_viewport_bias_portrait_x, true, DEFAULT_VIEWPORT_BIAS_PORTRAIT_X, false);
+   SETTING_FLOAT("video_viewport_bias_portrait_y", &settings->floats.video_viewport_bias_portrait_y, true, DEFAULT_VIEWPORT_BIAS_PORTRAIT_Y, false);
+#endif
    SETTING_FLOAT("video_refresh_rate",           &settings->floats.video_refresh_rate, true, DEFAULT_REFRESH_RATE, false);
    SETTING_FLOAT("video_autoswitch_pal_threshold", &settings->floats.video_autoswitch_pal_threshold, true, DEFAULT_AUTOSWITCH_PAL_THRESHOLD, false);
    SETTING_FLOAT("crt_video_refresh_rate",       &settings->floats.crt_video_refresh_rate, true, DEFAULT_CRT_REFRESH_RATE, false);
diff --git a/configuration.h b/configuration.h
index 0d67a825fff5..e027903a8dbc 100644
--- a/configuration.h
+++ b/configuration.h
@@ -375,6 +375,12 @@ typedef struct settings
    {
       float placeholder;
       float video_aspect_ratio;
+      float video_viewport_bias_x;
+      float video_viewport_bias_y;
+#if defined(RARCH_MOBILE)
+      float video_viewport_bias_portrait_x;
+      float video_viewport_bias_portrait_y;
+#endif
       float video_refresh_rate;
       float video_autoswitch_pal_threshold;
       float crt_video_refresh_rate;
@@ -954,6 +960,8 @@ typedef struct settings
       /* Cloud Sync */
       bool cloud_sync_enable;
       bool cloud_sync_destructive;
+      bool cloud_sync_sync_saves;
+      bool cloud_sync_sync_configs;
 
       /* Misc. */
       bool discord_enable;
diff --git a/core_info.c b/core_info.c
index faa4b5bde076..b2c24be931f6 100644
--- a/core_info.c
+++ b/core_info.c
@@ -261,8 +261,8 @@ static bool CCJSONStringHandler(void *context,
 {
    CCJSONContext *pCtx = (CCJSONContext*)context;
 
-   if (     pCtx->current_string_val 
-         && length 
+   if (     pCtx->current_string_val
+         && length
          && !string_is_empty(pValue))
    {
       if (*pCtx->current_string_val)
@@ -273,7 +273,7 @@ static bool CCJSONStringHandler(void *context,
       {
          if (*pCtx->current_string_list_val)
             string_list_free(*pCtx->current_string_list_val);
-         *pCtx->current_string_list_val = 
+         *pCtx->current_string_list_val =
             string_split(*pCtx->current_string_val, "|");
       }
    }
@@ -315,7 +315,7 @@ static bool CCJSONStartObjectHandler(void *context)
 
    pCtx->object_depth++;
 
-   if (     (pCtx->object_depth == 1) 
+   if (     (pCtx->object_depth == 1)
          && (pCtx->array_depth  == 0))
    {
       if (pCtx->core_info_cache_list)
@@ -323,7 +323,7 @@ static bool CCJSONStartObjectHandler(void *context)
       if (!(pCtx->core_info_cache_list = core_info_cache_list_new()))
          return false;
    }
-   else if ((pCtx->object_depth == 2) 
+   else if ((pCtx->object_depth == 2)
          && (pCtx->array_depth  == 1))
    {
       if (pCtx->core_info)
@@ -341,7 +341,7 @@ static bool CCJSONStartObjectHandler(void *context)
       pCtx->core_info->savestate_support_level =
             CORE_INFO_SAVESTATE_DETERMINISTIC;
    }
-   else if ((pCtx->object_depth == 3) 
+   else if ((pCtx->object_depth == 3)
          && (pCtx->array_depth  == 2))
    {
       if (pCtx->to_firmware)
@@ -349,7 +349,7 @@ static bool CCJSONStartObjectHandler(void *context)
          size_t new_idx            = pCtx->core_info->firmware_count;
          core_info_firmware_t *tmp = (core_info_firmware_t*)
                realloc(pCtx->core_info->firmware,
-                      (pCtx->core_info->firmware_count + 1) 
+                      (pCtx->core_info->firmware_count + 1)
                      * sizeof(core_info_firmware_t));
 
          if (!tmp)
@@ -372,7 +372,7 @@ static bool CCJSONEndObjectHandler(void *context)
 {
    CCJSONContext *pCtx = (CCJSONContext*)context;
 
-   if (     (pCtx->object_depth == 2) 
+   if (     (pCtx->object_depth == 2)
          && (pCtx->array_depth  == 1)
          && (pCtx->core_info))
    {
@@ -381,7 +381,7 @@ static bool CCJSONEndObjectHandler(void *context)
       free(pCtx->core_info);
       pCtx->core_info = NULL;
    }
-   else if ((pCtx->object_depth == 3) 
+   else if ((pCtx->object_depth == 3)
          && (pCtx->array_depth == 1))
       pCtx->to_core_file_id = false;
 
@@ -465,7 +465,7 @@ static void core_info_copy(core_info_t *src, core_info_t *dst)
          dst->firmware_count = 0;
    }
 
-   dst->core_file_id.str              = src->core_file_id.str 
+   dst->core_file_id.str              = src->core_file_id.str
       ? strdup(src->core_file_id.str) : NULL;
    dst->core_file_id.hash             = src->core_file_id.hash;
 
@@ -670,7 +670,7 @@ static void core_info_cache_add(
 #ifdef HAVE_CORE_INFO_CACHE
 static core_info_cache_list_t *core_info_cache_list_new(void)
 {
-   core_info_cache_list_t *core_info_cache_list = 
+   core_info_cache_list_t *core_info_cache_list =
       (core_info_cache_list_t *)malloc(sizeof(*core_info_cache_list));
    if (!core_info_cache_list)
       return NULL;
@@ -765,8 +765,8 @@ static core_info_cache_list_t *core_info_cache_read(const char *info_dir)
       RARCH_WARN("[Core Info]: Error: Invalid JSON at line %d, column %d - %s.\n",
             (int)rjson_get_source_line(parser),
             (int)rjson_get_source_column(parser),
-            (*rjson_get_error(parser) 
-             ? rjson_get_error(parser) 
+            (*rjson_get_error(parser)
+             ? rjson_get_error(parser)
              : "format error"));
 
       /* Info cache is corrupt - discard it */
@@ -1368,7 +1368,7 @@ static core_path_list_t *core_info_path_list_new(const char *core_dir,
          calloc(1, sizeof(*path_list->standalone_exempt_list));
 
    if (   !path_list->dir_list
-       || !path_list->core_list 
+       || !path_list->core_list
        || !path_list->lock_list
        || !path_list->standalone_exempt_list)
       goto error;
@@ -1421,7 +1421,7 @@ static core_path_list_t *core_info_path_list_new(const char *core_dir,
                sizeof(*path_list->standalone_exempt_list->list));
 
    if (   !path_list->core_list->list
-       || !path_list->lock_list->list 
+       || !path_list->lock_list->list
        || !path_list->standalone_exempt_list->list)
       goto error;
 
@@ -1899,12 +1899,13 @@ static void core_info_list_resolve_all_extensions(
 
    for (i = 0; i < core_info_list->count; i++)
    {
+      size_t _len;
       if (!core_info_list->list[i].supported_extensions)
          continue;
 
-      strlcat(core_info_list->all_ext,
+      _len = strlcat(core_info_list->all_ext,
             core_info_list->list[i].supported_extensions, all_ext_len);
-      strlcat(core_info_list->all_ext, "|", all_ext_len);
+      strlcpy(core_info_list->all_ext + _len, "|", all_ext_len - _len);
    }
 #ifdef HAVE_7ZIP
    strlcat(core_info_list->all_ext, "7z|", all_ext_len);
@@ -2336,8 +2337,8 @@ bool core_info_init_list(
    core_info_state_t *p_coreinfo          = &core_info_st;
    if (!(p_coreinfo->curr_list            = core_info_list_new(
                dir_cores,
-               !string_is_empty(path_info) 
-               ? path_info 
+               !string_is_empty(path_info)
+               ? path_info
                : dir_cores,
                exts,
                dir_show_hidden_files,
@@ -2481,7 +2482,7 @@ void core_info_list_get_supported_cores(core_info_list_t *core_info_list,
  *
  * e.g.:
  *   snes9x_libretro.dll and snes9x_libretro_android.so are matched
- *   snes9x__2005_libretro.dll and snes9x_libretro_android.so are 
+ *   snes9x__2005_libretro.dll and snes9x_libretro_android.so are
  *   NOT matched
  */
 bool core_info_core_file_id_is_equal(const char *core_path_a,
@@ -2594,7 +2595,7 @@ bool core_info_list_get_display_name(
    info = core_info_find_internal(
          core_info_list, core_path);
 
-   if (   s 
+   if (   s
        && info
        && !string_is_empty(info->display_name))
    {
@@ -2613,7 +2614,7 @@ bool core_info_list_get_display_name(
 core_updater_info_t *core_info_get_core_updater_info(
       const char *info_path)
 {
-   struct config_entry_list 
+   struct config_entry_list
       *entry                 = NULL;
    bool tmp_bool             = false;
    core_updater_info_t *info = NULL;
@@ -2705,7 +2706,7 @@ static int core_info_qsort_func_display_name(const core_info_t *a,
 {
    if (     !a
          || !b
-         || string_is_empty(a->display_name) 
+         || string_is_empty(a->display_name)
          || string_is_empty(b->display_name))
       return 0;
    return strcasecmp(a->display_name, b->display_name);
@@ -2716,7 +2717,7 @@ static int core_info_qsort_func_core_name(const core_info_t *a,
 {
    if (     !a
          || !b
-         || string_is_empty(a->core_name) 
+         || string_is_empty(a->core_name)
          || string_is_empty(b->core_name))
       return 0;
    return strcasecmp(a->core_name, b->core_name);
@@ -2728,7 +2729,7 @@ static int core_info_qsort_func_system_name(const core_info_t *a,
    if (
             !a
          || !b
-         || string_is_empty(a->systemname) 
+         || string_is_empty(a->systemname)
          || string_is_empty(b->systemname))
       return 0;
    return strcasecmp(a->systemname, b->systemname);
diff --git a/core_updater_list.c b/core_updater_list.c
index f7d5110b9f65..08af5e02e23f 100644
--- a/core_updater_list.c
+++ b/core_updater_list.c
@@ -330,35 +330,61 @@ bool core_updater_list_get_core(
 static bool core_updater_list_set_date(
       core_updater_list_entry_t *entry, const char *date_str)
 {
-   struct string_list date_list = {0};
+   char *tok, *save;
+   char *elem0        = NULL;
+   char *elem1        = NULL;
+   char *elem2        = NULL;
+   unsigned list_size = 0;
+   char *date_str_cpy = NULL;
 
    if (!entry || string_is_empty(date_str))
-      goto error;
+      return false;
+
+   date_str_cpy = strdup(date_str);
 
    /* Split date string into component values */
-   string_list_initialize(&date_list);
-   if (!string_split_noalloc(&date_list, date_str, "-"))
-         goto error;
+   if ((tok = strtok_r(date_str_cpy, "-", &save)))
+   {
+      elem0 = strdup(tok);
+      list_size++;
+   }
+   if ((tok = strtok_r(NULL, "-", &save)))
+   {
+      elem1 = strdup(tok);
+      list_size++;
+   }
+   if ((tok = strtok_r(NULL, "-", &save)))
+   {
+      elem2 = strdup(tok);
+      list_size++;
+   }
+   free(date_str_cpy);
 
    /* Date string must have 3 values:
     * [year] [month] [day] */
-   if (date_list.size < 3)
-      goto error;
+   if (list_size < 3)
+   {
+      if (elem0)
+         free(elem0);
+      if (elem1)
+         free(elem1);
+      if (elem2)
+         free(elem2);
+
+      return false;
+   }
 
    /* Convert date string values */
-   entry->date.year  = string_to_unsigned(date_list.elems[0].data);
-   entry->date.month = string_to_unsigned(date_list.elems[1].data);
-   entry->date.day   = string_to_unsigned(date_list.elems[2].data);
+   entry->date.year  = string_to_unsigned(elem0);
+   entry->date.month = string_to_unsigned(elem1);
+   entry->date.day   = string_to_unsigned(elem2);
 
    /* Clean up */
-   string_list_deinitialize(&date_list);
+   free(elem0);
+   free(elem1);
+   free(elem2);
 
    return true;
-
-error:
-   string_list_deinitialize(&date_list);
-
-   return false;
 }
 
 /* Parses crc string and adds value to
@@ -656,32 +682,13 @@ static void core_updater_list_add_entry(
       const char *path_dir_libretro,
       const char *path_libretro_info,
       const char *network_buildbot_url,
-      struct string_list *network_core_entry_list)
+      const char *date_str,
+      const char *crc_str,
+      const char *filename_str)
 {
-   const char *date_str                          = NULL;
-   const char *crc_str                           = NULL;
-   const char *filename_str                      = NULL;
    const core_updater_list_entry_t *search_entry = NULL;
    core_updater_list_entry_t entry               = {0};
 
-   if (!core_list || !network_core_entry_list)
-      goto error;
-
-   /* > Listings must have 3 entries:
-    *   [date] [crc] [filename] */
-   if (network_core_entry_list->size < 3)
-      goto error;
-
-   /* Get handles of the individual listing strings */
-   date_str     = network_core_entry_list->elems[0].data;
-   crc_str      = network_core_entry_list->elems[1].data;
-   filename_str = network_core_entry_list->elems[2].data;
-
-   if (   string_is_empty(date_str)
-       || string_is_empty(crc_str)
-       || string_is_empty(filename_str))
-      goto error;
-
    /* Check whether core file is already included
     * in the list (this is *not* an error condition,
     * it just means we can skip the current listing) */
@@ -777,13 +784,13 @@ bool core_updater_list_parse_network_data(
       const char *network_buildbot_url,
       const char *data, size_t len)
 {
-   size_t i;
-   char *data_buf                       = NULL;
-   struct string_list network_core_list = {0};
+   char *tok, *save;
+   unsigned list_size = 0;
+   char *data_buf     = NULL;
 
    /* Sanity check */
    if (!core_list || string_is_empty(data) || (len < 1))
-      goto error;
+      return false;
 
    /* We're populating a list 'from scratch' - remove
     * any existing entries */
@@ -792,55 +799,73 @@ bool core_updater_list_parse_network_data(
    /* Input data string is not terminated - have
     * to copy it to a temporary buffer... */
    if (!(data_buf = (char*)malloc((len + 1) * sizeof(char))))
-      goto error;
+      return false;
 
    memcpy(data_buf, data, len * sizeof(char));
    data_buf[len] = '\0';
 
-   /* Split network listing request into lines */
-   string_list_initialize(&network_core_list);
-   if (!string_split_noalloc(&network_core_list, data_buf, "\n"))
-      goto error;
-
-   if (network_core_list.size < 1)
-      goto error;
+   list_size     = string_count_occurrences_single_character(data_buf, '\n');
 
-   /* Temporary data buffer is no longer required */
-   free(data_buf);
-   data_buf = NULL;
+   if (list_size < 1)
+   {
+      free(data_buf);
+      return false;
+   }
 
+   /* Split network listing request into lines */
    /* Loop over lines */
-   for (i = 0; i < network_core_list.size; i++)
+   for (tok = strtok_r(data_buf, "\n", &save); tok;
+        tok = strtok_r(NULL, "\n", &save))
    {
-      struct string_list network_core_entry_list  = {0};
-      const char *line = network_core_list.elems[i].data;
+      char *tok2, *save2;
+      char *elem0      = NULL;
+      char *elem1      = NULL;
+      char *elem2      = NULL;
+      char *line_cpy   = NULL;
+      const char *line = tok;
 
       if (string_is_empty(line))
          continue;
 
-      string_list_initialize(&network_core_entry_list);
+      line_cpy = strdup(line);
+
       /* Split line into listings info components */
-      string_split_noalloc(&network_core_entry_list, line, " ");
+      if ((tok2 = strtok_r(line_cpy, " ", &save2)))
+         elem0 = strdup(tok2); /* date */
+      if ((tok2 = strtok_r(NULL, " ", &save2)))
+         elem1 = strdup(tok2); /* crc  */
+      if ((tok2 = strtok_r(NULL, " ", &save2)))
+         elem2 = strdup(tok2); /* filename */
+
+      free(line_cpy);
 
       /* Parse listings info and add to core updater
        * list */
-      core_updater_list_add_entry(
-            core_list,
-            path_dir_libretro,
-            path_libretro_info,
-            network_buildbot_url,
-            &network_core_entry_list);
+      /* > Listings must have 3 entries:
+       *   [date] [crc] [filename] */
+      if (     !string_is_empty(elem0)
+            && !string_is_empty(elem1)
+            && !string_is_empty(elem2))
+         core_updater_list_add_entry(
+               core_list,
+               path_dir_libretro,
+               path_libretro_info,
+               network_buildbot_url,
+               elem0, elem1, elem2);
 
       /* Clean up */
-      string_list_deinitialize(&network_core_entry_list);
+      free(elem0);
+      free(elem1);
+      free(elem2);
    }
 
+   /* Temporary data buffer is no longer required */
+   free(data_buf);
+   data_buf = NULL;
+
    /* Sanity check */
    if (RBUF_LEN(core_list->entries) < 1)
-      goto error;
-
-   /* Clean up */
-   string_list_deinitialize(&network_core_list);
+      return false;
 
    /* Sort completed list */
    core_updater_list_qsort(core_list);
@@ -849,14 +874,6 @@ bool core_updater_list_parse_network_data(
    core_list->type = CORE_UPDATER_LIST_TYPE_BUILDBOT;
 
    return true;
-
-error:
-   string_list_deinitialize(&network_core_list);
-
-   if (data_buf)
-      free(data_buf);
-
-   return false;
 }
 
 /* Parses a single play feature delivery core
diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c
index ee4841cf4395..cb37b99b27fe 100644
--- a/frontend/drivers/platform_ctr.c
+++ b/frontend/drivers/platform_ctr.c
@@ -79,7 +79,7 @@ static void get_first_valid_core(char* path_return, size_t len)
       {
          if (!ent)
             break;
-         if (strlen(ent->d_name) > strlen(extension) 
+         if (strlen(ent->d_name) > strlen(extension)
                && !strcmp(ent->d_name + strlen(ent->d_name) - strlen(extension), extension))
          {
             size_t _len = strlcpy(path_return, "sdmc:/retroarch/cores/", len);
@@ -244,8 +244,8 @@ static void frontend_ctr_exec(const char *path, bool should_load_game)
          is corrupt so we have to quit */
       {
          char error[PATH_MAX + 32];
-
-         snprintf(error, sizeof(error), "Can't launch core: %s", path);
+         size_t _len = strlcpy(error, "Can't launch core: ", sizeof(error));
+         strlcpy(error + _len, path, sizeof(error) - _len);
          error_and_quit(error);
       }
    }
@@ -335,7 +335,7 @@ static void ctr_check_dspfirm(void)
                {
                   size_t dspfirm_size = ptr[1];
                   ptr -= 0x40;
-                  if ((ptr + (dspfirm_size >> 2)) > 
+                  if ((ptr + (dspfirm_size >> 2)) >
                         (code_buffer + (code_size >> 2)))
                      break;
 
@@ -480,7 +480,7 @@ static void frontend_ctr_init(void* data)
 static int frontend_ctr_get_rating(void)
 {
    u8 device_model = 0xFF;
-   
+
    /*(0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL)*/
    CFGU_GetSystemModel(&device_model);
 
@@ -592,7 +592,7 @@ static void frontend_ctr_get_os(char* s, size_t len, int* major, int* minor)
 static void frontend_ctr_get_name(char* s, size_t len)
 {
    u8 device_model = 0xFF;
-   
+
    /*(0 = O3DS, 1 = O3DSXL, 2 = N3DS, 3 = 2DS, 4 = N3DSXL, 5 = N2DSXL)*/
    CFGU_GetSystemModel(&device_model);
 
diff --git a/frontend/drivers/platform_emscripten.c b/frontend/drivers/platform_emscripten.c
index 3856bdf08b4a..5c0511e35d7f 100644
--- a/frontend/drivers/platform_emscripten.c
+++ b/frontend/drivers/platform_emscripten.c
@@ -79,12 +79,10 @@ static void frontend_emscripten_get_env(int *argc, char *argv[],
 
    if (home)
    {
-      base_path[0]          = '\0';
-      user_path[0]          = '\0';
-      snprintf(base_path, sizeof(base_path),
-            "%s/retroarch", home);
-      snprintf(user_path, sizeof(user_path),
-            "%s/retroarch/userdata", home);
+      size_t _len = strlcpy(base_path, home, sizeof(base_path));
+      strlcpy(base_path + _len, "/retroarch", sizeof(base_path) - _len);
+      _len = strlcpy(user_path, home, sizeof(user_path));
+      strlcpy(user_path + _len, "/retroarch/userdata", sizeof(user_path) - _len);
    }
    else
    {
diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c
index 5a4487fa3839..47e7ebd421a3 100644
--- a/frontend/drivers/platform_win32.c
+++ b/frontend/drivers/platform_win32.c
@@ -453,7 +453,7 @@ static void frontend_win32_init(void *data)
 static void init_nvda(void)
 {
 #ifdef HAVE_DYLIB
-   if (     (g_plat_win32_flags & PLAT_WIN32_FLAG_USE_NVDA) 
+   if (     (g_plat_win32_flags & PLAT_WIN32_FLAG_USE_NVDA)
          && !nvda_lib)
    {
       if ((nvda_lib = dylib_load("nvdaControllerClient64.dll")))
@@ -750,8 +750,8 @@ static void frontend_win32_respawn(char *s, size_t len, char *args)
 {
    STARTUPINFO si;
    PROCESS_INFORMATION pi;
+   char executable_args[PATH_MAX_LENGTH];
    char executable_path[PATH_MAX_LENGTH] = {0};
-   char executable_args[PATH_MAX_LENGTH] = {0};
 
    if (win32_fork_mode != FRONTEND_FORK_RESTART)
       return;
@@ -761,7 +761,7 @@ static void frontend_win32_respawn(char *s, size_t len, char *args)
    path_set(RARCH_PATH_CORE, executable_path);
 
    /* Remove executable path from arguments given to CreateProcess */
-   snprintf(executable_args, sizeof(executable_args), "%s", strstr(args, ".exe") + 4);
+   strlcpy(executable_args, strstr(args, ".exe") + 4, sizeof(executable_args));
 
    memset(&si, 0, sizeof(si));
    si.cb = sizeof(si);
@@ -853,7 +853,7 @@ static const char *accessibility_win_language_id(const char* language)
       return "412";
    else if (string_is_equal(language,"pl"))
       return "415";
-   else if (string_is_equal(language,"cs")) 
+   else if (string_is_equal(language,"cs"))
       return "405";
    return "";
 }
@@ -966,12 +966,12 @@ static bool create_win32_process(char* cmd, const char * input)
       size_t input_len = strlen(input);
       if (!CreatePipe(&rd, &wr, NULL, input_len))
          return false;
-      
+
       SetHandleInformation(rd, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
-      
+
       WriteFile(wr, input, input_len, &dummy, NULL);
       CloseHandle(wr);
-      
+
       si.dwFlags    |= STARTF_USESTDHANDLES;
       si.hStdInput   = rd;
       si.hStdOutput  = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -1006,7 +1006,7 @@ static bool is_narrator_running_windows(void)
    {
       long res = nvdaController_testIfRunning_func();
 
-      if (res != 0) 
+      if (res != 0)
       {
          /* The running nvda service wasn't found, so revert
             back to the powershell method
@@ -1057,7 +1057,7 @@ static bool accessibility_speak_windows(int speed,
 #ifdef HAVE_NVDA
    init_nvda();
 #endif
-   
+
    if (g_plat_win32_flags & PLAT_WIN32_FLAG_USE_POWERSHELL)
    {
       const char * template_lang = "powershell.exe -NoProfile -WindowStyle Hidden -Command \"Add-Type -AssemblyName System.Speech; $synth = New-Object System.Speech.Synthesis.SpeechSynthesizer; $synth.SelectVoice(\\\"%s\\\"); $synth.Rate = %s; $synth.Speak($input);\"";
@@ -1079,7 +1079,7 @@ static bool accessibility_speak_windows(int speed,
       wchar_t        *wc = utf8_to_utf16_string_alloc(speak_text);
       long res           = nvdaController_testIfRunning_func();
 
-      if (!wc || res != 0) 
+      if (!wc || res != 0)
       {
          RARCH_ERR("Error communicating with NVDA\n");
          if (wc)
diff --git a/frontend/drivers/platform_xdk.c b/frontend/drivers/platform_xdk.c
index fbe04b3b3eca..3ccfb75f6de0 100644
--- a/frontend/drivers/platform_xdk.c
+++ b/frontend/drivers/platform_xdk.c
@@ -269,7 +269,7 @@ static void frontend_xdk_exec(const char *path, bool should_load_content)
    memset(&ptr, 0, sizeof(ptr));
 
    if (should_load_content && !path_is_empty(RARCH_PATH_CONTENT))
-      snprintf((char*)ptr.Data, sizeof(ptr.Data), "%s", path_get(RARCH_PATH_CONTENT));
+      strlcpy((char*)ptr.Data, path_get(RARCH_PATH_CONTENT), sizeof(ptr.Data));
 
    if (!string_is_empty(path))
       XLaunchNewImage(path, !string_is_empty((const char*)ptr.Data) ? &ptr : NULL);
diff --git a/frontend/frontend_driver.c b/frontend/frontend_driver.c
index 047d14218e22..2588bb3fa0fd 100644
--- a/frontend/frontend_driver.c
+++ b/frontend/frontend_driver.c
@@ -175,7 +175,7 @@ frontend_ctx_driver_t *frontend_ctx_init_first(void)
    return frontend_ctx_drivers[0];
 }
 
-bool frontend_driver_get_core_extension(char *s, size_t len)
+size_t frontend_driver_get_core_extension(char *s, size_t len)
 {
 #ifdef HAVE_DYNAMIC
 
@@ -184,7 +184,7 @@ bool frontend_driver_get_core_extension(char *s, size_t len)
    s[1] = 'l';
    s[2] = 'l';
    s[3] = '\0';
-   return true;
+   return 3;
 #elif defined(IOS)
    s[0] = 'f';
    s[1] = 'r';
@@ -196,7 +196,7 @@ bool frontend_driver_get_core_extension(char *s, size_t len)
    s[7] = 'r';
    s[8] = 'k';
    s[9] = '\0';
-   return true;
+   return 9;
 #elif defined(__APPLE__) || defined(__MACH__)
    s[0] = 'd';
    s[1] = 'y';
@@ -204,12 +204,12 @@ bool frontend_driver_get_core_extension(char *s, size_t len)
    s[3] = 'i';
    s[4] = 'b';
    s[5] = '\0';
-   return true;
+   return 5;
 #else
    s[0] = 's';
    s[1] = 'o';
    s[2] = '\0';
-   return true;
+   return 2;
 #endif
 
 #else
@@ -219,76 +219,60 @@ bool frontend_driver_get_core_extension(char *s, size_t len)
    s[1] = 'b';
    s[2] = 'p';
    s[3] = '\0';
-   return true;
+   return 3;
 #elif defined(ORBIS) || defined(VITA) || defined(__PS3__)
-   strlcpy(s, "self|bin", len);
-   return true;
+   return strlcpy(s, "self|bin", len);
 #elif defined(PS2)
    s[0] = 'e';
    s[1] = 'l';
    s[2] = 'f';
    s[3] = '\0';
-   return true;
+   return 3;
 #elif defined(_XBOX1)
    s[0] = 'x';
    s[1] = 'b';
    s[2] = 'e';
    s[3] = '\0';
-   return true;
+   return 3;
 #elif defined(_XBOX360)
    s[0] = 'x';
    s[1] = 'e';
    s[2] = 'x';
    s[3] = '\0';
-   return true;
+   return 3;
 #elif defined(GEKKO)
    s[0] = 'd';
    s[1] = 'o';
    s[2] = 'l';
    s[3] = '\0';
-   return true;
+   return 3;
 #elif defined(HW_WUP)
-   strlcpy(s, "rpx|elf", len);
-   return true;
+   return strlcpy(s, "rpx|elf", len);
 #elif defined(__linux__)
    s[0] = 'e';
    s[1] = 'l';
    s[2] = 'f';
    s[3] = '\0';
-   return true;
+   return 3;
 #elif defined(HAVE_LIBNX)
    s[0] = 'n';
    s[1] = 'r';
    s[2] = 'o';
    s[3] = '\0';
-   return true;
+   return 3;
 #elif defined(DJGPP)
    s[0] = 'e';
    s[1] = 'x';
    s[2] = 'e';
    s[3] = '\0';
-   return true;
+   return 3;
 #elif defined(_3DS)
    if (envIsHomebrew())
-   {
-      s[0] = '3';
-      s[1] = 'd';
-      s[2] = 's';
-      s[3] = 'x';
-      s[4] = '\0';
-   }
-   else
-   {
-      s[0] = 'c';
-      s[1] = 'i';
-      s[2] = 'a';
-      s[3] = '\0';
-   }
-   return true;
+      return strlcpy(s, "3dsx", len);
+   return strlcpy(s, "cia", len);
 #else
-   return false;
+   return 0;
 #endif
-
 #endif
 }
 
@@ -401,7 +385,7 @@ void frontend_driver_init_first(void *args)
    frontend_st->current_frontend_ctx = (frontend_ctx_driver_t*)
       frontend_ctx_init_first();
 
-   if (     frontend_st->current_frontend_ctx 
+   if (     frontend_st->current_frontend_ctx
          && frontend_st->current_frontend_ctx->init)
       frontend_st->current_frontend_ctx->init(args);
 }
@@ -586,15 +570,15 @@ void frontend_driver_attach_console(void)
 {
    /* TODO/FIXME - the frontend driver code is garbage and needs to be
       redesigned. Apparently frontend_driver_attach_console can be called
-      BEFORE frontend_driver_init_first is called, hence why we need 
-      to resort to the check for non-NULL below. This is just awful, 
-      BEFORE we make any frontend function call, we should be 100% 
+      BEFORE frontend_driver_init_first is called, hence why we need
+      to resort to the check for non-NULL below. This is just awful,
+      BEFORE we make any frontend function call, we should be 100%
       sure frontend_driver_init_first has already been called first.
 
       For now, we do this hack, but this absolutely should be redesigned
       as soon as possible.
     */
-   if (     frontend_driver_st.current_frontend_ctx 
+   if (     frontend_driver_st.current_frontend_ctx
          && frontend_driver_st.current_frontend_ctx->attach_console)
       frontend_driver_st.current_frontend_ctx->attach_console();
 }
diff --git a/frontend/frontend_driver.h b/frontend/frontend_driver.h
index 3278fedefa56..79d63c0a22ae 100644
--- a/frontend/frontend_driver.h
+++ b/frontend/frontend_driver.h
@@ -177,7 +177,7 @@ void frontend_driver_exitspawn(char *s, size_t len, char *args);
 
 bool frontend_driver_has_fork(void);
 
-bool frontend_driver_get_core_extension(char *s, size_t len);
+size_t frontend_driver_get_core_extension(char *s, size_t len);
 
 bool frontend_driver_get_salamander_basename(char *s, size_t len);
 
diff --git a/gfx/common/d3d9_common.c b/gfx/common/d3d9_common.c
index a0fc7ce6d221..c1820fd2db6f 100644
--- a/gfx/common/d3d9_common.c
+++ b/gfx/common/d3d9_common.c
@@ -1316,74 +1316,35 @@ void d3d9_calculate_rect(d3d9_video_t *d3d,
 {
    float device_aspect   = (float)*width / *height;
    settings_t *settings  = config_get_ptr();
-   bool scale_integer    = settings->bools.video_scale_integer;
+   bool video_scale_integer    = settings->bools.video_scale_integer;
+   struct video_viewport vp;
 
    video_driver_get_size(width, height);
 
-   *x                   = 0;
-   *y                   = 0;
+   vp.x = 0;
+   vp.y = 0;
+   vp.width = *width;
+   vp.height = *height;
+   vp.full_width = *width;
+   vp.full_height = *height;
 
-   if (scale_integer && !force_full)
+   if (video_scale_integer && !force_full)
    {
-      struct video_viewport vp;
-
-      vp.x                        = 0;
-      vp.y                        = 0;
-      vp.width                    = 0;
-      vp.height                   = 0;
-      vp.full_width               = 0;
-      vp.full_height              = 0;
-
       video_viewport_get_scaled_integer(&vp,
             *width,
             *height,
             video_driver_get_aspect_ratio(),
-            d3d->keep_aspect);
-
-      *x                          = vp.x;
-      *y                          = vp.y;
-      *width                      = vp.width;
-      *height                     = vp.height;
+            d3d->keep_aspect,
+            true);
    }
    else if (d3d->keep_aspect && !force_full)
    {
-      float desired_aspect = video_driver_get_aspect_ratio();
-
-#if defined(HAVE_MENU)
-      if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         video_viewport_t *custom_vp = &settings->video_viewport_custom;
-         *x                          = custom_vp->x;
-         *y                          = custom_vp->y;
-         *width                      = custom_vp->width;
-         *height                     = custom_vp->height;
-      }
-      else
-#endif
-      {
-         float delta;
-
-         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta        = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
-            *x           = (int)(roundf(*width * (0.5f - delta)));
-            *width       = (unsigned)(roundf(2.0f * (*width) * delta));
-         }
-         else
-         {
-            delta        = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
-            *y           = (int)(roundf(*height * (0.5f - delta)));
-            *height      = (unsigned)(roundf(2.0f * (*height) * delta));
-         }
-      }
+      video_viewport_get_scaled_aspect(&vp, *width, *height, true);
    }
+   *x                          = vp.x;
+   *y                          = vp.y;
+   *width                      = vp.width;
+   *height                     = vp.height;
 }
 
 void d3d9_set_rotation(void *data, unsigned rot)
diff --git a/gfx/common/win32_common.c b/gfx/common/win32_common.c
index 83d54348b672..2740460ddb68 100644
--- a/gfx/common/win32_common.c
+++ b/gfx/common/win32_common.c
@@ -987,6 +987,8 @@ static LRESULT CALLBACK wnd_proc_common(
                mod |= RETROKMOD_CAPSLOCK;
             if (GetKeyState(VK_SCROLL)  & 0x81)
                mod |= RETROKMOD_SCROLLOCK;
+            if (GetKeyState(VK_NUMLOCK) & 0x81)
+               mod |= RETROKMOD_NUMLOCK;
             if ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x80)
                mod |= RETROKMOD_META;
 
@@ -1111,6 +1113,8 @@ static LRESULT CALLBACK wnd_proc_common_internal(HWND hwnd,
                mod |= RETROKMOD_CAPSLOCK;
             if (GetKeyState(VK_SCROLL)  & 0x81)
                mod |= RETROKMOD_SCROLLOCK;
+            if (GetKeyState(VK_NUMLOCK) & 0x81)
+               mod |= RETROKMOD_NUMLOCK;
             if ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x80)
                mod |= RETROKMOD_META;
 
@@ -1369,6 +1373,8 @@ static LRESULT CALLBACK wnd_proc_common_dinput_internal(HWND hwnd,
                mod |= RETROKMOD_CAPSLOCK;
             if (GetKeyState(VK_SCROLL)  & 0x81)
                mod |= RETROKMOD_SCROLLOCK;
+            if (GetKeyState(VK_NUMLOCK) & 0x81)
+               mod |= RETROKMOD_NUMLOCK;
             if ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x80)
                mod |= RETROKMOD_META;
 
diff --git a/gfx/common/x11_common.c b/gfx/common/x11_common.c
index 5d1a3b18c6d8..69f9bdefa657 100644
--- a/gfx/common/x11_common.c
+++ b/gfx/common/x11_common.c
@@ -204,6 +204,28 @@ void x11_set_window_attr(Display *dpy, Window win)
    x11_set_window_pid(dpy, win);
 }
 
+#ifdef HAVE_XSCRNSAVER
+#include <X11/extensions/scrnsaver.h>
+static bool xss_screensaver_inhibit(Display *dpy, bool enable)
+{
+    int dummy, min, maj;
+    if (!XScreenSaverQueryExtension(dpy, &dummy, &dummy) ||
+        !XScreenSaverQueryVersion(dpy, &maj, &min) ||
+            maj < 1 || (maj == 1 && min < 1)) {
+            return false;
+        }
+    XScreenSaverSuspend(dpy, enable);
+    XResetScreenSaver(dpy);
+    return true;
+}
+#else
+static bool xss_screensaver_inhibit(Display *dpy, bool enable)
+{
+    (void) dpy;
+    return false;
+}
+#endif
+
 static void xdg_screensaver_inhibit(Window wnd)
 {
    int  ret;
@@ -253,9 +275,11 @@ bool x11_suspend_screensaver(void *data, bool enable)
     if (dbus_suspend_screensaver(enable))
        return true;
 #endif
-    if (enable)
-       if (xdg_screensaver_available)
+    if (!xss_screensaver_inhibit(g_x11_dpy, enable) && enable)
+       if (xdg_screensaver_available) {
           xdg_screensaver_inhibit(wnd);
+          return xdg_screensaver_available;
+       }
     return true;
 }
 
@@ -571,6 +595,8 @@ static void x11_handle_key_event(unsigned keycode, XEvent *event,
       mod |= RETROKMOD_ALT;
    if (state & Mod2Mask)
       mod |= RETROKMOD_NUMLOCK;
+   if (state & Mod3Mask)
+      mod |= RETROKMOD_SCROLLOCK;
    if (state & Mod4Mask)
       mod |= RETROKMOD_META;
 
@@ -645,6 +671,8 @@ bool x11_alive(void *data)
                case 5: /* Scroll down */
                case 6: /* Scroll wheel left */
                case 7: /* Scroll wheel right */
+               case 8: /* Mouse button 4 */
+               case 9: /* Mouse button 5 */
                   x_input_poll_wheel(&event.xbutton, true);
                   break;
             }
@@ -659,6 +687,13 @@ bool x11_alive(void *data)
             break;
 
          case ButtonRelease:
+            switch (event.xbutton.button)
+            {
+               case 8: /* Mouse button 4 - not handled as click */
+               case 9: /* Mouse button 5 - not handled as click */
+                  x_input_poll_wheel(&event.xbutton, true);
+                  break;
+            }
             break;
 
          case KeyRelease:
diff --git a/gfx/display_servers/dispserv_kms.c b/gfx/display_servers/dispserv_kms.c
index c42f5c0ac3be..086b4631cd94 100644
--- a/gfx/display_servers/dispserv_kms.c
+++ b/gfx/display_servers/dispserv_kms.c
@@ -123,6 +123,8 @@ static void *kms_display_server_get_resolution_list(
    unsigned curr_width               = 0;
    unsigned curr_height              = 0;
    unsigned curr_bpp                 = 0;
+   bool curr_interlaced              = false;
+   bool curr_dblscan                 = false;
    float curr_refreshrate            = 0;
    unsigned curr_orientation         = 0;
    struct video_display_config *conf = NULL;
@@ -134,6 +136,8 @@ static void *kms_display_server_get_resolution_list(
       curr_width       = g_drm_mode->hdisplay;
       curr_height      = g_drm_mode->vdisplay;
       curr_bpp         = 32;
+      curr_interlaced  = (g_drm_mode->flags & DRM_MODE_FLAG_INTERLACE) ? true : false;
+      curr_dblscan     = (g_drm_mode->flags & DRM_MODE_FLAG_DBLSCAN)   ? true : false;
    }
 
    *len = g_drm_connector->count_modes;
@@ -147,13 +151,18 @@ static void *kms_display_server_get_resolution_list(
       conf[j].height      = g_drm_connector->modes[i].vdisplay;
       conf[j].bpp         = 32;
       conf[j].refreshrate = floor(drm_calc_refresh_rate(&g_drm_connector->modes[i]));
+      conf[j].refreshrate_float = drm_calc_refresh_rate(&g_drm_connector->modes[i]);
+      conf[j].interlaced  = (g_drm_connector->modes[i].flags & DRM_MODE_FLAG_INTERLACE) ? true : false;
+      conf[j].dblscan     = (g_drm_connector->modes[i].flags & DRM_MODE_FLAG_DBLSCAN)   ? true : false;
       conf[j].idx         = j;
       conf[j].current     = false;
 
       if (     (conf[j].width       == curr_width)
             && (conf[j].height      == curr_height)
             && (conf[j].bpp         == curr_bpp)
-            && (drm_calc_refresh_rate(&g_drm_connector->modes[i]) == curr_refreshrate)
+            && (conf[j].refreshrate_float == curr_refreshrate)
+            && (conf[j].interlaced  == curr_interlaced)
+            && (conf[j].dblscan     == curr_dblscan)
          )
          conf[j].current  = true;
       j++;
diff --git a/gfx/display_servers/dispserv_win32.c b/gfx/display_servers/dispserv_win32.c
index 0d288d305912..13fff6adecd0 100644
--- a/gfx/display_servers/dispserv_win32.c
+++ b/gfx/display_servers/dispserv_win32.c
@@ -356,6 +356,7 @@ static void *win32_display_server_get_resolution_list(
 #if _WIN32_WINNT >= 0x0500
    unsigned curr_orientation         = 0;
 #endif
+   bool curr_interlaced              = false;
    struct video_display_config *conf = NULL;
 
    if (win32_get_video_output(&dm, -1, sizeof(dm)))
@@ -366,6 +367,7 @@ static void *win32_display_server_get_resolution_list(
       curr_refreshrate               = dm.dmDisplayFrequency;
 #if _WIN32_WINNT >= 0x0500
       curr_orientation               = dm.dmDisplayOrientation;
+      curr_interlaced                = (dm.dmDisplayFlags & DM_INTERLACED) ? true : false;
 #endif
    }
 
@@ -403,13 +405,22 @@ static void *win32_display_server_get_resolution_list(
       conf[j].height      = dm.dmPelsHeight;
       conf[j].bpp         = dm.dmBitsPerPel;
       conf[j].refreshrate = dm.dmDisplayFrequency;
+      /* It may be possible to get exact refresh rate via different API - for now, it is integer only */
+      conf[j].refreshrate_float = 0.0f;
       conf[j].idx         = j;
       conf[j].current     = false;
+#if _WIN32_WINNT >= 0x0500
+      conf[j].interlaced  = (dm.dmDisplayFlags & DM_INTERLACED) ? true : false;
+#else
+      conf[j].interlaced  = false;
+#endif
+      conf[j].dblscan     = false; /* no flag for doublescan on this platform */
 
       if (     (conf[j].width       == curr_width)
             && (conf[j].height      == curr_height)
             && (conf[j].bpp         == curr_bpp)
             && (conf[j].refreshrate == curr_refreshrate)
+            && (conf[j].interlaced  == curr_interlaced)
          )
          conf[j].current  = true;
 
diff --git a/gfx/drivers/ctr_gfx.c b/gfx/drivers/ctr_gfx.c
index 9e1e3ad7100d..4c0b66da7eab 100644
--- a/gfx/drivers/ctr_gfx.c
+++ b/gfx/drivers/ctr_gfx.c
@@ -762,52 +762,14 @@ static void ctr_update_viewport(
 
    if (video_scale_integer)
    {
+      /* TODO: does CTR use top-left or bottom-left coordinates? assuming top-left. */
       video_viewport_get_scaled_integer(&ctr->vp, ctr->vp.full_width,
-            ctr->vp.full_height, desired_aspect, ctr->keep_aspect);
+          ctr->vp.full_height, desired_aspect, ctr->keep_aspect,
+          true);
    }
    else if (ctr->keep_aspect)
    {
-#if defined(HAVE_MENU)
-      if (aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         x      = custom_vp_x;
-         y      = custom_vp_y;
-         width  = custom_vp_width;
-         height = custom_vp_height;
-      }
-      else
-#endif
-      {
-         float delta;
-         float device_aspect  = ((float)ctr->vp.full_width) / ctr->vp.full_height;
-
-         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta    = (desired_aspect / device_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            x        = (int)roundf(width * (0.5f - delta));
-            width    = (unsigned)roundf(2.0f * width * delta);
-         }
-         else
-         {
-            delta    = (device_aspect / desired_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            y        = (int)roundf(height * (0.5f - delta));
-            height   = (unsigned)roundf(2.0f * height * delta);
-         }
-      }
-
-      ctr->vp.x      = x;
-      ctr->vp.y      = y;
-      ctr->vp.width  = width;
-      ctr->vp.height = height;
+      video_viewport_get_scaled_aspect(&ctr->vp, width, height, true);
    }
    else
    {
diff --git a/gfx/drivers/d3d8.c b/gfx/drivers/d3d8.c
index 1bbe7ed4c054..833ba326ca57 100644
--- a/gfx/drivers/d3d8.c
+++ b/gfx/drivers/d3d8.c
@@ -1159,6 +1159,7 @@ static void d3d8_calculate_rect(void *data,
       bool force_full,
       bool allow_rotate)
 {
+   struct video_viewport vp;
    float device_aspect       = (float)*width / *height;
    d3d8_video_t *d3d         = (d3d8_video_t*)data;
    settings_t *settings      = config_get_ptr();
@@ -1167,71 +1168,26 @@ static void d3d8_calculate_rect(void *data,
 
    video_driver_get_size(width, height);
 
-   *x                        = 0;
-   *y                        = 0;
+   vp.x           = 0;
+   vp.y           = 0;
+   vp.width       = *width;
+   vp.height      = *height;
+   vp.full_width  = *width;
+   vp.full_height = *height;
 
    if (video_scale_integer && !force_full)
-   {
-      struct video_viewport vp;
-
-      vp.x                        = 0;
-      vp.y                        = 0;
-      vp.width                    = 0;
-      vp.height                   = 0;
-      vp.full_width               = 0;
-      vp.full_height              = 0;
-
       video_viewport_get_scaled_integer(&vp,
             *width,
             *height,
             video_driver_get_aspect_ratio(),
-            d3d->keep_aspect);
-
-      *x                          = vp.x;
-      *y                          = vp.y;
-      *width                      = vp.width;
-      *height                     = vp.height;
-   }
+            d3d->keep_aspect,
+            true);
    else if (d3d->keep_aspect && !force_full)
-   {
-      float desired_aspect = video_driver_get_aspect_ratio();
-
-#if defined(HAVE_MENU)
-      if (aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         video_viewport_t *custom_vp = &settings->video_viewport_custom;
-
-         *x                          = custom_vp->x;
-         *y                          = custom_vp->y;
-         *width                      = custom_vp->width;
-         *height                     = custom_vp->height;
-      }
-      else
-#endif
-      {
-         float delta;
-
-         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta        = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
-            *x           = (int)(roundf(*width * (0.5f - delta)));
-            *width       = (unsigned)(roundf(2.0f * (*width) * delta));
-         }
-         else
-         {
-            delta        = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
-            *y           = (int)(roundf(*height * (0.5f - delta)));
-            *height      = (unsigned)(roundf(2.0f * (*height) * delta));
-         }
-      }
-   }
+      video_viewport_get_scaled_aspect(&vp, *width, *height, true);
+   *x                          = vp.x;
+   *y                          = vp.y;
+   *width                      = vp.width;
+   *height                     = vp.height;
 }
 
 static void d3d8_set_viewport(void *data,
@@ -1302,8 +1258,7 @@ static bool d3d8_initialize(d3d8_video_t *d3d, const video_info_t *info)
          IDirect3D8_Release(g_pD3D8);
          g_pD3D8 = NULL;
 
-         ret = d3d8_init_base(d3d, info);
-         if (ret)
+         if ((ret = d3d8_init_base(d3d, info)))
             RARCH_LOG("[D3D8]: Recovered from dead state.\n");
       }
 
diff --git a/gfx/drivers/gl1.c b/gfx/drivers/gl1.c
index 0c5300d691d2..5c802798ed22 100644
--- a/gfx/drivers/gl1.c
+++ b/gfx/drivers/gl1.c
@@ -1227,54 +1227,16 @@ static void gl1_set_viewport(gl1_t *gl1,
       video_viewport_get_scaled_integer(&gl1->vp,
             viewport_width, viewport_height,
             video_driver_get_aspect_ratio(),
-            gl1->flags & GL1_FLAG_KEEP_ASPECT);
+            gl1->flags & GL1_FLAG_KEEP_ASPECT, false);
       viewport_width  = gl1->vp.width;
       viewport_height = gl1->vp.height;
    }
    else if ((gl1->flags & GL1_FLAG_KEEP_ASPECT) && !force_full)
    {
-      float desired_aspect = video_driver_get_aspect_ratio();
-
-#if defined(HAVE_MENU)
-      if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         video_viewport_t *custom_vp = &settings->video_viewport_custom;
-         /* OpenGL has bottom-left origin viewport. */
-         x                           = custom_vp->x;
-         y                           = height - custom_vp->y - custom_vp->height;
-         viewport_width              = custom_vp->width;
-         viewport_height             = custom_vp->height;
-      }
-      else
-#endif
-      {
-         float delta;
-
-         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
-            x     = (int)roundf(viewport_width * (0.5f - delta));
-            viewport_width = (unsigned)roundf(2.0f * viewport_width * delta);
-         }
-         else
-         {
-            delta  = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
-            y      = (int)roundf(viewport_height * (0.5f - delta));
-            viewport_height = (unsigned)roundf(2.0f * viewport_height * delta);
-         }
-      }
-
-      gl1->vp.x      = x;
-      gl1->vp.y      = y;
-      gl1->vp.width  = viewport_width;
-      gl1->vp.height = viewport_height;
+      gl1->vp.full_height = gl1->video_height;
+      video_viewport_get_scaled_aspect2(&gl1->vp, viewport_width, viewport_height, false, device_aspect, video_driver_get_aspect_ratio());
+      viewport_width  = gl1->vp.width;
+      viewport_height = gl1->vp.height;
    }
    else
    {
@@ -1283,12 +1245,6 @@ static void gl1_set_viewport(gl1_t *gl1,
       gl1->vp.height = viewport_height;
    }
 
-#if defined(RARCH_MOBILE)
-   /* In portrait mode, we want viewport to gravitate to top of screen. */
-   if (device_aspect < 1.0f)
-      gl1->vp.y *= 2;
-#endif
-
    glViewport(gl1->vp.x, gl1->vp.y, gl1->vp.width, gl1->vp.height);
    gl1_set_projection(gl1, &gl1_default_ortho, allow_rotate);
 
diff --git a/gfx/drivers/gl2.c b/gfx/drivers/gl2.c
index 0b56132b4d67..a6c3d29693dd 100644
--- a/gfx/drivers/gl2.c
+++ b/gfx/drivers/gl2.c
@@ -1273,11 +1273,8 @@ static void gl2_set_viewport(gl2_t *gl,
       bool force_full, bool allow_rotate)
 {
    settings_t *settings     = config_get_ptr();
-   unsigned height          = gl->video_height;
-   int x                    = 0;
-   int y                    = 0;
-   float device_aspect      = (float)viewport_width / viewport_height;
-
+   float device_aspect = (float) viewport_width / (float)viewport_height;
+   
    if (gl->ctx_driver->translate_aspect)
       device_aspect         = gl->ctx_driver->translate_aspect(
             gl->ctx_data, viewport_width, viewport_height);
@@ -1287,54 +1284,17 @@ static void gl2_set_viewport(gl2_t *gl,
       video_viewport_get_scaled_integer(&gl->vp,
             viewport_width, viewport_height,
             video_driver_get_aspect_ratio(),
-            (gl->flags & GL2_FLAG_KEEP_ASPECT) ? true : false);
+            (gl->flags & GL2_FLAG_KEEP_ASPECT) ? true : false,
+            false);
       viewport_width  = gl->vp.width;
       viewport_height = gl->vp.height;
    }
    else if ((gl->flags & GL2_FLAG_KEEP_ASPECT) && !force_full)
    {
-      float desired_aspect = video_driver_get_aspect_ratio();
-
-#if defined(HAVE_MENU)
-      if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         video_viewport_t *custom_vp = &settings->video_viewport_custom;
-         /* OpenGL has bottom-left origin viewport. */
-         x                           = custom_vp->x;
-         y                           = height - custom_vp->y - custom_vp->height;
-         viewport_width              = custom_vp->width;
-         viewport_height             = custom_vp->height;
-      }
-      else
-#endif
-      {
-         float delta;
-
-         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
-            x     = (int)roundf(viewport_width * (0.5f - delta));
-            viewport_width = (unsigned)roundf(2.0f * viewport_width * delta);
-         }
-         else
-         {
-            delta  = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
-            y      = (int)roundf(viewport_height * (0.5f - delta));
-            viewport_height = (unsigned)roundf(2.0f * viewport_height * delta);
-         }
-      }
-
-      gl->vp.x      = x;
-      gl->vp.y      = y;
-      gl->vp.width  = viewport_width;
-      gl->vp.height = viewport_height;
+      gl->vp.full_height = gl->video_height;
+      video_viewport_get_scaled_aspect2(&gl->vp, viewport_width, viewport_height, false, device_aspect, video_driver_get_aspect_ratio());
+      viewport_width  = gl->vp.width;
+      viewport_height = gl->vp.height;
    }
    else
    {
@@ -1343,12 +1303,6 @@ static void gl2_set_viewport(gl2_t *gl,
       gl->vp.height = viewport_height;
    }
 
-#if defined(RARCH_MOBILE)
-   /* In portrait mode, we want viewport to gravitate to top of screen. */
-   if (device_aspect < 1.0f)
-      gl->vp.y *= 2;
-#endif
-
    glViewport(gl->vp.x, gl->vp.y, gl->vp.width, gl->vp.height);
    gl2_set_projection(gl, &default_ortho, allow_rotate);
 
diff --git a/gfx/drivers/gl3.c b/gfx/drivers/gl3.c
index b148061c098b..70d42a4bcdee 100644
--- a/gfx/drivers/gl3.c
+++ b/gfx/drivers/gl3.c
@@ -1385,7 +1385,6 @@ static void gl3_set_viewport(gl3_t *gl,
    settings_t *settings            = config_get_ptr();
    float device_aspect             = (float)viewport_width / viewport_height;
    bool video_scale_integer        = settings->bools.video_scale_integer;
-   unsigned video_aspect_ratio_idx = settings->uints.video_aspect_ratio_idx;
 
    if (gl->ctx_driver->translate_aspect)
       device_aspect         = gl->ctx_driver->translate_aspect(
@@ -1396,54 +1395,17 @@ static void gl3_set_viewport(gl3_t *gl,
       video_viewport_get_scaled_integer(&gl->vp,
             viewport_width, viewport_height,
             video_driver_get_aspect_ratio(),
-            (gl->flags & GL3_FLAG_KEEP_ASPECT) ? true : false);
+            (gl->flags & GL3_FLAG_KEEP_ASPECT) ? true : false,
+            false);
       viewport_width  = gl->vp.width;
       viewport_height = gl->vp.height;
    }
    else if ((gl->flags & GL3_FLAG_KEEP_ASPECT) && !force_full)
    {
-      float desired_aspect = video_driver_get_aspect_ratio();
-
-#if defined(HAVE_MENU)
-      if (video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         video_viewport_t *custom_vp = &settings->video_viewport_custom;
-         /* OpenGL has bottom-left origin viewport. */
-         x                           = custom_vp->x;
-         y                           = height - custom_vp->y - custom_vp->height;
-         viewport_width              = custom_vp->width;
-         viewport_height             = custom_vp->height;
-      }
-      else
-#endif
-      {
-         float delta;
-
-         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
-            x     = (int)roundf(viewport_width * (0.5f - delta));
-            viewport_width = (unsigned)roundf(2.0f * viewport_width * delta);
-         }
-         else
-         {
-            delta  = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
-            y      = (int)roundf(viewport_height * (0.5f - delta));
-            viewport_height = (unsigned)roundf(2.0f * viewport_height * delta);
-         }
-      }
-
-      gl->vp.x      = x;
-      gl->vp.y      = y;
-      gl->vp.width  = viewport_width;
-      gl->vp.height = viewport_height;
+      gl->vp.full_height = gl->video_height;
+      video_viewport_get_scaled_aspect2(&gl->vp, viewport_width, viewport_height, false, device_aspect, video_driver_get_aspect_ratio());
+      viewport_width  = gl->vp.width;
+      viewport_height = gl->vp.height;
    }
    else
    {
@@ -1452,12 +1414,6 @@ static void gl3_set_viewport(gl3_t *gl,
       gl->vp.height = viewport_height;
    }
 
-#if defined(RARCH_MOBILE)
-   /* In portrait mode, we want viewport to gravitate to top of screen. */
-   if (device_aspect < 1.0f)
-      gl->vp.y *= 2;
-#endif
-
    glViewport(gl->vp.x, gl->vp.y, gl->vp.width, gl->vp.height);
    gl3_set_projection(gl, &gl3_default_ortho, allow_rotate);
 
diff --git a/gfx/drivers/gx2_gfx.c b/gfx/drivers/gx2_gfx.c
index 48e9c6eca65c..b144532b50ec 100644
--- a/gfx/drivers/gx2_gfx.c
+++ b/gfx/drivers/gx2_gfx.c
@@ -923,69 +923,22 @@ static void gx2_set_projection(wiiu_video_t *wiiu)
 
 static void gx2_update_viewport(wiiu_video_t *wiiu)
 {
-   int x                           = 0;
-   int y                           = 0;
    unsigned viewport_width         = wiiu->color_buffer.surface.width;
    unsigned viewport_height        = wiiu->color_buffer.surface.height;
-   float device_aspect             = (float)viewport_width / viewport_height;
    settings_t *settings            = config_get_ptr();
    bool video_scale_integer        = settings->bools.video_scale_integer;
-   unsigned video_aspect_ratio_idx = settings->uints.video_aspect_ratio_idx;
 
    if (video_scale_integer)
    {
       video_viewport_get_scaled_integer(&wiiu->vp,
             viewport_width, viewport_height,
-            video_driver_get_aspect_ratio(), wiiu->keep_aspect);
+            video_driver_get_aspect_ratio(), wiiu->keep_aspect, true);
       viewport_width  = wiiu->vp.width;
       viewport_height = wiiu->vp.height;
    }
    else if (wiiu->keep_aspect)
    {
-      float desired_aspect = video_driver_get_aspect_ratio();
-
-#if defined(HAVE_MENU)
-      if (video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         video_viewport_t *custom_vp = &settings->video_viewport_custom;
-         /* GX2 has top-left origin viewport. */
-         x                           = custom_vp->x;
-         y                           = custom_vp->y;
-         viewport_width              = custom_vp->width;
-         viewport_height             = custom_vp->height;
-      }
-      else
-#endif
-      {
-         float delta;
-
-         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta          = (desired_aspect / device_aspect - 1.0f)
-                             / 2.0f + 0.5f;
-            x              = (int)roundf(viewport_width * (0.5f - delta));
-            viewport_width = (unsigned)roundf(2.0f * viewport_width * delta);
-         }
-         else
-         {
-            delta           = (device_aspect / desired_aspect - 1.0f)
-                              / 2.0f + 0.5f;
-            y               = (int)roundf(viewport_height * (0.5f - delta));
-            viewport_height = (unsigned)roundf(2.0f * viewport_height * delta);
-         }
-      }
-
-      wiiu->vp.x      = x;
-      wiiu->vp.y      = y;
-      wiiu->vp.width  = viewport_width;
-      wiiu->vp.height = viewport_height;
+      video_viewport_get_scaled_aspect(&wiiu->vp, viewport_width, viewport_height, true);
    }
    else
    {
diff --git a/gfx/drivers/gx_gfx.c b/gfx/drivers/gx_gfx.c
index ca2b2432c92f..c82b58915562 100644
--- a/gfx/drivers/gx_gfx.c
+++ b/gfx/drivers/gx_gfx.c
@@ -1011,58 +1011,23 @@ static void gx_resize(gx_video_t *gx,
    /* Ignore this for custom resolutions */
    if (gx->keep_aspect && gx_mode.efbHeight >= 192)
    {
+#ifdef HW_RVL
+      float device_aspect = CONF_GetAspectRatio() == CONF_ASPECT_4_3 ?
+         4.0 / 3.0 : 16.0 / 9.0;
+#else
+      float device_aspect = 4.0 / 3.0;
+#endif
       float desired_aspect = video_driver_get_aspect_ratio();
       if (desired_aspect == 0.0)
          desired_aspect    = 1.0;
       if (     (gx->orientation == ORIENTATION_VERTICAL)
             || (gx->orientation == ORIENTATION_FLIPPED_ROTATED))
          desired_aspect    = 1.0 / desired_aspect;
-
-      if (aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         video_viewport_t *custom_vp = &settings->video_viewport_custom;
-
-         if (!custom_vp->width || !custom_vp->height)
-         {
-            custom_vp->x      = 0;
-            custom_vp->y      = 0;
-            custom_vp->width  = gx->vp.full_width;
-            custom_vp->height = gx->vp.full_height;
-         }
-
-         x      = custom_vp->x;
-         y      = custom_vp->y;
-         width  = custom_vp->width;
-         height = custom_vp->height;
-      }
-      else
-      {
-         float delta;
-#ifdef HW_RVL
-         float device_aspect = CONF_GetAspectRatio() == CONF_ASPECT_4_3 ?
-            4.0 / 3.0 : 16.0 / 9.0;
-#else
-         float device_aspect = 4.0 / 3.0;
-#endif
-         if (fabs(device_aspect - desired_aspect) < 0.0001)
-         {
-            /* If the aspect ratios of screen and desired aspect ratio
-             * are sufficiently equal (floating point stuff),
-             * assume they are actually equal. */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta = (desired_aspect / device_aspect - 1.0) / 2.0 + 0.5;
-            x     = (unsigned)(width * (0.5 - delta));
-            width = (unsigned)(2.0 * width * delta);
-         }
-         else
-         {
-            delta  = (device_aspect / desired_aspect - 1.0) / 2.0 + 0.5;
-            y      = (unsigned)(height * (0.5 - delta));
-            height = (unsigned)(2.0 * height * delta);
-         }
-      }
+      video_viewport_get_scaled_aspect2(&gx->vp, width, height, true, device_aspect, desired_aspect);
+      x = gx->vp.x;
+      y = gx->vp.y;
+      width = gx->vp.width;
+      height = gx->vp.height;
    }
 
    /* Overscan correction */
diff --git a/gfx/drivers/psp1_gfx.c b/gfx/drivers/psp1_gfx.c
index 10b8ae5ae7d8..e1cb2b4dcce8 100644
--- a/gfx/drivers/psp1_gfx.c
+++ b/gfx/drivers/psp1_gfx.c
@@ -257,54 +257,15 @@ static void psp_update_viewport(psp1_video_t* psp,
    if (video_scale_integer)
    {
       video_viewport_get_scaled_integer(&psp->vp, SCEGU_SCR_WIDTH,
-            SCEGU_SCR_HEIGHT, video_driver_get_aspect_ratio(), psp->keep_aspect);
+            SCEGU_SCR_HEIGHT, video_driver_get_aspect_ratio(), psp->keep_aspect, true);
       width  = psp->vp.width;
       height = psp->vp.height;
    }
    else if (psp->keep_aspect)
    {
-#if defined(HAVE_MENU)
-      if (aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         x      = video_info->custom_vp_x;
-         y      = video_info->custom_vp_y;
-         width  = video_info->custom_vp_width;
-         height = video_info->custom_vp_height;
-      }
-      else
-#endif
-      {
-         float delta;
-         float desired_aspect = video_driver_get_aspect_ratio();
-
-         if (     (fabsf(device_aspect - desired_aspect) < 0.0001f)
-               || (fabsf((16.0/9.0)    - desired_aspect) < 0.02f))
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta = (desired_aspect / device_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            x     = (int)roundf(width * (0.5f - delta));
-            width = (unsigned)roundf(2.0f * width * delta);
-         }
-         else
-         {
-            delta  = (device_aspect / desired_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            y      = (int)roundf(height * (0.5f - delta));
-            height = (unsigned)roundf(2.0f * height * delta);
-         }
-      }
-
-      psp->vp.x      = x;
-      psp->vp.y      = y;
-      psp->vp.width  = width;
-      psp->vp.height = height;
+      video_viewport_get_scaled_aspect(&psp->vp, width, height, true);
+      width  = psp->vp.width;
+      height = psp->vp.height;
    }
    else
    {
diff --git a/gfx/drivers/rsx_gfx.c b/gfx/drivers/rsx_gfx.c
index f108c1924cee..793e53283820 100644
--- a/gfx/drivers/rsx_gfx.c
+++ b/gfx/drivers/rsx_gfx.c
@@ -996,55 +996,16 @@ static void rsx_set_viewport(void *data, unsigned viewport_width,
    {
       video_viewport_get_scaled_integer(&rsx->vp,
             viewport_width, viewport_height,
-            video_driver_get_aspect_ratio(), rsx->keep_aspect);
-      viewport_width         = rsx->vp.width;
-      viewport_height        = rsx->vp.height;
+            video_driver_get_aspect_ratio(), rsx->keep_aspect,
+            true);
+      viewport_width          = rsx->vp.width;
+      viewport_height         = rsx->vp.height;
    }
    else if (rsx->keep_aspect && !force_full)
    {
-      float desired_aspect   = video_driver_get_aspect_ratio();
-
-#if defined(HAVE_MENU)
-      if (aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         video_viewport_t *custom_vp = &settings->video_viewport_custom;
-         /* RSX/libgcm has top-left origin viewport. */
-         x                           = custom_vp->x;
-         y                           = custom_vp->y;
-         viewport_width              = custom_vp->width;
-         viewport_height             = custom_vp->height;
-      }
-      else
-#endif
-      {
-         float delta;
-         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta            = (desired_aspect / device_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            x                = (int)roundf(viewport_width * (0.5f - delta));
-            viewport_width   = (unsigned)roundf(2.0f * viewport_width * delta);
-         }
-         else
-         {
-            delta             = (device_aspect / desired_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            y                 = (int)roundf(viewport_height * (0.5f - delta));
-            viewport_height   = (unsigned)roundf(2.0f * viewport_height * delta);
-         }
-      }
-
-      rsx->vp.x               = x;
-      rsx->vp.y               = y;
-      rsx->vp.width           = viewport_width;
-      rsx->vp.height          = viewport_height;
+      video_viewport_get_scaled_aspect(&rsx->vp, viewport_width, viewport_height, true);
+      viewport_width          = rsx->vp.width;
+      viewport_height         = rsx->vp.height;
    }
    else
    {
@@ -1493,7 +1454,8 @@ static void rsx_update_viewport(rsx_t* rsx)
    if (video_scale_integer)
    {
       video_viewport_get_scaled_integer(&rsx->vp, viewport_width,
-            viewport_height, video_driver_get_aspect_ratio(), rsx->keep_aspect);
+            viewport_height, video_driver_get_aspect_ratio(), rsx->keep_aspect,
+            true);
       viewport_width         = rsx->vp.width;
       viewport_height        = rsx->vp.height;
    }
@@ -1525,16 +1487,18 @@ static void rsx_update_viewport(rsx_t* rsx)
          }
          else if (device_aspect > desired_aspect)
          {
+            float viewport_bias = settings->floats.video_viewport_bias_x;
             delta           = (desired_aspect / device_aspect - 1.0f)
                / 2.0f + 0.5f;
-            x               = (int)roundf(viewport_width * (0.5f - delta));
+            x               = (int)roundf(viewport_width * ((0.5f - delta) * (viewport_bias * 2.0f)));
             viewport_width  = (unsigned)roundf(2.0f * viewport_width * delta);
          }
          else
          {
+            float viewport_bias = 1.0 - settings->floats.video_viewport_bias_y;
             delta           = (device_aspect / desired_aspect - 1.0f)
                / 2.0f + 0.5f;
-            y               = (int)roundf(viewport_height * (0.5f - delta));
+            y               = (int)roundf(viewport_height * ((0.5f - delta) * (viewport_bias * 2.0f)));
             viewport_height = (unsigned)roundf(2.0f * viewport_height * delta);
          }
       }
diff --git a/gfx/drivers/sdl2_gfx.c b/gfx/drivers/sdl2_gfx.c
index 9168a0e77d38..150539098055 100644
--- a/gfx/drivers/sdl2_gfx.c
+++ b/gfx/drivers/sdl2_gfx.c
@@ -229,7 +229,6 @@ static void sdl_refresh_viewport(sdl2_video_t *vid)
    int win_w, win_h;
    settings_t *settings      = config_get_ptr();
    bool video_scale_integer  = settings->bools.video_scale_integer;
-   unsigned aspect_ratio_idx = settings->uints.video_aspect_ratio_idx;
 
    SDL_GetWindowSize(vid->window, &win_w, &win_h);
 
@@ -243,39 +242,10 @@ static void sdl_refresh_viewport(sdl2_video_t *vid)
    if (video_scale_integer)
       video_viewport_get_scaled_integer(&vid->vp,
             win_w, win_h, video_driver_get_aspect_ratio(),
-            vid->video.force_aspect);
-   else if (aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-   {
-      video_viewport_t *custom_vp = &settings->video_viewport_custom;
-      vid->vp.x                   = custom_vp->x;
-      vid->vp.y                   = custom_vp->y;
-      vid->vp.width               = custom_vp->width;
-      vid->vp.height              = custom_vp->height;
-   }
+            vid->video.force_aspect, true);
    else if (vid->video.force_aspect)
    {
-      float delta;
-      float device_aspect  = (float)win_w / win_h;
-      float desired_aspect = video_driver_get_aspect_ratio();
-
-      if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-      {
-         /* If the aspect ratios of screen and desired aspect ratio are
-             * sufficiently equal (floating point stuff), assume they are
-             * actually equal. */
-      }
-      else if (device_aspect > desired_aspect)
-      {
-         delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
-         vid->vp.x     = (int)roundf(win_w * (0.5f - delta));
-         vid->vp.width = (unsigned)roundf(2.0f * win_w * delta);
-      }
-      else
-      {
-         delta  = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
-         vid->vp.y      = (int)roundf(win_h * (0.5f - delta));
-         vid->vp.height = (unsigned)roundf(2.0f * win_h * delta);
-      }
+      video_viewport_get_scaled_aspect(&vid->vp, win_w, win_h, true);
    }
 
    vid->flags &= ~SDL2_FLAG_SHOULD_RESIZE;
diff --git a/gfx/drivers/switch_nx_gfx.c b/gfx/drivers/switch_nx_gfx.c
index 5a7920bec83b..c679c7ebabe6 100644
--- a/gfx/drivers/switch_nx_gfx.c
+++ b/gfx/drivers/switch_nx_gfx.c
@@ -572,50 +572,12 @@ static void switch_update_viewport(switch_video_t *sw,
 
     if (settings->bools.video_scale_integer)
     {
-        video_viewport_get_scaled_integer(&sw->vp, sw->vp.full_width, sw->vp.full_height, desired_aspect, sw->keep_aspect);
+       /* TODO: Does nx use top-left or bottom-left origin?  I'm assuming top left. */
+       video_viewport_get_scaled_integer(&sw->vp, sw->vp.full_width, sw->vp.full_height, desired_aspect, sw->keep_aspect, true);
     }
     else if (sw->keep_aspect)
     {
-#if defined(HAVE_MENU)
-        if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-        {
-            sw->vp.x = sw->vp.y = 0;
-            sw->vp.width = width;
-            sw->vp.height = height;
-        }
-        else
-#endif
-        {
-            float delta;
-            float device_aspect = ((float)sw->vp.full_width) / sw->vp.full_height;
-
-            if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-            {
-                /*
-                    * If the aspect ratios of screen and desired aspect
-                    * ratio are sufficiently equal (floating point stuff),
-                    * assume they are actually equal.
-                */
-            }
-            else if (device_aspect > desired_aspect)
-            {
-                delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
-                x = (int)roundf(width * (0.5f - delta));
-                width = (unsigned)roundf(2.0f * width * delta);
-            }
-            else
-            {
-                delta = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
-                y = (int)roundf(height * (0.5f - delta));
-                height = (unsigned)roundf(2.0f * height * delta);
-            }
-        }
-
-        sw->vp.x = x;
-        sw->vp.y = y;
-
-        sw->vp.width = width;
-        sw->vp.height = height;
+      video_viewport_get_scaled_aspect(&sw->vp, width, height, true);
     }
     else
     {
diff --git a/gfx/drivers/vg.c b/gfx/drivers/vg.c
index 059926747807..1445759ee039 100644
--- a/gfx/drivers/vg.c
+++ b/gfx/drivers/vg.c
@@ -318,45 +318,39 @@ static void vg_free(void *data)
 static void vg_calculate_quad(vg_t *vg,
       unsigned width, unsigned height)
 {
-   /* set viewport for aspect ratio, taken from the OpenGL driver. */
-   if (vg->keep_aspect)
-   {
-      float desired_aspect = video_driver_get_aspect_ratio();
+   settings_t *settings      = config_get_ptr();
+   bool video_scale_integer  = settings->bools.video_scale_integer;
+   float device_aspect       = (float)width / height;
+   struct video_viewport_t vp;
+
+   vp.x = 0;
+   vp.y = 0;
+   vp.width = width;
+   vp.height = height;
+   vp.full_width = width;
+   vp.full_height = height;
 
-      /* If the aspect ratios of screen and desired aspect ratio
-       * are sufficiently equal (floating point stuff),
-       * assume they are actually equal. */
-      if (fabs(vg->mScreenAspect - desired_aspect) < 0.0001)
-      {
-         vg->x1 = 0;
-         vg->y1 = 0;
-         vg->x2 = width;
-         vg->y2 = height;
-      }
-      else if (vg->mScreenAspect > desired_aspect)
-      {
-         float delta = (desired_aspect / vg->mScreenAspect - 1.0) / 2.0 + 0.5;
-         vg->x1 = width * (0.5 - delta);
-         vg->y1 = 0;
-         vg->x2 = 2.0 * width * delta + vg->x1;
-         vg->y2 = height + vg->y1;
-      }
-      else
-      {
-         float delta = (vg->mScreenAspect / desired_aspect - 1.0) / 2.0 + 0.5;
-         vg->x1 = 0;
-         vg->y1 = height * (0.5 - delta);
-         vg->x2 = width + vg->x1;
-         vg->y2 = 2.0 * height * delta + vg->y1;
-      }
+   if (vg->ctx_driver->translate_aspect)
+      device_aspect = vg->ctx_driver->translate_aspect(vg->ctx_data, width, height);
+
+   vg->mScreenAspect = device_aspect;
+   /* OpenVG uses a bottom-left origin coordinate system */
+   if (video_scale_integer)
+   {
+      video_viewport_get_scaled_integer(&vp,
+            width, height,
+            video_driver_get_aspect_ratio(),
+            vg->keep_aspect,
+            false);
    }
-   else
+   else if (vg->keep_aspect)
    {
-      vg->x1 = 0;
-      vg->y1 = 0;
-      vg->x2 = width;
-      vg->y2 = height;
+      video_viewport_get_scaled_aspect(&vp, viewport_width, viewport_height, false);
    }
+   vg->x1 = vp.x;
+   vg->y1 = vp.y;
+   vg->x2 = vp.width;
+   vg->y2 = vp.height;
 
    vg->scissor[0] = vg->x1;
    vg->scissor[1] = vg->y1;
diff --git a/gfx/drivers/vita2d_gfx.c b/gfx/drivers/vita2d_gfx.c
index 9b66811aed2d..06c1213a131f 100644
--- a/gfx/drivers/vita2d_gfx.c
+++ b/gfx/drivers/vita2d_gfx.c
@@ -861,8 +861,9 @@ static void vita2d_update_viewport(vita_video_t* vita,
 
    if (video_scale_integer)
    {
+      /* TODO: Does Vita use top-left or bottom-left origin?  I'm assuming top left. */
       video_viewport_get_scaled_integer(&vita->vp, temp_width,
-            temp_height, video_driver_get_aspect_ratio(), vita->keep_aspect);
+           temp_height, video_driver_get_aspect_ratio(), vita->keep_aspect, true);
       width  = vita->vp.width;
       height = vita->vp.height;
    }
@@ -876,54 +877,16 @@ static void vita2d_update_viewport(vita_video_t* vita,
          width = temp_height;
          height = temp_width;
       }
-#if defined(HAVE_MENU)
-      if (aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
+      video_viewport_get_scaled_aspect(&vita->vp, width, height, true);
+      if ( (vita->rotation == ORIENTATION_VERTICAL) ||
+           (vita->rotation == ORIENTATION_FLIPPED_ROTATED)
+         )
       {
-         x      = video_info->custom_vp_x;
-         y      = video_info->custom_vp_y;
-         width  = video_info->custom_vp_width;
-         height = video_info->custom_vp_height;
+         // swap x and y
+         unsigned tmp = vita->vp.x;
+         vita->vp.x = vita->vp.y;
+         vita->vp.y = tmp;
       }
-      else
-#endif
-      {
-         float delta;
-
-         if ((fabsf(device_aspect - desired_aspect) < 0.0001f))
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta = (desired_aspect / device_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            x     = (int)roundf(width * (0.5f - delta));
-            width = (unsigned)roundf(2.0f * width * delta);
-         }
-         else
-         {
-            delta  = (device_aspect / desired_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            y      = (int)roundf(height * (0.5f - delta));
-            height = (unsigned)roundf(2.0f * height * delta);
-         }
-
-         if ( (vita->rotation == ORIENTATION_VERTICAL) ||
-              (vita->rotation == ORIENTATION_FLIPPED_ROTATED)
-            )
-         {
-            x = (temp_width - width) * 0.5f;
-            y = (temp_height - height) * 0.5f;
-         }
-      }
-
-      vita->vp.x      = x;
-      vita->vp.y      = y;
-      vita->vp.width  = width;
-      vita->vp.height = height;
    }
    else
    {
@@ -954,9 +917,10 @@ static void vita2d_set_viewport_wrapper(void *data, unsigned viewport_width,
 
    if (video_scale_integer && !force_full)
    {
+      /* TODO: Does Vita use top-left or bottom-left origin?  I'm assuming top left. */
       video_viewport_get_scaled_integer(&vita->vp,
             viewport_width, viewport_height,
-            video_driver_get_aspect_ratio(), vita->keep_aspect);
+            video_driver_get_aspect_ratio(), vita->keep_aspect, true);
       viewport_width  = vita->vp.width;
       viewport_height = vita->vp.height;
    }
@@ -986,16 +950,19 @@ static void vita2d_set_viewport_wrapper(void *data, unsigned viewport_width,
          }
          else if (device_aspect > desired_aspect)
          {
+            float viewport_bias = settings->floats.video_viewport_bias_x;
             delta          = (desired_aspect / device_aspect - 1.0f)
                / 2.0f + 0.5f;
-            x              = (int)roundf(viewport_width * (0.5f - delta));
+            x              = (int)roundf(viewport_width * ((0.5f - delta) * (viewport_bias * 2.0f)));
             viewport_width = (unsigned)roundf(2.0f * viewport_width * delta);
          }
          else
          {
+            /* TODO: Does Vita use top-left or bottom-left origin?  I'm assuming top left. */
+            float viewport_bias = settings->floats.video_viewport_bias_y;
             delta           = (device_aspect / desired_aspect - 1.0f)
                / 2.0f + 0.5f;
-            y               = (int)roundf(viewport_height * (0.5f - delta));
+            y               = (int)roundf(viewport_height * ((0.5f - delta) * (viewport_bias * 2.0f)));
             viewport_height = (unsigned)roundf(2.0f * viewport_height * delta);
          }
       }
diff --git a/gfx/drivers/vulkan.c b/gfx/drivers/vulkan.c
index dc4a8c28de51..af8d22771d16 100644
--- a/gfx/drivers/vulkan.c
+++ b/gfx/drivers/vulkan.c
@@ -3814,7 +3814,6 @@ static void vulkan_set_viewport(void *data, unsigned viewport_width,
    struct video_ortho ortho  = {0, 1, 0, 1, -1, 1};
    settings_t *settings      = config_get_ptr();
    bool video_scale_integer  = settings->bools.video_scale_integer;
-   unsigned aspect_ratio_idx = settings->uints.video_aspect_ratio_idx;
    vk_t *vk                  = (vk_t*)data;
 
    if (vk->ctx_driver->translate_aspect)
@@ -3826,55 +3825,18 @@ static void vulkan_set_viewport(void *data, unsigned viewport_width,
       video_viewport_get_scaled_integer(&vk->vp,
             viewport_width, viewport_height,
             video_driver_get_aspect_ratio(),
-            vk->flags & VK_FLAG_KEEP_ASPECT);
+            vk->flags & VK_FLAG_KEEP_ASPECT,
+            true);
+      vk->vp.x = MAX(vk->vp.x, 0);
+      vk->vp.y = MAX(vk->vp.y, 0);
       viewport_width  = vk->vp.width;
       viewport_height = vk->vp.height;
    }
    else if ((vk->flags & VK_FLAG_KEEP_ASPECT) && !force_full)
    {
-      float desired_aspect           = video_driver_get_aspect_ratio();
-#if defined(HAVE_MENU)
-      if (aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
-      {
-         video_viewport_t *custom_vp = &settings->video_viewport_custom;
-         /* Vulkan has top-left origin viewport. */
-         x                           = custom_vp->x;
-         y                           = custom_vp->y;
-         viewport_width              = custom_vp->width;
-         viewport_height             = custom_vp->height;
-      }
-      else
-#endif
-      {
-         float delta;
-
-         if (fabsf(device_aspect - desired_aspect) < 0.0001f)
-         {
-            /* If the aspect ratios of screen and desired aspect
-             * ratio are sufficiently equal (floating point stuff),
-             * assume they are actually equal.
-             */
-         }
-         else if (device_aspect > desired_aspect)
-         {
-            delta          = (desired_aspect / device_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            x              = (int)roundf(viewport_width * (0.5f - delta));
-            viewport_width = (unsigned)roundf(2.0f * viewport_width * delta);
-         }
-         else
-         {
-            delta           = (device_aspect / desired_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            y               = (int)roundf(viewport_height * (0.5f - delta));
-            viewport_height = (unsigned)roundf(2.0f * viewport_height * delta);
-         }
-      }
-
-      vk->vp.x      = x;
-      vk->vp.y      = y;
-      vk->vp.width  = viewport_width;
-      vk->vp.height = viewport_height;
+      video_viewport_get_scaled_aspect2(&vk->vp, viewport_width, viewport_height, true, device_aspect, video_driver_get_aspect_ratio());
+      viewport_width  = vk->vp.width;
+      viewport_height = vk->vp.height;
    }
    else
    {
@@ -3884,12 +3846,6 @@ static void vulkan_set_viewport(void *data, unsigned viewport_width,
       vk->vp.height = viewport_height;
    }
 
-#if defined(RARCH_MOBILE)
-   /* In portrait mode, we want viewport to gravitate to top of screen. */
-   if (device_aspect < 1.0f)
-      vk->vp.y = 0;
-#endif
-
    vulkan_set_projection(vk, &ortho, allow_rotate);
 
    /* Set last backbuffer viewport. */
diff --git a/gfx/drivers/xvideo.c b/gfx/drivers/xvideo.c
index f05bb0dca827..262a3a4ad41e 100644
--- a/gfx/drivers/xvideo.c
+++ b/gfx/drivers/xvideo.c
@@ -599,9 +599,10 @@ static void xv_calc_out_rect(bool keep_aspect,
    vp->full_width       = vp_width;
    vp->full_height      = vp_height;
 
+   /* TODO: Does xvideo have its origin in top left or bottom-left? Assuming top left. */ 
    if (scale_integer)
       video_viewport_get_scaled_integer(vp, vp_width, vp_height,
-            video_driver_get_aspect_ratio(), keep_aspect);
+           video_driver_get_aspect_ratio(), keep_aspect, true);
    else if (!keep_aspect)
    {
       vp->x      = 0;
@@ -611,36 +612,7 @@ static void xv_calc_out_rect(bool keep_aspect,
    }
    else
    {
-      float desired_aspect = video_driver_get_aspect_ratio();
-      float device_aspect  = (float)vp_width / vp_height;
-
-      /* If the aspect ratios of screen and desired aspect ratio
-       * are sufficiently equal (floating point stuff),
-       * assume they are actually equal.
-       */
-      if (fabs(device_aspect - desired_aspect) < 0.0001)
-      {
-         vp->x       = 0;
-         vp->y       = 0;
-         vp->width   = vp_width;
-         vp->height  = vp_height;
-      }
-      else if (device_aspect > desired_aspect)
-      {
-         float delta = (desired_aspect / device_aspect - 1.0) / 2.0 + 0.5;
-         vp->x       = vp_width * (0.5 - delta);
-         vp->y       = 0;
-         vp->width   = 2.0 * vp_width * delta;
-         vp->height  = vp_height;
-      }
-      else
-      {
-         float delta = (device_aspect / desired_aspect - 1.0) / 2.0 + 0.5;
-         vp->x       = 0;
-         vp->y       = vp_height * (0.5 - delta);
-         vp->width   = vp_width;
-         vp->height  = 2.0 * vp_height * delta;
-      }
+      video_viewport_get_scaled_aspect(vp, vp_width, vp_height, true);
    }
 }
 
diff --git a/gfx/drivers_shader/glslang.cpp b/gfx/drivers_shader/glslang.cpp
index 03d5cd379837..fc3bda542426 100644
--- a/gfx/drivers_shader/glslang.cpp
+++ b/gfx/drivers_shader/glslang.cpp
@@ -1,6 +1,6 @@
 /*  RetroArch - A frontend for libretro.
  *  Copyright (C) 2016 - Hans-Kristian Arntzen
- * 
+ *
  *  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.
@@ -13,6 +13,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <compat/posix_string.h>
 #include <string/stdstring.h>
 
 #include "glslang.hpp"
@@ -46,8 +47,8 @@ struct SlangProcess
 };
 
 /* We don't use glslang from multiple threads, but to be sure.
- * Initializing TLS and freeing it for glslang works around 
- * a really bizarre issue where the TLS key is suddenly 
+ * Initializing TLS and freeing it for glslang works around
+ * a really bizarre issue where the TLS key is suddenly
  * corrupted *somehow*.
  */
 static std::mutex glslang_global_lock;
@@ -69,6 +70,7 @@ struct SlangProcessHolder
 
 SlangProcess::SlangProcess()
 {
+   char *save           = NULL;
    char DefaultConfig[] =
       "MaxLights 32\n"
       "MaxClipPlanes 6\n"
@@ -101,7 +103,7 @@ SlangProcess::SlangProcess()
       "MaxComputeImageUniforms 8\n"
       "MaxComputeAtomicCounters 8\n"
       "MaxComputeAtomicCounterBuffers 1\n"
-      "MaxVaryingComponents 60\n" 
+      "MaxVaryingComponents 60\n"
       "MaxVertexOutputComponents 64\n"
       "MaxGeometryInputComponents 64\n"
       "MaxGeometryOutputComponents 128\n"
@@ -165,11 +167,11 @@ SlangProcess::SlangProcess()
       "generalConstantMatrixVectorIndexing 1\n";
 
    const char *delims       = " \t\n\r";
-   char *token              = strtok(DefaultConfig, delims);
+   char *token              = strtok_r(DefaultConfig, delims, &save);
 
    while (token)
    {
-      const char *value_str = strtok(0, delims);
+      const char *value_str = strtok_r(NULL, delims, &save);
       int             value = (int)strtoul(value_str, nullptr, 0);
 
       if (string_starts_with_size(token, "Max", STRLEN_CONST("Max")))
@@ -384,7 +386,7 @@ SlangProcess::SlangProcess()
       else if (string_is_equal(token, "doWhileLoops"))
          Resources.limits.doWhileLoops = (value != 0);
 
-      token = strtok(0, delims);
+      token = strtok_r(NULL, delims, &save);
    }
 }
 
@@ -427,7 +429,7 @@ bool glslang::compile_spirv(const string &source, Stage stage,
 
    EShMessages messages = static_cast<EShMessages>(EShMsgDefault | EShMsgVulkanRules | EShMsgSpvRules);
 
-   glslang::TShader::ForbidIncluder forbid_include = 
+   glslang::TShader::ForbidIncluder forbid_include =
       glslang::TShader::ForbidIncluder();
 
    if (!shader.preprocess(&process.GetResources(),
diff --git a/gfx/gfx_animation.c b/gfx/gfx_animation.c
index 277302fdae10..29bbc40a7233 100644
--- a/gfx/gfx_animation.c
+++ b/gfx/gfx_animation.c
@@ -1356,65 +1356,53 @@ bool gfx_animation_update(
    return ((p_anim->flags & GFX_ANIM_FLAG_IS_ACTIVE) > 0);
 }
 
-static void build_ticker_loop_string(
+static size_t build_ticker_loop_string(
       const char* src_str, const char *spacer,
       size_t char_offset1, size_t num_chars1,
       size_t char_offset2, size_t num_chars2,
       size_t char_offset3, size_t num_chars3,
-      char *dest_str, size_t dest_str_len)
+      char *s, size_t len)
 {
+   size_t _len = 0;
    /* Copy 'trailing' chunk of source string, if required */
    if (num_chars1 > 0)
-      utf8cpy(
-            dest_str, dest_str_len,
+      _len += utf8cpy(s + _len, len - _len,
             utf8skip(src_str, char_offset1), num_chars1);
-   else
-      dest_str[0] = '\0';
-
    /* Copy chunk of spacer string, if required */
    if (num_chars2 > 0)
-   {
-      char tmp[32];
-      utf8cpy(
-            tmp, sizeof(tmp),
+      _len += utf8cpy(s + _len, len - _len,
             utf8skip(spacer, char_offset2), num_chars2);
-      strlcat(dest_str, tmp, dest_str_len);
-   }
-
    /* Copy 'leading' chunk of source string, if required */
    if (num_chars3 > 0)
-   {
-      char tmp[80];
-      utf8cpy(
-            tmp, sizeof(tmp),
+      _len += utf8cpy(s + _len, len - _len,
             utf8skip(src_str, char_offset3), num_chars3);
-      strlcat(dest_str, tmp, dest_str_len);
-   }
+   return _len;
 }
 
-static void build_line_ticker_string(
+static size_t build_line_ticker_string(
       size_t num_display_lines, size_t line_offset,
-      struct string_list *lines,
-      char *dest_str, size_t dest_str_len)
+      struct string_list *lines, size_t lines_size,
+      char *s, size_t len)
 {
    size_t i;
-
+   size_t _len = 0;
    for (i = 0; i < (num_display_lines-1); i++)
    {
       size_t offset     = i + line_offset;
-      size_t line_index = offset % (lines->size + 1);
+      size_t line_index = offset % (lines_size + 1);
       /* Is line valid? */
-      if (line_index < lines->size)
-         strlcat(dest_str, lines->elems[line_index].data, dest_str_len);
-      strlcat(dest_str, "\n", dest_str_len);
+      if (line_index < lines_size)
+         _len += strlcpy(s + _len, lines->elems[line_index].data, len - _len);
+      _len    += strlcpy(s + _len, "\n", len - _len);
    }
    {
       size_t offset     = (num_display_lines-1) + line_offset;
-      size_t line_index = offset % (lines->size + 1);
+      size_t line_index = offset % (lines_size + 1);
       /* Is line valid? */
-      if (line_index < lines->size)
-         strlcat(dest_str, lines->elems[line_index].data, dest_str_len);
+      if (line_index < lines_size)
+         _len += strlcpy(s + _len, lines->elems[line_index].data, len - _len);
    }
+   return _len;
 }
 
 bool gfx_animation_ticker(gfx_animation_ctx_ticker_t *ticker)
@@ -1898,15 +1886,15 @@ bool gfx_animation_line_ticker(gfx_animation_ctx_line_ticker_t *line_ticker)
    if (!line_ticker)
       return false;
 
-   if (string_is_empty(line_ticker->str) ||
-       (line_ticker->line_len < 1) ||
-       (line_ticker->max_lines < 1))
+   if (    string_is_empty(line_ticker->str)
+       || (line_ticker->line_len  < 1)
+       || (line_ticker->max_lines < 1))
       goto end;
 
    /* Line wrap input string */
    line_ticker_str_len = strlen(line_ticker->str);
    wrapped_str_len     = line_ticker_str_len + 1 + 10; /* 10 bytes use for inserting '\n' */
-   if (!(wrapped_str = (char*)malloc(wrapped_str_len)))
+   if (!(wrapped_str   = (char*)malloc(wrapped_str_len)))
       goto end;
    wrapped_str[0] = '\0';
 
@@ -1957,7 +1945,7 @@ bool gfx_animation_line_ticker(gfx_animation_ctx_line_ticker_t *line_ticker)
 
    /* Build output string from required lines */
    build_line_ticker_string(
-      line_ticker->max_lines, line_offset, &lines,
+      line_ticker->max_lines, line_offset, &lines, lines.size,
       line_ticker->s, line_ticker->len);
 
    success                  = true;
@@ -2136,22 +2124,19 @@ bool gfx_animation_line_ticker_smooth(gfx_animation_ctx_line_ticker_smooth_t *li
 
    /* Build output string from required lines */
    build_line_ticker_string(
-         num_display_lines, line_offset, &lines,
+         num_display_lines, line_offset, &lines, lines.size,
          line_ticker->dst_str, line_ticker->dst_str_len);
 
    /* Extract top/bottom fade strings, if required */
    if (fade_active)
    {
-      /* We waste a handful of clock cycles by using
-       * build_line_ticker_string() here, but it saves
-       * rewriting a heap of code... */
-      build_line_ticker_string(
-            1, top_fade_line_offset, &lines,
-            line_ticker->top_fade_str, line_ticker->top_fade_str_len);
-
-      build_line_ticker_string(
-            1, bottom_fade_line_offset, &lines,
-            line_ticker->bottom_fade_str, line_ticker->bottom_fade_str_len);
+      size_t top_fade_line_index    = top_fade_line_offset    % (lines.size + 1);
+      size_t bottom_fade_line_index = bottom_fade_line_offset % (lines.size + 1);
+      /* Is line valid? */
+      if (top_fade_line_index < lines.size)
+         strlcpy(line_ticker->top_fade_str, lines.elems[top_fade_line_index].data, line_ticker->top_fade_str_len);
+      if (bottom_fade_line_index < lines.size)
+         strlcpy(line_ticker->bottom_fade_str, lines.elems[bottom_fade_line_index].data, line_ticker->bottom_fade_str_len);
    }
 
    success                  = true;
diff --git a/gfx/video_display_server.h b/gfx/video_display_server.h
index f29ac527e3dc..be6a7088cc6a 100644
--- a/gfx/video_display_server.h
+++ b/gfx/video_display_server.h
@@ -39,6 +39,9 @@ typedef struct video_display_config
    unsigned refreshrate;
    unsigned idx;
    bool current;
+   bool interlaced;
+   bool dblscan;
+   float refreshrate_float;
 } video_display_config_t;
 
 typedef struct video_display_server
diff --git a/gfx/video_driver.c b/gfx/video_driver.c
index 509edc6bc29c..6bec3759343f 100644
--- a/gfx/video_driver.c
+++ b/gfx/video_driver.c
@@ -1214,9 +1214,14 @@ bool video_display_server_has_refresh_rate(float hz)
 
       for (i = 0; i < size && !rate_exists; i++)
       {
-         if (   (video_list[i].width       == video_driver_width)
-             && (video_list[i].height      == video_driver_height)
-             && (video_list[i].refreshrate == floor(hz)))
+         /* Float difference added to enable 49.95Hz modelines for PAL. *
+          * Actual mode selection will be done in context driver,       *
+          * with some logic in video_switch_refresh_rate_maybe          *   
+          * and in action_cb_push_dropdown_item_resolution              */
+         if (   (video_list[i].width        == video_driver_width)
+             && (video_list[i].height       == video_driver_height)
+             && ((video_list[i].refreshrate == floor(hz)) ||
+                 (fabsf(video_list[i].refreshrate_float - hz) < 0.06f)))
             rate_exists = true;
       }
 
@@ -1243,7 +1248,7 @@ void video_switch_refresh_rate_maybe(
    unsigned video_bfi                 = settings->uints.video_black_frame_insertion;
    unsigned shader_subframes          = settings->uints.video_shader_subframes;
    bool vrr_runloop_enable            = settings->bools.vrr_runloop_enable;
-   bool exclusive_fullscreen          = (video_st->flags | VIDEO_FLAG_FORCE_FULLSCREEN) || (
+   bool exclusive_fullscreen          = (video_st->flags & VIDEO_FLAG_FORCE_FULLSCREEN) || (
                                         settings->bools.video_fullscreen && !settings->bools.video_windowed_fullscreen);
    bool windowed_fullscreen           = settings->bools.video_fullscreen && settings->bools.video_windowed_fullscreen;
    bool all_fullscreen                = settings->bools.video_fullscreen || settings->bools.video_windowed_fullscreen;
@@ -2039,39 +2044,28 @@ void video_driver_set_aspect_ratio(void)
       video_st->poke->set_aspect_ratio(video_st->data, aspect_ratio_idx);
 }
 
-void video_driver_update_viewport(
-      struct video_viewport* vp, bool force_full, bool keep_aspect)
-{
-   float            device_aspect  = (float)vp->full_width / vp->full_height;
-   settings_t *settings            = config_get_ptr();
-   bool video_scale_integer        = settings->bools.video_scale_integer;
-   unsigned video_aspect_ratio_idx = settings->uints.video_aspect_ratio_idx;
-   video_driver_state_t *video_st  = &video_driver_st;
-   float video_driver_aspect_ratio = video_st->aspect_ratio;
-
-   vp->x                           = 0;
-   vp->y                           = 0;
-   vp->width                       = vp->full_width;
-   vp->height                      = vp->full_height;
+void video_viewport_get_scaled_aspect(struct video_viewport *vp, unsigned viewport_width, unsigned viewport_height, bool ydown) {
+   float device_aspect      = (float)viewport_width / viewport_height;
+   float desired_aspect     = video_driver_get_aspect_ratio();
+   video_viewport_get_scaled_aspect2(vp, viewport_width, viewport_height, ydown, device_aspect, desired_aspect);
+}
 
-   if (video_scale_integer && !force_full)
-      video_viewport_get_scaled_integer(
-            vp,
-            vp->full_width,
-            vp->full_height,
-            video_driver_aspect_ratio, keep_aspect);
-   else if (keep_aspect && !force_full)
-   {
-      float desired_aspect = video_driver_aspect_ratio;
+void video_viewport_get_scaled_aspect2(struct video_viewport *vp, unsigned viewport_width, unsigned viewport_height, bool ydown, float device_aspect, float desired_aspect)
+{
+   settings_t *settings     = config_get_ptr();
+   int x                    = 0;
+   int y                    = 0;
 
 #if defined(HAVE_MENU)
-      if (video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
+      if (settings->uints.video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
       {
-         const struct video_viewport *custom_vp = &settings->video_viewport_custom;
-         vp->x      = custom_vp->x;
-         vp->y      = custom_vp->y;
-         vp->width  = custom_vp->width;
-         vp->height = custom_vp->height;
+         video_viewport_t *custom_vp = &settings->video_viewport_custom;
+         x                           = custom_vp->x;
+         y                           = custom_vp->y - custom_vp->height;
+         if (!ydown)
+            y = vp->full_height - y;
+         viewport_width              = custom_vp->width;
+         viewport_height             = custom_vp->height;
       }
       else
 #endif
@@ -2087,30 +2081,56 @@ void video_driver_update_viewport(
          }
          else if (device_aspect > desired_aspect)
          {
-            delta      = (desired_aspect / device_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            vp->x      = (int)roundf(vp->full_width * (0.5f - delta));
-            vp->width  = (unsigned)roundf(2.0f * vp->full_width * delta);
-            vp->y      = 0;
-            vp->height = vp->full_height;
+            float viewport_bias = settings->floats.video_viewport_bias_x;
+#if defined(RARCH_MOBILE)
+            if (device_aspect < 1.0f)
+               viewport_bias = settings->floats.video_viewport_bias_portrait_x;
+#endif
+            delta = (desired_aspect / device_aspect - 1.0f) / 2.0f + 0.5f;
+            x     = (int)roundf(viewport_width * ((0.5f - delta) * (viewport_bias * 2.0f)));
+            viewport_width = (unsigned)roundf(2.0f * viewport_width * delta);
          }
          else
          {
-            vp->x      = 0;
-            vp->width  = vp->full_width;
-            delta      = (device_aspect / desired_aspect - 1.0f)
-               / 2.0f + 0.5f;
-            vp->y      = (int)roundf(vp->full_height * (0.5f - delta));
-            vp->height = (unsigned)roundf(2.0f * vp->full_height * delta);
+            float viewport_bias = settings->floats.video_viewport_bias_y;
+#if defined(RARCH_MOBILE)
+            if (device_aspect < 1.0f)
+               viewport_bias = settings->floats.video_viewport_bias_portrait_y;
+#endif
+            if (!ydown)
+               viewport_bias = 1.0 - viewport_bias;
+            delta  = (device_aspect / desired_aspect - 1.0f) / 2.0f + 0.5f;
+            y      = (int)roundf(viewport_height * ((0.5f - delta) * (viewport_bias * 2.0f)));
+            viewport_height = (unsigned)roundf(2.0f * viewport_height * delta);
          }
       }
-   }
+      vp->x      = x;
+      vp->y      = y;
+      vp->width  = viewport_width;
+      vp->height = viewport_height;
+}
 
-#if defined(RARCH_MOBILE)
-   /* In portrait mode, we want viewport to gravitate to top of screen. */
-   if (device_aspect < 1.0f)
-      vp->y = 0;
-#endif
+void video_driver_update_viewport(
+      struct video_viewport* vp, bool force_full, bool keep_aspect)
+{
+   settings_t *settings            = config_get_ptr();
+   bool video_scale_integer        = settings->bools.video_scale_integer;
+   video_driver_state_t *video_st  = &video_driver_st;
+   float video_driver_aspect_ratio = video_st->aspect_ratio;
+
+   vp->x                           = 0;
+   vp->y                           = 0;
+   vp->width                       = vp->full_width;
+   vp->height                      = vp->full_height;
+
+   if (video_scale_integer && !force_full)
+      video_viewport_get_scaled_integer(
+            vp,
+            vp->full_width,
+            vp->full_height,
+            video_driver_aspect_ratio, keep_aspect, true);
+   else if (keep_aspect && !force_full)
+      video_viewport_get_scaled_aspect(vp, vp->full_width, vp->full_height, true);
 }
 
 void video_driver_restore_cached(void *settings_data)
@@ -2299,13 +2319,15 @@ bool video_driver_get_viewport_info(struct video_viewport *viewport)
  * @height        : Height.
  * @aspect_ratio  : Aspect ratio (in float).
  * @keep_aspect   : Preserve aspect ratio?
+ * @ydown         : Positive y points down?
  *
  * Gets viewport scaling dimensions based on
  * scaled integer aspect ratio.
  **/
 void video_viewport_get_scaled_integer(struct video_viewport *vp,
       unsigned width, unsigned height,
-      float aspect_ratio, bool keep_aspect)
+      float aspect_ratio, bool keep_aspect,
+      bool ydown)
 {
    int padding_x                   = 0;
    int padding_y                   = 0;
@@ -2313,7 +2335,6 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
    video_driver_state_t *video_st  = &video_driver_st;
    unsigned video_aspect_ratio_idx = settings->uints.video_aspect_ratio_idx;
    bool overscale                  = settings->bools.video_scale_integer_overscale;
-
    if (video_aspect_ratio_idx == ASPECT_RATIO_CUSTOM)
    {
       struct video_viewport *custom_vp = &settings->video_viewport_custom;
@@ -2328,12 +2349,24 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
    }
    else
    {
+      float viewport_bias_x = settings->floats.video_viewport_bias_x;
+      float viewport_bias_y = settings->floats.video_viewport_bias_y;
       unsigned base_width;
       /* Use system reported sizes as these define the
        * geometry for the "normal" case. */
       unsigned base_height  =
          video_st->av_info.geometry.base_height;
       unsigned int rotation = retroarch_get_rotation();
+#if defined(RARCH_MOBILE)
+      if (width < height)
+      {
+         viewport_bias_x = settings->floats.video_viewport_bias_portrait_x;
+         viewport_bias_y = settings->floats.video_viewport_bias_portrait_y;
+      }
+#endif
+
+      if (!ydown)
+         viewport_bias_y = 1.0 - viewport_bias_y;
 
       if (rotation % 2)
          base_height        = video_st->av_info.geometry.base_width;
@@ -2377,12 +2410,14 @@ void video_viewport_get_scaled_integer(struct video_viewport *vp,
 
       width  -= padding_x;
       height -= padding_y;
+      padding_x *= viewport_bias_x;
+      padding_y *= viewport_bias_y;
    }
 
    vp->width  = width;
    vp->height = height;
-   vp->x      = padding_x / 2;
-   vp->y      = padding_y / 2;
+   vp->x      = padding_x;
+   vp->y      = padding_y;
 }
 
 void video_driver_display_type_set(enum rarch_display_type type)
diff --git a/gfx/video_driver.h b/gfx/video_driver.h
index 87a44cc8f2eb..03bc64cde7cd 100644
--- a/gfx/video_driver.h
+++ b/gfx/video_driver.h
@@ -991,18 +991,49 @@ void video_driver_menu_settings(void **list_data, void *list_info_data,
 
 /**
  * video_viewport_get_scaled_integer:
- * @vp            : Viewport handle
+ * @vp            : Viewport handle.
  * @width         : Width.
  * @height        : Height.
  * @aspect_ratio  : Aspect ratio (in float).
  * @keep_aspect   : Preserve aspect ratio?
+ * @ydown         : Positive y goes "down".
  *
  * Gets viewport scaling dimensions based on
  * scaled integer aspect ratio.
  **/
 void video_viewport_get_scaled_integer(struct video_viewport *vp,
       unsigned width, unsigned height,
-      float aspect_ratio, bool keep_aspect);
+      float aspect_ratio, bool keep_aspect,
+      bool ydown);
+
+/**
+ * video_viewport_get_scaled_aspect:
+ * @vp            : Viewport handle. Fields x, y, width, height will be written, and full_width or full_height might be read.
+ * @width         : Viewport width.
+ * @height        : Viewport height.
+ * @ydown         : Positive y goes "down".
+ *
+ * Gets viewport scaling dimensions based on
+ * scaled non-integer aspect ratio.
+ **/
+void video_viewport_get_scaled_aspect(struct video_viewport *vp,
+      unsigned width, unsigned height, bool ydown);
+
+/**
+ * video_viewport_get_scaled_aspect2:
+ * @vp            : Viewport handle. Fields x, y, width, height will be written, and full_width or full_height might be read.
+ * @width         : Viewport width.
+ * @height        : Viewport height.
+ * @ydown         : Positive y goes "down".
+ * @device_aspect : Device aspect ratio.
+ * @desired_aspect: Target aspect ratio.
+ *
+ * Gets viewport scaling dimensions based on
+ * scaled non-integer aspect ratio.
+ **/
+void video_viewport_get_scaled_aspect2(struct video_viewport *vp,
+      unsigned width, unsigned height, bool ydown,
+      float device_aspect, float desired_aspect);
 
 /**
  * video_monitor_set_refresh_rate:
diff --git a/gfx/video_shader_parse.c b/gfx/video_shader_parse.c
index 744cc24ce0ce..71add020cf46 100644
--- a/gfx/video_shader_parse.c
+++ b/gfx/video_shader_parse.c
@@ -2780,11 +2780,12 @@ static bool video_shader_load_shader_preset_internal(
                len);
       else
       {
+         size_t _len;
          if (string_is_empty(special_name))
             break;
 
-         fill_pathname_join(s, shader_directory, special_name, len);
-         strlcat(s, video_shader_get_preset_extension(types[i]), len);
+         _len = fill_pathname_join(s, shader_directory, special_name, len);
+         strlcpy(s + _len, video_shader_get_preset_extension(types[i]), len - _len);
       }
 
       if (path_is_valid(s))
diff --git a/input/common/input_x11_common.c b/input/common/input_x11_common.c
index 80f1182d0841..f3a837c47386 100644
--- a/input/common/input_x11_common.c
+++ b/input/common/input_x11_common.c
@@ -23,7 +23,9 @@ enum x11_mouse_btn_flags
    X11_MOUSE_WU_BTN   = (1 << 0),
    X11_MOUSE_WD_BTN   = (1 << 1),
    X11_MOUSE_HWU_BTN  = (1 << 2),
-   X11_MOUSE_HWD_BTN  = (1 << 3)
+   X11_MOUSE_HWD_BTN  = (1 << 3),
+   X11_MOUSE_BTN_4    = (1 << 4),
+   X11_MOUSE_BTN_5    = (1 << 5)
 };
 
 /* TODO/FIXME - static globals */
@@ -51,6 +53,13 @@ int16_t x_mouse_state_wheel(unsigned id)
          ret                = (g_x11_mouse_flags & X11_MOUSE_HWD_BTN);
          g_x11_mouse_flags &= ~X11_MOUSE_HWD_BTN;
          break;
+      case RETRO_DEVICE_ID_MOUSE_BUTTON_4:
+         ret                = (g_x11_mouse_flags & X11_MOUSE_BTN_4);
+         break;
+      case RETRO_DEVICE_ID_MOUSE_BUTTON_5:
+         ret                = (g_x11_mouse_flags & X11_MOUSE_BTN_5);
+         break;
+
    }
 
    return ret;
@@ -74,5 +83,31 @@ void x_input_poll_wheel(XButtonEvent *event, bool latch)
          /* Scroll wheel right == HORIZ_WHEELUP */
          g_x11_mouse_flags |= X11_MOUSE_HWU_BTN;
          break;
+      case 8:
+         /* Extra buttons are regular press-release events,
+          * while scroll wheels do not stay pressed. */
+         /* Mouse button 4 */
+         switch (event->type)
+         {
+            case ButtonPress:
+               g_x11_mouse_flags |= X11_MOUSE_BTN_4;
+               break;
+            case ButtonRelease:
+               g_x11_mouse_flags &= ~X11_MOUSE_BTN_4;
+               break;
+         }
+         break;
+      case 9:
+         /* Mouse button 5 */
+         switch (event->type)
+         {
+            case ButtonPress:
+               g_x11_mouse_flags |= X11_MOUSE_BTN_5;
+               break;
+            case ButtonRelease:
+               g_x11_mouse_flags &= ~X11_MOUSE_BTN_5;
+               break;
+         }
+         break;
    }
 }
diff --git a/input/common/wayland_common.c b/input/common/wayland_common.c
index 1a36c61b6022..bbd9fce9a81a 100644
--- a/input/common/wayland_common.c
+++ b/input/common/wayland_common.c
@@ -213,6 +213,8 @@ static void wl_pointer_handle_leave(void *data,
    wl->input.mouse.left       = false;
    wl->input.mouse.right      = false;
    wl->input.mouse.middle     = false;
+   wl->input.mouse.side       = false;
+   wl->input.mouse.extra      = false;
 
    if (wl->input.mouse.surface == surface)
       wl->input.mouse.surface = NULL;
@@ -270,6 +272,12 @@ static void wl_pointer_handle_button(void *data,
          case BTN_MIDDLE:
             wl->input.mouse.middle = true;
             break;
+         case BTN_SIDE:
+            wl->input.mouse.side = true;
+            break;
+         case BTN_EXTRA:
+            wl->input.mouse.extra = true;
+            break;
       }
    }
    else
@@ -285,6 +293,12 @@ static void wl_pointer_handle_button(void *data,
          case BTN_MIDDLE:
             wl->input.mouse.middle = false;
             break;
+         case BTN_SIDE:
+            wl->input.mouse.side = false;
+            break;
+         case BTN_EXTRA:
+            wl->input.mouse.extra = false;
+            break;
       }
    }
 }
diff --git a/input/common/wayland_common.h b/input/common/wayland_common.h
index 8ed1f99f33e3..e99ef701ec75 100644
--- a/input/common/wayland_common.h
+++ b/input/common/wayland_common.h
@@ -123,7 +123,7 @@ typedef struct input_ctx_wayland_data
       int delta_x, delta_y;
       bool last_valid;
       bool focus;
-      bool left, right, middle;
+      bool left, right, middle, side, extra;
       bool wu, wd, wl, wr;
    } mouse;
 
diff --git a/input/drivers/android_input.c b/input/drivers/android_input.c
index 83fc3a6ff646..8e4f16ae9e62 100644
--- a/input/drivers/android_input.c
+++ b/input/drivers/android_input.c
@@ -875,6 +875,14 @@ static INLINE void android_input_poll_event_type_keyboard(
       mod |= RETROKMOD_CTRL;
    if (meta & AMETA_SHIFT_ON)
       mod |= RETROKMOD_SHIFT;
+   if (meta & AMETA_CAPS_LOCK_ON)
+      mod |= RETROKMOD_CAPSLOCK;
+   if (meta & AMETA_NUM_LOCK_ON)
+      mod |= RETROKMOD_NUMLOCK;
+   if (meta & AMETA_SCROLL_LOCK_ON)
+      mod |= RETROKMOD_SCROLLOCK;
+   if (meta & AMETA_META_ON)
+      mod |= RETROKMOD_META;
 
    input_keyboard_event(keydown, keyboardcode,
          keyboardcode, mod, RETRO_DEVICE_KEYBOARD);
diff --git a/input/drivers/dinput.c b/input/drivers/dinput.c
index 52c6767f8ac4..29fc26d1f02c 100644
--- a/input/drivers/dinput.c
+++ b/input/drivers/dinput.c
@@ -199,6 +199,26 @@ static void *dinput_init(const char *joypad_driver)
    return di;
 }
 
+static uint16_t dinput_get_active_keyboard_mods()
+{
+   uint16_t mod = 0;
+   if (GetKeyState(VK_SHIFT)   & 0x80)
+      mod |= RETROKMOD_SHIFT;
+   if (GetKeyState(VK_CONTROL) & 0x80)
+      mod |= RETROKMOD_CTRL;
+   if (GetKeyState(VK_MENU)    & 0x80)
+      mod |= RETROKMOD_ALT;
+   if (GetKeyState(VK_CAPITAL) & 0x81)
+      mod |= RETROKMOD_CAPSLOCK;
+   if (GetKeyState(VK_SCROLL)  & 0x81)
+      mod |= RETROKMOD_SCROLLOCK;
+   if (GetKeyState(VK_NUMLOCK) & 0x81)
+      mod |= RETROKMOD_NUMLOCK;
+   if ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x80)
+      mod |= RETROKMOD_META;
+   return mod;
+}
+
 static void dinput_keyboard_mods(struct dinput_input *di, int mod)
 {
    switch (mod)
@@ -212,7 +232,8 @@ static void dinput_keyboard_mods(struct dinput_input *di, int mod)
                 || (!vk_shift_l &&   (di->flags & DINP_FLAG_SHIFT_L)))
             {
                input_keyboard_event(vk_shift_l, RETROK_LSHIFT,
-                     0, RETROKMOD_SHIFT, RETRO_DEVICE_KEYBOARD);
+                     0, dinput_get_active_keyboard_mods() | RETROKMOD_SHIFT,
+                     RETRO_DEVICE_KEYBOARD);
                if (di->flags & DINP_FLAG_SHIFT_L)
                   di->flags &= ~DINP_FLAG_SHIFT_L;
                else
@@ -223,7 +244,8 @@ static void dinput_keyboard_mods(struct dinput_input *di, int mod)
                 || (!vk_shift_r &&   (di->flags & DINP_FLAG_SHIFT_R)))
             {
                input_keyboard_event(vk_shift_r, RETROK_RSHIFT,
-                     0, RETROKMOD_SHIFT, RETRO_DEVICE_KEYBOARD);
+                     0, dinput_get_active_keyboard_mods() | RETROKMOD_SHIFT,
+                     RETRO_DEVICE_KEYBOARD);
                if (di->flags & DINP_FLAG_SHIFT_R)
                   di->flags &= ~DINP_FLAG_SHIFT_R;
                else
@@ -246,7 +268,8 @@ static void dinput_keyboard_mods(struct dinput_input *di, int mod)
             else if (!vk_alt_l && (di->flags & DINP_FLAG_ALT_L))
             {
                input_keyboard_event(vk_alt_l, RETROK_LALT,
-                     0, RETROKMOD_ALT, RETRO_DEVICE_KEYBOARD);
+                     0, dinput_get_active_keyboard_mods() | RETROKMOD_ALT,
+                     RETRO_DEVICE_KEYBOARD);
                if (di->flags & DINP_FLAG_ALT_L)
                   di->flags &= ~DINP_FLAG_ALT_L;
                else
diff --git a/input/drivers/sdl_input.c b/input/drivers/sdl_input.c
index 6cccb3eb8b78..a9d312fc1ed7 100644
--- a/input/drivers/sdl_input.c
+++ b/input/drivers/sdl_input.c
@@ -442,6 +442,11 @@ static void sdl_input_poll(void *data)
          if (event.key.keysym.mod & KMOD_CAPS)
             mod |= RETROKMOD_CAPSLOCK;
 
+         /* KMOD_SCROLL was added in SDL 2.0.18, use the raw number
+            to stay backwards compatible with older versions */
+         if (event.key.keysym.mod & 0x8000 /*KMOD_SCROLL*/)
+            mod |= RETROKMOD_SCROLLOCK;
+
          input_keyboard_event(event.type == SDL_KEYDOWN, code, code, mod,
                RETRO_DEVICE_KEYBOARD);
       }
diff --git a/input/drivers/switch_input.c b/input/drivers/switch_input.c
index 463b1ae337c1..fab94afa17de 100644
--- a/input/drivers/switch_input.c
+++ b/input/drivers/switch_input.c
@@ -210,12 +210,20 @@ static void switch_input_poll(void *data)
    }
 
    hidGetKeyboardStates(&kbd_state, 1);
-   if (hidKeyboardStateGetKey(&kbd_state, HidKeyboardKey_LeftAlt) || hidKeyboardStateGetKey(&kbd_state, HidKeyboardKey_RightAlt))
+   if (kbd_state.modifiers & (HidKeyboardModifier_LeftAlt | HidKeyboardModifier_RightAlt))
       mod |= RETROKMOD_ALT;
-   if (hidKeyboardStateGetKey(&kbd_state, HidKeyboardKey_LeftControl) || hidKeyboardStateGetKey(&kbd_state, HidKeyboardKey_RightControl))
+   if (kbd_state.modifiers & HidKeyboardModifier_Control)
       mod |= RETROKMOD_CTRL;
-   if (hidKeyboardStateGetKey(&kbd_state, HidKeyboardKey_LeftShift) || hidKeyboardStateGetKey(&kbd_state, HidKeyboardKey_RightShift))
+   if (kbd_state.modifiers & HidKeyboardModifier_Shift)
       mod |= RETROKMOD_SHIFT;
+   if (kbd_state.modifiers & HidKeyboardModifier_Gui)
+      mod |= RETROKMOD_META;
+   if (kbd_state.modifiers & HidKeyboardModifier_CapsLock)
+      mod |= RETROKMOD_CAPSLOCK;
+   if (kbd_state.modifiers & HidKeyboardModifier_ScrollLock)
+      mod |= RETROKMOD_SCROLLOCK;
+   if (kbd_state.modifiers & HidKeyboardModifier_NumLock)
+      mod |= RETROKMOD_NUMLOCK;
 
    for (i = 0; i < SWITCH_NUM_SCANCODES; i++)
    {
diff --git a/input/drivers/wayland_input.c b/input/drivers/wayland_input.c
index 6523f5e7206d..e3e0a55c5754 100644
--- a/input/drivers/wayland_input.c
+++ b/input/drivers/wayland_input.c
@@ -284,7 +284,18 @@ static int16_t input_wl_state(
                   return wl->mouse.right;
                case RETRO_DEVICE_ID_MOUSE_MIDDLE:
                   return wl->mouse.middle;
-                  /* TODO/FIXME: Rest of the mouse inputs. */
+               case RETRO_DEVICE_ID_MOUSE_BUTTON_4:
+                  return wl->mouse.side;
+               case RETRO_DEVICE_ID_MOUSE_BUTTON_5:
+                  return wl->mouse.extra;
+               case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN:
+                  state        = wl->mouse.wl;
+                  wl->mouse.wl = false;
+                  return state;
+               case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP:
+                  state        = wl->mouse.wr;
+                  wl->mouse.wr = false;
+                  return state;
             }
          }
          break;
diff --git a/input/drivers/winraw_input.c b/input/drivers/winraw_input.c
index 6717731c3281..a76afc926fd3 100644
--- a/input/drivers/winraw_input.c
+++ b/input/drivers/winraw_input.c
@@ -581,6 +581,8 @@ static LRESULT CALLBACK winraw_callback(
             mod |= RETROKMOD_CAPSLOCK;
          if (GetKeyState(VK_SCROLL)  & 0x81)
             mod |= RETROKMOD_SCROLLOCK;
+         if (GetKeyState(VK_NUMLOCK) & 0x81)
+            mod |= RETROKMOD_NUMLOCK;
          if ((GetKeyState(VK_LWIN) | GetKeyState(VK_RWIN)) & 0x80)
             mod |= RETROKMOD_META;
 
diff --git a/input/drivers/x11_input.c b/input/drivers/x11_input.c
index 743ed74f7ae1..69d7b68176aa 100644
--- a/input/drivers/x11_input.c
+++ b/input/drivers/x11_input.c
@@ -86,12 +86,8 @@ static bool x_mouse_button_pressed(
          return x11->mouse_r;
       case RETRO_DEVICE_ID_MOUSE_MIDDLE:
          return x11->mouse_m;
-#if 0
       case RETRO_DEVICE_ID_MOUSE_BUTTON_4:
-         return x11->mouse_b4;
       case RETRO_DEVICE_ID_MOUSE_BUTTON_5:
-         return x11->mouse_b5;
-#endif
       case RETRO_DEVICE_ID_MOUSE_WHEELUP:
       case RETRO_DEVICE_ID_MOUSE_WHEELDOWN:
       case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP:
@@ -266,6 +262,8 @@ static int16_t x_input_state(
                case RETRO_DEVICE_ID_MOUSE_WHEELDOWN:
                case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELUP:
                case RETRO_DEVICE_ID_MOUSE_HORIZ_WHEELDOWN:
+               case RETRO_DEVICE_ID_MOUSE_BUTTON_4:
+               case RETRO_DEVICE_ID_MOUSE_BUTTON_5:
                   return x_mouse_state_wheel(id);
                case RETRO_DEVICE_ID_MOUSE_MIDDLE:
                   return x11->mouse_m;
@@ -489,7 +487,8 @@ static void x_input_poll(void *data)
    x11->mouse_l             = mask & Button1Mask;
    x11->mouse_m             = mask & Button2Mask;
    x11->mouse_r             = mask & Button3Mask;
-
+   /* Buttons 4 and 5 are not returned here, so they are handled elsewhere. */
+   
    /* > Mouse pointer */
    if (!x11->mouse_grabbed)
    {
diff --git a/input/input_driver.c b/input/input_driver.c
index b03517b73567..33fafc37d728 100644
--- a/input/input_driver.c
+++ b/input/input_driver.c
@@ -3600,38 +3600,39 @@ unsigned input_config_translate_str_to_bind_id(const char *str)
    return RARCH_BIND_LIST_END;
 }
 
-void input_config_get_bind_string(
+size_t input_config_get_bind_string(
       void *settings_data,
-      char *buf,
+      char *s,
       const struct retro_keybind *bind,
       const struct retro_keybind *auto_bind,
-      size_t size)
+      size_t len)
 {
    settings_t *settings                 = (settings_t*)settings_data;
+   size_t _len                          = 0;
    int delim                            = 0;
    bool  input_descriptor_label_show    =
       settings->bools.input_descriptor_label_show;
 
-   *buf                                 = '\0';
+   *s                                 = '\0';
 
    if      (bind      && bind->joykey  != NO_BTN)
-      input_config_get_bind_string_joykey(
+      _len = input_config_get_bind_string_joykey(
             input_descriptor_label_show,
-            buf, "", bind, size);
+            s, "", bind, len);
    else if (bind      && bind->joyaxis != AXIS_NONE)
-      input_config_get_bind_string_joyaxis(
+      _len = input_config_get_bind_string_joyaxis(
             input_descriptor_label_show,
-            buf, "", bind, size);
+            s, "", bind, len);
    else if (auto_bind && auto_bind->joykey != NO_BTN)
-      input_config_get_bind_string_joykey(
+      _len = input_config_get_bind_string_joykey(
             input_descriptor_label_show,
-            buf, "(Auto)", auto_bind, size);
+            s, "(Auto)", auto_bind, len);
    else if (auto_bind && auto_bind->joyaxis != AXIS_NONE)
-      input_config_get_bind_string_joyaxis(
+      _len = input_config_get_bind_string_joyaxis(
             input_descriptor_label_show,
-            buf, "(Auto)", auto_bind, size);
+            s, "(Auto)", auto_bind, len);
 
-   if (*buf)
+   if (*s)
       delim = 1;
 
 #ifndef RARCH_CONSOLE
@@ -3649,15 +3650,10 @@ void input_config_get_bind_string(
       /*empty?*/
       else if (*key != '\0')
       {
-         char keybuf[64];
-
-         keybuf[0] = '\0';
-
          if (delim)
-            strlcat(buf, ", ", size);
-         snprintf(keybuf, sizeof(keybuf),
+            _len += strlcpy(s + _len, ", ", len - _len);
+         _len += snprintf(s + _len, len - _len,
                msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_KEY), key);
-         strlcat(buf, keybuf, size);
          delim = 1;
       }
    }
@@ -3700,51 +3696,49 @@ void input_config_get_bind_string(
       if (tag != 0)
       {
          if (delim)
-            strlcat(buf, ", ", size);
-         strlcat(buf, msg_hash_to_str((enum msg_hash_enums)tag), size);
+            _len += strlcpy(s + _len, ", ", len - _len);
+         _len += strlcpy(s + _len, msg_hash_to_str((enum msg_hash_enums)tag), len - _len);
       }
    }
 
    /*completely empty?*/
-   if (*buf == '\0')
-      strlcat(buf, "---", size);
+   if (*s == '\0')
+      _len += strlcpy(s + _len, "---", len - _len);
+   return _len;
 }
 
-void input_config_get_bind_string_joykey(
+size_t input_config_get_bind_string_joykey(
       bool input_descriptor_label_show,
-      char *buf, const char *suffix,
-      const struct retro_keybind *bind, size_t size)
+      char *s, const char *suffix,
+      const struct retro_keybind *bind, size_t len)
 {
+   size_t _len = 0;
    if (GET_HAT_DIR(bind->joykey))
    {
       if (      bind->joykey_label
             && !string_is_empty(bind->joykey_label)
             && input_descriptor_label_show)
-         fill_pathname_join_delim(buf,
-               bind->joykey_label, suffix, ' ', size);
-      else
+         return fill_pathname_join_delim(s,
+               bind->joykey_label, suffix, ' ', len);
+      _len  = snprintf(s, len,
+            "Hat #%u ", (unsigned)GET_HAT(bind->joykey));
+      switch (GET_HAT_DIR(bind->joykey))
       {
-         size_t len  = snprintf(buf, size,
-               "Hat #%u ", (unsigned)GET_HAT(bind->joykey));
-
-         switch (GET_HAT_DIR(bind->joykey))
-         {
-            case HAT_UP_MASK:
-               strlcpy(buf + len, "Up",    size - len);
-               break;
-            case HAT_DOWN_MASK:
-               strlcpy(buf + len, "Down",  size - len);
-               break;
-            case HAT_LEFT_MASK:
-               strlcpy(buf + len, "Left",  size - len);
-               break;
-            case HAT_RIGHT_MASK:
-               strlcpy(buf + len, "Right", size - len);
-               break;
-            default:
-               strlcpy(buf + len, "?",     size - len);
-               break;
-         }
+         case HAT_UP_MASK:
+            _len += strlcpy(s + _len, "Up",    len - _len);
+            break;
+         case HAT_DOWN_MASK:
+            _len += strlcpy(s + _len, "Down",  len - _len);
+            break;
+         case HAT_LEFT_MASK:
+            _len += strlcpy(s + _len, "Left",  len - _len);
+            break;
+         case HAT_RIGHT_MASK:
+            _len += strlcpy(s + _len, "Right", len - _len);
+            break;
+         default:
+            _len += strlcpy(s + _len, "?",     len - _len);
+            break;
       }
    }
    else
@@ -3752,37 +3746,34 @@ void input_config_get_bind_string_joykey(
       if (      bind->joykey_label
             && !string_is_empty(bind->joykey_label)
             && input_descriptor_label_show)
-         fill_pathname_join_delim(buf,
-               bind->joykey_label, suffix, ' ', size);
-      else
-      {
-         size_t _len = strlcpy(buf, "Button ", size);
-         snprintf(buf + _len, size - _len, "%u",
-               (unsigned)bind->joykey);
-      }
+         return fill_pathname_join_delim(s,
+               bind->joykey_label, suffix, ' ', len);
+      _len  = strlcpy(s, "Button ", len);
+      _len += snprintf(s + _len, len - _len, "%u",
+            (unsigned)bind->joykey);
    }
+   return _len;
 }
 
-void input_config_get_bind_string_joyaxis(
+size_t input_config_get_bind_string_joyaxis(
       bool input_descriptor_label_show,
-      char *buf, const char *suffix,
-      const struct retro_keybind *bind, size_t size)
+      char *s, const char *suffix,
+      const struct retro_keybind *bind, size_t len)
 {
+   size_t _len = 0;
    if (      bind->joyaxis_label
          && !string_is_empty(bind->joyaxis_label)
          && input_descriptor_label_show)
-      fill_pathname_join_delim(buf,
-            bind->joyaxis_label, suffix, ' ', size);
-   else
-   {
-      size_t _len = strlcpy(buf, "Axis ", size);
-      if (AXIS_NEG_GET(bind->joyaxis) != AXIS_DIR_NONE)
-         snprintf(buf + _len, size - _len, "-%u",
-               (unsigned)AXIS_NEG_GET(bind->joyaxis));
-      else if (AXIS_POS_GET(bind->joyaxis) != AXIS_DIR_NONE)
-         snprintf(buf + _len, size - _len, "+%u",
-               (unsigned)AXIS_POS_GET(bind->joyaxis));
-   }
+      return fill_pathname_join_delim(s,
+            bind->joyaxis_label, suffix, ' ', len);
+   _len = strlcpy(s, "Axis ", len);
+   if (AXIS_NEG_GET(bind->joyaxis) != AXIS_DIR_NONE)
+      _len += snprintf(s + _len, len - _len, "-%u",
+            (unsigned)AXIS_NEG_GET(bind->joyaxis));
+   else if (AXIS_POS_GET(bind->joyaxis) != AXIS_DIR_NONE)
+      _len += snprintf(s + _len, len - _len, "+%u",
+            (unsigned)AXIS_POS_GET(bind->joyaxis));
+   return _len;
 }
 
 void osk_update_last_codepoint(
@@ -5649,6 +5640,7 @@ void bsv_movie_frame_rewind(void)
 {
    input_driver_state_t *input_st = &input_driver_st;
    bsv_movie_t         *handle    = input_st->bsv_movie_state_handle;
+   bool recording                 = (input_st->bsv_movie_state.flags & BSV_FLAG_MOVIE_RECORDING) ? true : false;
 
    if (!handle)
       return;
@@ -5661,6 +5653,8 @@ void bsv_movie_frame_rewind(void)
       /* If we're at the beginning... */
       handle->frame_ptr = 0;
       intfstream_seek(handle->file, (int)handle->min_file_pos, SEEK_SET);
+      if (recording)
+         intfstream_truncate(handle->file, (int)handle->min_file_pos);
    }
    else
    {
@@ -5672,8 +5666,9 @@ void bsv_movie_frame_rewind(void)
        * plus another. */
       handle->frame_ptr = (handle->frame_ptr -
             (handle->first_rewind ? 1 : 2)) & handle->frame_mask;
-      intfstream_seek(handle->file,
-            (int)handle->frame_pos[handle->frame_ptr], SEEK_SET);
+      intfstream_seek(handle->file, (int)handle->frame_pos[handle->frame_ptr], SEEK_SET);
+      if (recording)
+         intfstream_truncate(handle->file, (int)handle->frame_pos[handle->frame_ptr]);
    }
 
    if (intfstream_tell(handle->file) <= (long)handle->min_file_pos)
@@ -5688,6 +5683,7 @@ void bsv_movie_frame_rewind(void)
           * the starting point. Nice and easy. */
 
          intfstream_seek(handle->file, 4 * sizeof(uint32_t), SEEK_SET);
+         intfstream_truncate(handle->file, 4 * sizeof(uint32_t));
 
          serial_info.data = handle->state;
          serial_info.size = handle->state_size;
@@ -5945,17 +5941,14 @@ bool replay_set_serialized_data(void* buf)
       if (is_compatible)
       {
          /* If the state is part of this replay, go back to that state
-            and rewind the replay; otherwise
-            halt playback and go to that state normally.
+            and rewind/fast forward the replay.
 
             If the savestate movie is after the current replay
             length we can replace the current replay data with it,
             but if it's earlier we can rewind the replay to the
             savestate movie time point.
 
-            This can truncate the current recording, so beware!
-
-            TODO/FIXME: Figure out what to do about rewinding across load
+            This can truncate the current replay if we're in recording mode.
          */
          if (loaded_len > handle_idx)
          {
@@ -5966,10 +5959,15 @@ bool replay_set_serialized_data(void* buf)
             intfstream_write(input_st->bsv_movie_state_handle->file, buffer+sizeof(int32_t), loaded_len);
          }
          else
+         {
             intfstream_seek(input_st->bsv_movie_state_handle->file, loaded_len, SEEK_SET);
+            if (recording)
+               intfstream_truncate(input_st->bsv_movie_state_handle->file, loaded_len);
+         }
       }
       else
       {
+         /* otherwise, if recording do not allow the load */
          if (recording)
          {
             const char *str = msg_hash_to_str(MSG_REPLAY_LOAD_STATE_FAILED_INCOMPAT);
@@ -5979,7 +5977,7 @@ bool replay_set_serialized_data(void* buf)
             RARCH_ERR("[Replay] %s.\n", str);
             return false;
          }
-
+         /* if in playback, halt playback and go to that state normally */
          if (playback)
          {
             const char *str = msg_hash_to_str(MSG_REPLAY_LOAD_STATE_HALT_INCOMPAT);
diff --git a/input/input_driver.h b/input/input_driver.h
index 99f5abf9bc17..3db9c79ebe65 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -949,15 +949,28 @@ void input_remote_free(input_remote_t *handle, unsigned max_users);
 
 void input_game_focus_free(void);
 
-void input_config_get_bind_string_joyaxis(
+/**
+ * Converts a retro_keybind to a human-readable string, optionally allowing a
+ * fallback auto_bind to be used as the source for the string.
+ *
+ * @param buf        A string which will be overwritten with the returned value
+ * @param bind       A binding to convert to a string
+ * @param auto_bind  A default binding which will be used after `bind`. Can be NULL.
+ * @param size       The maximum length that will be written to `buf`
+ */
+size_t input_config_get_bind_string(void *settings_data,
+      char *s, const struct retro_keybind *bind,
+      const struct retro_keybind *auto_bind, size_t len);
+
+size_t input_config_get_bind_string_joyaxis(
       bool input_descriptor_label_show,
-      char *buf, const char *prefix,
-      const struct retro_keybind *bind, size_t size);
+      char *s, const char *prefix,
+      const struct retro_keybind *bind, size_t len);
 
-void input_config_get_bind_string_joykey(
+size_t input_config_get_bind_string_joykey(
       bool input_descriptor_label_show,
-      char *buf, const char *prefix,
-      const struct retro_keybind *bind, size_t size);
+      char *s, const char *prefix,
+      const struct retro_keybind *bind, size_t len);
 
 bool input_key_pressed(int key, bool keyboard_pressed);
 
diff --git a/input/input_remapping.h b/input/input_remapping.h
index 57736e356c90..064770448fef 100644
--- a/input/input_remapping.h
+++ b/input/input_remapping.h
@@ -30,7 +30,7 @@ RETRO_BEGIN_DECLS
 
 /**
  * Loads a remap file from disk to memory.
- * 
+ *
  * @param data Path to config file.
  *
  * @return true (1) if successful, otherwise false (0).
@@ -49,15 +49,15 @@ bool input_remapping_save_file(const char *path);
 /**
  * Caches any global configuration settings that should not be overwritten by
  * input remap changes made while content is running. Must be called on each
- * core init. 
+ * core init.
  */
 void input_remapping_cache_global_config(void);
 
 /**
  * Restores any global configuration settings that were cached on the last core
  * init if INP_FLAG_REMAPPING_CACHE_ACTIVE is set.
- * Must be called on core deinitialization. 
- * 
+ * Must be called on core deinitialization.
+ *
  * @param clear_cache               If true, function becomes a NOOP until the next time
  *                                  `input_remapping_cache_global_config()` is called, and
  *                                  INP_FLAG_REMAPPING_CACHE_ACTIVE is set.
@@ -75,7 +75,7 @@ void input_remapping_restore_global_config(bool clear_cache, bool restore_analog
 void input_remapping_update_port_map(void);
 
 /**
- * Frees runloop_st->name.remapfile and sets these runloop_state flags to false: 
+ * Frees runloop_st->name.remapfile and sets these runloop_state flags to false:
  * remaps_core_active, remaps_content_dir_active, and remaps_game_active.
  *
  * @param save_remap  If true, current remap settings will be saved to
@@ -86,7 +86,7 @@ void input_remapping_deinit(bool save_remap);
 
 /**
  * Used to set the default mapping values within the `settings` struct
- * @param clear_cache  This value is passed to 
+ * @param clear_cache  This value is passed to
  *                     `input_remapping_restore_global_config()`. Please see
  *                     the documentation for that function for details.
  */
@@ -95,9 +95,9 @@ void input_remapping_set_defaults(bool clear_cache);
 /**
  * Checks `input_config_bind_map` for the requested `input_bind_map`, and if
  * the bind has been registered, returns its base.
- * 
+ *
  * @param index
- * 
+ *
  * @return the contents of the meta field, or NULL if there is no matching bind
  */
 const char *input_config_bind_map_get_base(unsigned bind_index);
@@ -115,9 +115,9 @@ unsigned input_config_bind_map_get_meta(unsigned bind_index);
 /**
  * Checks `input_config_bind_map` for the requested `input_bind_map`, and if
  * the bind has been registered, returns a pointer to its description field.
- * 
+ *
  * @param index
- * 
+ *
  * @return the contents of the description field, or NULL if there is no
  *         matching bind
  */
@@ -126,29 +126,16 @@ const char *input_config_bind_map_get_desc(unsigned index);
 /**
  * Checks `input_config_bind_map` for the requested `input_bind_map`, and if
  * the bind has been registered, returns the value of its retro_key field.
- * 
+ *
  * @param index
- * 
+ *
  * @return the value of the retro_key field, or 0 if there is no matching bind
  */
 uint8_t input_config_bind_map_get_retro_key(unsigned index);
 
-/**
- * Converts a retro_keybind to a human-readable string, optionally allowing a
- * fallback auto_bind to be used as the source for the string. 
- *
- * @param buf        A string which will be overwritten with the returned value
- * @param bind       A binding to convert to a string
- * @param auto_bind  A default binding which will be used after `bind`. Can be NULL.
- * @param size       The maximum length that will be written to `buf`
- */
-void input_config_get_bind_string(void *settings_data,
-      char *buf, const struct retro_keybind *bind,
-      const struct retro_keybind *auto_bind, size_t size);
-
 /**
  * Parses the string representation of a retro_key struct
- * 
+ *
  * @param str String to parse.
  *
  * @return Key identifier.
@@ -157,7 +144,7 @@ enum retro_key input_config_translate_str_to_rk(const char *str, size_t len);
 
 /**
  * Searches for a string among the "base" fields of the list of binds.
- * 
+ *
  * @param str String to search for among the binds
  *
  * @return Bind index value on success or RARCH_BIND_LIST_END if not found.
@@ -174,7 +161,7 @@ void config_read_keybinds_conf(void *data);
 
 /**
  * Apply autoconfig binds to the indicated control port.
- * 
+ *
  * @param port
  * @param data  An object of type config_file_t. We assume it is passed as a
  *              void pointer like this to avoid including config_file.h.
diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h
index ab53b4b4f292..e8414df6e426 100644
--- a/intl/msg_hash_ar.h
+++ b/intl/msg_hash_ar.h
@@ -1148,6 +1148,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "تغيير اعدادات النواة."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_USERNAME,
    "اسم المستخدم"
@@ -1875,6 +1883,8 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
    "نسبة الجوانب المخصصة (موضع X)"
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "نسبة الجوانب المخصصة (العرض)"
diff --git a/intl/msg_hash_ast.h b/intl/msg_hash_ast.h
index 67088fe150fe..f61535351820 100644
--- a/intl/msg_hash_ast.h
+++ b/intl/msg_hash_ast.h
@@ -824,6 +824,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_ENABLE,
    "Activar la sincronización na nube"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_USERNAME,
    "Nome d'usuariu"
@@ -1059,6 +1067,8 @@ MSG_HASH(
    "Caltener la proporción del aspeutu"
    )
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_be.h b/intl/msg_hash_be.h
index fc0559fdf2fb..2ce6128b2854 100644
--- a/intl/msg_hash_be.h
+++ b/intl/msg_hash_be.h
@@ -1228,10 +1228,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Дэструктыўная воблачная сінхранізацыя"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Калі адключана, файлы будуць перасунутыя ў тэчку рэзервовай копіі перад іх перазапісам ці выдаленнем."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Бэкенд воблачнай сінхранізацыі"
@@ -2475,6 +2479,8 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
    "Уласныя суадносіны бакоў (пазіцыя Y)"
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Уласныя суадносіны бакоў (шырыня)"
@@ -3556,7 +3562,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_META_GRAB_MOUSE_TOGGLE,
-   "Захапляе або вызваляе мыш. Пры захопе сістэмны курсор схаваны ды абмежаваны акном RetroArch, тым самым паляпшаючы адносны ўвод мышы."
+   "Захапляе або вызваляе мыш. Пры захопе сістэмны курсор схаваны ды абмежаваны акном RetroArch, паляпшаючы адносны ўвод мышы."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_GAME_FOCUS_TOGGLE,
@@ -3575,6 +3581,10 @@ MSG_HASH(
    "Меню працоўнага стала (пераключэнне)"
    )
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_INPUT_META_VRR_RUNLOOP_TOGGLE,
+   "Сінхранізацыя з частатой кадраў змесціва (пераключэнне)"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_RUNAHEAD_TOGGLE,
    "Забяганне (пераключэнне)"
@@ -3625,10 +3635,18 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_BIND_DEFAULTS,
    "Вяртае налады прызначэнняў уводу да прадвызначаных значэнняў."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_INPUT_SAVE_AUTOCONFIG,
+   "Захаваць профіль кантролера"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_MOUSE_INDEX,
    "Індэкс мышы"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_INPUT_MOUSE_INDEX,
+   "Фізічная мыш, распазнаная RetroArch."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_B,
    "Кнопка B (унізе)"
@@ -3677,9 +3695,21 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_JOYPAD_R2,
    "Кнопка R2 (трыгер)"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_INPUT_TURBO_ENABLE,
+   "Турба"
+   )
 
 /* Settings > Latency */
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_RUN_AHEAD_UNSUPPORTED,
+   "[Забяганне недаступнае]"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_RUN_AHEAD_ENABLED,
+   "Забяганне для скарачэння латэнтнасці"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_RUN_AHEAD_FRAMES,
    "Колькасць кадраў забягання"
@@ -3719,6 +3749,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_SET_SUPPORTS_NO_CONTENT_ENABLE,
    "Запускаць ядро аўтаматычна"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CORE_OPTION_CATEGORY_ENABLE,
+   "Катэгорыі опцый ядра"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CORE_INFO_CACHE_ENABLE,
+   "Кэшаванне файлаў звестак ядраў"
+   )
 #ifndef HAVE_DYNAMIC
 #endif
 MSG_HASH(
@@ -3735,6 +3773,10 @@ MSG_HASH(
    "Кіраванне ядрамі"
    )
 
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CORE_MANAGER_STEAM_LIST,
+   "Усталяваць ці выдаліць ядры, якія распаўсюджваюцца праз Steam."
+   )
 
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_STEAM_INSTALL,
@@ -3760,17 +3802,65 @@ MSG_HASH(
    "Усталяванне ядра: "
 )
 
+MSG_HASH(
+   MSG_CORE_STEAM_UNINSTALLED,
+   "Ядро будзе выдалена пры выхадзе з RetroArch."
+)
 
+MSG_HASH(
+   MSG_CORE_STEAM_CURRENTLY_DOWNLOADING,
+   "Ядро зараз сцягваецца"
+)
 #endif
 /* Settings > Configuration */
 
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CONFIG_SAVE_ON_EXIT,
-   "Захоўваць канфігурацыю падчас выхаду"
+   "Захаванне канфігурацыі падчас выхаду"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CONFIG_SAVE_ON_EXIT,
-   "Захоўваць змены ў файл канфігурацыі падчас выхаду."
+   "Захоўвае змены ў файл канфігурацыі падчас выхаду."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_REMAP_SAVE_ON_EXIT,
+   "Захаванне файлаў пераназначэнняў пры выхадзе"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_REMAP_SAVE_ON_EXIT,
+   "Захоўваць змены ў любым уваходным файле пераназначэнняў пры закрыцці змесціва або пры выхадзе з RetroArch."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_GAME_SPECIFIC_OPTIONS,
+   "Аўтаматычная загрузка адмысловых змесціву опцый ядра"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_GAME_SPECIFIC_OPTIONS,
+   "Загружаць дапасаваныя опцыі ядра па змаўчанні пры запуску."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_AUTO_OVERRIDES_ENABLE,
+   "Аўтаматычная загрузка файлаў перавызначэнняў"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_AUTO_OVERRIDES_ENABLE,
+   "Загружаць дапасаваную канфігурацыю пры запуску."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_AUTO_REMAPS_ENABLE,
+   "Аўтаматычная загрузка файлаў пераназначэнняў"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_AUTO_REMAPS_ENABLE,
+   "Загружаць дапасаванае кіраванне пры запуску."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_INITIAL_DISK_CHANGE_ENABLE,
+   "Аўтаматычная загрузка файлаў індэксаў пачатковага дыска"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_INITIAL_DISK_CHANGE_ENABLE,
+   "Пераходзіць да апошняга выкарыстанага дыска пры запуску шматдыскавага змесціва."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_AUTO_SHADERS_ENABLE,
@@ -3780,16 +3870,44 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_GLOBAL_CORE_OPTIONS,
    "Выкарыстанне глабальнага файла опцый ядра"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_GLOBAL_CORE_OPTIONS,
+   "Захаваць усе опцыі ядра ў агульны файл налад (retroarch-core-options.cfg). Калі адключана, опцыі для кожнага ядра будуць захоўвацца ў асобны файл адмысловай ядру тэчкі ўнутры каталога 'Канфігурацыя' RetroArch."
+   )
 
 /* Settings > Saving */
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_ENABLE,
+   "Сартаванне захаванняў па тэчкам з назваў ядраў"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_SORT_SAVEFILES_ENABLE,
+   "Рассартоўваць файлы захаванняў па тэчкам з назвай выкарыстаных ядраў."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_ENABLE,
-   "Рассартоўваць захоўванні станаў па тэчкам назваў ядраў"
+   "Сартаванне захаванняў станаў па тэчкам з назваў ядраў"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_SORT_SAVESTATES_ENABLE,
+   "Рассартоўваць захаванні станаў па тэчкам з назвай выкарыстаных ядраў."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_SORT_SAVEFILES_BY_CONTENT_ENABLE,
+   "Сартаванне захаванняў па тэчкам каталога змесціва"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_SORT_SAVEFILES_BY_CONTENT_ENABLE,
+   "Рассартоўваць файлы захаванняў па тэчкам з назвай каталогаў, дзе размешчана змесціва."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SORT_SAVESTATES_BY_CONTENT_ENABLE,
-   "Рассартоўваць захоўванні станаў па тэчкам каталога змесціва"
+   "Сартаванне захаванняў станаў па тэчкам каталога змесціва"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_SORT_SAVESTATES_BY_CONTENT_ENABLE,
+   "Рассартоўваць захаванні станаў па тэчкам з назвай каталогаў, дзе размешчана змесціва."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SAVESTATE_AUTO_INDEX,
diff --git a/intl/msg_hash_bg.h b/intl/msg_hash_bg.h
index 641a387610a4..1e0fa3ea02ec 100644
--- a/intl/msg_hash_bg.h
+++ b/intl/msg_hash_bg.h
@@ -336,6 +336,14 @@ MSG_HASH(
 
 /* Settings */
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS,
    "Плейлисти"
@@ -379,6 +387,8 @@ MSG_HASH(
 
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_ca.h b/intl/msg_hash_ca.h
index 203be8777c88..ea02994dec55 100644
--- a/intl/msg_hash_ca.h
+++ b/intl/msg_hash_ca.h
@@ -1132,6 +1132,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "Canvia les configuracions de desament."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_USERNAME,
    "Nom d’usuari"
@@ -1907,6 +1915,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Òfset de subàrea de visualització personalitzat per definir la posició de l'eix Y de la subàrea de visualització.\nS'ignora si s'activa 'Escalat d'enter'."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Relació d'aspecte personalitzat (amplada)"
diff --git a/intl/msg_hash_chs.h b/intl/msg_hash_chs.h
index ee4a97a85165..3bbd331d8d95 100644
--- a/intl/msg_hash_chs.h
+++ b/intl/msg_hash_chs.h
@@ -1232,10 +1232,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "破坏性云同步"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "禁用后，文件会在被覆盖或删除之前移至备份文件夹。"
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "云同步后端"
@@ -2559,6 +2563,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "自定义 Y 轴视图偏移量。\n如果启用「整数缩放」则忽略此选项。"
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "自定义宽高比宽度"
diff --git a/intl/msg_hash_cht.h b/intl/msg_hash_cht.h
index 5b4819cde8c0..e7fd81052a19 100644
--- a/intl/msg_hash_cht.h
+++ b/intl/msg_hash_cht.h
@@ -1188,10 +1188,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_ENABLE,
    "嘗試將雲端設定檔、記憶存檔與狀態同步到雲端儲存供應商。"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "若未啟用，覆蓋或刪除前檔案將會移動到備份資料夾。"
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "雲端同步後端"
@@ -2351,6 +2355,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "自訂影像顯示垂直位置, 正數向下移動, 負數向上移動。\n開啟「整數縮放」時此選項被忽略。"
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "自訂寬度"
diff --git a/intl/msg_hash_cs.h b/intl/msg_hash_cs.h
index a90bed0291da..dade613cd53e 100644
--- a/intl/msg_hash_cs.h
+++ b/intl/msg_hash_cs.h
@@ -1200,10 +1200,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Destruktivní cloudová synchronizace"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Pokud je tato funkce vypnuta, jsou soubory před přepsáním nebo odstraněním přesunuty do záložní složky."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Backend cloudové synchronizace"
@@ -2503,6 +2507,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Vlastní posun zobrazení, který se používá k určení polohy osy Y zobrazení.\nTyto údaje jsou ignorovány, pokud je povoleno 'Celočíselné Škálování'."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Vlastní poměr stran (na šířku)"
diff --git a/intl/msg_hash_cy.h b/intl/msg_hash_cy.h
index 3b0868f94943..da51b90ca96c 100644
--- a/intl/msg_hash_cy.h
+++ b/intl/msg_hash_cy.h
@@ -880,6 +880,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "Newid gosodiadau arbed."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
    "Logio"
@@ -1015,6 +1023,8 @@ MSG_HASH(
 
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_da.h b/intl/msg_hash_da.h
index 62a4c7a6e9c4..54ea362522eb 100644
--- a/intl/msg_hash_da.h
+++ b/intl/msg_hash_da.h
@@ -752,6 +752,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "Skift gemmeindstillinger."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
    "Logning"
@@ -971,6 +979,8 @@ MSG_HASH(
 
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h
index bc732000bb4c..04c4d1ca3382 100644
--- a/intl/msg_hash_de.h
+++ b/intl/msg_hash_de.h
@@ -1160,10 +1160,26 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Destruktive Cloud-Synchronisation"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+   "Synchronisieren: Speicherdaten/Savestates"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Synchronisieren: Konfigurationsdateien"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES,
+   "Wenn aktiviert, werden Speicherdaten/Savestates mit der Cloud synchronisiert."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "Wenn aktiviert, werden Konfigurationsdateien mit der Cloud synchronisiert."
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Wenn deaktiviert, werden die Dateien in einen Sicherungsordner verschoben, bevor sie überschrieben oder gelöscht werden."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Cloud-Sync-Backend"
@@ -2467,6 +2483,24 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Benutzerdefinierter Versatz des Ansichtsfensters, welcher die Y-Achsenposition definiert.\nDieser wird ignoriert, wenn \"Ganzzahlige Skalierung\" aktiviert ist."
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_X, 
+   "Benutzerdefinierte Ausrichtung des Ansichtsfensters wird verwendet, um das Ansichtsfenster horizontal zu versetzen (wenn es breiter als die Inhaltshöhe ist).  0.0 bedeutet ganz links und 1.0 bedeutet ganz rechts."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_Y, 
+   "Benutzerdefinierte Ausrichtung des Ansichtsfensters wird verwendet, um das Ansichtsfenster vertikal zu versetzen (wenn es höher als die Inhaltshöhe ist).  0.0 bedeutet oben und 1.0 bedeutet unten."
+   )
+#if defined(RARCH_MOBILE)
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X, 
+   "Benutzerdefinierte Ausrichtung des Ansichtsfensters wird verwendet, um das Ansichtsfenster horizontal zu versetzen (wenn es breiter als die Inhaltshöhe ist).  0.0 bedeutet ganz links und 1.0 bedeutet ganz rechts. (Hochformat)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y, 
+   "Benutzerdefinierte Ausrichtung des Ansichtsfensters wird verwendet, um das Ansichtsfenster vertikal zu versetzen (wenn es höher als die Inhaltshöhe ist).  0.0 bedeutet oben und 1.0 bedeutet unten. (Hochformat)"
+   )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Bildbreite"
diff --git a/intl/msg_hash_el.h b/intl/msg_hash_el.h
index 2499b5bd9446..c5ad546d08ea 100644
--- a/intl/msg_hash_el.h
+++ b/intl/msg_hash_el.h
@@ -1148,6 +1148,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "Αλλαγή ρυθμίσεων αποθήκευσης."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_USERNAME,
    "Όνομα Χρήστη"
@@ -1611,6 +1619,8 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
    "Προτιμώμενη Θέση Άξωνα Y Αναλογίας Οθόνης"
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Προτιμώμενο Πλάτος Αναλογίας Οθόνης"
diff --git a/intl/msg_hash_en.h b/intl/msg_hash_en.h
index b49134be1591..3b59e9ded1e0 100644
--- a/intl/msg_hash_en.h
+++ b/intl/msg_hash_en.h
@@ -128,6 +128,14 @@ MSG_HASH(
 
 /* Settings */
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 
 /* Core option category placeholders for icons */
 
@@ -174,6 +182,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_HELP_SUSPEND_SCREENSAVER_ENABLE,
    "Suspends the screensaver. Is a hint that does not necessarily have to be honoured by the video driver."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_HELP_VIDEO_BLACK_FRAME_INSERTION,
+   "Inserts black frame(s) in between frames for enhanced motion clarity. Only use option designated for your current display refresh rate. Not for use at refresh rates that are non-multiples of 60Hz such as 144Hz, 165Hz, etc. Do not combine with Swap Interval > 1, sub-frames, Frame Delay, or Sync to Exact Content Framerate. Leaving system VRR on is ok, just not that setting. If you notice -any- temporary image retention, you should disable at 120Hz, and for higher Hz adjust the dark frames setting [...]"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_HELP_VIDEO_BFI_DARK_FRAMES,
    "Adjusts the number of frames displayed in the BFI sequence that are black. More black frames increases motion clarity but reduces brightness. Not applicable at 120hz as there is only one total extra 60hz frame, so it must be black otherwise BFI would not be active at all."
@@ -319,6 +331,8 @@ MSG_HASH(
    "Maintain 1:1 pixel aspect ratios when scaling content with the internal IPU. If it's disabled, images will then be stretched to fill the entire display."
    )
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_CROP_OVERSCAN,
    "Cut off a few pixels around the edges of the image customarily left blank by developers which sometimes also contain rubbish pixels."
@@ -2119,6 +2133,10 @@ MSG_HASH(
    MSG_INPUT_KIOSK_MODE_PASSWORD_NOK,
    "Password is incorrect."
    )
+MSG_HASH(
+   MSG_CHEAT_SEARCH_NOT_INITIALIZED,
+   "Searching has not been initialised/started."
+   )
 MSG_HASH(
    MSG_CHEAT_SEARCH_ADDED_MATCHES_TOO_MANY,
    "There's not enough room. The maximum number of simultaneous cheats is 100."
diff --git a/intl/msg_hash_eo.h b/intl/msg_hash_eo.h
index a93f98506bc9..129b86c30520 100644
--- a/intl/msg_hash_eo.h
+++ b/intl/msg_hash_eo.h
@@ -264,6 +264,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "Change settings for the saving."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_LOGGING_SETTINGS,
    "Change settings for the logging."
@@ -415,6 +423,8 @@ MSG_HASH(
 
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h
index 6ad51e765c05..de045a186846 100644
--- a/intl/msg_hash_es.h
+++ b/intl/msg_hash_es.h
@@ -1220,10 +1220,26 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Sincronización destructiva"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+   "Sincronizar: datos guardados/guardados rápidos"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sincronizar: archivos de configuración"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES,
+   "Al activar esta opción se sincronizarán los datos guardados y los guardados rápidos a la nube."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "Al activar esta opción se sincronizarán los archivos de configuración a la nube."
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Al desactivar esta opción, los archivos serán trasladados a una carpeta de copia de seguridad antes de ser sobrescritos o eliminados."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Motor de sincronización en la nube"
@@ -1402,11 +1418,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS,
-   "Energía"
+   "Administración de energía"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS,
-   "Cambia los ajustes de energía."
+   "Cambia los ajustes de la administración de energía."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS,
@@ -2543,6 +2559,56 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Indica el diferencial de posición respecto al eje Y del área de visualización.\nEste valor se ignorará si la opción «Escalar usando números enteros» está activada."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
+   "Compensación del eje X del punto de anclaje del área de visualización"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_X,
+   "Compensación del eje X del punto de anclaje del área de visualización"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_Y,
+   "Compensación del eje Y del punto de anclaje del área de visualización"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_Y,
+   "Compensación del eje Y del punto de anclaje del área de visualización"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_X, 
+   "Compensación personalizada usada para desplazar horizontalmente el área de visualización (si es más ancha que la altura del contenido). 0,0 significa llevar al extremo izquierdo y 1,0 significa llevar al extremo derecho."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_Y, 
+   "Compensación personalizada usada para desplazar verticalmente el área de visualización (si es más alta que la altura del contenido). 0,0 significa llevar al extremo superior y 1,0 significa llevar al extremo inferior."
+   )
+#if defined(RARCH_MOBILE)
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Compensación del eje X del punto de anclaje del área de visualización (orientación vertical)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Compensación del eje X del punto de anclaje del área de visualización (orientación vertical)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "Compensación del eje Y del punto de anclaje del área de visualización (orientación vertical)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "Compensación del eje Y del punto de anclaje del área de visualización (orientación vertical)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X, 
+   "Compensación personalizada usada para desplazar horizontalmente el área de visualización (si es más ancha que la altura del contenido) en una orientación vertical. 0,0 significa llevar al extremo izquierdo y 1,0 significa llevar al extremo derecho."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y, 
+   "Compensación personalizada usada para desplazar verticalmente el área de visualización (si es más alta que la altura del contenido) en una orientación vertical. 0,0 significa llevar al extremo superior y 1,0 significa llevar al extremo inferior."
+   )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Relación de aspecto personalizada (ancho)"
@@ -4294,7 +4360,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_RUN_AHEAD_FRAMES,
-   "Ajusta el número de fotogramas a ejecutar de forma anticipada. Puede haber tirones si el número de fotogramas retrasados supera al valor interno del juego."
+   "Ajusta el número de fotogramas a ejecutar de forma anticipada. Puede haber distorsiones visuales si el número de fotogramas retrasados supera al valor interno del juego."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_RUN_AHEAD_SECONDARY_INSTANCE,
@@ -4334,7 +4400,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_PREEMPT_FRAMES,
-   "Ajusta el número de fotogramas preventivos que se ejecutarán. Puede haber tirones si el número de fotogramas retrasados supera al valor interno del juego."
+   "Ajusta el número de fotogramas preventivos que se ejecutarán. Puede haber distorsiones visuales si el número de fotogramas retrasados supera al valor interno del juego."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PREEMPT_HIDE_WARNINGS,
@@ -5272,19 +5338,19 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OVERLAY_X_OFFSET_LANDSCAPE,
-   "Compensación X de superposición (modo horizontal)"
+   "Desplazamiento X de superposición (modo horizontal)"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_OVERLAY_X_OFFSET_LANDSCAPE,
-   "Compensa la superposición en el eje horizontal al utilizar una orientación de pantalla horizontal. Los valores positivos desplazarán la superposición hacia la derecha y los negativos hacia la izquierda."
+   "Desplaza la superposición en el eje horizontal al utilizar una orientación de pantalla horizontal. Los valores positivos desplazarán la superposición hacia la derecha y los negativos hacia la izquierda."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OVERLAY_Y_OFFSET_LANDSCAPE,
-   "Compensación Y de superposición (modo horizontal)"
+   "Desplazamiento Y de superposición (modo horizontal)"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_OVERLAY_Y_OFFSET_LANDSCAPE,
-   "Compensa la superposición en el eje vertical al utilizar una orientación de pantalla horizontal. Los valores positivos desplazarán la superposición hacia arriba y los negativos hacia abajo."
+   "Desplaza la superposición en el eje vertical al utilizar una orientación de pantalla horizontal. Los valores positivos desplazarán la superposición hacia arriba y los negativos hacia abajo."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OVERLAY_SCALE_PORTRAIT,
@@ -5320,19 +5386,19 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OVERLAY_X_OFFSET_PORTRAIT,
-   "Compensación X de superposición (modo vertical)"
+   "Desplazamiento X de superposición (modo vertical)"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_OVERLAY_X_OFFSET_PORTRAIT,
-   "Compensa la superposición en el eje horizontal al utilizar una orientación de pantalla vertical. Los valores positivos desplazarán la superposición hacia la derecha y los negativos hacia la izquierda."
+   "Desplaza la superposición en el eje horizontal al utilizar una orientación de pantalla vertical. Los valores positivos desplazarán la superposición hacia la derecha y los negativos hacia la izquierda."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OVERLAY_Y_OFFSET_PORTRAIT,
-   "Compensación Y de superposición (modo vertical)"
+   "Desplazamiento Y de superposición (modo vertical)"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_OVERLAY_Y_OFFSET_PORTRAIT,
-   "Compensa la superposición en el eje vertical al utilizar una orientación de pantalla vertical. Los valores positivos desplazarán la superposición hacia arriba y los negativos hacia abajo."
+   "Desplaza la superposición en el eje vertical al utilizar una orientación de pantalla vertical. Los valores positivos desplazarán la superposición hacia arriba y los negativos hacia abajo."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OSK_OVERLAY_SETTINGS,
@@ -6759,11 +6825,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_POWER_MANAGEMENT,
-   "Mostrar Energía"
+   "Mostrar Administración de energía"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_SETTINGS_SHOW_POWER_MANAGEMENT,
-   "Muestra los ajustes de energía."
+   "Muestra los ajustes de administración de energía."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_ACHIEVEMENTS,
@@ -6819,7 +6885,7 @@ MSG_HASH(
 
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_SCALE_FACTOR,
-   "Escala"
+   "Factor de escala"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_MENU_SCALE_FACTOR,
@@ -7415,11 +7481,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_INPUT_LATENCY_FRAMES_MIN,
-   "Indica el número de fotogramas de entrada que se utilizarán para ocultar la latencia durante el juego en red. Reduce los tirones y el uso de la CPU a costa de incrementar la latencia de entrada."
+   "Indica el número de fotogramas de entrada que se utilizarán para ocultar la latencia durante el juego en red. Reduce las distorsiones visuales y el uso de la CPU a costa de incrementar la latencia de entrada."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_HELP_NETPLAY_INPUT_LATENCY_FRAMES_MIN,
-   "El número de fotogramas de retraso en la entrada que utilizará el juego en red para ocultar la latencia de red.\nEsta opción retrasa la entrada local en el juego en red para que el fotograma ejecutado sea más próximo a los fotogramas que se reciban a través de la red, reduciendo los tirones y el consumo de la CPU, pero generará un retraso en la entrada visible."
+   "El número de fotogramas de retraso en la entrada que utilizará el juego en red para ocultar la latencia de red.\nEsta opción retrasa la entrada local en el juego en red para que el fotograma ejecutado sea más próximo a los fotogramas que se reciban a través de la red, reduciendo las distorsiones visuales y el consumo de la CPU, pero generará un retraso en la entrada visible."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_INPUT_LATENCY_FRAMES_RANGE,
@@ -7427,11 +7493,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_INPUT_LATENCY_FRAMES_RANGE,
-   "Indica el rango de fotogramas de entrada que se utilizarán para ocultar la latencia durante el juego en red. Reduce los tirones y el uso de la CPU a costa de incrementar la latencia de entrada."
+   "Indica el rango de fotogramas de entrada que se utilizarán para ocultar la latencia durante el juego en red. Reduce las distorsiones visuales y el uso de la CPU a costa de incrementar la latencia de entrada."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_HELP_NETPLAY_INPUT_LATENCY_FRAMES_RANGE,
-   "El rango de fotogramas de retraso de entrada que puede utilizar el juego en red para camuflar la latencia de red.\nSi esta opción está activada, el juego en red ajustará de forma dinámica el número de fotogramas de retraso en la entrada para equilibrar el uso de la CPU; el retraso de entrada y la latencia de red. Reducirá los tirones y el consumo de la CPU, pero generará un retraso impredecible en las entradas/controles."
+   "El rango de fotogramas de retraso de entrada que puede utilizar el juego en red para camuflar la latencia de red.\nSi esta opción está activada, el juego en red ajustará de forma dinámica el número de fotogramas de retraso en la entrada para equilibrar el uso de la CPU; el retraso de entrada y la latencia de red. Reducirá las distorsiones visuales y el consumo de la CPU, pero generará un retraso impredecible en las entradas/controles."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_NAT_TRAVERSAL,
@@ -11254,7 +11320,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_XMB_THUMBNAIL_SCALE_FACTOR,
-   "Escala de miniaturas"
+   "Factor de escala de miniaturas"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_MENU_XMB_THUMBNAIL_SCALE_FACTOR,
@@ -11508,7 +11574,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_OZONE_THUMBNAIL_SCALE_FACTOR,
-   "Escala de miniaturas"
+   "Factor de escala de miniaturas"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_OZONE_THUMBNAIL_SCALE_FACTOR,
@@ -12472,7 +12538,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_MAX_SWAPCHAIN_IMAGES,
-   "Máximo de imágenes en «swap chain»"
+   "Máximo de imágenes en swap chain"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_MAX_SWAPCHAIN_IMAGES,
@@ -12480,11 +12546,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_HELP_VIDEO_MAX_SWAPCHAIN_IMAGES,
-   "Indica la cantidad máxima de imágenes en «swap chain». Esto indica al controlador de vídeo que utilice un búfer de vídeo concreto.\nBúfer simple: 1\nBúfer doble: 2\nBúfer triple: 3\nSelecciona el búfer más apropiado para mejorar en gran medida la latencia."
+   "Indica la cantidad máxima de imágenes en swap chain. Esto indica al controlador de vídeo que utilice un búfer de vídeo concreto.\nBúfer simple: 1\nBúfer doble: 2\nBúfer triple: 3\nSelecciona el búfer más apropiado para mejorar en gran medida la latencia."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_WAITABLE_SWAPCHAINS,
-   "«Swap chains» en espera"
+   "Swap chains en espera"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_WAITABLE_SWAPCHAINS,
@@ -13825,7 +13891,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MSG_HW_RENDERED_MUST_USE_POSTSHADED_RECORDING,
-   "Este núcleo Libretro se renderiza por hardware. Las grabaciones deben tener shaders aplicados."
+   "Este núcleo libretro se renderiza por hardware. Las grabaciones deben tener shaders aplicados."
    )
 MSG_HASH(
    MSG_INFLATED_CHECKSUM_DID_NOT_MATCH_CRC32,
diff --git a/intl/msg_hash_fa.h b/intl/msg_hash_fa.h
index f4fbd382f3d3..f64f64f6b617 100644
--- a/intl/msg_hash_fa.h
+++ b/intl/msg_hash_fa.h
@@ -1192,6 +1192,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "همگام‌سازی ابری تخریبی"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DRIVER,
    "شیوه‌نامهٔ شبکهٔ فضای ابری که باید استفاده شود."
@@ -1963,6 +1971,8 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
    "نرخ نسبت سفارشی (موقعیت Y)"
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "نرخ نسبت سفارشی (عرض)"
diff --git a/intl/msg_hash_fi.h b/intl/msg_hash_fi.h
index 15537f63c7eb..f38b740cc890 100644
--- a/intl/msg_hash_fi.h
+++ b/intl/msg_hash_fi.h
@@ -1208,10 +1208,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Tuhoava pilvisynkronointi"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Kun pois käytöstä, tiedostot siirretään varmuuskopio-kansioon, ennen kuin niitä korvataan tai poistetaan."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Pilvisynkronoinnin taustaosa"
@@ -2339,6 +2343,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Mukautettu ikkunan siirtymä, jota käytetään ikkunan Y-akselin sijainnin määrittämiseen.\nNämä jätetään huomioimatta, jos 'Skaalaa kokonaisluvuin' on käytössä."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Mukautettu kuvasuhde (Leveys)"
@@ -13512,7 +13518,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_REBOOT,
-   "Käynnistä uudelleen"
+   "Käynnistä laite uudelleen"
    )
 
 /* Environment Specific Settings */
diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h
index ac5ed4b91e0d..1e4357fbce85 100644
--- a/intl/msg_hash_fr.h
+++ b/intl/msg_hash_fr.h
@@ -1196,10 +1196,26 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Synchronisation destructive avec le Cloud"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+   "Synchronisation : Sauvegardes/Sauvegardes instantanées"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Synchronisation : Fichiers de configuration"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES,
+   "Lorsque cette option est activée, les sauvegardes/sauvegardes instantanées seront synchronisés avec le cloud."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "Lorsque cette option est activée, les fichiers de configuration seront synchronisés avec le cloud."
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Lorsque cette option est désactivée, les fichiers sont déplacés vers un dossier de sauvegarde avant d'être remplacés ou supprimés."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Plateforme de synchronisation avec le Cloud"
@@ -2523,6 +2539,56 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Décalage de la fenêtre d'affichage sur l'axe Y.\nCette option sera ignorée si l'option 'Échelle à l'entier' est activée."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
+   "Biais d'ancrage X de la fenêtre d'affichage"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_X,
+   "Biais d'ancrage X de la fenêtre d'affichage"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_Y,
+   "Biais d'ancrage Y de la fenêtre d'affichage"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_Y,
+   "Biais d'ancrage Y de la fenêtre d'affichage"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_X, 
+   "Biais de la fenêtre d'affichage personnalisé utilisé pour décaler la fenêtre d'affichage horizontalement (si plus large que la hauteur du contenu). 0.0 signifie tout à gauche et 1.0 signifie tout à droite."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_Y, 
+   "Biais de la fenêtre d'affichage personnalisé utilisé pour décaler la fenêtre d'affichage verticalement (si plus grande que la hauteur du contenu). 0.0 signifie tout en haut et 1.0 signifie tout en bas."
+   )
+#if defined(RARCH_MOBILE)
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Biais d'ancrage X de la fenêtre d'affichage (orientation portrait)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Biais d'ancrage X de la fenêtre d'affichage (orientation portrait)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "Biais d'ancrage Y de la fenêtre d'affichage (orientation portrait)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "Biais d'ancrage Y de la fenêtre d'affichage (orientation portrait)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X, 
+   "Biais de la fenêtre d'affichage personnalisé utilisé pour décaler la fenêtre d'affichage horizontalement (si plus large que la hauteur du contenu). 0.0 signifie tout à gauche et 1.0 signifie tout à droite. (Orientation portrait)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y, 
+   "Biais de la fenêtre d'affichage personnalisé utilisé pour décaler la fenêtre d'affichage verticalement (si plus grande que la hauteur du contenu). 0.0 signifie tout en haut et 1.0 signifie tout en bas. (Orientation portrait)"
+   )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Largeur de l'affichage (Rapport d'aspect personnalisé)"
diff --git a/intl/msg_hash_gl.h b/intl/msg_hash_gl.h
index 1f0cc3123f83..6563779ca9e2 100644
--- a/intl/msg_hash_gl.h
+++ b/intl/msg_hash_gl.h
@@ -61,7 +61,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CONTENT_SETTINGS,
-   "Accede rápido ás configuracións relevantes do xogo."
+   "Accede rapidamente ás configuracións relevantes da partida."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_LIST,
@@ -151,7 +151,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_ONLINE_UPDATER,
-   "Descarga módulos de extensión, compoñentes e contido para RetroArch."
+   "Descargar complementos, compoñentes e contido para RetroArch."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY,
@@ -1150,7 +1150,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_SETTINGS,
-   "Cambia os axustes da saída de video."
+   "Cambia os axustes da saída de vídeo."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS,
@@ -1158,7 +1158,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_AUDIO_SETTINGS,
-   "Cambiar a configuración de entrada/saída de audio."
+   "Cambia a configuración de entrada e saída do son."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS,
@@ -1220,10 +1220,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Sincronización da nube destrutiva"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Cando está desactivado, os ficheiros móvense a un cartafol de copia de seguranza antes de sobrescribilos ou eliminalos."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Backend de sincronización na nube"
@@ -1398,11 +1402,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_POWER_MANAGEMENT_SETTINGS,
-   "Xestión enerxética"
+   "Xestión da Enerxía"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_POWER_MANAGEMENT_SETTINGS,
-   "Cambia as configuracións da xestión enerxética."
+   "Cambia as configuracións da xestión de enerxía."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_RETRO_ACHIEVEMENTS_SETTINGS,
@@ -2519,6 +2523,24 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Desfase personalizado da ventana gráfica que se usa para definir a posición do eixe Y da ventana gráfica.\nIgnoraranse se está activada a \"Escala enteira\"."
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_X, 
+   "Desviación personalizada do porto de vista usada para compensar o porto de vista horizontalmente (se for máis ancho que a altura do contido). 0.0 significa moi á esquerda e 1.0 significa moi á dereita."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_Y, 
+   "Desviación personalizada do porto de vista usada para compensar o porto de vista verticalmente (se for máis alto que a altura do contido). 0.0 significa arriba e 1.0 significa abaixo."
+   )
+#if defined(RARCH_MOBILE)
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X, 
+   "Desviación personalizada do porto de vista usada para desprazar o porto de vista horizontalmente (se for máis ancho que a altura do contido). 0.0 significa á esquerda e 1.0 significa á dereita. (Orientación en retrato)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y, 
+   "Desviación personalizada do porto de vista usada para compensar o porto de vista verticalmente (se for máis alto que a altura do contido). 0.0 significa arriba e 1.0 significa abaixo. (Orientación en retrato)"
+   )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Relación de aspecto personalizada (ancho)"
@@ -2691,7 +2713,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_MICROPHONE_SETTINGS,
-   "Cambiar a configuración de entrada de audio."
+   "Cambiar a configuración de entrada de son."
    )
 #endif
 MSG_HASH(
@@ -3939,35 +3961,35 @@ MSG_HASH(
 
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PING_TOGGLE,
-   "Ping de Netplay (alternar)"
+   "Ping do Xogo en Rede (alternar)"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PING_TOGGLE,
-   "Activa/desactiva o contador de ping para a sala de netplay actual."
+   "Activa/desactiva o contador de ping para a sala de Xogo en Rede actual."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_HOST_TOGGLE,
-   "Aloxamento de Netplay (alternar)"
+   "Aloxamento de Xogo en Rede (alternar)"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_HOST_TOGGLE,
-   "Activa/desactiva o hospedaxe de netplay."
+   "Activa/desactiva o hospedaxe de Xogo en Rede."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_GAME_WATCH,
-   "Netplay Play/Spectate Mode (alternar)"
+   "Xogo en Rede Modo Xogador / Espectador (alternar)"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_GAME_WATCH,
-   "Cambia a sesión actual de netplay entre os modos \"xogar\" e \"espectador\"."
+   "Cambia a sesión actual do xogo en rede entre os modos \"xogar\" e \"espectador\"."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_PLAYER_CHAT,
-   "Chat de Netplay Player"
+   "Chat de Xogadores no Xogo en Rede"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_META_NETPLAY_PLAYER_CHAT,
-   "Envía unha mensaxe de chat á sesión actual de netplay."
+   "Envía unha mensaxe de chat na sesión actual de Xogo en Rede."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_NETPLAY_FADE_CHAT_TOGGLE,
@@ -4834,11 +4856,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_FASTFORWARD_FRAMESKIP,
-   "Frameskip de avance rápido"
+   "Salto Rápido de Fotogramas"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_FASTFORWARD_FRAMESKIP,
-   "Saltar fotogramas segundo a taxa de avance rápido. Isto aforra enerxía e permite o uso da limitación de cadros de terceiros."
+   "Saltar fotogramas segundo a taxa de avance rápido. Isto conserva enerxía e permite o uso de limitación de fotogramas de terceiros."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SLOWMOTION_RATIO,
@@ -7131,11 +7153,11 @@ MSG_HASH(
 
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_PUBLIC_ANNOUNCE,
-   "Anunciar publicamente Netplay"
+   "Anunciar publicamente o Xogo en Rede"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_PUBLIC_ANNOUNCE,
-   "Indica se hai que anunciar xogos de netplay publicamente. Se non se configura, os clientes deben conectarse manualmente en lugar de usar o vestíbulo público."
+   "Indica se hai que anunciar sesións de xogos en rede publicamente. Se non se configura, os clientes deben conectarse manualmente en lugar de usar o vestíbulo público."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_USE_MITM_SERVER,
@@ -7143,7 +7165,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_USE_MITM_SERVER,
-   "Reenviar conexións de netplay a través dun servidor man-in-the-middle. Útil se o host está detrás dun firewall ou ten problemas con NAT/UPnP."
+   "Reenviar as conexións de xogo en rede a través dun servidor intermediario (man-in-the-middle). Útil se o servidor está detrás dunha devasa (firewall) ou ten problemas con NAT/UPnP."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_MITM_SERVER,
@@ -7187,15 +7209,15 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_IP_ADDRESS,
-   "O enderezo do host ao que se conectar."
+   "O enderezo do servidor ao que se conectar."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_TCP_UDP_PORT,
-   "Porto TCP de Netplay"
+   "Porto TCP do Xogo en Rede"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_TCP_UDP_PORT,
-   "O porto do enderezo IP do host. Pode ser un porto TCP ou UDP."
+   "O porto do enderezo IP do servidor. Pode ser un porto TCP ou UDP."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_MAX_CONNECTIONS,
@@ -7203,15 +7225,15 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_MAX_CONNECTIONS,
-   "O número máximo de conexións activas que o host aceptará antes de rexeitar outras novas."
+   "O número máximo de conexións activas co servidor aceptará antes de rexeitar outras novas."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_MAX_PING,
-   "Limitador de ping"
+   "Limitador de Latencia"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_MAX_PING,
-   "A latencia de conexión máxima (ping) que aceptará o host. Establéceo en 0 sen límite."
+   "A latencia máxima de conexión (ping) que o servidor aceptará. Axústao a 0 para non ter límite."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_PASSWORD,
@@ -7223,7 +7245,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_SPECTATE_PASSWORD,
-   "Spectador do servidor - Só Contrasinal"
+   "Espectador do Servidor - Só Contrasinal"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_SPECTATE_PASSWORD,
@@ -7231,7 +7253,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_START_AS_SPECTATOR,
-   "Modo Spectador Netplay"
+   "Modo Espectador do Xogo en Rede"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_START_AS_SPECTATOR,
@@ -14923,11 +14945,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_FRAME_REST,
-   "Resto de fotogramas"
+   "Pausa de fotogramas"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_FRAME_REST,
-   "Tenta reducir o uso da CPU vsync durmindo o máximo posible despois da presentación do cadro. Deseñado principalmente para sincronización de liña de exploración de terceiros."
+   "Tentar reducir o uso da CPU pola sincronía vertical durmindo o máximo posible tras a presentación do fotograma. Deseñado principalmente para a sincronización de terceiros por scanlines."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PAL60_ENABLE,
diff --git a/intl/msg_hash_he.h b/intl/msg_hash_he.h
index 898935b297da..1db2adac1755 100644
--- a/intl/msg_hash_he.h
+++ b/intl/msg_hash_he.h
@@ -252,6 +252,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS,
    "קלט"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS,
    "סייר קבצים"
@@ -399,6 +407,8 @@ MSG_HASH(
    )
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_hr.h b/intl/msg_hash_hr.h
index d2c7d0944494..bea9a5ef89e4 100644
--- a/intl/msg_hash_hr.h
+++ b/intl/msg_hash_hr.h
@@ -784,6 +784,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SAVING_SETTINGS,
    "Spremanje"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_USERNAME,
    "Korisničko ime"
@@ -955,6 +963,8 @@ MSG_HASH(
    )
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_hu.h b/intl/msg_hash_hu.h
index b151608484a2..209043da22a7 100644
--- a/intl/msg_hash_hu.h
+++ b/intl/msg_hash_hu.h
@@ -1204,10 +1204,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Destruktív szinkronizálás a felhőbe"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Kikapcsolt állapotban a fájlok egy tartalék könyvtárba kerülnek felülírás vagy törlés előtt."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "A felhőszinkronizálás háttértára"
@@ -2531,6 +2535,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Az egyedi nézőablak Y irányú eltolása. \nNincs hatása egész-szorzós skálázáskor."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Egyedi képarány (szélesség)"
@@ -13955,6 +13961,10 @@ MSG_HASH(
    MSG_ACHIEVEMENT_UNLOCKED,
    "Trófea feloldva"
    )
+MSG_HASH(
+   MSG_RARE_ACHIEVEMENT_UNLOCKED,
+   "Ritka trófea feloldva"
+   )
 MSG_HASH(
    MSG_LEADERBOARD_STARTED,
    "Eredménytábla kísérlet elindítva"
diff --git a/intl/msg_hash_id.h b/intl/msg_hash_id.h
index 513e7e8ef997..6711f2f04711 100644
--- a/intl/msg_hash_id.h
+++ b/intl/msg_hash_id.h
@@ -1096,6 +1096,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "Ubah pengaturan penyimpanan."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
    "Pencatatan Log"
@@ -1839,6 +1847,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Offset area pandang khusus yang digunakan untuk menentukan posisi sumbu Y dari area pandang.\n Ini diabaikan jika 'Skala Bilangan Bulat' diaktifkan."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Rasio Aspek Kustom (Lebar)"
@@ -1876,11 +1886,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_HDR_MAX_NITS,
-   "Maksimal Pancaran Cahaya Layar"
+   "Tingkat Serian Layar"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_HDR_MAX_NITS,
-   "Mengatur maksimal pancaran cahaya layar (dalam cd/m2) dari monitor/TV. Kunjungi situs RTings untuk rujukan."
+   "Mengatur tingkat serian layar (dalam cd/m2) dari monitor/TV. Kunjungi situs RTings untuk rujukan."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_HDR_PAPER_WHITE_NITS,
diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h
index 1384629623ab..84de7e318806 100644
--- a/intl/msg_hash_it.h
+++ b/intl/msg_hash_it.h
@@ -1188,10 +1188,26 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Sincronizzazione Cloud Distruttiva"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+   "Sincronizzazione: Salva/Stati"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sincronizza: File Di Configurazione"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES,
+   "Se abilitata, i salvataggi/stati verranno sincronizzati su cloud."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "Se abilitata, i file di configurazione verranno sincronizzati su cloud."
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Quando disabilitato, i file vengono spostati in una cartella di backup prima di essere sovrascritti o cancellati."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Backend Sincronizzazione Cloud"
@@ -2499,6 +2515,56 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Scostamento visuale personalizzato usato per definire la posizione dell'asse Y della porta di visualizzazione.\nQuesti vengono ignorati se 'Scala intera' è abilitata."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
+   "Bias Di Ancoraggio Di Viewport X"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_X,
+   "Bias Di Ancoraggio Di Viewport X"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_Y,
+   "Bias Di Ancoraggio Di Viewport Y"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_Y,
+   "Bias Di Ancoraggio Di Viewport Y"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_X, 
+   "Bias di visualizzazione personalizzata utilizzato per spostare la vista orizzontalmente (se più ampia dell'altezza del contenuto). 0.0 significa lontano a sinistra e 1.0 significa lontano a destra."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_Y, 
+   "Bias di visualizzazione personalizzata utilizzato per spostare la porta di visualizzazione verticalmente (se più alta dell'altezza del contenuto). 0.0 significa superiore e 1.0 significa basso."
+   )
+#if defined(RARCH_MOBILE)
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Bias Di Ancoraggio Di Viewport X (Orientamento Verticale)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Bias Di Ancoraggio Di Viewport X (Orientamento Verticale)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "Bias Di Ancoraggio Di Viewport Y (Orientamento Verticale)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "Bias Di Ancoraggio Di Viewport Y (Orientamento Verticale)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X, 
+   "Bias di visualizzazione personalizzata utilizzato per spostare la vista orizzontalmente (se più ampia dell'altezza del contenuto). 0.0 significa lontano a sinistra e 1.0 significa lontano a destra. (Orientamento verticale)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y, 
+   "Bias di visualizzazione personalizzata utilizzato per spostare la porta di visualizzazione verticalmente (se più alta dell'altezza del contenuto). 0.0 significa superiore e 1.0 significa inferiore. (Orientamento verticale)"
+   )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Rapporto d'aspetto personalizzato(in Larghezza)"
diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index 4aad031c1253..1b0e3bae596d 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -1228,10 +1228,26 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "破壊的なクラウド同期"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+   "同期: セーブ/ステート"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "同期: 設定ファイル"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES,
+   "有効にすると、セーブ/ステートがクラウドに同期されます。"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "有効にすると、設定ファイルがクラウドに同期されます。"
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "無効にすると、ファイルは上書きまたは削除される前にバックアップフォルダに移動されます。"
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "クラウド同期のバックエンド"
@@ -1266,11 +1282,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
-   "ロギング"
+   "ログ"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_LOGGING_SETTINGS,
-   "ロギングの設定を変更します。"
+   "ログの設定を変更します。"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_MENU_FILE_BROWSER_SETTINGS,
@@ -2060,7 +2076,15 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SCAN_SUBFRAMES,
-   "ローリングスキャンラインシミュレーション"
+   "ループ回転スキャンラインシミュレーション"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_SCAN_SUBFRAMES,
+   "画面を垂直に分割し、サブフレームの数に応じて画面の各部分をレンダリングすることで、複数のサブフレームにわたるブラウン管をカメラで撮影したときのようなループ回転スキャンラインをシミュレートします。"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_HELP_VIDEO_SCAN_SUBFRAMES,
+   "画面を垂直に分割し、画面の上端から下端にあるサブフレームの数に応じて画面の各部分をレンダリングすることで、複数のサブフレームにわたるブラウン管をカメラで撮影したときのようなループ回転スキャンラインをシミュレートします。"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_GPU_SCREENSHOT,
@@ -2541,8 +2565,58 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
-   "表示領域の Y軸位置を定義するために使用されるカスタム表示領域オフセットです。\n[整数倍拡大] が有効の場合は無視されます。"
+   "表示領域の Y 軸位置を定義するために使用されるカスタム表示領域オフセットです。\n[整数倍拡大] が有効の場合は無視されます。"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
+   "表示領域 X 座標補正"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_X,
+   "表示領域 X 座標補正"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_Y,
+   "表示領域 Y 座標補正"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_Y,
+   "表示領域 Y 座標補正"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_X, 
+   "表示領域がコンテンツの幅より広い場合、水平方向のオフセットに使用される補正値です。0.0 は左端を、1.0 は右端を表します。"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_Y, 
+   "表示領域がコンテンツの高さより高い場合、垂直方向のオフセットに使用される補正値です。0.0 は上端を、1.0 は下端を表します。"
+   )
+#if defined(RARCH_MOBILE)
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "表示領域 X 座標補正 (縦向き)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "表示領域 X 座標補正 (縦向き)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "表示領域 Y 座標補正 (縦向き)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "表示領域 Y 座標補正 (縦向き)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X, 
+   "表示領域がコンテンツの幅より広い場合、水平方向のオフセットに使用される補正値です。0.0 は左端を、1.0 は右端を表します (縦向き)。"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y, 
+   "表示領域がコンテンツの高さより高い場合、垂直方向のオフセットに使用される補正値です。0.0 は上端を、1.0 は下端を表します (縦向き)。"
+   )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "カスタムアスペクト比 (幅)"
@@ -4065,6 +4139,34 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_DEVICE_INDEX,
    "RetroArch によって認識された物理コントローラーです。"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_RESERVED_DEVICE_NAME,
+   "このプレイヤーの予約デバイス"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_INPUT_DEVICE_RESERVED_DEVICE_NAME,
+   "このコントローラーは予約モードに応じてこのプレイヤーに割り当てられます。"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_DEVICE_RESERVATION_NONE,
+   "予約なし"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_DEVICE_RESERVATION_PREFERRED,
+   "優先"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_DEVICE_RESERVATION_RESERVED,
+   "予約"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_INPUT_DEVICE_RESERVATION_TYPE,
+   "デバイス予約タイプ"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_INPUT_DEVICE_RESERVATION_TYPE,
+   "優先: 指定されたデバイスが存在する場合、このプレイヤーに割り当てられます。予約: このプレイヤーには他のコントローラーが割り当てられません。"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_REMAP_PORT,
    "割り当てるポート"
@@ -4732,7 +4834,7 @@ MSG_HASH(
 
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOG_VERBOSITY,
-   "ロギングの出力"
+   "ログの出力"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_LOG_VERBOSITY,
@@ -4740,7 +4842,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_FRONTEND_LOG_LEVEL,
-   "フロントエンドのロギング出力レベル"
+   "フロントエンドのログ出力レベル"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_FRONTEND_LOG_LEVEL,
@@ -4748,7 +4850,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LIBRETRO_LOG_LEVEL,
-   "コアのロギング出力レベル"
+   "コアのログ出力レベル"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_LIBRETRO_LOG_LEVEL,
@@ -4780,7 +4882,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_LOG_TO_FILE,
-   "システムイベントログメッセージをファイルにリダイレクトします。[ロギングの出力] を有効にする必要があります。"
+   "システムイベントログメッセージをファイルにリダイレクトします。[ログの出力] を有効にする必要があります。"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOG_TO_FILE_TIMESTAMP,
@@ -4788,7 +4890,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_LOG_TO_FILE_TIMESTAMP,
-   "ファイルにロギングする際、RetroArch の各セッションごとに新たなタイムスタンプ付きのファイルに出力します。無効にすると、ログは RetroArch を再起動するたび上書きされます。"
+   "ファイルにログを出力する際、RetroArch の各セッションごとに新たなタイムスタンプ付きのファイルに出力します。無効にすると、ログは RetroArch を再起動するたび上書きされます。"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PERFCNT_ENABLE,
@@ -6671,11 +6773,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_LOGGING,
-   "[ロギング] を表示"
+   "[ログ] を表示"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_SETTINGS_SHOW_LOGGING,
-   "[ロギング] 設定を表示します。"
+   "[ログ] 設定を表示します。"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SETTINGS_SHOW_FILE_BROWSER,
@@ -6898,7 +7000,11 @@ MSG_HASH(
 
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_AI_SERVICE_MODE,
-   "AIサービス出力"
+   "AI サービス出力"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_AI_SERVICE_MODE,
+   "テキストオーバーレイ (画像モード)、テキスト読み上げ (音声)、または NVDA (ナレーター) のようなスクリーンリーダーのいずれかで翻訳を表示します。"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_AI_SERVICE_URL,
@@ -7010,7 +7116,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CHEEVOS_UNLOCK_SOUND_ENABLE,
-   "実績を獲得したときにサウンドを再生します。"
+   "実績を解除したときにサウンドを再生します。"
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CHEEVOS_AUTO_SCREENSHOT,
@@ -14117,7 +14223,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MSG_ACHIEVEMENT_UNLOCKED,
-   "実績をアンロックしました"
+   "実績を解除しました"
+   )
+MSG_HASH(
+   MSG_RARE_ACHIEVEMENT_UNLOCKED,
+   "レアな実績を解除しました"
    )
 MSG_HASH(
    MSG_LEADERBOARD_STARTED,
diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h
index ca4b00a69e5a..df09db723532 100644
--- a/intl/msg_hash_ko.h
+++ b/intl/msg_hash_ko.h
@@ -1232,10 +1232,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "파괴적 클라우드 동기화"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "비활성화할 경우, 동기화 대상 파일들을 덮어씌우거나 삭제하지 않고 백업 폴더에 저장합니다."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "클라우드 동기화 백엔드"
@@ -2559,6 +2563,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "뷰포트의 Y축 위치를 정의하는 데 사용되는 사용자 뷰포트 오프셋입니다.\n'정수 단위 화면 크기'가 활성화된 경우 무시되고 자동으로 중앙이 됩니다."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "사용자 화면비 폭"
diff --git a/intl/msg_hash_lbl.h b/intl/msg_hash_lbl.h
index 24c5102e571a..484f3bce2558 100644
--- a/intl/msg_hash_lbl.h
+++ b/intl/msg_hash_lbl.h
@@ -3636,6 +3636,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_CLOUD_SYNC_DESTRUCTIVE,
    "cloud_sync_destructive"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_SAVES,
+   "cloud_sync_sync_saves"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "cloud_sync_sync_configs"
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_CLOUD_SYNC_DRIVER,
    "cloud_sync_driver"
@@ -4126,6 +4134,24 @@ MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX,
    "aspect_ratio_index"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
+   "video_viewport_bias_x"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_Y,
+   "video_viewport_bias_y"
+   )
+#if defined(RARCH_MOBILE)
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "video_viewport_bias_portrait_x"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "video_viewport_bias_portrait_y"
+   )
+#endif
 #if defined(DINGUX)
 MSG_HASH(
    MENU_ENUM_LABEL_VIDEO_DINGUX_IPU_KEEP_ASPECT,
diff --git a/intl/msg_hash_mt.h b/intl/msg_hash_mt.h
index f03c7775dba8..dd3972057b2b 100644
--- a/intl/msg_hash_mt.h
+++ b/intl/msg_hash_mt.h
@@ -52,6 +52,14 @@
 
 /* Settings */
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 
 /* Core option category placeholders for icons */
 
@@ -91,6 +99,8 @@
 
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_nl.h b/intl/msg_hash_nl.h
index 48a6ad6df3bf..a7d32445926d 100644
--- a/intl/msg_hash_nl.h
+++ b/intl/msg_hash_nl.h
@@ -1088,6 +1088,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "Instellingen voor opslaan wijzigen."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_USERNAME,
    "Gebruikersnaam"
@@ -2075,6 +2083,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Aangepaste weergave-offset gebruikt voor het definiëren van de Y-as positie van de weergave.\nDeze worden genegeerd als 'Integer Schaal' is ingeschakeld."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Aangepaste Beeldverhouding (Breedte)"
diff --git a/intl/msg_hash_no.h b/intl/msg_hash_no.h
index 9d67f625d8f2..77ce98e30c84 100644
--- a/intl/msg_hash_no.h
+++ b/intl/msg_hash_no.h
@@ -1160,10 +1160,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_ENABLE,
    "Aktiver Sky-Synkronisering"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Når deaktivert, flyttes filer til en sikkerhetskopimappe før de overskrives eller slettes."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_URL,
    "URL for sky-lagring"
@@ -1927,6 +1931,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Tilpasset visningsregion forskyvning bruk for å definere Y-aksen av visningsregionen.\nDisse er ignorert hvis \"heltall skalering\" er aktivert."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Egendefinert størrelsesforhold (bredde)"
diff --git a/intl/msg_hash_oc.h b/intl/msg_hash_oc.h
index f5f694eaf5fa..e0594a3c2e6a 100644
--- a/intl/msg_hash_oc.h
+++ b/intl/msg_hash_oc.h
@@ -204,6 +204,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS,
    "Vidèo"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS,
    "Listas de lectura"
@@ -259,6 +267,8 @@ MSG_HASH(
 
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_or.h b/intl/msg_hash_or.h
index 10267f89d1be..b8b2c9626ee7 100644
--- a/intl/msg_hash_or.h
+++ b/intl/msg_hash_or.h
@@ -324,6 +324,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS,
    "ଅଡ଼ିଓ"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_PLAYLIST_SETTINGS,
    "ଚାଳନତାଲିକା"
@@ -383,6 +391,8 @@ MSG_HASH(
 
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_pl.h b/intl/msg_hash_pl.h
index 806b17b95d47..61a8d0e823f1 100644
--- a/intl/msg_hash_pl.h
+++ b/intl/msg_hash_pl.h
@@ -1212,10 +1212,26 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Destrukcyjna synchronizacja w chmurze"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+   "Synchronizacja: Zapisy/Stany"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Synchronizacja: Pliki konfiguracyjne"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES,
+   "Po włączeniu zapisy/stany zostaną zsynchronizowane z chmurą."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "Po włączeniu pliki konfiguracyjne zostaną zsynchronizowane z chmurą."
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Gdy wyłączone, pliki są przenoszone do folderu kopii zapasowej przed nadpisaniem lub usunięciem."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Back-end synchronizacji w chmurze"
@@ -2503,6 +2519,40 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Własne przesunięcie widoku używane do zdefiniowania położenia osi Y widoku.\nSą one ignorowane, jeśli włączona jest „skala całkowita”."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
+   "Podgląd zakotwiczenia X"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_X,
+   "Podgląd zakotwiczenia X"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_X, 
+   "Własny widok używany do wyrównywania widoku poziomo (jeśli jest większy niż wysokość zawartości). 0.0 oznacza lewy i 1.0 oznacza prawo."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_Y, 
+   "Własny widok używany do wyrównywania widoku poziomo (jeśli jest większy niż wysokość zawartości). 0.0 oznacza lewy i 1.0 oznacza prawo."
+   )
+#if defined(RARCH_MOBILE)
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Podgląd kotwicy X (orientacja pionowa)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Podgląd kotwicy X (orientacja pionowa)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X, 
+   "Własny widok używany do wyrównywania widoku poziomo (jeśli jest większy niż wysokość zawartości). 0.0 oznacza lewo, a 1.0 oznacza prawo. (orientacja pionowa)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y, 
+   "Własny widok używany do przesuwania widoku pionowo (jeśli jest wyższy niż wysokość zawartości). 0.0 oznacza górny i 1.0 oznacza dolny (orientacja pionowa)"
+   )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Niestandardowy współczynnik proporcji (szerokość)"
diff --git a/intl/msg_hash_pt_br.h b/intl/msg_hash_pt_br.h
index efde0311f636..18b679063bb5 100644
--- a/intl/msg_hash_pt_br.h
+++ b/intl/msg_hash_pt_br.h
@@ -127,7 +127,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_SHOW_WIMP,
-   "Menu da área de trabalho"
+   "Abrir menu tradicional"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_SHOW_WIMP,
@@ -199,11 +199,15 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_QUIT_RETROARCH,
-   "Fecha o RetroArch.\nOBSERVAÇÃO: \"Salvar configuração ao sair\" está ativado."
+   "Fecha o RetroArch.\n\"Salvar configuração ao sair\" está ativado."
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_QUIT_RETROARCH_NOSAVE,
-   "Fecha o RetroArch.\nOBSERVAÇÃO: \"Salvar configuração ao sair\" está desativado."
+   "Fecha o RetroArch.\n\"Salvar configuração ao sair\" está desativado."
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_HELP_QUIT_RETROARCH,
+   "Sair do RetroArch. Matar o programa de qualquer maneira difícil (SIGKILL, etc.) encerrará o RetroArch sem salvar a configuração. Em Unix-likes, SIGINT/SIGTERM permite uma desinicialização limpa que inclui salvamento de configuração se ativado."
    )
 
 /* Main Menu > Load Core */
@@ -511,6 +515,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_SAVESTATE_DETERMINISTIC,
    "Determinístico (salva/carrega, rebobina, execução antecipada, Netplay)"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE_IN_CONTENT_DIRECTORY,
+   "- Nota: Os arquivos do sistema estão no Diretório de Conteúdo' está ativado no momento."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CORE_INFO_FIRMWARE_PATH,
    "- Pesquisando em: \"%s\""
@@ -1196,10 +1204,46 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_ENABLE,
    "Tentativa de sincronizar configurações, sram e salvamentos para um provedor de armazenamento em nuvem."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
+   "Sincronia de Nuvem Destrutiva"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+   "Sincronização: Salvas/Estados"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sincronização: Arquivos de Configuração"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES,
+   "Quando ativado, salvar/estados serão sincronizados para a nuvem."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "Quando ativado, os arquivos de configuração serão sincronizados para a nuvem."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "Quando desativado, os arquivos são movidos para uma pasta de backup antes de serem substituídos ou excluídos."
+   )      
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
+   "Sincronização da nuvem Backend"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DRIVER,
+   "Qual protocolo de rede de armazenamento na nuvem usar?"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_URL,
    "Link do Armazenamento na Nuvem"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_URL,
+   "A URL para a entrada de API aponta para o serviço de armazenamento em nuvem."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_USERNAME,
    "Usuário"
@@ -1212,6 +1256,10 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_PASSWORD,
    "Senha"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_PASSWORD,
+   "Sua senha para sua conta de armazenamento na nuvem."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
    "Registro de eventos"
@@ -1442,12 +1490,16 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_DRIVER,
-   "Driver de entrada a ser utilizado. Alguns drivers de vídeo forçam um driver de entrada diferente."
+   "Define o driver de entrada.\nOs drivers de vídeo podem forçar um driver de entrada diferente."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_JOYPAD_DRIVER,
    "Controle"
    )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_JOYPAD_DRIVER,
+   "Define o driver de controle (requer reinício)."
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_HELP_JOYPAD_DRIVER_DINPUT,
    "Driver de controle DirectInput."
@@ -1467,7 +1519,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_DRIVER,
-   "Driver de vídeo a ser utilizado."
+   "Define o driver de vídeo."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_HELP_VIDEO_DRIVER_GL1,
@@ -1547,7 +1599,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_AUDIO_DRIVER,
-   "Driver de áudio a ser utilizado."
+   "Define o driver de áudio."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_HELP_AUDIO_DRIVER_RSOUND,
@@ -1596,7 +1648,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_MICROPHONE_DRIVER,
-   "Driver de microfone a usar."
+   "Define o driver de microfone."
    )
 #endif
 MSG_HASH(
@@ -1613,15 +1665,15 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CAMERA_DRIVER,
-   "Driver de câmera a ser utilizado."
+   "Define o driver de câmera."
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_BLUETOOTH_DRIVER,
-   "Driver Bluetooth a ser utilizado."
+   "Define o driver de Bluetooth."
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_WIFI_DRIVER,
-   "Driver de Wi-Fi a ser utilizado."
+   "Define o driver de Wi-Fi."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOCATION_DRIVER,
@@ -1629,7 +1681,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_LOCATION_DRIVER,
-   "Driver de localização a ser utilizado."
+   "Define o driver de localização."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_MENU_DRIVER,
+   "Define o driver do menu (requer reinício)."
    )
 MSG_HASH(
    MENU_ENUM_LABEL_HELP_MENU_DRIVER_XMB,
@@ -1641,11 +1697,11 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_RECORD_DRIVER,
-   "Driver de gravação a ser utilizado."
+   "Define o driver de gravação."
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_MIDI_DRIVER,
-   "Driver MIDI a ser utilizado."
+   "Define o driver MIDI."
    )
 
 /* Settings > Video */
@@ -2247,6 +2303,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Deslocamento personalizado no eixo-Y da janela de exibição. \nSerá ignorado caso o \"dimensionamento com valores inteiros\" estiver ativado."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Largura personalizada da proporção de tela"
@@ -3368,7 +3426,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_INPUT_META_UI_COMPANION_TOGGLE,
-   "Menu do desktop (alternar)"
+   "Menu tradicional (ativar/desativar)"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_INPUT_META_UI_COMPANION_TOGGLE,
@@ -5090,9 +5148,13 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_UI_COMPANION_START_ON_BOOT,
    "Iniciar o assistente de interface na inicialização"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_DESKTOP_MENU_ENABLE,
+   "Menu tradicional (requer reinício)"
+   )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_UI_COMPANION_TOGGLE,
-   "Abrir o menu de desktop na inicialização"
+   "Abrir o menu tradicional ao iniciar"
    )
 
 /* Settings > User Interface > Menu Item Visibility */
@@ -7051,7 +7113,7 @@ MSG_HASH(
    )
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_NETPLAY_REFRESH_LAN,
-   "Atualizar lista de rede local (LAN)"
+   "Atualizar rede local (LAN)"
    )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_NETPLAY_REFRESH_LAN,
diff --git a/intl/msg_hash_pt_pt.h b/intl/msg_hash_pt_pt.h
index 7e81de4c4bb0..faad6621650d 100644
--- a/intl/msg_hash_pt_pt.h
+++ b/intl/msg_hash_pt_pt.h
@@ -1108,6 +1108,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "Modificar as definições de gravação."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_USERNAME,
    "Utilizador"
@@ -1923,6 +1931,8 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
    "Proporção personalizada do ecrã na posição Y"
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Proporção personalizada da largura do ecrã"
diff --git a/intl/msg_hash_ro.h b/intl/msg_hash_ro.h
index f03c7775dba8..dd3972057b2b 100644
--- a/intl/msg_hash_ro.h
+++ b/intl/msg_hash_ro.h
@@ -52,6 +52,14 @@
 
 /* Settings */
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 
 /* Core option category placeholders for icons */
 
@@ -91,6 +99,8 @@
 
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h
index e5475232d2c2..a86bf0e33ece 100644
--- a/intl/msg_hash_ru.h
+++ b/intl/msg_hash_ru.h
@@ -1228,10 +1228,26 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Деструктивная облачная синхронизация"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+   "Синхронизация: карты памяти/сохранения"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Синхронизация: файлы конфигураций"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES,
+   "Если включено, карты памяти/сохранения будут синхронизироваться с облаком."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "Если включено, файлы конфигураций будут синхронизироваться с облаком."
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Если отключено, перед удалением или перезаписью файлы помещаются в каталог резервирования."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Бэкенд облачной синхронизации"
@@ -2559,6 +2575,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Ручная установка смещения области отображения по оси Y.\nНе учитывается, если включено 'Целочисленное масштабирование'."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Пользовательское соотношение сторон (ширина)"
diff --git a/intl/msg_hash_si.h b/intl/msg_hash_si.h
index 913697a1e3f5..fe155a9f695d 100644
--- a/intl/msg_hash_si.h
+++ b/intl/msg_hash_si.h
@@ -116,6 +116,14 @@ MSG_HASH(
 
 /* Settings */
 
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 
 /* Core option category placeholders for icons */
 
@@ -155,6 +163,8 @@ MSG_HASH(
 
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/msg_hash_sk.h b/intl/msg_hash_sk.h
index 90c3c267bba0..6722bc4a808c 100644
--- a/intl/msg_hash_sk.h
+++ b/intl/msg_hash_sk.h
@@ -1144,6 +1144,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_ENABLE,
    "Povoliť cloud synchronizáciu"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_USERNAME,
    "Meno používateľa"
@@ -1887,6 +1895,8 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_Y,
    "Vlastný pomer strán (pozícia Y)"
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Vlastný pomer strán (šírka)"
diff --git a/intl/msg_hash_sr.h b/intl/msg_hash_sr.h
index dead0ff7cf80..e04e63fab318 100644
--- a/intl/msg_hash_sr.h
+++ b/intl/msg_hash_sr.h
@@ -1108,6 +1108,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "Izmeni podešavanja za usnimavanje."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
    "Beleženje"
@@ -1787,6 +1795,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Postavi ofset za prozor prikaza kada se definiše pozicija prozora prikaza na Y osi.\nOvo se ignoriše ako je 'Celobrojno skaliranje' uključeno."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Postavi odnos ekrana (širina)"
diff --git a/intl/msg_hash_sv.h b/intl/msg_hash_sv.h
index 530780d81cf6..dbe928350371 100644
--- a/intl/msg_hash_sv.h
+++ b/intl/msg_hash_sv.h
@@ -1144,10 +1144,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Destruktiv molnsynkning"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Inaktiverat flyttas filer till en säkerhetskopia innan de skrivs över eller raderas."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Backend för molnsynk"
@@ -2251,6 +2255,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Anpassad visningsportoffset som används för att definiera Y-axelns position för visningsporten.\nDessa ignoreras om 'Heltalsskala' är aktiverat."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Anpassa bildformat (Bredd)"
diff --git a/intl/msg_hash_tr.h b/intl/msg_hash_tr.h
index a7e9e2e99605..4bdec87015eb 100644
--- a/intl/msg_hash_tr.h
+++ b/intl/msg_hash_tr.h
@@ -1216,10 +1216,26 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Bulut Eşitleme Koruması"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+   "Eşitleyici: Kayıtlar/Durumlar"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Eşitleyici: Yapılandırma Dosyaları"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES,
+   "Etkinleştirildiğinde, kayıtlar/durumlar bulut ile eşitlenecektir."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "Etkinleştirildiğinde yapılandırma dosyaları bulut ile eşitlenecektir."
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "Devre dışı bırakıldığında, dosyalar üzerine yazılmadan veya silinmeden önce yedek klasörüne taşınır."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Bulut Eşitleyici Arka Uç"
@@ -2539,6 +2555,56 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Görünüm penceresinin Y ekseni konumunu tanımlamak için kullanılan özel görünüm alanı ofseti.\n'Tam sayı Ölçeği' etkinse bunlar yok sayılır."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
+   "Görünüm Bağlantı Noktası X"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_X,
+   "Görünüm Bağlantı Noktası X"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_Y,
+   "Görünüm Bağlantı Noktası Y"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_Y,
+   "Görünüm Bağlantı Noktası Y"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_X, 
+   "Görüntü alanını yatay olarak dengelemek için kullanılan özel görüntü alanı sapması (içerik yüksekliğinden daha genişse).  0,0 en sol, 1,0 ise en sağ anlamına gelir."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_Y, 
+   "Görüntü alanını dikey olarak dengelemek için kullanılan özel görüntü alanı sapması (içerik yüksekliğinden daha uzunsa).  0,0 üst, 1,0 ise alt anlamına gelir."
+   )
+#if defined(RARCH_MOBILE)
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Görünüm Bağlantı Noktası X (Portre Yönü)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Görünüm Bağlantı Noktası X (Portre Yönü)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "Görünüm Bağlantı Noktası Y (Portre Yönü)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "Görünüm Bağlantı Noktası Y (Portre Yönü)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X, 
+   "Görüntü alanını yatay olarak dengelemek için kullanılan özel görüntü alanı sapması (içerik yüksekliğinden daha genişse).  0,0 en sol, 1,0 ise en sağ anlamına gelir. (Portre Yönü)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y, 
+   "Görüntü alanını dikey olarak dengelemek için kullanılan özel görüntü alanı sapması (içerik yüksekliğinden daha uzunsa).  0,0 üst, 1,0 ise alt anlamına gelir. (Portre Yönü)"
+   )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Özel En Boy Oranı (Genişlik)"
diff --git a/intl/msg_hash_uk.h b/intl/msg_hash_uk.h
index 75968608abe4..3f612a1675b8 100644
--- a/intl/msg_hash_uk.h
+++ b/intl/msg_hash_uk.h
@@ -1228,10 +1228,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Деструктивна хмарна синхронізація"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "У вимкненому стані, файли переміщуються до резервного каталогу перед перезаписом чи видаленням."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Бекенд хмарної синхронізації"
@@ -2359,6 +2363,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Задати значення зсуву області перегляду по осі Y.\nІгнорується, якщо включено параметр «Цілочисельне масштабування»."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Довільне співвідношення сторін (ширина)"
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index f1654078ae51..0faeea183eea 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -1244,10 +1244,26 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DESTRUCTIVE,
    "Destructive Cloud Sync"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+   "Sync: Saves/States"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES,
+   "When enabled, saves/states will be synced to cloud."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS,
+   "When enabled, configuration files will be synced to cloud."
+   )
 MSG_HASH(
    MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
    "When disabled, files are moved to a backup folder before being overwritten or deleted."
-   )
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_DRIVER,
    "Cloud Sync Backend"
@@ -2599,6 +2615,56 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Custom viewport offset used for defining the Y-axis position of the viewport.\nThese are ignored if 'Integer Scale' is enabled."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
+   "Viewport Anchor Bias X"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_X,
+   "Viewport Anchor Bias X"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_Y,
+   "Viewport Anchor Bias Y"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_Y,
+   "Viewport Anchor Bias Y"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_X, 
+   "Custom viewport bias used to offset the viewport horizontally (if wider than content height).  0.0 means far left and 1.0 means far right."
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_Y, 
+   "Custom viewport bias used to offset the viewport vertically (if taller than content height).  0.0 means top and 1.0 means bottom."
+   )
+#if defined(RARCH_MOBILE)
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Viewport Anchor Bias X (Portrait Orientation)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+   "Viewport Anchor Bias X (Portrait Orientation)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "Viewport Anchor Bias Y (Portrait Orientation)"
+   )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+   "Viewport Anchor Bias Y (Portrait Orientation)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X, 
+   "Custom viewport bias used to offset the viewport horizontally (if wider than content height).  0.0 means far left and 1.0 means far right. (Portrait Orientation)"
+   )
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y, 
+   "Custom viewport bias used to offset the viewport vertically (if taller than content height).  0.0 means top and 1.0 means bottom. (Portrait Orientation)"
+   )
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Custom Aspect Ratio (Width)"
diff --git a/intl/msg_hash_val.h b/intl/msg_hash_val.h
index 92d2b8b91c4d..2b088388376f 100644
--- a/intl/msg_hash_val.h
+++ b/intl/msg_hash_val.h
@@ -1124,6 +1124,14 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_SAVING_SETTINGS,
    "Canvia els ajustos de guardat."
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS,
    "Registres"
@@ -1819,6 +1827,8 @@ MSG_HASH(
    MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y,
    "Indica el diferencial de posició respecte a l'eix Y de l'área de visualització.\nEste valor s'ignorarà si l'opció «Escalar usant nombres sencers» hi és activa."
    )
+#if defined(RARCH_MOBILE)
+#endif
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_CUSTOM_WIDTH,
    "Relació d'aspecte personalitzat (amplària)"
diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h
index 8c65caa89ffa..66c138171200 100644
--- a/intl/msg_hash_vn.h
+++ b/intl/msg_hash_vn.h
@@ -1064,6 +1064,14 @@ MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_ENABLE,
    "Bật đồng bộ hóa đám mây"
    )
+MSG_HASH(
+   MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+   "Sync: Configuration Files"
+   )      
+MSG_HASH(
+   MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE,
+   "When disabled, files are moved to a backup folder before being overwritten or deleted."
+   )      
 MSG_HASH(
    MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_USERNAME,
    "Tên truy nhập"
@@ -1315,6 +1323,8 @@ MSG_HASH(
    )
 #if defined(DINGUX)
 #endif
+#if defined(RARCH_MOBILE)
+#endif
 
 /* Settings > Video > HDR */
 
diff --git a/intl/progress.h b/intl/progress.h
index cc2f50b18c29..aed61e96d70c 100644
--- a/intl/progress.h
+++ b/intl/progress.h
@@ -7,7 +7,7 @@
 #define LANGUAGE_PROGRESS_ASTURIAN_APPROVED   5
 
 /* Belarusian */
-#define LANGUAGE_PROGRESS_BELARUSIAN_TRANSLATED 35
+#define LANGUAGE_PROGRESS_BELARUSIAN_TRANSLATED 36
 #define LANGUAGE_PROGRESS_BELARUSIAN_APPROVED   0
 
 /* Bulgarian */
@@ -31,7 +31,7 @@
 #define LANGUAGE_PROGRESS_DANISH_APPROVED   0
 
 /* German */
-#define LANGUAGE_PROGRESS_GERMAN_TRANSLATED 100
+#define LANGUAGE_PROGRESS_GERMAN_TRANSLATED 99
 #define LANGUAGE_PROGRESS_GERMAN_APPROVED   14
 
 /* Greek */
@@ -39,7 +39,7 @@
 #define LANGUAGE_PROGRESS_GREEK_APPROVED   0
 
 /* English, United Kingdom */
-#define LANGUAGE_PROGRESS_ENGLISH_UNITED_KINGDOM_TRANSLATED 94
+#define LANGUAGE_PROGRESS_ENGLISH_UNITED_KINGDOM_TRANSLATED 95
 #define LANGUAGE_PROGRESS_ENGLISH_UNITED_KINGDOM_APPROVED   0
 
 /* Esperanto */
@@ -48,14 +48,14 @@
 
 /* Spanish */
 #define LANGUAGE_PROGRESS_SPANISH_TRANSLATED 100
-#define LANGUAGE_PROGRESS_SPANISH_APPROVED   90
+#define LANGUAGE_PROGRESS_SPANISH_APPROVED   89
 
 /* Persian */
 #define LANGUAGE_PROGRESS_PERSIAN_TRANSLATED 12
 #define LANGUAGE_PROGRESS_PERSIAN_APPROVED   0
 
 /* Finnish */
-#define LANGUAGE_PROGRESS_FINNISH_TRANSLATED 77
+#define LANGUAGE_PROGRESS_FINNISH_TRANSLATED 76
 #define LANGUAGE_PROGRESS_FINNISH_APPROVED   46
 
 /* French */
@@ -87,11 +87,11 @@
 #define LANGUAGE_PROGRESS_ITALIAN_APPROVED   0
 
 /* Japanese */
-#define LANGUAGE_PROGRESS_JAPANESE_TRANSLATED 99
+#define LANGUAGE_PROGRESS_JAPANESE_TRANSLATED 100
 #define LANGUAGE_PROGRESS_JAPANESE_APPROVED   0
 
 /* Korean */
-#define LANGUAGE_PROGRESS_KOREAN_TRANSLATED 99
+#define LANGUAGE_PROGRESS_KOREAN_TRANSLATED 98
 #define LANGUAGE_PROGRESS_KOREAN_APPROVED   0
 
 /* Dutch */
@@ -155,6 +155,6 @@
 #define LANGUAGE_PROGRESS_CHINESE_SIMPLIFIED_APPROVED   45
 
 /* Chinese Traditional */
-#define LANGUAGE_PROGRESS_CHINESE_TRADITIONAL_TRANSLATED 89
+#define LANGUAGE_PROGRESS_CHINESE_TRADITIONAL_TRANSLATED 88
 #define LANGUAGE_PROGRESS_CHINESE_TRADITIONAL_APPROVED   76
 
diff --git a/libretro-common/dynamic/dylib.c b/libretro-common/dynamic/dylib.c
index c64a6ca22e50..673233f9afe7 100644
--- a/libretro-common/dynamic/dylib.c
+++ b/libretro-common/dynamic/dylib.c
@@ -129,17 +129,17 @@ dylib_t dylib_load(const char *path)
    dylib_t lib = (dylib_t)sceKernelLoadStartModule(path, 0, NULL, 0, NULL, &res);
 #elif IOS
     dylib_t lib;
-    static const char fwSuffix[] = ".framework";
-    if (string_ends_with(path, fwSuffix))
+    static const char fw_suffix[] = ".framework";
+    if (string_ends_with(path, fw_suffix))
     {
-        char fwPath[PATH_MAX_LENGTH] = {0};
-        strlcat(fwPath, path, sizeof(fwPath));
-        size_t sz = strlcat(fwPath, "/", sizeof(fwPath));
-        const char *fwName = path_basename(path);
-        // Assume every framework binary is named for the framework. Not always
-        // a great assumption but correct enough for our uses.
-        strlcpy(fwPath + sz, fwName, strlen(fwName) - STRLEN_CONST(fwSuffix) + 1);
-        lib = dlopen(fwPath, RTLD_LAZY | RTLD_LOCAL);
+        char fw_path[PATH_MAX_LENGTH];
+        const char *fw_name = path_basename(path);
+        size_t sz = strlcpy(fw_path, path, sizeof(fw_path));
+        sz += strlcpy(fw_path + sz, "/", sizeof(fw_path) - sz);
+        /* Assume every framework binary is named for the framework. Not always
+         * a great assumption but correct enough for our uses. */
+        strlcpy(fw_path + sz, fw_name, strlen(fw_name) - STRLEN_CONST(fw_suffix) + 1);
+        lib = dlopen(fw_path, RTLD_LAZY | RTLD_LOCAL);
     }
     else
         lib = dlopen(path, RTLD_LAZY | RTLD_LOCAL);
diff --git a/libretro-common/file/archive_file.c b/libretro-common/file/archive_file.c
index 40ece85ab53f..0a30211ae12c 100644
--- a/libretro-common/file/archive_file.c
+++ b/libretro-common/file/archive_file.c
@@ -20,7 +20,6 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -63,7 +62,7 @@ static int file_archive_get_file_list_cb(
       /* Skip if directory. */
       if (last_char == '/' || last_char == '\\' )
          return 1;
-      
+
       string_list_initialize(&ext_list);
       if (string_split_noalloc(&ext_list, valid_exts, "|"))
       {
@@ -531,7 +530,7 @@ int file_archive_compressed_read(
       const char * path, void **buf,
       const char* optional_filename, int64_t *length)
 {
-   const struct 
+   const struct
       file_archive_file_backend *backend = NULL;
    struct string_list *str_list          = NULL;
 
diff --git a/libretro-common/file/file_path.c b/libretro-common/file/file_path.c
index ee87e3714efb..e8baaa6c9adf 100644
--- a/libretro-common/file/file_path.c
+++ b/libretro-common/file/file_path.c
@@ -71,27 +71,27 @@
 
 /* Time format strings with AM-PM designation require special
  * handling due to platform dependence */
-void strftime_am_pm(char *s, size_t len, const char* format,
+size_t strftime_am_pm(char *s, size_t len, const char* format,
       const void *ptr)
 {
-   char *local = NULL;
+   size_t _len              = 0;
+   char *local              = NULL;
    const struct tm *timeptr = (const struct tm*)ptr;
-
    /* Ensure correct locale is set
     * > Required for localised AM/PM strings */
    setlocale(LC_TIME, "");
-
-   strftime(s, len, format, timeptr);
+   _len = strftime(s, len, format, timeptr);
 #if !(defined(__linux__) && !defined(ANDROID))
    if ((local = local_to_utf8_string_alloc(s)))
    {
       if (!string_is_empty(local))
-         strlcpy(s, local, len);
+         _len = strlcpy(s, local, len);
 
       free(local);
       local = NULL;
    }
 #endif
+   return _len;
 }
 
 /**
@@ -1422,7 +1422,7 @@ void fill_pathname_application_dir(char *s, size_t len)
 #endif
 }
 
-void fill_pathname_home_dir(char *s, size_t len)
+size_t fill_pathname_home_dir(char *s, size_t len)
 {
 #ifdef __WINRT__
    const char *home = uwp_dir_data;
@@ -1430,9 +1430,9 @@ void fill_pathname_home_dir(char *s, size_t len)
    const char *home = getenv("HOME");
 #endif
    if (home)
-      strlcpy(s, home, len);
-   else
-      *s = 0;
+      return strlcpy(s, home, len);
+   *s = 0;
+   return 0;
 }
 #endif
 
diff --git a/libretro-common/include/array/rhmap.h b/libretro-common/include/array/rhmap.h
index d6aec9014249..7427433d3ffb 100644
--- a/libretro-common/include/array/rhmap.h
+++ b/libretro-common/include/array/rhmap.h
@@ -228,6 +228,23 @@ RHMAP__UNUSED static void* rhmap__grow(void* old_ptr, size_t elem_size, size_t r
    return new_vals;
 }
 
+/* This is just a custom version of strdup so we don't have an inherent
+ * dependency on strdup for this file. It is functionally equivalent to
+ * a system-provided strdup */
+static char *rhmap_strdup(const char *s)
+{
+    char *out;
+    int count = 0;
+    while (s[count])
+        ++count;
+    ++count;
+    out = malloc(sizeof(char) * count);
+    out[--count] = 0;
+    while (--count >= 0)
+        out[count] = s[count];
+    return out;
+}
+
 RHMAP__UNUSED static ptrdiff_t rhmap__idx(struct rhmap__hdr* hdr, uint32_t key, const char * str, int add, size_t del)
 {
    uint32_t i;
@@ -260,7 +277,14 @@ RHMAP__UNUSED static ptrdiff_t rhmap__idx(struct rhmap__hdr* hdr, uint32_t key,
       }
       if (!hdr->keys[i])
       {
-         if (add) { hdr->len++; hdr->keys[i] = key; if (str) hdr->key_strs[i] = strdup(str); return (ptrdiff_t)i; }
+         if (add)
+         {
+            hdr->len++;
+            hdr->keys[i] = key;
+            if (str)
+               hdr->key_strs[i] = rhmap_strdup(str);
+            return (ptrdiff_t)i;
+         }
          return (ptrdiff_t)-1;
       }
    }
diff --git a/libretro-common/include/file/file_path.h b/libretro-common/include/file/file_path.h
index d410cc43b002..f1a34a76c57c 100644
--- a/libretro-common/include/file/file_path.h
+++ b/libretro-common/include/file/file_path.h
@@ -68,7 +68,7 @@ void path_linked_list_free(struct path_linked_list *in_path_linked_list);
 
 /**
  * Add a node to the linked list with this path
- * If the first node's path if it's not yet set, 
+ * If the first node's path if it's not yet set,
  * set this instead
 **/
 void path_linked_list_add_path(struct path_linked_list *in_path_linked_list, char *path);
@@ -342,7 +342,7 @@ size_t fill_str_dated_filename(char *out_filename,
  * a backslash on Windows too which takes precedence
  * over regular slash.
 
- * Hidden non-leaf function cost: 
+ * Hidden non-leaf function cost:
  * - calls strrchr
  *
  * @return pointer to last slash/backslash found in @str.
@@ -468,8 +468,8 @@ void fill_pathname_resolve_relative(char *out_path, const char *in_refpath,
  * Joins a directory (@dir) and path (@path) together.
  * Makes sure not to get two consecutive slashes
  * between directory and path.
- * 
- * Hidden non-leaf function cost: 
+ *
+ * Hidden non-leaf function cost:
  * - calls strlcpy at least once
  * - calls fill_pathname_slash()
  *
@@ -497,7 +497,7 @@ size_t fill_pathname_join(char *out_path, const char *dir,
  * Makes sure not to get two consecutive slashes
  * between directory and path.
  *
- * Hidden non-leaf function cost: 
+ * Hidden non-leaf function cost:
  * - calls strlcpy 2x
  * - calls find_last_slash()
  *
@@ -522,7 +522,7 @@ size_t fill_pathname_join_special_ext(char *out_path,
  * Joins a directory (@dir) and path (@path) together
  * using the given delimiter (@delim).
  *
- * Hidden non-leaf function cost: 
+ * Hidden non-leaf function cost:
  * - can call strlen
  * - can call strlcpy
  * - can call strlcat
@@ -539,9 +539,9 @@ size_t fill_pathname_abbreviate_special(char *out_path,
 /**
  * fill_pathname_abbreviated_or_relative:
  *
- * Fills the supplied path with either the abbreviated path or 
+ * Fills the supplied path with either the abbreviated path or
  * the relative path, which ever one has less depth / number of slashes
- * 
+ *
  * If lengths of abbreviated and relative paths are the same,
  * the relative path will be used
  * @in_path can be an absolute, relative or abbreviated path
@@ -555,10 +555,10 @@ size_t fill_pathname_abbreviated_or_relative(char *out_path,
  * pathname_conform_slashes_to_os:
  *
  * @path               : path
- * 
+ *
  * Leaf function.
  *
- * Changes the slashes to the correct kind for the os 
+ * Changes the slashes to the correct kind for the os
  * So forward slash on linux and backslash on Windows
  **/
 void pathname_conform_slashes_to_os(char *path);
@@ -569,7 +569,7 @@ void pathname_conform_slashes_to_os(char *path);
  *
  * Leaf function.
  *
- * Change all slashes to forward so they are more 
+ * Change all slashes to forward so they are more
  * portable between Windows and Linux
  **/
 void pathname_make_slashes_portable(char *path);
@@ -620,7 +620,7 @@ void path_basedir_wrapper(char *path);
  * Assumes path is a directory. Appends a slash
  * if not already there.
 
- * Hidden non-leaf function cost: 
+ * Hidden non-leaf function cost:
  * - calls find_last_slash()
  *   - can call strlcat once if it returns false
  * - calls strlen
@@ -630,7 +630,7 @@ size_t fill_pathname_slash(char *path, size_t size);
 #if !defined(RARCH_CONSOLE) && defined(RARCH_INTERNAL)
 void fill_pathname_application_path(char *buf, size_t size);
 void fill_pathname_application_dir(char *buf, size_t size);
-void fill_pathname_home_dir(char *buf, size_t size);
+size_t fill_pathname_home_dir(char *buf, size_t size);
 #endif
 
 /**
@@ -663,8 +663,10 @@ bool path_mkdir(const char *dir);
 bool path_is_directory(const char *path);
 
 /* Time format strings with AM-PM designation require special
- * handling due to platform dependence */
-void strftime_am_pm(char *s, size_t len, const char* format,
+ * handling due to platform dependence
+ * @return Length of the string written to @s
+ */
+size_t strftime_am_pm(char *s, size_t len, const char* format,
       const void* timeptr);
 
 bool path_is_character_special(const char *path);
diff --git a/libretro-common/include/streams/interface_stream.h b/libretro-common/include/streams/interface_stream.h
index b62552f219d9..497025933571 100644
--- a/libretro-common/include/streams/interface_stream.h
+++ b/libretro-common/include/streams/interface_stream.h
@@ -88,6 +88,9 @@ int intfstream_getc(intfstream_internal_t *intf);
 int64_t intfstream_seek(intfstream_internal_t *intf,
       int64_t offset, int whence);
 
+int64_t intfstream_truncate(intfstream_internal_t *intf,
+      uint64_t len);
+
 void intfstream_rewind(intfstream_internal_t *intf);
 
 int64_t intfstream_tell(intfstream_internal_t *intf);
diff --git a/libretro-common/libco/ppc.c b/libretro-common/libco/ppc.c
index 88faed611b47..b6f8d1893742 100644
--- a/libretro-common/libco/ppc.c
+++ b/libretro-common/libco/ppc.c
@@ -51,6 +51,14 @@ or are directly to function */
 	#endif
 #endif
 
+/* Whether the code should be inline asm stored in .text, or the original
+array buffer */
+#ifndef LIBCO_STATIC_TEXT
+   #if defined(WIIU)
+      #define LIBCO_STATIC_TEXT 1
+   #endif
+#endif
+
 #ifdef LIBCO_PPC_ASM
 
 	#ifdef __cplusplus
@@ -61,6 +69,225 @@ or are directly to function */
 	void co_swap_asm(cothread_t, cothread_t);
 	#define CO_SWAP_ASM(x, y) co_swap_asm(x, y)
 
+#elif LIBCO_STATIC_TEXT
+
+asm(
+	".globl libco_ppc_code\n"
+	"libco_ppc_code:\n"
+#if LIBCO_PPC64
+	"mfcr    %r8\n"
+	"std     %r1,40(%r4)\n"
+	"mflr    %r9\n"
+	"std     %r14,72(%r4)\n"
+	"std     %r15,80(%r4)\n"
+	"std     %r16,88(%r4)\n"
+	"std     %r17,96(%r4)\n"
+	"std     %r18,104(%r4)\n"
+	"std     %r19,112(%r4)\n"
+	"std     %r20,120(%r4)\n"
+	"std     %r21,128(%r4)\n"
+	"std     %r22,136(%r4)\n"
+	"std     %r23,144(%r4)\n"
+	"std     %r24,152(%r4)\n"
+	"std     %r25,160(%r4)\n"
+	"std     %r26,168(%r4)\n"
+	"std     %r27,176(%r4)\n"
+	"std     %r28,184(%r4)\n"
+	"std     %r29,192(%r4)\n"
+	"std     %r30,200(%r4)\n"
+	"std     %r31,208(%r4)\n"
+	"std     %r9,32(%r4)\n"
+	"ld      %r7,32(%r3)\n"
+	"ld      %r1,40(%r3)\n"
+	"bl      1f\n"
+	"trap\n"
+	"1:stw     %r8,48(%r4)\n"
+	"lwz     %r6,48(%r3)\n"
+	"mtctr   %r7\n"
+	"ld      %r14,72(%r3)\n"
+	"ld      %r15,80(%r3)\n"
+	"ld      %r16,88(%r3)\n"
+	"ld      %r17,96(%r3)\n"
+	"ld      %r18,104(%r3)\n"
+	"ld      %r19,112(%r3)\n"
+	"ld      %r20,120(%r3)\n"
+	"ld      %r21,128(%r3)\n"
+	"ld      %r22,136(%r3)\n"
+	"ld      %r23,144(%r3)\n"
+	"ld      %r24,152(%r3)\n"
+	"ld      %r25,160(%r3)\n"
+	"ld      %r26,168(%r3)\n"
+	"ld      %r27,176(%r3)\n"
+	"ld      %r28,184(%r3)\n"
+	"ld      %r29,192(%r3)\n"
+	"ld      %r30,200(%r3)\n"
+	"ld      %r31,208(%r3)\n"
+	"mtcr    %r6\n"
+#else
+	"mfcr    %r8\n"
+	"stw     %r1,40(%r4)\n"
+	"mflr    %r9\n"
+	"stw     %r13,60(%r4)\n"
+	"stw     %r14,64(%r4)\n"
+	"stw     %r15,68(%r4)\n"
+	"stw     %r16,72(%r4)\n"
+	"stw     %r17,76(%r4)\n"
+	"stw     %r18,80(%r4)\n"
+	"stw     %r19,84(%r4)\n"
+	"stw     %r20,88(%r4)\n"
+	"stw     %r21,92(%r4)\n"
+	"stw     %r22,96(%r4)\n"
+	"stw     %r23,100(%r4)\n"
+	"stw     %r24,104(%r4)\n"
+	"stw     %r25,108(%r4)\n"
+	"stw     %r26,112(%r4)\n"
+	"stw     %r27,116(%r4)\n"
+	"stw     %r28,120(%r4)\n"
+	"stw     %r29,124(%r4)\n"
+	"stw     %r30,128(%r4)\n"
+	"stw     %r31,132(%r4)\n"
+	"stw     %r9,32(%r4)\n"
+	"lwz     %r7,32(%r3)\n"
+	"lwz     %r1,40(%r3)\n"
+	"bl      1f\n"
+	"trap\n"
+	"1:stw     %r8,48(%r4)\n"
+	"lwz     %r6,48(%r3)\n"
+	"mtctr   %r7\n"
+	"lwz     %r13,60(%r3)\n"
+	"lwz     %r14,64(%r3)\n"
+	"lwz     %r15,68(%r3)\n"
+	"lwz     %r16,72(%r3)\n"
+	"lwz     %r17,76(%r3)\n"
+	"lwz     %r18,80(%r3)\n"
+	"lwz     %r19,84(%r3)\n"
+	"lwz     %r20,88(%r3)\n"
+	"lwz     %r21,92(%r3)\n"
+	"lwz     %r22,96(%r3)\n"
+	"lwz     %r23,100(%r3)\n"
+	"lwz     %r24,104(%r3)\n"
+	"lwz     %r25,108(%r3)\n"
+	"lwz     %r26,112(%r3)\n"
+	"lwz     %r27,116(%r3)\n"
+	"lwz     %r28,120(%r3)\n"
+	"lwz     %r29,124(%r3)\n"
+	"lwz     %r30,128(%r3)\n"
+	"lwz     %r31,132(%r3)\n"
+	"mtcr    %r6\n"
+#endif
+
+#ifndef LIBCO_PPC_NOFP
+	"stfd    %f14,224(%r4)\n"
+	"stfd    %f15,232(%r4)\n"
+	"stfd    %f16,240(%r4)\n"
+	"stfd    %f17,248(%r4)\n"
+	"stfd    %f18,256(%r4)\n"
+	"stfd    %f19,264(%r4)\n"
+	"stfd    %f20,272(%r4)\n"
+	"stfd    %f21,280(%r4)\n"
+	"stfd    %f22,288(%r4)\n"
+	"stfd    %f23,296(%r4)\n"
+	"stfd    %f24,304(%r4)\n"
+	"stfd    %f25,312(%r4)\n"
+	"stfd    %f26,320(%r4)\n"
+	"stfd    %f27,328(%r4)\n"
+	"stfd    %f28,336(%r4)\n"
+	"stfd    %f29,344(%r4)\n"
+	"stfd    %f30,352(%r4)\n"
+	"stfd    %f31,360(%r4)\n"
+	"lfd     %f14,224(%r3)\n"
+	"lfd     %f15,232(%r3)\n"
+	"lfd     %f16,240(%r3)\n"
+	"lfd     %f17,248(%r3)\n"
+	"lfd     %f18,256(%r3)\n"
+	"lfd     %f19,264(%r3)\n"
+	"lfd     %f20,272(%r3)\n"
+	"lfd     %f21,280(%r3)\n"
+	"lfd     %f22,288(%r3)\n"
+	"lfd     %f23,296(%r3)\n"
+	"lfd     %f24,304(%r3)\n"
+	"lfd     %f25,312(%r3)\n"
+	"lfd     %f26,320(%r3)\n"
+	"lfd     %f27,328(%r3)\n"
+	"lfd     %f28,336(%r3)\n"
+	"lfd     %f29,344(%r3)\n"
+	"lfd     %f30,352(%r3)\n"
+	"lfd     %f31,360(%r3)\n"
+#endif
+
+#ifdef __ALTIVEC__
+	"mfvrsave %r5\n"
+	"addi    %r8,%r4,384\n"
+	"addi    %r9,%r4,400\n"
+	"andi.   %r0,%r5,4095\n"
+	"stw     %r5,52(%r4)\n"
+	"beq-    2\n"
+	"stvx    %v20,%r0,%r8\n"
+	"addi    %r8,%r8,32\n"
+	"stvx    %v21,%r0,%r9\n"
+	"addi    %r9,%r9,32\n"
+	"stvx    %v22,%r0,%r8\n"
+	"addi    %r8,%r8,32\n"
+	"stvx    %v23,%r0,%r9\n"
+	"addi    %r9,%r9,32\n"
+	"stvx    %v24,%r0,%r8\n"
+	"addi    %r8,%r8,32\n"
+	"stvx    %v25,%r0,%r9\n"
+	"addi    %r9,%r9,32\n"
+	"stvx    %v26,%r0,%r8\n"
+	"addi    %r8,%r8,32\n"
+	"stvx    %v27,%r0,%r9\n"
+	"addi    %r9,%r9,32\n"
+	"stvx    %v28,%r0,%r8\n"
+	"addi    %r8,%r8,32\n"
+	"stvx    %v29,%r0,%r9\n"
+	"addi    %r9,%r9,32\n"
+	"stvx    %v30,%r0,%r8\n"
+	"stvx    %v31,%r0,%r9\n"
+	"2:lwz     %r5,52(%r3)\n"
+	"addi    %r8,%r3,384\n"
+	"addi    %r9,%r3,400\n"
+	"andi.   %r0,%r5,4095\n"
+	"mtvrsave %r5\n"
+	"beqctr  \n"
+	"lvx     %v20,%r0,%r8\n"
+	"addi    %r8,%r8,32\n"
+	"lvx     %v21,%r0,%r9\n"
+	"addi    %r9,%r9,32\n"
+	"lvx     %v22,%r0,%r8\n"
+	"addi    %r8,%r8,32\n"
+	"lvx     %v23,%r0,%r9\n"
+	"addi    %r9,%r9,32\n"
+	"lvx     %v24,%r0,%r8\n"
+	"addi    %r8,%r8,32\n"
+	"lvx     %v25,%r0,%r9\n"
+	"addi    %r9,%r9,32\n"
+	"lvx     %v26,%r0,%r8\n"
+	"addi    %r8,%r8,32\n"
+	"lvx     %v27,%r0,%r9\n"
+	"addi    %r9,%r9,32\n"
+	"lvx     %v28,%r0,%r8\n"
+	"addi    %r8,%r8,32\n"
+	"lvx     %v29,%r0,%r9\n"
+	"addi    %r9,%r9,32\n"
+	"lvx     %v30,%r0,%r8\n"
+	"lvx     %v31,%r0,%r9\n"
+#endif
+	"bctr"
+);
+
+extern void libco_ppc_code(cothread_t, cothread_t);
+
+#if LIBCO_PPCDESC
+/* Function call goes through indirect descriptor */
+#define CO_SWAP_ASM(x, y) \
+			((void (*)(cothread_t, cothread_t)) (uintptr_t) x)(x, y)
+#else
+/* Function call goes directly to code */
+#define CO_SWAP_ASM(x, y) \
+			libco_ppc_code(x, y)
+#endif
+
 #else
 
 /* Swap code is here in array. Please leave dieassembly comments,
@@ -364,7 +591,7 @@ void co_delete(cothread_t t)
 
 static void co_init_(void)
 {
-#if LIBCO_MPROTECT
+#if LIBCO_MPROTECT && !LIBCO_STATIC_TEXT
    /* TODO: pre- and post-pad PPC code so that this doesn't make other
       data executable and writable */
    long page_size = sysconf(_SC_PAGESIZE);
diff --git a/libretro-common/lists/nested_list.c b/libretro-common/lists/nested_list.c
index a57858cfa926..4c5be0f5e652 100644
--- a/libretro-common/lists/nested_list.c
+++ b/libretro-common/lists/nested_list.c
@@ -518,7 +518,7 @@ const char *nested_list_item_get_id(nested_list_item_t *list_item)
  * @address   : a delimited list of item identifiers,
  *              corresponding to item 'levels'
  * @len       : length of supplied @address char array
- 
+
  * Fetches a compound @address string corresponding to
  * the specified item's 'position' in the top level
  * nested list of which it is a member. The resultant
@@ -577,14 +577,15 @@ bool nested_list_item_get_address(nested_list_item_t *list_item,
    /* Build address string */
    for (i = id_list.size; i > 0; i--)
    {
+      size_t _len;
       const char *id = id_list.elems[i - 1].data;
 
       if (string_is_empty(id))
          goto end;
 
-      strlcat(address, id, len);
+      _len = strlcat(address, id, len);
       if (i > 1)
-         strlcat(address, delim, len);
+         strlcpy(address + _len, delim, len - _len);
    }
 
    success = true;
diff --git a/libretro-common/lists/string_list.c b/libretro-common/lists/string_list.c
index 65be0bccbb37..e092cfcd32c3 100644
--- a/libretro-common/lists/string_list.c
+++ b/libretro-common/lists/string_list.c
@@ -270,9 +270,9 @@ void string_list_join_concat(char *buffer, size_t size,
 
    for (i = 0; i < list->size; i++)
    {
-      strlcat(buffer, list->elems[i].data, size);
+      size_t _len = strlcat(buffer, list->elems[i].data, size);
       if ((i + 1) < list->size)
-         strlcat(buffer, delim, size);
+         strlcpy(buffer + _len, delim, size - _len);
    }
 }
 
diff --git a/libretro-common/streams/interface_stream.c b/libretro-common/streams/interface_stream.c
index 5f65c491aa62..3f769fdf2b45 100644
--- a/libretro-common/streams/interface_stream.c
+++ b/libretro-common/streams/interface_stream.c
@@ -309,6 +309,26 @@ int64_t intfstream_seek(
    return -1;
 }
 
+int64_t intfstream_truncate(intfstream_internal_t *intf, uint64_t len)
+{
+   if (!intf)
+      return 0;
+
+   switch (intf->type)
+   {
+      case INTFSTREAM_FILE:
+         return filestream_truncate(intf->file.fp, len);
+      case INTFSTREAM_MEMORY:
+         break;
+      case INTFSTREAM_CHD:
+         break;
+      case INTFSTREAM_RZIP:
+         break;
+   }
+
+   return 0;
+}
+
 int64_t intfstream_read(intfstream_internal_t *intf, void *s, uint64_t len)
 {
    if (!intf)
diff --git a/menu/cbs/menu_cbs_deferred_push.c b/menu/cbs/menu_cbs_deferred_push.c
index 707aa763dcf7..c1dc94d650d2 100644
--- a/menu/cbs/menu_cbs_deferred_push.c
+++ b/menu/cbs/menu_cbs_deferred_push.c
@@ -16,7 +16,6 @@
 #include <compat/strl.h>
 #include <file/file_path.h>
 #include <string/stdstring.h>
-#include <lists/string_list.h>
 
 #ifdef HAVE_CONFIG_H
 #include "../../config.h"
@@ -354,22 +353,34 @@ static int deferred_push_cursor_manager_list_generic(
       menu_displaylist_info_t *info, enum database_query_type type)
 {
    char query[256];
-   int ret                       = -1;
+   char *tok, *save;
+   char *elem0                   = NULL;
+   char *elem1                   = NULL;
+   char *path_cpy                = NULL;
    const char *path              = info->path;
-   struct string_list str_list   = {0};
-   settings_t *settings          = config_get_ptr();
 
    if (!path)
-      goto end;
+      return -1;
+
+   path_cpy = strdup(path);
+   tok      = strtok_r(path_cpy, "|", &save);
 
-   string_list_initialize(&str_list);
-   string_split_noalloc(&str_list, path, "|");
+   if (tok)
+      elem0 = strdup(tok);
+   if ((tok = strtok_r(NULL, "|", &save)))
+      elem1 = strdup(tok);
+   free(path_cpy);
 
-   database_info_build_query_enum(query, sizeof(query), type,
-         str_list.elems[0].data);
+   database_info_build_query_enum(query, sizeof(query), type, elem0);
 
    if (string_is_empty(query))
-      goto end;
+   {
+      if (elem0)
+         free(elem0);
+      if (elem1)
+         free(elem1);
+      return -1;
+   }
 
    if (!string_is_empty(info->path_b))
       free(info->path_b);
@@ -378,15 +389,11 @@ static int deferred_push_cursor_manager_list_generic(
    if (!string_is_empty(info->path))
       free(info->path);
 
-   info->path   = strdup(str_list.elems[1].data);
-   info->path_b = strdup(str_list.elems[0].data);
+   info->path   = elem1;
+   info->path_b = elem0;
    info->path_c = strdup(query);
 
-   ret = deferred_push_dlist(info, DISPLAYLIST_DATABASE_QUERY, settings);
-
-end:
-   string_list_deinitialize(&str_list);
-   return ret;
+   return deferred_push_dlist(info, DISPLAYLIST_DATABASE_QUERY, config_get_ptr());
 }
 
 GENERIC_DEFERRED_CURSOR_MANAGER(deferred_push_cursor_manager_list_deferred_query_rdb_entry_max_users, DATABASE_QUERY_ENTRY_MAX_USERS)
@@ -505,19 +512,16 @@ static int general_push(menu_displaylist_info_t *info,
       case PUSH_ARCHIVE_OPEN_DETECT_CORE:
       case PUSH_DETECT_CORE_LIST:
          {
-            char newstr1[PATH_MAX_LENGTH];
-            struct string_list str_list2      = {0};
             struct retro_system_info *sysinfo =
                &runloop_state_get_ptr()->system.info;
             bool filter_by_current_core       = settings->bools.filter_by_current_core;
 
-            newstr1[0]                        = '\0';
-
-            string_list_initialize(&str_list2);
-
             if (sysinfo && !string_is_empty(sysinfo->valid_extensions))
-                  string_split_noalloc(&str_list2,
-                        sysinfo->valid_extensions, "|");
+            {
+               _len += strlcpy(newstr2 + _len,
+                     sysinfo->valid_extensions,
+                     sizeof(newstr2)   - _len);
+            }
 
             if (!filter_by_current_core)
             {
@@ -525,64 +529,74 @@ static int general_push(menu_displaylist_info_t *info,
                core_info_get_list(&list);
                if (list && !string_is_empty(list->all_ext))
                {
-                  unsigned x;
-                  union string_list_elem_attr attr;
-                  struct string_list str_list  = {0};
-                  string_list_initialize(&str_list);
-                  attr.i                        = 0;
-
-                  string_split_noalloc(&str_list,
-                        list->all_ext, "|");
+                  char *tok, *save;
+                  char *all_ext_cpy    = strdup(list->all_ext);
 
-                  for (x = 0; x < str_list.size; x++)
+                  /* If the current core already supports
+                   * this extension, skip adding it */
+                  for ( tok = strtok_r(all_ext_cpy, "|", &save); tok;
+                        tok = strtok_r(NULL, "|", &save))
                   {
-                     /* Is extension not already added to
-                      * str_list2? This is the case if
-                      * the current core already supports
-                      * this extension. If so, it was added
-                      * in the loop above this one */
-                     if (!string_list_find_elem(&str_list2,
-                              str_list.elems[x].data))
+                     bool exists = false;
+
+                     if (!string_is_empty(newstr2))
+                     {
+                        char *tok2, *save2;
+                        char *newstr2_cpy = strdup(newstr2);
+                        for ( tok2 = strtok_r(newstr2_cpy, "|", &save2); tok2;
+                              tok2 = strtok_r(NULL, "|", &save2))
+                        {
+                           if (string_is_equal(tok, tok2))
+                           {
+                              exists = true;
+                              break;
+                           }
+                        }
+                        free(newstr2_cpy);
+                     }
+
+                     /* If extension wasn't found in string,
+                      * add it */
+                     if (!exists)
                      {
-                        const char *elem = str_list.elems[x].data;
-                        string_list_append(&str_list2, elem, attr);
+                        if (_len > 0 && newstr2[_len-1] != '\0')
+                           _len += strlcpy(newstr2 + _len, "|",
+                                   sizeof(newstr2) - _len);
+                        _len    += strlcpy(newstr2 + _len, tok,
+                              sizeof(newstr2) - _len);
                      }
                   }
 
-                  string_list_deinitialize(&str_list);
+                  free(all_ext_cpy);
                }
             }
 
-            string_list_join_concat(newstr1, sizeof(newstr1),
-                  &str_list2, "|");
-            string_list_deinitialize(&str_list2);
 
-            _len += strlcpy(newstr2 + _len, newstr1, sizeof(newstr2) - _len);
 #if defined(HAVE_AUDIOMIXER)
             if (multimedia_builtin_mediaplayer_enable)
             {
 #if defined(HAVE_DR_MP3)
-               if (newstr2[_len-1] != '\0')
+               if (_len > 0 && newstr2[_len-1] != '\0')
                   _len += strlcpy(newstr2 + _len, "|", sizeof(newstr2) - _len);
                _len    += strlcpy(newstr2 + _len, "mp3", sizeof(newstr2) - _len);
 #endif
 #if defined(HAVE_STB_VORBIS)
-               if (newstr2[_len-1] != '\0')
+               if (_len > 0 && newstr2[_len-1] != '\0')
                   _len += strlcpy(newstr2 + _len, "|", sizeof(newstr2) - _len);
                _len    += strlcpy(newstr2 + _len, "ogg", sizeof(newstr2) - _len);
 #endif
 #if defined(HAVE_DR_FLAC)
-               if (newstr2[_len-1] != '\0')
+               if (_len > 0 && newstr2[_len-1] != '\0')
                   _len += strlcpy(newstr2 + _len, "|", sizeof(newstr2) - _len);
                _len    += strlcpy(newstr2 + _len, "flac", sizeof(newstr2) - _len);
 #endif
 #if defined(HAVE_RWAV)
-               if (newstr2[_len-1] != '\0')
+               if (_len > 0 && newstr2[_len-1] != '\0')
                   _len += strlcpy(newstr2 + _len, "|", sizeof(newstr2) - _len);
                _len    += strlcpy(newstr2 + _len, "wav", sizeof(newstr2) - _len);
 #endif
 #ifdef HAVE_IBXM
-               if (newstr2[_len-1] != '\0')
+               if (_len > 0 && newstr2[_len-1] != '\0')
                   _len += strlcpy(newstr2 + _len, "|", sizeof(newstr2) - _len);
                _len    += strlcpy(newstr2 + _len, "s3m", sizeof(newstr2) - _len);
                   _len += strlcpy(newstr2 + _len, "|", sizeof(newstr2) - _len);
@@ -605,8 +619,11 @@ static int general_push(menu_displaylist_info_t *info,
 #elif defined(HAVE_MPV)
       libretro_mpv_retro_get_system_info(&sysinfo);
 #endif
-      _len += strlcpy(newstr2 + _len, "|", sizeof(newstr2) - _len);
-      _len += strlcpy(newstr2 + _len, sysinfo.valid_extensions, sizeof(newstr2) - _len);
+      if (_len > 0 && newstr2[_len-1] != '\0')
+         _len += strlcpy(newstr2 + _len, "|",
+                 sizeof(newstr2) - _len);
+      _len += strlcpy(newstr2 + _len, sysinfo.valid_extensions,
+              sizeof(newstr2) - _len);
    }
 #endif
 
@@ -615,10 +632,11 @@ static int general_push(menu_displaylist_info_t *info,
    {
       struct retro_system_info sysinfo = {0};
       libretro_imageviewer_retro_get_system_info(&sysinfo);
-      _len += strlcpy(newstr2 + _len, "|",
-            sizeof(newstr2)   - _len);
-      _len += strlcpy(newstr2 + _len, sysinfo.valid_extensions,
-            sizeof(newstr2)   - _len);
+      if (_len > 0 && newstr2[_len-1] != '\0')
+         _len += strlcpy(newstr2 + _len, "|",
+               sizeof(newstr2)   - _len);
+      _len    += strlcpy(newstr2 + _len, sysinfo.valid_extensions,
+               sizeof(newstr2)   - _len);
    }
 #endif
 
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index d6a5e51887a1..0fede1508aeb 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -15,6 +15,7 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <math.h>
 #include <compat/strl.h>
 #include <array/rbuf.h>
 #include <file/file_path.h>
@@ -5310,12 +5311,11 @@ static int action_ok_download_generic(const char *path,
          break;
       case MENU_ENUM_LABEL_CB_CORE_CONTENT_DOWNLOAD:
          {
-            struct string_list str_list  = {0};
-
-            string_list_initialize(&str_list);
-            if (string_split_noalloc(&str_list, menu_label, ";"))
-               strlcpy(s, str_list.elems[0].data, sizeof(s));
-            string_list_deinitialize(&str_list);
+            char *tok, *save;
+            char *menu_label_cpy         = strdup(menu_label);
+            if ((tok = strtok_r(menu_label_cpy, ";", &save)))
+               strlcpy(s, tok, sizeof(s));
+            free(menu_label_cpy);
          }
          break;
       case MENU_ENUM_LABEL_CB_CORE_SYSTEM_FILES_DOWNLOAD:
@@ -5598,9 +5598,10 @@ int action_ok_close_content(const char *path, const char *label, unsigned type,
    menu_st->selection_ptr       = 0;
 
    /* Check if we need to quit */
-   check_quit_on_close();
+   if (should_quit_on_close())
+      return generic_action_ok_command(CMD_EVENT_QUIT);
 
-   /* Unload core */
+   /* Otherwise, unload core */
    ret = generic_action_ok_command(CMD_EVENT_UNLOAD_CORE);
 
    /* If close content was selected via any means other than
@@ -5950,9 +5951,9 @@ static int action_ok_add_entry_to_playlist(const char *path,
 
 static void action_input_add_entry_to_new_playlist(void *userdata, const char *line)
 {
-   settings_t *settings             = config_get_ptr();
-   size_t path_length               = 0;
    char path[PATH_MAX_LENGTH];
+   settings_t *settings       = config_get_ptr();
+   size_t _len                = 0;
 
    menu_input_dialog_end();
 
@@ -5960,9 +5961,8 @@ static void action_input_add_entry_to_new_playlist(void *userdata, const char *l
       return;
 
    /* Create path for new file */
-   path_length = fill_pathname_join_special(path, settings->paths.directory_playlist, line, sizeof(path));
-   strlcat(path, ".lpl",  sizeof(path) - path_length);
-
+   _len = fill_pathname_join_special(path, settings->paths.directory_playlist, line, sizeof(path));
+   strlcpy(path + _len, ".lpl",  sizeof(path) - _len);
    action_ok_add_entry_to_playlist(NULL, path, 0, 0, 0);
 }
 
@@ -6182,61 +6182,38 @@ static int action_ok_delete_entry(const char *path,
 static int action_ok_rdb_entry_submenu(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   union string_list_elem_attr attr;
+   char *tok, *save;
+   char new_str[PATH_MAX_LENGTH];
    char new_label[PATH_MAX_LENGTH];
-   int ret                         = -1;
-   char *rdb                       = NULL;
-   int len                         = 0;
-   struct string_list str_list     = {0};
-   struct string_list str_list2    = {0};
+   size_t _len                     = 0;
+   char *label_cpy                 = NULL;
 
    if (!label)
       return -1;
 
    new_label[0]                    =  '\0';
-
-   string_list_initialize(&str_list);
-   if (!string_split_noalloc(&str_list, label, "|"))
-      goto end;
-
-   string_list_initialize(&str_list2);
-
-   /* element 0 : label
-    * element 1 : value
-    * element 2 : database path
-    */
-
-   attr.i = 0;
-
-   len += strlen(str_list.elems[1].data) + 1;
-   string_list_append(&str_list2, str_list.elems[1].data, attr);
-
-   len += strlen(str_list.elems[2].data) + 1;
-   string_list_append(&str_list2, str_list.elems[2].data, attr);
-
-   if (!(rdb = (char*)calloc(len, sizeof(char))))
-      goto end;
-
-   string_list_join_concat(rdb, len, &str_list2, "|");
-
-   fill_pathname_join_delim(new_label,
-         msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST),
-         str_list.elems[0].data, '_',
-         sizeof(new_label));
-
-   ret = generic_action_ok_displaylist_push(
-         rdb, NULL,
+   label_cpy                       = strdup(label);
+
+   /* element 0: label */
+   if ((tok = strtok_r(label_cpy, "|", &save)))
+      fill_pathname_join_delim(new_label,
+            msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_CURSOR_MANAGER_LIST),
+            tok, '_', sizeof(new_label));
+   /* element 1: value */
+   if ((tok = strtok_r(NULL, "|", &save)))
+      _len += strlcpy(new_str + _len, tok, sizeof(new_str) - _len);
+   /* element 2: database path */
+   if ((tok = strtok_r(NULL, "|", &save)))
+   {
+      _len += strlcpy(new_str + _len, "|", sizeof(new_str) - _len);
+      _len += strlcpy(new_str + _len, tok, sizeof(new_str) - _len);
+   }
+   free(label_cpy);
+   return generic_action_ok_displaylist_push(
+         new_str, NULL,
          new_label, type,
          idx, entry_idx,
          ACTION_OK_DL_RDB_ENTRY_SUBMENU);
-
-end:
-   if (rdb)
-      free(rdb);
-   string_list_deinitialize(&str_list);
-   string_list_deinitialize(&str_list2);
-
-   return ret;
 }
 
 STATIC_DEFAULT_ACTION_OK_FUNC(action_ok_browse_url_start, ACTION_OK_DL_BROWSE_URL_START)
@@ -6869,9 +6846,8 @@ static int action_ok_push_dropdown_setting_uint_item_special(const char *path,
    return action_cancel_pop_default(NULL, NULL, 0, 0);
 }
 
-
 static int generic_action_ok_dropdown_setting(const char *path, const char *label,
-      unsigned type, size_t idx)
+      unsigned type, size_t idx, size_t entry_idx)
 {
    enum msg_hash_enums enum_idx = (enum msg_hash_enums)atoi(label);
    rarch_setting_t     *setting = menu_setting_find_enum(enum_idx);
@@ -6899,18 +6875,22 @@ static int generic_action_ok_dropdown_setting(const char *path, const char *labe
       case ST_STRING_OPTIONS:
          if (setting->get_string_representation)
          {
-            struct string_list tmp_str_list = { 0 };
-            string_list_initialize(&tmp_str_list);
-            string_split_noalloc(&tmp_str_list,
-               setting->values, "|");
+            char *tok, *save;
+            unsigned tok_idx         = 0;
+            char *setting_values_cpy = strdup(setting->values);
 
-            if (idx < tmp_str_list.size)
+            for (tok = strtok_r(setting_values_cpy, "|", &save); tok != NULL;
+                 tok = strtok_r(NULL, "|", &save), tok_idx++)
             {
-               strlcpy(setting->value.target.string,
-                  tmp_str_list.elems[idx].data, setting->size);
+               if (idx == tok_idx)
+               {
+                  strlcpy(setting->value.target.string, tok,
+                        setting->size);
+                  break;
+               }
             }
 
-            string_list_deinitialize(&tmp_str_list);
+            free(setting_values_cpy);
             break;
          }
          /* fallthrough */
@@ -6930,12 +6910,6 @@ static int generic_action_ok_dropdown_setting(const char *path, const char *labe
    return action_cancel_pop_default(NULL, NULL, 0, 0);
 }
 
-static int action_ok_push_dropdown_setting(const char *path,
-      const char *label, unsigned type, size_t idx, size_t entry_idx)
-{
-   return generic_action_ok_dropdown_setting(path, label, type, idx);
-}
-
 static int action_ok_push_dropdown_item(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
@@ -6945,25 +6919,27 @@ static int action_ok_push_dropdown_item(const char *path,
 int action_cb_push_dropdown_item_resolution(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
-   char str[100];
-   char *pch            = NULL;
+   char *save           = NULL;
+   char *tok            = NULL;
    unsigned width       = 0;
    unsigned height      = 0;
-   unsigned refreshrate = 0;
-
-   strlcpy(str, path, sizeof(str));
-   pch            = strtok(str, "x");
-   if (pch)
-      width       = (unsigned)strtoul(pch, NULL, 0);
-   pch            = strtok(NULL, " ");
-   if (pch)
-      height      = (unsigned)strtoul(pch, NULL, 0);
-   pch            = strtok(NULL, "(");
-   if (pch)
-      refreshrate = (unsigned)strtoul(pch, NULL, 0);
+   float refreshrate    = 0.0f;
+   char *str            = path ? strdup(path) : NULL;
+
+   if (!str)
+      return -1;
+
+   if ((tok = strtok_r(str, "x", &save)))
+      width       = (unsigned)strtoul(tok, NULL, 0);
+   if ((tok = strtok_r(NULL, " ", &save)))
+      height      = (unsigned)strtoul(tok, NULL, 0);
+   if ((tok = strtok_r(NULL, "(", &save)))
+      refreshrate = (float)strtod(tok, NULL);
+
+   free(str);
 
    if (video_display_server_set_resolution(width, height,
-         refreshrate, (float)refreshrate, 0, 0, 0, 0))
+         floor(refreshrate), refreshrate, 0, 0, 0, 0))
    {
       settings_t *settings = config_get_ptr();
 #ifdef _MSC_VER
@@ -6975,7 +6951,7 @@ int action_cb_push_dropdown_item_resolution(const char *path,
       float refresh_exact  = refreshrate;
 
       /* 59 Hz is an inaccurate representation of the real value (59.94).
-       * And since we at this point only have the integer to work with,
+       * In case at this point we only have the integer to work with,
        * the exact float needs to be calculated for 'video_refresh_rate' */
       if (refreshrate == (60.0f * refresh_mod) - 1)
          refresh_exact = 59.94f * refresh_mod;
@@ -7324,6 +7300,7 @@ static int action_ok_push_dropdown_item_input_device_type(const char *path,
 static int action_ok_push_dropdown_item_input_select_reserved_device(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
+    unsigned user;
     const char *no_device;
     const char *reserved_device_name;
     enum msg_hash_enums enum_idx;
@@ -7331,7 +7308,6 @@ static int action_ok_push_dropdown_item_input_select_reserved_device(const char
     settings_t *settings         = config_get_ptr();
     const char *menu_path        = NULL;
     struct menu_state *menu_st   = menu_state_get_ptr();
-    unsigned user;
 
     menu_entries_get_last_stack(&menu_path, NULL, NULL, NULL, NULL);
     enum_idx = (enum msg_hash_enums)atoi(menu_path);
@@ -9263,7 +9239,7 @@ static int menu_cbs_init_bind_ok_compare_type(menu_file_list_cbs_t *cbs,
          case MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM_SPECIAL:
          case MENU_SETTING_DROPDOWN_SETTING_INT_ITEM_SPECIAL:
          case MENU_SETTING_DROPDOWN_SETTING_FLOAT_ITEM_SPECIAL:
-            BIND_ACTION_OK(cbs, action_ok_push_dropdown_setting);
+            BIND_ACTION_OK(cbs, generic_action_ok_dropdown_setting);
             break;
          case MENU_SETTING_DROPDOWN_SETTING_UINT_ITEM_SPECIAL:
             BIND_ACTION_OK(cbs, action_ok_push_dropdown_setting_uint_item_special);
diff --git a/menu/cbs/menu_cbs_sublabel.c b/menu/cbs/menu_cbs_sublabel.c
index 65e93e16db6d..43058d5ea7be 100644
--- a/menu/cbs/menu_cbs_sublabel.c
+++ b/menu/cbs/menu_cbs_sublabel.c
@@ -257,6 +257,8 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_saving_settings_list,          MENU_
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_cloud_sync_settings_list,      MENU_ENUM_SUBLABEL_CLOUD_SYNC_SETTINGS)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_cloud_sync_enable,             MENU_ENUM_SUBLABEL_CLOUD_SYNC_ENABLE)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_cloud_sync_destructive,        MENU_ENUM_SUBLABEL_CLOUD_SYNC_DESTRUCTIVE)
+DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_cloud_sync_sync_saves,        MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_SAVES)
+DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_cloud_sync_sync_configs,        MENU_ENUM_SUBLABEL_CLOUD_SYNC_SYNC_CONFIGS)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_cloud_sync_driver,             MENU_ENUM_SUBLABEL_CLOUD_SYNC_DRIVER)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_cloud_sync_url,                MENU_ENUM_SUBLABEL_CLOUD_SYNC_URL)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_cloud_sync_username,           MENU_ENUM_SUBLABEL_CLOUD_SYNC_USERNAME)
@@ -1251,6 +1253,12 @@ DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_custom_height,
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_custom_width,           MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_WIDTH)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_custom_x,               MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_X)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_custom_y,               MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_CUSTOM_Y)
+DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_bias_x,                 MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_X)
+DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_bias_y,                 MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_Y)
+#if defined(RARCH_MOBILE)
+DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_bias_portrait_x,        MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X)
+DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_video_viewport_bias_portrait_y,        MENU_ENUM_SUBLABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y)
+#endif
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_netplay_use_mitm_server,               MENU_ENUM_SUBLABEL_NETPLAY_USE_MITM_SERVER)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_netplay_mitm_server,                   MENU_ENUM_SUBLABEL_NETPLAY_MITM_SERVER)
 DEFAULT_SUBLABEL_MACRO(action_bind_sublabel_netplay_custom_mitm_server,            MENU_ENUM_SUBLABEL_NETPLAY_CUSTOM_MITM_SERVER)
@@ -1523,9 +1531,9 @@ static int action_bind_sublabel_subsystem_load(
 
    for (j = 0; j < content_get_subsystem_rom_id(); j++)
    {
-      strlcat(buf, path_basename(content_get_subsystem_rom(j)), sizeof(buf));
+      size_t _len = strlcat(buf, path_basename(content_get_subsystem_rom(j)), sizeof(buf));
       if (j != content_get_subsystem_rom_id() - 1)
-         strlcat(buf, "\n", sizeof(buf));
+         _len += strlcpy(buf + _len, "\n", sizeof(buf) - _len);
    }
 
    if (!string_is_empty(buf))
@@ -2570,6 +2578,20 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_aspect_ratio);
             break;
+         case MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_viewport_bias_x);
+            break;
+         case MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_Y:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_viewport_bias_y);
+            break;
+#if defined(RARCH_MOBILE)
+         case MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_viewport_bias_portrait_x);
+            break;
+         case MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_viewport_bias_portrait_y);
+            break;
+#endif
          case MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_video_aspect_ratio_index);
             break;
@@ -5029,6 +5051,12 @@ int menu_cbs_init_bind_sublabel(menu_file_list_cbs_t *cbs,
          case MENU_ENUM_LABEL_CLOUD_SYNC_DESTRUCTIVE:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cloud_sync_destructive);
             break;
+         case MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_SAVES:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cloud_sync_sync_saves);
+            break;
+         case MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_CONFIGS:
+            BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cloud_sync_sync_configs);
+            break;                        
          case MENU_ENUM_LABEL_CLOUD_SYNC_DRIVER:
             BIND_ACTION_SUBLABEL(cbs, action_bind_sublabel_cloud_sync_driver);
             break;
diff --git a/menu/cbs/menu_cbs_title.c b/menu/cbs/menu_cbs_title.c
index d82a8d796227..7767689e7537 100644
--- a/menu/cbs/menu_cbs_title.c
+++ b/menu/cbs/menu_cbs_title.c
@@ -13,7 +13,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <lists/string_list.h>
 #include <string/stdstring.h>
 #include <file/file_path.h>
 
@@ -808,28 +807,24 @@ static int action_get_title_generic(char *s, size_t len,
 {
    if (!string_is_empty(path))
    {
-      struct string_list list_path = {0};
-      string_list_initialize(&list_path);
-      if (string_split_noalloc(&list_path, path, "|"))
+      char *tok, *save;
+      char *path_cpy = strdup(path);
+
+      if ((tok = strtok_r(path_cpy, "|", &save)))
       {
          size_t _len;
-         char elem0_path[255];
-         if (list_path.size > 0)
-            strlcpy(elem0_path, list_path.elems[0].data,
-                  sizeof(elem0_path));
-         string_list_deinitialize(&list_path);
-
+         char elem0_path[256];
+         strlcpy(elem0_path, tok, sizeof(elem0_path));
          _len      = strlcpy(s, text, len);
-         if (!string_is_empty(elem0_path))
-         {
-            path_remove_extension(elem0_path);
-            s[  _len] = ':';
-            s[++_len] = ' ';
-            s[++_len] = '\0';
-            strlcpy(s + _len, path_basename(elem0_path), len - _len);
-         }
+         path_remove_extension(elem0_path);
+         s[  _len] = ':';
+         s[++_len] = ' ';
+         s[++_len] = '\0';
+         strlcpy(s + _len, path_basename(elem0_path), len - _len);
+         free(path_cpy);
          return 0;
       }
+      free(path_cpy);
    }
 
    strlcpy(s, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_NOT_AVAILABLE), len);
@@ -933,29 +928,22 @@ static int action_get_title_group_settings(const char *path, const char *label,
 
    {
       size_t _len;
-      char elem0[255];
-      char elem1[255];
-      struct string_list list_label = {0};
-      string_list_initialize(&list_label);
-      string_split_noalloc(&list_label, label, "|");
+      char *tok, *save;
+      char *label_cpy = strdup(label);
 
-      if (list_label.size > 0)
+      if ((tok = strtok_r(label_cpy, "|", &save)))
       {
-         strlcpy(elem0, list_label.elems[0].data, sizeof(elem0));
-         if (list_label.size > 1)
-            strlcpy(elem1, list_label.elems[1].data, sizeof(elem1));
-      }
-      string_list_deinitialize(&list_label);
-
-      _len = strlcpy(s, elem0, len);
-      if (!string_is_empty(elem1))
-      {
-         s[  _len] = ' ';
-         s[++_len] = '-';
-         s[++_len] = ' ';
-         s[++_len] = '\0';
-         strlcpy(s + _len, elem1, len - _len);
+         _len = strlcpy(s, tok, len);
+         if ((tok = strtok_r(NULL, "|", &save)))
+         {
+            s[  _len] = ' ';
+            s[++_len] = '-';
+            s[++_len] = ' ';
+            s[++_len] = '\0';
+            strlcpy(s + _len, tok, len - _len);
+         }
       }
+      free(label_cpy);
    }
 
    return 0;
diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c
index 435fb4475fd2..85944e97e55c 100644
--- a/menu/drivers/materialui.c
+++ b/menu/drivers/materialui.c
@@ -5859,7 +5859,7 @@ static void materialui_render_header(
       gfx_display_ctx_datetime_t datetime;
       char timedate_str[MUI_TIMEDATE_MAX_LENGTH];
 
-      timedate_str[0] = '\0';
+      timedate_str[0]         = '\0';
 
       datetime.s              = timedate_str;
       datetime.len            = sizeof(timedate_str);
@@ -5874,7 +5874,7 @@ static void materialui_render_header(
       if (!string_is_equal(timedate_str, mui->sys_bar_cache.timedate_str))
       {
          /* Cache new string */
-         strlcpy(mui->sys_bar_cache.timedate_str, timedate_str,
+         size_t _len = strlcpy(mui->sys_bar_cache.timedate_str, timedate_str,
                MUI_TIMEDATE_MAX_LENGTH * sizeof(char));
 
          /* Cache width */
@@ -5882,7 +5882,7 @@ static void materialui_render_header(
             = font_driver_get_message_width(
                mui->font_data.hint.font,
                mui->sys_bar_cache.timedate_str,
-               strlen(mui->sys_bar_cache.timedate_str),
+               _len,
                1.0f);
       }
 
diff --git a/menu/drivers/ozone.c b/menu/drivers/ozone.c
index 58fde4ba414c..30320973fd78 100644
--- a/menu/drivers/ozone.c
+++ b/menu/drivers/ozone.c
@@ -4902,7 +4902,7 @@ static void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
 
       if (string_ends_with_size(path, ".lpl", strlen(path), STRLEN_CONST(".lpl")))
       {
-         size_t len;
+         size_t len, syslen;
          struct texture_image ti;
          char sysname[PATH_MAX_LENGTH];
          char texturepath[PATH_MAX_LENGTH];
@@ -4911,14 +4911,14 @@ static void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
          /* Add current node to playlist database name map */
          RHMAP_SET_STR(ozone->playlist_db_node_map, path, node);
 
-         len                = fill_pathname_base(
-               sysname, path, sizeof(sysname));
+         syslen = fill_pathname_base(sysname, path, sizeof(sysname));
          /* Manually strip the extension (and dot) from sysname */
-            sysname[len-4]  =
-            sysname[len-3]  =
-            sysname[len-2]  =
-            sysname[len-1]  = '\0';
-         len                = fill_pathname_join_special(texturepath,
+            sysname[syslen-4]  =
+            sysname[syslen-3]  =
+            sysname[syslen-2]  =
+            sysname[syslen-1]  = '\0';
+         syslen -= 4;
+         len = fill_pathname_join_special(texturepath,
                ozone->icons_path, sysname,
                sizeof(texturepath));
          texturepath[  len] = '.';
@@ -4957,7 +4957,7 @@ static void ozone_context_reset_horizontal_list(ozone_handle_t *ozone)
             image_texture_free(&ti);
          }
 
-         strlcat(sysname, "-content.png", sizeof(sysname));
+         strlcpy(sysname + syslen, "-content.png", sizeof(sysname) - syslen);
          /* Assemble new icon path */
          fill_pathname_join_special(
                content_texturepath, ozone->icons_path, sysname,
@@ -6675,19 +6675,20 @@ static void ozone_draw_osk(
       unsigned video_height,
       const char *label, const char *str)
 {
-   unsigned i;
    char message[2048];
-   gfx_display_t *p_disp               = (gfx_display_t*)disp_userdata;
-   const char *text                    = str;
-   unsigned text_color                 = 0xffffffff;
+   gfx_display_t *p_disp          = (gfx_display_t*)disp_userdata;
+   const char *text               = str;
+   unsigned text_color            = 0xffffffff;
    static float ozone_osk_backdrop[16] = {
       0.00, 0.00, 0.00, 0.15,
       0.00, 0.00, 0.00, 0.15,
       0.00, 0.00, 0.00, 0.15,
       0.00, 0.00, 0.00, 0.15,
    };
+   char *tok, *save;
+   unsigned i                     = 0;
    static retro_time_t last_time  = 0;
-   struct string_list list        = {0};
+   unsigned list_size             = 0;
    float scale_factor             = ozone->last_scale_factor;
    unsigned margin                = 75 * scale_factor;
    unsigned padding               = 10 * scale_factor;
@@ -6797,12 +6798,12 @@ static void ozone_draw_osk(
          ozone->fonts.entries_label.wideglyph_width,
          0);
 
-   string_list_initialize(&list);
-   string_split_noalloc(&list, message, "\n");
+   tok       = strtok_r(message, "\n", &save);
+   list_size = string_count_occurrences_single_character(message, '\n');
 
-   for (i = 0; i < list.size; i++)
+   while (tok)
    {
-      const char *msg = list.elems[i].data;
+      const char *msg = tok;
 
       gfx_display_draw_text(
             ozone->fonts.entries_label.font,
@@ -6819,7 +6820,7 @@ static void ozone_draw_osk(
             false);
 
       /* Cursor */
-      if (i == list.size - 1)
+      if (i == list_size - 1)
       {
          if (ozone->flags & OZONE_FLAG_OSK_CURSOR)
          {
@@ -6850,6 +6851,9 @@ static void ozone_draw_osk(
       }
       else
          y_offset += 25 * scale_factor;
+
+      tok = strtok_r(NULL, "\n", &save);
+      i++;
    }
 
    /* Keyboard */
@@ -6868,8 +6872,6 @@ static void ozone_draw_osk(
             input_st->osk_ptr,
             ozone->theme->text_rgba);
    }
-
-   string_list_deinitialize(&list);
 }
 
 static void ozone_draw_messagebox(
@@ -10488,9 +10490,7 @@ static void ozone_draw_header(
    if (timedate_enable)
    {
       gfx_display_ctx_datetime_t datetime;
-      char timedate[255];
-
-      timedate[0]             = '\0';
+      char timedate[256];
 
       datetime.s              = timedate;
       datetime.time_mode      = settings->uints.menu_timedate_style;
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 156bff74db94..f4419a8b6c00 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -7164,34 +7164,31 @@ static void rgui_update_menu_sublabel(rgui_t *rgui, size_t selection)
 
    if (!string_is_empty(entry.sublabel))
    {
-      size_t line_index;
+      char *tok, *save;
       static const char* const
          sublabel_spacer       = RGUI_TICKER_SPACER;
       bool prev_line_empty     = true;
+      char *entry_sublabel_cpy = strdup(entry.sublabel);
+
       /* Sanitise sublabel
        * > Replace newline characters with standard delimiter
        * > Remove whitespace surrounding each sublabel line */
-      struct string_list list  = {0};
-
-      string_list_initialize(&list);
+      tok = strtok_r(entry_sublabel_cpy, "\n", &save);
 
-      if (string_split_noalloc(&list, entry.sublabel, "\n"))
+      while (tok)
       {
-         for (line_index = 0; line_index < list.size; line_index++)
+         const char *line = string_trim_whitespace(tok);
+         if (!string_is_empty(line))
          {
-            const char *line = string_trim_whitespace(
-                  list.elems[line_index].data);
-            if (!string_is_empty(line))
-            {
-               if (!prev_line_empty)
-                  strlcat(rgui->menu_sublabel, sublabel_spacer, sizeof(rgui->menu_sublabel));
-               strlcat(rgui->menu_sublabel, line, sizeof(rgui->menu_sublabel));
-               prev_line_empty = false;
-            }
+            if (!prev_line_empty)
+               strlcat(rgui->menu_sublabel, sublabel_spacer, sizeof(rgui->menu_sublabel));
+            strlcat(rgui->menu_sublabel, line, sizeof(rgui->menu_sublabel));
+            prev_line_empty = false;
          }
+         tok = strtok_r(NULL, "\n", &save);
       }
 
-      string_list_deinitialize(&list);
+      free(entry_sublabel_cpy);
    }
 }
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index f489b73ade2b..3c8fe14ca5ca 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -2457,7 +2457,7 @@ static void xmb_context_reset_horizontal_list(xmb_handle_t *xmb)
 
       if (string_ends_with_size(path, ".lpl", strlen(path), STRLEN_CONST(".lpl")))
       {
-         size_t len;
+         size_t len, syslen;
          struct texture_image ti;
          char sysname[PATH_MAX_LENGTH];
          char texturepath[PATH_MAX_LENGTH];
@@ -2467,13 +2467,13 @@ static void xmb_context_reset_horizontal_list(xmb_handle_t *xmb)
          /* Add current node to playlist database name map */
          RHMAP_SET_STR(xmb->playlist_db_node_map, path, node);
 
-         len = fill_pathname_base(sysname, path, sizeof(sysname));
+         syslen = fill_pathname_base(sysname, path, sizeof(sysname));
          /* Manually strip the extension (and dot) from sysname */
-         sysname[len-4]     =
-         sysname[len-3]     =
-         sysname[len-2]     =
-         sysname[len-1]     = '\0';
-
+         sysname[syslen-4]     =
+         sysname[syslen-3]     =
+         sysname[syslen-2]     =
+         sysname[syslen-1]     = '\0';
+         syslen -= 4;
          len = fill_pathname_join_special(texturepath, iconpath, sysname,
                sizeof(texturepath));
          texturepath[  len] = '.';
@@ -2510,7 +2510,7 @@ static void xmb_context_reset_horizontal_list(xmb_handle_t *xmb)
             image_texture_free(&ti);
          }
 
-         strlcat(sysname, "-content.png", sizeof(sysname));
+         strlcpy(sysname + syslen, "-content.png", sizeof(sysname) - syslen);
          /* Assemble new icon path */
          fill_pathname_join_special(content_texturepath, iconpath, sysname,
                sizeof(content_texturepath));
@@ -6127,7 +6127,8 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
    if (timedate_enable)
    {
       gfx_display_ctx_datetime_t datetime;
-      char timedate[255];
+      char timedate[256];
+      size_t _len  = 0;
       size_t x_pos = 0;
 
       if (percent_width)
@@ -6169,10 +6170,10 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
       datetime.time_mode      = settings->uints.menu_timedate_style;
       datetime.date_separator = settings->uints.menu_timedate_date_separator;
 
-      menu_display_timedate(&datetime);
+      _len = menu_display_timedate(&datetime);
 
       title_header_max_width = x_pos + font_driver_get_message_width(
-            xmb->font, timedate, strlen(timedate), 1.0f);
+            xmb->font, timedate, _len, 1.0f);
 
       xmb_draw_text(shadows_enable, xmb, settings, timedate,
             video_width - xmb->margins_title_left - xmb->icon_size / 4 - x_pos,
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index fa7ea49633c5..3aed5bdb0828 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -499,9 +499,9 @@ static int filebrowser_parse(
             allow_parent_directory = false;
          else
          {
-            fill_pathname_home_dir(dir, sizeof(dir));
+            size_t _len = fill_pathname_home_dir(dir, sizeof(dir));
             if (string_ends_with(full_path, "/") && !string_ends_with(dir, "/"))
-               strlcat(dir, "/", sizeof(dir));
+               strlcpy(dir + _len, "/", sizeof(dir) - _len);
             if (string_is_equal(dir, full_path))
                allow_parent_directory = false;
          }
@@ -2669,19 +2669,17 @@ static int menu_displaylist_parse_database_entry(menu_handle_t *menu,
 
             if (entry->crc32)
             {
-               struct string_list tmp_str_list = {0};
+               char *elem0           = NULL;
+               char *save            = NULL;
+               char *entry_crc32_cpy = strdup(entry->crc32);
+               const char *con       = strtok_r(entry_crc32_cpy, "|", &save);
 
-               string_list_initialize(&tmp_str_list);
-               string_split_noalloc(&tmp_str_list, entry->crc32, "|");
-
-               if (tmp_str_list.size > 0)
+               if (con)
                {
-                  if (tmp_str_list.size > 1)
+                  elem0              = strdup(con);
+                  if ((con = strtok_r(NULL, "|", &save)))
                   {
-                     const char *elem0 = tmp_str_list.elems[0].data;
-                     const char *elem1 = tmp_str_list.elems[1].data;
-
-                     switch (extension_to_file_hash_type(elem1))
+                     switch (extension_to_file_hash_type(con))
                      {
                         case FILE_TYPE_CRC:
                            if (string_is_equal(crc_str, elem0))
@@ -2699,9 +2697,10 @@ static int menu_displaylist_parse_database_entry(menu_handle_t *menu,
                            break;
                      }
                   }
+                  free(elem0);
                }
 
-               string_list_deinitialize(&tmp_str_list);
+               free(entry_crc32_cpy);
             }
 
             if (!match_found)
@@ -8351,10 +8350,20 @@ unsigned menu_displaylist_build_list(
                for (i = 0; i < size; i++)
                {
                   char val_d[256], str[256];
-                  snprintf(str, sizeof(str), "%dx%d (%d Hz)",
+                  /* If there is exact refresh rate available, use it */
+                  if (video_list[i].refreshrate_float > 0.0f)
+                     snprintf(str, sizeof(str), "%dx%d (%.3f Hz)%s%s",
+                        video_list[i].width,
+                        video_list[i].height,
+                        video_list[i].refreshrate_float,
+                        video_list[i].interlaced ? "[i]":"",
+                        video_list[i].dblscan    ? "[d]":"");
+                  else
+                     snprintf(str, sizeof(str), "%dx%d (%d Hz)%s",
                         video_list[i].width,
                         video_list[i].height,
-                        video_list[i].refreshrate);
+                        video_list[i].refreshrate,
+                        video_list[i].interlaced ? "[i]":"");
                   snprintf(val_d, sizeof(val_d), "%d", i);
                   if (menu_entries_append(list,
                            str,
@@ -9792,6 +9801,24 @@ unsigned menu_displaylist_build_list(
                         MENU_ENUM_LABEL_VIDEO_SCALE_INTEGER_OVERSCALE,
                         PARSE_ONLY_BOOL, false) == 0)
                   count++;
+               if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
+                        MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
+                        PARSE_ONLY_FLOAT, false) == 0)
+                  count++;
+               if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
+                        MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_Y,
+                        PARSE_ONLY_FLOAT, false) == 0)
+                  count++;
+#if defined(RARCH_MOBILE)
+               if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
+                        MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+                        PARSE_ONLY_FLOAT, false) == 0)
+                  count++;
+               if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
+                        MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+                        PARSE_ONLY_FLOAT, false) == 0)
+                  count++;
+#endif
                if (MENU_DISPLAYLIST_PARSE_SETTINGS_ENUM(list,
                         MENU_ENUM_LABEL_VIDEO_ASPECT_RATIO_INDEX,
                         PARSE_ONLY_UINT, false) == 0)
@@ -10681,12 +10708,14 @@ unsigned menu_displaylist_build_list(
       case DISPLAYLIST_CLOUD_SYNC_SETTINGS_LIST:
          {
             menu_displaylist_build_info_t build_list[] = {
-               {MENU_ENUM_LABEL_CLOUD_SYNC_ENABLE,      PARSE_ONLY_BOOL           },
-               {MENU_ENUM_LABEL_CLOUD_SYNC_DESTRUCTIVE, PARSE_ONLY_BOOL           },
-               {MENU_ENUM_LABEL_CLOUD_SYNC_DRIVER,      PARSE_ONLY_STRING_OPTIONS },
-               {MENU_ENUM_LABEL_CLOUD_SYNC_URL,         PARSE_ONLY_STRING         },
-               {MENU_ENUM_LABEL_CLOUD_SYNC_USERNAME,    PARSE_ONLY_STRING         },
-               {MENU_ENUM_LABEL_CLOUD_SYNC_PASSWORD,    PARSE_ONLY_STRING         },
+               {MENU_ENUM_LABEL_CLOUD_SYNC_ENABLE,       PARSE_ONLY_BOOL           },
+               {MENU_ENUM_LABEL_CLOUD_SYNC_DESTRUCTIVE,  PARSE_ONLY_BOOL           },
+               {MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_SAVES,   PARSE_ONLY_BOOL           },
+               {MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_CONFIGS, PARSE_ONLY_BOOL           },
+               {MENU_ENUM_LABEL_CLOUD_SYNC_DRIVER,       PARSE_ONLY_STRING_OPTIONS },
+               {MENU_ENUM_LABEL_CLOUD_SYNC_URL,          PARSE_ONLY_STRING         },
+               {MENU_ENUM_LABEL_CLOUD_SYNC_USERNAME,     PARSE_ONLY_STRING         },
+               {MENU_ENUM_LABEL_CLOUD_SYNC_PASSWORD,     PARSE_ONLY_STRING         },
             };
 
             for (i = 0; i < ARRAY_SIZE(build_list); i++)
@@ -11750,55 +11779,90 @@ static unsigned print_buf_lines(file_list_t *list, char *buf,
    if (!buf || !buf_size)
       return 0;
 
-   for (i = 0; i < buf_size; i++)
+   if (extended)
    {
-      size_t ln;
-      const char *core_pathname    = NULL;
-      struct string_list str_list  = {0};
+      for (i = 0; i < buf_size; i++)
+      {
+         size_t ln;
 
-      /* The end of the buffer, print the last bit */
-      if (*(buf + i) == '\0')
-         break;
+         /* The end of the buffer, print the last bit */
+         if (*(buf + i) == '\0')
+            break;
 
-      if (*(buf + i) != '\n')
-         continue;
+         if (*(buf + i) != '\n')
+            continue;
 
-      /* Found a line ending, print the line and compute new line_start */
-      c              = *(buf + i + 1); /* Save the next character  */
-      *(buf + i + 1) = '\0';           /* Replace with \0          */
+         /* Found a line ending, print the line and compute new line_start */
+         c              = *(buf + i + 1); /* Save the next character  */
+         *(buf + i + 1) = '\0';           /* Replace with \0          */
 
-      /* We need to strip the newline. */
-      ln             = strlen(line_start) - 1;
-      if (line_start[ln] == '\n')
-         line_start[ln] = '\0';
+         /* We need to strip the newline. */
+         ln             = strlen(line_start) - 1;
+         if (line_start[ln] == '\n')
+            line_start[ln] = '\0';
 
-      string_list_initialize(&str_list);
-      string_split_noalloc(&str_list, line_start, " ");
+         {
+            char *save           = NULL;
+            char *line_start_cpy = strdup(line_start);
+            const char *con      = strtok_r(line_start_cpy, " ", &save);
 
-      if (str_list.elems[2].data)
-         core_pathname = str_list.elems[2].data;
+            if (con)
+            {
+               if ((con = strtok_r(NULL, " ", &save)))
+               {
+                  if ((con = strtok_r(NULL, " ", &save)))
+                  {
+                     /* Get third parameter */
+                     if (append)
+                     {
+                        if (menu_entries_append(list, con, "",
+                                 MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0, NULL))
+                           count++;
+                     }
+                     else
+                     {
+                        menu_entries_prepend(list, con, "",
+                              MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0);
+                        count++;
+                     }
+                  }
+               }
+            }
 
-      if (extended)
-      {
-         if (append)
-         {
-            if (menu_entries_append(list, core_pathname, "",
-                  MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0, NULL))
-               count++;
-         }
-         else
-         {
-            menu_entries_prepend(list, core_pathname, "",
-                  MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0);
-            count++;
+            free(line_start_cpy);
          }
+
+         /* Restore the saved character */
+         *(buf + i + 1) = c;
+         line_start     = buf + i + 1;
       }
-      else
+   }
+   else
+   {
+      for (i = 0; i < buf_size; i++)
       {
+         size_t ln;
+
+         /* The end of the buffer, print the last bit */
+         if (*(buf + i) == '\0')
+            break;
+
+         if (*(buf + i) != '\n')
+            continue;
+
+         /* Found a line ending, print the line and compute new line_start */
+         c              = *(buf + i + 1); /* Save the next character  */
+         *(buf + i + 1) = '\0';           /* Replace with \0          */
+
+         /* We need to strip the newline. */
+         ln             = strlen(line_start) - 1;
+         if (line_start[ln] == '\n')
+            line_start[ln] = '\0';
+
          if (append)
          {
             if (menu_entries_append(list, line_start, label,
-                  MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0, NULL))
+                     MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0, NULL))
                count++;
          }
          else
@@ -11807,13 +11871,11 @@ static unsigned print_buf_lines(file_list_t *list, char *buf,
                   MENU_ENUM_LABEL_URL_ENTRY, type, 0, 0);
             count++;
          }
-      }
 
-      string_list_deinitialize(&str_list);
-
-      /* Restore the saved character */
-      *(buf + i + 1) = c;
-      line_start     = buf + i + 1;
+         /* Restore the saved character */
+         *(buf + i + 1) = c;
+         line_start     = buf + i + 1;
+      }
    }
 
    if (append && type != FILE_TYPE_DOWNLOAD_LAKKA)
@@ -12083,8 +12145,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                         const struct retro_keybind *auto_bind =
                            (const struct retro_keybind*)
                            input_config_get_bind_auto(port, retro_id);
-
-                        input_config_get_bind_string(settings, descriptor,
+                        size_t desc_len = input_config_get_bind_string(
+                              settings, descriptor,
                               keybind, auto_bind, sizeof(descriptor));
 
                         if (!strstr(descriptor, "Auto"))
@@ -12099,7 +12161,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                            desc_label[++_len] = ' ';
                            desc_label[++_len] = '\0';
                            strlcpy(desc_label + _len, descriptor, sizeof(desc_label) - _len);
-                           strlcpy(descriptor, desc_label, sizeof(descriptor));
+                           desc_len = strlcpy(descriptor, desc_label, sizeof(descriptor));
                         }
 
                         /* Add user index when display driver == rgui and sublabels
@@ -12108,8 +12170,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                               && (max_users > 1)
                               && !settings->bools.menu_show_sublabels)
                         {
-                           size_t _len = strlcat(descriptor, " [", sizeof(descriptor));
-                           snprintf(descriptor + _len, sizeof(descriptor) - _len, "%s %u]",
+                           desc_len += strlcpy(descriptor + desc_len, " [", sizeof(descriptor) - desc_len);
+                           snprintf(descriptor + desc_len, sizeof(descriptor) - desc_len, "%s %u]",
                                  msg_val_port, port + 1);
                         }
 
@@ -12136,8 +12198,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                         const struct retro_keybind *auto_bind =
                            (const struct retro_keybind*)
                            input_config_get_bind_auto(port, retro_id);
-
-                        input_config_get_bind_string(settings, descriptor,
+                        size_t desc_len = input_config_get_bind_string(
+                              settings, descriptor,
                               keybind, auto_bind, sizeof(descriptor));
 
                         if (!strstr(descriptor, "Auto"))
@@ -12152,7 +12214,7 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                            desc_label[++_len] = ' ';
                            desc_label[++_len] = '\0';
                            strlcpy(desc_label + _len, descriptor, sizeof(desc_label) - _len);
-                           strlcpy(descriptor, desc_label, sizeof(descriptor));
+                           desc_len = strlcpy(descriptor, desc_label, sizeof(descriptor));
                         }
 
                         /* Add user index when display driver == rgui and sublabels
@@ -12161,8 +12223,8 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                               && (max_users > 1)
                               && !settings->bools.menu_show_sublabels)
                         {
-                           size_t _len = strlcat(descriptor, " [", sizeof(descriptor));
-                           snprintf(descriptor + _len, sizeof(descriptor) - _len, "%s %u]",
+                           desc_len += strlcpy(descriptor + desc_len, " [", sizeof(descriptor) - desc_len);
+                           snprintf(descriptor + desc_len, sizeof(descriptor) - desc_len, "%s %u]",
                                  val_port, port + 1);
                         }
 
@@ -12793,14 +12855,21 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
          case DISPLAYLIST_DATABASE_ENTRY:
             menu_entries_clear(info->list);
             {
+               char *elem0                  = NULL;
+               char *elem1                  = NULL;
 #ifdef HAVE_LIBRETRODB
                bool parse_database          = false;
 #endif
-               struct string_list *str_list = NULL;
-
                if (!string_is_empty(info->label))
                {
-                  str_list     = string_split(info->label, "|");
+                  char *tok, *save;
+                  char *info_label_cpy = strdup(info->label);
+
+                  if ((tok = strtok_r(info_label_cpy, "|", &save)))
+                     elem0     = strdup(tok);
+                  if ((tok = strtok_r(NULL, "|", &save)))
+                     elem1     = strdup(tok);
+                  free(info_label_cpy);
                   free(info->label);
                   info->label  = NULL;
                }
@@ -12810,22 +12879,14 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                   info->path_b = NULL;
                }
 
-               if (str_list)
+               if (     !string_is_empty(elem0)
+                     && !string_is_empty(elem1))
                {
-                  if (str_list->size > 1)
-                  {
-                     if (     !string_is_empty(str_list->elems[0].data)
-                           && !string_is_empty(str_list->elems[1].data))
-                     {
-                        info->path_b   = strdup(str_list->elems[1].data);
-                        info->label    = strdup(str_list->elems[0].data);
+                  info->path_b   = elem1;
+                  info->label    = elem0;
 #ifdef HAVE_LIBRETRODB
-                        parse_database = true;
+                  parse_database = true;
 #endif
-                     }
-                  }
-
-                  string_list_free(str_list);
                }
 
 #ifdef HAVE_LIBRETRODB
@@ -13051,16 +13112,19 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
             {
 #ifdef HAVE_NETWORKING
                char new_label[PATH_MAX_LENGTH];
-               struct string_list str_list = {0};
-               string_list_initialize(&str_list);
-               string_split_noalloc(&str_list, info->path, ";");
+               char *save                  = NULL;
+               char *info_path_cpy         = strdup(info->path);
+               const char *con             = strtok_r(info_path_cpy, ";", &save);
 
-               if (str_list.elems[0].data)
-                  strlcpy(new_label, str_list.elems[0].data, sizeof(new_label));
+               if (con)
+                  strlcpy(new_label, con, sizeof(new_label));
                else
                   new_label[0] = '\0';
-               if (str_list.elems[1].data)
-                  strlcpy(menu->core_buf, str_list.elems[1].data, menu->core_len);
+
+               if ((con = strtok_r(NULL, ";", &save))) /* Get second parameter */
+                  strlcpy(menu->core_buf, con, menu->core_len);
+               free(info_path_cpy);
+
                if ((count = print_buf_lines(
                            info->list, menu->core_buf, new_label,
                            (int)menu->core_len, FILE_TYPE_DOWNLOAD_URL,
@@ -13076,8 +13140,6 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                info->flags       |= MD_FLAG_NEED_REFRESH
                                   | MD_FLAG_NEED_PUSH
                                   | MD_FLAG_NEED_CLEAR;
-
-               string_list_deinitialize(&str_list);
 #endif
             }
             break;
@@ -14934,43 +14996,54 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
             menu_entries_clear(info->list);
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
             {
-               struct string_list str_list = {0};
                char new_exts[PATH_MAX_LENGTH];
-               union string_list_elem_attr attr;
-               attr.i = 0;
+               size_t _len = 0;
                new_exts[0] = '\0';
-               string_list_initialize(&str_list);
                filebrowser_clear_type();
                switch (type)
                {
                   case DISPLAYLIST_SHADER_PRESET:
                      info->type_default = FILE_TYPE_SHADER_PRESET;
                      if (video_shader_is_supported(RARCH_SHADER_CG))
-                        string_list_append(&str_list, "cgp", attr);
+                        _len    += strlcpy(new_exts + _len, "cgp", sizeof(new_exts) - _len);
                      if (video_shader_is_supported(RARCH_SHADER_GLSL))
-                        string_list_append(&str_list, "glslp", attr);
+                     {
+                        if (new_exts[_len-1] != '\0')
+                           _len += strlcpy(new_exts + _len, "|",   sizeof(new_exts) - _len);
+                        _len    += strlcpy(new_exts + _len, "glslp", sizeof(new_exts) - _len);
+                     }
                      if (video_shader_is_supported(RARCH_SHADER_SLANG))
-                        string_list_append(&str_list, "slangp", attr);
+                     {
+                        if (new_exts[_len-1] != '\0')
+                           _len += strlcpy(new_exts + _len, "|",   sizeof(new_exts) - _len);
+                        _len    += strlcpy(new_exts + _len, "slangp", sizeof(new_exts) - _len);
+                     }
                      break;
 
                   case DISPLAYLIST_SHADER_PASS:
                      info->type_default = FILE_TYPE_SHADER;
                      if (video_shader_is_supported(RARCH_SHADER_CG))
-                        string_list_append(&str_list, "cg", attr);
+                        _len    += strlcpy(new_exts + _len, "cg", sizeof(new_exts) - _len);
                      if (video_shader_is_supported(RARCH_SHADER_GLSL))
-                        string_list_append(&str_list, "glsl", attr);
+                     {
+                        if (new_exts[_len-1] != '\0')
+                           _len += strlcpy(new_exts + _len, "|",   sizeof(new_exts) - _len);
+                        _len    += strlcpy(new_exts + _len, "glsl", sizeof(new_exts) - _len);
+                     }
                      if (video_shader_is_supported(RARCH_SHADER_SLANG))
-                        string_list_append(&str_list, "slang", attr);
+                     {
+                        if (new_exts[_len-1] != '\0')
+                           _len += strlcpy(new_exts + _len, "|",   sizeof(new_exts) - _len);
+                        _len    += strlcpy(new_exts + _len, "slang", sizeof(new_exts) - _len);
+                     }
                      break;
                   default:
                      break;
                }
 
-               string_list_join_concat(new_exts, sizeof(new_exts), &str_list, "|");
                if (!string_is_empty(info->exts))
                   free(info->exts);
-               info->exts = strdup(new_exts);
-               string_list_deinitialize(&str_list);
+               info->exts         = strdup(new_exts);
                use_filebrowser    = true;
             }
 #endif
@@ -14980,25 +15053,28 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
             menu_entries_clear(info->list);
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
             {
-               struct string_list str_list = {0};
                char new_exts[PATH_MAX_LENGTH];
-               union string_list_elem_attr attr;
-               attr.i = 0;
+               size_t _len = 0;
                new_exts[0] = '\0';
-               string_list_initialize(&str_list);
                filebrowser_clear_type();
                info->type_default = FILE_TYPE_SHADER_PRESET;
                if (video_shader_is_supported(RARCH_SHADER_CG))
-                  string_list_append(&str_list, "cgp", attr);
+                  _len    += strlcpy(new_exts + _len, "cgp", sizeof(new_exts) - _len);
                if (video_shader_is_supported(RARCH_SHADER_GLSL))
-                  string_list_append(&str_list, "glslp", attr);
+               {
+                  if (new_exts[_len-1] != '\0')
+                     _len += strlcpy(new_exts + _len, "|",   sizeof(new_exts) - _len);
+                  _len    += strlcpy(new_exts + _len, "glslp", sizeof(new_exts) - _len);
+               }
                if (video_shader_is_supported(RARCH_SHADER_SLANG))
-                  string_list_append(&str_list, "slangp", attr);
-               string_list_join_concat(new_exts, sizeof(new_exts), &str_list, "|");
+               {
+                  if (new_exts[_len-1] != '\0')
+                     _len += strlcpy(new_exts + _len, "|",   sizeof(new_exts) - _len);
+                  _len    += strlcpy(new_exts + _len, "slangp", sizeof(new_exts) - _len);
+               }
                if (!string_is_empty(info->exts))
                   free(info->exts);
                info->exts = strdup(new_exts);
-               string_list_deinitialize(&str_list);
                use_filebrowser    = true;
             }
 #endif
@@ -15010,30 +15086,33 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                filebrowser_clear_type();
             info->type_default = FILE_TYPE_IMAGE;
             {
+               size_t _len = 0;
                char new_exts[PATH_MAX_LENGTH];
-               union string_list_elem_attr attr;
-               struct string_list *str_list     = string_list_new();
-               attr.i = 0;
                new_exts[0] = '\0';
 #ifdef HAVE_RBMP
-               string_list_append(str_list, "bmp", attr);
+               _len    += strlcpy(new_exts + _len, "bmp", sizeof(new_exts) - _len);
 #endif
 #ifdef HAVE_RPNG
-               string_list_append(str_list, "png", attr);
+               if (new_exts[_len-1] != '\0')
+                  _len += strlcpy(new_exts + _len, "|",   sizeof(new_exts) - _len);
+               _len    += strlcpy(new_exts + _len, "png", sizeof(new_exts) - _len);
 #endif
 #ifdef HAVE_RJPEG
-               string_list_append(str_list, "jpeg", attr);
-               string_list_append(str_list, "jpg", attr);
+               if (new_exts[_len-1] != '\0')
+                  _len += strlcpy(new_exts + _len, "|",   sizeof(new_exts) - _len);
+               _len    += strlcpy(new_exts + _len, "jpeg", sizeof(new_exts) - _len);
+               if (new_exts[_len-1] != '\0')
+                  _len += strlcpy(new_exts + _len, "|",   sizeof(new_exts) - _len);
+               _len    += strlcpy(new_exts + _len, "jpg", sizeof(new_exts) - _len);
 #endif
 #ifdef HAVE_RTGA
-               string_list_append(str_list, "tga", attr);
+               if (new_exts[_len-1] != '\0')
+                  _len += strlcpy(new_exts + _len, "|",   sizeof(new_exts) - _len);
+               _len    += strlcpy(new_exts + _len, "tga", sizeof(new_exts) - _len);
 #endif
-               string_list_join_concat(new_exts,
-                     sizeof(new_exts), str_list, "|");
                if (!string_is_empty(info->exts))
                   free(info->exts);
                info->exts = strdup(new_exts);
-               string_list_free(str_list);
             }
             use_filebrowser    = true;
             break;
@@ -15176,14 +15255,16 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                   break;
                case DISPLAYLIST_FILE_BROWSER_SELECT_SIDELOAD_CORE:
                   {
+                     size_t _len;
                      char ext_names[32];
 
                      info->type_default = FILE_TYPE_SIDELOAD_CORE;
 
-                     if (frontend_driver_get_core_extension(ext_names, sizeof(ext_names)))
+                     _len = frontend_driver_get_core_extension(ext_names, sizeof(ext_names));
+                     if (_len > 0)
                      {
-                        strlcat(ext_names, "|", sizeof(ext_names));
-                        strlcat(ext_names, FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT, sizeof(ext_names));
+                        _len += strlcpy(ext_names + _len, "|", sizeof(ext_names) - _len);
+                        _len += strlcpy(ext_names + _len, FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT, sizeof(ext_names) - _len);
                      }
                      else
                         strlcpy(ext_names, FILE_PATH_CORE_BACKUP_EXTENSION_NO_DOT, sizeof(ext_names));
@@ -15295,68 +15376,66 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                      {
                         case ST_STRING_OPTIONS:
                            {
-                              struct string_list tmp_str_list = {0};
-                              string_list_initialize(&tmp_str_list);
-                              string_split_noalloc(&tmp_str_list,
-                                    setting->values, "|");
+                              char val_d[16];
+                              char *tok, *save;
+                              unsigned i               = 0;
+                              bool checked_found       = false;
+                              unsigned checked         = 0;
+                              char* orig_val           = setting->get_string_representation ?
+                                 strdup(setting->value.target.string) : setting->value.target.string;
+                              char *setting_values_cpy = strdup(setting->values);
+                              snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
 
-                              if (tmp_str_list.size > 0)
+                              for (tok = strtok_r(setting_values_cpy, "|", &save); tok;
+                                    tok = strtok_r(NULL, "|", &save), i++)
                               {
-                                 unsigned i;
-                                 char val_s[256], val_d[16];
-                                 unsigned size        = (unsigned)
-                                    tmp_str_list.size;
-                                 bool checked_found   = false;
-                                 unsigned checked     = 0;
-                                 char* orig_val       = setting->get_string_representation ?
-                                    strdup(setting->value.target.string) : setting->value.target.string;
-                                 snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
-
-                                 for (i = 0; i < size; i++)
-                                 {
-                                    const char* val = tmp_str_list.elems[i].data;
                                     if (setting->get_string_representation)
                                     {
-                                       strlcpy(setting->value.target.string, val, setting->size);
+                                       char val_s[256];
+                                       strlcpy(setting->value.target.string, tok, setting->size);
                                        setting->get_string_representation(setting,
                                              val_s, sizeof(val_s));
-                                       val = val_s;
+                                       if (menu_entries_append(info->list,
+                                                val_s,
+                                                val_d,
+                                                MENU_ENUM_LABEL_NO_ITEMS,
+                                                MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM,
+                                                i, 0, NULL))
+                                          count++;
+                                    }
+                                    else
+                                    {
+                                       if (menu_entries_append(info->list,
+                                                tok,
+                                                val_d,
+                                                MENU_ENUM_LABEL_NO_ITEMS,
+                                                MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM,
+                                                i, 0, NULL))
+                                          count++;
                                     }
 
-                                    if (menu_entries_append(info->list,
-                                             val,
-                                             val_d,
-                                             MENU_ENUM_LABEL_NO_ITEMS,
-                                             MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM,
-                                             i, 0, NULL))
-                                       count++;
-
-                                    if (!checked_found && string_is_equal(
-                                             tmp_str_list.elems[i].data,
-                                             orig_val))
+                                    if (!checked_found && string_is_equal(tok, orig_val))
                                     {
-                                       checked = i;
+                                       checked       = i;
                                        checked_found = true;
                                     }
-                                 }
-
-                                 if (setting->get_string_representation)
-                                 {
-                                    strlcpy(setting->value.target.string, orig_val, setting->size);
-                                    free(orig_val);
-                                 }
+                              }
+                              free(setting_values_cpy);
 
-                                 if (checked_found)
-                                 {
-                                    struct menu_state *menu_st = menu_state_get_ptr();
-                                    menu_file_list_cbs_t *cbs  = (menu_file_list_cbs_t*)info->list->list[checked].actiondata;
-                                    if (cbs)
-                                       cbs->checked            = true;
-                                    menu_st->selection_ptr     = checked;
-                                 }
+                              if (setting->get_string_representation)
+                              {
+                                 strlcpy(setting->value.target.string, orig_val, setting->size);
+                                 free(orig_val);
                               }
 
-                              string_list_deinitialize(&tmp_str_list);
+                              if (checked_found)
+                              {
+                                 struct menu_state *menu_st = menu_state_get_ptr();
+                                 menu_file_list_cbs_t *cbs  = (menu_file_list_cbs_t*)info->list->list[checked].actiondata;
+                                 if (cbs)
+                                    cbs->checked            = true;
+                                 menu_st->selection_ptr     = checked;
+                              }
                            }
                            break;
                         case ST_INT:
@@ -15651,50 +15730,42 @@ bool menu_displaylist_ctl(enum menu_displaylist_ctl_state type,
                   {
                      case ST_STRING_OPTIONS:
                         {
-                           struct string_list tmp_str_list = {0};
+                           char val_d[16];
+                           char *tok, *save;
+                           unsigned i               = 0;
+                           bool checked_found       = false;
+                           unsigned checked         = 0;
+                           char *setting_values_cpy = strdup(setting->values);
 
-                           string_list_initialize(&tmp_str_list);
-                           string_split_noalloc(&tmp_str_list,
-                                 setting->values, "|");
+                           snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
 
-                           if (tmp_str_list.size > 0)
+                           for (tok = strtok_r(setting_values_cpy, "|", &save); tok;
+                                 tok = strtok_r(NULL, "|", &save), i++)
                            {
-                              unsigned i;
-                              char val_d[16];
-                              unsigned size        = (unsigned)tmp_str_list.size;
-                              bool checked_found   = false;
-                              unsigned checked     = 0;
-                              snprintf(val_d, sizeof(val_d), "%d", setting->enum_idx);
-
-                              for (i = 0; i < size; i++)
-                              {
-                                 if (menu_entries_append(info->list,
-                                          tmp_str_list.elems[i].data,
-                                          val_d,
-                                          MENU_ENUM_LABEL_NO_ITEMS,
-                                          MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM_SPECIAL, i, 0, NULL))
-                                    count++;
-
-                                 if (    !checked_found
-                                       && string_is_equal(tmp_str_list.elems[i].data,
-                                          setting->value.target.string))
-                                 {
-                                    checked = i;
-                                    checked_found = true;
-                                 }
-                              }
+                              if (menu_entries_append(info->list,
+                                       tok,
+                                       val_d,
+                                       MENU_ENUM_LABEL_NO_ITEMS,
+                                       MENU_SETTING_DROPDOWN_SETTING_STRING_OPTIONS_ITEM_SPECIAL, i, 0, NULL))
+                                 count++;
 
-                              if (checked_found)
+                              if (    !checked_found
+                                    && string_is_equal(tok, setting->value.target.string))
                               {
-                                 struct menu_state *menu_st = menu_state_get_ptr();
-                                 menu_file_list_cbs_t *cbs  = (menu_file_list_cbs_t*)info->list->list[checked].actiondata;
-                                 if (cbs)
-                                    cbs->checked            = true;
-                                 menu_st->selection_ptr     = checked;
+                                 checked       = i;
+                                 checked_found = true;
                               }
                            }
+                           free(setting_values_cpy);
 
-                           string_list_deinitialize(&tmp_str_list);
+                           if (checked_found)
+                           {
+                              struct menu_state *menu_st = menu_state_get_ptr();
+                              menu_file_list_cbs_t *cbs  = (menu_file_list_cbs_t*)info->list->list[checked].actiondata;
+                              if (cbs)
+                                 cbs->checked            = true;
+                              menu_st->selection_ptr     = checked;
+                           }
                         }
                         break;
                      case ST_INT:
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index a9d530edcf15..7cc5a68fc731 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -640,7 +640,7 @@ bool menu_entries_list_search(const char *needle, size_t *idx)
 /* Display the date and time - time_mode will influence how
  * the time representation will look like.
  * */
-void menu_display_timedate(gfx_display_ctx_datetime_t *datetime)
+size_t menu_display_timedate(gfx_display_ctx_datetime_t *datetime)
 {
    struct menu_state *menu_st  = &menu_driver_state;
 
@@ -1008,7 +1008,7 @@ void menu_display_timedate(gfx_display_ctx_datetime_t *datetime)
 
    /* Copy cached datetime string to input
     * menu_display_ctx_datetime_t struct */
-   strlcpy(datetime->s, menu_st->datetime_cache, datetime->len);
+   return strlcpy(datetime->s, menu_st->datetime_cache, datetime->len);
 }
 
 /* Display current (battery) power state */
@@ -5195,6 +5195,7 @@ unsigned menu_event(
       input_bits_t *p_trigger_input,
       bool display_kb)
 {
+   int i;
    /* Used for key repeat */
    static retro_time_t last_time_us                = 0;
    static float delay_timer                        = 0.0f;
@@ -5242,7 +5243,6 @@ unsigned menu_event(
          RETRO_DEVICE_ID_JOYPAD_A : RETRO_DEVICE_ID_JOYPAD_B;
    unsigned ok_current                             = BIT256_GET_PTR(p_input, menu_ok_btn);
    unsigned ok_trigger                             = ok_current & ~ok_old;
-   unsigned i                                      = 0;
    static unsigned navigation_initial              = 0;
    unsigned navigation_current                     = 0;
    unsigned navigation_buttons[8]                  =
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 254afafc1e25..27fdeb1dcac5 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -627,7 +627,7 @@ bool menu_driver_init(bool video_is_threaded);
 
 retro_time_t menu_driver_get_current_time(void);
 
-void menu_display_timedate(gfx_display_ctx_datetime_t *datetime);
+size_t menu_display_timedate(gfx_display_ctx_datetime_t *datetime);
 
 void menu_display_powerstate(gfx_display_ctx_powerstate_t *powerstate);
 
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index 390bc0c6f62c..a92f2bca800e 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -11830,6 +11830,36 @@ static bool setting_append_list(
                general_read_handler,
                SD_FLAG_NONE);
 
+         CONFIG_BOOL(
+               list, list_info,
+               &settings->bools.cloud_sync_sync_saves,
+               MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_SAVES,
+               MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_SAVES,
+               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_NONE);
+
+         CONFIG_BOOL(
+               list, list_info,
+               &settings->bools.cloud_sync_sync_configs,
+               MENU_ENUM_LABEL_CLOUD_SYNC_SYNC_CONFIGS,
+               MENU_ENUM_LABEL_VALUE_CLOUD_SYNC_SYNC_CONFIGS,
+               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_NONE);
+
          CONFIG_STRING_OPTIONS(
                list, list_info,
                settings->arrays.cloud_sync_driver,
@@ -12929,6 +12959,84 @@ static bool setting_append_list(
             END_SUB_GROUP(list, list_info, parent_group);
             START_SUB_GROUP(list, list_info, "Aspect", &group_info, &subgroup_info, parent_group);
 
+            CONFIG_FLOAT(
+                  list, list_info,
+                  &settings->floats.video_viewport_bias_x,
+                  MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_X,
+                  MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_X,
+                  DEFAULT_VIEWPORT_BIAS_X,
+                  "%.2f",
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler);
+            menu_settings_list_current_add_range(list, list_info, 0.0, 1.0, 0.05, true, true);
+            (*list)[list_info->index - 1].offset_by = 0;
+            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ALLOW_INPUT);
+            MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info,
+                                               CMD_EVENT_VIDEO_APPLY_STATE_CHANGES);
+            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
+
+            CONFIG_FLOAT(
+                  list, list_info,
+                  &settings->floats.video_viewport_bias_y,
+                  MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_Y,
+                  MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_Y,
+                  DEFAULT_VIEWPORT_BIAS_Y,
+                  "%.2f",
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler);
+            menu_settings_list_current_add_range(list, list_info, 0.0, 1.0, 0.05, true, true);
+            (*list)[list_info->index - 1].offset_by = 0;
+            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ALLOW_INPUT);
+            MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info,
+                                               CMD_EVENT_VIDEO_APPLY_STATE_CHANGES);
+            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
+
+#if defined(RARCH_MOBILE)
+            CONFIG_FLOAT(
+                  list, list_info,
+                  &settings->floats.video_viewport_bias_portrait_x,
+                  MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+                  MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_X,
+                  DEFAULT_VIEWPORT_BIAS_PORTRAIT_X,
+                  "%.2f",
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler);
+            menu_settings_list_current_add_range(list, list_info, 0.0, 1.0, 0.05, true, true);
+            (*list)[list_info->index - 1].offset_by = 0;
+            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ALLOW_INPUT);
+            MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info,
+                                               CMD_EVENT_VIDEO_APPLY_STATE_CHANGES);
+            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
+
+            CONFIG_FLOAT(
+                  list, list_info,
+                  &settings->floats.video_viewport_bias_portrait_y,
+                  MENU_ENUM_LABEL_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+                  MENU_ENUM_LABEL_VALUE_VIDEO_VIEWPORT_BIAS_PORTRAIT_Y,
+                  DEFAULT_VIEWPORT_BIAS_PORTRAIT_Y,
+                  "%.2f",
+                  &group_info,
+                  &subgroup_info,
+                  parent_group,
+                  general_write_handler,
+                  general_read_handler);
+            menu_settings_list_current_add_range(list, list_info, 0.0, 1.0, 0.05, true, true);
+            (*list)[list_info->index - 1].offset_by = 0;
+            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_ALLOW_INPUT);
+            MENU_SETTINGS_LIST_CURRENT_ADD_CMD(list, list_info,
+                                               CMD_EVENT_VIDEO_APPLY_STATE_CHANGES);
+            SETTINGS_DATA_LIST_CURRENT_ADD_FLAGS(list, list_info, SD_FLAG_LAKKA_ADVANCED);
+#endif
+
             CONFIG_UINT(
                   list, list_info,
                   &settings->uints.video_aspect_ratio_idx,
diff --git a/menu/menu_shader.h b/menu/menu_shader.h
index d4459e53f9a3..2365cd94ff4b 100644
--- a/menu/menu_shader.h
+++ b/menu/menu_shader.h
@@ -18,7 +18,6 @@
 #define _MENU_SHADER_MANAGER_H
 
 #include <retro_common_api.h>
-#include <lists/string_list.h>
 
 #include "../gfx/video_shader_parse.h"
 
@@ -59,8 +58,8 @@ bool menu_shader_manager_init(void);
  **/
 bool menu_shader_manager_set_preset(
       struct video_shader *menu_shader,
-      enum rarch_shader_type type, 
-      const char *preset_path, 
+      enum rarch_shader_type type,
+      const char *preset_path,
       bool apply);
 
 /**
diff --git a/msg_hash.h b/msg_hash.h
index bcc0e37ec607..b38471c158cc 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -3230,6 +3230,8 @@ enum msg_hash_enums
    MENU_LABEL(CLOUD_SYNC_SETTINGS),
    MENU_LABEL(CLOUD_SYNC_ENABLE),
    MENU_LABEL(CLOUD_SYNC_DESTRUCTIVE),
+   MENU_LABEL(CLOUD_SYNC_SYNC_SAVES),
+   MENU_LABEL(CLOUD_SYNC_SYNC_CONFIGS),
    MENU_LABEL(CLOUD_SYNC_DRIVER),
    MENU_LABEL(CLOUD_SYNC_URL),
    MENU_LABEL(CLOUD_SYNC_USERNAME),
@@ -3385,6 +3387,12 @@ enum msg_hash_enums
    MENU_LABEL(VIDEO_OVERSCAN_CORRECTION_TOP),
    MENU_LABEL(VIDEO_OVERSCAN_CORRECTION_BOTTOM),
    MENU_LABEL(VIDEO_ASPECT_RATIO),
+   MENU_LABEL(VIDEO_VIEWPORT_BIAS_X),
+   MENU_LABEL(VIDEO_VIEWPORT_BIAS_Y),
+#if defined(RARCH_MOBILE)
+   MENU_LABEL(VIDEO_VIEWPORT_BIAS_PORTRAIT_X),
+   MENU_LABEL(VIDEO_VIEWPORT_BIAS_PORTRAIT_Y),
+#endif
    MENU_LABEL(VIDEO_FORCE_ASPECT),
    MENU_LABEL(VIDEO_ASPECT_RATIO_AUTO),
    MENU_LABEL(VIDEO_ASPECT_RATIO_INDEX),
diff --git a/network/cloud_sync/webdav.c b/network/cloud_sync/webdav.c
index b8be2c246a84..cba17263391a 100644
--- a/network/cloud_sync/webdav.c
+++ b/network/cloud_sync/webdav.c
@@ -824,9 +824,8 @@ static bool webdav_delete(const char *path, cloud_sync_complete_handler_t cb, vo
    }
    else
    {
-      char   dir[PATH_MAX_LENGTH] = {0};
-      size_t _len;
-      _len = strlcat(dir, "deleted/", sizeof(dir));
+      char dir[PATH_MAX_LENGTH];
+      size_t _len = strlcpy(dir, "deleted/", sizeof(dir));
       fill_pathname_basedir(dir + _len, path, sizeof(dir) - _len);
       webdav_ensure_dir(dir, webdav_do_backup, webdav_cb_st);
    }
diff --git a/pkg/apple/update-cores.sh b/pkg/apple/update-cores.sh
index d6f33d56ccba..a898e26e4f0e 100755
--- a/pkg/apple/update-cores.sh
+++ b/pkg/apple/update-cores.sh
@@ -116,45 +116,90 @@ else
             dylibs=(${allcores[*]})
         elif [ "$1" = "appstore" ] ; then
             exports=(
-                mupen64plus_next
-                kronos
-                pcsx_rearmed
-                easyrpg
+                2048
+                a5200
+                anarch
+                ardens
+                atari800
+                #blastem
+                bluemsx
+                bsnes
+                bsnes_hd_beta
+                cap32
+                crocods
+                desmume
                 dinothawr
-                sameboy
-                mgba
+                dirksimple
+                dosbox_pure
+                DoubleCherryGB
+                easyrpg
+                ep128emu_core
+                fbneo
+                fceumm
+                #flycast
+                freechaf
+                freeintv
+                fuse
+                gambatte
+                gearboy
+                gearsystem
+                genesis_plus_gx
+                genesis_plus_gx_wide
+                geolith
+                gme
                 gpsp
+                gw
+                handy
+                kronos
+                mednafen_ngp
+                mednafen_pce
+                mednafen_pce_fast
+                mednafen_psx
+                mednafen_psx_hw
+                mednafen_saturn
+                mednafen_supergrafx
+                mednafen_vb
+                mednafen_wswan
+                melondsds
                 mesen
                 mesen-s
-                genesis_plus_gx
-                genesis_plus_gx_wide
-                fbneo
-                bsnes
-                bsnes_hd_beta
-                #flycast
-                desmume
+                mgba
+                mojozork
+                mu
+                mupen64plus_next
+                neocd
+                nestopia
+                np2kai
+                numero
+                nxengine
+                pcsx_rearmed
+                picodrive
+                #play
+                pocketcdg
+                pokemini
+                potator
                 ppsspp
-                stella
-                stella2014
+                prboom
+                prosystem
+                puae
+                px68k
+                quicknes
+                race
+                sameboy
+                scummvm
+                smsplus
                 snes9x
                 snes9x2005
                 snes9x2010
-                vbam
+                stella
+                stella2014
+                tgbdual
+                theodore
+                tic80
+                tyrquake
                 vba_next
-                picodrive
-                np2kai
-                atari800
-                prosystem
-                cap32
-                crocods
-                pocketcdg
-                neocd
-                nestopia
-                fceumm
-                race
-                quicknes
-                smsplus
-                #blastem
+                vbam
+                vecx
                 vice_x128
                 vice_x64
                 vice_x64sc
@@ -164,53 +209,10 @@ else
                 vice_xplus4
                 vice_xscpu64
                 vice_xvic
-                puae
-                mednafen_pce
-                mednafen_pce_fast
-                mednafen_supergrafx
-                mednafen_vb
-                mednafen_wswan
-                mednafen_psx
-                mednafen_psx_hw
-                mednafen_saturn
-                potator
-                vecx
-                tgbdual
-                gw
-                fuse
-                freechaf
-                gambatte
-                freeintv
-                gearsystem
-                gearboy
-                handy
-                tic80
+                vircon32
+                virtualxt
                 wasm4
-                gme
-                tyrquake
-                theodore
-                a5200
-                #play
-                bluemsx
-                px68k
                 xrick
-                ep128emu_core
-                mojozork
-                numero
-                dirksimple
-                scummvm
-                virtualxt
-                geolith
-                vircon32
-                melondsds
-                2048
-                mu
-                dosbox_pure
-                pokemini
-                nxengine
-                prboom
-                mednafen_ngp
-                DoubleCherryGB
             )
             for dylib in "${exports[@]}" ; do
                 find_dylib $dylib
diff --git a/playlist.c b/playlist.c
index 122cdbe78f0f..d2f28674b1f7 100644
--- a/playlist.c
+++ b/playlist.c
@@ -112,7 +112,7 @@ typedef int (playlist_sort_fun_t)(
       const struct playlist_entry *a,
       const struct playlist_entry *b);
 
-/* TODO/FIXME - hack for allowing the explore view to switch 
+/* TODO/FIXME - hack for allowing the explore view to switch
  * over to a playlist item */
 void playlist_set_cached_external(playlist_t* pl)
 {
@@ -139,7 +139,7 @@ void playlist_config_set_path(playlist_config_t *config, const char *path)
 
 /* Convenience function: copies base content directory
  * path to specified playlist configuration object.
- * Also sets autofix_paths boolean, depending on base 
+ * Also sets autofix_paths boolean, depending on base
  * content directory value */
 void playlist_config_set_base_content_directory(
       playlist_config_t* config, const char* path)
@@ -209,7 +209,7 @@ static void path_replace_base_path_and_convert_to_local_file_system(
             strlen(in_path) - in_oldrefpath_length + 1);
 #ifdef _WIN32
       /* If we are running under a Windows filesystem,
-       * '/' characters are not allowed anywhere. 
+       * '/' characters are not allowed anywhere.
        * We replace with '\' and hope for the best... */
       string_replace_all_chars(out_path,
             POSIX_PATH_DELIMITER, WINDOWS_PATH_DELIMITER);
@@ -498,7 +498,7 @@ static bool playlist_core_path_equal(const char *real_core_path, const char *ent
    char entry_real_core_path[PATH_MAX_LENGTH];
 
    /* Sanity check */
-   if (     string_is_empty(real_core_path) 
+   if (     string_is_empty(real_core_path)
          || string_is_empty(entry_core_path))
       return false;
 
@@ -1059,7 +1059,7 @@ bool playlist_push_runtime(playlist_t *playlist,
    return false;
 }
 
-void playlist_update_thumbnail_name_flag(playlist_t *playlist, size_t idx, 
+void playlist_update_thumbnail_name_flag(playlist_t *playlist, size_t idx,
       enum playlist_thumbnail_name_flags thumbnail_flags)
 {
    struct playlist_entry *entry = NULL;
@@ -1413,19 +1413,19 @@ bool playlist_push(playlist_t *playlist,
        * or command line, certain entry values will be missing.
        * If we are now loading the same content from a playlist,
        * fill in any blanks */
-      if (     !playlist->entries[i].label 
+      if (     !playlist->entries[i].label
             && !string_is_empty(entry->label))
       {
          playlist->entries[i].label       = strdup(entry->label);
          entry_updated                    = true;
       }
-      if (     !playlist->entries[i].crc32 
+      if (     !playlist->entries[i].crc32
             && !string_is_empty(entry->crc32))
       {
          playlist->entries[i].crc32       = strdup(entry->crc32);
          entry_updated                    = true;
       }
-      if (     !playlist->entries[i].db_name 
+      if (     !playlist->entries[i].db_name
             && !string_is_empty(entry->db_name))
       {
          playlist->entries[i].db_name     = strdup(entry->db_name);
@@ -2213,11 +2213,11 @@ static bool JSONEndArrayHandler(void *context)
 
    pCtx->array_depth--;
 
-   if (     pCtx->in_items 
+   if (     pCtx->in_items
          && (pCtx->array_depth  == 0)
          && (pCtx->object_depth <= 1))
       pCtx->in_items = false;
-   else if (pCtx->in_subsystem_roms 
+   else if (pCtx->in_subsystem_roms
          && (pCtx->array_depth  <= 1)
          && (pCtx->object_depth <= 2))
       pCtx->in_subsystem_roms = false;
@@ -2231,11 +2231,11 @@ static bool JSONStartObjectHandler(void *context)
 
    pCtx->object_depth++;
 
-   if (      pCtx->in_items 
+   if (      pCtx->in_items
          && (pCtx->object_depth == 2))
    {
       if (
-            (pCtx->array_depth == 1) 
+            (pCtx->array_depth == 1)
          && !pCtx->capacity_exceeded)
       {
          size_t len = RBUF_LEN(pCtx->playlist->entries);
@@ -2275,10 +2275,10 @@ static bool JSONEndObjectHandler(void *context)
 {
    JSONContext *pCtx = (JSONContext *)context;
 
-   if (     pCtx->in_items 
+   if (     pCtx->in_items
          && pCtx->object_depth == 2)
    {
-      if (     (pCtx->array_depth == 1) 
+      if (     (pCtx->array_depth == 1)
             && !pCtx->capacity_exceeded)
          RBUF_RESIZE(pCtx->playlist->entries,
                RBUF_LEN(pCtx->playlist->entries) + 1);
@@ -2293,8 +2293,8 @@ static bool JSONStringHandler(void *context, const char *pValue, size_t length)
 {
    JSONContext *pCtx = (JSONContext *)context;
 
-   if (     pCtx->in_items 
-         && pCtx->in_subsystem_roms 
+   if (     pCtx->in_items
+         && pCtx->in_subsystem_roms
          && (pCtx->object_depth == 2)
          && (pCtx->array_depth  == 2))
    {
@@ -2313,8 +2313,8 @@ static bool JSONStringHandler(void *context, const char *pValue, size_t length)
    {
       if (pCtx->array_depth == 1)
       {
-         if (     pCtx->current_string_val 
-               && length 
+         if (     pCtx->current_string_val
+               && length
                && !string_is_empty(pValue))
          {
             if (*pCtx->current_string_val)
@@ -2327,8 +2327,8 @@ static bool JSONStringHandler(void *context, const char *pValue, size_t length)
    {
       if (pCtx->array_depth == 0)
       {
-         if (     pCtx->current_string_val 
-               && length 
+         if (     pCtx->current_string_val
+               && length
                && !string_is_empty(pValue))
          {
             /* handle any top-level playlist metadata here */
@@ -2348,11 +2348,11 @@ static bool JSONNumberHandler(void *context, const char *pValue, size_t length)
 {
    JSONContext *pCtx = (JSONContext *)context;
 
-   if (     pCtx->in_items 
+   if (     pCtx->in_items
          && (pCtx->object_depth == 2))
    {
       if (    (pCtx->array_depth == 1)
-            && length 
+            && length
             && !string_is_empty(pValue))
       {
          if (pCtx->current_entry_uint_val)
@@ -2406,7 +2406,7 @@ static bool JSONObjectMemberHandler(void *context, const char *pValue, size_t le
 {
    JSONContext *pCtx = (JSONContext *)context;
 
-   if (     pCtx->in_items 
+   if (     pCtx->in_items
          && (pCtx->object_depth == 2))
    {
       if (pCtx->array_depth == 1)
@@ -2790,32 +2790,32 @@ static bool playlist_read_file(playlist_t *playlist)
                      line_buf[3],
                      STRLEN_CONST("thumbnail_mode")) == 0)
             {
+               char *tok, *save;
                char thumbnail_mode_str[8]          = {0};
-               struct string_list thumbnail_modes  = {0};
+               char *thumbnail_mode_str_cpy = strdup(thumbnail_mode_str);
 
                playlist_get_old_format_metadata_value(
                      line_buf[3], thumbnail_mode_str,
                      sizeof(thumbnail_mode_str));
-               string_list_initialize(&thumbnail_modes);
-               if (string_split_noalloc(&thumbnail_modes,
-                        thumbnail_mode_str, "|"))
+
+               if ((tok = strtok_r(thumbnail_mode_str_cpy, "|", &save)))
                {
-                  if (thumbnail_modes.size == 2)
+                  char *elem0 = strdup(tok);
+                  if ((tok = strtok_r(NULL, "|", &save)))
                   {
                      /* Right thumbnail mode */
-                     unsigned thumbnail_mode = string_to_unsigned(
-                           thumbnail_modes.elems[0].data);
+                     unsigned thumbnail_mode = string_to_unsigned(elem0);
                      if (thumbnail_mode <= PLAYLIST_THUMBNAIL_MODE_BOXARTS)
                         playlist->right_thumbnail_mode = (enum playlist_thumbnail_mode)thumbnail_mode;
 
                      /* Left thumbnail mode */
-                     thumbnail_mode = string_to_unsigned(
-                           thumbnail_modes.elems[1].data);
+                     thumbnail_mode = string_to_unsigned(tok);
                      if (thumbnail_mode <= PLAYLIST_THUMBNAIL_MODE_BOXARTS)
                         playlist->left_thumbnail_mode = (enum playlist_thumbnail_mode)thumbnail_mode;
                   }
+                  free(elem0);
                }
-               string_list_deinitialize(&thumbnail_modes);
+               free(thumbnail_mode_str_cpy);
             }
 
             /* Get sort_mode */
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 39092b5e6cb7..1c8453751861 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -505,6 +505,7 @@ if [ "$HAVE_X11" != 'no' ]; then
    check_val '' XCB -lxcb '' xcb '' '' false
    check_val '' XEXT -lXext '' xext '' '' false
    check_val '' XF86VM -lXxf86vm '' xxf86vm '' '' false
+   check_val '' XSCRNSAVER -lXss '' xscrnsaver '' '' false
 else
    die : 'Notice: X11 not present. Skipping X11 code paths.'
 fi
diff --git a/qb/config.params.sh b/qb/config.params.sh
index d261c8f6f379..f0de7db5636e 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -92,6 +92,7 @@ HAVE_OPENGLES3_1=no        # OpenGLES3.1 support
 HAVE_OPENGLES3_2=no        # OpenGLES3.2 support
 HAVE_X11=auto              # everything X11.
 HAVE_XRANDR=auto           # Xrandr support.
+HAVE_XSCRNSAVER=auto       # Xss support.
 HAVE_OMAP=no               # OMAP video support
 HAVE_XINERAMA=auto         # Xinerama support.
 HAVE_KMS=auto              # KMS context support
diff --git a/record/record_driver.c b/record/record_driver.c
index 89491665ad0c..5270ca26075c 100644
--- a/record/record_driver.c
+++ b/record/record_driver.c
@@ -1,512 +1,522 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
- *  Copyright (C) 2011-2021 - Daniel De Matteis
- *  Copyright (C) 2016-2019 - Andr�s Su�rez
- *
- *  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 <compat/strl.h>
-#include <string/stdstring.h>
-#include <file/file_path.h>
-#include <retro_math.h>
-
-#include "../configuration.h"
-#include "../list_special.h"
-#include "../gfx/video_driver.h"
-#include "../paths.h"
-#include "../retroarch.h"
-#include "../runloop.h"
-#include "../verbosity.h"
-#include "../defaults.h"
-
-#include "record_driver.h"
-
-static recording_state_t recording_state = {0};
-
-static const record_driver_t record_null = {
-   NULL, /* new */
-   NULL, /* free */
-   NULL, /* push_video */
-   NULL, /* push_audio */
-   NULL, /* finalize */
-   "null",
-};
-
-const record_driver_t *record_drivers[] = {
-#ifdef HAVE_FFMPEG
-   &record_ffmpeg,
-#endif
-   &record_null,
-   NULL,
-};
-
-recording_state_t *recording_state_get_ptr(void)
-{
-   return &recording_state;
-}
-
-/**
- * config_get_record_driver_options:
- *
- * Get an enumerated list of all record driver names, separated by '|'.
- *
- * @return string listing of all record driver names, separated by '|'.
- **/
-const char* config_get_record_driver_options(void)
-{
-   return char_list_new_special(STRING_LIST_RECORD_DRIVERS, NULL);
-}
-
-#if 0
-/* TODO/FIXME - not used apparently */
-static void find_record_driver(const char *prefix,
-      bool verbosity_enabled)
-{
-   settings_t *settings = config_get_ptr();
-   int i                = (int)driver_find_index(
-         "record_driver",
-         settings->arrays.record_driver);
-
-   if (i >= 0)
-      recording_state.driver = (const record_driver_t*)record_drivers[i];
-   else
-   {
-      if (verbosity_enabled)
-      {
-         unsigned d;
-
-         RARCH_ERR("[Recording]: Couldn't find any %s named \"%s\".\n", prefix,
-               settings->arrays.record_driver);
-         RARCH_LOG_OUTPUT("Available %ss are:\n", prefix);
-         for (d = 0; record_drivers[d]; d++)
-            RARCH_LOG_OUTPUT("\t%s\n", record_drivers[d].ident);
-         RARCH_WARN("[Recording]: Going to default to first %s...\n", prefix);
-      }
-
-      recording_state.driver = (const record_driver_t*)record_drivers[0];
-
-      if (!recording_state.driver)
-         retroarch_fail(1, "find_record_driver()");
-   }
-}
-
-/**
- * ffemu_find_backend:
- * @ident                   : Identifier of driver to find.
- *
- * Finds a recording driver with the name @ident.
- *
- * Returns: recording driver handle if successful, otherwise
- * NULL.
- **/
-static const record_driver_t *ffemu_find_backend(const char *ident)
-{
-   unsigned i;
-
-   for (i = 0; record_drivers[i]; i++)
-   {
-      if (string_is_equal(record_drivers[i]->ident, ident))
-         return record_drivers[i];
-   }
-
-   return NULL;
-}
-
-static void recording_driver_free_state(void)
-{
-   /* TODO/FIXME - this is not being called anywhere */
-   recording_state.gpu_width     = 0;
-   recording_state.gpu_height    = 0;
-   recording_state.width         = 0;
-   recording_stte.height         = 0;
-}
-#endif
-
-/**
- * gfx_ctx_init_first:
- * @param backend
- * Recording backend handle.
- * @param data
- * Recording data handle.
- * @param params
- * Recording info parameters.
- *
- * Finds first suitable recording context driver and initializes.
- *
- * @return true if successful, otherwise false.
- **/
-static bool record_driver_init_first(
-      const record_driver_t **backend, void **data,
-      const struct record_params *params)
-{
-   unsigned i;
-
-   for (i = 0; record_drivers[i]; i++)
-   {
-      void *handle = NULL;
-      if (!record_drivers[i]->init)
-         continue;
-      if (!(handle = record_drivers[i]->init(params)))
-         continue;
-
-      *backend = record_drivers[i];
-      *data    = handle;
-      return true;
-   }
-
-   return false;
-}
-
-bool recording_deinit(void)
-{
-   recording_state_t *recording_st = &recording_state;
-#ifdef HAVE_FFMPEG
-   settings_t *settings            = config_get_ptr();
-   bool history_list_enable        = settings->bools.history_list_enable;
-#endif
-
-   if (     !recording_st->data 
-		   || !recording_st->driver)
-      return false;
-
-   if (recording_st->driver->finalize)
-      recording_st->driver->finalize(recording_st->data);
-
-   if (recording_st->driver->free)
-      recording_st->driver->free(recording_st->data);
-
-   recording_st->data              = NULL;
-   recording_st->driver            = NULL;
-
-   video_driver_gpu_record_deinit();
-
-   /* Push recording to video history playlist */
-#ifdef HAVE_FFMPEG
-   if (     history_list_enable
-         && !string_is_empty(recording_st->path))
-   {
-      struct playlist_entry entry = {0};
-
-      /* the push function reads our entry as const, so these casts are safe */
-      entry.path                  = recording_st->path;
-      entry.core_path             = (char*)"builtin";
-      entry.core_name             = (char*)"movieplayer";
-
-      command_playlist_push_write(g_defaults.video_history, &entry);
-   }
-#endif
-
-   /* Forget cached path to create a new one next */
-   recording_st->path[0] = '\0';
-
-   return true;
-}
-
-void streaming_set_state(bool state)
-{
-   recording_state_t *recording_st = &recording_state;
-   recording_st->streaming_enable  = state;
-}
-
-bool recording_init(void)
-{
-   char output[PATH_MAX_LENGTH];
-   char buf[PATH_MAX_LENGTH];
-   struct record_params params          = {0};
-   settings_t *settings                 = config_get_ptr();
-   video_driver_state_t *video_st       = video_state_get_ptr();
-   struct retro_system_av_info *av_info = &video_st->av_info;
-   runloop_state_t *runloop_st          = runloop_state_get_ptr();
-   bool video_gpu_record                = settings->bools.video_gpu_record;
-   bool video_force_aspect              = settings->bools.video_force_aspect;
-   const enum rarch_core_type
-      current_core_type                 = runloop_st->current_core_type;
-   const enum retro_pixel_format
-      video_driver_pix_fmt              = video_st->pix_fmt;
-   recording_state_t *recording_st      = &recording_state;
-   bool recording_enable                = recording_st->enable;
-
-   if (!recording_enable)
-      return false;
-
-   output[0] = '\0';
-
-   if (current_core_type == CORE_TYPE_DUMMY)
-   {
-      RARCH_WARN("[Recording]: %s\n",
-            msg_hash_to_str(MSG_USING_LIBRETRO_DUMMY_CORE_RECORDING_SKIPPED));
-      return false;
-   }
-
-   if (!video_gpu_record && video_driver_is_hw_context())
-   {
-      RARCH_WARN("[Recording]: %s.\n",
-            msg_hash_to_str(MSG_HW_RENDERED_MUST_USE_POSTSHADED_RECORDING));
-      return false;
-   }
-
-   RARCH_LOG("[Recording]: %s: FPS: %.2f, Sample rate: %.2f\n",
-         msg_hash_to_str(MSG_CUSTOM_TIMING_GIVEN),
-         (float)av_info->timing.fps,
-         (float)av_info->timing.sample_rate);
-
-   if (!string_is_empty(recording_st->path))
-      strlcpy(output, recording_st->path, sizeof(output));
-   else
-   {
-      const char *stream_url        = settings->paths.path_stream_url;
-      unsigned video_record_quality = settings->uints.video_record_quality;
-      unsigned video_stream_port    = settings->uints.video_stream_port;
-      if (recording_st->streaming_enable)
-         if (!string_is_empty(stream_url))
-            strlcpy(output, stream_url, sizeof(output));
-         else
-            /* Fallback, stream locally to 127.0.0.1 */
-            snprintf(output, sizeof(output), "udp://127.0.0.1:%u",
-                  video_stream_port);
-      else
-      {
-         const char *game_name = path_basename(path_get(RARCH_PATH_BASENAME));
-         /* Fallback to core name if started without content */
-         if (string_is_empty(game_name))
-            game_name          = runloop_st->system.info.library_name;
-
-         if (video_record_quality < RECORD_CONFIG_TYPE_RECORDING_WEBM_FAST)
-         {
-            fill_str_dated_filename(buf, game_name,
-                     "mkv", sizeof(buf));
-            fill_pathname_join_special(output, recording_st->output_dir, buf, sizeof(output));
-         }
-         else if (video_record_quality >= RECORD_CONFIG_TYPE_RECORDING_WEBM_FAST
-               && video_record_quality < RECORD_CONFIG_TYPE_RECORDING_GIF)
-         {
-            fill_str_dated_filename(buf, game_name,
-                     "webm", sizeof(buf));
-            fill_pathname_join_special(output, recording_st->output_dir, buf, sizeof(output));
-         }
-         else if (video_record_quality >= RECORD_CONFIG_TYPE_RECORDING_GIF
-               && video_record_quality < RECORD_CONFIG_TYPE_RECORDING_APNG)
-         {
-            fill_str_dated_filename(buf, game_name,
-                     "gif", sizeof(buf));
-            fill_pathname_join_special(output, recording_st->output_dir, buf, sizeof(output));
-         }
-         else
-         {
-            fill_str_dated_filename(buf, game_name,
-                     "png", sizeof(buf));
-            fill_pathname_join_special(output, recording_st->output_dir, buf, sizeof(output));
-         }
-
-         /* Cache path for playlist saving */
-         if (!string_is_empty(output))
-            strlcpy(recording_st->path, output, sizeof(recording_st->path));
-      }
-   }
-
-   params.audio_resampler           = settings->arrays.audio_resampler;
-   params.video_gpu_record          = settings->bools.video_gpu_record;
-   params.video_record_scale_factor = settings->uints.video_record_scale_factor;
-   params.video_stream_scale_factor = settings->uints.video_stream_scale_factor;
-   params.video_record_threads      = settings->uints.video_record_threads;
-   params.streaming_mode            = settings->uints.streaming_mode;
-
-   params.out_width                 = av_info->geometry.base_width;
-   params.out_height                = av_info->geometry.base_height;
-   params.fb_width                  = av_info->geometry.max_width;
-   params.fb_height                 = av_info->geometry.max_height;
-   params.channels                  = 2;
-   params.filename                  = output;
-   params.fps                       = av_info->timing.fps;
-   params.samplerate                = av_info->timing.sample_rate;
-   params.pix_fmt                   =
-      (video_driver_pix_fmt == RETRO_PIXEL_FORMAT_XRGB8888)
-      ? FFEMU_PIX_ARGB8888
-      : FFEMU_PIX_RGB565;
-   params.config                    = NULL;
-
-   if (!string_is_empty(recording_st->config))
-      params.config                 = recording_st->config;
-   else
-   {
-      if (recording_st->streaming_enable)
-      {
-         params.config = settings->paths.path_stream_config;
-         params.preset = (enum record_config_type)
-            settings->uints.video_stream_quality;
-      }
-      else
-      {
-         params.config = settings->paths.path_record_config;
-         params.preset = (enum record_config_type)
-            settings->uints.video_record_quality;
-      }
-   }
-
-   if (settings->bools.video_gpu_record
-      && video_st->current_video->read_viewport)
-   {
-      unsigned gpu_size;
-      struct video_viewport vp;
-
-      vp.x                        = 0;
-      vp.y                        = 0;
-      vp.width                    = 0;
-      vp.height                   = 0;
-      vp.full_width               = 0;
-      vp.full_height              = 0;
-
-      video_driver_get_viewport_info(&vp);
-
-      if (!vp.width || !vp.height)
-      {
-         RARCH_ERR("[Recording]: Failed to get viewport information from video driver. "
-               "Cannot start recording ...\n");
-         return false;
-      }
-
-      params.out_width                    = vp.width;
-      params.out_height                   = vp.height;
-      params.fb_width                     = next_pow2(vp.width);
-      params.fb_height                    = next_pow2(vp.height);
-
-      if (video_force_aspect &&
-            (video_st->aspect_ratio > 0.0f))
-         params.aspect_ratio              = video_st->aspect_ratio;
-      else
-         params.aspect_ratio              = (float)vp.width / vp.height;
-
-      params.pix_fmt                      = FFEMU_PIX_BGR24;
-      recording_st->gpu_width             = vp.width;
-      recording_st->gpu_height            = vp.height;
-
-      RARCH_LOG("[Recording]: %s %ux%u.\n", msg_hash_to_str(MSG_DETECTED_VIEWPORT_OF),
-            vp.width, vp.height);
-
-      gpu_size = vp.width * vp.height * 3;
-      if (!(video_st->record_gpu_buffer = (uint8_t*)malloc(gpu_size)))
-         return false;
-   }
-   else
-   {
-      if (recording_state.width || recording_state.height)
-      {
-         params.out_width  = recording_state.width;
-         params.out_height = recording_state.height;
-      }
-
-      if (video_force_aspect &&
-            (video_st->aspect_ratio > 0.0f))
-         params.aspect_ratio = video_st->aspect_ratio;
-      else
-         params.aspect_ratio = (float)params.out_width / params.out_height;
-
-#ifdef HAVE_VIDEO_FILTER
-      if (settings->bools.video_post_filter_record
-            && !!video_st->state_filter)
-      {
-         unsigned max_width  = 0;
-         unsigned max_height = 0;
-
-         params.pix_fmt      = FFEMU_PIX_RGB565;
-
-         if (video_st->flags & VIDEO_FLAG_STATE_OUT_RGB32)
-            params.pix_fmt = FFEMU_PIX_ARGB8888;
-
-         rarch_softfilter_get_max_output_size(
-               video_st->state_filter,
-               &max_width, &max_height);
-         params.fb_width  = next_pow2(max_width);
-         params.fb_height = next_pow2(max_height);
-      }
-#endif
-   }
-
-   RARCH_LOG("[Recording]: %s %s @ %ux%u. (FB size: %ux%u pix_fmt: %u)\n",
-         msg_hash_to_str(MSG_RECORDING_TO),
-         output,
-         params.out_width, params.out_height,
-         params.fb_width, params.fb_height,
-         (unsigned)params.pix_fmt);
-
-   if (!record_driver_init_first(
-            &recording_state.driver,
-            &recording_state.data, &params))
-   {
-      RARCH_ERR("[Recording]: %s\n",
-            msg_hash_to_str(MSG_FAILED_TO_START_RECORDING));
-      video_driver_gpu_record_deinit();
-
-      return false;
-   }
-
-   return true;
-}
-
-void recording_driver_update_streaming_url(void)
-{
-   settings_t     *settings      = config_get_ptr();
-   const char     *youtube_url   = "rtmp://a.rtmp.youtube.com/live2/";
-   const char     *twitch_url    = "rtmp://live.twitch.tv/app/";
-   const char     *facebook_url  = "rtmps://live-api-s.facebook.com:443/rtmp/";
-
-   if (!settings)
-      return;
-
-   switch (settings->uints.streaming_mode)
-   {
-      case STREAMING_MODE_TWITCH:
-         if (!string_is_empty(settings->arrays.twitch_stream_key))
-         {
-            size_t _len = strlcpy(settings->paths.path_stream_url,
-                  twitch_url,
-                  sizeof(settings->paths.path_stream_url));
-            strlcpy(settings->paths.path_stream_url       + _len,
-                  settings->arrays.twitch_stream_key,
-                  sizeof(settings->paths.path_stream_url) - _len);
-         }
-         break;
-      case STREAMING_MODE_YOUTUBE:
-         if (!string_is_empty(settings->arrays.youtube_stream_key))
-         {
-            size_t _len = strlcpy(settings->paths.path_stream_url,
-                  youtube_url,
-                  sizeof(settings->paths.path_stream_url));
-            strlcpy(settings->paths.path_stream_url       + _len,
-                  settings->arrays.youtube_stream_key,
-                  sizeof(settings->paths.path_stream_url) - _len);
-         }
-         break;
-      case STREAMING_MODE_LOCAL:
-         /* TODO: figure out default interface and bind to that instead */
-         snprintf(settings->paths.path_stream_url, sizeof(settings->paths.path_stream_url),
-            "udp://%s:%u", "127.0.0.1", settings->uints.video_stream_port);
-         break;
-      case STREAMING_MODE_CUSTOM:
-      default:
-         /* Do nothing, let the user input the URL */
-         break;
-      case STREAMING_MODE_FACEBOOK:
-         if (!string_is_empty(settings->arrays.facebook_stream_key))
-         {
-            size_t _len = strlcpy(settings->paths.path_stream_url,
-                  facebook_url,
-                  sizeof(settings->paths.path_stream_url));
-            strlcpy(settings->paths.path_stream_url       + _len,
-                  settings->arrays.facebook_stream_key,
-                  sizeof(settings->paths.path_stream_url) - _len);
-         }
-         break;
-   }
-}
+/*  RetroArch - A frontend for libretro.
+ *  Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ *  Copyright (C) 2011-2021 - Daniel De Matteis
+ *  Copyright (C) 2016-2019 - Andr�s Su�rez
+ *
+ *  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 <compat/strl.h>
+#include <string/stdstring.h>
+#include <file/file_path.h>
+#include <retro_math.h>
+
+#include "../configuration.h"
+#include "../list_special.h"
+#include "../gfx/video_driver.h"
+#include "../paths.h"
+#include "../retroarch.h"
+#include "../runloop.h"
+#include "../verbosity.h"
+#include "../defaults.h"
+
+#include "record_driver.h"
+
+static recording_state_t recording_state = {0};
+
+static const record_driver_t record_null = {
+   NULL, /* new */
+   NULL, /* free */
+   NULL, /* push_video */
+   NULL, /* push_audio */
+   NULL, /* finalize */
+   "null",
+};
+
+const record_driver_t *record_drivers[] = {
+#ifdef HAVE_FFMPEG
+   &record_ffmpeg,
+#endif
+   &record_null,
+   NULL,
+};
+
+recording_state_t *recording_state_get_ptr(void)
+{
+   return &recording_state;
+}
+
+/**
+ * config_get_record_driver_options:
+ *
+ * Get an enumerated list of all record driver names, separated by '|'.
+ *
+ * @return string listing of all record driver names, separated by '|'.
+ **/
+const char* config_get_record_driver_options(void)
+{
+   return char_list_new_special(STRING_LIST_RECORD_DRIVERS, NULL);
+}
+
+#if 0
+/* TODO/FIXME - not used apparently */
+static void find_record_driver(const char *prefix,
+      bool verbosity_enabled)
+{
+   settings_t *settings = config_get_ptr();
+   int i                = (int)driver_find_index(
+         "record_driver",
+         settings->arrays.record_driver);
+
+   if (i >= 0)
+      recording_state.driver = (const record_driver_t*)record_drivers[i];
+   else
+   {
+      if (verbosity_enabled)
+      {
+         unsigned d;
+
+         RARCH_ERR("[Recording]: Couldn't find any %s named \"%s\".\n", prefix,
+               settings->arrays.record_driver);
+         RARCH_LOG_OUTPUT("Available %ss are:\n", prefix);
+         for (d = 0; record_drivers[d]; d++)
+            RARCH_LOG_OUTPUT("\t%s\n", record_drivers[d].ident);
+         RARCH_WARN("[Recording]: Going to default to first %s...\n", prefix);
+      }
+
+      recording_state.driver = (const record_driver_t*)record_drivers[0];
+
+      if (!recording_state.driver)
+         retroarch_fail(1, "find_record_driver()");
+   }
+}
+
+/**
+ * ffemu_find_backend:
+ * @ident                   : Identifier of driver to find.
+ *
+ * Finds a recording driver with the name @ident.
+ *
+ * Returns: recording driver handle if successful, otherwise
+ * NULL.
+ **/
+static const record_driver_t *ffemu_find_backend(const char *ident)
+{
+   unsigned i;
+
+   for (i = 0; record_drivers[i]; i++)
+   {
+      if (string_is_equal(record_drivers[i]->ident, ident))
+         return record_drivers[i];
+   }
+
+   return NULL;
+}
+
+static void recording_driver_free_state(void)
+{
+   /* TODO/FIXME - this is not being called anywhere */
+   recording_state.gpu_width     = 0;
+   recording_state.gpu_height    = 0;
+   recording_state.width         = 0;
+   recording_stte.height         = 0;
+}
+#endif
+
+/**
+ * gfx_ctx_init_first:
+ * @param backend
+ * Recording backend handle.
+ * @param data
+ * Recording data handle.
+ * @param params
+ * Recording info parameters.
+ *
+ * Finds first suitable recording context driver and initializes.
+ *
+ * @return true if successful, otherwise false.
+ **/
+static bool record_driver_init_first(
+      const record_driver_t **backend, void **data,
+      const struct record_params *params)
+{
+   unsigned i;
+
+   for (i = 0; record_drivers[i]; i++)
+   {
+      void *handle = NULL;
+      if (!record_drivers[i]->init)
+         continue;
+      if (!(handle = record_drivers[i]->init(params)))
+         continue;
+
+      *backend = record_drivers[i];
+      *data    = handle;
+      return true;
+   }
+
+   return false;
+}
+
+bool recording_deinit(void)
+{
+   recording_state_t *recording_st = &recording_state;
+#ifdef HAVE_FFMPEG
+   settings_t *settings            = config_get_ptr();
+   bool history_list_enable        = settings->bools.history_list_enable;
+#endif
+
+   if (     !recording_st->data
+		   || !recording_st->driver)
+      return false;
+
+   if (recording_st->driver->finalize)
+      recording_st->driver->finalize(recording_st->data);
+
+   if (recording_st->driver->free)
+      recording_st->driver->free(recording_st->data);
+
+   recording_st->data              = NULL;
+   recording_st->driver            = NULL;
+
+   video_driver_gpu_record_deinit();
+
+   /* Push recording to video history playlist */
+#ifdef HAVE_FFMPEG
+   if (     history_list_enable
+         && !string_is_empty(recording_st->path))
+   {
+      struct playlist_entry entry = {0};
+
+      /* the push function reads our entry as const, so these casts are safe */
+      entry.path                  = recording_st->path;
+      entry.core_path             = (char*)"builtin";
+      entry.core_name             = (char*)"movieplayer";
+
+      command_playlist_push_write(g_defaults.video_history, &entry);
+   }
+#endif
+
+   /* Forget cached path to create a new one next */
+   recording_st->path[0] = '\0';
+
+   return true;
+}
+
+void streaming_set_state(bool state)
+{
+   recording_state_t *recording_st = &recording_state;
+   recording_st->streaming_enable  = state;
+}
+
+bool recording_init(void)
+{
+   char output[PATH_MAX_LENGTH];
+   char buf[PATH_MAX_LENGTH];
+   struct record_params params          = {0};
+   settings_t *settings                 = config_get_ptr();
+   video_driver_state_t *video_st       = video_state_get_ptr();
+   struct retro_system_av_info *av_info = &video_st->av_info;
+   runloop_state_t *runloop_st          = runloop_state_get_ptr();
+   bool video_gpu_record                = settings->bools.video_gpu_record;
+   bool video_force_aspect              = settings->bools.video_force_aspect;
+   const enum rarch_core_type
+      current_core_type                 = runloop_st->current_core_type;
+   const enum retro_pixel_format
+      video_driver_pix_fmt              = video_st->pix_fmt;
+   recording_state_t *recording_st      = &recording_state;
+   bool recording_enable                = recording_st->enable;
+
+   if (!recording_enable)
+      return false;
+
+   output[0] = '\0';
+
+   if (current_core_type == CORE_TYPE_DUMMY)
+   {
+      RARCH_WARN("[Recording]: %s\n",
+            msg_hash_to_str(MSG_USING_LIBRETRO_DUMMY_CORE_RECORDING_SKIPPED));
+      return false;
+   }
+
+   if (!video_gpu_record && video_driver_is_hw_context())
+   {
+      RARCH_WARN("[Recording]: %s.\n",
+            msg_hash_to_str(MSG_HW_RENDERED_MUST_USE_POSTSHADED_RECORDING));
+      return false;
+   }
+
+   RARCH_LOG("[Recording]: %s: FPS: %.2f, Sample rate: %.2f\n",
+         msg_hash_to_str(MSG_CUSTOM_TIMING_GIVEN),
+         (float)av_info->timing.fps,
+         (float)av_info->timing.sample_rate);
+
+   if (!string_is_empty(recording_st->path))
+      strlcpy(output, recording_st->path, sizeof(output));
+   else
+   {
+      const char *stream_url        = settings->paths.path_stream_url;
+      unsigned video_record_quality = settings->uints.video_record_quality;
+      unsigned video_stream_port    = settings->uints.video_stream_port;
+      if (recording_st->streaming_enable)
+      {
+         if (!string_is_empty(stream_url))
+            strlcpy(output, stream_url, sizeof(output));
+         else
+         {
+            /* Fallback, stream locally to 127.0.0.1 */
+            size_t _len = strlcpy(output, "udp://127.0.0.1:", sizeof(output));
+            snprintf(output + _len, sizeof(output) - _len, "%u",
+                  video_stream_port);
+         }
+      }
+      else
+      {
+         const char *game_name = path_basename(path_get(RARCH_PATH_BASENAME));
+         /* Fallback to core name if started without content */
+         if (string_is_empty(game_name))
+            game_name          = runloop_st->system.info.library_name;
+
+         if (video_record_quality < RECORD_CONFIG_TYPE_RECORDING_WEBM_FAST)
+         {
+            fill_str_dated_filename(buf, game_name,
+                     "mkv", sizeof(buf));
+            fill_pathname_join_special(output, recording_st->output_dir, buf, sizeof(output));
+         }
+         else if (video_record_quality >= RECORD_CONFIG_TYPE_RECORDING_WEBM_FAST
+               && video_record_quality < RECORD_CONFIG_TYPE_RECORDING_GIF)
+         {
+            fill_str_dated_filename(buf, game_name,
+                     "webm", sizeof(buf));
+            fill_pathname_join_special(output, recording_st->output_dir, buf, sizeof(output));
+         }
+         else if (video_record_quality >= RECORD_CONFIG_TYPE_RECORDING_GIF
+               && video_record_quality < RECORD_CONFIG_TYPE_RECORDING_APNG)
+         {
+            fill_str_dated_filename(buf, game_name,
+                     "gif", sizeof(buf));
+            fill_pathname_join_special(output, recording_st->output_dir, buf, sizeof(output));
+         }
+         else
+         {
+            fill_str_dated_filename(buf, game_name,
+                     "png", sizeof(buf));
+            fill_pathname_join_special(output, recording_st->output_dir, buf, sizeof(output));
+         }
+
+         /* Cache path for playlist saving */
+         if (!string_is_empty(output))
+            strlcpy(recording_st->path, output, sizeof(recording_st->path));
+      }
+   }
+
+   params.audio_resampler           = settings->arrays.audio_resampler;
+   params.video_gpu_record          = settings->bools.video_gpu_record;
+   params.video_record_scale_factor = settings->uints.video_record_scale_factor;
+   params.video_stream_scale_factor = settings->uints.video_stream_scale_factor;
+   params.video_record_threads      = settings->uints.video_record_threads;
+   params.streaming_mode            = settings->uints.streaming_mode;
+
+   params.out_width                 = av_info->geometry.base_width;
+   params.out_height                = av_info->geometry.base_height;
+   params.fb_width                  = av_info->geometry.max_width;
+   params.fb_height                 = av_info->geometry.max_height;
+   params.channels                  = 2;
+   params.filename                  = output;
+   params.fps                       = av_info->timing.fps;
+   params.samplerate                = av_info->timing.sample_rate;
+   params.pix_fmt                   =
+      (video_driver_pix_fmt == RETRO_PIXEL_FORMAT_XRGB8888)
+      ? FFEMU_PIX_ARGB8888
+      : FFEMU_PIX_RGB565;
+   params.config                    = NULL;
+
+   if (!string_is_empty(recording_st->config))
+      params.config                 = recording_st->config;
+   else
+   {
+      if (recording_st->streaming_enable)
+      {
+         params.config = settings->paths.path_stream_config;
+         params.preset = (enum record_config_type)
+            settings->uints.video_stream_quality;
+      }
+      else
+      {
+         params.config = settings->paths.path_record_config;
+         params.preset = (enum record_config_type)
+            settings->uints.video_record_quality;
+      }
+   }
+
+   if (settings->bools.video_gpu_record
+      && video_st->current_video->read_viewport)
+   {
+      unsigned gpu_size;
+      struct video_viewport vp;
+
+      vp.x                        = 0;
+      vp.y                        = 0;
+      vp.width                    = 0;
+      vp.height                   = 0;
+      vp.full_width               = 0;
+      vp.full_height              = 0;
+
+      video_driver_get_viewport_info(&vp);
+
+      if (!vp.width || !vp.height)
+      {
+         RARCH_ERR("[Recording]: Failed to get viewport information from video driver. "
+               "Cannot start recording ...\n");
+         return false;
+      }
+
+      params.out_width                    = vp.width;
+      params.out_height                   = vp.height;
+      params.fb_width                     = next_pow2(vp.width);
+      params.fb_height                    = next_pow2(vp.height);
+
+      if (video_force_aspect &&
+            (video_st->aspect_ratio > 0.0f))
+         params.aspect_ratio              = video_st->aspect_ratio;
+      else
+         params.aspect_ratio              = (float)vp.width / vp.height;
+
+      params.pix_fmt                      = FFEMU_PIX_BGR24;
+      recording_st->gpu_width             = vp.width;
+      recording_st->gpu_height            = vp.height;
+
+      RARCH_LOG("[Recording]: %s %ux%u.\n", msg_hash_to_str(MSG_DETECTED_VIEWPORT_OF),
+            vp.width, vp.height);
+
+      gpu_size = vp.width * vp.height * 3;
+      if (!(video_st->record_gpu_buffer = (uint8_t*)malloc(gpu_size)))
+         return false;
+   }
+   else
+   {
+      if (recording_state.width || recording_state.height)
+      {
+         params.out_width  = recording_state.width;
+         params.out_height = recording_state.height;
+      }
+
+      if (video_force_aspect &&
+            (video_st->aspect_ratio > 0.0f))
+         params.aspect_ratio = video_st->aspect_ratio;
+      else
+         params.aspect_ratio = (float)params.out_width / params.out_height;
+
+#ifdef HAVE_VIDEO_FILTER
+      if (settings->bools.video_post_filter_record
+            && !!video_st->state_filter)
+      {
+         unsigned max_width  = 0;
+         unsigned max_height = 0;
+
+         params.pix_fmt      = FFEMU_PIX_RGB565;
+
+         if (video_st->flags & VIDEO_FLAG_STATE_OUT_RGB32)
+            params.pix_fmt = FFEMU_PIX_ARGB8888;
+
+         rarch_softfilter_get_max_output_size(
+               video_st->state_filter,
+               &max_width, &max_height);
+         params.fb_width  = next_pow2(max_width);
+         params.fb_height = next_pow2(max_height);
+      }
+#endif
+   }
+
+   RARCH_LOG("[Recording]: %s %s @ %ux%u. (FB size: %ux%u pix_fmt: %u)\n",
+         msg_hash_to_str(MSG_RECORDING_TO),
+         output,
+         params.out_width, params.out_height,
+         params.fb_width, params.fb_height,
+         (unsigned)params.pix_fmt);
+
+   if (!record_driver_init_first(
+            &recording_state.driver,
+            &recording_state.data, &params))
+   {
+      RARCH_ERR("[Recording]: %s\n",
+            msg_hash_to_str(MSG_FAILED_TO_START_RECORDING));
+      video_driver_gpu_record_deinit();
+
+      return false;
+   }
+
+   return true;
+}
+
+void recording_driver_update_streaming_url(void)
+{
+   settings_t     *settings      = config_get_ptr();
+   const char     *youtube_url   = "rtmp://a.rtmp.youtube.com/live2/";
+   const char     *twitch_url    = "rtmp://live.twitch.tv/app/";
+   const char     *facebook_url  = "rtmps://live-api-s.facebook.com:443/rtmp/";
+
+   if (!settings)
+      return;
+
+   switch (settings->uints.streaming_mode)
+   {
+      case STREAMING_MODE_TWITCH:
+         if (!string_is_empty(settings->arrays.twitch_stream_key))
+         {
+            size_t _len = strlcpy(settings->paths.path_stream_url,
+                  twitch_url,
+                  sizeof(settings->paths.path_stream_url));
+            strlcpy(settings->paths.path_stream_url       + _len,
+                  settings->arrays.twitch_stream_key,
+                  sizeof(settings->paths.path_stream_url) - _len);
+         }
+         break;
+      case STREAMING_MODE_YOUTUBE:
+         if (!string_is_empty(settings->arrays.youtube_stream_key))
+         {
+            size_t _len = strlcpy(settings->paths.path_stream_url,
+                  youtube_url,
+                  sizeof(settings->paths.path_stream_url));
+            strlcpy(settings->paths.path_stream_url       + _len,
+                  settings->arrays.youtube_stream_key,
+                  sizeof(settings->paths.path_stream_url) - _len);
+         }
+         break;
+      case STREAMING_MODE_LOCAL:
+         {
+            /* TODO: figure out default interface and bind to that instead */
+            size_t _len = strlcpy(settings->paths.path_stream_url, "udp://127.0.0.1:",
+                  sizeof(settings->paths.path_stream_url));
+            snprintf(settings->paths.path_stream_url      + _len,
+                  sizeof(settings->paths.path_stream_url) - _len,
+                  "%u", settings->uints.video_stream_port);
+         }
+         break;
+      case STREAMING_MODE_FACEBOOK:
+         if (!string_is_empty(settings->arrays.facebook_stream_key))
+         {
+            size_t _len = strlcpy(settings->paths.path_stream_url,
+                  facebook_url,
+                  sizeof(settings->paths.path_stream_url));
+            strlcpy(settings->paths.path_stream_url       + _len,
+                  settings->arrays.facebook_stream_key,
+                  sizeof(settings->paths.path_stream_url) - _len);
+         }
+         break;
+      case STREAMING_MODE_CUSTOM:
+      default:
+         /* Do nothing, let the user input the URL */
+         break;
+   }
+}
diff --git a/retroarch.c b/retroarch.c
index 7bc799781d46..06821a8bc66f 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -2168,8 +2168,9 @@ struct string_list *dir_list_new_special(const char *input_dir,
    char ext_shaders[255];
 #endif
    char ext_name[16];
-   const char *exts                  = NULL;
-   bool recursive                    = false;
+   size_t _len         = 0;
+   const char *exts    = NULL;
+   bool recursive      = false;
 
    switch (type)
    {
@@ -2196,36 +2197,36 @@ struct string_list *dir_list_new_special(const char *input_dir,
       case DIR_LIST_SHADERS:
 #if defined(HAVE_CG) || defined(HAVE_GLSL) || defined(HAVE_SLANG) || defined(HAVE_HLSL)
          {
-            union string_list_elem_attr attr;
-            struct string_list str_list;
-
-            if (!string_list_initialize(&str_list))
-               return NULL;
-
             ext_shaders[0]                   = '\0';
 
-            attr.i = 0;
-
             if (video_shader_is_supported(RARCH_SHADER_CG))
             {
-               string_list_append(&str_list, "cgp", attr);
-               string_list_append(&str_list, "cg", attr);
+               _len    += strlcpy(ext_shaders + _len, "cgp", sizeof(ext_shaders) - _len);
+               if (ext_shaders[_len-1] != '\0')
+                  _len += strlcpy(ext_shaders + _len, "|",   sizeof(ext_shaders) - _len);
+               _len    += strlcpy(ext_shaders + _len, "cg", sizeof(ext_shaders) - _len);
             }
 
             if (video_shader_is_supported(RARCH_SHADER_GLSL))
             {
-               string_list_append(&str_list, "glslp", attr);
-               string_list_append(&str_list, "glsl", attr);
+               if (ext_shaders[_len-1] != '\0')
+                  _len += strlcpy(ext_shaders + _len, "|",   sizeof(ext_shaders) - _len);
+               _len    += strlcpy(ext_shaders + _len, "glslp", sizeof(ext_shaders) - _len);
+               if (ext_shaders[_len-1] != '\0')
+                  _len += strlcpy(ext_shaders + _len, "|",   sizeof(ext_shaders) - _len);
+               _len    += strlcpy(ext_shaders + _len, "glsl", sizeof(ext_shaders) - _len);
             }
 
             if (video_shader_is_supported(RARCH_SHADER_SLANG))
             {
-               string_list_append(&str_list, "slangp", attr);
-               string_list_append(&str_list, "slang", attr);
+               if (ext_shaders[_len-1] != '\0')
+                  _len += strlcpy(ext_shaders + _len, "|",   sizeof(ext_shaders) - _len);
+               _len    += strlcpy(ext_shaders + _len, "slangp", sizeof(ext_shaders) - _len);
+               if (ext_shaders[_len-1] != '\0')
+                  _len += strlcpy(ext_shaders + _len, "|",   sizeof(ext_shaders) - _len);
+               _len    += strlcpy(ext_shaders + _len, "slang", sizeof(ext_shaders) - _len);
             }
 
-            string_list_join_concat(ext_shaders, sizeof(ext_shaders), &str_list, "|");
-            string_list_deinitialize(&str_list);
             exts = ext_shaders;
          }
          break;
@@ -3722,6 +3723,12 @@ bool command_event(enum event_command cmd, void *data)
          break;
       case CMD_EVENT_CLOSE_CONTENT:
 #ifdef HAVE_MENU
+         /* If we need to quit, skip unloading the core to avoid performing
+          * cleanup actions (like writing autosave state) twice. */
+         if (should_quit_on_close()) {
+            command_event(CMD_EVENT_QUIT, NULL);
+            break;
+         }
          /* Closing content via hotkey requires toggling menu
           * and resetting the position later on to prevent
           * going to empty Quick Menu */
@@ -3730,8 +3737,6 @@ bool command_event(enum event_command cmd, void *data)
             menu_state_get_ptr()->flags |= MENU_ST_FLAG_PENDING_CLOSE_CONTENT;
             command_event(CMD_EVENT_MENU_TOGGLE, NULL);
          }
-         /* Check if we need to quit Retroarch */
-         check_quit_on_close();
 #else
          command_event(CMD_EVENT_QUIT, NULL);
 #endif
@@ -4410,7 +4415,7 @@ bool command_event(enum event_command cmd, void *data)
          {
             struct string_list *str_list = (struct string_list*)data;
 
-            /* Check whether favourties playlist is at capacity */
+            /* Check whether favourites playlist is at capacity */
             if (playlist_size(g_defaults.content_favorites) >=
                   playlist_capacity(g_defaults.content_favorites))
             {
@@ -6184,7 +6189,8 @@ static void retroarch_print_version(void)
 static void retroarch_print_help(const char *arg0)
 {
    char buf[2048];
-   buf[0] = '\0';
+   size_t _len = 0;
+   buf[0]      = '\0';
 
    frontend_driver_attach_console();
    fputs("\n", stdout);
@@ -6195,7 +6201,7 @@ static void retroarch_print_help(const char *arg0)
 
    fprintf(stdout, "Usage: %s [OPTIONS]... [FILE]\n\n", arg0);
 
-   strlcat(buf,
+   _len = strlcpy(buf + _len,
          "  -h, --help                     "
          "Show this help message.\n"
          "  -v, --verbose                  "
@@ -6206,29 +6212,29 @@ static void retroarch_print_help(const char *arg0)
          "Show version.\n"
          "      --features                 "
          "Print available features compiled into program.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #ifdef HAVE_MENU
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "      --menu                     "
          "Do not require content or libretro core to be loaded,\n"
          "                                 "
          "  starts directly in menu. If no arguments are passed to\n"
          "                                 "
          "  the program, it is equivalent to using --menu as only argument.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif
 
 #ifdef HAVE_CONFIGFILE
-   strlcat(buf, "  -c, --config=FILE              "
-         "Path for config file.\n", sizeof(buf));
+   _len += strlcpy(buf + _len, "  -c, --config=FILE              "
+         "Path for config file.\n", sizeof(buf) - _len);
 #ifdef _WIN32
-   strlcat(buf, "                                 "
+   _len += strlcpy(buf + _len, "                                 "
          "  Defaults to retroarch.cfg in same directory as retroarch.exe.\n"
          "                                 "
          "  If a default config is not found, the program will attempt to create one.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #else
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "                                 "
          "  By default looks for config in\n"
          "                                 "
@@ -6241,22 +6247,32 @@ static void retroarch_print_help(const char *arg0)
          "  If a default config is not found, the program will attempt to create one\n"
          "                                 "
          "  based on the skeleton config (" GLOBAL_CONFIG_DIR "/retroarch.cfg).\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif
-   strlcat(buf, "      --appendconfig=FILE        "
+   _len += strlcpy(buf + _len, "      --appendconfig=FILE        "
          "Extra config files are loaded in, and take priority over\n"
          "                                 "
          "  config selected in -c (or default). Multiple configs are\n"
          "                                 "
          "  delimited by '|'.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif
 
    fputs(buf, stdout);
    buf[0] = '\0';
+   _len   = 0;
+
+   _len += strlcpy(buf + _len,
+         "      --subsystem=NAME           "
+         "Use a subsystem of the libretro core. Multiple content\n"
+         "                                 "
+         "  files are loaded as multiple arguments. If a content\n"
+         "                                 "
+         "  file is skipped, use a blank (\"\") command line argument.\n"
+         , sizeof(buf) - _len);
 
 #ifdef HAVE_DYNAMIC
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "  -L, --libretro=FILE            "
          "Path to libretro implementation. Overrides any config setting.\n"
          "                                 "
@@ -6265,42 +6281,34 @@ static void retroarch_print_help(const char *arg0)
          "  1. The full path to a core shared object library: path/to/<core_name>_libretro.<lib_ext>\n"
          "                                 "
          "  2. A core shared object library 'file name' (*): <core_name>_libretro.<lib_ext>\n"
-         , sizeof(buf));
-   strlcat(buf,
+         , sizeof(buf) - _len);
+   _len += strlcpy(buf + _len,
          "                                 "
          "  3. A core 'short name' (*): <core_name>_libretro OR <core_name>\n"
          "                                 "
          "  (*) If 'file name' or 'short name' do not correspond to an existing full file path,\n"
          "                                 "
          "  the configured frontend 'cores' directory will be searched for a match.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif
 
-   strlcat(buf,
-         "      --subsystem=NAME           "
-         "Use a subsystem of the libretro core. Multiple content\n"
-         "                                 "
-         "  files are loaded as multiple arguments. If a content\n"
-         "                                 "
-         "  file is skipped, use a blank (\"\") command line argument.\n"
-         , sizeof(buf));
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "                                 "
          "  Content must be loaded in an order which depends on the\n"
          "                                 "
          "  particular subsystem used. See verbose log output to learn\n"
          "                                 "
          "  how a particular subsystem wants content to be loaded.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 
 #ifdef HAVE_LIBRETRODB
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "      --scan=PATH|FILE           "
          "Import content from path.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif
 
-   strlcat(buf,
+   _len = strlcpy(buf + _len,
          "  -f, --fullscreen               "
          "Start the program in fullscreen regardless of config setting.\n"
          "      --set-shader=PATH          "
@@ -6309,18 +6317,20 @@ static void retroarch_print_help(const char *arg0)
          "  Effectively overrides automatic shader presets.\n"
          "                                 "
          "  An empty argument \"\" will disable automatic shader presets.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 
    fputs(buf, stdout);
    buf[0] = '\0';
+   _len   = 0;
 
-   printf(      "  -N, --nodevice=PORT            "
+   _len += snprintf(buf + _len, sizeof(buf) - _len,"  -N, --nodevice=PORT            "
          "Disconnects controller device connected to PORT (1 to %d).\n", MAX_USERS);
-   printf(      "  -A, --dualanalog=PORT          "
+   _len += snprintf(buf + _len, sizeof(buf) - _len,"  -A, --dualanalog=PORT          "
          "Connect a DualAnalog controller to PORT (1 to %d).\n", MAX_USERS);
-   printf(      "  -d, --device=PORT:ID           "
+   _len += snprintf(buf + _len, sizeof(buf) - _len,"  -d, --device=PORT:ID           "
          "Connect a generic device into PORT of the device (1 to %d).\n", MAX_USERS);
-   strlcat(buf,
+
+   _len += strlcpy(buf + _len,
          "                                 "
          "  Format is PORT:ID, where ID is a number corresponding to the particular device.\n"
          "  -M, --sram-mode=MODE           "
@@ -6329,10 +6339,10 @@ static void retroarch_print_help(const char *arg0)
          "  'noload-nosave', 'noload-save', 'load-nosave' or 'load-save'.\n"
          "                                 "
          "  Note: 'noload-save' implies that save files *WILL BE OVERWRITTEN*.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 
 #ifdef HAVE_NETWORKING
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "  -H, --host                     "
          "Host netplay as user 1.\n"
          "  -C, --connect=HOST             "
@@ -6345,87 +6355,86 @@ static void retroarch_print_help(const char *arg0)
          "Picks a username (for use with netplay). Not mandatory.\n"
          "      --check-frames=NUMBER      "
          "Check frames when using netplay.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #ifdef HAVE_NETWORK_CMD
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "      --command                  "
          "Sends a command over UDP to an already running program process.\n"
          "                                 "
          "  Available commands are listed if command is invalid.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif
 #endif
 
 #ifdef HAVE_BSV_MOVIE
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "  -P, --play-replay=FILE         "
          "Playback a replay file.\n"
          "  -R, --record-replay=FILE       "
          "Start recording a replay file from the beginning.\n"
          "      --eof-exit                 "
          "Exit upon reaching the end of the replay file.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif
 
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "  -r, --record=FILE              "
          "Path to record video file. Using mkv extension is recommended.\n"
          "      --recordconfig             "
          "Path to settings used during recording.\n"
          "      --size=WIDTHxHEIGHT        "
          "Overrides output video size when recording.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 
    fputs(buf, stdout);
    buf[0] = '\0';
+   _len   = 0;
 
-   strlcat(buf,
+   _len   = strlcpy(buf + _len,
          "  -D, --detach                   "
          "Detach program from the running console. Not relevant for all platforms.\n"
          "      --max-frames=NUMBER        "
          "Runs for the specified number of frames, then exits.\n"
-         , sizeof(buf));
-
-
+         , sizeof(buf) - _len);
 
 #ifdef HAVE_PATCH
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "  -U, --ups=FILE                 "
          "Specifies path for UPS patch that will be applied to content.\n"
          "      --bps=FILE                 "
          "Specifies path for BPS patch that will be applied to content.\n"
          "      --ips=FILE                 "
          "Specifies path for IPS patch that will be applied to content.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #ifdef HAVE_XDELTA
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "      --xdelta=FILE              "
          "Specifies path for Xdelta patch that will be applied to content.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif /* HAVE_XDELTA */
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "      --no-patch                 "
          "Disables all forms of content patching.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif /* HAVE_PATCH */
 
 #ifdef HAVE_SCREENSHOTS
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "      --max-frames-ss            "
          "Takes a screenshot at the end of max-frames.\n"
          "      --max-frames-ss-path=FILE  "
          "Path to save the screenshot to at the end of max-frames.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif
 
 #ifdef HAVE_ACCESSIBILITY
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "      --accessibility            "
          "Enables accessibilty for blind users using text-to-speech.\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 #endif
 
-   strlcat(buf,
+   _len += strlcpy(buf + _len,
          "      --load-menu-on-error       "
          "Open menu instead of quitting if specified core or content fails to load.\n"
          "  -e, --entryslot=NUMBER         "
@@ -6434,7 +6443,7 @@ static void retroarch_print_help(const char *arg0)
          "Path for save files (*.srm). (DEPRECATED, use --appendconfig and savefile_directory)\n"
          "  -S, --savestate=PATH           "
          "Path for the save state files (*.state). (DEPRECATED, use --appendconfig and savestate_directory)\n"
-         , sizeof(buf));
+         , sizeof(buf) - _len);
 
    fputs(buf, stdout);
 }
@@ -6946,16 +6955,16 @@ static bool retroarch_parse_input_and_config(
             case 'd':
                {
                   unsigned new_port;
-                  unsigned id              = 0;
-                  struct string_list *list = string_split(optarg, ":");
+                  char *tok, *save;
                   int    port              = 0;
+                  unsigned id              = 0;
+                  char *optarg_cpy         = strdup(optarg);
 
-                  if (list && list->size == 2)
-                  {
-                     port = (int)strtol(list->elems[0].data, NULL, 0);
-                     id   = (unsigned)strtoul(list->elems[1].data, NULL, 0);
-                  }
-                  string_list_free(list);
+                  if ((tok = strtok_r(optarg_cpy, ":", &save)))
+                     port = (int)strtol(tok, NULL, 0);
+                  if ((tok = strtok_r(NULL, ":", &save)))
+                     id   = (unsigned)strtoul(tok, NULL, 0);
+                  free(optarg_cpy);
 
                   if (port < 1 || port > MAX_USERS)
                   {
@@ -8166,7 +8175,7 @@ int retroarch_get_capabilities(enum rarch_capabilities type,
                _MSC_VER);
 #elif defined(__SNC__)
          _len  = strlcpy(str_out, msg_hash_to_str(MSG_COMPILER), str_len);
-         _len += snprintf(str_out + _len, str_len - _Len, ": SNC (%d)",
+         _len += snprintf(str_out + _len, str_len - _len, ": SNC (%d)",
                __SN_VER__);
 #elif defined(_WIN32) && defined(__GNUC__)
          _len  = strlcpy(str_out, msg_hash_to_str(MSG_COMPILER), str_len);
@@ -8207,7 +8216,7 @@ void retroarch_fail(int error_code, const char *error)
 }
 
 /* Called on close content, checks if we need to also exit retroarch */
-void check_quit_on_close(void)
+bool should_quit_on_close(void)
 {
 #ifdef HAVE_MENU
    settings_t *settings   = config_get_ptr();
@@ -8218,8 +8227,9 @@ void check_quit_on_close(void)
             || (settings->uints.quit_on_close_content ==
                QUIT_ON_CLOSE_CONTENT_ENABLED)
       )
-      command_event(CMD_EVENT_QUIT, NULL);
+      return true;
 #endif
+   return false;
 }
 
 /*
diff --git a/retroarch.h b/retroarch.h
index 7da4e3948212..2d1900766c1b 100644
--- a/retroarch.h
+++ b/retroarch.h
@@ -206,7 +206,7 @@ void core_options_flush(void);
  **/
 void retroarch_fail(int error_code, const char *error);
 
-void check_quit_on_close(void);
+bool should_quit_on_close(void);
 
 uint16_t retroarch_get_flags(void);
 
diff --git a/steam/steam.c b/steam/steam.c
index a22d48514959..bc65709e2ec4 100644
--- a/steam/steam.c
+++ b/steam/steam.c
@@ -447,8 +447,9 @@ void steam_update_presence(enum presence presence, bool force)
                   content[_len+2]    = '\0';
                   if (core_info)
                   {
-                     _len            = strlcat(content, core_info->systemname,
-                           sizeof(content));
+                     _len           += 2;
+                     _len           += strlcpy(content + _len, core_info->systemname,
+                           sizeof(content) - _len);
                      content[_len  ] = ')';
                      content[_len+1] = '\0';
                   }
@@ -468,8 +469,9 @@ void steam_update_presence(enum presence presence, bool force)
                   content[_len+2]    = '\0';
                   if (core_info)
                   {
-                     _len            = strlcat(content, core_info->core_name,
-                           sizeof(content));
+                     _len           += 2;
+                     _len           += strlcpy(content + _len, core_info->core_name,
+                           sizeof(content) - _len);
                      content[_len  ] = ')';
                      content[_len+1] = '\0';
                   }
@@ -489,13 +491,15 @@ void steam_update_presence(enum presence presence, bool force)
                   content[_len+2]    = '\0';
                   if (core_info)
                   {
-                     _len            = strlcat(content, core_info->systemname,
-                           sizeof(content));
+                     _len           += 2;
+                     _len           += strlcpy(content + _len, core_info->systemname,
+                           sizeof(content) - _len);
                      content[_len  ] = ' ';
                      content[_len+1] = '-';
                      content[_len+2] = ' ';
-                     _len            = strlcat(content, core_info->core_name,
-                           sizeof(content));
+                     _len           += 3;
+                     _len           += strlcpy(content + _len, core_info->core_name,
+                           sizeof(content) - _len);
                      content[_len  ] = ')';
                      content[_len+1] = '\0';
                   }
diff --git a/tasks/task_cloudsync.c b/tasks/task_cloudsync.c
index 0660a7afe5b8..c57a3027a5ec 100644
--- a/tasks/task_cloudsync.c
+++ b/tasks/task_cloudsync.c
@@ -302,23 +302,32 @@ static void task_cloud_sync_manifest_append_dir(file_list_t *manifest,
 static struct string_list *task_cloud_sync_directory_map(void)
 {
    static struct string_list *list = NULL;
+   settings_t *settings = config_get_ptr();
+
    if (!list)
    {
       union string_list_elem_attr attr = {0};
       char  dir[PATH_MAX_LENGTH];
       list = string_list_new();
 
-      string_list_append(list, "config", attr);
-      fill_pathname_application_special(dir,
-            sizeof(dir), APPLICATION_SPECIAL_DIRECTORY_CONFIG);
-      list->elems[list->size - 1].userdata = strdup(dir);
+      if (settings->bools.cloud_sync_sync_configs) 
+      {
+         string_list_append(list, "config", attr);
+         fill_pathname_application_special(dir,
+               sizeof(dir), APPLICATION_SPECIAL_DIRECTORY_CONFIG);
+         list->elems[list->size - 1].userdata = strdup(dir);
+      }
 
-      string_list_append(list, "saves", attr);
-      list->elems[list->size - 1].userdata = strdup(dir_get_ptr(RARCH_DIR_SAVEFILE));
+      if (settings->bools.cloud_sync_sync_saves) 
+      {
+         string_list_append(list, "saves", attr);
+         list->elems[list->size - 1].userdata = strdup(dir_get_ptr(RARCH_DIR_SAVEFILE));
 
-      string_list_append(list, "states", attr);
-      list->elems[list->size - 1].userdata = strdup(dir_get_ptr(RARCH_DIR_SAVESTATE));
+         string_list_append(list, "states", attr);
+         list->elems[list->size - 1].userdata = strdup(dir_get_ptr(RARCH_DIR_SAVESTATE));
+      }
    }
+
    return list;
 }
 
diff --git a/tasks/task_content.c b/tasks/task_content.c
index de2fcf8c9f5c..1817d82d1af8 100644
--- a/tasks/task_content.c
+++ b/tasks/task_content.c
@@ -211,8 +211,8 @@ static bool content_file_override_get_ext(
 bool content_file_override_set(
       const struct retro_system_content_info_override *overrides)
 {
-   content_state_t *p_content = content_state_get_ptr();
    size_t i;
+   content_state_t *p_content = content_state_get_ptr();
 
    if (!p_content || !overrides)
       return false;
@@ -222,28 +222,21 @@ bool content_file_override_set(
 
    for (i = 0; overrides[i].extensions; i++)
    {
-      struct string_list ext_list = {0};
-      size_t j;
+      char *tok, *save;
+      char *overrides_ext_cpy = strdup(overrides[i].extensions);
 
-      /* Get list of extensions affected by override */
-      string_list_initialize(&ext_list);
-      if (!string_split_noalloc(&ext_list,
-            overrides[i].extensions, "|"))
+      /* Get list of extensions affected by overrides */
+      for (tok = strtok_r(overrides_ext_cpy, "|", &save); tok;
+            tok = strtok_r(NULL, "|", &save))
       {
-         string_list_deinitialize(&ext_list);
-         continue;
-      }
-
-      for (j = 0; j < ext_list.size; j++)
-      {
-         const char *ext                   = ext_list.elems[j].data;
-         content_file_override_t *override = NULL;
          size_t num_entries;
+         const char *ext                   = tok;
+         content_file_override_t *override = NULL;
 
          /* Check whether extension has already been
           * registered */
-         if (string_is_empty(ext) ||
-             content_file_override_get_ext(p_content, ext, NULL))
+         if (   string_is_empty(ext)
+             || content_file_override_get_ext(p_content, ext, NULL))
             continue;
 
          /* Add current override to the list */
@@ -252,7 +245,7 @@ bool content_file_override_set(
          if (!RBUF_TRYFIT(p_content->content_override_list,
                num_entries + 1))
          {
-            string_list_deinitialize(&ext_list);
+            free(overrides_ext_cpy);
             return false;
          }
 
@@ -269,7 +262,7 @@ bool content_file_override_set(
          override->persistent_data = overrides[i].persistent_data;
       }
 
-      string_list_deinitialize(&ext_list);
+      free(overrides_ext_cpy);
    }
 
    return true;
diff --git a/tasks/task_decompress.c b/tasks/task_decompress.c
index d7510e89bceb..94a991063444 100644
--- a/tasks/task_decompress.c
+++ b/tasks/task_decompress.c
@@ -14,7 +14,6 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <lists/string_list.h>
 #include <string/stdstring.h>
 #include <file/file_path.h>
 #include <file/archive_file.h>
diff --git a/tasks/task_overlay.c b/tasks/task_overlay.c
index 12689e91efb0..0c163feb213b 100644
--- a/tasks/task_overlay.c
+++ b/tasks/task_overlay.c
@@ -20,7 +20,6 @@
 #include <retro_miscellaneous.h>
 #include <file/file_path.h>
 #include <file/config_file.h>
-#include <lists/string_list.h>
 #include <streams/file_stream.h>
 #include <string/stdstring.h>
 #include <lrc_hash.h>
@@ -233,12 +232,20 @@ static bool task_overlay_load_desc(
    char overlay_desc_key[32];
    char overlay_key[64];
    char overlay[256];
+   char *tok, *save;
+   unsigned list_size                   = 0;
+   char *elem0                          = NULL;
+   char *elem1                          = NULL;
+   char *elem2                          = NULL;
+   char *elem3                          = NULL;
+   char *elem4                          = NULL;
+   char *elem5                          = NULL;
+   char *overlay_cpy                    = NULL;
    float tmp_float                      = 0.0f;
    bool tmp_bool                        = false;
    bool ret                             = true;
    bool by_pixel                        = false;
    char *key                            = NULL;
-   struct string_list list              = {0};
    const char *x                        = NULL;
    const char *y                        = NULL;
    const char *box                      = NULL;
@@ -273,25 +280,50 @@ static bool task_overlay_load_desc(
       goto end;
    }
 
-   string_list_initialize(&list);
-   if (!string_split_noalloc(&list, overlay, ", "))
+   overlay_cpy = strdup(overlay);
+   if ((tok = strtok_r(overlay_cpy, ", ", &save)))
    {
-      RARCH_ERR("[Overlay]: Failed to split overlay desc.\n");
-      ret = false;
-      goto end;
+      elem0 = strdup(tok);
+      list_size++;
+   }
+   if ((tok = strtok_r(NULL, ", ", &save)))
+   {
+      elem1 = strdup(tok);
+      list_size++;
+   }
+   if ((tok = strtok_r(NULL, ", ", &save)))
+   {
+      elem2 = strdup(tok);
+      list_size++;
+   }
+   if ((tok = strtok_r(NULL, ", ", &save))) /* box */
+   {
+      elem3 = strdup(tok);
+      list_size++;
+   }
+   if ((tok = strtok_r(NULL, ", ", &save)))
+   {
+      elem4 = strdup(tok);
+      list_size++;
    }
+   if ((tok = strtok_r(NULL, ", ", &save)))
+   {
+      elem5 = strdup(tok);
+      list_size++;
+   }
+   free(overlay_cpy);
 
-   if (list.size < 6)
+   if (list_size < 6)
    {
       RARCH_ERR("[Overlay]: Overlay desc is invalid. Requires at least 6 tokens.\n");
       ret = false;
       goto end;
    }
 
-   key            = list.elems[0].data;
-   x              = list.elems[1].data;
-   y              = list.elems[2].data;
-   box            = list.elems[3].data;
+   key                 = elem0;
+   x                   = elem1;
+   y                   = elem2;
+   box                 = elem3;
 
    desc->retro_key_idx = 0;
    BIT256_CLEAR_ALL(desc->button_mask);
@@ -390,8 +422,8 @@ static bool task_overlay_load_desc(
          break;
    }
 
-   desc->range_x = (float)strtod(list.elems[4].data, NULL) * width_mod;
-   desc->range_y = (float)strtod(list.elems[5].data, NULL) * height_mod;
+   desc->range_x = (float)strtod(elem4, NULL) * width_mod;
+   desc->range_y = (float)strtod(elem5, NULL) * height_mod;
 
    _len = strlcpy(conf_key, overlay_desc_key, sizeof(conf_key));
 
@@ -471,7 +503,18 @@ static bool task_overlay_load_desc(
    input_overlay->pos ++;
 
 end:
-   string_list_deinitialize(&list);
+   if (elem0)
+      free(elem0);
+   if (elem1)
+      free(elem1);
+   if (elem2)
+      free(elem2);
+   if (elem3)
+      free(elem3);
+   if (elem4)
+      free(elem4);
+   if (elem5)
+      free(elem5);
    return ret;
 }
 
@@ -799,25 +842,55 @@ static void task_overlay_deferred_load(retro_task_t *task)
       if (config_get_array(conf, overlay->config.rect.key,
                overlay->config.rect.array, sizeof(overlay->config.rect.array)))
       {
-         struct string_list  list = {0};
-
-         string_list_initialize(&list);
+         char *tok, *save;
+         char *elem0              = NULL;
+         char *elem1              = NULL;
+         char *elem2              = NULL;
+         char *elem3              = NULL;
+         unsigned list_size       = 0;
+         char *cfg_rect_array_cpy = strdup(overlay->config.rect.array);
+
+         if ((tok = strtok_r(cfg_rect_array_cpy, ", ", &save)))
+         {
+            elem0 = strdup(tok);
+            list_size++;
+         }
+         if ((tok = strtok_r(NULL, ", ", &save)))
+         {
+            elem1 = strdup(tok);
+            list_size++;
+         }
+         if ((tok = strtok_r(NULL, ", ", &save)))
+         {
+            elem2 = strdup(tok);
+            list_size++;
+         }
+         if ((tok = strtok_r(NULL, ", ", &save)))
+         {
+            elem3 = strdup(tok);
+            list_size++;
+         }
+         free(cfg_rect_array_cpy);
 
-         if (     !string_split_noalloc(
-                  &list, overlay->config.rect.array, ", ")
-               || list.size < 4)
+         if (list_size < 4)
          {
             RARCH_ERR("[Overlay]: Failed to split rect \"%s\" into at least four tokens.\n",
                   overlay->config.rect.array);
-            string_list_deinitialize(&list);
+            free(elem0);
+            free(elem1);
+            free(elem2);
+            free(elem3);
             goto error;
          }
 
-         overlay->x = (float)strtod(list.elems[0].data, NULL);
-         overlay->y = (float)strtod(list.elems[1].data, NULL);
-         overlay->w = (float)strtod(list.elems[2].data, NULL);
-         overlay->h = (float)strtod(list.elems[3].data, NULL);
-         string_list_deinitialize(&list);
+         overlay->x = (float)strtod(elem0, NULL);
+         overlay->y = (float)strtod(elem1, NULL);
+         overlay->w = (float)strtod(elem2, NULL);
+         overlay->h = (float)strtod(elem3, NULL);
+         free(elem0);
+         free(elem1);
+         free(elem2);
+         free(elem3);
       }
 
       /* Assume for now that scaling center is in the middle.
diff --git a/tasks/task_save.c b/tasks/task_save.c
index 464cd3e3adc2..93b1c6620efb 100644
--- a/tasks/task_save.c
+++ b/tasks/task_save.c
@@ -54,12 +54,12 @@
    read/write is a possible suspend to JS code */
 #define SAVE_STATE_CHUNK 4096 * 4096
 #else
-/* A low common denominator write chunk size.  On a slow 
-  (speed class 6) SD card, we can write 6MB/s.  That gives us 
-  roughly 100KB/frame.  
-  This means we can write savestates with one syscall for cores 
-  with less than 100KB of state. Class 10 is the standard now 
-  even for lousy cards and supports 10MB/s, so you may prefer 
+/* A low common denominator write chunk size.  On a slow
+  (speed class 6) SD card, we can write 6MB/s.  That gives us
+  roughly 100KB/frame.
+  This means we can write savestates with one syscall for cores
+  with less than 100KB of state. Class 10 is the standard now
+  even for lousy cards and supports 10MB/s, so you may prefer
   to put this to 170KB. This all assumes that task_save's loop
   is iterated once per frame at 60 FPS; if it's updated less
   frequently this number could be doubled or quadrupled depending
@@ -537,8 +537,7 @@ static void task_save_handler(retro_task_t *task)
 
    if (task_get_cancelled(task) || written != remaining)
    {
-      size_t err_size = 8192 * sizeof(char);
-      char *err       = (char*)malloc(err_size);
+      char msg[PATH_MAX_LENGTH];
 
       if (state->flags & SAVE_TASK_FLAG_UNDO_SAVE)
       {
@@ -546,21 +545,19 @@ static void task_save_handler(retro_task_t *task)
                MSG_FAILED_TO_UNDO_SAVE_STATE);
          RARCH_ERR("[State]: %s \"%s\".\n", failed_undo_str,
                undo_save_buf.path);
-         err[0]      = '\0';
-         snprintf(err, err_size - 1, "%s \"RAM\".", failed_undo_str);
+         snprintf(msg, sizeof(msg), "%s \"RAM\".", failed_undo_str);
       }
       else
       {
-         size_t _len = strlcpy(err,
+         size_t _len = strlcpy(msg,
                msg_hash_to_str(MSG_FAILED_TO_SAVE_STATE_TO),
-               err_size - 1);
-         err[  _len] = ' ';
-         err[++_len] = '\0';
-         strlcat(err, state->path, err_size - 1);
+               sizeof(msg));
+         msg[  _len] = ' ';
+         msg[++_len] = '\0';
+         strlcpy(msg + _len, state->path, sizeof(msg) - _len);
       }
 
-      task_set_error(task, strdup(err));
-      free(err);
+      task_set_error(task, strdup(msg));
       task_save_handler_finished(task, state);
       return;
    }
diff --git a/ui/drivers/cocoa/cocoa_common.m b/ui/drivers/cocoa/cocoa_common.m
index eb4f8d2c9ec8..8d8b8d77c66d 100644
--- a/ui/drivers/cocoa/cocoa_common.m
+++ b/ui/drivers/cocoa/cocoa_common.m
@@ -273,8 +273,10 @@ - (void)pressesBegan:(NSSet<UIPress *> *)presses
         /* If we're at the top it doesn't matter who pressed it, we want to leave */
         if (press.type == UIPressTypeMenu && [self menuIsAtTop])
             [super pressesBegan:presses withEvent:event];
-        else if ([self didMicroGamepadPress:press.type])
+        else if (!press.key && [self didMicroGamepadPress:press.type])
             [self sendKeyForPress:press.type down:true];
+        else
+            [super pressesBegan:[NSSet setWithObject:press] withEvent:event];
     }
 }
 
diff --git a/uwp/uwp_main.cpp b/uwp/uwp_main.cpp
index 15266cdb41f3..bc434f55c295 100644
--- a/uwp/uwp_main.cpp
+++ b/uwp/uwp_main.cpp
@@ -636,6 +636,8 @@ void App::OnAcceleratorKey(CoreDispatcher^ sender, AcceleratorKeyEventArgs^ args
       mod |= RETROKMOD_CAPSLOCK;
    if ((window->GetKeyState(VirtualKey::Scroll) & CoreVirtualKeyStates::Locked) == CoreVirtualKeyStates::Locked)
       mod |= RETROKMOD_SCROLLOCK;
+   if ((window->GetKeyState(VirtualKey::NumberKeyLock) & CoreVirtualKeyStates::Locked) == CoreVirtualKeyStates::Locked)
+      mod |= RETROKMOD_NUMLOCK;
    if ((window->GetKeyState(VirtualKey::LeftWindows) & CoreVirtualKeyStates::Down) == CoreVirtualKeyStates::Down ||
          (window->GetKeyState(VirtualKey::RightWindows) & CoreVirtualKeyStates::Down) == CoreVirtualKeyStates::Down)
       mod |= RETROKMOD_META;