diff --git a/applets/kicker/package/contents/ui/ItemGridView.qml b/applets/kicker/package/contents/ui/ItemGridView.qml
index 4b02dedbf..464383c80 100644
--- a/applets/kicker/package/contents/ui/ItemGridView.qml
+++ b/applets/kicker/package/contents/ui/ItemGridView.qml
@@ -1,458 +1,460 @@
 /***************************************************************************
  *   Copyright (C) 2015 by Eike Hein <hein@kde.org>                        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  *   This program is distributed in the hope that it will be useful,       *
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA .        *
  ***************************************************************************/
 
 import QtQuick 2.4
 
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.plasma.extras 2.0 as PlasmaExtras
 import org.kde.kquickcontrolsaddons 2.0
 import org.kde.draganddrop 2.0
 
 FocusScope {
     id: itemGrid
 
     signal keyNavLeft
     signal keyNavRight
     signal keyNavUp
     signal keyNavDown
 
     signal itemActivated(int index, string actionId, string argument)
 
     property bool dragEnabled: true
     property bool dropEnabled: false
     property bool showLabels: true
     property alias usesPlasmaTheme: gridView.usesPlasmaTheme
 
     property alias currentIndex: gridView.currentIndex
     property alias currentItem: gridView.currentItem
     property alias contentItem: gridView.contentItem
     property alias count: gridView.count
     property alias model: gridView.model
 
     property alias cellWidth: gridView.cellWidth
     property alias cellHeight: gridView.cellHeight
     property alias iconSize: gridView.iconSize
 
     property alias horizontalScrollBarPolicy: scrollArea.horizontalScrollBarPolicy
     property alias verticalScrollBarPolicy: scrollArea.verticalScrollBarPolicy
 
     onDropEnabledChanged: {
         if (!dropEnabled && "dropPlaceHolderIndex" in model) {
             model.dropPlaceHolderIndex = -1;
         }
     }
 
     onFocusChanged: {
         if (!focus && !root.keyEventProxy.activeFocus) {
             currentIndex = -1;
         }
     }
 
     function currentRow() {
         if (currentIndex == -1) {
             return -1;
         }
 
         return Math.floor(currentIndex / Math.floor(width / cellWidth));
     }
 
     function currentCol() {
         if (currentIndex == -1) {
             return -1;
         }
 
         return currentIndex - (currentRow() * Math.floor(width / cellWidth));
     }
 
     function lastRow() {
         var columns = Math.floor(width / cellWidth);
         return Math.ceil(count / columns) - 1;
     }
 
     function tryActivate(row, col) {
         if (count) {
             var columns = Math.floor(width / cellWidth);
             var rows = Math.ceil(count / columns);
             row = Math.min(row, rows - 1);
             col = Math.min(col, columns - 1);
             currentIndex = Math.min(row ? ((Math.max(1, row) * columns) + col)
                 : col,
                 count - 1);
 
             focus = true;
         }
     }
 
     function forceLayout() {
         gridView.forceLayout();
     }
 
     ActionMenu {
         id: actionMenu
 
         onActionClicked: {
             visualParent.actionTriggered(actionId, actionArgument);
         }
     }
 
     DropArea {
         id: dropArea
 
         anchors.fill: parent
 
         onDragMove: {
             if (!dropEnabled || gridView.animating || !kicker.dragSource) {
                 return;
             }
 
             var x = Math.max(0, event.x - (width % cellWidth));
             var cPos = mapToItem(gridView.contentItem, x, event.y);
             var item = gridView.itemAt(cPos.x, cPos.y);
 
             if (item) {
                 if (kicker.dragSource.parent == gridView.contentItem) {
                     if (item != kicker.dragSource) {
                         item.GridView.view.model.moveRow(dragSource.itemIndex, item.itemIndex);
                     }
                 } else if (kicker.dragSource.view.model.favoritesModel == model
                     && !model.isFavorite(kicker.dragSource.favoriteId)) {
                     var hasPlaceholder = (model.dropPlaceholderIndex != -1);
 
                     model.dropPlaceholderIndex = item.itemIndex;
 
                     if (!hasPlaceholder) {
                         gridView.currentIndex = (item.itemIndex - 1);
                     }
                 }
             } else if (kicker.dragSource.parent != gridView.contentItem
                 && kicker.dragSource.view.model.favoritesModel == model
                 && !model.isFavorite(kicker.dragSource.favoriteId)) {
                     var hasPlaceholder = (model.dropPlaceholderIndex != -1);
 
                     model.dropPlaceholderIndex = hasPlaceholder ? model.count - 1 : model.count;
 
                     if (!hasPlaceholder) {
                         gridView.currentIndex = (model.count - 1);
                     }
             } else {
                 model.dropPlaceholderIndex = -1;
                 gridView.currentIndex = -1;
             }
         }
 
         onDragLeave: {
             if ("dropPlaceholderIndex" in model) {
                 model.dropPlaceholderIndex = -1;
                 gridView.currentIndex = -1;
             }
         }
 
         onDrop: {
             if (kicker.dragSource && kicker.dragSource.parent != gridView.contentItem && kicker.dragSource.view.model.favoritesModel == model) {
                 model.addFavorite(kicker.dragSource.favoriteId, model.dropPlaceholderIndex);
                 gridView.currentIndex = -1;
             }
         }
 
         Timer {
             id: resetAnimationDurationTimer
 
             interval: 120
             repeat: false
 
             onTriggered: {
                 gridView.animationDuration = interval - 20;
             }
         }
 
         PlasmaExtras.ScrollArea {
             id: scrollArea
 
             anchors.fill: parent
 
             focus: true
 
             horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
 
             GridView {
                 id: gridView
 
                 property bool usesPlasmaTheme: false
 
                 property int iconSize: units.iconSizes.huge
 
                 property bool animating: false
                 property int animationDuration: dropEnabled ? resetAnimationDurationTimer.interval : 0
 
                 focus: true
 
                 currentIndex: -1
 
                 move: Transition {
                     enabled: itemGrid.dropEnabled
 
                     SequentialAnimation {
                         PropertyAction { target: gridView; property: "animating"; value: true }
 
                         NumberAnimation {
                             duration: gridView.animationDuration
                             properties: "x, y"
                             easing.type: Easing.OutQuad
                         }
 
                         PropertyAction { target: gridView; property: "animating"; value: false }
                     }
                 }
 
                 moveDisplaced: Transition {
                     enabled: itemGrid.dropEnabled
 
                     SequentialAnimation {
                         PropertyAction { target: gridView; property: "animating"; value: true }
 
                         NumberAnimation {
                             duration: gridView.animationDuration
                             properties: "x, y"
                             easing.type: Easing.OutQuad
                         }
 
                         PropertyAction { target: gridView; property: "animating"; value: false }
                     }
                 }
 
                 keyNavigationWraps: false
                 boundsBehavior: Flickable.StopAtBounds
 
                 delegate: ItemGridDelegate {
                     showLabel: showLabels
                 }
 
                 highlight: Item {
                     property bool isDropPlaceHolder: "dropPlaceholderIndex" in model && currentIndex == model.dropPlaceholderIndex
 
                     PlasmaComponents.Highlight {
                         visible: gridView.currentItem && !isDropPlaceHolder
 
                         anchors.fill: parent
                     }
 
                     PlasmaCore.FrameSvgItem {
                         visible: gridView.currentItem && isDropPlaceHolder
 
                         anchors.fill: parent
 
                         imagePath: "widgets/viewitem"
                         prefix: "selected"
 
                         opacity: 0.5
 
                         PlasmaCore.IconItem {
                             anchors {
                                 right: parent.right
                                 rightMargin: parent.margins.right
                                 bottom: parent.bottom
                                 bottomMargin: parent.margins.bottom
                             }
 
                             width: units.iconSizes.smallMedium
                             height: width
 
                             source: "list-add"
                             active: false
                         }
                     }
                 }
 
                 highlightFollowsCurrentItem: true
                 highlightMoveDuration: 0
 
                 onCurrentIndexChanged: {
                     if (currentIndex != -1) {
                         focus = true;
                     }
                 }
 
                 onCountChanged: {
                     animationDuration = 0;
                     resetAnimationDurationTimer.start();
                 }
 
                 onModelChanged: {
                     currentIndex = -1;
                 }
 
                 Keys.onLeftPressed: {
                     if (currentCol() != 0) {
                         event.accepted = true;
                         moveCurrentIndexLeft();
                     } else {
                         itemGrid.keyNavLeft();
                     }
                 }
 
                 Keys.onRightPressed: {
                     var columns = Math.floor(width / cellWidth);
 
                     if (currentCol() != columns - 1 && currentIndex != count -1) {
                         event.accepted = true;
                         moveCurrentIndexRight();
                     } else {
                         itemGrid.keyNavRight();
                     }
                 }
 
                 Keys.onUpPressed: {
                     if (currentRow() != 0) {
                         event.accepted = true;
                         moveCurrentIndexUp();
                         positionViewAtIndex(currentIndex, GridView.Contain);
                     } else {
                         itemGrid.keyNavUp();
                     }
                 }
 
                 Keys.onDownPressed: {
                     if (currentRow() < itemGrid.lastRow()) {
                         // Fix moveCurrentIndexDown()'s lack of proper spatial nav down
                         // into partial columns.
                         event.accepted = true;
                         var columns = Math.floor(width / cellWidth);
                         var newIndex = currentIndex + columns;
                         currentIndex = Math.min(newIndex, count - 1);
                         positionViewAtIndex(currentIndex, GridView.Contain);
                     } else {
                         itemGrid.keyNavDown();
                     }
                 }
             }
         }
 
         MouseArea {
             id: hoverArea
 
             anchors.fill: parent
 
             property int pressX: -1
             property int pressY: -1
             property int lastX: -1
             property int lastY: -1
             property Item pressedItem: null
 
             acceptedButtons: Qt.LeftButton | Qt.RightButton
 
             hoverEnabled: true
 
             function updatePositionProperties(x, y) {
                 // Prevent hover event synthesis in QQuickWindow interfering
                 // with keyboard navigation by ignoring repeated events with
                 // identical coordinates. As the work done here would be re-
                 // dundant in any case, these are safe to ignore.
                 if (lastX == x && lastY == y) {
                     return;
                 }
 
                 lastX = x;
                 lastY = y;
 
                 var cPos = mapToItem(gridView.contentItem, x, y);
                 var item = gridView.itemAt(cPos.x, cPos.y);
 
                 if (!item) {
                     gridView.currentIndex = -1;
                     pressedItem = null;
                 } else {
                     gridView.currentIndex = item.itemIndex;
                     itemGrid.focus = (currentIndex != -1)
                 }
+
+                return item;
             }
 
             onPressed: {
                 mouse.accepted = true;
 
                 updatePositionProperties(mouse.x, mouse.y);
 
                 pressX = mouse.x;
                 pressY = mouse.y;
 
                 if (mouse.button == Qt.RightButton) {
                     if (gridView.currentItem) {
                         if (gridView.currentItem.hasActionList) {
                             var mapped = mapToItem(gridView.currentItem, mouse.x, mouse.y);
                             gridView.currentItem.openActionMenu(mapped.x, mapped.y);
                         }
                     } else {
                         var mapped = mapToItem(rootItem, mouse.x, mouse.y);
                         contextMenu.open(mapped.x, mapped.y);
                     }
                 } else {
                     pressedItem = gridView.currentItem;
                 }
             }
 
             onReleased: {
                 mouse.accepted = true;
 
                 if (gridView.currentItem && gridView.currentItem == pressedItem) {
                     if ("trigger" in gridView.model) {
                         gridView.model.trigger(pressedItem.itemIndex, "", null);
                         root.toggle();
                     }
 
                     itemGrid.itemActivated(pressedItem.itemIndex, "", null);
                 } else if (!pressedItem && mouse.button == Qt.LeftButton) {
                     root.toggle();
                 }
 
                 pressX = -1;
                 pressY = -1;
                 pressedItem = null;
             }
 
             onPositionChanged: {
-                updatePositionProperties(mouse.x, mouse.y);
+                var item = updatePositionProperties(mouse.x, mouse.y);
 
                 if (gridView.currentIndex != -1) {
                     if (dragEnabled && pressX != -1 && dragHelper.isDrag(pressX, pressY, mouse.x, mouse.y)) {
                         if ("pluginName" in item.m) {
                             dragHelper.startDrag(kicker, item.url, item.icon,
                             "text/x-plasmoidservicename", item.m.pluginName);
                         } else {
                             dragHelper.startDrag(kicker, item.url, item.icon);
                         }
 
                         kicker.dragSource = item;
 
                         pressX = -1;
                         pressY = -1;
                     }
                 }
             }
 
             onContainsMouseChanged: {
                 if (!containsMouse) {
                     gridView.currentIndex = -1;
                     pressX = -1;
                     pressY = -1;
                     pressedItem = null;
                 }
             }
         }
     }
 }
diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
index ced4f838d..1b1f8cddd 100644
--- a/kcms/lookandfeel/kcm.cpp
+++ b/kcms/lookandfeel/kcm.cpp
@@ -1,819 +1,819 @@
 /* This file is part of the KDE Project
    Copyright (c) 2014 Marco Martin <mart@kde.org>
    Copyright (c) 2014 Vishesh Handa <me@vhanda.in>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #include "kcm.h"
 #include "../krdb/krdb.h"
 #include "../cursortheme/xcursor/xcursortheme.h"
 #include "config-kcm.h"
 #include "config-workspace.h"
 #include <klauncher_iface.h>
 
 #include <KPluginFactory>
 #include <KPluginLoader>
 #include <KAboutData>
 #include <KSharedConfig>
 #include <QDebug>
 #include <QStandardPaths>
 #include <QProcess>
 #include <QQuickWidget>
 #include <QQuickView>
 #include <KGlobalSettings>
 #include <KIconLoader>
 #include <KAutostart>
 #include <KRun>
 
 #include <QVBoxLayout>
 #include <QPushButton>
 #include <QMessageBox>
 #include <QQmlEngine>
 #include <QQmlContext>
 #include <QStandardItemModel>
 #include <QX11Info>
 
 #include <KLocalizedString>
 #include <Plasma/PluginLoader>
 
 #include <X11/Xlib.h>
 #include <X11/Xcursor/Xcursor.h>
 
 #ifdef HAVE_XFIXES
 #  include <X11/extensions/Xfixes.h>
 #endif
 
 #ifndef DEFINE_NO_PLUGIN
 K_PLUGIN_FACTORY_WITH_JSON(KCMLookandFeelFactory, "kcm_lookandfeel.json", registerPlugin<KCMLookandFeel>();)
 #endif
 
 KCMLookandFeel::KCMLookandFeel(QObject* parent, const QVariantList& args)
     : KQuickAddons::ConfigModule(parent, args)
     , m_config(QStringLiteral("kdeglobals"))
     , m_configGroup(m_config.group("KDE"))
     , m_applyColors(true)
     , m_applyWidgetStyle(true)
     , m_applyIcons(true)
     , m_applyPlasmaTheme(true)
     , m_applyCursors(true)
     , m_applyWindowSwitcher(true)
     , m_applyDesktopSwitcher(true)
     , m_resetDefaultLayout(false)
     , m_applyWindowDecoration(true)
 {
     //This flag seems to be needed in order for QQuickWidget to work
     //see https://bugreports.qt-project.org/browse/QTBUG-40765
     //also, it seems to work only if set in the kcm, not in the systemsettings' main
     qApp->setAttribute(Qt::AA_DontCreateNativeWidgetSiblings);
     qmlRegisterType<QStandardItemModel>();
     qmlRegisterType<KCMLookandFeel>();
     KAboutData* about = new KAboutData(QStringLiteral("kcm_lookandfeel"), i18n("Configure Look and Feel details"),
                                        QStringLiteral("0.1"), QString(), KAboutLicense::LGPL);
     about->addAuthor(i18n("Marco Martin"), QString(), QStringLiteral("mart@kde.org"));
     setAboutData(about);
     setButtons(Apply | Default);
 
     m_model = new QStandardItemModel(this);
     QHash<int, QByteArray> roles = m_model->roleNames();
     roles[PluginNameRole] = "pluginName";
     roles[ScreenhotRole] = "screenshot";
     roles[FullScreenPreviewRole] = "fullScreenPreview";
     roles[HasSplashRole] = "hasSplash";
     roles[HasLockScreenRole] = "hasLockScreen";
     roles[HasRunCommandRole] = "hasRunCommand";
     roles[HasLogoutRole] = "hasLogout";
 
     roles[HasColorsRole] = "hasColors";
     roles[HasWidgetStyleRole] = "hasWidgetStyle";
     roles[HasIconsRole] = "hasIcons";
     roles[HasPlasmaThemeRole] = "hasPlasmaTheme";
     roles[HasCursorsRole] = "hasCursors";
     roles[HasWindowSwitcherRole] = "hasWindowSwitcher";
     roles[HasDesktopSwitcherRole] = "hasDesktopSwitcher";
     m_model->setItemRoleNames(roles);
 }
 
 KCMLookandFeel::~KCMLookandFeel()
 {
 }
 
 void KCMLookandFeel::getNewStuff()
 {
     if (!m_newStuffDialog) {
         m_newStuffDialog = new KNS3::DownloadDialog( QLatin1String("lookandfeel.knsrc") );
         m_newStuffDialog.data()->setWindowTitle(i18n("Download New Look And Feel Packages"));
         connect(m_newStuffDialog.data(), &KNS3::DownloadDialog::accepted, this,  &KCMLookandFeel::load);
     }
     m_newStuffDialog.data()->show();
 }
 
 QStandardItemModel *KCMLookandFeel::lookAndFeelModel()
 {
     return m_model;
 }
 
 QString KCMLookandFeel::selectedPlugin() const
 {
     return m_selectedPlugin;
 }
 
 void KCMLookandFeel::setSelectedPlugin(const QString &plugin)
 {
     if (m_selectedPlugin == plugin) {
         return;
     }
 
     const bool firstTime = m_selectedPlugin.isNull();
     m_selectedPlugin = plugin;
     emit selectedPluginChanged();
     emit selectedPluginIndexChanged();
 
     if (!firstTime) {
         setNeedsSave(true);
     }
 }
 
 int KCMLookandFeel::selectedPluginIndex() const
 {
     for (int i = 0; i < m_model->rowCount(); ++i) {
         if (m_model->data(m_model->index(i, 0), PluginNameRole).toString() == m_selectedPlugin) {
             return i;
         }
     }
     return -1;
 }
 
 QList<Plasma::Package> KCMLookandFeel::availablePackages(const QString &component)
 {
     QList<Plasma::Package> packages;
     QStringList paths;
     const QStringList dataPaths = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
 
     paths.reserve(dataPaths.count());
     for (const QString &path : dataPaths) {
         QDir dir(path + QStringLiteral("/plasma/look-and-feel"));
         paths << dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot);
     }
 
     for (const QString &path : paths) {
         Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
         pkg.setPath(path);
         pkg.setFallbackPackage(Plasma::Package());
         if (component.isEmpty() || !pkg.filePath(component.toUtf8()).isEmpty()) {
             packages << pkg;
         }
     }
 
     return packages;
 }
 
 void KCMLookandFeel::load()
 {
     m_package = Plasma::PluginLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
     KConfigGroup cg(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "KDE");
     const QString packageName = cg.readEntry("LookAndFeelPackage", QString());
     if (!packageName.isEmpty()) {
         m_package.setPath(packageName);
     }
 
     if (!m_package.metadata().isValid()) {
         return;
     }
 
     setSelectedPlugin(m_package.metadata().pluginName());
 
     m_model->clear();
 
     const QList<Plasma::Package> pkgs = availablePackages();
     for (const Plasma::Package &pkg : pkgs) {
         if (!pkg.metadata().isValid()) {
             continue;
         }
         QStandardItem* row = new QStandardItem(pkg.metadata().name());
         row->setData(pkg.metadata().pluginName(), PluginNameRole);
         row->setData(pkg.filePath("preview"), ScreenhotRole);
         row->setData(pkg.filePath("fullscreenpreview"), FullScreenPreviewRole);
 
         //What the package provides
         row->setData(!pkg.filePath("splashmainscript").isEmpty(), HasSplashRole);
         row->setData(!pkg.filePath("lockscreenmainscript").isEmpty(), HasLockScreenRole);
         row->setData(!pkg.filePath("runcommandmainscript").isEmpty(), HasRunCommandRole);
         row->setData(!pkg.filePath("logoutmainscript").isEmpty(), HasLogoutRole);
 
         if (!pkg.filePath("defaults").isEmpty()) {
             KSharedConfigPtr conf = KSharedConfig::openConfig(pkg.filePath("defaults"));
             KConfigGroup cg(conf, "kdeglobals");
             cg = KConfigGroup(&cg, "General");
             bool hasColors = !cg.readEntry("ColorScheme", QString()).isEmpty();
             if (!hasColors) {
                 hasColors = !pkg.filePath("colors").isEmpty();
             }
             row->setData(hasColors, HasColorsRole);
             cg = KConfigGroup(&cg, "KDE");
             row->setData(!cg.readEntry("widgetStyle", QString()).isEmpty(), HasWidgetStyleRole);
             cg = KConfigGroup(conf, "kdeglobals");
             cg = KConfigGroup(&cg, "Icons");
             row->setData(!cg.readEntry("Theme", QString()).isEmpty(), HasIconsRole);
 
             cg = KConfigGroup(conf, "kdeglobals");
             cg = KConfigGroup(&cg, "Theme");
             row->setData(!cg.readEntry("name", QString()).isEmpty(), HasPlasmaThemeRole);
 
             cg = KConfigGroup(conf, "kcminputrc");
             cg = KConfigGroup(&cg, "Mouse");
             row->setData(!cg.readEntry("cursorTheme", QString()).isEmpty(), HasCursorsRole);
 
             cg = KConfigGroup(conf, "kwinrc");
             cg = KConfigGroup(&cg, "WindowSwitcher");
             row->setData(!cg.readEntry("LayoutName", QString()).isEmpty(), HasWindowSwitcherRole);
 
             cg = KConfigGroup(conf, "kwinrc");
             cg = KConfigGroup(&cg, "DesktopSwitcher");
             row->setData(!cg.readEntry("LayoutName", QString()).isEmpty(), HasDesktopSwitcherRole);
         }
 
         m_model->appendRow(row);
     }
     setNeedsSave(false);
 }
 
 
 void KCMLookandFeel::save()
 {
     Plasma::Package package = Plasma::PluginLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
     package.setPath(m_selectedPlugin);
 
     if (!package.isValid()) {
         return;
     }
 
     m_configGroup.writeEntry("LookAndFeelPackage", m_selectedPlugin);
 
     if (m_resetDefaultLayout) {
         QDBusMessage message = QDBusMessage::createMethodCall(QStringLiteral("org.kde.plasmashell"), QStringLiteral("/PlasmaShell"),
                                                    QStringLiteral("org.kde.PlasmaShell"), QStringLiteral("loadLookAndFeelDefaultLayout"));
 
         QList<QVariant> args;
         args << m_selectedPlugin;
         message.setArguments(args);
 
         QDBusConnection::sessionBus().call(message, QDBus::NoBlock);
     }
 
     if (!package.filePath("defaults").isEmpty()) {
         KSharedConfigPtr conf = KSharedConfig::openConfig(package.filePath("defaults"));
         KConfigGroup cg(conf, "kdeglobals");
         cg = KConfigGroup(&cg, "KDE");
         if (m_applyWidgetStyle) {
             setWidgetStyle(cg.readEntry("widgetStyle", QString()));
         }
 
         if (m_applyColors) {
             QString colorsFile = package.filePath("colors");
             KConfigGroup cg(conf, "kdeglobals");
             cg = KConfigGroup(&cg, "General");
             QString colorScheme = cg.readEntry("ColorScheme", QString());
 
             if (!colorsFile.isEmpty()) {
                 if (!colorScheme.isEmpty()) {
                     setColors(colorScheme, colorsFile);
                 } else {
                     setColors(package.metadata().name(), colorsFile);
                 }
             } else if (!colorScheme.isEmpty()) {
                 colorScheme.remove('\''); // So Foo's does not become FooS
                 QRegExp fixer(QStringLiteral("[\\W,.-]+(.?)"));
                 int offset;
                 while ((offset = fixer.indexIn(colorScheme)) >= 0) {
                     colorScheme.replace(offset, fixer.matchedLength(), fixer.cap(1).toUpper());
                 }
                 colorScheme.replace(0, 1, colorScheme.at(0).toUpper());
 
                 //NOTE: why this loop trough all the scheme files?
                 //the scheme theme name is an heuristic, there is no plugin metadata whatsoever.
                 //is based on the file name stripped from weird characters or the
                 //eventual id- prefix store.kde.org puts, so we can just find a
                 //theme that ends as the specified name
                 bool schemeFound = false;
                 const QStringList schemeDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("color-schemes"), QStandardPaths::LocateDirectory);
                 for (const QString &dir : schemeDirs) {
                     const QStringList fileNames = QDir(dir).entryList(QStringList()<<QStringLiteral("*.colors"));
                     for (const QString &file : fileNames) {
                         if (file.endsWith(colorScheme + QStringLiteral(".colors"))) {
                             setColors(colorScheme, dir + QLatin1Char('/') + file);
                             schemeFound = true;
                             break;
                         }
                     }
                     if (schemeFound) {
                         break;
                     }
                 }
             }
         }
 
         if (m_applyIcons) {
             cg = KConfigGroup(conf, "kdeglobals");
             cg = KConfigGroup(&cg, "Icons");
             setIcons(cg.readEntry("Theme", QString()));
         }
 
         if (m_applyPlasmaTheme) {
             cg = KConfigGroup(conf, "plasmarc");
             cg = KConfigGroup(&cg, "Theme");
             setPlasmaTheme(cg.readEntry("name", QString()));
         }
 
         if (m_applyCursors) {
             cg = KConfigGroup(conf, "kcminputrc");
             cg = KConfigGroup(&cg, "Mouse");
             setCursorTheme(cg.readEntry("cursorTheme", QString()));
         }
 
         if (m_applyWindowSwitcher) {
             cg = KConfigGroup(conf, "kwinrc");
             cg = KConfigGroup(&cg, "WindowSwitcher");
             setWindowSwitcher(cg.readEntry("LayoutName", QString()));
         }
 
         if (m_applyDesktopSwitcher) {
             cg = KConfigGroup(conf, "kwinrc");
             cg = KConfigGroup(&cg, "DesktopSwitcher");
             setDesktopSwitcher(cg.readEntry("LayoutName", QString()));
         }
 
         if (m_applyWindowDecoration) {
             cg = KConfigGroup(conf, "kwinrc");
             cg = KConfigGroup(&cg, "org.kde.kdecoration2");
 #ifdef HAVE_BREEZE_DECO
             setWindowDecoration(cg.readEntry("library", QStringLiteral(BREEZE_KDECORATION_PLUGIN_ID)), cg.readEntry("theme", QString()));
 #else
             setWindowDecoration(cg.readEntry("library", QStringLiteral("org.kde.kwin.aurorae")), cg.readEntry("theme", QString()));
 #endif
         }
 
         // Reload KWin if something changed, but only once.
         if (m_applyWindowSwitcher || m_applyDesktopSwitcher || m_applyWindowDecoration) {
             QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KWin"),
                                                     QStringLiteral("org.kde.KWin"),
                                                     QStringLiteral("reloadConfig"));
             QDBusConnection::sessionBus().send(message);
         }
 
         //autostart
         if (m_resetDefaultLayout) {
             //remove all the old package to autostart
             {
                 KSharedConfigPtr oldConf = KSharedConfig::openConfig(m_package.filePath("defaults"));
                 cg = KConfigGroup(oldConf, QStringLiteral("Autostart"));
                 const QStringList autostartServices = cg.readEntry("Services", QStringList());
 
                 if (qEnvironmentVariableIsSet("KDE_FULL_SESSION")) {
                     for (const QString &serviceFile : autostartServices) {
                         KService service(serviceFile + QStringLiteral(".desktop"));
                         KAutostart as(serviceFile);
                         as.setAutostarts(false);
                         //FIXME: quite ugly way to stop things, and what about non KDE things?
                         QProcess::startDetached(QStringLiteral("kquitapp5"), {QStringLiteral("--service"), service.property(QStringLiteral("X-DBUS-ServiceName")).toString()});
                     }
                 }
             }
             //Set all the stuff in the new lnf to autostart
             {
                 cg = KConfigGroup(conf, QStringLiteral("Autostart"));
                 const QStringList autostartServices = cg.readEntry("Services", QStringList());
 
                 for (const QString &serviceFile : autostartServices) {
                     KService service(serviceFile + QStringLiteral(".desktop"));
                     KAutostart as(serviceFile);
                     as.setCommand(service.exec());
                     as.setAutostarts(true);
                     if (qEnvironmentVariableIsSet("KDE_FULL_SESSION")) {
                         KRun::runApplication(service, {}, nullptr);
                     }
                 }
             }
         }
     }
 
     //TODO: option to enable/disable apply? they don't seem required by UI design
     setSplashScreen(m_selectedPlugin);
     setLockScreen(m_selectedPlugin);
 
     m_configGroup.sync();
     runRdb(KRdbExportQtColors | KRdbExportGtkTheme | KRdbExportColors | KRdbExportQtSettings | KRdbExportXftSettings);
 }
 
 void KCMLookandFeel::defaults()
 {
     if (!m_package.metadata().isValid()) {
         return;
     }
 
     setSelectedPlugin(m_package.metadata().pluginName());
 }
 
 void KCMLookandFeel::setWidgetStyle(const QString &style)
 {
     if (style.isEmpty()) {
         return;
     }
 
     m_configGroup.writeEntry("widgetStyle", style);
     m_configGroup.sync();
     //FIXME: changing style on the fly breaks QQuickWidgets
     KGlobalSettings::self()->emitChange(KGlobalSettings::StyleChanged);
 }
 
 void KCMLookandFeel::setColors(const QString &scheme, const QString &colorFile)
 {
     if (scheme.isEmpty() && colorFile.isEmpty()) {
         return;
     }
     KConfigGroup configGroup(&m_config, "General");
     configGroup.writeEntry("ColorScheme", scheme);
 
-    KSharedConfigPtr conf = KSharedConfig::openConfig(colorFile);
+    KSharedConfigPtr conf = KSharedConfig::openConfig(colorFile, KSharedConfig::CascadeConfig);
     foreach (const QString &grp, conf->groupList()) {
         KConfigGroup cg(conf, grp);
         KConfigGroup cg2(&m_config, grp);
         cg.copyTo(&cg2);
     }
 
     configGroup.sync();
     KGlobalSettings::self()->emitChange(KGlobalSettings::PaletteChanged);
 }
 
 void KCMLookandFeel::setIcons(const QString &theme)
 {
     if (theme.isEmpty()) {
         return;
     }
 
     KConfigGroup cg(&m_config, "Icons");
     cg.writeEntry("Theme", theme);
     cg.sync();
 
     for (int i=0; i < KIconLoader::LastGroup; i++) {
         KIconLoader::emitChange(KIconLoader::Group(i));
     }
 }
 
 void KCMLookandFeel::setPlasmaTheme(const QString &theme)
 {
     if (theme.isEmpty()) {
         return;
     }
 
     KConfig config(QStringLiteral("plasmarc"));
     KConfigGroup cg(&config, "Theme");
     cg.writeEntry("name", theme);
     cg.sync();
 }
 
 void KCMLookandFeel::setCursorTheme(const QString themeName)
 {
     //TODO: use pieces of cursor kcm when moved to plasma-desktop
     if (themeName.isEmpty()) {
         return;
     }
 
     KConfig config(QStringLiteral("kcminputrc"));
     KConfigGroup cg(&config, "Mouse");
     cg.writeEntry("cursorTheme", themeName);
     cg.sync();
 
     // Require the Xcursor version that shipped with X11R6.9 or greater, since
     // in previous versions the Xfixes code wasn't enabled due to a bug in the
     // build system (freedesktop bug #975).
 #if HAVE_XFIXES && XFIXES_MAJOR >= 2 && XCURSOR_LIB_VERSION >= 10105
     const int cursorSize = cg.readEntry("cursorSize", 0);
 
     QDir themeDir = cursorThemeDir(themeName, 0);
 
     if (!themeDir.exists()) {
         return;
     }
 
     XCursorTheme theme(themeDir);
 
     if (!CursorTheme::haveXfixes()) {
         return;
     }
 
     // Set up the proper launch environment for newly started apps
     OrgKdeKLauncherInterface klauncher(QStringLiteral("org.kde.klauncher5"),
                                        QStringLiteral("/KLauncher"),
                                        QDBusConnection::sessionBus());
     klauncher.setLaunchEnv(QStringLiteral("XCURSOR_THEME"), themeName);
 
     // Update the Xcursor X resources
     runRdb(0);
 
     // Notify all applications that the cursor theme has changed
     KGlobalSettings::self()->emitChange(KGlobalSettings::CursorChanged);
 
     // Reload the standard cursors
     QStringList names;
 
     // Qt cursors
     names << QStringLiteral("left_ptr")       << QStringLiteral("up_arrow")      << QStringLiteral("cross")      << QStringLiteral("wait")
           << QStringLiteral("left_ptr_watch") << QStringLiteral("ibeam")         << QStringLiteral("size_ver")   << QStringLiteral("size_hor")
           << QStringLiteral("size_bdiag")     << QStringLiteral("size_fdiag")    << QStringLiteral("size_all")   << QStringLiteral("split_v")
           << QStringLiteral("split_h")        << QStringLiteral("pointing_hand") << QStringLiteral("openhand")
           << QStringLiteral("closedhand")     << QStringLiteral("forbidden")     << QStringLiteral("whats_this") << QStringLiteral("copy") << QStringLiteral("move") << QStringLiteral("link");
 
     // X core cursors
     names << QStringLiteral("X_cursor")            << QStringLiteral("right_ptr")           << QStringLiteral("hand1")
           << QStringLiteral("hand2")               << QStringLiteral("watch")               << QStringLiteral("xterm")
           << QStringLiteral("crosshair")           << QStringLiteral("left_ptr_watch")      << QStringLiteral("center_ptr")
           << QStringLiteral("sb_h_double_arrow")   << QStringLiteral("sb_v_double_arrow")   << QStringLiteral("fleur")
           << QStringLiteral("top_left_corner")     << QStringLiteral("top_side")            << QStringLiteral("top_right_corner")
           << QStringLiteral("right_side")          << QStringLiteral("bottom_right_corner") << QStringLiteral("bottom_side")
           << QStringLiteral("bottom_left_corner")  << QStringLiteral("left_side")           << QStringLiteral("question_arrow")
           << QStringLiteral("pirate");
 
     foreach (const QString &name, names) {
         XFixesChangeCursorByName(QX11Info::display(), theme.loadCursor(name, cursorSize), QFile::encodeName(name));
     }
 
 #else
     KMessageBox::information(this,
                                  i18n("You have to restart the Plasma session for these changes to take effect."),
                                  i18n("Cursor Settings Changed"), "CursorSettingsChanged");
 #endif
 }
 
 QDir KCMLookandFeel::cursorThemeDir(const QString &theme, const int depth)
 {
     // Prevent infinite recursion
     if (depth > 10) {
         return QDir();
     }
 
     // Search each icon theme directory for 'theme'
     foreach (const QString &baseDir, cursorSearchPaths()) {
         QDir dir(baseDir);
         if (!dir.exists() || !dir.cd(theme)) {
             continue;
         }
 
         // If there's a cursors subdir, we'll assume this is a cursor theme
         if (dir.exists(QStringLiteral("cursors"))) {
             return dir;
         }
 
         // If the theme doesn't have an index.theme file, it can't inherit any themes.
         if (!dir.exists(QStringLiteral("index.theme"))) {
             continue;
         }
 
         // Open the index.theme file, so we can get the list of inherited themes
         KConfig config(dir.path() + "/index.theme", KConfig::NoGlobals);
         KConfigGroup cg(&config, "Icon Theme");
 
         // Recurse through the list of inherited themes, to check if one of them
         // is a cursor theme.
         QStringList inherits = cg.readEntry("Inherits", QStringList());
         foreach (const QString &inherit, inherits) {
             // Avoid possible DoS
             if (inherit == theme) {
                 continue;
             }
 
             if (cursorThemeDir(inherit, depth + 1).exists()) {
                 return dir;
             }
         }
     }
 
     return QDir();
 }
 
 const QStringList KCMLookandFeel::cursorSearchPaths()
 {
     if (!m_cursorSearchPaths.isEmpty())
         return m_cursorSearchPaths;
 
 #if XCURSOR_LIB_MAJOR == 1 && XCURSOR_LIB_MINOR < 1
     // These are the default paths Xcursor will scan for cursor themes
     QString path("~/.icons:/usr/share/icons:/usr/share/pixmaps:/usr/X11R6/lib/X11/icons");
 
     // If XCURSOR_PATH is set, use that instead of the default path
     char *xcursorPath = std::getenv("XCURSOR_PATH");
     if (xcursorPath)
         path = xcursorPath;
 #else
     // Get the search path from Xcursor
     QString path = XcursorLibraryPath();
 #endif
 
     // Separate the paths
     m_cursorSearchPaths = path.split(QLatin1Char(':'), QString::SkipEmptyParts);
 
     // Remove duplicates
     QMutableStringListIterator i(m_cursorSearchPaths);
     while (i.hasNext())
     {
         const QString path = i.next();
         QMutableStringListIterator j(i);
         while (j.hasNext())
             if (j.next() == path)
                 j.remove();
     }
 
     // Expand all occurrences of ~/ to the home dir
     m_cursorSearchPaths.replaceInStrings(QRegExp(QStringLiteral("^~\\/")), QDir::home().path() + QLatin1Char('/'));
     return m_cursorSearchPaths;
 }
 
 void KCMLookandFeel::setSplashScreen(const QString &theme)
 {
     if (theme.isEmpty()) {
         return;
     }
 
     KConfig config(QStringLiteral("ksplashrc"));
     KConfigGroup cg(&config, "KSplash");
     cg.writeEntry("Theme", theme);
     //TODO: a way to set none as spash in the l&f
     cg.writeEntry("Engine", "KSplashQML");
     cg.sync();
 }
 
 void KCMLookandFeel::setLockScreen(const QString &theme)
 {
     if (theme.isEmpty()) {
         return;
     }
 
     KConfig config(QStringLiteral("kscreenlockerrc"));
     KConfigGroup cg(&config, "Greeter");
     cg.writeEntry("Theme", theme);
     cg.sync();
 }
 
 void KCMLookandFeel::setWindowSwitcher(const QString &theme)
 {
     if (theme.isEmpty()) {
         return;
     }
 
     KConfig config(QStringLiteral("kwinrc"));
     KConfigGroup cg(&config, "TabBox");
     cg.writeEntry("LayoutName", theme);
     cg.sync();
 }
 
 void KCMLookandFeel::setDesktopSwitcher(const QString &theme)
 {
     if (theme.isEmpty()) {
         return;
     }
 
     KConfig config(QStringLiteral("kwinrc"));
     KConfigGroup cg(&config, "TabBox");
     cg.writeEntry("DesktopLayout", theme);
     cg.writeEntry("DesktopListLayout", theme);
     cg.sync();
 }
 
 void KCMLookandFeel::setWindowDecoration(const QString &library, const QString &theme)
 {
     if (library.isEmpty()) {
         return;
     }
 
     KConfig config(QStringLiteral("kwinrc"));
     KConfigGroup cg(&config, "org.kde.kdecoration2");
     cg.writeEntry("library", library);
     cg.writeEntry("theme", theme);
     
     cg.sync();
     // Reload KWin.
     QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/KWin"),
                                                       QStringLiteral("org.kde.KWin"),
                                                       QStringLiteral("reloadConfig"));
     QDBusConnection::sessionBus().send(message);
 }
 
 void KCMLookandFeel::setApplyColors(bool apply)
 {
     if (m_applyColors == apply) {
         return;
     }
 
     m_applyColors = apply;
     emit applyColorsChanged();
 }
 
 bool KCMLookandFeel::applyColors() const
 {
     return m_applyColors;
 }
 
 void KCMLookandFeel::setApplyWidgetStyle(bool apply)
 {
     if (m_applyWidgetStyle == apply) {
         return;
     }
 
     m_applyWidgetStyle = apply;
     emit applyWidgetStyleChanged();
 }
 
 bool KCMLookandFeel::applyWidgetStyle() const
 {
     return m_applyWidgetStyle;
 }
 
 void KCMLookandFeel::setApplyIcons(bool apply)
 {
     if (m_applyIcons == apply) {
         return;
     }
 
     m_applyIcons = apply;
     emit applyIconsChanged();
 }
 
 bool KCMLookandFeel::applyIcons() const
 {
     return m_applyIcons;
 }
 
 void KCMLookandFeel::setApplyPlasmaTheme(bool apply)
 {
     if (m_applyPlasmaTheme == apply) {
         return;
     }
 
     m_applyPlasmaTheme = apply;
     emit applyPlasmaThemeChanged();
 }
 
 bool KCMLookandFeel::applyPlasmaTheme() const
 {
     return m_applyPlasmaTheme;
 }
 
 void KCMLookandFeel::setApplyWindowSwitcher(bool apply)
 {
     if (m_applyWindowSwitcher == apply) {
         return;
     }
     m_applyWindowSwitcher = apply;
     emit applyWindowSwitcherChanged();
 }
 
 bool KCMLookandFeel::applyWindowSwitcher() const
 {
     return m_applyWindowSwitcher;
 }
 
 void KCMLookandFeel::setApplyDesktopSwitcher(bool apply)
 {
     if (m_applyDesktopSwitcher == apply) {
         return;
     }
     m_applyDesktopSwitcher = apply;
     emit applyDesktopSwitcherChanged();
 }
 
 bool KCMLookandFeel::applyDesktopSwitcher() const
 {
     return m_applyDesktopSwitcher;
 }
 
 void KCMLookandFeel::setResetDefaultLayout(bool reset)
 {
     if (m_resetDefaultLayout == reset) {
         return;
     }
     m_resetDefaultLayout = reset;
     emit resetDefaultLayoutChanged();
     if (reset) {
         setNeedsSave(true);
     }
 }
 
 bool KCMLookandFeel::resetDefaultLayout() const
 {
     return m_resetDefaultLayout;
 }
 
 
 #include "kcm.moc"