diff --git a/comps-f7.xml.in b/comps-f7.xml.in
index deaceb6e..72e30cd8 100644
--- a/comps-f7.xml.in
+++ b/comps-f7.xml.in
@@ -962,35 +962,29 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">amarok</packagereq>
-      <packagereq type="default">apollon</packagereq>
       <packagereq type="default">basket</packagereq>
-      <packagereq type="default">beryl-kde</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">digikamimageplugins</packagereq>
-      <packagereq type="default">gift-gnutella</packagereq>
-      <packagereq type="default">gift-openft</packagereq>
       <packagereq type="default">gpgme</packagereq>
       <packagereq type="default">gtk-qt-engine</packagereq>
       <packagereq type="default">kaffeine</packagereq>
-      <packagereq type="default">kdeartwork-extras</packagereq>
       <packagereq type="default">kdemultimedia-extras</packagereq>
       <packagereq type="default">kdetoys</packagereq>
-      <packagereq type="default">kerry</packagereq>
       <packagereq type="default">kiosktool</packagereq>
       <packagereq type="default">kipi-plugins</packagereq>
       <packagereq type="default">kleansweep</packagereq>
       <packagereq type="default">kmenu-gnome</packagereq>
       <packagereq type="default">kmymoney2</packagereq>
       <packagereq type="default">knetworkmanager</packagereq>
-      <packagereq type="default">koffice-suite</packagereq>
       <packagereq type="default">konversation</packagereq>
       <packagereq type="default">kpowersave</packagereq>
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
-      <packagereq type="default">rss-glx-kde</packagereq>
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">xdg-user-dirs</packagereq>
       <packagereq type="default">xdg-utils</packagereq>
+      <packagereq type="optional">apollon</packagereq>
+      <packagereq type="optional">beryl-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">dolphin</packagereq>
       <packagereq type="optional">kasablanca</packagereq>
@@ -999,13 +993,16 @@
       <packagereq type="optional">kbibtex</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>
+      <packagereq type="optional">kdeartwork-extras</packagereq>
       <packagereq type="optional">kdegraphics-extras</packagereq>
       <packagereq type="optional">kdissert</packagereq>
       <packagereq type="optional">kdmtheme</packagereq>
+      <packagereq type="optional">kerry</packagereq>
       <packagereq type="optional">kickpim</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmobiletools</packagereq>
       <packagereq type="optional">knemo</packagereq>
+      <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">kompose</packagereq>
       <packagereq type="optional">kooldock</packagereq>
       <packagereq type="optional">krecipes</packagereq>
@@ -1021,6 +1018,7 @@
       <packagereq type="optional">polyester</packagereq>
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
+      <packagereq type="optional">rss-glx-kde</packagereq>
       <packagereq type="optional">smb4k</packagereq>
     </packagelist>
   </group>
diff --git a/comps-fe7.xml.in b/comps-fe7.xml.in
index deaceb6e..72e30cd8 100644
--- a/comps-fe7.xml.in
+++ b/comps-fe7.xml.in
@@ -962,35 +962,29 @@
     <uservisible>true</uservisible>
     <packagelist>
       <packagereq type="default">amarok</packagereq>
-      <packagereq type="default">apollon</packagereq>
       <packagereq type="default">basket</packagereq>
-      <packagereq type="default">beryl-kde</packagereq>
       <packagereq type="default">digikam</packagereq>
       <packagereq type="default">digikamimageplugins</packagereq>
-      <packagereq type="default">gift-gnutella</packagereq>
-      <packagereq type="default">gift-openft</packagereq>
       <packagereq type="default">gpgme</packagereq>
       <packagereq type="default">gtk-qt-engine</packagereq>
       <packagereq type="default">kaffeine</packagereq>
-      <packagereq type="default">kdeartwork-extras</packagereq>
       <packagereq type="default">kdemultimedia-extras</packagereq>
       <packagereq type="default">kdetoys</packagereq>
-      <packagereq type="default">kerry</packagereq>
       <packagereq type="default">kiosktool</packagereq>
       <packagereq type="default">kipi-plugins</packagereq>
       <packagereq type="default">kleansweep</packagereq>
       <packagereq type="default">kmenu-gnome</packagereq>
       <packagereq type="default">kmymoney2</packagereq>
       <packagereq type="default">knetworkmanager</packagereq>
-      <packagereq type="default">koffice-suite</packagereq>
       <packagereq type="default">konversation</packagereq>
       <packagereq type="default">kpowersave</packagereq>
       <packagereq type="default">ktorrent</packagereq>
       <packagereq type="default">pinentry-qt</packagereq>
-      <packagereq type="default">rss-glx-kde</packagereq>
       <packagereq type="default">scribus</packagereq>
       <packagereq type="default">xdg-user-dirs</packagereq>
       <packagereq type="default">xdg-utils</packagereq>
+      <packagereq type="optional">apollon</packagereq>
+      <packagereq type="optional">beryl-kde</packagereq>
       <packagereq type="optional">crystal</packagereq>
       <packagereq type="optional">dolphin</packagereq>
       <packagereq type="optional">kasablanca</packagereq>
@@ -999,13 +993,16 @@
       <packagereq type="optional">kbibtex</packagereq>
       <packagereq type="optional">kbilliards</packagereq>
       <packagereq type="optional">kchmviewer</packagereq>
+      <packagereq type="optional">kdeartwork-extras</packagereq>
       <packagereq type="optional">kdegraphics-extras</packagereq>
       <packagereq type="optional">kdissert</packagereq>
       <packagereq type="optional">kdmtheme</packagereq>
+      <packagereq type="optional">kerry</packagereq>
       <packagereq type="optional">kickpim</packagereq>
       <packagereq type="optional">klamav</packagereq>
       <packagereq type="optional">kmobiletools</packagereq>
       <packagereq type="optional">knemo</packagereq>
+      <packagereq type="optional">koffice-suite</packagereq>
       <packagereq type="optional">kompose</packagereq>
       <packagereq type="optional">kooldock</packagereq>
       <packagereq type="optional">krecipes</packagereq>
@@ -1021,6 +1018,7 @@
       <packagereq type="optional">polyester</packagereq>
       <packagereq type="optional">rekall</packagereq>
       <packagereq type="optional">rsibreak</packagereq>
+      <packagereq type="optional">rss-glx-kde</packagereq>
       <packagereq type="optional">smb4k</packagereq>
     </packagelist>
   </group>