diff --git a/README.md b/README.md
index 33550939..b742b31e 100644
--- a/README.md
+++ b/README.md
@@ -88,8 +88,8 @@ try switching the app to JQuery mode (see Content injection mode in Configuratio
 
   + <img src="images/electron-color.svg" width="27" /> Electron >= 1.8.0 (Ubuntu, Debian, Fedora, OpenSUSE, AppImage, Windows): [GitHub release](https://kiwix.github.io/kiwix-js-pwa/app)
   + <img src="images/microsoftwindows-color.svg" width="20" /> Universal Windows Platform (UWP) >=10.0.10240: [Microsoft Store app](https://www.microsoft.com/store/apps/9P8SLZ4J979J) or [GitHub release](https://kiwix.github.io/kiwix-js-pwa/app) - Windows 10/11 (Electron), Windows on ARM, Xbox, Windows 10 Mobile
-  + <img src="images/nwjs-color.svg" width="20" /> NWJS >= 0.23.0 (Windows 7/8/10/11): [GitHub release](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-nwjs.html)
-  + NWJS 0.14.7 (Windows XP/Vista only): [GitHub release](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-nwjs.html)
+  + <img src="images/nwjs-color.svg" width="20" /> NWJS >= 0.23.0 (Windows 7/8/10/11): [GitHub release](https://kiwix.github.io/kiwix-js-pwa/app/nwjs.html)
+  + NWJS 0.14.7 (Windows XP/Vista only): [GitHub release](https://kiwix.github.io/kiwix-js-pwa/app/nwjs.html)
 
 `*` With **Firefox on Android**, the app is only useable with files stored in the Origin Private File System. There is a Firefox bug whereby the browser
 attempts to read the entire ZIM archive into memory if opening it from the user-visible file system.
@@ -220,5 +220,5 @@ for further information.
 **Builds of this app are available that do not use a Store or an online Service Worker.** Please see:
 
 * [Releases](https://github.com/kiwix/kiwix-js-pwa/releases/)
-* [NWJS version](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-nwjs.html) - this version is completely standalone
+* [NWJS version](https://kiwix.github.io/kiwix-js-pwa/app/nwjs.html) - this version is completely standalone
   and will never access servers unless you allow it to.
diff --git a/scripts/Create-DraftRelease.ps1 b/scripts/Create-DraftRelease.ps1
index 8496bf5c..a79a45ff 100644
--- a/scripts/Create-DraftRelease.ps1
+++ b/scripts/Create-DraftRelease.ps1
@@ -747,15 +747,15 @@ if ($dryrun -or $buildonly -or $release.assets_url -imatch '^https:') {
     }
   }
   "`nCreating permalink..."
-  $permalinkFile = "$PSScriptRoot/../kiwix-js-uwp.html"
+  $permalinkFile = "$PSScriptRoot/../app/uwp.html"
   $permalinkFile2 = ""
   $permalinkFile3 = ""
-  if ($tag_name -imatch 'WikiMed') { $permalinkFile = $permalinkFile -replace 'kiwix-js-uwp', 'wikimed-uwp' }
-  if ($tag_name -imatch 'Wikivoyage') { $permalinkFile = $permalinkFile -replace 'kiwix-js-uwp', 'wikivoyage-uwp' }
+  if ($tag_name -imatch 'WikiMed') { $permalinkFile = $permalinkFile -replace 'app', 'wikiumed' }
+  if ($tag_name -imatch 'Wikivoyage') { $permalinkFile = $permalinkFile -replace 'app', 'wikivoyage' }
   if ($flavour -eq '_N') { $permalinkFile = $permalinkFile -replace 'uwp', 'nwjs' }
   if ($tag_name -match 'E\+N') { $permalinkFile2 = $permalinkFile -replace 'uwp', 'nwjs' }
-  if ($flavour -eq '_E') { $permalinkFile = $permalinkFile -replace 'uwp', 'electron' }
-  if ($plus_electron) { $permalinkFile3 = $permalinkFile -replace 'uwp', 'electron' }
+  if ($flavour -eq '_E') { $permalinkFile = $permalinkFile -replace 'uwp', 'index' }
+  if ($plus_electron) { $permalinkFile3 = $permalinkFile -replace 'uwp', 'index' }
   "Looking for: $permalinkFile"
   foreach ($file in @($permalinkFile, $permalinkFile2, $permalinkFile3)) {
     if ($file) {
diff --git a/scripts/Kiwix_JS_WikiMed_E_Release_Body.md b/scripts/Kiwix_JS_WikiMed_E_Release_Body.md
index 0ed17312..c76f227b 100644
--- a/scripts/Kiwix_JS_WikiMed_E_Release_Body.md
+++ b/scripts/Kiwix_JS_WikiMed_E_Release_Body.md
@@ -2,7 +2,7 @@
 
 This is **not** the UWP/Microsoft Store build. If you are using Windows 10 or 11, we strongly recommend [the WikiMed release for the Microsoft Store](https://kiwix.github.io/kiwix-js-pwa/wikimed), which will keep itself up-to-date automatically. These portable and installable versions run on the included [Electron platform](https://www.electronjs.org/) version 10.4.0. 
 
-These builds are packaged with the <<date>> English-language WikiMed archive `<<zim>>`. They will run on 32bit and 64bit editions of Windows or Linux (tested on Ubuntu, Debian and OpenSUSE - but see instructions below). The Windows build is **not compatible with Windows XP or Windows Vista**. If you need an app compatible with those old platforms, get [Kiwix JS Windows reader](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-nwjs.html) and download the latest WikiMed archive from within the app.
+These builds are packaged with the <<date>> English-language WikiMed archive `<<zim>>`. They will run on 32bit and 64bit editions of Windows or Linux (tested on Ubuntu, Debian and OpenSUSE - but see instructions below). The Windows build is **not compatible with Windows XP or Windows Vista**. If you need an app compatible with those old platforms, get [Kiwix JS Windows reader](https://kiwix.github.io/kiwix-js-pwa/app/nwjs.html) and download the latest WikiMed archive from within the app.
 
 Choose the correct build (**warning: the download is at least 1.2GB**):
 
diff --git a/scripts/Kiwix_JS_WikiMed_Release_Body.md b/scripts/Kiwix_JS_WikiMed_Release_Body.md
index 399f5e3e..f3208d8c 100644
--- a/scripts/Kiwix_JS_WikiMed_Release_Body.md
+++ b/scripts/Kiwix_JS_WikiMed_Release_Body.md
@@ -4,7 +4,7 @@ WikiMed by Kiwix is an offline medical encyclopaedia with content curated by [MD
 
 ![WikiMed montage](https://user-images.githubusercontent.com/4304337/182706203-eca53649-8dea-44b9-ac4a-b08cc05c4252.png)
 
-These custom apps are packaged with the <<date>> English-language WikiMed archive `<<zim>>`. They will run on 32bit and 64bit editions of Windows or Linux (tested on Ubuntu, Debian, Fedora and OpenSUSE). The Windows builds are **not compatible with Windows XP or Windows Vista**. If you need an app compatible with those old platforms, get [Kiwix JS Windows reader](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-nwjs.html) and download the latest WikiMed archive from within the app.
+These custom apps are packaged with the <<date>> English-language WikiMed archive `<<zim>>`. They will run on 32bit and 64bit editions of Windows or Linux (tested on Ubuntu, Debian, Fedora and OpenSUSE). The Windows builds are **not compatible with Windows XP or Windows Vista**. If you need an app compatible with those old platforms, get [Kiwix JS Windows reader](https://kiwix.github.io/kiwix-js-pwa/app/nwjs.html) and download the latest WikiMed archive from within the app.
 
 **MS Store status: IN CERTIFICATION**
 **Winget status: IN CERTIFICATION**
diff --git a/scripts/Kiwix_JS_Wikivoyage_E_Release_Body.md b/scripts/Kiwix_JS_Wikivoyage_E_Release_Body.md
index 11cf3fd3..7a8081b2 100644
--- a/scripts/Kiwix_JS_Wikivoyage_E_Release_Body.md
+++ b/scripts/Kiwix_JS_Wikivoyage_E_Release_Body.md
@@ -2,7 +2,7 @@
 
 ![image](https://user-images.githubusercontent.com/4304337/118415611-46484d00-b6a3-11eb-8586-11b23e3391be.png)
 
-These custom apps are packaged with the <<date>> English-language Wikivoyage archive `<<zim>>`. They will run on 32bit and 64bit editions of Windows or Linux (tested on Ubuntu, Debian and OpenSUSE - but see instructions below). The Windows builds are **not compatible with Windows XP or Windows Vista**. If you need an app compatible with those old platforms, get [Kiwix JS Windows reader](https://kiwix.github.io/kiwix-js-pwa/kiwix-js-nwjs.html) and download the latest Wikivoyage archive from within the app.
+These custom apps are packaged with the <<date>> English-language Wikivoyage archive `<<zim>>`. They will run on 32bit and 64bit editions of Windows or Linux (tested on Ubuntu, Debian and OpenSUSE - but see instructions below). The Windows builds are **not compatible with Windows XP or Windows Vista**. If you need an app compatible with those old platforms, get [Kiwix JS Windows reader](https://kiwix.github.io/kiwix-js-pwa/app/nwjs.html) and download the latest Wikivoyage archive from within the app.
 
 **MS Store status: IN CERTIFICATION**
 **Winget status: IN CERTIFICATION**
diff --git a/www/index.html b/www/index.html
index 0c0eabfe..b30e6695 100644
--- a/www/index.html
+++ b/www/index.html
@@ -418,7 +418,7 @@
                         <b>Builds of this app are available that do not use a Store or an online Service Worker.</b> Please see:
                         <ul>
                             <li><a href="https://github.com/kiwix/kiwix-js-pwa/releases" target="_blank">Releases</a></li>
-                            <li><a href="https://kiwix.github.io/kiwix-js-pwa/kiwix-js-nwjs.html" target="_blank">NWJS version</a> - this version is completely standalone and will never self-update.</li>
+                            <li><a href="https://kiwix.github.io/kiwix-js-pwa/app/nwjs.html" target="_blank">NWJS version</a> - this version is completely standalone and will never self-update.</li>
                         </ul>
                     </p>
                     <h3 id="filehandling">File handling and File System access</h3>