diff --git a/app/src/handlers/systemhandler.cpp b/app/src/handlers/systemhandler.cpp
index 3d233ec564904c228c049d873644f69383bceefd..461cbce430c7a462b49dc837e9c42ea1c327eef7 100644
--- a/app/src/handlers/systemhandler.cpp
+++ b/app/src/handlers/systemhandler.cpp
@@ -64,7 +64,7 @@ bool SystemHandler::openUrl(const QString &url) const
 
 QString SystemHandler::desktopEnvironment() const
 {
-    QString desktop = "unknown";
+    QString desktop = "";
     QString currentDesktop = "";
 
     if (!qgetenv("XDG_CURRENT_DESKTOP").isEmpty()) {
@@ -93,157 +93,146 @@ bool SystemHandler::isApplicableType(const QString &installType) const
 {
     auto desktop = desktopEnvironment();
 
-    if (installType == "wallpapers"
-            && (desktop == "kde" || desktop == "gnome" || desktop == "xfce")) {
-        return true;
+    QStringList applicableTypes;
+
+    if (desktop == "kde") {
+        applicableTypes << "wallpapers";
     }
-    else if (installType == "icons"
-             && (desktop == "kde" || desktop == "gnome" || desktop == "xfce")) {
-        return true;
+    else if (desktop == "gnome") {
+        applicableTypes << "wallpapers"
+                        << "icons"
+                        << "cursors"
+                        << "gtk3_themes"
+                        << "gnome_shell_themes";
     }
-    /*else if (installType == "cursors"
-             && (desktop == "kde" || desktop == "gnome" || desktop == "xfce")) {
-        return true;
+    else if (desktop == "xfce") {
+        applicableTypes << "wallpapers";
     }
-    else if ((installType == "aurorae_themes" && desktop == "kde")
-             || (installType == "metacity_themes" && desktop == "gnome")
-             || (installType == "xfwm4_themes" && desktop == "xfce")) {
-        return true;
-    }*/
-    return false;
+
+    return applicableTypes.contains(installType);
 }
 
 #ifdef QTLIB_UNIX
 bool SystemHandler::applyFile(const QString &path, const QString &installType) const
 {
     if (QFileInfo::exists(path) && isApplicableType(installType)) {
-        if (installType == "wallpapers") {
-            return applyWallpaper(path);
+        auto desktop = desktopEnvironment();
+
+        if (desktop == "kde") {
+            if (installType == "wallpapers") {
+                return applyKdeWallpaper(path);
+            }
         }
-        else if (installType == "icons") {
-            return applyIcon(path);
+        else if (desktop == "gnome") {
+            if (installType == "wallpapers") {
+                return applyGnomeWallpaper(path);
+            }
+            else if (installType == "icons") {
+                return applyGnomeIcon(path);
+            }
+            else if (installType == "cursors") {
+                return applyGnomeCursor(path);
+            }
+            else if (installType == "gtk3_themes") {
+                return applyGnomeGtk3Theme(path);
+            }
+            else if (installType == "gnome_shell_themes") {
+                return applyGnomeGnomeShellTheme(path);
+            }
         }
-        /*else if (installType == "cursors") {
-            return applyCursor(path);
+        else if (desktop == "xfce") {
+            if (installType == "wallpapers") {
+                return applyXfceWallpaper(path);
+            }
         }
-        else if (installType == "aurorae_themes"
-                 || installType == "metacity_themes"
-                 || installType == "xfwm4_themes") {
-            return applyWindowTheme(path);
-        }*/
     }
+
     return false;
 }
 #endif
 
 #ifdef QTLIB_UNIX
-bool SystemHandler::applyWallpaper(const QString &path) const
+bool SystemHandler::applyKdeWallpaper(const QString &path) const
 {
-    auto desktop = desktopEnvironment();
-
-    if (desktop == "kde") {
-        // plasma5.6+
-        auto message = QDBusMessage::createMethodCall("org.kde.plasmashell", "/PlasmaShell", "org.kde.PlasmaShell", "evaluateScript");
-        QVariantList arguments;
-
-        QString script;
-        QTextStream out(&script);
-        out << "for (var key in desktops()) {"
-            << "var d = desktops()[key];"
-            << "d.wallpaperPlugin = 'org.kde.image';"
-            << "d.currentConfigGroup = ['Wallpaper', 'org.kde.image', 'General'];"
-            << "d.writeConfig('Image', 'file://" + path + "');"
-            << "}";
-
-        arguments << QVariant(script);
-        message.setArguments(arguments);
-
-        auto reply = QDBusConnection::sessionBus().call(message);
-
-        if (reply.type() == QDBusMessage::ErrorMessage) {
-            qWarning() << reply.errorMessage();
-            return false;
-        }
-        return true;
-    }
-    else if (desktop == "gnome") {
-        // gnome3
-        QStringList arguments{"set", "org.gnome.desktop.background", "picture-uri", "file://" + path};
-        return QProcess::startDetached("gsettings", arguments);
-        // gnome2
-        //QStringList arguments{"--type=string", "--set", "/desktop/gnome/background/picture_filename", path};
-        //return QProcess::startDetached("gconftool-2", arguments);
-    }
-    else if (desktop == "xfce") {
-        auto message = QDBusMessage::createMethodCall("org.xfce.Xfconf", "/org/xfce/Xfconf", "org.xfce.Xfconf", "SetProperty");
-        QVariantList arguments;
+    auto message = QDBusMessage::createMethodCall("org.kde.plasmashell", "/PlasmaShell", "org.kde.PlasmaShell", "evaluateScript");
 
-        QString channelValue = "xfce4-desktop";
-        //QString propertyValue = "/backdrop/screen0/monitor0/image-path";
-        QString propertyValue = "/backdrop/screen0/monitor0/workspace0/last-image";
-        QDBusVariant valueValue(path);
+    QString script;
+    QTextStream out(&script);
+    out << "for (var key in desktops()) {"
+        << "var d = desktops()[key];"
+        << "d.wallpaperPlugin = 'org.kde.image';"
+        << "d.currentConfigGroup = ['Wallpaper', 'org.kde.image', 'General'];"
+        << "d.writeConfig('Image', 'file://" + path + "');"
+        << "}";
 
-        arguments << QVariant(channelValue) << QVariant(propertyValue) << QVariant::fromValue(valueValue);
-        message.setArguments(arguments);
+    QVariantList arguments;
+    arguments << QVariant(script);
+    message.setArguments(arguments);
 
-        auto reply = QDBusConnection::sessionBus().call(message);
+    auto reply = QDBusConnection::sessionBus().call(message);
 
-        if (reply.type() == QDBusMessage::ErrorMessage) {
-            qWarning() << reply.errorMessage();
-            return false;
-        }
-        return true;
+    if (reply.type() == QDBusMessage::ErrorMessage) {
+        qWarning() << reply.errorMessage();
+        return false;
     }
-    return false;
+
+    return true;
 }
 
-bool SystemHandler::applyIcon(const QString &path) const
+bool SystemHandler::applyGnomeWallpaper(const QString &path) const
 {
-    auto desktop = desktopEnvironment();
-
-    if (path.endsWith("/")) {
-    }
+    QStringList arguments{"set", "org.gnome.desktop.background", "picture-uri", "file://" + path};
+    return QProcess::startDetached("gsettings", arguments);
+}
 
-    if (desktop == "kde") {
-    }
-    else if (desktop == "gnome") {
-        // gnome3
-        auto themeName = QFileInfo(path).fileName();
-        QStringList arguments{"set", "org.gnome.desktop.interface", "icon-theme", themeName};
-        return QProcess::startDetached("gsettings", arguments);
-    }
-    else if (desktop == "xfce") {
-    }
-    return false;
+bool SystemHandler::applyGnomeIcon(const QString &path) const
+{
+    auto themeName = QFileInfo(path).fileName();
+    QStringList arguments{"set", "org.gnome.desktop.interface", "icon-theme", themeName};
+    return QProcess::startDetached("gsettings", arguments);
 }
 
-bool SystemHandler::applyCursor(const QString &path) const
+bool SystemHandler::applyGnomeCursor(const QString &path) const
 {
-    qDebug() << path;
+    auto themeName = QFileInfo(path).fileName();
+    QStringList arguments{"set", "org.gnome.desktop.interface", "cursor-theme", themeName};
+    return QProcess::startDetached("gsettings", arguments);
+}
 
-    auto desktop = desktopEnvironment();
+bool SystemHandler::applyGnomeGtk3Theme(const QString &path) const
+{
+    auto themeName = QFileInfo(path).fileName();
+    QStringList arguments{"set", "org.gnome.desktop.interface", "gtk-theme", themeName};
+    return QProcess::startDetached("gsettings", arguments);
+}
 
-    if (desktop == "kde") {
-    }
-    else if (desktop == "gnome") {
-    }
-    else if (desktop == "xfce") {
-    }
-    return false;
+bool SystemHandler::applyGnomeGnomeShellTheme(const QString &path) const
+{
+    auto themeName = QFileInfo(path).fileName();
+    QStringList arguments{"set", "org.gnome.shell.extensions.user-theme", "name", themeName};
+    return QProcess::startDetached("gsettings", arguments);
 }
 
-bool SystemHandler::applyWindowTheme(const QString &path) const
+bool SystemHandler::applyXfceWallpaper(const QString &path) const
 {
-    qDebug() << path;
+    auto message = QDBusMessage::createMethodCall("org.xfce.Xfconf", "/org/xfce/Xfconf", "org.xfce.Xfconf", "SetProperty");
 
-    auto desktop = desktopEnvironment();
+    QString channelValue = "xfce4-desktop";
+    //QString propertyValue = "/backdrop/screen0/monitor0/image-path";
+    QString propertyValue = "/backdrop/screen0/monitor0/workspace0/last-image";
+    QDBusVariant valueValue(path);
 
-    if (desktop == "kde") {
-    }
-    else if (desktop == "gnome") {
-    }
-    else if (desktop == "xfce") {
+    QVariantList arguments;
+    arguments << QVariant(channelValue) << QVariant(propertyValue) << QVariant::fromValue(valueValue);
+    message.setArguments(arguments);
+
+    auto reply = QDBusConnection::sessionBus().call(message);
+
+    if (reply.type() == QDBusMessage::ErrorMessage) {
+        qWarning() << reply.errorMessage();
+        return false;
     }
-    return false;
+
+    return true;
 }
 #endif
diff --git a/app/src/handlers/systemhandler.h b/app/src/handlers/systemhandler.h
index b4697833b8a86be062fa31a0dbfe1e7132818153..3ea555e5983718de0a9fae0b17ddc8983d7e39c8 100644
--- a/app/src/handlers/systemhandler.h
+++ b/app/src/handlers/systemhandler.h
@@ -23,9 +23,14 @@ public slots:
 
 private:
 #ifdef QTLIB_UNIX
-    bool applyWallpaper(const QString &path) const;
-    bool applyIcon(const QString &path) const;
-    bool applyCursor(const QString &path) const;
-    bool applyWindowTheme(const QString &path) const;
+    bool applyKdeWallpaper(const QString &path) const;
+
+    bool applyGnomeWallpaper(const QString &path) const;
+    bool applyGnomeIcon(const QString &path) const;
+    bool applyGnomeCursor(const QString &path) const;
+    bool applyGnomeGtk3Theme(const QString &path) const;
+    bool applyGnomeGnomeShellTheme(const QString &path) const;
+
+    bool applyXfceWallpaper(const QString &path) const;
 #endif
 };
diff --git a/app/src/main.cpp b/app/src/main.cpp
index f1df5336d391c7b127974af9c0117fd10a7559d9..36827d1bdac104a676a7fbe926e4387c01158fc2 100644
--- a/app/src/main.cpp
+++ b/app/src/main.cpp
@@ -15,7 +15,7 @@ int main(int argc, char *argv[])
     // Init
     QGuiApplication app(argc, argv); // This is backend program, but need GUI module
 
-    auto *configHandler = new ConfigHandler();
+    auto *configHandler = new ConfigHandler(&app);
     auto appConfigApplication = configHandler->getAppConfigApplication();
 
     app.setApplicationName(appConfigApplication["name"].toString());