diff --git a/desktop/kde/plasma/plasma-desktop/pspec.xml b/desktop/kde/plasma/plasma-desktop/pspec.xml
index 5a74d73316..9a7cab65a9 100755
--- a/desktop/kde/plasma/plasma-desktop/pspec.xml
+++ b/desktop/kde/plasma/plasma-desktop/pspec.xml
@@ -10,107 +10,117 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:console</IsA>
+        <IsA>app:console</IsA>
         <Summary>KDE5 plasma workspace</Summary>
         <Description>This package contains the basic packages for a Plasma workspace.</Description>
         <Archive sha1sum="944cd883875078eecca3e7555dc2e376448b64ab" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/plasma-desktop-5.3.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>boost-devel</Dependency>
-	    <Dependency>kdoctools-devel</Dependency>
-	    <Dependency>kio-devel</Dependency>
-	    <Dependency>libX11-devel</Dependency>
-	    <Dependency>libgcc</Dependency>
-	    <Dependency>libxcb-devel</Dependency>
-	    <Dependency>freetype-devel</Dependency>
-	    <Dependency>libusb-compat-devel</Dependency>
-	    <Dependency>xorg-server-devel</Dependency>
-	    <Dependency>xorg-input-evdev-devel</Dependency>
-	    <Dependency>xorg-input-synaptics-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>boost-devel</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kio-devel</Dependency>
+            <Dependency>kcmutils-devel</Dependency>
+            <Dependency>knewstuff-devel</Dependency>
+            <Dependency>kpeople-devel</Dependency>
+            <Dependency>kdbusaddons-devel</Dependency>
+            <Dependency>kemoticons-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
+            <Dependency>kwin-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>libXft-devel</Dependency>
+            <Dependency>libxkbfile-devel</Dependency>
+            <Dependency>kded-devel</Dependency>
+            <Dependency>libxcb-devel</Dependency>
+            <Dependency>freetype-devel</Dependency>
+            <Dependency>libusb-compat-devel</Dependency>
+            <Dependency>xorg-server-devel</Dependency>
+            <Dependency>xorg-input-evdev-devel</Dependency>
+            <Dependency>xorg-input-synaptics-devel</Dependency>
+            <Dependency>pulseaudio-libs-devel</Dependency>
+            <Dependency>fontconfig-devel</Dependency>
+            <Dependency>plasma-workspace-devel</Dependency>
+            <Dependency>docbook-xsl</Dependency>
+            <Dependency>qt5-sql-sqlite</Dependency>
+            <Dependency>qt5-sql-mysql</Dependency>
+            <Dependency>qt5-sql-postgresql</Dependency>
+            <Dependency>qt5-sql-odbc</Dependency>
+            <Dependency>kdesignerplugin</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>plasma-desktop</Name>
         <RuntimeDependencies>
+            <Dependency>baloo</Dependency>
+            <Dependency>fontconfig</Dependency>
+            <Dependency>freetype</Dependency>
+            <Dependency>kactivities</Dependency>
+            <Dependency>karchive</Dependency>
+            <Dependency>kauth</Dependency>
+            <Dependency>kbookmarks</Dependency>
+            <Dependency>kcmutils</Dependency>
+            <Dependency>kcodecs</Dependency>
+            <Dependency>kcompletion</Dependency>
+            <Dependency>kconfig</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kdbusaddons</Dependency>
+            <Dependency>kdeclarative</Dependency>
+            <Dependency>kdelibs4-support</Dependency>
+            <Dependency>kemoticons</Dependency>
+            <Dependency>kglobalaccel</Dependency>
+            <Dependency>kguiaddons</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>kiconthemes</Dependency>
+            <Dependency>kio</Dependency>
+            <Dependency>kitemviews</Dependency>
+            <Dependency>kjobwidgets</Dependency>
+            <Dependency>knewstuff</Dependency>
+            <Dependency>knotifications</Dependency>
+            <Dependency>knotifyconfig</Dependency>
+            <Dependency>kparts</Dependency>
+            <Dependency>kpeople</Dependency>
+            <Dependency>krunner</Dependency>
+            <Dependency>kservice</Dependency>
+            <Dependency>kwallet</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>kwindowsystem</Dependency>
+            <Dependency>kxmlgui</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libusb-compat</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>libxcb</Dependency>
+            <Dependency>libXcursor</Dependency>
+            <Dependency>libXfixes</Dependency>
+            <Dependency>libXft</Dependency>
+            <Dependency>libXi</Dependency>
+            <Dependency>libxkbfile</Dependency>
+            <Dependency>plasma-framework</Dependency>
+            <Dependency>plasma-workspace</Dependency>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>kio</Dependency>
-	    <Dependency>libX11</Dependency>
-	    <Dependency>libgcc</Dependency>
-	    <Dependency>libxcb</Dependency>
-	    <Dependency>freetype</Dependency>
-	    <Dependency>libusb-compat</Dependency>
-	    <Dependency>baloo</Dependency>
-	    <Dependency>libxkbfile</Dependency>
-	    <Dependency>kconfigwidgets</Dependency>
-	    <Dependency>kwindowsystem</Dependency>
-	    <Dependency>kpeople</Dependency>
-	    <Dependency>knotifications</Dependency>
-	    <Dependency>kwin</Dependency>
-	    <Dependency>kwindowsystem</Dependency>
-	    <Dependency>knotifyconfig</Dependency>
-	    <Dependency>libcanberra</Dependency>
-	    <Dependency>sonnet</Dependency>
-	    <Dependency>powerdevil</Dependency>	
-	    <Dependency>system-settings</Dependency>
-	    <Dependency>libXi</Dependency>+
-	    <Dependency>libXft</Dependency>
-	    <Dependency>qt5-svg</Dependency>
-	    <Dependency>libXfixes</Dependency>
-	    <Dependency>fontconfig</Dependency>
-	    <Dependency>kauth</Dependency>
-	    <Dependency>ki18n</Dependency>
-	    <Dependency>solid</Dependency>
-	    <Dependency>libXcursor</Dependency>
-	    <Dependency>qt5-phonon</Dependency>
-	    <Dependency>kparts</Dependency>
-	    <Dependency>kcodecs</Dependency>
-	    <Dependency>kconfig</Dependency>
-	    <Dependency>krunner</Dependency>
-	    <Dependency>kwallet</Dependency>
-	    <Dependency>kxmlgui</Dependency>
-	    <Dependency>karchive</Dependency>
-	    <Dependency>kcmutils</Dependency>
-	    <Dependency>kservice</Dependency>
-	    <Dependency>qt5-x11extras</Dependency>
-	    <Dependency>knewstuff</Dependency>
-	    <Dependency>xcb-util-image</Dependency>
-	    <Dependency>kbookmarks</Dependency>
-	    <Dependency>kemoticons</Dependency>
-	    <Dependency>kguiaddons</Dependency>
-	    <Dependency>kitemviews</Dependency>
-	    <Dependency>pulseaudio-libs</Dependency>
-	    <Dependency>qt5-declarative</Dependency>
-	    <Dependency>kactivities</Dependency>
-	    <Dependency>kcompletion</Dependency>
-	    <Dependency>kcoreaddons</Dependency>
-	    <Dependency>kdbusaddons</Dependency>
-	    <Dependency>kiconthemes</Dependency>
-	    <Dependency>kjobwidgets</Dependency>
-	    <Dependency>kdeclarative</Dependency>
-	    <Dependency>kglobalaccel</Dependency>
-	    <Dependency>kwidgetsaddons</Dependency>
-	    <Dependency>kdelibs4-support</Dependency>
-	    <Dependency>plasma-framework</Dependency>
-	    <Dependency>plasma-workspace</Dependency>
+            <Dependency>qt5-declarative</Dependency>
+            <Dependency>qt5-phonon</Dependency>
+            <Dependency>qt5-svg</Dependency>
+            <Dependency>qt5-x11extras</Dependency>
+            <Dependency>solid</Dependency>
+            <Dependency>sonnet</Dependency>
+            <!--Dependency>system-settings</Dependency--><!--1-->
+            <Dependency>xcb-util-image</Dependency>
         </RuntimeDependencies>
         <Files>
-	    <Path fileType="config">/etc</Path>
+            <Path fileType="config">/etc</Path>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="executable">/usr/bin</Path>
             <Path fileType="library">/usr/lib/cmake</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
-        <Replaces>
-          <Package>kcm-touchpad-frameworks</Package>
-        </Replaces>
-        <Conflicts>
-          <Package>kcm-touchpad-frameworks, kdebase-workspace</Package>
-        </Conflicts>  
     </Package>
 
     <History>
diff --git a/desktop/kde/plasma/powerdevil/pspec.xml b/desktop/kde/plasma/powerdevil/pspec.xml
index 8b97b31d9d..a8fd47b3de 100755
--- a/desktop/kde/plasma/powerdevil/pspec.xml
+++ b/desktop/kde/plasma/powerdevil/pspec.xml
@@ -10,19 +10,25 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:console</IsA>
+        <IsA>app:console</IsA>
         <Summary>KDE power manager module</Summary>
         <Description>KDE Power Management module. Provides kded daemon DBus helper and KCM for configuring Power settings</Description>
         <Archive sha1sum="88f54076a475acbfabd45f661af60ec506e78f5e" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/powerdevil-5.3.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>	    
-	    <Dependency>kdoctools-devel</Dependency>
-	    <Dependency>kidletime-devel</Dependency>
-        <Dependency>libgcc</Dependency>
-        <Dependency>libxcb-devel</Dependency>
-        <Dependency>eudev-devel</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kidletime-devel</Dependency>
+            <Dependency>libxcb-devel</Dependency>
+            <Dependency>eudev-devel</Dependency>
+            <Dependency>kdesignerplugin</Dependency>
+            <Dependency>kinit-devel</Dependency>
+	    <Dependency>kunitconversion-devel</Dependency>
+	    <Dependency>kitemmodels-devel</Dependency>
+	    <Dependency>kemoticons-devel</Dependency>
+	    <Dependency>docbook-xsl</Dependency>
 	    <Dependency>plasma-workspace-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>	    
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -30,40 +36,39 @@
         <Name>powerdevil</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>kdoctools</Dependency>
-	    <Dependency>kidletime</Dependency>
-        <Dependency>libgcc</Dependency>
-        <Dependency>libxcb</Dependency>
-        <Dependency>eudev</Dependency>
-	    <Dependency>plasma-workspace</Dependency>
-	    <Dependency>kio</Dependency>
-	    <Dependency>kauth</Dependency>
-	    <Dependency>ki18n</Dependency>
-	    <Dependency>solid</Dependency>
-	    <Dependency>kconfig</Dependency>
-	    <Dependency>kxmlgui</Dependency>
-	    <Dependency>kservice</Dependency>
-	    <Dependency>qt5-x11extras</Dependency>
-	    <Dependency>libkscreen</Dependency>
-	    <Dependency>kactivities</Dependency>
-	    <Dependency>kcompletion</Dependency>
-	    <Dependency>kcoreaddons</Dependency>
-	    <Dependency>kdbusaddons</Dependency>
-	    <Dependency>kglobalaccel</Dependency>
-	    <Dependency>knotifyconfig</Dependency>
-	    <Dependency>kconfigwidgets</Dependency>
-	    <Dependency>knotifications</Dependency>
-	    <Dependency>kwidgetsaddons</Dependency>
-	    <Dependency>kdelibs4-support</Dependency>
+            <Dependency>kidletime</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libxcb</Dependency>
+            <Dependency>eudev</Dependency>
+            <Dependency>plasma-workspace</Dependency>
+            <Dependency>kio</Dependency>
+            <Dependency>kauth</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>solid</Dependency>
+            <Dependency>kconfig</Dependency>
+            <Dependency>kxmlgui</Dependency>
+            <Dependency>kservice</Dependency>
+            <Dependency>qt5-x11extras</Dependency>
+            <Dependency>libkscreen</Dependency>
+            <Dependency>kactivities</Dependency>
+            <Dependency>kcompletion</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kdbusaddons</Dependency>
+            <Dependency>kglobalaccel</Dependency>
+            <Dependency>knotifyconfig</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
+            <Dependency>knotifications</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>kdelibs4-support</Dependency>
         </RuntimeDependencies>
         <Files>
-	    <Path fileType="config">/etc</Path>
+            <Path fileType="config">/etc</Path>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="executable">/usr/bin</Path>
             <Path fileType="library">/usr/lib/cmake</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>