diff --git a/appstream-data.spec b/appstream-data.spec
index 7dffff5..d798b80 100644
--- a/appstream-data.spec
+++ b/appstream-data.spec
@@ -1,7 +1,7 @@
 Summary:   Fedora AppStream metadata
 Name:      appstream-data
 Version:   31
-Release:   4%{?dist}
+Release:   8%{?dist}
 BuildArch: noarch
 License:   CC0 and CC-BY and CC-BY-SA and GFDL
 URL:       https://github.com/hughsie/appstream-glib
@@ -46,6 +46,19 @@ fi
 %dir %{_datadir}/app-info/xmls
 
 %changelog
+* Thu Jan 02 2020 Kalev Lember <klember@redhat.com> - 31-8
+- New metadata version
+
+* Mon Oct 14 2019 Kalev Lember <klember@redhat.com> - 31-7
+- New metadata version
+
+* Thu Sep 19 2019 Kalev Lember <klember@redhat.com> - 31-6
+- New metadata version
+- Update webapps.xml
+
+* Thu Sep 19 2019 Kalev Lember <klember@redhat.com> - 31-5
+- New metadata version
+
 * Wed Sep 18 2019 Kalev Lember <klember@redhat.com> - 31-4
 - Update categories and popular xmls with renamed app ids
 
diff --git a/fedora-categories.xml b/fedora-categories.xml
index ab29729..9490829 100644
--- a/fedora-categories.xml
+++ b/fedora-categories.xml
@@ -178,7 +178,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>endless-sky.desktop</id>
+    <id>io.github.endless_sky.endless_sky</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
@@ -297,7 +297,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.wesnoth.Wesnoth.desktop</id>
+    <id>wesnoth.desktop</id>
     <categories>
       <category>Game</category>
       <category>Featured</category>
@@ -311,7 +311,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>blender.desktop</id>
+    <id>org.blender.Blender</id>
     <categories>
       <category>Graphics</category>
       <category>Featured</category>
@@ -332,7 +332,7 @@
     </categories>
   </component>
   <component type="desktop">
-    <id>org.inkscape.Inkscape</id>
+    <id>inkscape.desktop</id>
     <categories>
       <category>Graphics</category>
       <category>Featured</category>
diff --git a/fedora-popular.xml b/fedora-popular.xml
index 79c003f..f8a0105 100644
--- a/fedora-popular.xml
+++ b/fedora-popular.xml
@@ -21,7 +21,7 @@
     </kudos>
   </component>
   <component type="desktop">
-    <id>org.inkscape.Inkscape</id>
+    <id>inkscape.desktop</id>
     <kudos>
       <kudo>GnomeSoftware::popular</kudo>
     </kudos>
diff --git a/sources b/sources
index 06baa91..3b1a075 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (fedora-31.xml.gz) = 79f2c5e6ce3ef6ad1e225740f3b7f43a4d17e1b2b339445fa6ab2559af98b871bb34d5c5896f6288c6d018b3938499ea102ec291b6ff1276f54715a27268bc5c
-SHA512 (fedora-31-icons.tar.gz) = fabeb5c1da6ca39b312c8c04512adaa927aad9fa4bcbeb4d80dded04e2733d5ede5b4f626c1cb2df12008d02e74c8e2ad6e30d481c716882277c495c8991ead9
+SHA512 (fedora-31.xml.gz) = 79a8085fb8c3c944550acf77a95e2cb79f301690568de4befb36267b62f4551e93b83b7a6544e6ef4578613530f8f3aa260c4153a6f71dbe803a7fa953453ffa
+SHA512 (fedora-31-icons.tar.gz) = 55eed094eda48dcb2f2e7b2cf7486c6ae3b79649c8bc9d184f1a5625371c38ed397786c800df1a3bc0db827e66a140db520b78cb3d3ee38cdeb69d02ada99135
diff --git a/webapps.xml b/webapps.xml
index 8374d6b..197d05f 100644
--- a/webapps.xml
+++ b/webapps.xml
@@ -250,38 +250,6 @@
       <value key="X-Kudo-Popular"/>
     </metadata>
   </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>
-      <p>
-        Google+ is one of the most active social media networks with hundreds of
-        millions of people having active accounts.
-        Whether it's a simple note or a special photograph, share life's
-        important moments with just the right people.
-        You can even make a video call with up to 10 friends at once.
-      </p>
-      <p>
-        To use Google+ you need a Google account and be over the age of 13.
-      </p>
-    </description>
-    <icon type="remote">https://developers.google.com/+/images/branding/g+128.png</icon>
-    <categories>
-      <category>InstantMessaging</category>
-      <category>Network</category>
-    </categories>
-    <keywords>
-      <keyword>google</keyword>
-      <keyword>plus</keyword>
-    </keywords>
-    <url type="homepage">http://plus.google.com/</url>
-    <metadata>
-      <value key="X-Kudo-Popular"/>
-    </metadata>
-  </component>
   <component type="addon">
     <id>libnpgoogletalk.so</id>
     <pkgname>google-talkplugin</pkgname>