diff --git a/comps-f7.xml.in b/comps-f7.xml.in
index ae6a6de3..947f3f53 100644
--- a/comps-f7.xml.in
+++ b/comps-f7.xml.in
@@ -311,11 +311,11 @@
       <packagereq type="default">authconfig-gtk</packagereq>
       <packagereq type="default">bluez-pin</packagereq>
       <packagereq type="default">dejavu-lgc-fonts</packagereq>
-      <packagereq type="default">liberation-fonts</packagereq>
       <packagereq type="default">firstboot</packagereq>
       <packagereq type="default">gdm</packagereq>
       <packagereq type="default">glx-utils</packagereq>
       <packagereq type="default">krb5-auth-dialog</packagereq>
+      <packagereq type="default">liberation-fonts</packagereq>
       <packagereq type="default">linuxwacom</packagereq>
       <packagereq type="default">openssh-askpass</packagereq>
       <packagereq type="default">pirut</packagereq>
@@ -1446,8 +1446,6 @@
       <packagereq type="mandatory">yelp</packagereq>
       <packagereq type="default">alacarte</packagereq>
       <packagereq type="default">at-spi</packagereq>
-      <packagereq type="optional">beagle-evolution</packagereq>
-      <packagereq type="optional">beagle-gui</packagereq>
       <packagereq type="default">bug-buddy</packagereq>
       <packagereq type="default">compiz</packagereq>
       <packagereq type="default">desktop-printing</packagereq>
@@ -1488,6 +1486,8 @@
       <packagereq type="default">tomboy</packagereq>
       <packagereq type="default">vino</packagereq>
       <packagereq type="default">xdg-user-dirs-gtk</packagereq>
+      <packagereq type="optional">beagle-evolution</packagereq>
+      <packagereq type="optional">beagle-gui</packagereq>
       <packagereq type="optional">beryl-gnome</packagereq>
       <packagereq type="optional">buoh</packagereq>
       <packagereq type="optional">byzanz</packagereq>
@@ -2610,7 +2610,7 @@
       <packagereq type="optional">taskjuggler</packagereq>
       <packagereq type="optional">tetex-xdvi</packagereq>
       <packagereq type="optional">texmaker</packagereq>
-      <packagereq type="optional">tinyerp</packagereq>  
+      <packagereq type="optional">tinyerp</packagereq>
       <packagereq type="optional">tinyerp-server</packagereq>
       <packagereq type="optional">vym</packagereq>
       <packagereq type="optional">xchm</packagereq>
@@ -3549,10 +3549,10 @@
       <packagereq type="optional">Pound</packagereq>
       <packagereq type="optional">tclhttpd</packagereq>
       <packagereq type="optional">thttpd</packagereq>
+      <packagereq type="optional">tiquit</packagereq>
       <packagereq type="optional">tomcat5</packagereq>
       <packagereq type="optional">tomcat5-admin-webapps</packagereq>
       <packagereq type="optional">tomcat5-webapps</packagereq>
-      <packagereq type="optional">tiquit</packagereq>
       <packagereq type="optional">TurboGears</packagereq>
       <packagereq type="optional">vdr-wapd</packagereq>
       <packagereq type="optional">vdradmin-am</packagereq>
@@ -3957,4 +3957,3 @@
     </grouplist>
   </category>
 </comps>
-