diff --git a/frontend/menu/menu_common.h b/frontend/menu/menu_common.h
index b1ecbb33b7..3d4836d323 100644
--- a/frontend/menu/menu_common.h
+++ b/frontend/menu/menu_common.h
@@ -113,6 +113,8 @@ typedef enum
    RGUI_SETTINGS_CUSTOM_VIEWPORT_2,
    RGUI_SETTINGS_TOGGLE_FULLSCREEN,
    RGUI_SETTINGS_VIDEO_ROTATION,
+   RGUI_SETTINGS_VIDEO_VSYNC,
+   RGUI_SETTINGS_VIDEO_HARD_SYNC,
 #ifdef HAVE_SHADER_MANAGER
    RGUI_SETTINGS_SHADER_FILTER,
    RGUI_SETTINGS_SHADER_PRESET,
@@ -125,7 +127,7 @@ typedef enum
 #ifdef HAVE_SHADER_MANAGER
    RGUI_SETTINGS_SHADER_LAST = RGUI_SETTINGS_SHADER_0_SCALE + (3 * (RGUI_MAX_SHADERS - 1)),
 #else
-   RGUI_SETTINGS_SHADER_LAST = RGUI_SETTINGS_VIDEO_ROTATION,
+   RGUI_SETTINGS_SHADER_LAST = RGUI_SETTINGS_VIDEO_HARD_SYNC,
 #endif
 
    // settings options are done here too
@@ -148,9 +150,11 @@ typedef enum
    RGUI_SETTINGS_SCREENSHOT,
 #endif
    RGUI_BROWSER_DIR_PATH,
+   RGUI_SHADER_DIR_PATH,
    RGUI_SAVESTATE_DIR_PATH,
    RGUI_SAVEFILE_DIR_PATH,
    RGUI_SYSTEM_DIR_PATH,
+   RGUI_CONFIG_PATH,
    RGUI_SETTINGS_RESTART_GAME,
    RGUI_SETTINGS_AUDIO_MUTE,
    RGUI_SETTINGS_AUDIO_CONTROL_RATE,
diff --git a/frontend/menu/rgui.c b/frontend/menu/rgui.c
index bf01edab95..11d38138a8 100644
--- a/frontend/menu/rgui.c
+++ b/frontend/menu/rgui.c
@@ -508,6 +508,10 @@ static void render_text(rgui_handle_t *rgui)
          }
          else if (type == RGUI_SETTINGS_VIDEO_GAMMA)
             snprintf(type_str, sizeof(type_str), "%d", g_extern.console.screen.gamma_correction);
+         else if (type == RGUI_SETTINGS_VIDEO_VSYNC)
+            snprintf(type_str, sizeof(type_str), g_settings.video.vsync ? "ON" : "OFF");
+         else if (type == RGUI_SETTINGS_VIDEO_HARD_SYNC)
+            snprintf(type_str, sizeof(type_str), g_settings.video.hard_sync ? "ON" : "OFF");
          else if (type == RGUI_SETTINGS_VIDEO_INTEGER_SCALE)
             strlcpy(type_str, g_settings.video.scale_integer ? "ON" : "OFF", sizeof(type_str));
          else if (type == RGUI_SETTINGS_VIDEO_ASPECT_RATIO)
@@ -600,9 +604,15 @@ static void render_text(rgui_handle_t *rgui)
             case RGUI_SAVESTATE_DIR_PATH:
                strlcpy(type_str, g_extern.savestate_dir, sizeof(type_str));
                break;
+            case RGUI_SHADER_DIR_PATH:
+               strlcpy(type_str, g_settings.video.shader_dir, sizeof(type_str));
+               break;
             case RGUI_SYSTEM_DIR_PATH:
                strlcpy(type_str, g_settings.system_directory, sizeof(type_str));
                break;
+            case RGUI_CONFIG_PATH:
+               strlcpy(type_str, g_extern.config_path, sizeof(type_str));
+               break;
             case RGUI_SETTINGS_DISK_INDEX:
             {
                const struct retro_disk_control_callback *control = &g_extern.system.disk_control;
@@ -1267,6 +1277,8 @@ static void rgui_settings_shader_manager_populate_entries(rgui_handle_t *rgui)
    rgui_list_push(rgui->selection_buf, "Toggle Fullscreen", RGUI_SETTINGS_TOGGLE_FULLSCREEN, 0);
 #endif
    rgui_list_push(rgui->selection_buf, "Rotation", RGUI_SETTINGS_VIDEO_ROTATION, 0);
+   rgui_list_push(rgui->selection_buf, "Vertical sync", RGUI_SETTINGS_VIDEO_VSYNC, 0);
+   rgui_list_push(rgui->selection_buf, "Hard sync", RGUI_SETTINGS_VIDEO_HARD_SYNC, 0);
 #ifdef HAVE_SHADER_MANAGER
    rgui_list_push(rgui->selection_buf, "Apply Shader Changes",
          RGUI_SETTINGS_SHADER_APPLY, 0);
@@ -1475,6 +1487,42 @@ static int shader_manager_toggle_setting(rgui_handle_t *rgui, unsigned setting,
          driver.video_poke->apply_state_changes(driver.video_data);
    }
 #endif
+   else if (setting == RGUI_SETTINGS_VIDEO_VSYNC)
+   {
+      switch (action)
+      {
+         case RGUI_ACTION_START:
+            g_settings.video.vsync = true;
+            break;
+
+         case RGUI_ACTION_LEFT:
+         case RGUI_ACTION_RIGHT:
+         case RGUI_ACTION_OK:
+            g_settings.video.vsync = !g_settings.video.vsync;
+            break;
+
+         default:
+            break;
+      }
+   }
+   else if (setting == RGUI_SETTINGS_VIDEO_HARD_SYNC)
+   {
+      switch (action)
+      {
+         case RGUI_ACTION_START:
+            g_settings.video.hard_sync = true;
+            break;
+
+         case RGUI_ACTION_LEFT:
+         case RGUI_ACTION_RIGHT:
+         case RGUI_ACTION_OK:
+            g_settings.video.hard_sync = !g_settings.video.hard_sync;
+            break;
+
+         default:
+            break;
+      }
+   }
 #ifdef HAVE_SHADER_MANAGER
    else if (setting == RGUI_SETTINGS_SHADER_FILTER)
    {
@@ -1642,9 +1690,13 @@ static void rgui_settings_path_populate_entries(rgui_handle_t *rgui)
 {
    rgui_list_clear(rgui->selection_buf);
    rgui_list_push(rgui->selection_buf, "Browser directory", RGUI_BROWSER_DIR_PATH, 0);
+#ifdef HAVE_SHADER_MANAGER
+   rgui_list_push(rgui->selection_buf, "Shader directory", RGUI_SHADER_DIR_PATH, 0);
+#endif
    rgui_list_push(rgui->selection_buf, "Savestate directory", RGUI_SAVESTATE_DIR_PATH, 0);
    rgui_list_push(rgui->selection_buf, "Savefile directory", RGUI_SAVEFILE_DIR_PATH, 0);
    rgui_list_push(rgui->selection_buf, "System directory", RGUI_SYSTEM_DIR_PATH, 0);
+   rgui_list_push(rgui->selection_buf, "Config file", RGUI_SYSTEM_DIR_PATH, 0);
 }
 
 static void rgui_settings_controller_populate_entries(rgui_handle_t *rgui)
diff --git a/frontend/menu/rmenu.c b/frontend/menu/rmenu.c
index 2ab1e58d26..563250dd72 100644
--- a/frontend/menu/rmenu.c
+++ b/frontend/menu/rmenu.c
@@ -402,7 +402,7 @@ static void display_menubar(uint8_t menu_type)
          strlcpy(title, "Path", sizeof(title));
          break;
       case INGAME_MENU:
-         strlcpy(title, "Ingame Menu", sizeof(title));
+         strlcpy(title, "Menu", sizeof(title));
          break;
       case INGAME_MENU_CORE_OPTIONS:
          strlcpy(title, "Core Options", sizeof(title));
@@ -417,7 +417,7 @@ static void display_menubar(uint8_t menu_type)
          strlcpy(title, "Resize Menu", sizeof(title));
          break;
       case INGAME_MENU_SCREENSHOT:
-         strlcpy(title, "Ingame Menu", sizeof(title));
+         strlcpy(title, "Menu", sizeof(title));
          break;
       case FILE_BROWSER_MENU:
          strlcpy(title, "Filebrowser", sizeof(title));