diff --git a/apps.json b/apps.json
index b88bd8165..537a4f697 100644
--- a/apps.json
+++ b/apps.json
@@ -1,20 +1,38 @@
+---
+# =================================================================
+#    ALL THE INFORMATION INSIDE APPS.JSON HAS NOW BEEN MOVED
+# 
+#  You'll find it inside a file called apps/yourapp/metadata.json
+# 
+#  Otherwise nothing has changed. GitHub Pages will automatically
+#  create apps.json as your site is hosted, or if you're hosting
+#  yourself you can run bin/create_apps_json.sh
+#
+#  If you serve the store from localhost for development/testing,
+#  the loader looks for apps.local.json instead, you can run
+#  `bin/create_apps_json.sh apps.local.json` to create that file.
+# =================================================================
+
+# Uncomment the following line if you only want explicitly listed
+# apps to be available on your site
+
+# restricted: ["boot", "launch", "antonclk", "health", "setting", "about", "widbat", "widbt", "widlock", "widid"]
+---
+{%- if page.restricted == nil -%}
+    {%- assign apps = site.static_files | where: "name", "metadata.json" | map: "path" -%}
+{%- else -%}
+    {%- capture temp -%}
+    {%- for app in page.restricted %} /apps/{{app}}/metadata.json {%- endfor -%}
+    {%- endcapture -%}
+    {%- assign apps = temp | strip | split: " " -%}
+{%- endif -%}
+
 [
-{
-    "id": "aptsciclk",
-    "name": "Apeture Science Clock",
-    "shortName":"AptSci Clock",
-    "version": "0.08",
-    "description": "A clock based on the portal series",
-    "icon": "app.png",
-    "type": "clock",
-    "tags": "clock",
-    "supports": "BANGLEJS2",
-    "allow_emulator": false,
-    "readme":"README.md",
-    "storage": [
-      {"name":"aptsciclkquotes.txt","url":"quotes.txt"},
-      {"name":"aptsciclk.app.js","url":"app.js"},
-      {"name":"aptsciclk.img","url":"app-icon.js","evaluate":true}
-    ]
-}
+
+{%- include_relative {{ apps.first }} -%}
+
+{%- for app in apps offset:1 -%}
+,{%- include_relative {{ app }} -%}
+{%- endfor -%}
+
 ]