diff --git a/kcms/CMakeLists.txt b/kcms/CMakeLists.txt
index a773d22e5..602994ec7 100644
--- a/kcms/CMakeLists.txt
+++ b/kcms/CMakeLists.txt
@@ -1,3 +1,2 @@
 project(kcms)
-
 add_subdirectory( splash )
diff --git a/kcms/splash/kcm.cpp b/kcms/splash/kcm.cpp
index 2f85a44ce..55ecb36b8 100644
--- a/kcms/splash/kcm.cpp
+++ b/kcms/splash/kcm.cpp
@@ -112,7 +112,7 @@ void KCMSplashScreen::load()
     for (const Plasma::Package &pkg : pkgs) {
         QStandardItem* row = new QStandardItem(pkg.metadata().name());
         row->setData(pkg.metadata().pluginName(), PluginNameRole);
-        row->setData(pkg.filePath("splash", "screenshot.png"), ScreenhotRole);
+        row->setData(pkg.filePath("previews", "splash.png"), ScreenhotRole);
         m_model->appendRow(row);
     }
 }
diff --git a/ksmserver/screenlocker/kcm/kcm.cpp b/ksmserver/screenlocker/kcm/kcm.cpp
index 3dfcd0bd8..8bf997370 100644
--- a/ksmserver/screenlocker/kcm/kcm.cpp
+++ b/ksmserver/screenlocker/kcm/kcm.cpp
@@ -91,7 +91,7 @@ void ScreenLockerKcm::load()
     for (const Plasma::Package &pkg : pkgs) {
         QStandardItem* row = new QStandardItem(pkg.metadata().name());
         row->setData(pkg.metadata().pluginName(), PluginNameRole);
-        row->setData(pkg.filePath("lockscreen", "screenshot.png"), ScreenhotRole);
+        row->setData(pkg.filePath("previews", "lockscreen.png"), ScreenhotRole);
         m_model->appendRow(row);
     }
 }
diff --git a/ksmserver/screenlocker/kcm/package/contents/ui/main.qml b/ksmserver/screenlocker/kcm/package/contents/ui/main.qml
index f37fc1979..8a3a643c3 100644
--- a/ksmserver/screenlocker/kcm/package/contents/ui/main.qml
+++ b/ksmserver/screenlocker/kcm/package/contents/ui/main.qml
@@ -132,7 +132,7 @@ Rectangle {
              * the view really is done loading"*/
             Timer {
                 id: makeCurrentTimer
-                interval: 0
+                interval: 100
                 repeat: false
                 property int pendingIndex
                 onPendingIndexChanged: makeCurrentTimer.restart()
diff --git a/lookandfeel/contents/defaults b/lookandfeel/contents/defaults
index c34041a1b..b40f1f71b 100644
--- a/lookandfeel/contents/defaults
+++ b/lookandfeel/contents/defaults
@@ -1,10 +1,12 @@
-[KDE]
+[kdeglobals][KDE]
 widgetStyle=qtcurve
-SingleClick=true
 ColorScheme=Breeze
 
-[Icons]
+[kdeglobals][Icons]
 Theme=breeze
 
-[Theme]
+[plasmarc][Theme]
 name=default
+
+[kcminputrc][Mouse]
+cursorTheme=breeze
diff --git a/lookandfeel/contents/lockscreen/screenshot.png b/lookandfeel/contents/lockscreen/screenshot.png
deleted file mode 100644
index c22d3bfd3..000000000
Binary files a/lookandfeel/contents/lockscreen/screenshot.png and /dev/null differ
diff --git a/lookandfeel/contents/previews/lockscreen.png b/lookandfeel/contents/previews/lockscreen.png
index e69de29bb..c22d3bfd3 100644
Binary files a/lookandfeel/contents/previews/lockscreen.png and b/lookandfeel/contents/previews/lockscreen.png differ
diff --git a/lookandfeel/contents/previews/preview.png b/lookandfeel/contents/previews/preview.png
new file mode 100644
index 000000000..7850a27ec
Binary files /dev/null and b/lookandfeel/contents/previews/preview.png differ
diff --git a/lookandfeel/contents/previews/splash.png b/lookandfeel/contents/previews/splash.png
index e69de29bb..218131d17 100644
Binary files a/lookandfeel/contents/previews/splash.png and b/lookandfeel/contents/previews/splash.png differ
diff --git a/lookandfeel/contents/splash/screenshot.png b/lookandfeel/contents/splash/screenshot.png
deleted file mode 100644
index 218131d17..000000000
Binary files a/lookandfeel/contents/splash/screenshot.png and /dev/null differ
diff --git a/lookandfeelaccess/lookandfeelaccess.cpp b/lookandfeelaccess/lookandfeelaccess.cpp
index 8fee1d4b3..effdf5dfb 100644
--- a/lookandfeelaccess/lookandfeelaccess.cpp
+++ b/lookandfeelaccess/lookandfeelaccess.cpp
@@ -78,7 +78,7 @@ LookAndFeelAccess::LookAndFeelAccess(QObject *parent)
 {
     ShellPluginLoader::init();
     d->defaultPackage = Plasma::PluginLoader::self()->loadPackage("Plasma/LookAndFeel");
-    d->defaultPackage.setPath("org.kde.lookandfeel");
+    d->defaultPackage.setPath("org.kde.breeze.desktop");
 
     d->config = KSharedConfig::openConfig("kdeglobals");
     KConfigGroup cg(d->config, "KDE");
@@ -159,7 +159,7 @@ QList<Plasma::Package> LookAndFeelAccess::availablePackages(const QString &compo
     for (const QString &path : paths) {
         Plasma::Package pkg = Plasma::PluginLoader::self()->loadPackage("Plasma/LookAndFeel");
         pkg.setPath(path);
-        if (!component.isEmpty() && !pkg.filePath(component.toUtf8()).isEmpty()) {
+        if (component.isEmpty() || !pkg.filePath(component.toUtf8()).isEmpty()) {
             packages << pkg;
         }
     }
diff --git a/shell/shellcorona.cpp b/shell/shellcorona.cpp
index 084d4f82a..4fa29bff7 100644
--- a/shell/shellcorona.cpp
+++ b/shell/shellcorona.cpp
@@ -64,6 +64,8 @@
 
 #include "plasmashelladaptor.h"
 
+#include "../lookandfeelaccess/lookandfeelaccess.h"
+
 static const int s_configSyncDelay = 10000; // 10 seconds
 
 class ShellCorona::Private {
@@ -176,10 +178,12 @@ ShellCorona::ShellCorona(QObject *parent)
     themeName = plasmarc.readEntry(themeNameKey, themeName);
 
     if (themeName.isEmpty()) {
-        const KConfigGroup lnfCfg = KConfigGroup(KSharedConfig::openConfig(
-                                                lookAndFeelPackage().filePath("defaults")),
-                                                themeGroupKey
+        LookAndFeelAccess access;
+        KConfigGroup lnfCfg = KConfigGroup(KSharedConfig::openConfig(
+                                                access.filePath("defaults")),
+                                                "plasmarc"
                                            );
+        lnfCfg = KConfigGroup(&lnfCfg, themeGroupKey);
         themeName = lnfCfg.readEntry(themeNameKey, themeName);
     }
 
@@ -1316,17 +1320,6 @@ void ShellCorona::desktopContainmentDestroyed(QObject *obj)
     }
 }
 
-Plasma::Package ShellCorona::lookAndFeelPackage() const
-{
-    if (!d->lookNFeelPackage.isValid()) {
-        d->lookNFeelPackage = ShellPluginLoader::self()->loadPackage("Plasma/LookAndFeel");
-        //TODO: make loading from config once we have some UI for setting the package
-        d->lookNFeelPackage.setPath("org.kde.lookandfeel");
-    }
-
-    return d->lookNFeelPackage;
-}
-
 KScreen::Config* ShellCorona::screensConfiguration() const
 {
     return d->screenConfiguration;
diff --git a/shell/shellcorona.h b/shell/shellcorona.h
index 2228b7632..6bdeaf020 100644
--- a/shell/shellcorona.h
+++ b/shell/shellcorona.h
@@ -71,8 +71,6 @@ public:
 
     KActivities::Controller *activityController();
 
-    Plasma::Package lookAndFeelPackage() const;
-
     //Those two are a bit of an hack but are just for desktop scripting
     Activity *activity(const QString &id);
     void insertActivity(const QString &id, Activity *activity);