diff --git a/kcms/lookandfeel/autotests/kcmtest.cpp b/kcms/lookandfeel/autotests/kcmtest.cpp
--- a/kcms/lookandfeel/autotests/kcmtest.cpp
+++ b/kcms/lookandfeel/autotests/kcmtest.cpp
@@ -20,8 +20,8 @@
 #include "../kcm.h"
 // Qt
 #include <QtTest>
-#include <Plasma/Package>
-#include <Plasma/PluginLoader>
+#include <KPackage/Package>
+#include <KPackage/PackageLoader>
 #include <ksycoca.h>
 #include <KJob>
 
@@ -69,7 +69,7 @@
 
     const QString packagePath = QFINDTESTDATA("lookandfeel");
 
-    Plasma::Package p = Plasma::PluginLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
+    KPackage::Package p = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
     p.setPath(packagePath);
     QVERIFY(p.isValid());
 
diff --git a/kcms/lookandfeel/kcm.h b/kcms/lookandfeel/kcm.h
--- a/kcms/lookandfeel/kcm.h
+++ b/kcms/lookandfeel/kcm.h
@@ -26,7 +26,7 @@
 
 #include <KNewStuff3/KNS3/DownloadDialog>
 
-#include <Plasma/Package>
+#include <KPackage/Package>
 #include <KQuickAddons/ConfigModule>
 
 class QQuickItem;
@@ -63,7 +63,7 @@
     ~KCMLookandFeel() override;
 
     //List only packages which provide at least one of the components
-    QList<Plasma::Package> availablePackages(const QStringList &components);
+    QList<KPackage::Package> availablePackages(const QStringList &components);
 
     QStandardItemModel *lookAndFeelModel() const;
 
@@ -104,7 +104,7 @@
     QDir cursorThemeDir(const QString &theme, const int depth);
     const QStringList cursorSearchPaths();
     QStandardItemModel *m_model;
-    Plasma::Package m_package;
+    KPackage::Package m_package;
     QString m_selectedPlugin;
     QStringList m_cursorSearchPaths;
     QPointer<KNS3::DownloadDialog> m_newStuffDialog;
diff --git a/kcms/lookandfeel/kcm.cpp b/kcms/lookandfeel/kcm.cpp
--- a/kcms/lookandfeel/kcm.cpp
+++ b/kcms/lookandfeel/kcm.cpp
@@ -30,6 +30,7 @@
 #include <KIconLoader>
 #include <KAutostart>
 #include <KRun>
+#include <KService>
 
 #include <QDebug>
 #include <QQuickItem>
@@ -40,7 +41,7 @@
 #include <QX11Info>
 
 #include <KLocalizedString>
-#include <Plasma/PluginLoader>
+#include <KPackage/PackageLoader>
 
 #include <X11/Xlib.h>
 #include <X11/Xcursor/Xcursor.h>
@@ -150,9 +151,9 @@
     return -1;
 }
 
-QList<Plasma::Package> KCMLookandFeel::availablePackages(const QStringList &components)
+QList<KPackage::Package> KCMLookandFeel::availablePackages(const QStringList &components)
 {
-    QList<Plasma::Package> packages;
+    QList<KPackage::Package> packages;
     QStringList paths;
     const QStringList dataPaths = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation);
 
@@ -163,9 +164,9 @@
     }
 
     for (const QString &path : paths) {
-        Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
+        KPackage::Package pkg = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
         pkg.setPath(path);
-        pkg.setFallbackPackage(Plasma::Package());
+        pkg.setFallbackPackage(KPackage::Package());
         if (components.isEmpty()) {
             packages << pkg;
         } else {
@@ -185,14 +186,14 @@
 {
     m_model->clear();
 
-    const QList<Plasma::Package> pkgs = availablePackages({"defaults", "layouts"});
-    for (const Plasma::Package &pkg : pkgs) {
+    const QList<KPackage::Package> pkgs = availablePackages({"defaults", "layouts"});
+    for (const KPackage::Package &pkg : pkgs) {
         if (!pkg.metadata().isValid()) {
             continue;
         }
         QStandardItem* row = new QStandardItem(pkg.metadata().name());
-        row->setData(pkg.metadata().pluginName(), PluginNameRole);
-        row->setData(pkg.metadata().comment(), DescriptionRole);
+        row->setData(pkg.metadata().pluginId(), PluginNameRole);
+        row->setData(pkg.metadata().description(), DescriptionRole);
         row->setData(pkg.filePath("preview"), ScreenshotRole);
         row->setData(pkg.filePath("fullscreenpreview"), FullScreenPreviewRole);
 
@@ -242,7 +243,7 @@
 
 void KCMLookandFeel::load()
 {
-    m_package = Plasma::PluginLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
+    m_package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
     KConfigGroup cg(KSharedConfig::openConfig(QStringLiteral("kdeglobals")), "KDE");
     const QString packageName = cg.readEntry("LookAndFeelPackage", QString());
     if (!packageName.isEmpty()) {
@@ -253,15 +254,15 @@
         return;
     }
 
-    setSelectedPlugin(m_package.metadata().pluginName());
+    setSelectedPlugin(m_package.metadata().pluginId());
 
     setNeedsSave(false);
 }
 
 
 void KCMLookandFeel::save()
 {
-    Plasma::Package package = Plasma::PluginLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
+    KPackage::Package package = KPackage::PackageLoader::self()->loadPackage(QStringLiteral("Plasma/LookAndFeel"));
     package.setPath(m_selectedPlugin);
 
     if (!package.isValid()) {
@@ -432,7 +433,7 @@
         return;
     }
 
-    setSelectedPlugin(m_package.metadata().pluginName());
+    setSelectedPlugin(m_package.metadata().pluginId());
 }
 
 void KCMLookandFeel::setWidgetStyle(const QString &style)