diff --git a/fedora-categories.xml b/fedora-categories.xml
index 6793d41..3362122 100644
--- a/fedora-categories.xml
+++ b/fedora-categories.xml
@@ -5,522 +5,609 @@
   <component type="desktop">
     <id>org.kde.amarok.desktop</id>
     <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Cheese.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Totem.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>pitivi.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>vlc.desktop</id>
+    <categories>
+      <category>AudioVideo</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>ardour5.desktop</id>
     <categories>
+      <category>AudioVideo</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>audacity.desktop</id>
     <categories>
+      <category>AudioVideo</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>banshee.desktop</id>
     <categories>
+      <category>AudioVideo</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>brasero.desktop</id>
     <categories>
+      <category>AudioVideo</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>easytag.desktop</id>
     <categories>
+      <category>AudioVideo</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Music.desktop</id>
     <categories>
+      <category>AudioVideo</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>rhythmbox.desktop</id>
     <categories>
+      <category>AudioVideo</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>com.rosegardenmusic.rosegarden.desktop</id>
     <categories>
+      <category>AudioVideo</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.SoundJuicer.desktop</id>
     <categories>
+      <category>AudioVideo</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>org.gnome.Builder.desktop</id>
+    <categories>
+      <category>Development</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Devhelp.desktop</id>
     <categories>
+      <category>Development</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>d-feet.desktop</id>
     <categories>
+      <category>Development</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>eclipse.desktop</id>
     <categories>
+      <category>Development</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gitg.desktop</id>
     <categories>
+      <category>Development</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>glade.desktop</id>
     <categories>
+      <category>Development</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>monodevelop.desktop</id>
     <categories>
+      <category>Development</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.gedit.desktop</id>
     <categories>
+      <category>Development</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>celestia.desktop</id>
     <categories>
+      <category>Science</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>0ad.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>btanks.desktop</id>
     <categories>
+      <category>Game</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>endless-sky.desktop</id>
+    <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>frozen-bubble.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-chess.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-mahjongg.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-mines.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-sudoku.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-tetravex.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>iagno.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>lightsoff.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>neverball.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>openarena.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>quadrapassel.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>redeclipse.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>sol.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>supertuxkart.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>swell-foop.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>tremulous.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>wesnoth.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>xonotic.desktop</id>
     <categories>
+      <category>Game</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>blender.desktop</id>
     <categories>
+      <category>Graphics</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>darktable.desktop</id>
     <categories>
+      <category>Graphics</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gimp.desktop</id>
     <categories>
+      <category>Graphics</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>inkscape.desktop</id>
     <categories>
+      <category>Graphics</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>libreoffice-draw.desktop</id>
     <categories>
+      <category>Graphics</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>mypaint.desktop</id>
     <categories>
+      <category>Graphics</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.font-viewer.desktop</id>
     <categories>
+      <category>Graphics</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>scribus.desktop</id>
     <categories>
+      <category>Graphics</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>shotwell.desktop</id>
     <categories>
+      <category>Graphics</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>simple-scan.desktop</id>
     <categories>
+      <category>Graphics</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>chromium-browser.desktop</id>
     <categories>
+      <category>Network</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Epiphany.desktop</id>
     <categories>
+      <category>Network</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>firefox.desktop</id>
     <categories>
+      <category>Network</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Geary.desktop</id>
     <categories>
+      <category>Network</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>mozilla-thunderbird.desktop</id>
     <categories>
+      <category>Network</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Polari.desktop</id>
     <categories>
+      <category>Network</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>pidgin.desktop</id>
     <categories>
+      <category>Network</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>transmission-gtk.desktop</id>
     <categories>
+      <category>Network</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>vinagre.desktop</id>
     <categories>
+      <category>Network</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>abiword.desktop</id>
     <categories>
+      <category>Office</category>
+      <category>Featured</category>
+    </categories>
+  </component>
+  <component type="desktop">
+    <id>homebank.desktop</id>
+    <categories>
+      <category>Office</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Evolution.desktop</id>
     <categories>
+      <category>Office</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Geary.desktop</id>
     <categories>
+      <category>Office</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnucash.desktop</id>
     <categories>
+      <category>Office</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnumeric.desktop</id>
     <categories>
+      <category>Office</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gramps.desktop</id>
     <categories>
+      <category>Office</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>libreoffice-calc.desktop</id>
     <categories>
+      <category>Office</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>libreoffice-impress.desktop</id>
     <categories>
+      <category>Office</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>libreoffice-writer.desktop</id>
     <categories>
+      <category>Office</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>lyx.desktop</id>
     <categories>
+      <category>Office</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>www.octave.org-octave.desktop</id>
     <categories>
+      <category>Education</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>saoimage.desktop</id>
     <categories>
+      <category>Education</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>stellarium.desktop</id>
     <categories>
+      <category>Education</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.DiskUtility.desktop</id>
     <categories>
+      <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gparted.desktop</id>
     <categories>
+      <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Boxes.desktop</id>
     <categories>
+      <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>virt-manager.desktop</id>
     <categories>
+      <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.bijiben.desktop</id>
     <categories>
+      <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.clocks.desktop</id>
     <categories>
+      <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Documents.desktop</id>
     <categories>
+      <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Photos.desktop</id>
     <categories>
+      <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>workrave.desktop</id>
     <categories>
+      <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>openshot-qt.desktop</id>
     <categories>
-      <category>Featured</category>
-    </categories>
-  </component>
-  <component type="desktop">
-    <id>org.gnome.Cheese.desktop</id>
-    <categories>
-      <category>Featured</category>
-    </categories>
-  </component>
-  <component type="desktop">
-    <id>org.gnome.Totem.desktop</id>
-    <categories>
-      <category>Featured</category>
-    </categories>
-  </component>
-  <component type="desktop">
-    <id>pitivi.desktop</id>
-    <categories>
-      <category>Featured</category>
-    </categories>
-  </component>
-  <component type="desktop">
-    <id>vlc.desktop</id>
-    <categories>
-      <category>Featured</category>
-    </categories>
-  </component>
-  <component type="desktop">
-    <id>org.gnome.Builder.desktop</id>
-    <categories>
-      <category>Featured</category>
-    </categories>
-  </component>
-  <component type="desktop">
-    <id>homebank.desktop</id>
-    <categories>
-      <category>Featured</category>
-    </categories>
-  </component>
-  <component type="desktop">
-    <id>endless-sky.desktop</id>
-    <categories>
+      <category>Utility</category>
       <category>Featured</category>
     </categories>
   </component>