diff --git a/Makefile.common b/Makefile.common
index 0cff7dcd58..7d6af76b24 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -357,13 +357,9 @@ ifeq ($(HAVE_QT), 1)
        OBJ += ui/drivers/qt/settingswidgets.o \
               ui/drivers/qt/options/achievements.o \
               ui/drivers/qt/options/audio.o \
-              ui/drivers/qt/options/configuration.o \
-              ui/drivers/qt/options/core.o \
-              ui/drivers/qt/options/directory.o \
-              ui/drivers/qt/options/drivers.o \
+              ui/drivers/qt/options/generic.o \
               ui/drivers/qt/options/input.o \
               ui/drivers/qt/options/latency.o \
-              ui/drivers/qt/options/logging.o \
               ui/drivers/qt/options/network.o \
               ui/drivers/qt/options/osd.o \
               ui/drivers/qt/options/playlists.o \
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 686c70b20c..9267eb7fda 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -61,17 +61,13 @@ UI
 #include "../ui/drivers/qt/playlistthumbnaildownload.cpp"
 #ifdef HAVE_MENU
 #include "../ui/drivers/qt/settingswidgets.cpp"
-#include "../ui/drivers/qt/options/drivers.cpp"
+#include "../ui/drivers/qt/options/generic.cpp"
 #include "../ui/drivers/qt/options/video.cpp"
 #include "../ui/drivers/qt/options/audio.cpp"
 #include "../ui/drivers/qt/options/saving.cpp"
 #include "../ui/drivers/qt/options/throttle.cpp"
 #include "../ui/drivers/qt/options/osd.cpp"
 #include "../ui/drivers/qt/options/input.cpp"
-#include "../ui/drivers/qt/options/directory.cpp"
-#include "../ui/drivers/qt/options/logging.cpp"
-#include "../ui/drivers/qt/options/core.cpp"
-#include "../ui/drivers/qt/options/configuration.cpp"
 #include "../ui/drivers/qt/options/latency.cpp"
 #include "../ui/drivers/qt/options/playlists.cpp"
 #include "../ui/drivers/qt/options/user.cpp"
diff --git a/ui/drivers/qt/options/configuration.cpp b/ui/drivers/qt/options/configuration.cpp
deleted file mode 100644
index 4af468a7a4..0000000000
--- a/ui/drivers/qt/options/configuration.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "options.h"
-
-ConfigurationCategory::ConfigurationCategory(QWidget *parent) :
-   OptionsCategory(parent)
-{
-   setDisplayName(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS);
-   setCategoryIcon("setting");
-}
-
-QVector<OptionsPage*> ConfigurationCategory::pages()
-{
-   QVector<OptionsPage*> pages;
-
-   pages << new ConfigurationPage(this);
-
-   return pages;
-}
-
-ConfigurationPage::ConfigurationPage(QObject *parent) :
-   OptionsPage(parent)
-{
-}
-
-QWidget *ConfigurationPage::widget()
-{
-   return create_widget(DISPLAYLIST_CONFIGURATION_SETTINGS_LIST);
-}
diff --git a/ui/drivers/qt/options/core.cpp b/ui/drivers/qt/options/core.cpp
deleted file mode 100644
index 0252f353f8..0000000000
--- a/ui/drivers/qt/options/core.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "options.h"
-
-CoreCategory::CoreCategory(QWidget *parent) :
-   OptionsCategory(parent)
-{
-   setDisplayName(MENU_ENUM_LABEL_VALUE_CORE_SETTINGS);
-   setCategoryIcon("core-options");
-}
-
-QVector<OptionsPage*> CoreCategory::pages()
-{
-   QVector<OptionsPage*> pages;
-
-   pages << new CorePage(this);
-
-   return pages;
-}
-
-CorePage::CorePage(QObject *parent) :
-   OptionsPage(parent)
-{
-}
-
-QWidget *CorePage::widget()
-{
-   return create_widget(DISPLAYLIST_CORE_SETTINGS_LIST);
-}
diff --git a/ui/drivers/qt/options/directory.cpp b/ui/drivers/qt/options/directory.cpp
deleted file mode 100644
index a2b268aab4..0000000000
--- a/ui/drivers/qt/options/directory.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "options.h"
-
-DirectoryCategory::DirectoryCategory(QWidget *parent) :
-   OptionsCategory(parent)
-{
-   setDisplayName(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS);
-   setCategoryIcon("folder");
-}
-
-QVector<OptionsPage*> DirectoryCategory::pages()
-{
-   QVector<OptionsPage*> pages;
-
-   pages << new DirectoryPage(this);
-
-   return pages;
-}
-
-DirectoryPage::DirectoryPage(QObject *parent) :
-   OptionsPage(parent)
-{
-}
-
-QWidget *DirectoryPage::widget()
-{
-   return create_widget(DISPLAYLIST_DIRECTORY_SETTINGS_LIST);
-}
diff --git a/ui/drivers/qt/options/drivers.cpp b/ui/drivers/qt/options/drivers.cpp
deleted file mode 100644
index 3c2f52c420..0000000000
--- a/ui/drivers/qt/options/drivers.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "options.h"
-
-DriversCategory::DriversCategory(QWidget *parent) :
-   OptionsCategory(parent)
-{
-   setDisplayName(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS);
-   setCategoryIcon("menu_drivers");
-}
-
-QVector<OptionsPage*> DriversCategory::pages()
-{
-   QVector<OptionsPage*> pages;
-
-   pages << new DriversPage(this);
-
-   return pages;
-}
-
-DriversPage::DriversPage(QObject *parent) :
-   OptionsPage(parent)
-{
-   setDisplayName(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS);
-}
-
-QWidget *DriversPage::widget()
-{
-   return create_widget(DISPLAYLIST_DRIVER_SETTINGS_LIST);
-}
diff --git a/ui/drivers/qt/options/generic.cpp b/ui/drivers/qt/options/generic.cpp
new file mode 100644
index 0000000000..1cd79441ef
--- /dev/null
+++ b/ui/drivers/qt/options/generic.cpp
@@ -0,0 +1,142 @@
+#include "options.h"
+
+/* DRIVERS */
+
+DriversCategory::DriversCategory(QWidget *parent) :
+   OptionsCategory(parent)
+{
+   setDisplayName(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS);
+   setCategoryIcon("menu_drivers");
+}
+
+QVector<OptionsPage*> DriversCategory::pages()
+{
+   QVector<OptionsPage*> pages;
+
+   pages << new DriversPage(this);
+
+   return pages;
+}
+
+DriversPage::DriversPage(QObject *parent) :
+   OptionsPage(parent)
+{
+   setDisplayName(MENU_ENUM_LABEL_VALUE_DRIVER_SETTINGS);
+}
+
+QWidget *DriversPage::widget()
+{
+   return create_widget(DISPLAYLIST_DRIVER_SETTINGS_LIST);
+}
+
+/* DIRECTORY */
+
+DirectoryCategory::DirectoryCategory(QWidget *parent) :
+   OptionsCategory(parent)
+{
+   setDisplayName(MENU_ENUM_LABEL_VALUE_DIRECTORY_SETTINGS);
+   setCategoryIcon("folder");
+}
+
+QVector<OptionsPage*> DirectoryCategory::pages()
+{
+   QVector<OptionsPage*> pages;
+
+   pages << new DirectoryPage(this);
+
+   return pages;
+}
+
+DirectoryPage::DirectoryPage(QObject *parent) :
+   OptionsPage(parent)
+{
+}
+
+QWidget *DirectoryPage::widget()
+{
+   return create_widget(DISPLAYLIST_DIRECTORY_SETTINGS_LIST);
+}
+
+/* CONFIGURATION */
+
+ConfigurationCategory::ConfigurationCategory(QWidget *parent) :
+   OptionsCategory(parent)
+{
+   setDisplayName(MENU_ENUM_LABEL_VALUE_CONFIGURATION_SETTINGS);
+   setCategoryIcon("setting");
+}
+
+QVector<OptionsPage*> ConfigurationCategory::pages()
+{
+   QVector<OptionsPage*> pages;
+
+   pages << new ConfigurationPage(this);
+
+   return pages;
+}
+
+ConfigurationPage::ConfigurationPage(QObject *parent) :
+   OptionsPage(parent)
+{
+}
+
+QWidget *ConfigurationPage::widget()
+{
+   return create_widget(DISPLAYLIST_CONFIGURATION_SETTINGS_LIST);
+}
+
+/* CORE */
+
+CoreCategory::CoreCategory(QWidget *parent) :
+   OptionsCategory(parent)
+{
+   setDisplayName(MENU_ENUM_LABEL_VALUE_CORE_SETTINGS);
+   setCategoryIcon("core-options");
+}
+
+QVector<OptionsPage*> CoreCategory::pages()
+{
+   QVector<OptionsPage*> pages;
+
+   pages << new CorePage(this);
+
+   return pages;
+}
+
+CorePage::CorePage(QObject *parent) :
+   OptionsPage(parent)
+{
+}
+
+QWidget *CorePage::widget()
+{
+   return create_widget(DISPLAYLIST_CORE_SETTINGS_LIST);
+}
+
+/* LOGGING */
+
+LoggingCategory::LoggingCategory(QWidget *parent) :
+   OptionsCategory(parent)
+{
+   setDisplayName(MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS);
+   setCategoryIcon("menu_log");
+}
+
+QVector<OptionsPage*> LoggingCategory::pages()
+{
+   QVector<OptionsPage*> pages;
+
+   pages << new LoggingPage(this);
+
+   return pages;
+}
+
+LoggingPage::LoggingPage(QObject *parent) :
+   OptionsPage(parent)
+{
+}
+
+QWidget *LoggingPage::widget()
+{
+   return create_widget(DISPLAYLIST_LOGGING_SETTINGS_LIST);
+}
diff --git a/ui/drivers/qt/options/logging.cpp b/ui/drivers/qt/options/logging.cpp
deleted file mode 100644
index f34c18c695..0000000000
--- a/ui/drivers/qt/options/logging.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "options.h"
-
-LoggingCategory::LoggingCategory(QWidget *parent) :
-   OptionsCategory(parent)
-{
-   setDisplayName(MENU_ENUM_LABEL_VALUE_LOGGING_SETTINGS);
-   setCategoryIcon("menu_log");
-}
-
-QVector<OptionsPage*> LoggingCategory::pages()
-{
-   QVector<OptionsPage*> pages;
-
-   pages << new LoggingPage(this);
-
-   return pages;
-}
-
-LoggingPage::LoggingPage(QObject *parent) :
-   OptionsPage(parent)
-{
-}
-
-QWidget *LoggingPage::widget()
-{
-   return create_widget(DISPLAYLIST_LOGGING_SETTINGS_LIST);
-}