diff --git a/frontend/libretro.c b/frontend/libretro.c
index 6b5256c00..7e5ac0cb6 100644
--- a/frontend/libretro.c
+++ b/frontend/libretro.c
@@ -1881,7 +1881,7 @@ static void update_variables(bool in_flight)
 
 #ifdef GPU_NEON
    var.value = NULL;
-   var.key = "pcsx_rearmed_neon_interlace_enable";
+   var.key = "pcsx_rearmed_neon_interlace_enable_v2";
 
    if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
    {
@@ -1889,6 +1889,8 @@ static void update_variables(bool in_flight)
          pl_rearmed_cbs.gpu_neon.allow_interlace = 0;
       else if (strcmp(var.value, "enabled") == 0)
          pl_rearmed_cbs.gpu_neon.allow_interlace = 1;
+      else // auto
+         pl_rearmed_cbs.gpu_neon.allow_interlace = 2;
    }
 
    var.value = NULL;
diff --git a/frontend/libretro_core_options.h b/frontend/libretro_core_options.h
index e7c10c1fe..38169c45a 100644
--- a/frontend/libretro_core_options.h
+++ b/frontend/libretro_core_options.h
@@ -203,9 +203,6 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       "PSX CPU Clock Speed",
       NULL,
       "Overclock or under-clock the PSX CPU. Try adjusting this if the game is too slow, too fast or hangs."
-#if defined(LIGHTREC)
-      " Currently doesn't work with Lightrec dynarec."
-#endif
 #if defined(HAVE_PRE_ARMV7) && !defined(_3DS)
       " Default is 50."
 #else
@@ -440,18 +437,19 @@ struct retro_core_option_v2_definition option_defs_us[] = {
    },
 #ifdef GPU_NEON
    {
-      "pcsx_rearmed_neon_interlace_enable",
+      "pcsx_rearmed_neon_interlace_enable_v2",
       "(GPU) Show Interlaced Video",
       "Show Interlaced Video",
-      "When enabled, games that run in high resolution video modes (480i, 512i) will produced interlaced video output. While this displays correctly on CRT televisions, it will produce artifacts on modern displays. When disabled, all video is output in progressive format.",
+      "When enabled, games that run in high resolution video modes (480i, 512i) will produced interlaced video output. While this displays correctly on CRT televisions, it will produce artifacts on modern displays. When disabled, all video is output in progressive format. Note: there are games that will glitch is this is off.",
       NULL,
       "gpu_neon",
       {
+         { "auto", NULL },
          { "disabled", NULL },
          { "enabled",  NULL },
          { NULL, NULL },
       },
-      "disabled",
+      "auto",
    },
    {
       "pcsx_rearmed_neon_enhancement_enable",
diff --git a/frontend/libretro_core_options_intl.h b/frontend/libretro_core_options_intl.h
index 5b04d601a..d66582221 100644
--- a/frontend/libretro_core_options_intl.h
+++ b/frontend/libretro_core_options_intl.h
@@ -221,11 +221,13 @@ struct retro_core_option_v2_definition option_defs_tr[] = {
       "pcsx_rearmed_psxclock",
       "PSX CPU Saat Hızı",
       NULL,
+      "Overclock or under-clock the PSX CPU. Try adjusting this if the game is too slow, too fast or hangs."
 #if defined(HAVE_PRE_ARMV7) && !defined(_3DS)
-      "Overclock or underclock the PSX clock. Default is 50",
+      " Default is 50."
 #else
-      "Overclock or underclock the PSX clock. Default is 57",
+      " Default is 57."
 #endif
+      ,
       NULL,
       NULL,
       {
@@ -237,7 +239,7 @@ struct retro_core_option_v2_definition option_defs_tr[] = {
 
 #ifdef GPU_NEON
    {
-      "pcsx_rearmed_neon_interlace_enable",
+      "pcsx_rearmed_neon_interlace_enable_v2",
       "Interlacing Mode'u etkinleştir",
       NULL,
       "Sahte tarama çizgileri efektini etkinleştirir.",
@@ -250,7 +252,7 @@ struct retro_core_option_v2_definition option_defs_tr[] = {
    },
    {
       "pcsx_rearmed_neon_enhancement_enable",
-      "Geliştirilmiş Çözünürlük (Yavaş)",
+      "Geliştirilmiş Çözünürlük",
       NULL,
       "Düşük performans pahasına çift çözünürlükte işler.",
       NULL,