diff --git a/setting_list.c b/setting_list.c
index 6bb523e166..49c57e1847 100644
--- a/setting_list.c
+++ b/setting_list.c
@@ -2014,6 +2014,7 @@ bool CONFIG_DIR(
    if (!(settings_list_append(list, list_info)))
       return false;
    (*list)[list_info->index++] = value;
+   (*list)[list_info->index - 1].ui_type   = ST_UI_TYPE_DIRECTORY_SELECTOR;
    settings_data_list_current_add_flags(
          list,
          list_info,
diff --git a/ui/drivers/qt/options/configuration.cpp b/ui/drivers/qt/options/configuration.cpp
index 017bb97cb5..30f9548879 100644
--- a/ui/drivers/qt/options/configuration.cpp
+++ b/ui/drivers/qt/options/configuration.cpp
@@ -23,14 +23,13 @@ ConfigurationPage::ConfigurationPage(QObject *parent) :
 
 QWidget *ConfigurationPage::widget()
 {
-   QWidget *widget = new QWidget;
-
+   QWidget *widget    = new QWidget;
    FormLayout *layout = new FormLayout;
 
-   layout->addCheckBox(MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT);
-   layout->addCheckBox(MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS);
-   layout->addCheckBox(MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE);
-   layout->addCheckBox(MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE);
+   layout->add(MENU_ENUM_LABEL_CONFIG_SAVE_ON_EXIT);
+   layout->add(MENU_ENUM_LABEL_GAME_SPECIFIC_OPTIONS);
+   layout->add(MENU_ENUM_LABEL_AUTO_OVERRIDES_ENABLE);
+   layout->add(MENU_ENUM_LABEL_AUTO_REMAPS_ENABLE);
 
    widget->setLayout(layout);
 
diff --git a/ui/drivers/qt/options/core.cpp b/ui/drivers/qt/options/core.cpp
index 755ffced3a..90a6996c23 100644
--- a/ui/drivers/qt/options/core.cpp
+++ b/ui/drivers/qt/options/core.cpp
@@ -23,14 +23,13 @@ CorePage::CorePage(QObject *parent) :
 
 QWidget *CorePage::widget()
 {
-   QWidget *widget = new QWidget;
-
+   QWidget *widget    = new QWidget;
    FormLayout *layout = new FormLayout;
 
-   layout->addCheckBox(MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT);
-   layout->addCheckBox(MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN);
-   layout->addCheckBox(MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE);
-   layout->addCheckBox(MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE);
+   layout->add(MENU_ENUM_LABEL_VIDEO_SHARED_CONTEXT);
+   layout->add(MENU_ENUM_LABEL_DUMMY_ON_CORE_SHUTDOWN);
+   layout->add(MENU_ENUM_LABEL_CHECK_FOR_MISSING_FIRMWARE);
+   layout->add(MENU_ENUM_LABEL_VIDEO_ALLOW_ROTATE);
 
    widget->setLayout(layout);
 
diff --git a/ui/drivers/qt/options/directory.cpp b/ui/drivers/qt/options/directory.cpp
index c665096393..51a062e341 100644
--- a/ui/drivers/qt/options/directory.cpp
+++ b/ui/drivers/qt/options/directory.cpp
@@ -23,34 +23,33 @@ DirectoryPage::DirectoryPage(QObject *parent) :
 
 QWidget *DirectoryPage::widget()
 {
-   QWidget *widget = new QWidget;
-
+   QWidget *widget    = new QWidget;
    FormLayout *layout = new FormLayout;
 
-   layout->addDirectorySelector(MENU_ENUM_LABEL_CORE_ASSETS_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_ASSETS_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_THUMBNAILS_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_RGUI_BROWSER_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_RGUI_CONFIG_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_LIBRETRO_DIR_PATH);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_LIBRETRO_INFO_PATH);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_CONTENT_DATABASE_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_CURSOR_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_CHEAT_DATABASE_PATH);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_VIDEO_FILTER_DIR);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_AUDIO_FILTER_DIR);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_VIDEO_SHADER_DIR);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_RECORDING_OUTPUT_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_RECORDING_CONFIG_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_OVERLAY_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_SCREENSHOT_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_JOYPAD_AUTOCONFIG_DIR);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_INPUT_REMAPPING_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_PLAYLIST_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_SAVEFILE_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_SAVESTATE_DIRECTORY);
-   layout->addDirectorySelector(MENU_ENUM_LABEL_CACHE_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_CORE_ASSETS_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_ASSETS_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_DYNAMIC_WALLPAPERS_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_THUMBNAILS_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_RGUI_BROWSER_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_RGUI_CONFIG_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_LIBRETRO_DIR_PATH);
+   layout->add(MENU_ENUM_LABEL_LIBRETRO_INFO_PATH);
+   layout->add(MENU_ENUM_LABEL_CONTENT_DATABASE_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_CURSOR_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_CHEAT_DATABASE_PATH);
+   layout->add(MENU_ENUM_LABEL_VIDEO_FILTER_DIR);
+   layout->add(MENU_ENUM_LABEL_AUDIO_FILTER_DIR);
+   layout->add(MENU_ENUM_LABEL_VIDEO_SHADER_DIR);
+   layout->add(MENU_ENUM_LABEL_RECORDING_OUTPUT_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_RECORDING_CONFIG_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_OVERLAY_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_SCREENSHOT_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_JOYPAD_AUTOCONFIG_DIR);
+   layout->add(MENU_ENUM_LABEL_INPUT_REMAPPING_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_PLAYLIST_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_SAVEFILE_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_SAVESTATE_DIRECTORY);
+   layout->add(MENU_ENUM_LABEL_CACHE_DIRECTORY);
 
    widget->setLayout(layout);
 
diff --git a/ui/drivers/qt/options/drivers.cpp b/ui/drivers/qt/options/drivers.cpp
index 64db8534ab..10a724c58d 100644
--- a/ui/drivers/qt/options/drivers.cpp
+++ b/ui/drivers/qt/options/drivers.cpp
@@ -24,20 +24,19 @@ DriversPage::DriversPage(QObject *parent) :
 
 QWidget *DriversPage::widget()
 {
-   QWidget *widget = new QWidget;
-
+   QWidget *widget    = new QWidget;
    FormLayout *layout = new FormLayout;
 
-   layout->addStringComboBox(MENU_ENUM_LABEL_INPUT_DRIVER);
-   layout->addStringComboBox(MENU_ENUM_LABEL_JOYPAD_DRIVER);
-   layout->addStringComboBox(MENU_ENUM_LABEL_VIDEO_DRIVER);
-   layout->addStringComboBox(MENU_ENUM_LABEL_AUDIO_DRIVER);
-   layout->addStringComboBox(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER);
-   layout->addStringComboBox(MENU_ENUM_LABEL_CAMERA_DRIVER);
-   layout->addStringComboBox(MENU_ENUM_LABEL_LOCATION_DRIVER);
-   layout->addStringComboBox(MENU_ENUM_LABEL_MENU_DRIVER);
-   layout->addStringComboBox(MENU_ENUM_LABEL_RECORD_DRIVER);
-   layout->addStringComboBox(MENU_ENUM_LABEL_MIDI_DRIVER);
+   layout->add(MENU_ENUM_LABEL_INPUT_DRIVER);
+   layout->add(MENU_ENUM_LABEL_JOYPAD_DRIVER);
+   layout->add(MENU_ENUM_LABEL_VIDEO_DRIVER);
+   layout->add(MENU_ENUM_LABEL_AUDIO_DRIVER);
+   layout->add(MENU_ENUM_LABEL_AUDIO_RESAMPLER_DRIVER);
+   layout->add(MENU_ENUM_LABEL_CAMERA_DRIVER);
+   layout->add(MENU_ENUM_LABEL_LOCATION_DRIVER);
+   layout->add(MENU_ENUM_LABEL_MENU_DRIVER);
+   layout->add(MENU_ENUM_LABEL_RECORD_DRIVER);
+   layout->add(MENU_ENUM_LABEL_MIDI_DRIVER);
 
    widget->setLayout(layout);