diff --git a/metadata/co.pxhouse.sas.txt b/metadata/co.pxhouse.sas.txt
index fb13eecf2b..ccf01218f4 100644
--- a/metadata/co.pxhouse.sas.txt
+++ b/metadata/co.pxhouse.sas.txt
@@ -1,7 +1,7 @@
 AntiFeatures:NonFreeNet
 Categories:Internet,System
 License:MIT
-Web Site:https://github.com/veniosg/JustSearch
+Web Site:
 Source Code:https://github.com/veniosg/JustSearch
 Issue Tracker:https://github.com/veniosg/JustSearch/issues
 
diff --git a/metadata/com.nononsenseapps.feeder.txt b/metadata/com.nononsenseapps.feeder.txt
index 9e67f6078d..f3e9f7fa97 100644
--- a/metadata/com.nononsenseapps.feeder.txt
+++ b/metadata/com.nononsenseapps.feeder.txt
@@ -1,6 +1,6 @@
 Categories:Internet,Reading
 License:GPL-3.0-only
-Web Site:https://gitlab.com/spacecowboy/Feeder
+Web Site:
 Source Code:https://gitlab.com/spacecowboy/Feeder
 Issue Tracker:https://gitlab.com/spacecowboy/Feeder/issues
 Changelog:https://gitlab.com/spacecowboy/Feeder/blob/HEAD/CHANGELOG.md
diff --git a/metadata/com.npi.muzeiflickr.txt b/metadata/com.npi.muzeiflickr.txt
index 30b41ac10f..ae98931640 100644
--- a/metadata/com.npi.muzeiflickr.txt
+++ b/metadata/com.npi.muzeiflickr.txt
@@ -1,7 +1,7 @@
 Disabled:Missing license, ticket pending
 Categories:Multimedia,Theming
 License:
-Web Site:https://github.com/PomepuyN/muzei-flickr
+Web Site:
 Source Code:https://github.com/PomepuyN/muzei-flickr
 Issue Tracker:https://github.com/PomepuyN/muzei-flickr/issues
 
diff --git a/metadata/com.quaap.bookymcbookface.txt b/metadata/com.quaap.bookymcbookface.txt
index 02c093f2f8..3874014c0a 100644
--- a/metadata/com.quaap.bookymcbookface.txt
+++ b/metadata/com.quaap.bookymcbookface.txt
@@ -1,6 +1,6 @@
 Categories:Reading
 License:GPL-3.0-only
-Web Site:https://github.com/quaap/BookyMcBookface
+Web Site:
 Source Code:https://github.com/quaap/BookyMcBookface
 Issue Tracker:https://github.com/quaap/BookyMcBookface/issues
 Changelog:https://github.com/quaap/BookyMcBookface/releases
diff --git a/metadata/com.roguetemple.hyperroid.txt b/metadata/com.roguetemple.hyperroid.txt
index 2a8bb55cc4..aaf1fe863a 100644
--- a/metadata/com.roguetemple.hyperroid.txt
+++ b/metadata/com.roguetemple.hyperroid.txt
@@ -1,9 +1,9 @@
 Categories:Games
 License:GPL-2.0-only
-Web Site:http://www.roguetemple.com/z/hyper.php
+Web Site:https://www.roguetemple.com/z/hyper.php
 Source Code:https://github.com/zenorogue/hyperrogue
 Issue Tracker:https://github.com/zenorogue/hyperrogue/issues
-Donate:http://www.roguetemple.com/z/hyper.php
+Donate:https://www.roguetemple.com/z/donate.php?id=HyperRogue
 
 Auto Name:HyperRogue
 Summary:Top-down rogue-like adventure
diff --git a/metadata/com.semche.invasion.txt b/metadata/com.semche.invasion.txt
index b5a96f6c6a..39693551a9 100644
--- a/metadata/com.semche.invasion.txt
+++ b/metadata/com.semche.invasion.txt
@@ -1,7 +1,7 @@
 Disabled:Repo vanished
 Categories:Games
 License:MIT
-Web Site:https://github.com/Semche/Invasion-Android
+Web Site:
 Source Code:https://github.com/Semche/Invasion-Android
 Issue Tracker:https://github.com/Semche/Invasion-Android/issues
 
@@ -12,9 +12,6 @@ You're a space ship, just kill those damn aliens! Touch the right part of the
 screen to shoot.
 .
 
-Repo Type:git
-Repo:https://github.com/Semche/Invasion-Android.git
-
 Build:1.0,1
     disable=unknown jar andengine.jar
     commit=51d7251f1629d2b7263abe4bb37906c11490eed4
@@ -24,6 +21,8 @@ Repo has been removed.
 .
 
 Auto Update Mode:None
-Update Check Mode:Static
+Update Check Mode:None
 Current Version:0
 Current Version Code:0
+
+No Source Since:1.1
diff --git a/metadata/com.stevenschoen.putionew.txt b/metadata/com.stevenschoen.putionew.txt
index 9d85522531..254aa1163d 100644
--- a/metadata/com.stevenschoen.putionew.txt
+++ b/metadata/com.stevenschoen.putionew.txt
@@ -2,7 +2,7 @@ Disabled:Relies on non-free libraries
 AntiFeatures:UpstreamNonFree
 Categories:Internet
 License:MIT
-Web Site:https://github.com/DSteve595/Put.io
+Web Site:
 Source Code:https://github.com/DSteve595/Put.io
 Issue Tracker:https://github.com/DSteve595/Put.io/issues
 
diff --git a/metadata/com.vadimfrolov.duorem.txt b/metadata/com.vadimfrolov.duorem.txt
index f2d13434cb..10da0e87bd 100644
--- a/metadata/com.vadimfrolov.duorem.txt
+++ b/metadata/com.vadimfrolov.duorem.txt
@@ -2,7 +2,7 @@ Categories:System,Internet,Multimedia
 License:GPL-3.0-or-later
 Author Name:Vadim Frolov
 Author Email:mail@vadimfrolov.com
-Web Site:https://github.com/fralik/Duorem
+Web Site:
 Source Code:https://github.com/fralik/Duorem
 Issue Tracker:https://github.com/fralik/Duorem/issues
 Changelog:https://github.com/fralik/Duorem/blob/HEAD/CHANGELOG.md
diff --git a/metadata/com.zoffcc.applications.metalab_open_widget.txt b/metadata/com.zoffcc.applications.metalab_open_widget.txt
index bb177781e8..4502743517 100644
--- a/metadata/com.zoffcc.applications.metalab_open_widget.txt
+++ b/metadata/com.zoffcc.applications.metalab_open_widget.txt
@@ -1,6 +1,6 @@
 Categories:Internet
 License:GPL-2.0-only
-Web Site:https://github.com/zoff99/MetalabDoorWidget
+Web Site:
 Source Code:https://github.com/zoff99/MetalabDoorWidget
 Issue Tracker:https://github.com/zoff99/MetalabDoorWidget/issues
 
diff --git a/metadata/com.zoffcc.applications.trifa.txt b/metadata/com.zoffcc.applications.trifa.txt
index 3ca7ee0096..2198760688 100644
--- a/metadata/com.zoffcc.applications.trifa.txt
+++ b/metadata/com.zoffcc.applications.trifa.txt
@@ -1,6 +1,6 @@
 Categories:Internet
 License:GPL-2.0-only
-Web Site:https://github.com/zoff99/ToxAndroidRefImpl
+Web Site:
 Source Code:https://github.com/zoff99/ToxAndroidRefImpl
 Issue Tracker:https://github.com/zoff99/ToxAndroidRefImpl/issues
 Changelog:https://github.com/zoff99/ToxAndroidRefImpl/blob/zoff99/dev003/CHANGELOG.md
diff --git a/metadata/com.zoffcc.fahrplan.toxcon.txt b/metadata/com.zoffcc.fahrplan.toxcon.txt
index 9d7be60951..afca717fc1 100644
--- a/metadata/com.zoffcc.fahrplan.toxcon.txt
+++ b/metadata/com.zoffcc.fahrplan.toxcon.txt
@@ -1,6 +1,6 @@
 Categories:Internet
 License:GPL-2.0-only
-Web Site:https://github.com/zoff99/CampFahrplan
+Web Site:
 Source Code:https://github.com/zoff99/CampFahrplan
 Issue Tracker:https://github.com/zoff99/CampFahrplan/issues
 
diff --git a/metadata/cz.antecky.netswitch.txt b/metadata/cz.antecky.netswitch.txt
index 3f7ebc2a20..0c642b2b7a 100755
--- a/metadata/cz.antecky.netswitch.txt
+++ b/metadata/cz.antecky.netswitch.txt
@@ -1,6 +1,6 @@
 Categories:Connectivity
 License:Apache-2.0
-Web Site:https://github.com/tantecky/android/tree/HEAD/NetSwitch
+Web Site:
 Source Code:https://github.com/tantecky/android/tree/HEAD/NetSwitch
 Issue Tracker:https://github.com/tantecky/android/issues
 
diff --git a/metadata/de.k3b.android.intentintercept.txt b/metadata/de.k3b.android.intentintercept.txt
index 0cb45fc092..e7929643d6 100644
--- a/metadata/de.k3b.android.intentintercept.txt
+++ b/metadata/de.k3b.android.intentintercept.txt
@@ -1,6 +1,6 @@
 Categories:Development
 License:Apache-2.0
-Web Site:https://github.com/k3b/intent-intercept
+Web Site:
 Source Code:https://github.com/k3b/intent-intercept
 Issue Tracker:https://github.com/k3b/intent-intercept/issues
 Changelog:https://github.com/k3b/intent-intercept/releases
diff --git a/metadata/de.rampro.activitydiary.txt b/metadata/de.rampro.activitydiary.txt
index 1db5604c15..a449d4fbbe 100644
--- a/metadata/de.rampro.activitydiary.txt
+++ b/metadata/de.rampro.activitydiary.txt
@@ -1,6 +1,6 @@
 Categories:Writing
 License:GPL-3.0-or-later
-Web Site:https://github.com/ramack/ActivityDiary
+Web Site:https://github.com/ramack/ActivityDiary/wiki
 Source Code:https://github.com/ramack/ActivityDiary
 Issue Tracker:https://github.com/ramack/ActivityDiary/issues
 LiberapayID:32386
diff --git a/metadata/de.schaeuffelhut.android.openvpn.txt b/metadata/de.schaeuffelhut.android.openvpn.txt
index 3b1cc308c1..4c97c411ab 100644
--- a/metadata/de.schaeuffelhut.android.openvpn.txt
+++ b/metadata/de.schaeuffelhut.android.openvpn.txt
@@ -3,7 +3,6 @@ License:GPL-3.0-only
 Web Site:https://code.google.com/p/android-openvpn-settings
 Source Code:https://code.google.com/p/android-openvpn-settings/source
 Issue Tracker:
-Donate:https://code.google.com/p/android-openvpn-settings
 FlattrID:621822
 
 Summary:VPN settings
@@ -22,9 +21,6 @@ Requirements (app does a check):
 
 Requires Root:yes
 
-Repo Type:hg
-Repo:https://code.google.com/p/android-openvpn-settings
-
 Build:0.4.14,39
     commit=b78a64143ef8
     extlibs=android/android-support-v4.jar
@@ -42,6 +38,8 @@ Uses embedded copy of openssl source based on 0.9.8h. Not vulnerable to CVE-2014
 .
 
 Auto Update Mode:None
-Update Check Mode:Static
+Update Check Mode:None
 Current Version:0.4.15test1
 Current Version Code:40
+
+No Source Since:0.4.16
diff --git a/metadata/de.vier_bier.habpanelviewer.txt b/metadata/de.vier_bier.habpanelviewer.txt
index 5a962d7a2f..5bc0dd6ce3 100644
--- a/metadata/de.vier_bier.habpanelviewer.txt
+++ b/metadata/de.vier_bier.habpanelviewer.txt
@@ -1,6 +1,6 @@
 Categories:Internet
 License:GPL-3.0-only
-Web Site:https://github.com/vbier/habpanelviewer
+Web Site:https://github.com/vbier/habpanelviewer/wiki
 Source Code:https://github.com/vbier/habpanelviewer
 Issue Tracker:https://github.com/vbier/habpanelviewer/issues
 
diff --git a/metadata/de.westnordost.streetcomplete.txt b/metadata/de.westnordost.streetcomplete.txt
index 54a4aada91..ec76c8d3e0 100644
--- a/metadata/de.westnordost.streetcomplete.txt
+++ b/metadata/de.westnordost.streetcomplete.txt
@@ -2,7 +2,7 @@ Categories:Navigation
 License:GPL-3.0-only
 Author Name:Tobias Zwick
 Author Email:osm@westnordost.de
-Web Site:https://github.com/westnordost/StreetComplete
+Web Site:https://github.com/westnordost/StreetComplete/wiki
 Source Code:https://github.com/westnordost/StreetComplete
 Issue Tracker:https://github.com/westnordost/StreetComplete/issues
 Changelog:https://github.com/westnordost/StreetComplete/releases
diff --git a/metadata/dk.nindroid.rss.txt b/metadata/dk.nindroid.rss.txt
index 07ef1e8bb2..d41d22d89f 100644
--- a/metadata/dk.nindroid.rss.txt
+++ b/metadata/dk.nindroid.rss.txt
@@ -3,7 +3,6 @@ License:GPL-3.0-only
 Web Site:https://code.google.com/p/floatingimage
 Source Code:https://code.google.com/p/floatingimage/source
 Issue Tracker:
-Donate:https://code.google.com/p/floatingimage
 
 Auto Name:Floating Image
 Summary:Display images from galleries
@@ -13,9 +12,6 @@ the device and displays them in a continuous stream of floating images across
 the display. Works as a live wallpaper too.
 .
 
-Repo Type:git-svn
-Repo:https://floatingimage.googlecode.com/svn/trunk
-
 Build:3.4.23,119
     commit=141
     subdir=floatingimage
@@ -29,3 +25,5 @@ Auto Update Mode:None
 Update Check Mode:Static
 Current Version:3.4.25
 Current Version Code:121
+
+No Source Since:3.4.26
diff --git a/metadata/eu.quelltext.mundraub.txt b/metadata/eu.quelltext.mundraub.txt
index a006525682..4668846863 100644
--- a/metadata/eu.quelltext.mundraub.txt
+++ b/metadata/eu.quelltext.mundraub.txt
@@ -3,7 +3,7 @@ Categories:Internet,Science & Education,Sports & Health
 License:GPL-3.0-only
 Author Name:Nicco Kunzmann
 Author Email:niccokunzmann@rambler.ru
-Web Site:https://github.com/niccokunzmann/mundraub-android
+Web Site:
 Source Code:https://github.com/niccokunzmann/mundraub-android
 Issue Tracker:https://github.com/niccokunzmann/mundraub-android/issues