diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/components b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/components
deleted file mode 120000
index f579bfa..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/components
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/components
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/defaults b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/defaults
index 1d03a35..7209562 100644
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/defaults
+++ b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/defaults
@@ -1,20 +1,23 @@
 [kdeglobals][KDE]
-widgetStyle=qtcurve
+widgetStyle=Breeze
 
 [kdeglobals][General]
-ColorScheme=KXStudio
+ColorScheme=Breeze Dark
 
 [kdeglobals][Icons]
 Theme=breeze-dark
 
 [plasmarc][Theme]
-name=default
+name=breeze-dark
 
 [kcminputrc][Mouse]
-cursorTheme=oxy-zion
+cursorTheme=breeze_cursors
 
 [kwinrc][WindowSwitcher]
 LayoutName=org.kde.breeze.desktop
 
 [kwinrc][DesktopSwitcher]
 LayoutName=org.kde.breeze.desktop
+
+[kwinrc][org.kde.kdecoration2]
+library=org.kde.breeze
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/desktopswitcher b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/desktopswitcher
deleted file mode 120000
index c59e6c0..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/desktopswitcher
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/desktopswitcher
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/lockscreen b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/lockscreen
deleted file mode 120000
index f9ac48f..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/lockscreen
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/lockscreen
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/loginmanager b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/loginmanager
deleted file mode 120000
index 408b723..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/loginmanager
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/loginmanager
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/logout b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/logout
deleted file mode 120000
index 4f3bac6..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/logout
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/logout
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/osd b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/osd
deleted file mode 120000
index 3bbc6a2..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/osd
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/osd
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/previews b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/previews
deleted file mode 120000
index 9d10bdb..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/previews
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/previews
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/previews/preview.png b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/previews/preview.png
new file mode 100644
index 0000000..61a80a0
Binary files /dev/null and b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/previews/preview.png differ
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/previews/splash.png b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/previews/splash.png
new file mode 100644
index 0000000..2a0ee80
Binary files /dev/null and b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/previews/splash.png differ
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/runcommand b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/runcommand
deleted file mode 120000
index 5dc5ea6..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/runcommand
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/runcommand
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/splash/Splash.qml b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/splash/Splash.qml
index ee19dab..59e4b76 100644
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/splash/Splash.qml
+++ b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/splash/Splash.qml
@@ -22,8 +22,7 @@ import QtQuick 2.2
 Image {
     id: root
     fillMode: Image.PreserveAspectCrop
-    source: "/usr/share/wallpapers/KXStudio-Stripes-Miku/contents/images/1920x1200.jpg"
-    //source: "/usr/share/wallpapers/KXStudio-Stripes/contents/images/1920x1200.jpg"
+    source: "/usr/share/wallpapers/KXStudio-Stripes/contents/images/1920x1200.jpg"
 
     property int stage
 
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/userswitcher b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/userswitcher
deleted file mode 120000
index 4377aab..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/userswitcher
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/userswitcher
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/windowdecoration b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/windowdecoration
deleted file mode 120000
index e98e129..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/windowdecoration
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/windowdecoration
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/windowswitcher b/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/windowswitcher
deleted file mode 120000
index 97bcdf0..0000000
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/contents/windowswitcher
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/plasma/look-and-feel/org.kde.breeze.desktop/contents/windowswitcher
\ No newline at end of file
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/metadata.desktop b/look-and-feel/org.linuxaudio.kxstudio.desktop/metadata.desktop
index 9e211ed..1542fc7 100644
--- a/look-and-feel/org.linuxaudio.kxstudio.desktop/metadata.desktop
+++ b/look-and-feel/org.linuxaudio.kxstudio.desktop/metadata.desktop
@@ -13,3 +13,4 @@ X-KDE-PluginInfo-Name=org.linuxaudio.kxstudio.desktop
 X-KDE-PluginInfo-Version=2.0
 X-KDE-PluginInfo-Website=http://kxstudio.linuxaudio.org/
 X-Plasma-MainScript=defaults
+X-KDE-PluginInfo-License=GPLv2+
diff --git a/look-and-feel/org.linuxaudio.kxstudio.desktop/metadata.json b/look-and-feel/org.linuxaudio.kxstudio.desktop/metadata.json
new file mode 100644
index 0000000..fb3a3a0
--- /dev/null
+++ b/look-and-feel/org.linuxaudio.kxstudio.desktop/metadata.json
@@ -0,0 +1,26 @@
+{
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "",
+                "Name": "falkTX"
+            },
+            {
+                "Email": "plasma-devel@kde.org",
+                "Name": "KDE Visual Design Group"
+            }
+        ],
+        "Category": "",
+        "Description": "KXStudio Desktop",
+        "Id": "org.linuxaudio.kxstudio.desktop",
+        "License": "GPLv2+",
+        "Name": "KXStudio",
+        "ServiceTypes": [
+            "Plasma/LookAndFeel"
+        ],
+        "Version": "2.0",
+        "Website": "http://kxstudio.linuxaudio.org/"
+    },
+    "X-KDE-ParentApp": "",
+    "X-Plasma-MainScript": "defaults"
+}