diff --git a/desktop/kde/plasma/sddm/actions.py b/desktop/misc/sddm/actions.py
similarity index 100%
rename from desktop/kde/plasma/sddm/actions.py
rename to desktop/misc/sddm/actions.py
diff --git a/desktop/kde/plasma/sddm/comar/package.py b/desktop/misc/sddm/comar/package.py
similarity index 100%
rename from desktop/kde/plasma/sddm/comar/package.py
rename to desktop/misc/sddm/comar/package.py
diff --git a/desktop/kde/plasma/sddm/comar/service.py b/desktop/misc/sddm/comar/service.py
similarity index 100%
rename from desktop/kde/plasma/sddm/comar/service.py
rename to desktop/misc/sddm/comar/service.py
diff --git a/desktop/kde/plasma/sddm/files/10-backlight.rules b/desktop/misc/sddm/files/10-backlight.rules
similarity index 100%
rename from desktop/kde/plasma/sddm/files/10-backlight.rules
rename to desktop/misc/sddm/files/10-backlight.rules
diff --git a/desktop/kde/plasma/sddm/files/ecb903e4.patch b/desktop/misc/sddm/files/ecb903e4.patch
similarity index 100%
rename from desktop/kde/plasma/sddm/files/ecb903e4.patch
rename to desktop/misc/sddm/files/ecb903e4.patch
diff --git a/desktop/kde/plasma/sddm/files/sddm b/desktop/misc/sddm/files/sddm
similarity index 100%
rename from desktop/kde/plasma/sddm/files/sddm
rename to desktop/misc/sddm/files/sddm
diff --git a/desktop/kde/plasma/sddm/files/sddm-0.10.0-upower.patch b/desktop/misc/sddm/files/sddm-0.10.0-upower.patch
similarity index 100%
rename from desktop/kde/plasma/sddm/files/sddm-0.10.0-upower.patch
rename to desktop/misc/sddm/files/sddm-0.10.0-upower.patch
diff --git a/desktop/kde/plasma/sddm/files/sddm-0.11.0-consolekit.patch b/desktop/misc/sddm/files/sddm-0.11.0-consolekit.patch
similarity index 100%
rename from desktop/kde/plasma/sddm/files/sddm-0.11.0-consolekit.patch
rename to desktop/misc/sddm/files/sddm-0.11.0-consolekit.patch
diff --git a/desktop/kde/plasma/sddm/files/sddm-0.11.0-dbus-config.patch b/desktop/misc/sddm/files/sddm-0.11.0-dbus-config.patch
similarity index 100%
rename from desktop/kde/plasma/sddm/files/sddm-0.11.0-dbus-config.patch
rename to desktop/misc/sddm/files/sddm-0.11.0-dbus-config.patch
diff --git a/desktop/kde/plasma/sddm/files/sddm-0.14.0-consolekit.patch b/desktop/misc/sddm/files/sddm-0.14.0-consolekit.patch
similarity index 100%
rename from desktop/kde/plasma/sddm/files/sddm-0.14.0-consolekit.patch
rename to desktop/misc/sddm/files/sddm-0.14.0-consolekit.patch
diff --git a/desktop/kde/plasma/sddm/files/sddm-autologin b/desktop/misc/sddm/files/sddm-autologin
similarity index 100%
rename from desktop/kde/plasma/sddm/files/sddm-autologin
rename to desktop/misc/sddm/files/sddm-autologin
diff --git a/desktop/kde/plasma/sddm/files/sddm-greeter b/desktop/misc/sddm/files/sddm-greeter
similarity index 100%
rename from desktop/kde/plasma/sddm/files/sddm-greeter
rename to desktop/misc/sddm/files/sddm-greeter
diff --git a/desktop/kde/plasma/sddm/files/sddm-respect-user-flags.patch b/desktop/misc/sddm/files/sddm-respect-user-flags.patch
similarity index 100%
rename from desktop/kde/plasma/sddm/files/sddm-respect-user-flags.patch
rename to desktop/misc/sddm/files/sddm-respect-user-flags.patch
diff --git a/desktop/kde/plasma/sddm/files/sddm.conf b/desktop/misc/sddm/files/sddm.conf
similarity index 100%
rename from desktop/kde/plasma/sddm/files/sddm.conf
rename to desktop/misc/sddm/files/sddm.conf
diff --git a/desktop/kde/plasma/sddm/files/sddm_upstream.patch b/desktop/misc/sddm/files/sddm_upstream.patch
similarity index 100%
rename from desktop/kde/plasma/sddm/files/sddm_upstream.patch
rename to desktop/misc/sddm/files/sddm_upstream.patch
diff --git a/desktop/kde/plasma/sddm/pspec.xml b/desktop/misc/sddm/pspec.xml
similarity index 100%
rename from desktop/kde/plasma/sddm/pspec.xml
rename to desktop/misc/sddm/pspec.xml
diff --git a/desktop/kde/plasma/sddm/translations.xml b/desktop/misc/sddm/translations.xml
similarity index 100%
rename from desktop/kde/plasma/sddm/translations.xml
rename to desktop/misc/sddm/translations.xml
diff --git a/pisi-index.xml b/pisi-index.xml
index 967d957c27..89c38ec4e0 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -42873,6 +42873,112 @@ thunar-volman is installed and configured properly, and you plug in your digical
             </Update>
         </History>
     </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>sddm</Name>
+            <Homepage>https://github.com/sddm/sddm</Homepage>
+            <Packager>
+                <Name>Pisi Linux Admins</Name>
+                <Email>admin@pisilinux.org</Email>
+            </Packager>
+            <License>LGPLv2</License>
+            <IsA>library</IsA>
+            <IsA>app:console</IsA>
+            <PartOf>desktop.misc</PartOf>
+            <Summary xml:lang="en">QML based X11 display manager</Summary>
+            <Summary xml:lang="tr">QML tabanlı X11 görüntü yöneticisi.</Summary>
+            <Description xml:lang="en">KDE Power Management module. Provides kded daemon DBus helper and KCM for configuring Power settings</Description>
+            <Archive type="tarxz" sha1sum="ee92a2b27602c13d6ac5cfd34399192a31ca033c">https://github.com/sddm/sddm/releases/download/v0.14.0/sddm-0.14.0.tar.xz</Archive>
+            <BuildDependencies>
+                <Dependency>qt5-base-devel</Dependency>
+                <Dependency>qt5-linguist</Dependency>
+                <Dependency>qt5-declarative-devel</Dependency>
+                <Dependency>libxcb-devel</Dependency>
+                <Dependency>libxkbfile-devel</Dependency>
+                <Dependency>pam-devel</Dependency>
+                <Dependency>extra-cmake-modules</Dependency>
+                <Dependency>docutils</Dependency>
+            </BuildDependencies>
+            <Patches>
+                <Patch>sddm-respect-user-flags.patch</Patch>
+                <Patch>ecb903e4.patch</Patch>
+            </Patches>
+            <SourceURI>desktop/misc/sddm/pspec.xml</SourceURI>
+        </Source>
+        <Package>
+            <Name>sddm</Name>
+            <RuntimeDependencies>
+                <Dependency>qt5-base</Dependency>
+                <Dependency>qt5-declarative</Dependency>
+                <Dependency>pam</Dependency>
+                <Dependency>libgcc</Dependency>
+                <Dependency>libxcb</Dependency>
+            </RuntimeDependencies>
+            <Files>
+                <Path fileType="config">/etc</Path>
+                <Path fileType="data">/usr/share</Path>
+                <Path fileType="executable">/usr/bin</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>
+            <Conflicts>
+                <Package>lightdm</Package>
+                <Package>lxdm</Package>
+                <Package>mdm</Package>
+                <Package>gdm</Package>
+                <Package>slim</Package>
+            </Conflicts>
+            <Provides>
+                <COMAR script="service.py">System.Service</COMAR>
+                <COMAR script="package.py">System.Package</COMAR>
+            </Provides>
+            <AdditionalFiles>
+                <AdditionalFile target="/etc/sddm.conf" permission="0644" owner="root">sddm.conf</AdditionalFile>
+                <AdditionalFile target="/etc/pam.d/sddm" permission="0644" owner="root">sddm</AdditionalFile>
+                <AdditionalFile target="/etc/pam.d/sddm-autologin" permission="0644" owner="root">sddm-autologin</AdditionalFile>
+                <AdditionalFile target="/etc/polkit-1/rules.d/10-backlight.rules" permission="0644" owner="root">10-backlight.rules</AdditionalFile>
+            </AdditionalFiles>
+        </Package>
+        <History>
+            <Update release="5">
+                <Date>2016-10-06</Date>
+                <Version>0.14.0</Version>
+                <Comment>Version bump.</Comment>
+                <Name>Stefan Gronewold</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="4">
+                <Date>2016-09-07</Date>
+                <Version>0.13.0</Version>
+                <Comment>Add conflict list</Comment>
+                <Name>Yusuf Aydemir</Name>
+                <Email>yusuf.aydemir@pisilinux.org</Email>
+            </Update>
+            <Update release="3">
+                <Date>2016-08-14</Date>
+                <Version>0.13.0</Version>
+                <Comment>Rebuild</Comment>
+                <Name>Yusuf Aydemir</Name>
+                <Email>yusuf.aydemir@pisilinux.org</Email>
+            </Update>
+            <Update release="2">
+                <Date>2016-07-15</Date>
+                <Version>0.13.0</Version>
+                <Comment>Fix session authorization issue and add rules</Comment>
+                <Name>Yusuf Aydemir</Name>
+                <Email>yusuf.aydemir@pisilinux.org</Email>
+            </Update>
+            <Update release="1">
+                <Date>2015-11-18</Date>
+                <Version>0.13.0</Version>
+                <Comment>First release</Comment>
+                <Name>Yusuf Aydemir</Name>
+                <Email>yusuf.aydemir@pisilinux.org</Email>
+            </Update>
+        </History>
+    </SpecFile>
     <SpecFile>
         <Source>
             <Name>lxdm</Name>
@@ -55677,105 +55783,6 @@ thunar-volman is installed and configured properly, and you plug in your digical
             </Update>
         </History>
     </SpecFile>
-    <SpecFile>
-        <Source>
-            <Name>yakuake</Name>
-            <Homepage>http://extragear.kde.org/apps/yakuake</Homepage>
-            <Packager>
-                <Name>PisiLinux Community</Name>
-                <Email>admins@pisilinux.org</Email>
-            </Packager>
-            <License>GPLv2</License>
-            <IsA>app:gui</IsA>
-            <PartOf>desktop.kde.applications</PartOf>
-            <Summary xml:lang="en">Very powerful Quake style Konsole for KDE4</Summary>
-            <Summary xml:lang="tr">KDE5 için Quake tarzı oldukça güçlü bir Konsole</Summary>
-            <Description xml:lang="en">The name comes from Yet Another Kuake (thus YaKuake). Its behaviour is similar to the console of the Quake game.</Description>
-            <Description xml:lang="tr">İsmi Bir Başka Kuake (Yet Another Kuake - YaKuake) sözcüklerinden gelmektedir. Quake oyunundaki konsola benzer.</Description>
-            <Icon>yakuake</Icon>
-            <Archive type="tarxz" sha1sum="8e5b43995cc01a127364969d74e2272c40933176">mirrors://kde/stable/yakuake/3.0.2/src/yakuake-3.0.2.tar.xz</Archive>
-            <BuildDependencies>
-                <Dependency>qt5-base-devel</Dependency>
-                <Dependency>libX11-devel</Dependency>
-                <Dependency>qt5-x11extras-devel</Dependency>
-                <Dependency>knewstuff-devel</Dependency>
-                <Dependency>kio-devel</Dependency>
-                <Dependency>kparts-devel</Dependency>
-                <Dependency>knotifyconfig-devel</Dependency>
-                <Dependency>karchive-devel</Dependency>
-                <Dependency>kcoreaddons-devel</Dependency>
-                <Dependency>kconfig-devel</Dependency>
-                <Dependency>kcrash-devel</Dependency>
-                <Dependency>kdbusaddons-devel</Dependency>
-                <Dependency>kglobalaccel-devel</Dependency>
-                <Dependency>ki18n-devel</Dependency>
-                <Dependency>kiconthemes-devel</Dependency>
-                <Dependency>knewstuff-devel</Dependency>
-                <Dependency>knotifications-devel</Dependency>
-                <Dependency>kparts-devel</Dependency>
-                <Dependency>kwidgetsaddons-devel</Dependency>
-                <Dependency>kwindowsystem-devel</Dependency>
-                <Dependency>gettext-devel</Dependency>
-                <Dependency>extra-cmake-modules</Dependency>
-            </BuildDependencies>
-            <SourceURI>desktop/kde/applications/yakuake/pspec.xml</SourceURI>
-        </Source>
-        <Package>
-            <Name>yakuake</Name>
-            <RuntimeDependencies>
-                <Dependency>qt5-base</Dependency>
-                <Dependency>qt5-x11extras</Dependency>
-                <Dependency>kio</Dependency>
-                <Dependency>kcrash</Dependency>
-                <Dependency>ki18n</Dependency>
-                <Dependency>kparts</Dependency>
-                <Dependency>kconfig</Dependency>
-                <Dependency>kxmlgui</Dependency>
-                <Dependency>karchive</Dependency>
-                <Dependency>kservice</Dependency>
-                <Dependency>knewstuff</Dependency>
-                <Dependency>kcoreaddons</Dependency>
-                <Dependency>kdbusaddons</Dependency>
-                <Dependency>kiconthemes</Dependency>
-                <Dependency>kglobalaccel</Dependency>
-                <Dependency>knotifyconfig</Dependency>
-                <Dependency>kwindowsystem</Dependency>
-                <Dependency>kconfigwidgets</Dependency>
-                <Dependency>knotifications</Dependency>
-                <Dependency>kwidgetsaddons</Dependency>
-                <Dependency>libX11</Dependency>
-                <Dependency>libgcc</Dependency>
-            </RuntimeDependencies>
-            <Files>
-                <Path fileType="config">/etc/xdg</Path>
-                <Path fileType="executable">/usr/bin</Path>
-                <Path fileType="library">/usr/lib</Path>
-                <Path fileType="library">/usr/lib/qt5</Path>
-                <Path fileType="data">/usr/share</Path>
-                <Path fileType="localedata">/usr/share/locale</Path>
-                <Path fileType="doc">/usr/share/doc</Path>
-            </Files>
-            <AdditionalFiles>
-                <AdditionalFile target="/usr/share/kde4/apps/yakuake/yakuake.notifyrc" permission="0644" owner="root">yakuake.notifyrc</AdditionalFile>
-            </AdditionalFiles>
-        </Package>
-        <History>
-            <Update release="2">
-                <Date>2016-05-23</Date>
-                <Version>3.0.2</Version>
-                <Comment>Release bump</Comment>
-                <Name>Stefan Gronewold(groni)</Name>
-                <Email>groni@pisilinux.org</Email>
-            </Update>
-            <Update release="1">
-                <Date>2016-03-07</Date>
-                <Version>3.0.2</Version>
-                <Comment>First release</Comment>
-                <Name>Stefan Gronewold(groni)</Name>
-                <Email>groni@pisilinux.org</Email>
-            </Update>
-        </History>
-    </SpecFile>
     <SpecFile>
         <Source>
             <Name>plasma-applet-distrowatcher</Name>
@@ -63619,112 +63626,6 @@ thunar-volman is installed and configured properly, and you plug in your digical
             </Update>
         </History>
     </SpecFile>
-    <SpecFile>
-        <Source>
-            <Name>sddm</Name>
-            <Homepage>https://github.com/sddm/sddm</Homepage>
-            <Packager>
-                <Name>Pisi Linux Admins</Name>
-                <Email>admin@pisilinux.org</Email>
-            </Packager>
-            <License>LGPLv2</License>
-            <IsA>library</IsA>
-            <IsA>app:console</IsA>
-            <PartOf>desktop.kde.plasma</PartOf>
-            <Summary xml:lang="en">QML based X11 display manager</Summary>
-            <Summary xml:lang="tr">QML tabanlı X11 görüntü yöneticisi.</Summary>
-            <Description xml:lang="en">KDE Power Management module. Provides kded daemon DBus helper and KCM for configuring Power settings</Description>
-            <Archive type="tarxz" sha1sum="ee92a2b27602c13d6ac5cfd34399192a31ca033c">https://github.com/sddm/sddm/releases/download/v0.14.0/sddm-0.14.0.tar.xz</Archive>
-            <BuildDependencies>
-                <Dependency>qt5-base-devel</Dependency>
-                <Dependency>qt5-linguist</Dependency>
-                <Dependency>qt5-declarative-devel</Dependency>
-                <Dependency>libxcb-devel</Dependency>
-                <Dependency>libxkbfile-devel</Dependency>
-                <Dependency>pam-devel</Dependency>
-                <Dependency>extra-cmake-modules</Dependency>
-                <Dependency>docutils</Dependency>
-            </BuildDependencies>
-            <Patches>
-                <Patch>sddm-respect-user-flags.patch</Patch>
-                <Patch>ecb903e4.patch</Patch>
-            </Patches>
-            <SourceURI>desktop/kde/plasma/sddm/pspec.xml</SourceURI>
-        </Source>
-        <Package>
-            <Name>sddm</Name>
-            <RuntimeDependencies>
-                <Dependency>qt5-base</Dependency>
-                <Dependency>qt5-declarative</Dependency>
-                <Dependency>pam</Dependency>
-                <Dependency>libgcc</Dependency>
-                <Dependency>libxcb</Dependency>
-            </RuntimeDependencies>
-            <Files>
-                <Path fileType="config">/etc</Path>
-                <Path fileType="data">/usr/share</Path>
-                <Path fileType="executable">/usr/bin</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>
-            <Conflicts>
-                <Package>lightdm</Package>
-                <Package>lxdm</Package>
-                <Package>mdm</Package>
-                <Package>gdm</Package>
-                <Package>slim</Package>
-            </Conflicts>
-            <Provides>
-                <COMAR script="service.py">System.Service</COMAR>
-                <COMAR script="package.py">System.Package</COMAR>
-            </Provides>
-            <AdditionalFiles>
-                <AdditionalFile target="/etc/sddm.conf" permission="0644" owner="root">sddm.conf</AdditionalFile>
-                <AdditionalFile target="/etc/pam.d/sddm" permission="0644" owner="root">sddm</AdditionalFile>
-                <AdditionalFile target="/etc/pam.d/sddm-autologin" permission="0644" owner="root">sddm-autologin</AdditionalFile>
-                <AdditionalFile target="/etc/polkit-1/rules.d/10-backlight.rules" permission="0644" owner="root">10-backlight.rules</AdditionalFile>
-            </AdditionalFiles>
-        </Package>
-        <History>
-            <Update release="5">
-                <Date>2016-10-06</Date>
-                <Version>0.14.0</Version>
-                <Comment>Version bump.</Comment>
-                <Name>Stefan Gronewold</Name>
-                <Email>groni@pisilinux.org</Email>
-            </Update>
-            <Update release="4">
-                <Date>2016-09-07</Date>
-                <Version>0.13.0</Version>
-                <Comment>Add conflict list</Comment>
-                <Name>Yusuf Aydemir</Name>
-                <Email>yusuf.aydemir@pisilinux.org</Email>
-            </Update>
-            <Update release="3">
-                <Date>2016-08-14</Date>
-                <Version>0.13.0</Version>
-                <Comment>Rebuild</Comment>
-                <Name>Yusuf Aydemir</Name>
-                <Email>yusuf.aydemir@pisilinux.org</Email>
-            </Update>
-            <Update release="2">
-                <Date>2016-07-15</Date>
-                <Version>0.13.0</Version>
-                <Comment>Fix session authorization issue and add rules</Comment>
-                <Name>Yusuf Aydemir</Name>
-                <Email>yusuf.aydemir@pisilinux.org</Email>
-            </Update>
-            <Update release="1">
-                <Date>2015-11-18</Date>
-                <Version>0.13.0</Version>
-                <Comment>First release</Comment>
-                <Name>Yusuf Aydemir</Name>
-                <Email>yusuf.aydemir@pisilinux.org</Email>
-            </Update>
-        </History>
-    </SpecFile>
     <SpecFile>
         <Source>
             <Name>powerdevil</Name>
@@ -101149,6 +101050,105 @@ uses SIMD instructions (MMX, SSE2, etc.) to accelerate baseline JPEG compression
             </Update>
         </History>
     </SpecFile>
+    <SpecFile>
+        <Source>
+            <Name>yakuake</Name>
+            <Homepage>http://extragear.kde.org/apps/yakuake</Homepage>
+            <Packager>
+                <Name>PisiLinux Community</Name>
+                <Email>admins@pisilinux.org</Email>
+            </Packager>
+            <License>GPLv2</License>
+            <IsA>app:gui</IsA>
+            <PartOf>x11.terminal</PartOf>
+            <Summary xml:lang="en">Very powerful Quake style Konsole for KDE4</Summary>
+            <Summary xml:lang="tr">KDE5 için Quake tarzı oldukça güçlü bir Konsole</Summary>
+            <Description xml:lang="en">The name comes from Yet Another Kuake (thus YaKuake). Its behaviour is similar to the console of the Quake game.</Description>
+            <Description xml:lang="tr">İsmi Bir Başka Kuake (Yet Another Kuake - YaKuake) sözcüklerinden gelmektedir. Quake oyunundaki konsola benzer.</Description>
+            <Icon>yakuake</Icon>
+            <Archive type="tarxz" sha1sum="8e5b43995cc01a127364969d74e2272c40933176">mirrors://kde/stable/yakuake/3.0.2/src/yakuake-3.0.2.tar.xz</Archive>
+            <BuildDependencies>
+                <Dependency>qt5-base-devel</Dependency>
+                <Dependency>libX11-devel</Dependency>
+                <Dependency>qt5-x11extras-devel</Dependency>
+                <Dependency>knewstuff-devel</Dependency>
+                <Dependency>kio-devel</Dependency>
+                <Dependency>kparts-devel</Dependency>
+                <Dependency>knotifyconfig-devel</Dependency>
+                <Dependency>karchive-devel</Dependency>
+                <Dependency>kcoreaddons-devel</Dependency>
+                <Dependency>kconfig-devel</Dependency>
+                <Dependency>kcrash-devel</Dependency>
+                <Dependency>kdbusaddons-devel</Dependency>
+                <Dependency>kglobalaccel-devel</Dependency>
+                <Dependency>ki18n-devel</Dependency>
+                <Dependency>kiconthemes-devel</Dependency>
+                <Dependency>knewstuff-devel</Dependency>
+                <Dependency>knotifications-devel</Dependency>
+                <Dependency>kparts-devel</Dependency>
+                <Dependency>kwidgetsaddons-devel</Dependency>
+                <Dependency>kwindowsystem-devel</Dependency>
+                <Dependency>gettext-devel</Dependency>
+                <Dependency>extra-cmake-modules</Dependency>
+            </BuildDependencies>
+            <SourceURI>x11/terminal/yakuake/pspec.xml</SourceURI>
+        </Source>
+        <Package>
+            <Name>yakuake</Name>
+            <RuntimeDependencies>
+                <Dependency>qt5-base</Dependency>
+                <Dependency>qt5-x11extras</Dependency>
+                <Dependency>kio</Dependency>
+                <Dependency>kcrash</Dependency>
+                <Dependency>ki18n</Dependency>
+                <Dependency>kparts</Dependency>
+                <Dependency>kconfig</Dependency>
+                <Dependency>kxmlgui</Dependency>
+                <Dependency>karchive</Dependency>
+                <Dependency>kservice</Dependency>
+                <Dependency>knewstuff</Dependency>
+                <Dependency>kcoreaddons</Dependency>
+                <Dependency>kdbusaddons</Dependency>
+                <Dependency>kiconthemes</Dependency>
+                <Dependency>kglobalaccel</Dependency>
+                <Dependency>knotifyconfig</Dependency>
+                <Dependency>kwindowsystem</Dependency>
+                <Dependency>kconfigwidgets</Dependency>
+                <Dependency>knotifications</Dependency>
+                <Dependency>kwidgetsaddons</Dependency>
+                <Dependency>libX11</Dependency>
+                <Dependency>libgcc</Dependency>
+            </RuntimeDependencies>
+            <Files>
+                <Path fileType="config">/etc/xdg</Path>
+                <Path fileType="executable">/usr/bin</Path>
+                <Path fileType="library">/usr/lib</Path>
+                <Path fileType="library">/usr/lib/qt5</Path>
+                <Path fileType="data">/usr/share</Path>
+                <Path fileType="localedata">/usr/share/locale</Path>
+                <Path fileType="doc">/usr/share/doc</Path>
+            </Files>
+            <AdditionalFiles>
+                <AdditionalFile target="/usr/share/kde4/apps/yakuake/yakuake.notifyrc" permission="0644" owner="root">yakuake.notifyrc</AdditionalFile>
+            </AdditionalFiles>
+        </Package>
+        <History>
+            <Update release="2">
+                <Date>2016-05-23</Date>
+                <Version>3.0.2</Version>
+                <Comment>Release bump</Comment>
+                <Name>Stefan Gronewold(groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+            <Update release="1">
+                <Date>2016-03-07</Date>
+                <Version>3.0.2</Version>
+                <Comment>First release</Comment>
+                <Name>Stefan Gronewold(groni)</Name>
+                <Email>groni@pisilinux.org</Email>
+            </Update>
+        </History>
+    </SpecFile>
     <SpecFile>
         <Source>
             <Name>xkeyboard-config</Name>
diff --git a/pisi-index.xml.sha1sum b/pisi-index.xml.sha1sum
index b91e48158d..54cc103652 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1 @@
-7bef5bd174f1dd9111dd77988d5d5f652c5126f1
\ No newline at end of file
+c518c79560db002d9fd3167528786c485f93a239
\ No newline at end of file
diff --git a/pisi-index.xml.xz b/pisi-index.xml.xz
index 3d8de33271..c627c16a17 100644
Binary files a/pisi-index.xml.xz and b/pisi-index.xml.xz differ
diff --git a/pisi-index.xml.xz.sha1sum b/pisi-index.xml.xz.sha1sum
index 54e0fa12ca..66dec07e29 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1 @@
-3a0628f1cb21622b27752429b89bf4c9896599f5
\ No newline at end of file
+c1f0979dd4adc30ed0132165b1a3b6c58d1c46a6
\ No newline at end of file
diff --git a/desktop/kde/applications/yakuake/actions.py b/x11/terminal/yakuake/actions.py
similarity index 100%
rename from desktop/kde/applications/yakuake/actions.py
rename to x11/terminal/yakuake/actions.py
diff --git a/desktop/kde/applications/yakuake/files/yakuake.notifyrc b/x11/terminal/yakuake/files/yakuake.notifyrc
similarity index 100%
rename from desktop/kde/applications/yakuake/files/yakuake.notifyrc
rename to x11/terminal/yakuake/files/yakuake.notifyrc
diff --git a/desktop/kde/applications/yakuake/pspec.xml b/x11/terminal/yakuake/pspec.xml
similarity index 100%
rename from desktop/kde/applications/yakuake/pspec.xml
rename to x11/terminal/yakuake/pspec.xml
diff --git a/desktop/kde/applications/yakuake/translations.xml b/x11/terminal/yakuake/translations.xml
similarity index 100%
rename from desktop/kde/applications/yakuake/translations.xml
rename to x11/terminal/yakuake/translations.xml