diff --git a/pisi-index.xml b/pisi-index.xml
index 4e00a4d4d6..89c38ec4e0 100644
--- a/pisi-index.xml
+++ b/pisi-index.xml
@@ -55783,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>
@@ -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 464b0a8ab3..54cc103652 100644
--- a/pisi-index.xml.sha1sum
+++ b/pisi-index.xml.sha1sum
@@ -1 +1 @@
-8ec569645a1691390654ca71adb9559e464f483d
\ 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 35506d4b83..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 879e82fbba..66dec07e29 100644
--- a/pisi-index.xml.xz.sha1sum
+++ b/pisi-index.xml.xz.sha1sum
@@ -1 +1 @@
-983a10940d02f5b848f545dc69cd1e69e7b9492e
\ 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