diff --git a/desktop/kde/plasma/bluedevil/pspec.xml b/desktop/kde/plasma/bluedevil/pspec.xml
index 37410fce4f..67db18a0a0 100755
--- a/desktop/kde/plasma/bluedevil/pspec.xml
+++ b/desktop/kde/plasma/bluedevil/pspec.xml
@@ -10,44 +10,57 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:console</IsA>
+        <IsA>app:console</IsA>
         <Summary>KDE 5 Bluetooth Stack</Summary>
         <Description>Integrate the Bluetooth technology within KDE workspace and applications</Description>
         <Archive sha1sum="494f441442c5284b40b611477f2ad7e6b0540a09" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/bluedevil-5.3.2.tar.xz</Archive>
         <BuildDependencies>
-        <Dependency>qt5-base-devel</Dependency>		    
-	    <Dependency>kded-devel</Dependency>
-	    <Dependency>plasma-framework-devel</Dependency>	    
-        <Dependency>extra-cmake-modules</Dependency>	    
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-declarative</Dependency>
+            <Dependency>kded-devel</Dependency>
+            <Dependency>plasma-framework-devel</Dependency>
+            <Dependency>bluez-qt-devel</Dependency>	    
+            <Dependency>kio-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kcompletion-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>kdbusaddons-devel</Dependency>
+            <Dependency>kiconthemes-devel</Dependency>
+            <Dependency>kconfigwidgets-devel</Dependency>
+            <Dependency>knotifications-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>    
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>bluedevil</Name>
         <RuntimeDependencies>
-        <Dependency>qt5-base</Dependency>
-        <Dependency>libgcc</Dependency>		    
-	    <Dependency>bluez-qt</Dependency>	    
-	    <Dependency>kio</Dependency>
-        <Dependency>ki18n</Dependency>
-        <Dependency>kconfig</Dependency>
-        <Dependency>qt5-declarative</Dependency>
-        <Dependency>kcompletion</Dependency>
-        <Dependency>kcoreaddons</Dependency>
-        <Dependency>kdbusaddons</Dependency>
-        <Dependency>kiconthemes</Dependency>
-        <Dependency>kconfigwidgets</Dependency>
-        <Dependency>knotifications</Dependency>
-        <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>qt5-base</Dependency>
+            <Dependency>libgcc</Dependency>		    
+            <Dependency>bluez-qt</Dependency>	    
+            <Dependency>kio</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>kconfig</Dependency>
+            <Dependency>qt5-declarative</Dependency>
+            <Dependency>kcompletion</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kdbusaddons</Dependency>
+            <Dependency>kiconthemes</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
+            <Dependency>knotifications</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
         </RuntimeDependencies>
         <Files>
-	    <Path fileType="data">/usr/share</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="doc">/usr/share/doc</Path>
+            <Path fileType="data">/usr/share</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="doc">/usr/share/doc</Path>
         </Files>        
     </Package>
 
diff --git a/desktop/kde/plasma/breeze/pspec.xml b/desktop/kde/plasma/breeze/pspec.xml
index c163ad6c79..430804870d 100755
--- a/desktop/kde/plasma/breeze/pspec.xml
+++ b/desktop/kde/plasma/breeze/pspec.xml
@@ -10,55 +10,56 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:console</IsA>
+        <IsA>app:console</IsA>
         <Summary>KDE5 Plasma artwork</Summary>
         <Description>Artwork, styles and assets for the Breeze visual style for the Plasma Desktop</Description>
         <Archive sha1sum="4e239602229398b8da7fc539dcb5552c07e63f8a" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/breeze-5.3.2.tar.xz</Archive>
         <BuildDependencies>
-        <Dependency>qt5-base-devel</Dependency>
-        <Dependency>libxcb-devel</Dependency>
-        <Dependency>libgcc</Dependency>
-	    <Dependency>qt5-x11extras-devel</Dependency>
-        <Dependency>frameworkintegration-devel</Dependency>
-        <Dependency>kdecorations-devel</Dependency>    
-	    <Dependency>kcoreaddons-devel</Dependency>
-	    <Dependency>ki18n-devel</Dependency>
-	    <Dependency>kwindowsystem-devel</Dependency>
-	    <Dependency>kconfig-devel</Dependency>
-	    <Dependency>kguiaddons-devel</Dependency>
-	    <Dependency>kcoreaddons-devel</Dependency>
-	    <Dependency>kconfigwidgets-devel</Dependency>
-	    <Dependency>kwidgetsaddons-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>	    
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>libxcb-devel</Dependency>
+            <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>frameworkintegration-devel</Dependency>
+            <Dependency>kdecorations-devel</Dependency>    
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>kcmutils-devel</Dependency> 
+            <Dependency>kwindowsystem-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kguiaddons-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>kconfigwidgets-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>breeze-style</Name>
         <RuntimeDependencies>
-        <Dependency>qt5-base</Dependency>
-        <Dependency>libgcc</Dependency>
-	    <Dependency>kconfig</Dependency>
-	    <Dependency>kguiaddons</Dependency>
-	    <Dependency>kcoreaddons</Dependency>
-	    <Dependency>kconfigwidgets</Dependency>
-	    <Dependency>kwidgetsaddons</Dependency>
-	    <Dependency>qt5-x11extras</Dependency>
-        <Dependency>libxcb</Dependency>
-        <Dependency>frameworkintegration</Dependency>
-        <Dependency>kcmutils </Dependency>    
-	    <Dependency>kcoreaddons</Dependency>
-	    <Dependency>ki18n</Dependency>
-	    <Dependency>kwindowsystem</Dependency>
-	    <Dependency>kdecorations</Dependency>
+            <Dependency>qt5-base</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>kconfig</Dependency>
+            <Dependency>kguiaddons</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>qt5-x11extras</Dependency>
+            <Dependency>libxcb</Dependency>
+            <Dependency>frameworkintegration</Dependency>
+            <Dependency>kcmutils</Dependency>    
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>kwindowsystem</Dependency>
+            <Dependency>kdecorations</Dependency>
         </RuntimeDependencies>
         <Files>
             <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>
diff --git a/desktop/kde/plasma/kde-cli-tools/pspec.xml b/desktop/kde/plasma/kde-cli-tools/pspec.xml
index f328ddf993..450c9fed2d 100755
--- a/desktop/kde/plasma/kde-cli-tools/pspec.xml
+++ b/desktop/kde/plasma/kde-cli-tools/pspec.xml
@@ -15,52 +15,70 @@
         <Description>Tools based on KDE Frameworks 5 to better interact with the system</Description>
         <Archive sha1sum="824eece1d44d66e3c037380496b65ea90e85f3ac" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/kde-cli-tools-5.3.2.tar.xz</Archive>
         <BuildDependencies>
-        <Dependency>qt5-base-devel</Dependency>
-        <Dependency>libX11-devel</Dependency>
-        <Dependency>libgcc</Dependency>
-	    <Dependency>kdoctools-devel</Dependency>
-	    <Dependency>python3</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>	    
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>qt5-svg-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>kdoctools-devel</Dependency>
+            <Dependency>kio-devel</Dependency>
+            <Dependency>kdesu-devel</Dependency>
+            <Dependency>ki18n-devel</Dependency>
+            <Dependency>kservice-devel</Dependency>
+            <Dependency>kcompletion-devel</Dependency>
+            <Dependency>kcoreaddons-devel</Dependency>
+            <Dependency>kiconthemes-devel</Dependency>
+            <Dependency>kwindowsystem-devel</Dependency>
+            <Dependency>kconfigwidgets-devel</Dependency>
+            <Dependency>kwidgetsaddons-devel</Dependency>
+            <Dependency>kcmutils-devel</Dependency>
+            <Dependency>kconfig-devel</Dependency>
+            <Dependency>kdelibs4-support-devel</Dependency>
+            <Dependency>kemoticons-devel</Dependency>
+            <Dependency>kitemmodels-devel</Dependency>
+            <Dependency>kinit-devel</Dependency>
+            <Dependency>kunitconversion-devel</Dependency>
+            <Dependency>kdesignerplugin</Dependency>
+            <Dependency>docbook-xsl</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>	    
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>kde-cli-tools</Name>
         <RuntimeDependencies>
-        <Dependency>qt5-base</Dependency>
-	    <Dependency>qt5-svg</Dependency>
-        <Dependency>libX11</Dependency>
-        <Dependency>libgcc</Dependency>
-	    <Dependency>kio</Dependency>
-	    <Dependency>ki18n</Dependency>
-	    <Dependency>kservice</Dependency>
-	    <Dependency>qt5-x11extras</Dependency>
-	    <Dependency>kcompletion</Dependency>
-	    <Dependency>kcoreaddons</Dependency>
-	    <Dependency>kiconthemes</Dependency>
-	    <Dependency>kwindowsystem</Dependency>
-	    <Dependency>kconfigwidgets</Dependency>
-	    <Dependency>kwidgetsaddons</Dependency>
-	    <Dependency>kcmutils</Dependency>
-	    <Dependency>kconfig</Dependency>
-	    <Dependency>kdelibs4-support</Dependency>	    
+            <Dependency>qt5-base</Dependency>
+            <Dependency>qt5-svg</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>kio</Dependency>
+            <Dependency>kdesu</Dependency>
+            <Dependency>ki18n</Dependency>
+            <Dependency>kservice</Dependency>
+            <Dependency>qt5-x11extras</Dependency>
+            <Dependency>kcompletion</Dependency>
+            <Dependency>kcoreaddons</Dependency>
+            <Dependency>kiconthemes</Dependency>
+            <Dependency>kwindowsystem</Dependency>
+            <Dependency>kconfigwidgets</Dependency>
+            <Dependency>kwidgetsaddons</Dependency>
+            <Dependency>kcmutils</Dependency>
+            <Dependency>kconfig</Dependency>
+            <Dependency>kdelibs4-support</Dependency>    
         </RuntimeDependencies>
         <Files>
-        <Path fileType="data">/usr/share</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="man">/usr/share/man</Path>
-        <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="data">/usr/share</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="man">/usr/share/man</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
         </Files>
        <Provides>            
             <COMAR script="package.py">System.Package</COMAR>
         </Provides>
-       <Conflicts>
-          <Package>kdesu</Package>
-        </Conflicts>
     </Package>
     
     <History>
diff --git a/desktop/kde/plasma/kdecorations/pspec.xml b/desktop/kde/plasma/kdecorations/pspec.xml
index 85452c9ae9..96dc77edee 100644
--- a/desktop/kde/plasma/kdecorations/pspec.xml
+++ b/desktop/kde/plasma/kdecorations/pspec.xml
@@ -15,7 +15,8 @@
         <Archive sha1sum="b032f6b0473c42a3abde38182fbb41ae2f95e965" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/kdecoration-5.3.2.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-            <Dependency>extra-cmake-modules</Dependency>	    
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -28,31 +29,25 @@
         <Files>
             <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="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     <Package>
         <Name>kdecorations-devel</Name>
-	<Summary>Development files for kdecorations</Summary>
+        <Summary>Development files for kdecorations</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">kdecorations</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/cmake</Path>
-	    <Path fileType="config">/usr/lib/pkgconfig</Path>
+            <Path fileType="config">/usr/lib/pkgconfig</Path>
         </Files>                
-        <Replaces>
-          <Package>kde-workspace-devel</Package>
-        </Replaces>
-        <Conflicts>
-          <Package>kde-workspace-devel</Package>
-        </Conflicts> 
     </Package>
 
     <History>