diff --git a/src/libretro_variables.cpp b/src/libretro_variables.cpp
index 41a620c..559e244 100644
--- a/src/libretro_variables.cpp
+++ b/src/libretro_variables.cpp
@@ -13,40 +13,163 @@ static const char* const SPEEDHACK_VARIABLE = "neocd_cdspeedhack";
 static const char* const LOADSKIP_VARIABLE = "neocd_loadskip";
 static const char* const PER_CONTENT_SAVES_VARIABLE = "neocd_per_content_saves";
 
+static const char* const CATEGORY_SYSTEM = "system";
+static const char* const CATEGORY_VIDEO = "video";
+static const char* const CATEGORY_AUDIO = "audio";
+static const char* const CATEGORY_INPUT = "input";
+static const char* const CATEGORY_ADVANCED = "advanced";
+
 // All core variables
 static std::vector<retro_variable> variables;
+static std::vector<retro_core_option_v2_definition> coreOptionDefinitions;
 
-void Libretro::Variables::init()
-{
-    variables.clear();
+static retro_core_option_v2_category coreOptionCategories[] = {
+    { CATEGORY_SYSTEM, "System", nullptr },
+    //{ CATEGORY_VIDEO, "Video", nullptr },
+    //{ CATEGORY_AUDIO, "Audio", nullptr },
+    //{ CATEGORY_INPUT, "Input", nullptr },
+    { CATEGORY_ADVANCED, "Advanced", nullptr },
+    { nullptr, nullptr, nullptr },
+};
 
-    variables.emplace_back(retro_variable{ REGION_VARIABLE, "Region; Japan|USA|Europe" });
+static retro_core_options_v2 coreOptionsV2 = { coreOptionCategories, nullptr };
 
+static void buildBiosChoices()
+{
     globals.biosChoices.clear();
 
-    if (globals.biosList.size())
+    if (globals.biosList.empty())
+        return;
+
+    globals.biosChoices = "BIOS Select; ";
+    globals.biosChoices.append(globals.biosList[0].description);
+
+    for (size_t i = 1; i < globals.biosList.size(); ++i)
     {
-        globals.biosChoices = "BIOS Select; ";
-        globals.biosChoices.append(globals.biosList[0].description);
+        globals.biosChoices.append("|");
+        globals.biosChoices.append(globals.biosList[i].description);
+    }
+}
 
-        for (size_t i = 1; i < globals.biosList.size(); ++i)
-        {
-            globals.biosChoices.append("|");
-            globals.biosChoices.append(globals.biosList[i].description);
-        }
+static void fillBasicOption(retro_core_option_v2_definition& option,
+                            const char* key,
+                            const char* desc,
+                            const char* categoryKey,
+                            const char* defaultValue,
+                            const char* const* values,
+                            size_t valueCount)
+{
+    option = retro_core_option_v2_definition{};
+    option.key = key;
+    option.desc = desc;
+    option.desc_categorized = desc;
+    option.category_key = categoryKey;
 
-        variables.emplace_back(retro_variable{ BIOS_VARIABLE, globals.biosChoices.c_str() });
+    const size_t maxValues = RETRO_NUM_CORE_OPTION_VALUES_MAX - 1;
+    const size_t count = valueCount > maxValues ? maxValues : valueCount;
+
+    for (size_t i = 0; i < count; ++i)
+    {
+        option.values[i].value = values[i];
+        option.values[i].label = values[i];
     }
 
-    variables.emplace_back(retro_variable{ SPEEDHACK_VARIABLE, "CD Speed Hack; On|Off" });
+    option.values[count].value = NULL;
+    option.values[count].label = NULL;
+    option.default_value = defaultValue;
+}
 
-    variables.emplace_back(retro_variable{ LOADSKIP_VARIABLE, "Skip CD Loading; On|Off" });
+static void fillBiosOption(retro_core_option_v2_definition& option)
+{
+    option = retro_core_option_v2_definition{};
+    option.key = BIOS_VARIABLE;
+    option.desc = "BIOS Select";
+    option.desc_categorized = "BIOS Select";
+    option.category_key = CATEGORY_SYSTEM;
+
+    size_t count = globals.biosList.size();
+    const size_t maxValues = RETRO_NUM_CORE_OPTION_VALUES_MAX - 1;
+    if (count > maxValues)
+        count = maxValues;
+
+    for (size_t i = 0; i < count; ++i)
+    {
+        const char* desc = globals.biosList[i].description.c_str();
+        option.values[i].value = desc;
+        option.values[i].label = desc;
+    }
+
+    option.values[count].value = NULL;
+    option.values[count].label = NULL;
+    option.default_value = count ? option.values[0].value : NULL;
+}
 
+static void buildLegacyVariables()
+{
+    variables.clear();
+
+    variables.emplace_back(retro_variable{ REGION_VARIABLE, "Region; Japan|USA|Europe" });
+
+    buildBiosChoices();
+
+    if (globals.biosList.size())
+        variables.emplace_back(retro_variable{ BIOS_VARIABLE, globals.biosChoices.c_str() });
+
+    variables.emplace_back(retro_variable{ SPEEDHACK_VARIABLE, "CD Speed Hack; On|Off" });
+    variables.emplace_back(retro_variable{ LOADSKIP_VARIABLE, "Skip CD Loading; On|Off" });
     variables.emplace_back(retro_variable{ PER_CONTENT_SAVES_VARIABLE, "Per-Game Saves (Restart); Off|On" });
 
     variables.emplace_back(retro_variable{ nullptr, nullptr });
+}
+
+static void buildCoreOptionsV2()
+{
+    coreOptionDefinitions.clear();
+    coreOptionDefinitions.reserve(6);
+
+    retro_core_option_v2_definition option;
+
+    const char* const regionValues[] = { "Japan", "USA", "Europe" };
+    fillBasicOption(option, REGION_VARIABLE, "Region", CATEGORY_SYSTEM, "Japan", regionValues, 3);
+    coreOptionDefinitions.emplace_back(option);
+
+    if (!globals.biosList.empty())
+    {
+        fillBiosOption(option);
+        coreOptionDefinitions.emplace_back(option);
+    }
+
+    const char* const onOffValues[] = { "On", "Off" };
+    fillBasicOption(option, SPEEDHACK_VARIABLE, "CD Speed Hack", CATEGORY_ADVANCED, "On", onOffValues, 2);
+    coreOptionDefinitions.emplace_back(option);
+
+    fillBasicOption(option, LOADSKIP_VARIABLE, "Skip CD Loading", CATEGORY_ADVANCED, "On", onOffValues, 2);
+    coreOptionDefinitions.emplace_back(option);
+
+    const char* const offOnValues[] = { "Off", "On" };
+    fillBasicOption(option, PER_CONTENT_SAVES_VARIABLE, "Per-Game Saves (Restart)", CATEGORY_SYSTEM, "Off", offOnValues, 2);
+    coreOptionDefinitions.emplace_back(option);
+
+    coreOptionDefinitions.emplace_back(retro_core_option_v2_definition{});
+    coreOptionsV2.definitions = coreOptionDefinitions.data();
+}
+
+void Libretro::Variables::init()
+{
+    unsigned optionsVersion = 0;
+    bool setOptions = false;
 
-    libretro.environment(RETRO_ENVIRONMENT_SET_VARIABLES, reinterpret_cast<void*>(&variables[0]));
+    if (libretro.environment(RETRO_ENVIRONMENT_GET_CORE_OPTIONS_VERSION, &optionsVersion) && optionsVersion >= 2)
+    {
+        buildCoreOptionsV2();
+        setOptions = libretro.environment(RETRO_ENVIRONMENT_SET_CORE_OPTIONS_V2, &coreOptionsV2);
+    }
+
+    if (!setOptions)
+    {
+        buildLegacyVariables();
+        libretro.environment(RETRO_ENVIRONMENT_SET_VARIABLES, reinterpret_cast<void*>(&variables[0]));
+    }
 }
 
 void Libretro::Variables::update(bool needReset)