diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4cfef69ac..213b65852 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,3 +5,4 @@ Changed for individual apps are listed in `apps/appname/ChangeLog`
 
 * `Remove All Apps` now doesn't perform a reset before erase - fixes inability to update firmware if settings are wrong
 * Added optional `README.md` file for apps
+* Remove 2v04 version warning, add links in About to official/developer versions
diff --git a/index.html b/index.html
index 67f5a748b..0d5c17251 100644
--- a/index.html
+++ b/index.html
@@ -69,9 +69,6 @@
       <p id="requireHTTPS" class="hidden">
         <b>STOP!</b> This page <b>must</b> be served over HTTPS. Please <a>reload this page via HTTPS</a>.
       </p>
-      <p><b>Note:</b> If you have a version of Bangle.js firmware before 2v04, please update to the <a href="https://www.espruino.com/Bangle.js#firmware-updates" target="_blank">latest firmware</a> or
-        <a href="https://banglejs.com/oldapps/">use the legacy app loader</a>.
-      </p>
     </div>
 
 
@@ -129,6 +126,7 @@
         </div>
       </div>
       <div class="container" style="padding-top: 8px;">
+        <p id="apploaderlinks"></p>
         <p>Check out <a href="https://github.com/espruino/BangleApps" target="_blank">the Source on GitHub</a>, or
           find out <a href="https://www.espruino.com/Bangle.js+App+Loader" target="_blank">how to add your own app</a></p>
         <p>Using <a href="https://espruino.com/" target="_blank">Espruino</a>, Icons from <a href="https://icons8.com/" target="_blank">icons8.com</a></p>
diff --git a/js/index.js b/js/index.js
index 3cdb1c30c..d2c6d698b 100644
--- a/js/index.js
+++ b/js/index.js
@@ -465,6 +465,19 @@ librarySearchInput.addEventListener('input', evt => {
 
 // =========================================== About
 
+if (window.location.host=="banglejs.com") {
+  document.getElementById("apploaderlinks").innerHTML =
+    'This is the official Bangle.js App Loader - you can also try the <a href="https://espruino.github.io/BangleApps/">Development Version</a> for the most recent apps.';
+} else if (window.location.host=="espruino.github.io") {
+  document.title += " [Development]";
+  document.getElementById("apploaderlinks").innerHTML =
+    'This is the development Bangle.js App Loader - you can also try the <a href="https://banglejs.com/apps/">Official Version</a> for stable apps.';
+} else {
+  document.title += " [Unofficial]";
+  document.getElementById("apploaderlinks").innerHTML =
+    'This is not the official Bangle.js App Loader - you can try the <a href="https://banglejs.com/apps/">Official Version</a> here.';
+}
+
 document.getElementById("settime").addEventListener("click",event=>{
   Comms.setTime().then(()=>{
     showToast("Time set successfully","success");