diff --git a/modules/AdoptOpenJDK11.php b/modules/AdoptOpenJDK11.php
index f150a55..477c9ea 100644
--- a/modules/AdoptOpenJDK11.php
+++ b/modules/AdoptOpenJDK11.php
@@ -2,7 +2,7 @@
 
 class AdoptOpenJDK11 extends PatchBase {
 	function __construct() {
-		parent::__construct('AdoptOpenJDK', 'OpenJDK', 'https://adoptopenjdk.net/');
+		parent::__construct('AdoptOpenJDK', 'OpenJDK', 'https://adoptopenjdk.net/releases.html?variant=openjdk11&jvmVariant=hotspot');
 		$this->patch->setBranch('JRE 11');
 	}
 	function check() : bool {
diff --git a/modules/AdoptOpenJDK14.php b/modules/AdoptOpenJDK14.php
index a9c0988..0f446a5 100644
--- a/modules/AdoptOpenJDK14.php
+++ b/modules/AdoptOpenJDK14.php
@@ -2,7 +2,7 @@
 
 class AdoptOpenJDK14 extends PatchBase {
 	function __construct() {
-		parent::__construct('AdoptOpenJDK', 'OpenJDK', 'https://adoptopenjdk.net/');
+		parent::__construct('AdoptOpenJDK', 'OpenJDK', 'https://adoptopenjdk.net/releases.html?variant=openjdk14&jvmVariant=hotspot');
 		$this->patch->setBranch('JRE 14');
 	}
 	function check() : bool {
diff --git a/modules/AdoptOpenJDK8.php b/modules/AdoptOpenJDK8.php
index 12680eb..13127ec 100644
--- a/modules/AdoptOpenJDK8.php
+++ b/modules/AdoptOpenJDK8.php
@@ -2,7 +2,7 @@
 
 class AdoptOpenJDK8 extends PatchBase {
 	function __construct() {
-		parent::__construct('AdoptOpenJDK', 'OpenJDK', 'https://adoptopenjdk.net/');
+		parent::__construct('AdoptOpenJDK', 'OpenJDK', 'https://adoptopenjdk.net/releases.html?variant=openjdk8&jvmVariant=hotspot');
 		$this->patch->setBranch('JRE 8');
 	}
 	function check() : bool {
diff --git a/modules/Arduino.php b/modules/Arduino.php
index 1eb34b7..ab95f9e 100644
--- a/modules/Arduino.php
+++ b/modules/Arduino.php
@@ -2,7 +2,7 @@
 
 class Arduino extends PatchBase {
 	function __construct() {
-		parent::__construct('Arduino AG', 'Arduino IDE', 'https://www.arduino.cc/');
+		parent::__construct('Arduino AG', 'Arduino IDE', 'https://www.arduino.cc/en/Main/Software');
 	}
 	function check() : bool {
 		if ($this->fetch('https://www.arduino.cc/en/Main/Software'))
diff --git a/modules/ClonezillaAlternative.php b/modules/ClonezillaAlternative.php
index 55b2498..ac105ed 100644
--- a/modules/ClonezillaAlternative.php
+++ b/modules/ClonezillaAlternative.php
@@ -2,7 +2,7 @@
 
 class ClonezillaAlternative extends PatchBase {
 	function __construct() {
-		parent::__construct('NCHC Free Software Lab', 'Clonezilla', 'https://clonezilla.org/');
+		parent::__construct('NCHC Free Software Lab', 'Clonezilla', 'https://clonezilla.org/downloads.php');
 		$this->patch->setBranch('Alternative');
 	}
 	function check() : bool {
diff --git a/modules/ClonezillaStable.php b/modules/ClonezillaStable.php
index 1956511..cae1004 100644
--- a/modules/ClonezillaStable.php
+++ b/modules/ClonezillaStable.php
@@ -2,7 +2,7 @@
 
 class ClonezillaStable extends PatchBase {
 	function __construct() {
-		parent::__construct('NCHC Free Software Lab', 'Clonezilla', 'https://clonezilla.org/');
+		parent::__construct('NCHC Free Software Lab', 'Clonezilla', 'https://clonezilla.org/downloads.php');
 		$this->patch->setBranch('Stable');
 	}
 	function check() : bool {
diff --git a/modules/GIMP.php b/modules/GIMP.php
index 4d3fd99..899c890 100644
--- a/modules/GIMP.php
+++ b/modules/GIMP.php
@@ -2,7 +2,7 @@
 
 class GIMP extends PatchBase {
 	function __construct() {
-		parent::__construct('GIMP Team', 'GNU Image Manipulation Program', 'https://www.gimp.org/');
+		parent::__construct('GIMP Team', 'GNU Image Manipulation Program', 'https://www.gimp.org/downloads/');
 	}
 	function check() : bool {
 		if ($this->fetch('https://www.gimp.org/downloads/'))
diff --git a/modules/GpgWin.php b/modules/GpgWin.php
index 4396c69..1399e20 100644
--- a/modules/GpgWin.php
+++ b/modules/GpgWin.php
@@ -2,7 +2,7 @@
 
 class GpgWin extends PatchBase {
 	function __construct() {
-		parent::__construct('Gpg4win Initiative', 'GNU Privacy Guard for Windows', 'https://www.gpg4win.de/');
+		parent::__construct('Gpg4win Initiative', 'GNU Privacy Guard for Windows', 'https://www.gpg4win.de/get-gpg4win.html');
 	}
 	function check() : bool {
 		if ($this->fetch('https://www.gpg4win.de/get-gpg4win.html'))
diff --git a/modules/Grafana.php b/modules/Grafana.php
index 199b554..dcb7640 100644
--- a/modules/Grafana.php
+++ b/modules/Grafana.php
@@ -2,7 +2,7 @@
 
 class Grafana extends PatchBase {
 	function __construct() {
-		parent::__construct('Grafana Labs', 'Grafana', 'https://grafana.com/');
+		parent::__construct('Grafana Labs', 'Grafana', 'https://grafana.com/grafana/download');
 	}
 	function check() : bool {
 		if ($this->fetch('https://api.github.com/repos/grafana/grafana/releases/latest', true))
diff --git a/modules/IrfanView.php b/modules/IrfanView.php
index 5b082ed..20a5675 100644
--- a/modules/IrfanView.php
+++ b/modules/IrfanView.php
@@ -2,7 +2,7 @@
 
 class IrfanView extends PatchBase {
 	function __construct() {
-		parent::__construct('Irfan Skiljan', 'IrfanView', 'https://www.irfanview.com/');
+		parent::__construct('Irfan Skiljan', 'IrfanView', 'https://www.irfanview.com/64bit.htm');
 	}
 	function check() : bool {
 		if ($this->fetch('https://www.irfanview.com/64bit.htm'))
diff --git a/modules/JQuery.php b/modules/JQuery.php
index 99afb8b..48e4446 100644
--- a/modules/JQuery.php
+++ b/modules/JQuery.php
@@ -2,7 +2,7 @@
 
 class JQuery extends PatchBase {
 	function __construct() {
-		parent::__construct('jQuery Foundation', 'jQuery', 'https://jquery.com/');
+		parent::__construct('jQuery Foundation', 'jQuery', 'https://jquery.com/download/');
 	}
 	function check() : bool {
 		if ($this->fetch('https://api.github.com/repos/jquery/jquery/tags', true))
diff --git a/modules/Krita.php b/modules/Krita.php
index 885143d..e7d35e1 100644
--- a/modules/Krita.php
+++ b/modules/Krita.php
@@ -2,7 +2,7 @@
 
 class Krita extends PatchBase {
 	function __construct() {
-		parent::__construct('Krita Foundation', 'Krita', 'https://krita.org/');
+		parent::__construct('Krita Foundation', 'Krita', 'https://krita.org/en/download/krita-desktop/');
 	}
 	function check() : bool {
 		if ($this->fetch('https://krita.org/en/download/krita-desktop/'))
diff --git a/modules/Nextcloud.php b/modules/Nextcloud.php
index f5127ab..f8767de 100644
--- a/modules/Nextcloud.php
+++ b/modules/Nextcloud.php
@@ -2,7 +2,7 @@
 
 class Nextcloud extends PatchBase {
 	function __construct() {
-		parent::__construct('Nextcloud GmbH', 'Nextcloud', 'https://nextcloud.com/');
+		parent::__construct('Nextcloud GmbH', 'Nextcloud', 'https://nextcloud.com/install/');
 	}
 	function check() : bool {
 		if ($this->fetch('https://nextcloud.com/install/'))
diff --git a/modules/OpenWrt.php b/modules/OpenWrt.php
index 9c5c4b0..360b2a3 100644
--- a/modules/OpenWrt.php
+++ b/modules/OpenWrt.php
@@ -2,7 +2,7 @@
 
 class OpenWrt extends PatchBase {
 	function __construct() {
-		parent::__construct('OpenWrt Developers', 'OpenWrt', 'https://openwrt.org/');
+		parent::__construct('OpenWrt Developers', 'OpenWrt', 'https://openwrt.org/downloads');
 	}
 	function check() : bool {
 		if ($this->fetch('https://openwrt.org/start'))
diff --git a/modules/OwnCloud.php b/modules/OwnCloud.php
index 35f6bdd..646bc60 100644
--- a/modules/OwnCloud.php
+++ b/modules/OwnCloud.php
@@ -2,7 +2,7 @@
 
 class OwnCloud extends PatchBase {
 	function __construct() {
-		parent::__construct('ownCloud GmbH', 'ownCloud', 'https://owncloud.org/');
+		parent::__construct('ownCloud GmbH', 'ownCloud', 'https://owncloud.org/download/');
 	}
 	function check() : bool {
 		if ($this->fetch('https://owncloud.org/download/'))
diff --git a/modules/PDF24.php b/modules/PDF24.php
index d21e8fb..f208b58 100644
--- a/modules/PDF24.php
+++ b/modules/PDF24.php
@@ -2,7 +2,7 @@
 
 class PDF24 extends PatchBase {
 	function __construct() {
-		parent::__construct('geek Software', 'PDF24 Creator', 'https://tools.pdf24.org/en/creator#download');
+		parent::__construct('geek Software', 'PDF24 Creator', 'https://tools.pdf24.org/en/creator');
 	}
 	function check() : bool {
 		if ($this->fetch('https://en.pdf24.org/'))
diff --git a/modules/PHP.php b/modules/PHP.php
index 68b414c..cd2b624 100644
--- a/modules/PHP.php
+++ b/modules/PHP.php
@@ -2,7 +2,7 @@
 
 class PHP extends PatchBase {
 	function __construct() {
-		parent::__construct('PHP Group', 'PHP', 'https://www.php.net/');
+		parent::__construct('PHP Group', 'PHP', 'https://www.php.net/downloads');
 	}
 	function check() : bool {
 		if ($this->fetch('https://www.php.net/downloads.php'))
diff --git a/modules/PhpMyAdmin.php b/modules/PhpMyAdmin.php
index 15f2744..3ceb7c2 100644
--- a/modules/PhpMyAdmin.php
+++ b/modules/PhpMyAdmin.php
@@ -2,7 +2,7 @@
 
 class PhpMyAdmin extends PatchBase {
 	function __construct() {
-		parent::__construct('phpMyAdmin Contributors', 'phpMyAdmin', 'https://www.phpmyadmin.net/');
+		parent::__construct('phpMyAdmin Contributors', 'phpMyAdmin', 'https://www.phpmyadmin.net/downloads/');
 	}
 	function check() : bool {
 		if ($this->fetch('https://api.github.com/repos/phpmyadmin/phpmyadmin/releases/latest', true))
diff --git a/modules/Prometheus.php b/modules/Prometheus.php
index fbe6644..ef7399c 100644
--- a/modules/Prometheus.php
+++ b/modules/Prometheus.php
@@ -2,7 +2,7 @@
 
 class Prometheus extends PatchBase {
 	function __construct() {
-		parent::__construct('Prometheus Authors', 'Prometheus', 'https://prometheus.io/');
+		parent::__construct('Prometheus Authors', 'Prometheus', 'https://prometheus.io/download/');
 	}
 	function check() : bool {
 		if ($this->fetch('https://api.github.com/repos/prometheus/prometheus/releases/latest', true))
diff --git a/modules/PuTTY.php b/modules/PuTTY.php
index 99de541..25aff3c 100644
--- a/modules/PuTTY.php
+++ b/modules/PuTTY.php
@@ -2,7 +2,7 @@
 
 class PuTTY extends PatchBase {
 	function __construct() {
-		parent::__construct('Simon Tatham', 'PuTTY', 'https://www.chiark.greenend.org.uk/~sgtatham/putty/');
+		parent::__construct('Simon Tatham', 'PuTTY', 'https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html');
 	}
 	function check() : bool {
 		if ($this->fetch('https://www.chiark.greenend.org.uk/~sgtatham/putty/latest.html'))
diff --git a/modules/SevenZip.php b/modules/SevenZip.php
index 0d13e53..44dcfd2 100644
--- a/modules/SevenZip.php
+++ b/modules/SevenZip.php
@@ -2,7 +2,7 @@
 
 class SevenZip extends PatchBase {
 	function __construct() {
-		parent::__construct('Igor Pavlov', '7-Zip', 'https://www.7-zip.org/');
+		parent::__construct('Igor Pavlov', '7-Zip', 'https://www.7-zip.org/download.html');
 	}
 	function check() : bool {
 		if ($this->fetch('https://www.7-zip.org/download.html'))
diff --git a/modules/SysRescCd.php b/modules/SysRescCd.php
index a29b902..d2b8800 100644
--- a/modules/SysRescCd.php
+++ b/modules/SysRescCd.php
@@ -2,7 +2,7 @@
 
 class SysRescCd extends PatchBase {
 	function __construct() {
-		parent::__construct('Francois Dupoux', 'SystemRescueCd', 'http://www.system-rescue-cd.org/');
+		parent::__construct('Francois Dupoux', 'SystemRescueCd', 'http://www.system-rescue-cd.org/Download/');
 	}
 	function check() : bool {
 		if ($this->fetch('http://www.system-rescue-cd.org/Detailed-packages-list/'))
diff --git a/modules/TotalCommander.php b/modules/TotalCommander.php
index 854ca3f..177a8ff 100644
--- a/modules/TotalCommander.php
+++ b/modules/TotalCommander.php
@@ -2,7 +2,7 @@
 
 class TotalCommander extends PatchBase {
 	function __construct() {
-		parent::__construct('Christian Ghisler', 'Total Commander', 'https://www.ghisler.com/');
+		parent::__construct('Christian Ghisler', 'Total Commander', 'https://www.ghisler.com/download.htm');
 	}
 	function check() : bool {
 		if ($this->fetch('https://www.ghisler.com/download.htm'))
diff --git a/modules/VirtualBox.php b/modules/VirtualBox.php
index 9325fd0..9b4e936 100644
--- a/modules/VirtualBox.php
+++ b/modules/VirtualBox.php
@@ -2,7 +2,7 @@
 
 class VirtualBox extends PatchBase {
 	function __construct() {
-		parent::__construct('Oracle', 'VirtualBox', 'https://www.virtualbox.org/');
+		parent::__construct('Oracle', 'VirtualBox', 'https://www.virtualbox.org/wiki/Downloads');
 	}
 	function check() : bool {
 		if ($this->fetch('https://www.virtualbox.org/wiki/Downloads'))
diff --git a/modules/WinSCP.php b/modules/WinSCP.php
index b7c4da3..8e85916 100644
--- a/modules/WinSCP.php
+++ b/modules/WinSCP.php
@@ -2,7 +2,7 @@
 
 class WinSCP extends PatchBase {
 	function __construct() {
-		parent::__construct('Martin Přikryl', 'WinSCP', 'https://winscp.net/');
+		parent::__construct('Martin Přikryl', 'WinSCP', 'https://winscp.net/eng/download.php');
 	}
 	function check() : bool {
 		if ($this->fetch('https://winscp.net/eng/download.php'))
diff --git a/modules/WordPress.php b/modules/WordPress.php
index 8bdd060..a0a3f0e 100644
--- a/modules/WordPress.php
+++ b/modules/WordPress.php
@@ -2,7 +2,7 @@
 
 class WordPress extends PatchBase {
 	function __construct() {
-		parent::__construct('WordPress Foundation', 'WordPress', 'https://wordpress.org/');
+		parent::__construct('WordPress Foundation', 'WordPress', 'https://wordpress.org/download/');
 	}
 	function check() : bool {
 		if ($this->fetch('https://wordpress.org/download/'))