diff --git a/appstream-data.spec b/appstream-data.spec
index efb2de9..ec0fd20 100644
--- a/appstream-data.spec
+++ b/appstream-data.spec
@@ -1,18 +1,19 @@
 Summary:   Fedora AppStream metadata
 Name:      appstream-data
 Version:   25
-Release:   3%{?dist}
+Release:   23%{?dist}
 BuildArch: noarch
 License:   CC0 and CC-BY and CC-BY-SA and GFDL
 URL:       https://github.com/hughsie/createrepo_as
-Source1:   https://alt.fedoraproject.org/pub/alt/screenshots/f25/fedora-%{version}.xml.gz
-Source2:   https://alt.fedoraproject.org/pub/alt/screenshots/f25/fedora-%{version}-icons.tar.gz
+Source1:   https://dl.fedoraproject.org/pub/alt/screenshots/f25/fedora-%{version}.xml.gz
+Source2:   https://dl.fedoraproject.org/pub/alt/screenshots/f25/fedora-%{version}-icons.tar.gz
 Source3:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/adobe-flash.xml
 Source4:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/gstreamer-non-free.xml
 Source5:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/other-repos.xml
 Source6:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/webapps.xml
 Source7:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-categories.xml
 Source8:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/fedora-popular.xml
+Source9:   https://raw.githubusercontent.com/hughsie/fedora-appstream/master/appstream-extra/steam-oars.xml
 
 BuildRequires: libappstream-glib
 
@@ -25,7 +26,7 @@ createrepo_as and the extra data in fedora-appstream.
 
 DESTDIR=%{buildroot} appstream-util install-origin fedora %{SOURCE1} %{SOURCE2}
 DESTDIR=%{buildroot} appstream-util install \
-	%{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8}
+	%{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9}
 
 %check
 if ! gunzip -c %{buildroot}%{_datadir}/app-info/xmls/fedora.xml.gz | grep -q '<pkgname>gstreamer1-plugin-openh264</pkgname>' ; then
@@ -44,6 +45,67 @@ fi
 %dir %{_datadir}/app-info/xmls
 
 %changelog
+* Wed Nov 29 2017 Kalev Lember <klember@redhat.com> 25-23
+- New metadata version
+
+* Thu Aug 31 2017 Kalev Lember <klember@redhat.com> 25-22
+- New metadata version
+
+* Fri Aug 04 2017 Kalev Lember <klember@redhat.com> 25-21
+- New metadata version
+
+* Fri Jul 21 2017 Kalev Lember <klember@redhat.com> 25-20
+- New metadata version
+
+* Wed Jun 14 2017 Kalev Lember <klember@redhat.com> 25-19
+- New metadata version
+
+* Tue Apr 11 2017 Kalev Lember <klember@redhat.com> 25-18
+- New metadata version
+
+* Mon Mar 06 2017 Kalev Lember <klember@redhat.com> 25-17
+- New metadata version
+
+* Tue Feb 07 2017 Kalev Lember <klember@redhat.com> 25-16
+- New metadata version
+
+* Mon Jan 23 2017 Kalev Lember <klember@redhat.com> 25-15
+- New metadata version
+
+* Mon Jan 16 2017 Kalev Lember <klember@redhat.com> 25-14
+- Add gstreamer1-plugin-mpg123 metadata
+
+* Mon Jan 09 2017 Kalev Lember <klember@redhat.com> 25-13
+- New metadata version
+
+* Fri Dec 30 2016 Kalev Lember <klember@redhat.com> 25-12
+- New metadata version
+
+* Wed Dec 21 2016 Kalev Lember <klember@redhat.com> 25-11
+- New metadata version
+
+* Tue Dec 20 2016 Kalev Lember <klember@redhat.com> 25-10
+- New metadata version
+
+* Sun Dec 04 2016 Kalev Lember <klember@redhat.com> 25-9
+- New metadata version
+
+* Mon Oct 17 2016 Richard Hughes <richard@hughsie.com> 25-8
+- New metadata version
+
+* Fri Oct 14 2016 Richard Hughes <richard@hughsie.com> 25-7
+- New metadata version
+- Add Steam OARS overrides
+
+* Mon Sep 19 2016 Richard Hughes <richard@hughsie.com> 25-6
+- New metadata version
+
+* Tue Aug 09 2016 Richard Hughes <richard@hughsie.com> 25-5
+- New metadata version
+
+* Sun Jun 12 2016 Richard Hughes <richard@hughsie.com> 25-4
+- New metadata version
+
 * Thu May 26 2016 Richard Hughes <richard@hughsie.com> 25-3
 - Add the Fedora-specific popular metadata
 
diff --git a/fedora-categories.xml b/fedora-categories.xml
index 78b6658..dbcedc3 100644
--- a/fedora-categories.xml
+++ b/fedora-categories.xml
@@ -5,523 +5,535 @@
   <component type="desktop">
     <id>amarok.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>ardour4.desktop</id>
+    <id>ardour5.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>audacity.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>banshee.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>brasero.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>easytag.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-music.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>rhythmbox.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>rosegarden.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>sound-juicer.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>anjuta.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>devassistant.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>devhelp.desktop</id>
+    <id>org.gnome.Devhelp.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>d-feet.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>eclipse.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gitg.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>glade.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>monodevelop.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.gedit.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>celestia.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>0ad.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>btanks.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>frozen-bubble.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-chess.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-mahjongg.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-mines.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-sudoku.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnome-tetravex.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>iagno.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>lightsoff.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>neverball.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>openarena.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>quadrapassel.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>redeclipse.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>sol.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>supertuxkart.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>swell-foop.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>tremulous.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>wesnoth.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>xonotic.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>blender.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>darktable.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gimp.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>inkscape.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>libreoffice-draw.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>mypaint.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.font-viewer.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>scribus.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>shotwell.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>simple-scan.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>chromium-browser.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>epiphany.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>firefox.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>geary.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>mozilla-thunderbird.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Polari.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>pidgin.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>transmission-gtk.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>vinagre.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>abiword.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>evolution.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>geary.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnucash.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gnumeric.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gramps.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>libreoffice-calc.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>libreoffice-impress.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>libreoffice-writer.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>lyx.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>octave.desktop</id>
+    <id>www.octave.org-octave.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>saoimage.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>stellarium.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>gnome-disks.desktop</id>
+    <id>org.gnome.DiskUtility.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>gparted.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Boxes.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>virt-manager.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
-    <id>bijiben.desktop</id>
+    <id>org.gnome.bijiben.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.clocks.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Documents.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Photos.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>workrave.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>openshot.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Cheese.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Totem.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>pitivi.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>vlc.desktop</id>
     <categories>
-      <category>featured</category>
+      <category>Featured</category>
     </categories>
   </component>
   <component type="desktop">
     <id>org.gnome.Builder.desktop</id>
     <categories>
-      <category>featured</category>
+      <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>Featured</category>
     </categories>
   </component>
 
diff --git a/fedora-popular.xml b/fedora-popular.xml
index 4bcf139..c0c94e2 100644
--- a/fedora-popular.xml
+++ b/fedora-popular.xml
@@ -3,7 +3,7 @@
 
   <!-- Apps for the GNOME Software "Editor's Picks" list -->
   <component type="desktop">
-    <id>bijiben.desktop</id>
+    <id>org.gnome.bijiben.desktop</id>
     <kudos>
       <kudo>GnomeSoftware::popular</kudo>
     </kudos>
diff --git a/gstreamer-non-free.xml b/gstreamer-non-free.xml
index 522d471..74f99fb 100644
--- a/gstreamer-non-free.xml
+++ b/gstreamer-non-free.xml
@@ -27,7 +27,7 @@
         video editing applications.
       </p>
     </description>
-    <icon type="stock">application-x-executable</icon>
+    <icon type="stock">application-x-addon</icon>
     <categories>
       <category>Addons</category>
       <category>Codecs</category>
@@ -73,7 +73,7 @@
         video editing applications.
       </p>
     </description>
-    <icon type="stock">application-x-executable</icon>
+    <icon type="stock">application-x-addon</icon>
     <categories>
       <category>Addons</category>
       <category>Codecs</category>
@@ -119,7 +119,7 @@
         video editing applications.
       </p>
     </description>
-    <icon type="stock">application-x-executable</icon>
+    <icon type="stock">application-x-addon</icon>
     <categories>
       <category>Addons</category>
       <category>Codecs</category>
diff --git a/sources b/sources
index e435ac0..2669c25 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e47dc12e663d511318882cc6b73b0c3e  fedora-25.xml.gz
-e41e1d2ef1fa3855f4b341c921cc51e6  fedora-25-icons.tar.gz
+SHA512 (fedora-25.xml.gz) = f209fabe6f7ae64259af2dddf38e55c2b8ac300cf0381b408b1f3102e0bc87dfad7d64a2e3f7f6c675e0c58238c0b5a9fe22e040c1f007d4d32df976dc1c1c12
+SHA512 (fedora-25-icons.tar.gz) = a9e072338192a56e47c1a4900a3c131fbbb2177edbd71a9beaae8c1385a6aa84f1fe4353fc8b3db9db83a92d67f0ee7e41838a5e3ffc22c9b728cdcf13d25ce7
diff --git a/steam-oars.xml b/steam-oars.xml
new file mode 100644
index 0000000..1fe86c4
--- /dev/null
+++ b/steam-oars.xml
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<components version="0.9" origin="fedora">
+  <component type="desktop" merge="replace">
+    <id>War Thunder.desktop</id>
+    <content_rating type="oars-1.0">
+      <content_attribute id="violence-cartoon">none</content_attribute>
+      <content_attribute id="violence-fantasy">none</content_attribute>
+      <content_attribute id="violence-realistic">moderate</content_attribute>
+      <content_attribute id="violence-bloodshed">none</content_attribute>
+      <content_attribute id="violence-sexual">none</content_attribute>
+      <content_attribute id="drugs-alcohol">none</content_attribute>
+      <content_attribute id="drugs-narcotics">none</content_attribute>
+      <content_attribute id="drugs-tobacco">none</content_attribute>
+      <content_attribute id="sex-nudity">none</content_attribute>
+      <content_attribute id="sex-themes">none</content_attribute>
+      <content_attribute id="language-profanity">none</content_attribute>
+      <content_attribute id="language-humor">none</content_attribute>
+      <content_attribute id="language-discrimination">none</content_attribute>
+      <content_attribute id="social-chat">intense</content_attribute>
+      <content_attribute id="social-info">none</content_attribute>
+      <content_attribute id="social-audio">none</content_attribute>
+      <content_attribute id="social-location">none</content_attribute>
+      <content_attribute id="social-contacts">none</content_attribute>
+      <content_attribute id="money-purchasing">intense</content_attribute>
+      <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+  </component>
+  <component type="desktop" merge="replace">
+    <id>Half-Life.desktop</id>
+    <content_rating type="oars-1.0">
+      <content_attribute id="violence-cartoon">none</content_attribute>
+      <content_attribute id="violence-fantasy">moderate</content_attribute>
+      <content_attribute id="violence-realistic">moderate</content_attribute>
+      <content_attribute id="violence-bloodshed">none</content_attribute>
+      <content_attribute id="violence-sexual">none</content_attribute>
+      <content_attribute id="drugs-alcohol">none</content_attribute>
+      <content_attribute id="drugs-narcotics">none</content_attribute>
+      <content_attribute id="drugs-tobacco">none</content_attribute>
+      <content_attribute id="sex-nudity">none</content_attribute>
+      <content_attribute id="sex-themes">none</content_attribute>
+      <content_attribute id="language-profanity">none</content_attribute>
+      <content_attribute id="language-humor">none</content_attribute>
+      <content_attribute id="language-discrimination">none</content_attribute>
+      <content_attribute id="social-chat">none</content_attribute>
+      <content_attribute id="social-info">none</content_attribute>
+      <content_attribute id="social-audio">none</content_attribute>
+      <content_attribute id="social-location">none</content_attribute>
+      <content_attribute id="social-contacts">none</content_attribute>
+      <content_attribute id="money-purchasing">none</content_attribute>
+      <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+  </component>
+  <component type="desktop" merge="replace">
+    <id>Killing Floor.desktop</id>
+    <content_rating type="oars-1.0">
+      <content_attribute id="violence-cartoon">none</content_attribute>
+      <content_attribute id="violence-fantasy">intense</content_attribute>
+      <content_attribute id="violence-realistic">intense</content_attribute>
+      <content_attribute id="violence-bloodshed">intense</content_attribute>
+      <content_attribute id="violence-sexual">none</content_attribute>
+      <content_attribute id="drugs-alcohol">none</content_attribute>
+      <content_attribute id="drugs-narcotics">none</content_attribute>
+      <content_attribute id="drugs-tobacco">none</content_attribute>
+      <content_attribute id="sex-nudity">mild</content_attribute>
+      <content_attribute id="sex-themes">none</content_attribute>
+      <content_attribute id="language-profanity">mild</content_attribute>
+      <content_attribute id="language-humor">mild</content_attribute>
+      <content_attribute id="language-discrimination">none</content_attribute>
+      <content_attribute id="social-chat">intense</content_attribute>
+      <content_attribute id="social-info">none</content_attribute>
+      <content_attribute id="social-audio">intense</content_attribute>
+      <content_attribute id="social-location">none</content_attribute>
+      <content_attribute id="social-contacts">none</content_attribute>
+      <content_attribute id="money-purchasing">none</content_attribute>
+      <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+  </component>
+  <component type="desktop" merge="replace">
+    <id>Portal.desktop</id>
+    <content_rating type="oars-1.0">
+      <content_attribute id="violence-cartoon">none</content_attribute>
+      <content_attribute id="violence-fantasy">none</content_attribute>
+      <content_attribute id="violence-realistic">moderate</content_attribute>
+      <content_attribute id="violence-bloodshed">none</content_attribute>
+      <content_attribute id="violence-sexual">none</content_attribute>
+      <content_attribute id="drugs-alcohol">none</content_attribute>
+      <content_attribute id="drugs-narcotics">none</content_attribute>
+      <content_attribute id="drugs-tobacco">none</content_attribute>
+      <content_attribute id="sex-nudity">none</content_attribute>
+      <content_attribute id="sex-themes">none</content_attribute>
+      <content_attribute id="language-profanity">none</content_attribute>
+      <content_attribute id="language-humor">mild</content_attribute>
+      <content_attribute id="language-discrimination">none</content_attribute>
+      <content_attribute id="social-chat">none</content_attribute>
+      <content_attribute id="social-info">none</content_attribute>
+      <content_attribute id="social-audio">none</content_attribute>
+      <content_attribute id="social-location">none</content_attribute>
+      <content_attribute id="social-contacts">none</content_attribute>
+      <content_attribute id="money-purchasing">none</content_attribute>
+      <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+  </component>
+  <component type="desktop" merge="replace">
+    <id>Team Fortress 2.desktop</id>
+    <content_rating type="oars-1.0">
+      <content_attribute id="violence-cartoon">none</content_attribute>
+      <content_attribute id="violence-fantasy">none</content_attribute>
+      <content_attribute id="violence-realistic">intense</content_attribute>
+      <content_attribute id="violence-bloodshed">intense</content_attribute>
+      <content_attribute id="violence-sexual">none</content_attribute>
+      <content_attribute id="drugs-alcohol">moderate</content_attribute>
+      <content_attribute id="drugs-narcotics">none</content_attribute>
+      <content_attribute id="drugs-tobacco">moderate</content_attribute>
+      <content_attribute id="sex-nudity">none</content_attribute>
+      <content_attribute id="sex-themes">none</content_attribute>
+      <content_attribute id="language-profanity">moderate</content_attribute>
+      <content_attribute id="language-humor">moderate</content_attribute>
+      <content_attribute id="language-discrimination">none</content_attribute>
+      <content_attribute id="social-chat">intense</content_attribute>
+      <content_attribute id="social-info">none</content_attribute>
+      <content_attribute id="social-audio">intense</content_attribute>
+      <content_attribute id="social-location">none</content_attribute>
+      <content_attribute id="social-contacts">none</content_attribute>
+      <content_attribute id="money-purchasing">intense</content_attribute>
+      <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+  </component>
+  <component type="desktop" merge="replace">
+    <id>Half-Life 2.desktop</id>
+    <content_rating type="oars-1.0">
+      <content_attribute id="violence-cartoon">none</content_attribute>
+      <content_attribute id="violence-fantasy">moderate</content_attribute>
+      <content_attribute id="violence-realistic">moderate</content_attribute>
+      <content_attribute id="violence-bloodshed">none</content_attribute>
+      <content_attribute id="violence-sexual">none</content_attribute>
+      <content_attribute id="drugs-alcohol">none</content_attribute>
+      <content_attribute id="drugs-narcotics">none</content_attribute>
+      <content_attribute id="drugs-tobacco">none</content_attribute>
+      <content_attribute id="sex-nudity">none</content_attribute>
+      <content_attribute id="sex-themes">none</content_attribute>
+      <content_attribute id="language-profanity">none</content_attribute>
+      <content_attribute id="language-humor">none</content_attribute>
+      <content_attribute id="language-discrimination">none</content_attribute>
+      <content_attribute id="social-chat">none</content_attribute>
+      <content_attribute id="social-info">none</content_attribute>
+      <content_attribute id="social-audio">none</content_attribute>
+      <content_attribute id="social-location">none</content_attribute>
+      <content_attribute id="social-contacts">none</content_attribute>
+      <content_attribute id="money-purchasing">none</content_attribute>
+      <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+  </component>
+  <component type="desktop" merge="replace">
+    <id>Dota 2.desktop</id>
+    <content_rating type="oars-1.0">
+      <content_attribute id="violence-cartoon">moderate</content_attribute>
+      <content_attribute id="violence-fantasy">moderate</content_attribute>
+      <content_attribute id="violence-realistic">none</content_attribute>
+      <content_attribute id="violence-bloodshed">mild</content_attribute>
+      <content_attribute id="violence-sexual">none</content_attribute>
+      <content_attribute id="drugs-alcohol">mild</content_attribute>
+      <content_attribute id="drugs-narcotics">none</content_attribute>
+      <content_attribute id="drugs-tobacco">none</content_attribute>
+      <content_attribute id="sex-nudity">none</content_attribute>
+      <content_attribute id="sex-themes">none</content_attribute>
+      <content_attribute id="language-profanity">none</content_attribute>
+      <content_attribute id="language-humor">none</content_attribute>
+      <content_attribute id="language-discrimination">none</content_attribute>
+      <content_attribute id="social-chat">intense</content_attribute>
+      <content_attribute id="social-info">none</content_attribute>
+      <content_attribute id="social-audio">intense</content_attribute>
+      <content_attribute id="social-location">none</content_attribute>
+      <content_attribute id="social-contacts">none</content_attribute>
+      <content_attribute id="money-purchasing">intense</content_attribute>
+      <content_attribute id="money-gambling">none</content_attribute>
+    </content_rating>
+  </component>
+</components>
diff --git a/webapps.xml b/webapps.xml
index c08814b..ce25459 100644
--- a/webapps.xml
+++ b/webapps.xml
@@ -3,6 +3,7 @@
   <component type="webapp">
     <id>epiphany-kindlecloud.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
+    <project_license>proprietary</project_license>
     <name>Kindle Cloud Reader</name>
     <summary>Read instantly in your browser</summary>
     <description>
@@ -70,6 +71,7 @@
   <component type="webapp">
     <id>epiphany-bbciplayer.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
+    <project_license>proprietary</project_license>
     <name>BBC iPlayer</name>
     <summary>Catch up on BBC TV and Radio programmes, or watch/listen live</summary>
     <description>
@@ -104,6 +106,7 @@
   <component type="webapp">
     <id>devdocs-io.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
+    <project_license>MPL-2.0</project_license>
     <name>Devdocs.io</name>
     <summary>Easily view and search developer documentation</summary>
     <description>
@@ -121,7 +124,6 @@
       <keyword>documentation</keyword>
       <keyword>programming</keyword>
     </keywords>
-    <project_license>Mozilla Public License v2.0</project_license>
     <url type="homepage">http://devdocs.io/</url>
     <metadata>
       <value key="X-Kudo-Popular"/>
@@ -130,6 +132,7 @@
   <component type="webapp">
     <id>epiphany-dropbox.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
+    <project_license>proprietary</project_license>
     <name>Dropbox</name>
     <summary>A free service that shares your documents easily</summary>
     <description>
@@ -154,6 +157,7 @@
   <component type="webapp">
     <id>epiphany-facebook.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
+    <project_license>proprietary</project_license>
     <name>Facebook</name>
     <summary>Give people the power to share</summary>
     <description>
@@ -182,6 +186,7 @@
   <component type="webapp">
     <id>epiphany-googledrive.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
+    <project_license>proprietary</project_license>
     <name>Google Drive</name>
     <summary>Everything you need, everywhere you go</summary>
     <description>
@@ -214,6 +219,8 @@
   </component>
   <component type="webapp">
     <id>epiphany-googlemaps.desktop</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>proprietary</project_license>
     <name>Google Maps</name>
     <summary>A web mapping service application and technology</summary>
     <description>
@@ -245,6 +252,8 @@
   </component>
   <component type="webapp">
     <id>epiphany-googleplus.desktop</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>proprietary</project_license>
     <name>Google Plus</name>
     <summary>Share and discover</summary>
     <description>
@@ -277,6 +286,7 @@
     <id>libnpgoogletalk.so</id>
     <pkgname>google-talkplugin</pkgname>
     <metadata_license>CC0-1.0</metadata_license>
+    <project_license>proprietary</project_license>
     <name>Google Talk</name>
     <summary>Bring your conversations to life with video calls for free</summary>
     <description>
@@ -306,47 +316,10 @@
       <value key="X-Kudo-Popular"/>
     </metadata>
   </component>
-  <component type="webapp">
-    <id>epiphany-rdio.desktop</id>
-    <metadata_license>CC0-1.0</metadata_license>
-    <name>Rdio</name>
-    <summary>An ad-free music subscription service</summary>
-    <description>
-      <p>
-        Rdio has millions of songs, from massive hits to rare gems to cult
-        classics, with more added every week.
-        It's more music than you could listen to in a lifetime.
-      </p>
-      <p>
-        Find what to play next -- a song, album, or playlist -- by following
-        friends and artists.
-        Or lean back and listen to stations, always free on mobile, for a mix of
-        favorites and soon-to-be-loved songs.
-      </p>
-      <p>
-        Build a collection of your favorites, so they're always close at hand,
-        and share the music you love with the people who might love it next.
-      </p>
-    </description>
-    <icon type="remote">http://rdio0img-a.akamaihd.net/user/press/rdio-app-icon.png</icon>
-    <categories>
-      <category>Audio</category>
-      <category>Music</category>
-    </categories>
-    <keywords>
-      <keyword>music</keyword>
-      <keyword>streaming</keyword>
-    </keywords>
-    <url type="homepage">http://www.rdio.com/</url>
-    <metadata>
-      <value key="X-Kudo-Popular"/>
-      <value key="X-Needs-Dark-Theme"/>
-      <value key="X-Needs-Flash"/>
-    </metadata>
-  </component>
   <component type="webapp">
     <id>epiphany-twitter.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
+    <project_license>proprietary</project_license>
     <name>Twitter</name>
     <summary>Start a conversation, explore your interests, and be in the know</summary>
     <description>
@@ -375,6 +348,7 @@
   <component type="webapp">
     <id>epiphany-telegram.desktop</id>
     <metadata_license>CC0-1.0</metadata_license>
+    <project_license>proprietary</project_license>
     <name>Telegram</name>
     <summary>Telegram is an instant messaging app focused on speed and security</summary>
     <description>