[Scummvm-git-logs] scummvm-web master -> 375325ca94b7d141205ff702c81ed26086073108

Thunderforge wjherrmann at gmail.com
Sat Apr 4 22:36:26 UTC 2020


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-web' repo located at https://github.com/scummvm/scummvm-web .

Summary:
375325ca94 * DATA: Changing YAML to Flathub style guide


Commit: 375325ca94b7d141205ff702c81ed26086073108
    https://github.com/scummvm/scummvm-web/commit/375325ca94b7d141205ff702c81ed26086073108
Author: Thunderforge (wjherrmann at gmail.com)
Date: 2020-04-04T17:36:23-05:00

Commit Message:
* DATA: Changing YAML to Flathub style guide

With YAML being a very flexible format, it would be good to have some consistency with how it is formatted. Flathub is a pretty commonly used repository and has good YAML guidelines, so I think it's good to reflect them.

Changed paths:
    README.md
    data/game_demos.yaml
    include/Models/GameDemosModel.php


diff --git a/README.md b/README.md
index 2b510e2a..4db7d351 100644
--- a/README.md
+++ b/README.md
@@ -63,3 +63,7 @@ submission guidelines.
 * **BUILD:** Files related to building and developing the site.
 * **WEB:** Catch-all for things that don't fit any of the above, or a mix of
 multiple components in a single commit.
+
+### Code Style
+
+YAML files should adhere to the [Flathub YAML Style Guide](https://github.com/flathub/flathub/wiki/YAML-Style-Guide).
\ No newline at end of file
diff --git a/data/game_demos.yaml b/data/game_demos.yaml
index 86b57599..6f1c4005 100644
--- a/data/game_demos.yaml
+++ b/data/game_demos.yaml
@@ -1,1501 +1,1181 @@
-game_demos:
-  group:
-  -
-    name: "LucasArts Demos"
+# Downloadable game demos
+groups:
+  - name: "LucasArts Demos"
     href: "lec"
     demos:
-    -
-      name: "Day of the Tentacle (DOS demo - Non interactive)"
-      url: "/frs/demos/scumm/dott-dos-ni-demo-en.zip"
-      target: "tentacle"
-    -
-      name: "Day of the Tentacle (DOS French demo - Non interactive)"
-      url: "/frs/demos/scumm/dott-dos-ni-demo-fr.zip"
-      target: "tentacle"
-    -
-      name: "Day of the Tentacle (DOS German demo - Non interactive)"
-      url: "/frs/demos/scumm/dott-dos-ni-demo-de.zip"
-      target: "tentacle"
-    -
-      name: "Day of the Tentacle (Macintosh demo - Non interactive)"
-      url: "/frs/demos/scumm/dott-mac-ni-demo-en.zip"
-      target: "tentacle"
-    -
-      name: "Full Throttle (DOS demo)"
-      url: "/frs/demos/scumm/ft-dos-demo-en.zip"
-      target: "ft"
-    -
-      name: "Full Throttle (Macintosh demo)"
-      url: "/frs/demos/scumm/ft-mac-demo-en.zip"
-      target: "ft"
-    -
-      name: "Indiana Jones and the Fate of Atlantis (DOS demo - Interactive)"
-      url: "/frs/demos/scumm/atlantis-dos-demo1-en.zip"
-      target: "atlantis"
-    -
-      name: "Indiana Jones and the Fate of Atlantis (DOS Alternative demo - Interactive)"
-      url: "/frs/demos/scumm/atlantis-dos-demo2-en.zip"
-      target: "atlantis"
-    -
-      name: "Indiana Jones and the Fate of Atlantis (DOS Yet another demo - Interactive)"
-      url: "/frs/demos/scumm/atlantis-dos-demo3-en.zip"
-      target: "atlantis"
-    -
-      name: "Indiana Jones and the Fate of Atlantis (DOS demo - Non interactive)"
-      url: "/frs/demos/scumm/atlantis-dos-ni-demo-en.zip"
-      target: "atlantis"
-    -
-      name: "Indiana Jones and the Fate of Atlantis (FM Towns demo - Non interactive)"
-      url: "/frs/demos/scumm/atlantis-fmtowns-ni-demo-jp.zip"
-      target: "atlantis"
-    -
-      name: "Indiana Jones and the Last Crusade (DOS EGA - Non interactive)"
-      url: "/frs/demos/scumm/indy3-ega-ni-demo-en.zip"
-      target: "indy3"
-    -
-      name: "Indiana Jones and the Last Crusade & Loom (FM Towns demo - Non interactive)"
-      url: "/frs/demos/scumm/zak-fmtowns-indyloom-ni-demo.zip"
-      target: "zak"
-    -
-      name: "Indiana Jones and the Last Crusade & Zak McKracken (FM Towns demo - Non interactive)"
-      url: "/frs/demos/scumm/zak-fmtowns-indyzak-ni-demo.zip"
-      target: "zak"
-    -
-      name: "Loom (DOS EGA - Short Non interactive)"
-      url: "/frs/demos/scumm/loom-dos-short-demo-en.zip"
-      target: "loom"
-    -
-      name: "Loom (DOS EGA - Long Non interactive)"
-      url: "/frs/demos/scumm/loom-dos-long-demo-en.zip"
-      target: "loom"
-    -
-      name: "Maniac Mansion (Commodore 64 demo)"
-      url: "/frs/demos/scumm/maniac-c64-demo-en.zip"
-      target: "maniac"
-    -
-      name: "Maniac Mansion (v1 DOS demo - Non interactive)"
-      url: "/frs/demos/scumm/maniac-dos-v1-ni-demo-en.zip"
-      target: "maniac"
-    -
-      name: "Maniac Mansion (v2 DOS demo - Non interactive)"
-      url: "/frs/demos/scumm/maniac-dos-v2-ni-demo-en.zip"
-      target: "maniac"
-    -
-      name: "Monkey Island 2 (DOS demo - not supported by ScummVM)"
-      url: "/frs/demos/scumm/monkey2-dos-ni-demo-en.zip"
-      target: "monkey2"
-    -
-      name: "Passport to Adventure (DOS EGA demos of Indiana Jones and the Last Crusade, The Secret of Monkey Island, Loom)"
-      url: "/frs/demos/scumm/pass-dos-en.zip"
-      target: "pass"
-      category: "blank"
-    -
-      name: "Sam & Max Hit the Road (DOS demo - Interactive)"
-      url: "/frs/demos/scumm/samnmax-dos-demo-en.zip"
-      target: "samnmax"
-    -
-      name: "Sam & Max Hit the Road (DOS demo - Non interactive)"
-      url: "/frs/demos/scumm/samnmax-dos-ni-demo-en.zip"
-      target: "samnmax"
-    -
-      name: "Sam & Max Hit the Road (DOS German demo - Interactive)"
-      url: "/frs/demos/scumm/samnmax-dos-demo-de.zip"
-      target: "samnmax"
-    -
-      name: "Sam & Max Hit the Road (DOS WIP demo - Interactive)"
-      url: "/frs/demos/scumm/samnmax-dos-wip-demo-en.zip"
-      target: "samnmax"
-    -
-      name: "Sam & Max Hit the Road (DOS CD demo - Interactive)"
-      url: "/frs/demos/scumm/samnmax-dos-cd-demo-en.zip"
-      target: "samnmax"
-    -
-      name: "Sam & Max Hit the Road (Macintosh demo - Interactive)"
-      url: "/frs/demos/scumm/samnmax-mac-demo-en.zip"
-      target: "samnmax"
-    -
-      name: "The Curse of Monkey Island (Windows small demo)"
-      url: "/frs/demos/scumm/comi-win-small-demo-en.zip"
-      target: "comi"
-    -
-      name: "The Curse of Monkey Island (Windows large demo)"
-      url: "/frs/demos/scumm/comi-win-large-demo-en.zip"
-      target: "comi"
-    -
-      name: "The Dig (Macintosh demo)"
-      url: "/frs/demos/scumm/dig-mac-demo-en.zip"
-      target: "dig"
-    -
-      name: "The Dig (DOS demo)"
-      url: "/frs/demos/scumm/dig-dos-demo-en.zip"
-      target: "dig"
-    -
-      name: "The Secret of Monkey Island (Amiga demo)"
-      url: "/frs/demos/scumm/monkey1-amiga-demo-en.zip"
-      target: "monkey"
-    -
-      name: "The Secret of Monkey Island (DOS EGA demo)"
-      url: "/frs/demos/scumm/monkey1-dos-ega-demo-en.zip"
-      target: "monkey"
-    -
-      name: "The Secret of Monkey Island (DOS EGA German demo)"
-      url: "/frs/demos/scumm/monkey1-dos-ega-demo-de.zip"
-      target: "monkey"
-    -
-      name: "Zak McKracken and the Alien Mindbenders (Atari ST demo - Non interactive)"
-      url: "/frs/demos/scumm/zak-atari-ni-demo.zip"
-      target: "zak"
-    -
-      name: "Zak McKracken & Loom (FM Towns demo - Non interactive)"
-      url: "/frs/demos/scumm/zak-fmtowns-zakloom-ni-demo.zip"
-      target: "zak"
-  -
-    name: "Humongous Entertainment Demos"
+      - name: "Day of the Tentacle (DOS demo - Non interactive)"
+        url: "/frs/demos/scumm/dott-dos-ni-demo-en.zip"
+        target: "tentacle"
+      - name: "Day of the Tentacle (DOS French demo - Non interactive)"
+        url: "/frs/demos/scumm/dott-dos-ni-demo-fr.zip"
+        target: "tentacle"
+      - name: "Day of the Tentacle (DOS German demo - Non interactive)"
+        url: "/frs/demos/scumm/dott-dos-ni-demo-de.zip"
+        target: "tentacle"
+      - name: "Day of the Tentacle (Macintosh demo - Non interactive)"
+        url: "/frs/demos/scumm/dott-mac-ni-demo-en.zip"
+        target: "tentacle"
+      - name: "Full Throttle (DOS demo)"
+        url: "/frs/demos/scumm/ft-dos-demo-en.zip"
+        target: "ft"
+      - name: "Full Throttle (Macintosh demo)"
+        url: "/frs/demos/scumm/ft-mac-demo-en.zip"
+        target: "ft"
+      - name: "Indiana Jones and the Fate of Atlantis (DOS demo - Interactive)"
+        url: "/frs/demos/scumm/atlantis-dos-demo1-en.zip"
+        target: "atlantis"
+      - name: "Indiana Jones and the Fate of Atlantis (DOS Alternative demo - Interactive)"
+        url: "/frs/demos/scumm/atlantis-dos-demo2-en.zip"
+        target: "atlantis"
+      - name: "Indiana Jones and the Fate of Atlantis (DOS Yet another demo - Interactive)"
+        url: "/frs/demos/scumm/atlantis-dos-demo3-en.zip"
+        target: "atlantis"
+      - name: "Indiana Jones and the Fate of Atlantis (DOS demo - Non interactive)"
+        url: "/frs/demos/scumm/atlantis-dos-ni-demo-en.zip"
+        target: "atlantis"
+      - name: "Indiana Jones and the Fate of Atlantis (FM Towns demo - Non interactive)"
+        url: "/frs/demos/scumm/atlantis-fmtowns-ni-demo-jp.zip"
+        target: "atlantis"
+      - name: "Indiana Jones and the Last Crusade (DOS EGA - Non interactive)"
+        url: "/frs/demos/scumm/indy3-ega-ni-demo-en.zip"
+        target: "indy3"
+      - name: "Indiana Jones and the Last Crusade & Loom (FM Towns demo - Non interactive)"
+        url: "/frs/demos/scumm/zak-fmtowns-indyloom-ni-demo.zip"
+        target: "zak"
+      - name: "Indiana Jones and the Last Crusade & Zak McKracken (FM Towns demo - Non interactive)"
+        url: "/frs/demos/scumm/zak-fmtowns-indyzak-ni-demo.zip"
+        target: "zak"
+      - name: "Loom (DOS EGA - Short Non interactive)"
+        url: "/frs/demos/scumm/loom-dos-short-demo-en.zip"
+        target: "loom"
+      - name: "Loom (DOS EGA - Long Non interactive)"
+        url: "/frs/demos/scumm/loom-dos-long-demo-en.zip"
+        target: "loom"
+      - name: "Maniac Mansion (Commodore 64 demo)"
+        url: "/frs/demos/scumm/maniac-c64-demo-en.zip"
+        target: "maniac"
+      - name: "Maniac Mansion (v1 DOS demo - Non interactive)"
+        url: "/frs/demos/scumm/maniac-dos-v1-ni-demo-en.zip"
+        target: "maniac"
+      - name: "Maniac Mansion (v2 DOS demo - Non interactive)"
+        url: "/frs/demos/scumm/maniac-dos-v2-ni-demo-en.zip"
+        target: "maniac"
+      - name: "Monkey Island 2 (DOS demo - not supported by ScummVM)"
+        url: "/frs/demos/scumm/monkey2-dos-ni-demo-en.zip"
+        target: "monkey2"
+      - name: "Passport to Adventure (DOS EGA demos of Indiana Jones and the Last Crusade, The Secret of Monkey Island, Loom)"
+        url: "/frs/demos/scumm/pass-dos-en.zip"
+        target: "pass"
+        category: "blank"
+      - name: "Sam & Max Hit the Road (DOS demo - Interactive)"
+        url: "/frs/demos/scumm/samnmax-dos-demo-en.zip"
+        target: "samnmax"
+      - name: "Sam & Max Hit the Road (DOS demo - Non interactive)"
+        url: "/frs/demos/scumm/samnmax-dos-ni-demo-en.zip"
+        target: "samnmax"
+      - name: "Sam & Max Hit the Road (DOS German demo - Interactive)"
+        url: "/frs/demos/scumm/samnmax-dos-demo-de.zip"
+        target: "samnmax"
+      - name: "Sam & Max Hit the Road (DOS WIP demo - Interactive)"
+        url: "/frs/demos/scumm/samnmax-dos-wip-demo-en.zip"
+        target: "samnmax"
+      - name: "Sam & Max Hit the Road (DOS CD demo - Interactive)"
+        url: "/frs/demos/scumm/samnmax-dos-cd-demo-en.zip"
+        target: "samnmax"
+      - name: "Sam & Max Hit the Road (Macintosh demo - Interactive)"
+        url: "/frs/demos/scumm/samnmax-mac-demo-en.zip"
+        target: "samnmax"
+      - name: "The Curse of Monkey Island (Windows small demo)"
+        url: "/frs/demos/scumm/comi-win-small-demo-en.zip"
+        target: "comi"
+      - name: "The Curse of Monkey Island (Windows large demo)"
+        url: "/frs/demos/scumm/comi-win-large-demo-en.zip"
+        target: "comi"
+      - name: "The Dig (Macintosh demo)"
+        url: "/frs/demos/scumm/dig-mac-demo-en.zip"
+        target: "dig"
+      - name: "The Dig (DOS demo)"
+        url: "/frs/demos/scumm/dig-dos-demo-en.zip"
+        target: "dig"
+      - name: "The Secret of Monkey Island (Amiga demo)"
+        url: "/frs/demos/scumm/monkey1-amiga-demo-en.zip"
+        target: "monkey"
+      - name: "The Secret of Monkey Island (DOS EGA demo)"
+        url: "/frs/demos/scumm/monkey1-dos-ega-demo-en.zip"
+        target: "monkey"
+      - name: "The Secret of Monkey Island (DOS EGA German demo)"
+        url: "/frs/demos/scumm/monkey1-dos-ega-demo-de.zip"
+        target: "monkey"
+      - name: "Zak McKracken and the Alien Mindbenders (Atari ST demo - Non interactive)"
+        url: "/frs/demos/scumm/zak-atari-ni-demo.zip"
+        target: "zak"
+      - name: "Zak McKracken & Loom (FM Towns demo - Non interactive)"
+        url: "/frs/demos/scumm/zak-fmtowns-zakloom-ni-demo.zip"
+        target: "zak"
+
+  - name: "Humongous Entertainment Demos"
     href: "he"
-    demos: 
-    -
-      name: "Backyard Baseball (Windows Preview)"
-      url: "/frs/demos/scumm/he/baseball-win-preview1-us.zip"
-      target: "baseball"
-      category: "blank"
-    -
-      name: "Backyard Baseball (Windows Alternative Preview)"
-      url: "/frs/demos/scumm/he/baseball-win-preview2-us.zip"
-      target: "baseball"
-      category: "blank"
-    -
-      name: "Backyard Baseball 2001 (Windows Demo)"
-      url: "/frs/demos/scumm/he/baseball2001-win-demo-us.zip"
-      target: "baseball2001"
-      category: "blank"
-    -
-      name: "Backyard Football (Windows Demo)"
-      url: "/frs/demos/scumm/he/football-win-demo-us.zip"
-      target: "football"
-    -
-      name: "Big Thinkers First Grade (Windows Demo)"
-      url: "/frs/demos/scumm/he/thinker1-win-demo-us.zip"
-      target: "thinker1"
-      category: "thinkers"
-    -
-      name: "Big Thinkers Kindergarten (Windows Demo)"
-      url: "/frs/demos/scumm/he/thinkerk-win-demo-us.zip"
-      target: "thinkerk"
-      category: "thinkers"
-    -
-      name: "Blue's ABC Time (Windows Demo)"
-      url: "/frs/demos/scumm/he/BluesABCTime-win-demo1-us.zip"
-      target: "BluesABCTime"
-      category: "blues"
-    -
-      name: "Blue's ABC Time (Windows Alternative Demo)"
-      url: "/frs/demos/scumm/he/BluesABCTime-win-demo2-us.zip"
-      target: "BluesABCTime"
-      category: "blues"
-    -
-      name: "Blue's ABC Time (Windows Preview)"
-      url: "/frs/demos/scumm/he/BluesABCTime-win-preview-us.zip"
-      target: "BluesABCTime"
-      category: "blues"
-    -
-      name: "Blue's Art Time Activities (Windows Demo)"
-      url: "/frs/demos/scumm/he/arttime-win-demo-us.zip"
-      target: "freddicove"
-      category: "blues"
-    -
-      name: "Blue's Birthday Adventure (Windows Demo)"
-      url: "/frs/demos/scumm/he/BluesBirthday-win-demo1-us.zip"
-      target: "BluesBirthday"
-      category: "blues"
-    -
-      name: "Blue's Birthday Adventure (Windows Alternative Demo)"
-      url: "/frs/demos/scumm/he/BluesBirthday-win-demo2-us.zip"
-      target: "BluesBirthday"
-      category: "blues"
-    -
-      name: "Blue's Birthday Adventure (Windows Preview)"
-      url: "/frs/demos/scumm/he/BluesBirthday-win-preview-us.zip"
-      target: "BluesBirthday"
-      category: "blues"
-    -
-      name: "Blue's Reading Time Activities (Windows Demo)"
-      url: "/frs/demos/scumm/he/readtime-win-demo-us.zip"
-      target: "freddicove"
-      category: "blues"
-    -
-      name: "Fatty Bear's Birthday Surprise (DOS demo)"
-      url: "/frs/demos/scumm/he/fbear-dos-demo-us.zip"
-      target: "fbear"
-    -
-      name: "Fatty Bear's Birthday Surprise (Macintosh demo)"
-      url: "/frs/demos/scumm/he/fbear-mac-demo-us.zip"
-      target: "fbear"
-    -
-      name: "Fatty Bear's Birthday Surprise (Windows demo)"
-      url: "/frs/demos/scumm/he/fbear-win-demo-us.zip"
-      target: "fbear"
-    -
-      name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Macintosh Demo)"
-      url: "/frs/demos/scumm/he/freddi-mac-demo_us.zip"
-      target: "freddi"
-      category: "ffish"
-    -
-      name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Windows Demo)"
-      url: "/frs/demos/scumm/he/freddi-win-demo-us.zip"
-      target: "freddi"
-      category: "ffish"
-    -
-      name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Windows Updated Demo)"
-      url: "/frs/demos/scumm/he/freddi-win-updated-demo-us.zip"
-      target: "freddi"
-      category: "ffish"
-    -
-      name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/freddi-win-demo-nl.zip"
-      target: "freddi"
-      category: "ffish"
-    -
-      name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Windows French Demo)"
-      url: "/frs/demos/scumm/he/freddi-win-demo-fr.zip"
-      target: "freddi"
-      category: "ffish"
-    -
-      name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Windows German demo)"
-      url: "/frs/demos/scumm/he/freddi-win-demo-de.zip"
-      target: "freddi"
-      category: "ffish"
-    -
-      name: "Freddi Fish 2: The Case of the Haunted Schoolhouse (Windows Demo)"
-      url: "/frs/demos/scumm/he/freddi2-win-demo-us.zip"
-      target: "freddi2"
-      category: "ffish"
-    -
-      name: "Freddi Fish 2: The Case of the Haunted Schoolhouse (Windows Updated Demo)"
-      url: "/frs/demos/scumm/he/freddi2-win-updated-demo-us.zip"
-      target: "freddi2"
-      category: "ffish"
-    -
-      name: "Freddi Fish 2: The Case of the Haunted Schoolhouse (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/freddi2-win-demo-nl.zip"
-      target: "freddi2"
-      category: "ffish"
-    -
-      name: "Freddi Fish 3: The Case of the Stolen Conch Shell (Windows Demo)"
-      url: "/frs/demos/scumm/he/freddi3-win-demo-us.zip"
-      target: "freddi3"
-      category: "ffish"
-    -
-      name: "Freddi Fish 3: The Case of the Stolen Conch Shell (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/freddi3-win-demo-nl.zip"
-      target: "freddi3"
-      category: "ffish"
-    -
-      name: "Freddi Fish 3: The Case of the Stolen Conch Shell (Windows French Demo)"
-      url: "/frs/demos/scumm/he/freddi3-win-demo-fr.zip"
-      target: "freddi3"
-      category: "ffish"
-    -
-      name: "Freddi Fish 3: The Case of the Stolen Conch Shell (Windows Hebrew Demo)"
-      url: "/frs/demos/scumm/he/freddi3-win-demo-hb.zip"
-      target: "freddi3"
-      category: "ffish"
-    -
-      name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Demo)"
-      url: "/frs/demos/scumm/he/freddi4-win-demo-us.zip"
-      target: "freddi4"
-      category: "ffish"
-    -
-      name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Updated Demo)"
-      url: "/frs/demos/scumm/he/freddi4-win-updated-demo-us.zip"
-      target: "freddi4"
-      category: "ffish"
-    -
-      name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/freddi4-win-demo1-nl.zip"
-      target: "freddi4"
-      category: "ffish"
-    -
-      name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Dutch Alternative Demo)"
-      url: "/frs/demos/scumm/he/freddi4-win-demo2-nl.zip"
-      target: "freddi4"
-      category: "ffish"
-    -
-      name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Dutch Alternative Demo)"
-      url: "/frs/demos/scumm/he/freddi4-win-demo3-nl.zip"
-      target: "freddi4"
-      category: "ffish"
-    -
-      name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows French Demo)"
-      url: "/frs/demos/scumm/he/freddi4-win-demo.fr.zip"
-      target: "freddi4"
-      category: "ffish"
-    -
-      name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows German Demo)"
-      url: "/frs/demos/scumm/he/freddi4-win-demo-de.zip"
-      target: "freddi4"
-      category: "ffish"
-    -
-      name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Italian Demo)"
-      url: "/frs/demos/scumm/he/freddi4-win-demo-it.zip"
-      target: "freddi4"
-      category: "ffish"
-    -
-      name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows UK Demo)"
-      url: "/frs/demos/scumm/he/freddi4-win-demo-uk.zip"
-      target: "freddi4"
-      category: "ffish"
-    -
-      name: "Freddi Fish 5: The Case of the Creature of Coral Cave (Windows Demo)"
-      url: "/frs/demos/scumm/he/freddicove-win-demo-us.zip"
-      target: "freddicove"
-      category: "ffish"
-    -
-      name: "Freddi Fish 5: The Case of the Creature of Coral Cave (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/freddicove-win-demo-nl.zip"
-      target: "freddicove"
-      category: "ffish"
-    -
-      name: "Humongous Catalog demo (Windows Demo)"
-      url: "/frs/demos/scumm/he/catalog-win-demo-en.zip"
-      target: "catalog"
-      category: "blank"
-    -
-      name: "Humongous Catalog demo (Windows French Preview)"
-      url: "/frs/demos/scumm/he/catalog-win-preview-fr.zip"
-      target: "catalog"
-      category: "blank"
-    -
-      name: "Humongous Catalog demo (Windows German Preview)"
-      url: "/frs/demos/scumm/he/catalog-win-preview-de.zip"
-      target: "catalog"
-      category: "blank"
-    -
-      name: "Humongous Catalog demo (Windows UK Preview)"
-      url: "/frs/demos/scumm/he/catalog-win-preview-uk.zip"
-      target: "catalog"
-      category: "blank"
-    -
-      name: "Humongous Catalog demo (Windows US Preview)"
-      url: "/frs/demos/scumm/he/catalog-win-preview-us.zip"
-      target: "catalog"
-      category: "blank"
-    -
-      name: "Let's Explore the Airport with Buzzy (Macintosh Demo)"
-      url: "/frs/demos/scumm/he/airport-mac-demo-us.zip"
-      target: "airport"
-      category: "blank"
-    -
-      name: "Let's Explore the Airport with Buzzy (Windows Demo)"
-      url: "/frs/demos/scumm/he/airport-win-demo-us.zip"
-      target: "airport"
-      category: "blank"
-    -
-      name: "Let's Explore the Airport with Buzzy (Windows Updated Demo)"
-      url: "/frs/demos/scumm/he/airport-win-updated-demo1-us.zip"
-      target: "airport"
-      category: "blank"
-    -
-      name: "Let's Explore the Airport with Buzzy (Windows Updated Alternative Demo)"
-      url: "/frs/demos/scumm/he/airport-win-updated-demo2-us.zip"
-      target: "airport"
-      category: "blank"
-    -
-      name: "Let's Explore the Airport with Buzzy (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/airport-win-demo-nl.zip"
-      target: "airport"
-      category: "blank"
-    -
-      name: "Let's Explore the Farm with Buzzy (Windows Demo)"
-      url: "/frs/demos/scumm/he/farm-win-demo-us.zip"
-      target: "farm"
-      category: "blank"
-    -
-      name: "Let's Explore the Farm with Buzzy (Windows Updated Demo)"
-      url: "/frs/demos/scumm/he/farm-win-updated-demo-us.zip"
-      target: "farm"
-      category: "blank"
-    -
-      name: "Let's Explore the Farm with Buzzy (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/farm-win-demo-nl.zip"
-      target: "farm"
-      category: "blank"
-    -
-      name: "Pajama Sam 1: No Need to Hide When It's Dark Outside (Windows Demo)"
-      url: "/frs/demos/scumm/he/pajama-win-demo-us.zip"
-      target: "pajama"
-    -
-      name: "Pajama Sam 1: No Need to Hide When It's Dark Outside (Windows Updated Demo)"
-      url: "/frs/demos/scumm/he/pajama-win-updated-demo-us.zip"
-      target: "pajama"
-    -
-      name: "Pajama Sam 1: No Need to Hide When It's Dark Outside (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/pajama2-win-demo-nl.zip"
-      target: "pajama"
-    -
-      name: "Pajama Sam 1: No Need to Hide When It's Dark Outside (Windows French Demo)"
-      url: "/frs/demos/scumm/he/pajama-win-demo-fr.zip"
-      target: "pajama"
-    -
-      name: "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Windows Demo)"
-      url: "/frs/demos/scumm/he/pajama2-win-demo-us.zip"
-      target: "pajama2"
-      category: "pajama"
-    -
-      name: "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/pajama2-win-demo-nl.zip"
-      target: "pajama2"
-      category: "pajama"
-    -
-      name: "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Windows Hebrew Demo)"
-      url: "/frs/demos/scumm/he/pajama2-win-demo-hb.zip"
-      target: "pajama2"
-      category: "pajama"
-    -
-      name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows Demo)"
-      url: "/frs/demos/scumm/he/pajama3-win-demo-us.zip"
-      target: "pajama3"
-      category: "pajama"
-    -
-      name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/pajama3-win-demo-nl.zip"
-      target: "pajama3"
-      category: "pajama"
-    -
-      name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows French Demo)"
-      url: "/frs/demos/scumm/he/pajama3-win-demo-fr.zip"
-      target: "pajama3"
-      category: "pajama"
-    -
-      name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows German Demo)"
-      url: "/frs/demos/scumm/he/pajama3-win-demo-de.zip"
-      target: "pajama3"
-      category: "pajama"
-    -
-      name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows Italian Demo)"
-      url: "/frs/demos/scumm/he/pajama3-win-demo-it.zip"
-      target: "pajama3"
-      category: "pajama"
-    -
-      name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows UK Demo)"
-      url: "/frs/demos/scumm/he/pajama3-win-demo-uk.zip"
-      target: "pajama3"
-      category: "pajama"
-    -
-      name: "Pajama Sam's Lost & Found (Windows Demo)"
-      url: "/frs/demos/scumm/he/lost-win-demo-us.zip"
-      target: "lost"
-      category: "pajama"
-    -
-      name: "Putt-Putt Enters the Race (Windows Demo)"
-      url: "/frs/demos/scumm/he/puttrace-win-demo-us.zip"
-      target: "puttrace"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Enters the Race (Windows Preview)"
-      url: "/frs/demos/scumm/he/puttrace-win-preview-us.zip"
-      target: "puttrace"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Enters the Race (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/puttrace-win-demo-nl.zip"
-      target: "puttrace"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Enters the Race (Windows Updated Dutch Demo)"
-      url: "/frs/demos/scumm/he/puttrace-win-updated-demo-nl.zip"
-      target: "puttrace"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Enters the Race (Windows French Demo)"
-      url: "/frs/demos/scumm/he/puttrace-win-demo-fr.zip"
-      target: "puttrace"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Enters the Race (Windows German Demo)"
-      url: "/frs/demos/scumm/he/puttrace-win-demo-de.zip"
-      target: "puttrace"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Enters the Race (Windows Italian Demo)"
-      url: "/frs/demos/scumm/he/puttrace-win-demo-it.zip"
-      target: "puttrace"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Enters the Race (Windows UK Demo)"
-      url: "/frs/demos/scumm/he/puttrace-win-demo-uk.zip"
-      target: "puttrace"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Goes to the Moon (DOS demo)"
-      url: "/frs/demos/scumm/he/puttmoon-dos-demo-us.zip"
-      target: "puttmoon"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Goes to the Moon (Macintosh demo)"
-      url: "/frs/demos/scumm/he/puttmoon-mac-demo-us.zip"
-      target: "puttmoon"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Goes to the Moon (Windows demo)"
-      url: "/frs/demos/scumm/he/puttmoon-win-demo-us.zip"
-      target: "puttmoon"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Joins the Circus (Windows Demo)"
-      url: "/frs/demos/scumm/he/puttcircus-win-demo-us.zip"
-      target: "puttcircus"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Joins the Circus (Windows French Demo)"
-      url: "/frs/demos/scumm/he/puttcircus-win-demo-fr.zip"
-      target: "puttcircus"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Joins the Circus (Windows Hebrew Demo)"
-      url: "/frs/demos/scumm/he/puttcircus-win-demo-hb.zip"
-      target: "puttcircus"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Joins the Parade (DOS demo)"
-      url: "/frs/demos/scumm/he/puttputt-dos-demo-us.zip"
-      target: "puttputt"
-    -
-      name: "Putt-Putt Joins the Parade (Macintosh demo)"
-      url: "/frs/demos/scumm/he/puttputt-mac-demo-us.zip"
-      target: "puttputt"
-    -
-      name: "Putt-Putt Joins the Parade (Windows demo)"
-      url: "/frs/demos/scumm/he/puttputt-win-demo-us.zip"
-      target: "puttputt"
-    -
-      name: "Putt-Putt Saves the Zoo (Macintosh Demo)"
-      url: "/frs/demos/scumm/he/puttzoo-mac-demo-us.zip"
-      target: "puttzoo"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Saves the Zoo (Windows Demo)"
-      url: "/frs/demos/scumm/he/puttzoo-win-demo-us.zip"
-      target: "puttzoo"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Saves the Zoo (Windows Updated Demo)"
-      url: "/frs/demos/scumm/he/puttzoo-win-updated-demo-us.zip"
-      target: "puttzoo"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Saves the Zoo (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/puttzoo-win-demo-nl.zip"
-      target: "puttzoo"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Saves the Zoo (Windows French Demo)"
-      url: "/frs/demos/scumm/he/puttzoo-win-demo-fr.zip"
-      target: "puttzoo"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Saves the Zoo (Windows German Demo)"
-      url: "/frs/demos/scumm/he/puttzoo-win-demo-de.zip"
-      target: "puttzoo"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Travels Through Time (Windows Demo)"
-      url: "/frs/demos/scumm/he/putttime-win-demo-us.zip"
-      target: "putttime"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Travels Through Time (Windows Updated Demo)"
-      url: "/frs/demos/scumm/he/putttime-win-updated-demo-us.zip"
-      target: "putttime"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Travels Through Time (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/putttime-win-demo-nl.zip"
-      target: "putttime"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Travels Through Time (Windows French Demo)"
-      url: "/frs/demos/scumm/he/putttime-win-demo-fr.zip"
-      target: "putttime"
-      category: "puttputt"
-    -
-      name: "Putt-Putt Travels Through Time (Windows German Demo)"
-      url: "/frs/demos/scumm/he/putttime-win-demo-de.zip"
-      target: "putttime"
-      category: "puttputt"
-    -
-      name: "SPY Fox 1: Dry Cereal (Windows Demo)"
-      url: "/frs/demos/scumm/he/spyfox-win-demo1-us.zip"
-      target: "spyfox"
-    -
-      name: "SPY Fox 1: Dry Cereal (Windows Alternative Demo)"
-      url: "/frs/demos/scumm/he/spyfox-win-demo2-us.zip"
-      target: "spyfox"
-    -
-      name: "SPY Fox 1: Dry Cereal (Windows Updated Demo)"
-      url: "/frs/demos/scumm/he/spyfox-win-updated-demo-us.zip"
-      target: "spyfox"
-    -
-      name: "SPY Fox 1: Dry Cereal (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/spyfox-win-demo-nl.zip"
-      target: "spyfox"
-    -
-      name: "SPY Fox 1: Dry Cereal (Windows French Demo)"
-      url: "/frs/demos/scumm/he/spyfox-win-demo-fr.zip"
-      target: "spyfox"
-    -
-      name: "SPY Fox 2: Some Assembly Required (Windows Demo)"
-      url: "/frs/demos/scumm/he/spyfox2-win-demo-us.zip"
-      target: "spyfox2"
-      category: "spyfox"
-    -
-      name: "SPY Fox 2: Some Assembly Required (Windows French Demo)"
-      url: "/frs/demos/scumm/he/spyfox2-win-demo-fr.zip"
-      target: "spyfox2"
-      category: "spyfox"
-    -
-      name: "SPY Fox 2: Some Assembly Required (Windows Preview)"
-      url: "/frs/demos/scumm/he/spyfox2-win-preview-us.zip"
-      target: "spyfox2"
-      category: "spyfox"
-    -
-      name: "SPY Fox 2: Some Assembly Required (Windows Dutch Demo)"
-      url: "/frs/demos/scumm/he/spyfox2-win-demo-nl.zip"
-      target: "spyfox2"
-      category: "spyfox"
-    -
-      name: "SPY Fox 2: Some Assembly Required (Windows German Demo)"
-      url: "/frs/demos/scumm/he/spyfox2-win-demo-de.zip"
-      target: "spyfox2"
-      category: "spyfox"
-    -
-      name: "SPY Fox 2: Some Assembly Required (Windows Italian Demo)"
-      url: "/frs/demos/scumm/he/spyfox2-win-demo-it.zip"
-      target: "spyfox2"
-      category: "spyfox"
-    -
-      name: "SPY Fox 2: Some Assembly Required (Windows UK Demo)"
-      url: "/frs/demos/scumm/he/spyfox2-win-demo-uk.zip"
-      target: "spyfox2"
-      category: "spyfox"
-    -
-      name: "SPY Fox 3: Operation Ozone (Windows Demo)"
-      url: "/frs/demos/scumm/he/spyozon-win-demo-us.zip"
-      target: "spyozon"
-      category: "spyfox"
-    -
-      name: "SPY Fox 3: Operation Ozone (Windows French Demo)"
-      url: "/frs/demos/scumm/he/spyozon-win-demo-fr.zip"
-      target: "spyozon"
-      category: "spyfox"
-    -
-      name: "SPY Fox 3: Operation Ozone (Windows Preview)"
-      url: "/frs/demos/scumm/he/spyozon-win-preview-us.zip"
-      target: "spyozon"
-      category: "spyfox"
-  -
-    name: "Adventuresoft/Horrorsoft Demos"
+    demos:
+      - name: "Backyard Baseball (Windows Preview)"
+        url: "/frs/demos/scumm/he/baseball-win-preview1-us.zip"
+        target: "baseball"
+        category: "blank"
+      - name: "Backyard Baseball (Windows Alternative Preview)"
+        url: "/frs/demos/scumm/he/baseball-win-preview2-us.zip"
+        target: "baseball"
+        category: "blank"
+      - name: "Backyard Baseball 2001 (Windows Demo)"
+        url: "/frs/demos/scumm/he/baseball2001-win-demo-us.zip"
+        target: "baseball2001"
+        category: "blank"
+      - name: "Backyard Football (Windows Demo)"
+        url: "/frs/demos/scumm/he/football-win-demo-us.zip"
+        target: "football"
+      - name: "Big Thinkers First Grade (Windows Demo)"
+        url: "/frs/demos/scumm/he/thinker1-win-demo-us.zip"
+        target: "thinker1"
+        category: "thinkers"
+      - name: "Big Thinkers Kindergarten (Windows Demo)"
+        url: "/frs/demos/scumm/he/thinkerk-win-demo-us.zip"
+        target: "thinkerk"
+        category: "thinkers"
+      - name: "Blue's ABC Time (Windows Demo)"
+        url: "/frs/demos/scumm/he/BluesABCTime-win-demo1-us.zip"
+        target: "BluesABCTime"
+        category: "blues"
+      - name: "Blue's ABC Time (Windows Alternative Demo)"
+        url: "/frs/demos/scumm/he/BluesABCTime-win-demo2-us.zip"
+        target: "BluesABCTime"
+        category: "blues"
+      - name: "Blue's ABC Time (Windows Preview)"
+        url: "/frs/demos/scumm/he/BluesABCTime-win-preview-us.zip"
+        target: "BluesABCTime"
+        category: "blues"
+      - name: "Blue's Art Time Activities (Windows Demo)"
+        url: "/frs/demos/scumm/he/arttime-win-demo-us.zip"
+        target: "freddicove"
+        category: "blues"
+      - name: "Blue's Birthday Adventure (Windows Demo)"
+        url: "/frs/demos/scumm/he/BluesBirthday-win-demo1-us.zip"
+        target: "BluesBirthday"
+        category: "blues"
+      - name: "Blue's Birthday Adventure (Windows Alternative Demo)"
+        url: "/frs/demos/scumm/he/BluesBirthday-win-demo2-us.zip"
+        target: "BluesBirthday"
+        category: "blues"
+      - name: "Blue's Birthday Adventure (Windows Preview)"
+        url: "/frs/demos/scumm/he/BluesBirthday-win-preview-us.zip"
+        target: "BluesBirthday"
+        category: "blues"
+      - name: "Blue's Reading Time Activities (Windows Demo)"
+        url: "/frs/demos/scumm/he/readtime-win-demo-us.zip"
+        target: "freddicove"
+        category: "blues"
+      - name: "Fatty Bear's Birthday Surprise (DOS demo)"
+        url: "/frs/demos/scumm/he/fbear-dos-demo-us.zip"
+        target: "fbear"
+      - name: "Fatty Bear's Birthday Surprise (Macintosh demo)"
+        url: "/frs/demos/scumm/he/fbear-mac-demo-us.zip"
+        target: "fbear"
+      - name: "Fatty Bear's Birthday Surprise (Windows demo)"
+        url: "/frs/demos/scumm/he/fbear-win-demo-us.zip"
+        target: "fbear"
+      - name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Macintosh Demo)"
+        url: "/frs/demos/scumm/he/freddi-mac-demo_us.zip"
+        target: "freddi"
+        category: "ffish"
+      - name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Windows Demo)"
+        url: "/frs/demos/scumm/he/freddi-win-demo-us.zip"
+        target: "freddi"
+        category: "ffish"
+      - name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Windows Updated Demo)"
+        url: "/frs/demos/scumm/he/freddi-win-updated-demo-us.zip"
+        target: "freddi"
+        category: "ffish"
+      - name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/freddi-win-demo-nl.zip"
+        target: "freddi"
+        category: "ffish"
+      - name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Windows French Demo)"
+        url: "/frs/demos/scumm/he/freddi-win-demo-fr.zip"
+        target: "freddi"
+        category: "ffish"
+      - name: "Freddi Fish 1: The Case of the Missing Kelp Seeds (Windows German demo)"
+        url: "/frs/demos/scumm/he/freddi-win-demo-de.zip"
+        target: "freddi"
+        category: "ffish"
+      - name: "Freddi Fish 2: The Case of the Haunted Schoolhouse (Windows Demo)"
+        url: "/frs/demos/scumm/he/freddi2-win-demo-us.zip"
+        target: "freddi2"
+        category: "ffish"
+      - name: "Freddi Fish 2: The Case of the Haunted Schoolhouse (Windows Updated Demo)"
+        url: "/frs/demos/scumm/he/freddi2-win-updated-demo-us.zip"
+        target: "freddi2"
+        category: "ffish"
+      - name: "Freddi Fish 2: The Case of the Haunted Schoolhouse (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/freddi2-win-demo-nl.zip"
+        target: "freddi2"
+        category: "ffish"
+      - name: "Freddi Fish 3: The Case of the Stolen Conch Shell (Windows Demo)"
+        url: "/frs/demos/scumm/he/freddi3-win-demo-us.zip"
+        target: "freddi3"
+        category: "ffish"
+      - name: "Freddi Fish 3: The Case of the Stolen Conch Shell (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/freddi3-win-demo-nl.zip"
+        target: "freddi3"
+        category: "ffish"
+      - name: "Freddi Fish 3: The Case of the Stolen Conch Shell (Windows French Demo)"
+        url: "/frs/demos/scumm/he/freddi3-win-demo-fr.zip"
+        target: "freddi3"
+        category: "ffish"
+      - name: "Freddi Fish 3: The Case of the Stolen Conch Shell (Windows Hebrew Demo)"
+        url: "/frs/demos/scumm/he/freddi3-win-demo-hb.zip"
+        target: "freddi3"
+        category: "ffish"
+      - name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Demo)"
+        url: "/frs/demos/scumm/he/freddi4-win-demo-us.zip"
+        target: "freddi4"
+        category: "ffish"
+      - name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Updated Demo)"
+        url: "/frs/demos/scumm/he/freddi4-win-updated-demo-us.zip"
+        target: "freddi4"
+        category: "ffish"
+      - name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/freddi4-win-demo1-nl.zip"
+        target: "freddi4"
+        category: "ffish"
+      - name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Dutch Alternative Demo)"
+        url: "/frs/demos/scumm/he/freddi4-win-demo2-nl.zip"
+        target: "freddi4"
+        category: "ffish"
+      - name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Dutch Alternative Demo)"
+        url: "/frs/demos/scumm/he/freddi4-win-demo3-nl.zip"
+        target: "freddi4"
+        category: "ffish"
+      - name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows French Demo)"
+        url: "/frs/demos/scumm/he/freddi4-win-demo.fr.zip"
+        target: "freddi4"
+        category: "ffish"
+      - name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows German Demo)"
+        url: "/frs/demos/scumm/he/freddi4-win-demo-de.zip"
+        target: "freddi4"
+        category: "ffish"
+      - name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows Italian Demo)"
+        url: "/frs/demos/scumm/he/freddi4-win-demo-it.zip"
+        target: "freddi4"
+        category: "ffish"
+      - name: "Freddi Fish 4: The Case of the Hogfish Rustlers of Briny Gulch (Windows UK Demo)"
+        url: "/frs/demos/scumm/he/freddi4-win-demo-uk.zip"
+        target: "freddi4"
+        category: "ffish"
+      - name: "Freddi Fish 5: The Case of the Creature of Coral Cave (Windows Demo)"
+        url: "/frs/demos/scumm/he/freddicove-win-demo-us.zip"
+        target: "freddicove"
+        category: "ffish"
+      - name: "Freddi Fish 5: The Case of the Creature of Coral Cave (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/freddicove-win-demo-nl.zip"
+        target: "freddicove"
+        category: "ffish"
+      - name: "Humongous Catalog demo (Windows Demo)"
+        url: "/frs/demos/scumm/he/catalog-win-demo-en.zip"
+        target: "catalog"
+        category: "blank"
+      - name: "Humongous Catalog demo (Windows French Preview)"
+        url: "/frs/demos/scumm/he/catalog-win-preview-fr.zip"
+        target: "catalog"
+        category: "blank"
+      - name: "Humongous Catalog demo (Windows German Preview)"
+        url: "/frs/demos/scumm/he/catalog-win-preview-de.zip"
+        target: "catalog"
+        category: "blank"
+      - name: "Humongous Catalog demo (Windows UK Preview)"
+        url: "/frs/demos/scumm/he/catalog-win-preview-uk.zip"
+        target: "catalog"
+        category: "blank"
+      - name: "Humongous Catalog demo (Windows US Preview)"
+        url: "/frs/demos/scumm/he/catalog-win-preview-us.zip"
+        target: "catalog"
+        category: "blank"
+      - name: "Let's Explore the Airport with Buzzy (Macintosh Demo)"
+        url: "/frs/demos/scumm/he/airport-mac-demo-us.zip"
+        target: "airport"
+        category: "blank"
+      - name: "Let's Explore the Airport with Buzzy (Windows Demo)"
+        url: "/frs/demos/scumm/he/airport-win-demo-us.zip"
+        target: "airport"
+        category: "blank"
+      - name: "Let's Explore the Airport with Buzzy (Windows Updated Demo)"
+        url: "/frs/demos/scumm/he/airport-win-updated-demo1-us.zip"
+        target: "airport"
+        category: "blank"
+      - name: "Let's Explore the Airport with Buzzy (Windows Updated Alternative Demo)"
+        url: "/frs/demos/scumm/he/airport-win-updated-demo2-us.zip"
+        target: "airport"
+        category: "blank"
+      - name: "Let's Explore the Airport with Buzzy (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/airport-win-demo-nl.zip"
+        target: "airport"
+        category: "blank"
+      - name: "Let's Explore the Farm with Buzzy (Windows Demo)"
+        url: "/frs/demos/scumm/he/farm-win-demo-us.zip"
+        target: "farm"
+        category: "blank"
+      - name: "Let's Explore the Farm with Buzzy (Windows Updated Demo)"
+        url: "/frs/demos/scumm/he/farm-win-updated-demo-us.zip"
+        target: "farm"
+        category: "blank"
+      - name: "Let's Explore the Farm with Buzzy (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/farm-win-demo-nl.zip"
+        target: "farm"
+        category: "blank"
+      - name: "Pajama Sam 1: No Need to Hide When It's Dark Outside (Windows Demo)"
+        url: "/frs/demos/scumm/he/pajama-win-demo-us.zip"
+        target: "pajama"
+      - name: "Pajama Sam 1: No Need to Hide When It's Dark Outside (Windows Updated Demo)"
+        url: "/frs/demos/scumm/he/pajama-win-updated-demo-us.zip"
+        target: "pajama"
+      - name: "Pajama Sam 1: No Need to Hide When It's Dark Outside (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/pajama2-win-demo-nl.zip"
+        target: "pajama"
+      - name: "Pajama Sam 1: No Need to Hide When It's Dark Outside (Windows French Demo)"
+        url: "/frs/demos/scumm/he/pajama-win-demo-fr.zip"
+        target: "pajama"
+      - name: "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Windows Demo)"
+        url: "/frs/demos/scumm/he/pajama2-win-demo-us.zip"
+        target: "pajama2"
+        category: "pajama"
+      - name: "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/pajama2-win-demo-nl.zip"
+        target: "pajama2"
+        category: "pajama"
+      - name: "Pajama Sam 2: Thunder and Lightning Aren't so Frightening (Windows Hebrew Demo)"
+        url: "/frs/demos/scumm/he/pajama2-win-demo-hb.zip"
+        target: "pajama2"
+        category: "pajama"
+      - name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows Demo)"
+        url: "/frs/demos/scumm/he/pajama3-win-demo-us.zip"
+        target: "pajama3"
+        category: "pajama"
+      - name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/pajama3-win-demo-nl.zip"
+        target: "pajama3"
+        category: "pajama"
+      - name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows French Demo)"
+        url: "/frs/demos/scumm/he/pajama3-win-demo-fr.zip"
+        target: "pajama3"
+        category: "pajama"
+      - name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows German Demo)"
+        url: "/frs/demos/scumm/he/pajama3-win-demo-de.zip"
+        target: "pajama3"
+        category: "pajama"
+      - name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows Italian Demo)"
+        url: "/frs/demos/scumm/he/pajama3-win-demo-it.zip"
+        target: "pajama3"
+        category: "pajama"
+      - name: "Pajama Sam 3: You Are What You Eat From Your Head to Your Feet (Windows UK Demo)"
+        url: "/frs/demos/scumm/he/pajama3-win-demo-uk.zip"
+        target: "pajama3"
+        category: "pajama"
+      - name: "Pajama Sam's Lost & Found (Windows Demo)"
+        url: "/frs/demos/scumm/he/lost-win-demo-us.zip"
+        target: "lost"
+        category: "pajama"
+      - name: "Putt-Putt Enters the Race (Windows Demo)"
+        url: "/frs/demos/scumm/he/puttrace-win-demo-us.zip"
+        target: "puttrace"
+        category: "puttputt"
+      - name: "Putt-Putt Enters the Race (Windows Preview)"
+        url: "/frs/demos/scumm/he/puttrace-win-preview-us.zip"
+        target: "puttrace"
+        category: "puttputt"
+      - name: "Putt-Putt Enters the Race (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/puttrace-win-demo-nl.zip"
+        target: "puttrace"
+        category: "puttputt"
+      - name: "Putt-Putt Enters the Race (Windows Updated Dutch Demo)"
+        url: "/frs/demos/scumm/he/puttrace-win-updated-demo-nl.zip"
+        target: "puttrace"
+        category: "puttputt"
+      - name: "Putt-Putt Enters the Race (Windows French Demo)"
+        url: "/frs/demos/scumm/he/puttrace-win-demo-fr.zip"
+        target: "puttrace"
+        category: "puttputt"
+      - name: "Putt-Putt Enters the Race (Windows German Demo)"
+        url: "/frs/demos/scumm/he/puttrace-win-demo-de.zip"
+        target: "puttrace"
+        category: "puttputt"
+      - name: "Putt-Putt Enters the Race (Windows Italian Demo)"
+        url: "/frs/demos/scumm/he/puttrace-win-demo-it.zip"
+        target: "puttrace"
+        category: "puttputt"
+      - name: "Putt-Putt Enters the Race (Windows UK Demo)"
+        url: "/frs/demos/scumm/he/puttrace-win-demo-uk.zip"
+        target: "puttrace"
+        category: "puttputt"
+      - name: "Putt-Putt Goes to the Moon (DOS demo)"
+        url: "/frs/demos/scumm/he/puttmoon-dos-demo-us.zip"
+        target: "puttmoon"
+        category: "puttputt"
+      - name: "Putt-Putt Goes to the Moon (Macintosh demo)"
+        url: "/frs/demos/scumm/he/puttmoon-mac-demo-us.zip"
+        target: "puttmoon"
+        category: "puttputt"
+      - name: "Putt-Putt Goes to the Moon (Windows demo)"
+        url: "/frs/demos/scumm/he/puttmoon-win-demo-us.zip"
+        target: "puttmoon"
+        category: "puttputt"
+      - name: "Putt-Putt Joins the Circus (Windows Demo)"
+        url: "/frs/demos/scumm/he/puttcircus-win-demo-us.zip"
+        target: "puttcircus"
+        category: "puttputt"
+      - name: "Putt-Putt Joins the Circus (Windows French Demo)"
+        url: "/frs/demos/scumm/he/puttcircus-win-demo-fr.zip"
+        target: "puttcircus"
+        category: "puttputt"
+      - name: "Putt-Putt Joins the Circus (Windows Hebrew Demo)"
+        url: "/frs/demos/scumm/he/puttcircus-win-demo-hb.zip"
+        target: "puttcircus"
+        category: "puttputt"
+      - name: "Putt-Putt Joins the Parade (DOS demo)"
+        url: "/frs/demos/scumm/he/puttputt-dos-demo-us.zip"
+        target: "puttputt"
+      - name: "Putt-Putt Joins the Parade (Macintosh demo)"
+        url: "/frs/demos/scumm/he/puttputt-mac-demo-us.zip"
+        target: "puttputt"
+      - name: "Putt-Putt Joins the Parade (Windows demo)"
+        url: "/frs/demos/scumm/he/puttputt-win-demo-us.zip"
+        target: "puttputt"
+      - name: "Putt-Putt Saves the Zoo (Macintosh Demo)"
+        url: "/frs/demos/scumm/he/puttzoo-mac-demo-us.zip"
+        target: "puttzoo"
+        category: "puttputt"
+      - name: "Putt-Putt Saves the Zoo (Windows Demo)"
+        url: "/frs/demos/scumm/he/puttzoo-win-demo-us.zip"
+        target: "puttzoo"
+        category: "puttputt"
+      - name: "Putt-Putt Saves the Zoo (Windows Updated Demo)"
+        url: "/frs/demos/scumm/he/puttzoo-win-updated-demo-us.zip"
+        target: "puttzoo"
+        category: "puttputt"
+      - name: "Putt-Putt Saves the Zoo (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/puttzoo-win-demo-nl.zip"
+        target: "puttzoo"
+        category: "puttputt"
+      - name: "Putt-Putt Saves the Zoo (Windows French Demo)"
+        url: "/frs/demos/scumm/he/puttzoo-win-demo-fr.zip"
+        target: "puttzoo"
+        category: "puttputt"
+      - name: "Putt-Putt Saves the Zoo (Windows German Demo)"
+        url: "/frs/demos/scumm/he/puttzoo-win-demo-de.zip"
+        target: "puttzoo"
+        category: "puttputt"
+      - name: "Putt-Putt Travels Through Time (Windows Demo)"
+        url: "/frs/demos/scumm/he/putttime-win-demo-us.zip"
+        target: "putttime"
+        category: "puttputt"
+      - name: "Putt-Putt Travels Through Time (Windows Updated Demo)"
+        url: "/frs/demos/scumm/he/putttime-win-updated-demo-us.zip"
+        target: "putttime"
+        category: "puttputt"
+      - name: "Putt-Putt Travels Through Time (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/putttime-win-demo-nl.zip"
+        target: "putttime"
+        category: "puttputt"
+      - name: "Putt-Putt Travels Through Time (Windows French Demo)"
+        url: "/frs/demos/scumm/he/putttime-win-demo-fr.zip"
+        target: "putttime"
+        category: "puttputt"
+      - name: "Putt-Putt Travels Through Time (Windows German Demo)"
+        url: "/frs/demos/scumm/he/putttime-win-demo-de.zip"
+        target: "putttime"
+        category: "puttputt"
+      - name: "SPY Fox 1: Dry Cereal (Windows Demo)"
+        url: "/frs/demos/scumm/he/spyfox-win-demo1-us.zip"
+        target: "spyfox"
+      - name: "SPY Fox 1: Dry Cereal (Windows Alternative Demo)"
+        url: "/frs/demos/scumm/he/spyfox-win-demo2-us.zip"
+        target: "spyfox"
+      - name: "SPY Fox 1: Dry Cereal (Windows Updated Demo)"
+        url: "/frs/demos/scumm/he/spyfox-win-updated-demo-us.zip"
+        target: "spyfox"
+      - name: "SPY Fox 1: Dry Cereal (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/spyfox-win-demo-nl.zip"
+        target: "spyfox"
+      - name: "SPY Fox 1: Dry Cereal (Windows French Demo)"
+        url: "/frs/demos/scumm/he/spyfox-win-demo-fr.zip"
+        target: "spyfox"
+      - name: "SPY Fox 2: Some Assembly Required (Windows Demo)"
+        url: "/frs/demos/scumm/he/spyfox2-win-demo-us.zip"
+        target: "spyfox2"
+        category: "spyfox"
+      - name: "SPY Fox 2: Some Assembly Required (Windows French Demo)"
+        url: "/frs/demos/scumm/he/spyfox2-win-demo-fr.zip"
+        target: "spyfox2"
+        category: "spyfox"
+      - name: "SPY Fox 2: Some Assembly Required (Windows Preview)"
+        url: "/frs/demos/scumm/he/spyfox2-win-preview-us.zip"
+        target: "spyfox2"
+        category: "spyfox"
+      - name: "SPY Fox 2: Some Assembly Required (Windows Dutch Demo)"
+        url: "/frs/demos/scumm/he/spyfox2-win-demo-nl.zip"
+        target: "spyfox2"
+        category: "spyfox"
+      - name: "SPY Fox 2: Some Assembly Required (Windows German Demo)"
+        url: "/frs/demos/scumm/he/spyfox2-win-demo-de.zip"
+        target: "spyfox2"
+        category: "spyfox"
+      - name: "SPY Fox 2: Some Assembly Required (Windows Italian Demo)"
+        url: "/frs/demos/scumm/he/spyfox2-win-demo-it.zip"
+        target: "spyfox2"
+        category: "spyfox"
+      - name: "SPY Fox 2: Some Assembly Required (Windows UK Demo)"
+        url: "/frs/demos/scumm/he/spyfox2-win-demo-uk.zip"
+        target: "spyfox2"
+        category: "spyfox"
+      - name: "SPY Fox 3: Operation Ozone (Windows Demo)"
+        url: "/frs/demos/scumm/he/spyozon-win-demo-us.zip"
+        target: "spyozon"
+        category: "spyfox"
+      - name: "SPY Fox 3: Operation Ozone (Windows French Demo)"
+        url: "/frs/demos/scumm/he/spyozon-win-demo-fr.zip"
+        target: "spyozon"
+        category: "spyfox"
+      - name: "SPY Fox 3: Operation Ozone (Windows Preview)"
+        url: "/frs/demos/scumm/he/spyozon-win-preview-us.zip"
+        target: "spyozon"
+        category: "spyfox"
+
+  - name: "Adventuresoft/Horrorsoft Demos"
     href: "agos"
-    demos: 
-    -
-      name: "Elvira - Mistress of Darkness (Amiga demo - Non interactive)"
-      url: "/frs/demos/agos/elvira1-amiga-ni-demo-en.zip"
-      target: "elvira1"
-      category: "elvira"
-    -
-      name: "Elvira - Mistress of Darkness (Atari ST demo - Non interactive)"
-      url: "/frs/demos/agos/elvira1-atari-ni-demo-en.zip"
-      target: "elvira1"
-      category: "elvira"
-    -
-      name: "Elvira - Mistress of Darkness (DOS demo - Non interactive)"
-      url: "/frs/demos/agos/elvira1-dos-ni-demo-en.zip"
-      target: "elvira1"
-      category: "elvira"
-    -
-      name: "Personal Nightmare (Atari ST demo - Non-interactive)"
-      url: "/frs/demos/agos/pn-atari-ni-demo-en.zip"
-      target: "pn"
-      category: "blank"
-    -
-      name: "Simon the Sorcerer 1 (Amiga demo)"
-      url: "/frs/demos/agos/simon1-amiga-floppy-demo-en.zip"
-      target: "simon1"
-      category: "simon"
-    -
-      name: "Simon the Sorcerer 1 (Amiga CD32 demo)"
-      url: "/frs/demos/agos/simon1-amiga-cd32-demo-en.zip"
-      target: "simon1"
-      category: "simon"
-    -
-      name: "Simon the Sorcerer 1 (DOS demo)"
-      url: "/frs/demos/agos/simon1-dos-floppy-demo-en.zip"
-      target: "simon1"
-      category: "simon"
-    -
-      name: "Simon the Sorcerer 1 (Acorn CD demo)"
-      url: "/frs/demos/agos/simon1-acorn-cd-demo-en.zip"
-      target: "simon1"
-      category: "simon"
-    -
-      name: "Simon the Sorcerer 1 (DOS CD demo)"
-      url: "/frs/demos/agos/simon1-dos-cd-demo-en.zip"
-      target: "simon1"
-      category: "simon"
-    -
-      name: "Simon the Sorcerer 2 (DOS CD demo)"
-      url: "/frs/demos/agos/simon2-dos-cd-demo-en.zip"
-      target: "simon2"
-    -
-      name: "Simon the Sorcerer 2 (DOS CD German demo)"
-      url: "/frs/demos/agos/simon2-dos-cd-demo-de.zip"
-      target: "simon2"
-    -
-      name: "Simon the Sorcerer 2 (DOS CD German demo - Non interactive)"
-      url: "/frs/demos/agos/simon2-dos-cd-ni-demo-de.zip"
-      target: "simon2"
-    -
-      name: "The Feeble Files (DOS demo - Non interactive)"
-      url: "/frs/demos/agos/feeble-dos-ni-demo-en.zip"
-      target: "feeble"
-    -
-      name: "The Feeble Files (DOS German demo - Non interactive)"
-      url: "/frs/demos/agos/feeble-dos-ni-demo-de.zip"
-      target: "feeble"
-    -
-      name: "Waxworks (DOS demo - Non interactive)"
-      url: "/frs/demos/agos/waxworks-dos-ni-demo-en.zip"
-      target: "waxworks"
-  -
-    name: "Coktel Vision Demos"
+    demos:
+      - name: "Elvira - Mistress of Darkness (Amiga demo - Non interactive)"
+        url: "/frs/demos/agos/elvira1-amiga-ni-demo-en.zip"
+        target: "elvira1"
+        category: "elvira"
+      - name: "Elvira - Mistress of Darkness (Atari ST demo - Non interactive)"
+        url: "/frs/demos/agos/elvira1-atari-ni-demo-en.zip"
+        target: "elvira1"
+        category: "elvira"
+      - name: "Elvira - Mistress of Darkness (DOS demo - Non interactive)"
+        url: "/frs/demos/agos/elvira1-dos-ni-demo-en.zip"
+        target: "elvira1"
+        category: "elvira"
+      - name: "Personal Nightmare (Atari ST demo - Non-interactive)"
+        url: "/frs/demos/agos/pn-atari-ni-demo-en.zip"
+        target: "pn"
+        category: "blank"
+      - name: "Simon the Sorcerer 1 (Amiga demo)"
+        url: "/frs/demos/agos/simon1-amiga-floppy-demo-en.zip"
+        target: "simon1"
+        category: "simon"
+      - name: "Simon the Sorcerer 1 (Amiga CD32 demo)"
+        url: "/frs/demos/agos/simon1-amiga-cd32-demo-en.zip"
+        target: "simon1"
+        category: "simon"
+      - name: "Simon the Sorcerer 1 (DOS demo)"
+        url: "/frs/demos/agos/simon1-dos-floppy-demo-en.zip"
+        target: "simon1"
+        category: "simon"
+      - name: "Simon the Sorcerer 1 (Acorn CD demo)"
+        url: "/frs/demos/agos/simon1-acorn-cd-demo-en.zip"
+        target: "simon1"
+        category: "simon"
+      - name: "Simon the Sorcerer 1 (DOS CD demo)"
+        url: "/frs/demos/agos/simon1-dos-cd-demo-en.zip"
+        target: "simon1"
+        category: "simon"
+      - name: "Simon the Sorcerer 2 (DOS CD demo)"
+        url: "/frs/demos/agos/simon2-dos-cd-demo-en.zip"
+        target: "simon2"
+      - name: "Simon the Sorcerer 2 (DOS CD German demo)"
+        url: "/frs/demos/agos/simon2-dos-cd-demo-de.zip"
+        target: "simon2"
+      - name: "Simon the Sorcerer 2 (DOS CD German demo - Non interactive)"
+        url: "/frs/demos/agos/simon2-dos-cd-ni-demo-de.zip"
+        target: "simon2"
+      - name: "The Feeble Files (DOS demo - Non interactive)"
+        url: "/frs/demos/agos/feeble-dos-ni-demo-en.zip"
+        target: "feeble"
+      - name: "The Feeble Files (DOS German demo - Non interactive)"
+        url: "/frs/demos/agos/feeble-dos-ni-demo-de.zip"
+        target: "feeble"
+      - name: "Waxworks (DOS demo - Non interactive)"
+        url: "/frs/demos/agos/waxworks-dos-ni-demo-en.zip"
+        target: "waxworks"
+
+  - name: "Coktel Vision Demos"
     href: "gob"
-    demos: 
-    -
-      name: "Gobliiins (Amiga demo)"
-      url: "/frs/demos/gob/gob1-amiga_demo_en.zip"
-      target: "gob"
-    -
-      name: "Gobliiins (DOS demo)"
-      url: "/frs/demos/gob/gob1-dos-demo1-en.zip"
-      target: "gob"
-    -
-      name: "Gobliiins (DOS Alternative demo)"
-      url: "/frs/demos/gob/gob1-dos-demo2-en.zip"
-      target: "gob"
-    -
-      name: "Gobliiins (DOS French demo)"
-      url: "/frs/demos/gob/gob1-dos-demo-fr.zip"
-      target: "gob"
-    -
-      name: "Gobliins 2 (Amiga demo)"
-      url: "/frs/demos/gob/gob2-amiga-demo1-en.zip"
-      target: "gob2"
-      category: "gob"
-    -
-      name: "Gobliins 2 (Amiga Alternative demo)"
-      url: "/frs/demos/gob/gob2-amiga-demo2-en.zip"
-      target: "gob2"
-      category: "gob"
-    -
-      name: "Gobliins 2 (DOS demo)"
-      url: "/frs/demos/gob/gob2-dos-demo-en.zip"
-      target: "gob2"
-      category: "gob"
-    -
-      name: "Gobliins 2 (DOS demo - Non interactive)"
-      url: "/frs/demos/gob/gob2-dos-ni-demo-en.zip"
-      target: "gob2"
-      category: "gob"
-    -
-      name: "Goblins Quest 3 (DOS demo)"
-      url: "/frs/demos/gob/gob3-dos-demo-en.zip"
-      target: "gob3"
-      category: "gob"
-    -
-      name: "Goblins Quest 3 (DOS demo - Non interactive)"
-      url: "/frs/demos/gob/gob3-dos-ni-demo-en.zip"
-      target: "gob3"
-      category: "gob"
-    -
-      name: "Goblins Quest 3 (DOS French demo)"
-      url: "/frs/demos/gob/gob3-dos-demo1-fr.zip"
-      target: "gob3"
-      category: "gob"
-    -
-      name: "Goblins Quest 3 (DOS French Alternative demo)"
-      url: "/frs/demos/gob/gob3-dos-demo2-fr.zip"
-      target: "gob3"
-      category: "gob"
-    -
-      name: "Inca II: Wiracocha (DOS demo - Non-interactive)"
-      url: "/frs/demos/gob/inca2-dos-ni-demo-en.zip"
-      target: "inca2"
-      category: "blank"
-    -
-      name: "Lost in Time (DOS demo - Non interactive)"
-      url: "/frs/demos/gob/lostintime-dos-ni-demo-en.zip"
-      target: "lit"
-      category: "lostintime"
-    -
-      name: "Playtoons (DOS demos of Playtoon 1 - Uncle Archibald, Playtoon 2 - Spirou, Playtoons 3 - Secret of the Castle)"
-      url: "/frs/demos/gob/archibald-dos-ni-demo1-en.zip"
-      target: "gob"
-      category: "blank"
-    -
-      name: "Playtoon 1 - Uncle Archibald (DOS demo - Non-interactive)"
-      url: "/frs/demos/gob/archibald-dos-ni-demo2-en.zip"
-      target: "playtoons1"
-      category: "blank"
-    -
-      name: "Playtoon 1 - Uncle Archibald (DOS Italian demo - Non-interactive)"
-      url: "/frs/demos/gob/archibald-dos-ni-demo-it.zip"
-      target: "playtoons1"
-      category: "blank"
-    -
-      name: "Playtoon 1 - Uncle Archibald (DOS Spanish demo - Non-interactive)"
-      url: "/frs/demos/gob/archibald-dos-ni-demo-sp.zip"
-      target: "playtoons1"
-      category: "blank"
-    -
-      name: "The Bizarre Adventures of Woodruff and the Schnibble (DOS demo - Non-interactive)"
-      url: "/frs/demos/gob/woodruff-dos-ni-demo-en.zip"
-      target: "woodruff"
-    -
-      name: "The Last Dynasty (DOS demo - Non interactive)"
-      url: "/frs/demos/gob/dynasty-win-ni-demo-en.zip"
-      target: "gob"
-      category: "blank"
-    -
-      name: "Urban Runner (DOS demo - Non-interactive)"
-      url: "/frs/demos/gob/urban-win-ni-demo-en.zip"
-      target: "urban"
-    -
-      name: "Ween: The Prophecy (DOS demo)"
-      url: "/frs/demos/gob/ween-dos-demo-en.zip"
-      target: "ween"
-  -
-    name: "Living Books Demos"
+    demos:
+      - name: "Gobliiins (Amiga demo)"
+        url: "/frs/demos/gob/gob1-amiga_demo_en.zip"
+        target: "gob"
+      - name: "Gobliiins (DOS demo)"
+        url: "/frs/demos/gob/gob1-dos-demo1-en.zip"
+        target: "gob"
+      - name: "Gobliiins (DOS Alternative demo)"
+        url: "/frs/demos/gob/gob1-dos-demo2-en.zip"
+        target: "gob"
+      - name: "Gobliiins (DOS French demo)"
+        url: "/frs/demos/gob/gob1-dos-demo-fr.zip"
+        target: "gob"
+      - name: "Gobliins 2 (Amiga demo)"
+        url: "/frs/demos/gob/gob2-amiga-demo1-en.zip"
+        target: "gob2"
+        category: "gob"
+      - name: "Gobliins 2 (Amiga Alternative demo)"
+        url: "/frs/demos/gob/gob2-amiga-demo2-en.zip"
+        target: "gob2"
+        category: "gob"
+      - name: "Gobliins 2 (DOS demo)"
+        url: "/frs/demos/gob/gob2-dos-demo-en.zip"
+        target: "gob2"
+        category: "gob"
+      - name: "Gobliins 2 (DOS demo - Non interactive)"
+        url: "/frs/demos/gob/gob2-dos-ni-demo-en.zip"
+        target: "gob2"
+        category: "gob"
+      - name: "Goblins Quest 3 (DOS demo)"
+        url: "/frs/demos/gob/gob3-dos-demo-en.zip"
+        target: "gob3"
+        category: "gob"
+      - name: "Goblins Quest 3 (DOS demo - Non interactive)"
+        url: "/frs/demos/gob/gob3-dos-ni-demo-en.zip"
+        target: "gob3"
+        category: "gob"
+      - name: "Goblins Quest 3 (DOS French demo)"
+        url: "/frs/demos/gob/gob3-dos-demo1-fr.zip"
+        target: "gob3"
+        category: "gob"
+      - name: "Goblins Quest 3 (DOS French Alternative demo)"
+        url: "/frs/demos/gob/gob3-dos-demo2-fr.zip"
+        target: "gob3"
+        category: "gob"
+      - name: "Inca II: Wiracocha (DOS demo - Non-interactive)"
+        url: "/frs/demos/gob/inca2-dos-ni-demo-en.zip"
+        target: "inca2"
+        category: "blank"
+      - name: "Lost in Time (DOS demo - Non interactive)"
+        url: "/frs/demos/gob/lostintime-dos-ni-demo-en.zip"
+        target: "lit"
+        category: "lostintime"
+      - name: "Playtoons (DOS demos of Playtoon 1 - Uncle Archibald, Playtoon 2 - Spirou, Playtoons 3 - Secret of the Castle)"
+        url: "/frs/demos/gob/archibald-dos-ni-demo1-en.zip"
+        target: "gob"
+        category: "blank"
+      - name: "Playtoon 1 - Uncle Archibald (DOS demo - Non-interactive)"
+        url: "/frs/demos/gob/archibald-dos-ni-demo2-en.zip"
+        target: "playtoons1"
+        category: "blank"
+      - name: "Playtoon 1 - Uncle Archibald (DOS Italian demo - Non-interactive)"
+        url: "/frs/demos/gob/archibald-dos-ni-demo-it.zip"
+        target: "playtoons1"
+        category: "blank"
+      - name: "Playtoon 1 - Uncle Archibald (DOS Spanish demo - Non-interactive)"
+        url: "/frs/demos/gob/archibald-dos-ni-demo-sp.zip"
+        target: "playtoons1"
+        category: "blank"
+      - name: "The Bizarre Adventures of Woodruff and the Schnibble (DOS demo - Non-interactive)"
+        url: "/frs/demos/gob/woodruff-dos-ni-demo-en.zip"
+        target: "woodruff"
+      - name: "The Last Dynasty (DOS demo - Non interactive)"
+        url: "/frs/demos/gob/dynasty-win-ni-demo-en.zip"
+        target: "gob"
+        category: "blank"
+      - name: "Urban Runner (DOS demo - Non-interactive)"
+        url: "/frs/demos/gob/urban-win-ni-demo-en.zip"
+        target: "urban"
+      - name: "Ween: The Prophecy (DOS demo)"
+        url: "/frs/demos/gob/ween-dos-demo-en.zip"
+        target: "ween"
+
+  - name: "Living Books Demos"
     href: "lb"
-    demos: 
-    -
-      name: "Aesop's Fables: The Tortoise and the Hare (Macintosh demo)"
-      url: "/frs/demos/mohawk/tortoise-mac-demo-en.zip"
-      target: "tortoise"
-    -
-      name: "Aesop's Fables: The Tortoise and the Hare (Windows demo)"
-      url: "/frs/demos/mohawk/tortoise-win-demo-en.zip"
-      target: "tortoise"
-    -
-      name: "Aesop's Fables: The Tortoise and the Hare (Windows demo alt)"
-      url: "/frs/demos/mohawk/tortoise-win-demo-en-v1.1.zip"
-      target: "tortoise"
-    -
-      name: "Arthur's Birthday (Macintosh demo)"
-      url: "/frs/demos/mohawk/arthurbday-mac-demo-en.zip"
-      target: "arthurbday"
-      category: "arthur"
-    -
-      name: "Arthur's Birthday (Windows demo)"
-      url: "/frs/demos/mohawk/arthurbday-win-demo-en.zip"
-      target: "arthurbday"
-      category: "arthur"
-    -
-      name: "Arthur's Teacher Troubles (Macintosh demo)"
-      url: "/frs/demos/mohawk/arthur-mac-demo-en.zip"
-      target: "arthur"
-    -
-      name: "Arthur's Teacher Troubles (Macintosh demo alt)"
-      url: "/frs/demos/mohawk/arthur-mac-demo2-en.zip"
-      target: "arthur"
-    -
-      name: "Arthur's Teacher Troubles (Windows demo)"
-      url: "/frs/demos/mohawk/arthur-win-demo-en.zip"
-      target: "arthur"
-    -
-      name: "Arthur's Teacher Troubles (Windows demo alt)"
-      url: "/frs/demos/mohawk/arthur-win-demo-en-v1.1.zip"
-      target: "arthur"
-    -
-      name: "Green Eggs and Ham (Windows demo)"
-      url: "/frs/demos/mohawk/greeneggs-win-demo-en.zip"
-      target: "greeneggs"
-    -
-      name: "Just Grandma and Me (Macintosh demo)"
-      url: "/frs/demos/mohawk/grandma-mac-demo-en.zip"
-      target: "grandma"
-    -
-      name: "Just Grandma and Me (Macintosh demo alt)"
-      url: "/frs/demos/mohawk/grandma-mac-demo2-en.zip"
-      target: "grandma"
-    -
-      name: "Just Grandma and Me (Windows demo)"
-      url: "/frs/demos/mohawk/grandma-win-demo-en.zip"
-      target: "grandma"
-    -
-      name: "Just Grandma and Me (Windows demo alt)"
-      url: "/frs/demos/mohawk/grandma-win-demo-en-v1.1.zip"
-      target: "grandma"
-    -
-      name: "Living Books Sampler v1 (Macintosh demo)"
-      url: "/frs/demos/mohawk/lbsampler-demo-mac-en-v1.zip"
-      target: "lbsampler"
-      category: "blank"
-    -
-      name: "Living Books Sampler v1 (Windows demo)"
-      url: "/frs/demos/mohawk/lbsampler-demo-win-en-v1.zip"
-      target: "lbsampler"
-      category: "blank"
-    -
-      name: "Living Books Sampler v2 (Macintosh demo)"
-      url: "/frs/demos/mohawk/lbsampler-demo-mac-en-v2.zip"
-      target: "lbsampler"
-      category: "blank"
-    -
-      name: "Living Books Sampler v2 (Windows demo)"
-      url: "/frs/demos/mohawk/lbsampler-demo-win-en-v2.zip"
-      target: "lbsampler"
-      category: "blank"
-    -
-      name: "Ruff's Bone (Macintosh demo)"
-      url: "/frs/demos/mohawk/ruff-mac-demo-en.zip"
-      target: "ruff"
-    -
-      name: "Ruff's Bone (Windows demo)"
-      url: "/frs/demos/mohawk/ruff-win-demo-en.zip"
-      target: "ruff"
-    -
-      name: "The New Kid on the Block (Macintosh demo)"
-      url: "/frs/demos/mohawk/newkid-demo-mac-en.zip"
-      target: "newkid"
-    -
-      name: "The New Kid on the Block (Windows demo)"
-      url: "/frs/demos/mohawk/newkid-win-demo-en.zip"
-      target: "newkid"
-    -
-      name: "The New Kid on the Block (Windows demo alt)"
-      url: "/frs/demos/mohawk/newkid-win-demo-en-v1.1.zip"
-      target: "newkid"
-  -
-    name: "Sierra Demos"
+    demos:
+      - name: "Aesop's Fables: The Tortoise and the Hare (Macintosh demo)"
+        url: "/frs/demos/mohawk/tortoise-mac-demo-en.zip"
+        target: "tortoise"
+      - name: "Aesop's Fables: The Tortoise and the Hare (Windows demo)"
+        url: "/frs/demos/mohawk/tortoise-win-demo-en.zip"
+        target: "tortoise"
+      - name: "Aesop's Fables: The Tortoise and the Hare (Windows demo alt)"
+        url: "/frs/demos/mohawk/tortoise-win-demo-en-v1.1.zip"
+        target: "tortoise"
+      - name: "Arthur's Birthday (Macintosh demo)"
+        url: "/frs/demos/mohawk/arthurbday-mac-demo-en.zip"
+        target: "arthurbday"
+        category: "arthur"
+      - name: "Arthur's Birthday (Windows demo)"
+        url: "/frs/demos/mohawk/arthurbday-win-demo-en.zip"
+        target: "arthurbday"
+        category: "arthur"
+      - name: "Arthur's Teacher Troubles (Macintosh demo)"
+        url: "/frs/demos/mohawk/arthur-mac-demo-en.zip"
+        target: "arthur"
+      - name: "Arthur's Teacher Troubles (Macintosh demo alt)"
+        url: "/frs/demos/mohawk/arthur-mac-demo2-en.zip"
+        target: "arthur"
+      - name: "Arthur's Teacher Troubles (Windows demo)"
+        url: "/frs/demos/mohawk/arthur-win-demo-en.zip"
+        target: "arthur"
+      - name: "Arthur's Teacher Troubles (Windows demo alt)"
+        url: "/frs/demos/mohawk/arthur-win-demo-en-v1.1.zip"
+        target: "arthur"
+      - name: "Green Eggs and Ham (Windows demo)"
+        url: "/frs/demos/mohawk/greeneggs-win-demo-en.zip"
+        target: "greeneggs"
+      - name: "Just Grandma and Me (Macintosh demo)"
+        url: "/frs/demos/mohawk/grandma-mac-demo-en.zip"
+        target: "grandma"
+      - name: "Just Grandma and Me (Macintosh demo alt)"
+        url: "/frs/demos/mohawk/grandma-mac-demo2-en.zip"
+        target: "grandma"
+      - name: "Just Grandma and Me (Windows demo)"
+        url: "/frs/demos/mohawk/grandma-win-demo-en.zip"
+        target: "grandma"
+      - name: "Just Grandma and Me (Windows demo alt)"
+        url: "/frs/demos/mohawk/grandma-win-demo-en-v1.1.zip"
+        target: "grandma"
+      - name: "Living Books Sampler v1 (Macintosh demo)"
+        url: "/frs/demos/mohawk/lbsampler-demo-mac-en-v1.zip"
+        target: "lbsampler"
+        category: "blank"
+      - name: "Living Books Sampler v1 (Windows demo)"
+        url: "/frs/demos/mohawk/lbsampler-demo-win-en-v1.zip"
+        target: "lbsampler"
+        category: "blank"
+      - name: "Living Books Sampler v2 (Macintosh demo)"
+        url: "/frs/demos/mohawk/lbsampler-demo-mac-en-v2.zip"
+        target: "lbsampler"
+        category: "blank"
+      - name: "Living Books Sampler v2 (Windows demo)"
+        url: "/frs/demos/mohawk/lbsampler-demo-win-en-v2.zip"
+        target: "lbsampler"
+        category: "blank"
+      - name: "Ruff's Bone (Macintosh demo)"
+        url: "/frs/demos/mohawk/ruff-mac-demo-en.zip"
+        target: "ruff"
+      - name: "Ruff's Bone (Windows demo)"
+        url: "/frs/demos/mohawk/ruff-win-demo-en.zip"
+        target: "ruff"
+      - name: "The New Kid on the Block (Macintosh demo)"
+        url: "/frs/demos/mohawk/newkid-demo-mac-en.zip"
+        target: "newkid"
+      - name: "The New Kid on the Block (Windows demo)"
+        url: "/frs/demos/mohawk/newkid-win-demo-en.zip"
+        target: "newkid"
+      - name: "The New Kid on the Block (Windows demo alt)"
+        url: "/frs/demos/mohawk/newkid-win-demo-en-v1.1.zip"
+        target: "newkid"
+
+  - name: "Sierra Demos"
     href: "sierra"
-    demos: 
-    -
-      name: "AGI Demo Pack 1 (DOS demos of 3-D Helicopter Sim, Police Quest, Thexder, Space Quest 2, Mixed-up Mother Goose, Leisure Suit Larry)"
-      url: "/frs/demos/agi/agi-dos-pack1-demo-en.zip"
-      target: "agidemo"
-      category: "blank"
-    -
-      name: "AGI Demo Pack 2 (DOS demos of 3-D Helicopter Sim, Space Quest 2, Thexder, King's Quest 3, Mixed- up Mother Goose, King's Quest 2, Police Quest, Leisure Suit Larry, Space Quest)"
-      url: "/frs/demos/agi/agi-dos-pack2-demo-en.zip"
-      target: "agidemo"
-      category: "blank"
-    -
-      name: "AGI Demo Pack 3 (DOS demos of 3-D Helicopter Sim, Space Quest 2, Police Quest, King's Quest 3, Mixed-up Mother Goose, Leisure Suit Larry)"
-      url: "/frs/demos/agi/agi-dos-pack3-demo-en.zip"
-      target: "agidemo"
-      category: "blank"
-    -
-      name: "AGI Demo Pack 4 (DOS demos of Gold Rush!, Manhunter: NewYork, Mixed-up Mother Goose, Police Quest, Space Quest 2, Leisure Suit Larry)"
-      url: "/frs/demos/agi/agi-dos-pack4-demo-en.zip"
-      target: "agidemo"
-      category: "blank"
-    -
-      name: "AGI Demo Pack 5 (DOS demos of Space Quest, Donald Duck's Playground, King's Quest 3, Leisure Suit Larry)"
-      url: "/frs/demos/agi/agi-dos-pack5-demo-en.zip"
-      target: "agidemo"
-      category: "blank"
-    -
-      name: "Astro Chicken (DOS demo)"
-      url: "/frs/demos/sci/astrochicken-dos-demo-en.zip"
-      target: "astrochicken"
-      category: "blank"
-    -
-      name: "Castle of Dr. Brain (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/castlebrain-dos-ni-demo-en.zip"
-      target: "castlebrain"
-    -
-      name: "Christmas Card 1988 (DOS demo)"
-      url: "/frs/demos/sci/christmas1988-dos-en.zip"
-      target: "christmas1988"
-      category: "blank"
-    -
-      name: "Christmas Card 1990: The Seasoned Professional (EGA DOS demo)"
-      url: "/frs/demos/sci/christmas1990-dos-ega-en.zip"
-      target: "christmas1990"
-      category: "blank"
-    -
-      name: "Christmas Card 1990: The Seasoned Professional (VGA DOS demo)"
-      url: "/frs/demos/sci/christmas1990-dos-vga-en.zip"
-      target: "christmas1990"
-      category: "blank"
-    -
-      name: "Christmas Card 1992 (DOS demo)"
-      url: "/frs/demos/sci/christmas1992-dos-en.zip"
-      target: "christmas1992"
-      category: "blank"
-    -
-      name: "Codename: ICEMAN (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/iceman-dos-ni-demo-en.zip"
-      target: "iceman"
-    -
-      name: "Conquests of Camelot: King Arthur, Quest for the Grail (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/camelot-dos-ni-demo-en.zip"
-      target: "camelot"
-    -
-      name: "Conquests of the Longbow: The Adventures of Robin Hood (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/longbow-dos-ni-demo-en.zip"
-      target: "longbow"
-    -
-      name: "EcoQuest: The Search for Cetus (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/ecoquest-dos-ni-demo-en.zip"
-      target: "ecoquest"
-    -
-      name: "EcoQuest II: Lost Secret of the Rainforest (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/ecoquest2-dos-ni-demo-en.zip"
-      target: "ecoquest2"
-      category: "ecoquest"
-    -
-      name: "Freddy Pharkas: Frontier Pharmacist (DOS demo)"
-      url: "/frs/demos/sci/freddypharkas-dos-demo1-en.zip"
-      target: "freddypharkas"
-    -
-      name: "Freddy Pharkas: Frontier Pharmacist (DOS Alternative demo)"
-      url: "/frs/demos/sci/freddypharkas-dos-demo2-en.zip"
-      target: "freddypharkas"
-    -
-      name: "Freddy Pharkas: Frontier Pharmacist (Windows CD demo)"
-      url: "/frs/demos/sci/freddypharkas-win-cd-demo-en.zip"
-      target: "freddypharkas"
-    -
-      name: "Fun Seeker's Guide (DOS demo)"
-      url: "/frs/demos/sci/funseeker-dos-demo-en.zip"
-      target: "funseeker"
-      category: "blank"
-    -
-      name: "Hoyle Official Book of Games: Volume 3 (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/hoyle3-dos-ni-demo-en.zip"
-      target: "hoyle3"
-      category: "hoyle"
-    -
-      name: "Hoyle Classic Card Games (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/hoyle4-dos-ni-demo-en.zip"
-      target: "hoyle4"
-      category: "hoyle"
-    -
-      name: "ImagiNation Network (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/inn-dos-ni-demo-en.zip"
-      target: "inndemo"
-      category: "blank"
-    -
-      name: "King's Quest I: Quest for the Crown, SCI Remake (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/kq1sci-dos-ni-demo-en.zip"
-      target: "kq1sci"
-      category: "kq-sci"
-    -
-      name: "King's Quest IV: The Perils of Rosella (DOS demo - Non-interactive)"
-      url: "/frs/demos/agi/kq4-dos-ni-demo-en.zip"
-      target: "kq4"
-      category: "kq-sci"
-    -
-      name: "King's Quest IV: The Perils of Rosella, SCI Remake (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/kq4sci-dos-ni-demo-en.zip"
-      target: "kq4sci"
-      category: "kq-sci"
-    -
-      name: "King's Quest VI: Heir Today, Gone Tomorrow (DOS CD demo - Non-interactive)"
-      url: "/frs/demos/sci/kq6-dos-ni-demo-en.zip"
-      target: "kq6"
-      category: "kq-sci"
-    -
-      name: "King's Quest VII: The Princeless Bride (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/kq7-dos-win-ni-demo-en.zip"
-      target: "kq7"
-      category: "kq-sci"
-    -
-      name: "Laura Bow: The Colonel's Bequest (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/laurabow-dos-ni-demo-en.zip"
-      target: "laurabow"
-    -
-      name: "Laura Bow 2: The Dagger of Amon Ra (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/laurabow2-dos-ni-demo-en.zip"
-      target: "laurabow2"
-      category: "laurabow"
-    -
-      name: "Leisure Suit Larry in the Land of the Lounge Lizards, SCI Remake (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/lsl1sci-dos-ni-demo-en.zip"
-      target: "lsl1sci"
-      category: "lsl-sci"
-    -
-      name: "Leisure Suit Larry 2: Goes Looking for Love (in Several Wrong Places) (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/lsl2-dos-ni-demo-en.zip"
-      target: "lsl2"
-      category: "lsl-sci"
-    -
-      name: "Leisure Suit Larry 3: Passionate Patti in Pursuit of the Pulsating Pectorals (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/lsl3-dos-ni-demo-en.zip"
-      target: "lsl3"
-      category: "lsl-sci"
-    -
-      name: "Leisure Suit Larry 5: Passionate Patti Does a Little Undercover Work (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/lsl5-dos-ni-demo-en.zip"
-      target: "lsl5"
-      category: "lsl-sci"
-    -
-      name: "Leisure Suit Larry 7: Love For Sail! (DOS demo)"
-      url: "/frs/demos/sci/lsl7-dos-demo-en.zip"
-      target: "lsl7"
-      category: "lsl-sci"
-    -
-      name: "Lighthouse: The Dark Being (Windows demo)"
-      url: "/frs/demos/sci/lighthouse-win-demo-en.zip"
-      target: "lighthouse"
-      category: "blank"
-    -
-      name: "Lighthouse: The Dark Being (Windows demo - Non-interactive)"
-      url: "/frs/demos/sci/lighthouse-win-ni-demo-en.zip"
-      target: "lighthouse"
-      category: "blank"
-    -
-      name: "Mixed-up Fairy Tales (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/fairytales-dos-ni-demo-en.zip"
-      target: "fairytales"
-      category: "mixedup"
-    -
-      name: "Mixed-Up Mother Goose (DOS demo)"
-      url: "/frs/demos/sci/mothergoose-win-demo-en.zip"
-      target: "mothergoose"
-      category: "mixedup"
-    -
-      name: "Ms. Astro Chicken (DOS demo)"
-      url: "/frs/demos/sci/msastrochicken-dos-demo-en.zip"
-      target: "msastrochicken"
-      category: "blank"
-    -
-      name: "Pepper's Adventures in Time (DOS demo)"
-      url: "/frs/demos/sci/pepper-dos-demo-en.zip"
-      target: "pepper"
-      category: "blank"
-    -
-      name: "Pepper's Adventures in Time (DOS demo - Non-interactive"
-      url: "/frs/demos/sci/pepper-dos-ni-demo-en.zip"
-      target: "pepper"
-      category: "blank"
-    -
-      name: "Pepper's Adventures in Time (Windows demo)"
-      url: "/frs/demos/sci/pepper-dos-win-demo-en.zip"
-      target: "pepper"
-      category: "blank"
-    -
-      name: "Phantasmagoria (DOS demo)"
-      url: "/frs/demos/sci/phantasmagoria-dos-win-demo-en.zip"
-      target: "phantasmagoria"
-      category: "blank"
-    -
-      name: "Police Quest II: The Vengeance (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/pq2-dos-ni-demo-en.zip"
-      target: "pq2"
-      category: "pq-sci"
-    -
-      name: "Police Quest III: The Kindred (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/pq3-dos-ni-demo-en.zip"
-      target: "pq3"
-      category: "pq-sci"
-    -
-      name: "Police Quest IV: Open Season (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/pq4-dos-ni-demo-en.zip"
-      target: "pq4"
-      category: "pq-sci"
-    -
-      name: "Quest for Glory I: So You Want to Be a Hero (EGA DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/qfg1-dos-ni-demo-en.zip"
-      target: "qfg1"
-      category: "qfg-sci"
-    -
-      name: "Quest for Glory I: So You Want to Be a Hero (VGA DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/qfg1vga-dos-ni-demo-en.zip"
-      target: "qfg1vga"
-      category: "qfg-sci"
-    -
-      name: "Quest for Glory II: Trial by Fire (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/qfg2-dos-ni-demo-en.zip"
-      target: "qfg2"
-      category: "qfg-sci"
-    -
-      name: "Quest for Glory III: Wages of War (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/qfg3-dos-ni-demo-en.zip"
-      target: "qfg3"
-      category: "qfg-sci"
-    -
-      name: "Quest for Glory IV: Shadows of Darkness (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/qfg4-dos-ni-demo-en.zip"
-      target: "qfg4"
-      category: "qfg-sci"
-    -
-      name: "RAMA (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/rama-dos-win-ni-demo-en.zip"
-      target: "rama"
-      category: "blank"
-    -
-      name: "Shivers (Windows demo - Non-interactive)"
-      url: "/frs/demos/sci/shivers-win-demo-en.zip"
-      target: "shivers"
-      category: "blank"
-    -
-      name: "Shivers (Windows demo)"
-      url: "/frs/demos/sci/shivers-win-demo2-en.zip"
-      target: "shivers"
-      category: "blank"
-    -
-      name: "Slater & Charlie Go Camping (DOS demo)"
-      url: "/frs/demos/sci/slater-dos-demo.en.zip"
-      target: "slater"
-      category: "blank"
-    -
-      name: "Space Quest I: The Sarien Encounter, SCI Remake (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/sq1sci-dos-ni-demo-en.zip"
-      target: "sq1sci"
-      category: "sq-sci"
-    -
-      name: "Space Quest III: The Pirates of Pestulon (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/sq3-dos-ni-demo-en.zip"
-      target: "sq3"
-      category: "sq-sci"
-    -
-      name: "Space Quest 6: The Spinal Frontier (DOS demo)"
-      url: "/frs/demos/sci/sq6-dos-demo-en.zip"
-      target: "sq6"
-      category: "sq-sci"
-    -
-      name: "The Beast Within: A Gabriel Knight Mystery (Windows demo - Non-interactive)"
-      url: "/frs/demos/sci/gk2-win-ni-demo-en.zip"
-      target: "gk2"
-      category: "blank"
-    -
-      name: "The Island of Dr. Brain (DOS demo - Non-interactive)"
-      url: "/frs/demos/sci/islandbrain-dos-ni-demo-en.zip"
-      target: "islandbrain"
-      category: "blank"
-    -
-      name: "Torin's Passage (Windows demo)"
-      url: "/frs/demos/sci/torin-dos-win-demo-en.zip"
-      target: "torin"
-      category: "blank"
-    -
-      name: "Xmas Card (DOS demo)"
-      url: "/frs/demos/agi/xmascard-dos-en.zip"
-      target: "xmascard"
-      category: "blank"
-  -
-    name: "Miscellaneous Demos"
+    demos:
+      - name: "AGI Demo Pack 1 (DOS demos of 3-D Helicopter Sim, Police Quest, Thexder, Space Quest 2, Mixed-up Mother Goose, Leisure Suit Larry)"
+        url: "/frs/demos/agi/agi-dos-pack1-demo-en.zip"
+        target: "agidemo"
+        category: "blank"
+      - name: "AGI Demo Pack 2 (DOS demos of 3-D Helicopter Sim, Space Quest 2, Thexder, King's Quest 3, Mixed- up Mother Goose, King's Quest 2, Police Quest, Leisure Suit Larry, Space Quest)"
+        url: "/frs/demos/agi/agi-dos-pack2-demo-en.zip"
+        target: "agidemo"
+        category: "blank"
+      - name: "AGI Demo Pack 3 (DOS demos of 3-D Helicopter Sim, Space Quest 2, Police Quest, King's Quest 3, Mixed-up Mother Goose, Leisure Suit Larry)"
+        url: "/frs/demos/agi/agi-dos-pack3-demo-en.zip"
+        target: "agidemo"
+        category: "blank"
+      - name: "AGI Demo Pack 4 (DOS demos of Gold Rush!, Manhunter: NewYork, Mixed-up Mother Goose, Police Quest, Space Quest 2, Leisure Suit Larry)"
+        url: "/frs/demos/agi/agi-dos-pack4-demo-en.zip"
+        target: "agidemo"
+        category: "blank"
+      - name: "AGI Demo Pack 5 (DOS demos of Space Quest, Donald Duck's Playground, King's Quest 3, Leisure Suit Larry)"
+        url: "/frs/demos/agi/agi-dos-pack5-demo-en.zip"
+        target: "agidemo"
+        category: "blank"
+      - name: "Astro Chicken (DOS demo)"
+        url: "/frs/demos/sci/astrochicken-dos-demo-en.zip"
+        target: "astrochicken"
+        category: "blank"
+      - name: "Castle of Dr. Brain (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/castlebrain-dos-ni-demo-en.zip"
+        target: "castlebrain"
+      - name: "Christmas Card 1988 (DOS demo)"
+        url: "/frs/demos/sci/christmas1988-dos-en.zip"
+        target: "christmas1988"
+        category: "blank"
+      - name: "Christmas Card 1990: The Seasoned Professional (EGA DOS demo)"
+        url: "/frs/demos/sci/christmas1990-dos-ega-en.zip"
+        target: "christmas1990"
+        category: "blank"
+      - name: "Christmas Card 1990: The Seasoned Professional (VGA DOS demo)"
+        url: "/frs/demos/sci/christmas1990-dos-vga-en.zip"
+        target: "christmas1990"
+        category: "blank"
+      - name: "Christmas Card 1992 (DOS demo)"
+        url: "/frs/demos/sci/christmas1992-dos-en.zip"
+        target: "christmas1992"
+        category: "blank"
+      - name: "Codename: ICEMAN (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/iceman-dos-ni-demo-en.zip"
+        target: "iceman"
+      - name: "Conquests of Camelot: King Arthur, Quest for the Grail (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/camelot-dos-ni-demo-en.zip"
+        target: "camelot"
+      - name: "Conquests of the Longbow: The Adventures of Robin Hood (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/longbow-dos-ni-demo-en.zip"
+        target: "longbow"
+      - name: "EcoQuest: The Search for Cetus (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/ecoquest-dos-ni-demo-en.zip"
+        target: "ecoquest"
+      - name: "EcoQuest II: Lost Secret of the Rainforest (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/ecoquest2-dos-ni-demo-en.zip"
+        target: "ecoquest2"
+        category: "ecoquest"
+      - name: "Freddy Pharkas: Frontier Pharmacist (DOS demo)"
+        url: "/frs/demos/sci/freddypharkas-dos-demo1-en.zip"
+        target: "freddypharkas"
+      - name: "Freddy Pharkas: Frontier Pharmacist (DOS Alternative demo)"
+        url: "/frs/demos/sci/freddypharkas-dos-demo2-en.zip"
+        target: "freddypharkas"
+      - name: "Freddy Pharkas: Frontier Pharmacist (Windows CD demo)"
+        url: "/frs/demos/sci/freddypharkas-win-cd-demo-en.zip"
+        target: "freddypharkas"
+      - name: "Fun Seeker's Guide (DOS demo)"
+        url: "/frs/demos/sci/funseeker-dos-demo-en.zip"
+        target: "funseeker"
+        category: "blank"
+      - name: "Hoyle Official Book of Games: Volume 3 (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/hoyle3-dos-ni-demo-en.zip"
+        target: "hoyle3"
+        category: "hoyle"
+      - name: "Hoyle Classic Card Games (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/hoyle4-dos-ni-demo-en.zip"
+        target: "hoyle4"
+        category: "hoyle"
+      - name: "ImagiNation Network (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/inn-dos-ni-demo-en.zip"
+        target: "inndemo"
+        category: "blank"
+      - name: "King's Quest I: Quest for the Crown, SCI Remake (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/kq1sci-dos-ni-demo-en.zip"
+        target: "kq1sci"
+        category: "kq-sci"
+      - name: "King's Quest IV: The Perils of Rosella (DOS demo - Non-interactive)"
+        url: "/frs/demos/agi/kq4-dos-ni-demo-en.zip"
+        target: "kq4"
+        category: "kq-sci"
+      - name: "King's Quest IV: The Perils of Rosella, SCI Remake (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/kq4sci-dos-ni-demo-en.zip"
+        target: "kq4sci"
+        category: "kq-sci"
+      - name: "King's Quest VI: Heir Today, Gone Tomorrow (DOS CD demo - Non-interactive)"
+        url: "/frs/demos/sci/kq6-dos-ni-demo-en.zip"
+        target: "kq6"
+        category: "kq-sci"
+      - name: "King's Quest VII: The Princeless Bride (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/kq7-dos-win-ni-demo-en.zip"
+        target: "kq7"
+        category: "kq-sci"
+      - name: "Laura Bow: The Colonel's Bequest (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/laurabow-dos-ni-demo-en.zip"
+        target: "laurabow"
+      - name: "Laura Bow 2: The Dagger of Amon Ra (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/laurabow2-dos-ni-demo-en.zip"
+        target: "laurabow2"
+        category: "laurabow"
+      - name: "Leisure Suit Larry in the Land of the Lounge Lizards, SCI Remake (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/lsl1sci-dos-ni-demo-en.zip"
+        target: "lsl1sci"
+        category: "lsl-sci"
+      - name: "Leisure Suit Larry 2: Goes Looking for Love (in Several Wrong Places) (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/lsl2-dos-ni-demo-en.zip"
+        target: "lsl2"
+        category: "lsl-sci"
+      - name: "Leisure Suit Larry 3: Passionate Patti in Pursuit of the Pulsating Pectorals (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/lsl3-dos-ni-demo-en.zip"
+        target: "lsl3"
+        category: "lsl-sci"
+      - name: "Leisure Suit Larry 5: Passionate Patti Does a Little Undercover Work (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/lsl5-dos-ni-demo-en.zip"
+        target: "lsl5"
+        category: "lsl-sci"
+      - name: "Leisure Suit Larry 7: Love For Sail! (DOS demo)"
+        url: "/frs/demos/sci/lsl7-dos-demo-en.zip"
+        target: "lsl7"
+        category: "lsl-sci"
+      - name: "Lighthouse: The Dark Being (Windows demo)"
+        url: "/frs/demos/sci/lighthouse-win-demo-en.zip"
+        target: "lighthouse"
+        category: "blank"
+      - name: "Lighthouse: The Dark Being (Windows demo - Non-interactive)"
+        url: "/frs/demos/sci/lighthouse-win-ni-demo-en.zip"
+        target: "lighthouse"
+        category: "blank"
+      - name: "Mixed-up Fairy Tales (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/fairytales-dos-ni-demo-en.zip"
+        target: "fairytales"
+        category: "mixedup"
+      - name: "Mixed-Up Mother Goose (DOS demo)"
+        url: "/frs/demos/sci/mothergoose-win-demo-en.zip"
+        target: "mothergoose"
+        category: "mixedup"
+      - name: "Ms. Astro Chicken (DOS demo)"
+        url: "/frs/demos/sci/msastrochicken-dos-demo-en.zip"
+        target: "msastrochicken"
+        category: "blank"
+      - name: "Pepper's Adventures in Time (DOS demo)"
+        url: "/frs/demos/sci/pepper-dos-demo-en.zip"
+        target: "pepper"
+        category: "blank"
+      - name: "Pepper's Adventures in Time (DOS demo - Non-interactive"
+        url: "/frs/demos/sci/pepper-dos-ni-demo-en.zip"
+        target: "pepper"
+        category: "blank"
+      - name: "Pepper's Adventures in Time (Windows demo)"
+        url: "/frs/demos/sci/pepper-dos-win-demo-en.zip"
+        target: "pepper"
+        category: "blank"
+      - name: "Phantasmagoria (DOS demo)"
+        url: "/frs/demos/sci/phantasmagoria-dos-win-demo-en.zip"
+        target: "phantasmagoria"
+        category: "blank"
+      - name: "Police Quest II: The Vengeance (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/pq2-dos-ni-demo-en.zip"
+        target: "pq2"
+        category: "pq-sci"
+      - name: "Police Quest III: The Kindred (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/pq3-dos-ni-demo-en.zip"
+        target: "pq3"
+        category: "pq-sci"
+      - name: "Police Quest IV: Open Season (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/pq4-dos-ni-demo-en.zip"
+        target: "pq4"
+        category: "pq-sci"
+      - name: "Quest for Glory I: So You Want to Be a Hero (EGA DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/qfg1-dos-ni-demo-en.zip"
+        target: "qfg1"
+        category: "qfg-sci"
+      - name: "Quest for Glory I: So You Want to Be a Hero (VGA DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/qfg1vga-dos-ni-demo-en.zip"
+        target: "qfg1vga"
+        category: "qfg-sci"
+      - name: "Quest for Glory II: Trial by Fire (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/qfg2-dos-ni-demo-en.zip"
+        target: "qfg2"
+        category: "qfg-sci"
+      - name: "Quest for Glory III: Wages of War (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/qfg3-dos-ni-demo-en.zip"
+        target: "qfg3"
+        category: "qfg-sci"
+      - name: "Quest for Glory IV: Shadows of Darkness (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/qfg4-dos-ni-demo-en.zip"
+        target: "qfg4"
+        category: "qfg-sci"
+      - name: "RAMA (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/rama-dos-win-ni-demo-en.zip"
+        target: "rama"
+        category: "blank"
+      - name: "Shivers (Windows demo - Non-interactive)"
+        url: "/frs/demos/sci/shivers-win-demo-en.zip"
+        target: "shivers"
+        category: "blank"
+      - name: "Shivers (Windows demo)"
+        url: "/frs/demos/sci/shivers-win-demo2-en.zip"
+        target: "shivers"
+        category: "blank"
+      - name: "Slater & Charlie Go Camping (DOS demo)"
+        url: "/frs/demos/sci/slater-dos-demo.en.zip"
+        target: "slater"
+        category: "blank"
+      - name: "Space Quest I: The Sarien Encounter, SCI Remake (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/sq1sci-dos-ni-demo-en.zip"
+        target: "sq1sci"
+        category: "sq-sci"
+      - name: "Space Quest III: The Pirates of Pestulon (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/sq3-dos-ni-demo-en.zip"
+        target: "sq3"
+        category: "sq-sci"
+      - name: "Space Quest 6: The Spinal Frontier (DOS demo)"
+        url: "/frs/demos/sci/sq6-dos-demo-en.zip"
+        target: "sq6"
+        category: "sq-sci"
+      - name: "The Beast Within: A Gabriel Knight Mystery (Windows demo - Non-interactive)"
+        url: "/frs/demos/sci/gk2-win-ni-demo-en.zip"
+        target: "gk2"
+        category: "blank"
+      - name: "The Island of Dr. Brain (DOS demo - Non-interactive)"
+        url: "/frs/demos/sci/islandbrain-dos-ni-demo-en.zip"
+        target: "islandbrain"
+        category: "blank"
+      - name: "Torin's Passage (Windows demo)"
+        url: "/frs/demos/sci/torin-dos-win-demo-en.zip"
+        target: "torin"
+        category: "blank"
+      - name: "Xmas Card (DOS demo)"
+        url: "/frs/demos/agi/xmascard-dos-en.zip"
+        target: "xmascard"
+        category: "blank"
+
+  - name: "Miscellaneous Demos"
     href: "other"
-    demos: 
-    -
-      name: "Beneath a Steel Sky (DOS CD Demo)"
-      url: "/frs/demos/sky/sky-dos-v0365-cd-demo-en.zip"
-      target: "sky"
-    -
-      name: "Broken Sword 1: The Shadow of the Templars (Macintosh Demo)"
-      url: "/frs/demos/sword1/sword1-mac-demo-en.zip"
-      target: "sword1macdemo"
-      category: "sword"
-    -
-      name: "Broken Sword 1: The Shadow of the Templars (PlayStation Demo)"
-      url: "/frs/demos/sword1/sword1-psx-demo-en.zip"
-      target: "sword1psxdemo"
-      category: "sword"
-    -
-      name: "Broken Sword 1: The Shadow of the Templars (Windows Demo)"
-      url: "/frs/demos/sword1/sword1-win-demo-en.zip"
-      target: "sword1demo"
-      category: "sword"
-    -
-      name: "Broken Sword II: The Smoking Mirror (Windows Demo)"
-      url: "/frs/demos/sword2/sword2-win-demo-en.zip"
-      target: "sword2demo"
-      category: "sword2"
-    -
-      name: "Broken Sword II: The Smoking Mirror (PlayStation Demo)"
-      url: "/frs/demos/sword2/sword2-psx-demo-en.zip"
-      target: "sword2psxdemo"
-      category: "sword2"
-    -
-      name: "Bud Tucker in Double Trouble (DOS Demo)"
-      url: "/frs/demos/tucker/tucker-dos-demo.zip"
-      target: "tucker"
-    -
-      name: "Bud Tucker in Double Trouble (DOS demo - Non-interactive)"
-      url: "/frs/demos/tucker/tucker-dos-ni-demo.zip"
-      target: "tucker"
-    -
-      name: "Discworld 1 (DOS CD demo)"
-      url: "/frs/demos/tinsel/dw-dos-cd-demo-en.zip"
-      target: "dw"
-    -
-      name: "Discworld 1 (DOS Floppy demo)"
-      url: "/frs/demos/tinsel/dw-dos-floppy-demo-en.zip"
-      target: "dw"
-    -
-      name: "Discworld 1 (PlayStation demo)"
-      url: "/frs/demos/tinsel/dw-psx-demo-en.zip"
-      target: "dw"
-    -
-      name: "Discworld 2 (Windows demo)"
-      url: "/frs/demos/tinsel/dw2-win-demo-en.zip"
-      target: "dw2"
-      category: "dw"
-    -
-      name: "Flight of the Amazon Queen (Amiga demo)"
-      url: "/frs/demos/queen/queen-amiga-demo-en.zip"
-      target: "queen"
-    -
-      name: "Flight of the Amazon Queen (Amiga interview demo)"
-      url: "/frs/demos/queen/queen-amiga-interview-en.zip"
-      target: "queen"
-    -
-      name: "Flight of the Amazon Queen (DOS demo)"
-      url: "/frs/demos/queen/queen-dos-demo-en.zip"
-      target: "queen"
-    -
-      name: "Flight of the Amazon Queen (DOS alternative demo)"
-      url: "/frs/demos/queen/queen-dos-demo-en-alt.zip"
-      target: "queen"
-    -
-      name: "Flight of the Amazon Queen (DOS PCGAMES demo)"
-      url: "/frs/demos/queen/queen-dos-pcgames-demo-en.zip"
-      target: "queen"
-    -
-      name: "Flight of the Amazon Queen (DOS interview demo)"
-      url: "/frs/demos/queen/queen-dos-interview-en.zip"
-      target: "queen"
-    -
-      name: "Full Pipe (Russian demo)"
-      url: "/frs/demos/fullpipe/fullpipe-demo-ru.zip"
-      target: "fullpipe"
-    -
-      name: "Full Pipe (German demo)"
-      url: "/frs/demos/fullpipe/fullpipe-demo-de.zip"
-      target: "fullpipe"
-    -
-      name: "Future Wars (Amiga demo - Non interactive)"
-      url: "/frs/demos/cine/fw-amiga-ni-demo-en.zip"
-      target: "fw"
-    -
-      name: "Hopkins FBI (Linux demo)"
-      url: "/frs/demos/hopkins/hopkins-linux-en.zip"
-      target: "hopkins"
-    -
-      name: "Hopkins FBI (Windows 95 English demo)"
-      url: "/frs/demos/hopkins/hopkins-win95-en.zip"
-      target: "hopkins"
-    -
-      name: "Hopkins FBI (Windows 95 Polish demo)"
-      url: "/frs/demos/hopkins/hopkins-win95-pl.zip"
-      target: "hopkins"
-    -
-      name: "Hyperspace Delivery Boy! (Linux demo)"
-      url: "/frs/demos/hdb/hdb-demo-linux.zip"
-      target: "hdb"
-    -
-      name: "Hyperspace Delivery Boy! (Windows demo)"
-      url: "/frs/demos/hdb/hdb-demo-win.zip"
-      target: "hdb"
-    -
-      name: "Hyperspace Delivery Boy! (PocketPC demo)"
-      url: "/frs/demos/hdb/hdb-demo-ppc.zip"
-      target: "hdb"
-    -
-      name: "Hyperspace Delivery Boy! (Handango PocketPC demo)"
-      url: "/frs/demos/hdb/hdb-demo-ppc-alt.zip"
-      target: "hdb"
-    -
-      name: "I Have No Mouth And I Must Scream (DOS demo)"
-      url: "/frs/demos/saga/ihnm-dos-demo-en.zip"
-      target: "ihnm"
-    -
-      name: "Lands of Lore: The Throne of Chaos (DOS demo - Non-interactive)"
-      url: "/frs/demos/kyra/lol-dos-ni-demo-en.zip"
-      target: "lol"
-    -
-      name: "Myst (Windows demo)"
-      url: "/frs/demos/mohawk/myst-win-demo-en.zip"
-      target: "myst"
-    -
-      name: "Nippon Safes (Amiga demo)"
-      url: "/frs/demos/parallaction/nippon-amiga-demo-en.zip"
-      target: "nippon"
-    -
-      name: "Operation Stealth (Amiga demo - Non interactive)"
-      url: "/frs/demos/cine/os-amiga-ni-demo-en.zip"
-      target: "os"
-      category: "blank"
-    -
-      name: "Operation Stealth (DOS demo - Non interactive) - Requires ScummVM 1.8.0git"
-      url: "/frs/demos/cine/os-dos-ni-demo-en.zip"
-      target: "os"
-      category: "blank"
-    -
-      name: "Ringworld: Revenge of the Patriarch (DOS demo - Non interactive)"
-      url: "/frs/demos/tsage/ringworld-dos-ni-demo-en.zip"
-      target: "tsage"
-      category: "blank"
-    -
-      name: "Riven (Windows demo)"
-      url: "/frs/demos/mohawk/riven-win-demo-en.zip"
-      target: "riven"
-    -
-      name: "Return to Ringworld (DOS demo)"
-      url: "/frs/demos/tsage/returntoringworld-dos-demo-en.zip"
-      target: "tsage"
-      category: "blank"
-    -
-      name: "Return to Zork (DOS demo - Non interactive)"
-      url: "/frs/demos/made/rtz-dos-ni-demo-en.zip"
-      target: "rtz"
-    -
-      name: "Teen Agent (DOS Union demo)"
-      url: "/frs/demos/teen/teen-dos-union-demo-en.zip"
-      target: "teenagent"
-    -
-      name: "Teen Agent (DOS WizTech demo)"
-      url: "/frs/demos/teen/teen-dos-wiztech-demo-en.zip"
-      target: "teenagent"
-    -
-      name: "The Journeyman Project: Pegasus Prime (Macintosh demo)"
-      url: "/frs/demos/pegasus/pegasus-mac-demo-en.zip"
-      target: "pegasus"
-      category: "jmp"
-    -
-      name: "The Legend of Kyrandia (DOS demo - Non-interactive)"
-      url: "/frs/demos/kyra/kyra1-dos-ni-demo-en.zip"
-      target: "kyra1"
-      category: "kyra"
-    -
-      name: "The Legend of Kyrandia: The Hand of Fate (DOS demo)"
-      url: "/frs/demos/kyra/kyra2-dos-cd-demo-en.zip"
-      target: "kyra2"
-      category: "kyra"
-    -
-      name: "The Legend of Kyrandia: The Hand of Fate (DOS demo - Non-interactive)"
-      url: "/frs/demos/kyra/kyra2-dos-ni-demo1-en.zip"
-      target: "kyra2"
-      category: "kyra"
-    -
-      name: "The Legend of Kyrandia: The Hand of Fate (DOS Alternative demo - Non-interactive)"
-      url: "/frs/demos/kyra/kyra2-dos-ni-demo2-en.zip"
-      target: "kyra2"
-      category: "kyra"
-    -
-      name: "The Neverhood (DOS demo)"
-      url: "/frs/demos/neverhood/neverhood-win-demo-en.zip"
-      target: "neverhood"
-    -
-      name: "The Neverhood (DOS Alternative demo)"
-      url: "/frs/demos/neverhood/neverhood-win-demo2-en.zip"
-      target: "neverhood"
-    -
-      name: "Toonstruck (DOS German demo)"
-      url: "/frs/demos/toon/toon-dos-demo-de.zip"
-      target: "toon"
-    -
-      name: "Touché: The Adventures of the Fifth Musketeer (DOS Demo)"
-      url: "/frs/demos/touche/touche-dos-demo-en.zip"
-      target: "touche"
\ No newline at end of file
+    demos:
+      - name: "Beneath a Steel Sky (DOS CD Demo)"
+        url: "/frs/demos/sky/sky-dos-v0365-cd-demo-en.zip"
+        target: "sky"
+      - name: "Broken Sword 1: The Shadow of the Templars (Macintosh Demo)"
+        url: "/frs/demos/sword1/sword1-mac-demo-en.zip"
+        target: "sword1macdemo"
+        category: "sword"
+      - name: "Broken Sword 1: The Shadow of the Templars (PlayStation Demo)"
+        url: "/frs/demos/sword1/sword1-psx-demo-en.zip"
+        target: "sword1psxdemo"
+        category: "sword"
+      - name: "Broken Sword 1: The Shadow of the Templars (Windows Demo)"
+        url: "/frs/demos/sword1/sword1-win-demo-en.zip"
+        target: "sword1demo"
+        category: "sword"
+      - name: "Broken Sword II: The Smoking Mirror (Windows Demo)"
+        url: "/frs/demos/sword2/sword2-win-demo-en.zip"
+        target: "sword2demo"
+        category: "sword2"
+      - name: "Broken Sword II: The Smoking Mirror (PlayStation Demo)"
+        url: "/frs/demos/sword2/sword2-psx-demo-en.zip"
+        target: "sword2psxdemo"
+        category: "sword2"
+      - name: "Bud Tucker in Double Trouble (DOS Demo)"
+        url: "/frs/demos/tucker/tucker-dos-demo.zip"
+        target: "tucker"
+      - name: "Bud Tucker in Double Trouble (DOS demo - Non-interactive)"
+        url: "/frs/demos/tucker/tucker-dos-ni-demo.zip"
+        target: "tucker"
+      - name: "Discworld 1 (DOS CD demo)"
+        url: "/frs/demos/tinsel/dw-dos-cd-demo-en.zip"
+        target: "dw"
+      - name: "Discworld 1 (DOS Floppy demo)"
+        url: "/frs/demos/tinsel/dw-dos-floppy-demo-en.zip"
+        target: "dw"
+      - name: "Discworld 1 (PlayStation demo)"
+        url: "/frs/demos/tinsel/dw-psx-demo-en.zip"
+        target: "dw"
+      - name: "Discworld 2 (Windows demo)"
+        url: "/frs/demos/tinsel/dw2-win-demo-en.zip"
+        target: "dw2"
+        category: "dw"
+      - name: "Flight of the Amazon Queen (Amiga demo)"
+        url: "/frs/demos/queen/queen-amiga-demo-en.zip"
+        target: "queen"
+      - name: "Flight of the Amazon Queen (Amiga interview demo)"
+        url: "/frs/demos/queen/queen-amiga-interview-en.zip"
+        target: "queen"
+      - name: "Flight of the Amazon Queen (DOS demo)"
+        url: "/frs/demos/queen/queen-dos-demo-en.zip"
+        target: "queen"
+      - name: "Flight of the Amazon Queen (DOS alternative demo)"
+        url: "/frs/demos/queen/queen-dos-demo-en-alt.zip"
+        target: "queen"
+      - name: "Flight of the Amazon Queen (DOS PCGAMES demo)"
+        url: "/frs/demos/queen/queen-dos-pcgames-demo-en.zip"
+        target: "queen"
+      - name: "Flight of the Amazon Queen (DOS interview demo)"
+        url: "/frs/demos/queen/queen-dos-interview-en.zip"
+        target: "queen"
+      - name: "Full Pipe (Russian demo)"
+        url: "/frs/demos/fullpipe/fullpipe-demo-ru.zip"
+        target: "fullpipe"
+      - name: "Full Pipe (German demo)"
+        url: "/frs/demos/fullpipe/fullpipe-demo-de.zip"
+        target: "fullpipe"
+      - name: "Future Wars (Amiga demo - Non interactive)"
+        url: "/frs/demos/cine/fw-amiga-ni-demo-en.zip"
+        target: "fw"
+      - name: "Hopkins FBI (Linux demo)"
+        url: "/frs/demos/hopkins/hopkins-linux-en.zip"
+        target: "hopkins"
+      - name: "Hopkins FBI (Windows 95 English demo)"
+        url: "/frs/demos/hopkins/hopkins-win95-en.zip"
+        target: "hopkins"
+      - name: "Hopkins FBI (Windows 95 Polish demo)"
+        url: "/frs/demos/hopkins/hopkins-win95-pl.zip"
+        target: "hopkins"
+      - name: "Hyperspace Delivery Boy! (Linux demo)"
+        url: "/frs/demos/hdb/hdb-demo-linux.zip"
+        target: "hdb"
+      - name: "Hyperspace Delivery Boy! (Windows demo)"
+        url: "/frs/demos/hdb/hdb-demo-win.zip"
+        target: "hdb"
+      - name: "Hyperspace Delivery Boy! (PocketPC demo)"
+        url: "/frs/demos/hdb/hdb-demo-ppc.zip"
+        target: "hdb"
+      - name: "Hyperspace Delivery Boy! (Handango PocketPC demo)"
+        url: "/frs/demos/hdb/hdb-demo-ppc-alt.zip"
+        target: "hdb"
+      - name: "I Have No Mouth And I Must Scream (DOS demo)"
+        url: "/frs/demos/saga/ihnm-dos-demo-en.zip"
+        target: "ihnm"
+      - name: "Lands of Lore: The Throne of Chaos (DOS demo - Non-interactive)"
+        url: "/frs/demos/kyra/lol-dos-ni-demo-en.zip"
+        target: "lol"
+      - name: "Myst (Windows demo)"
+        url: "/frs/demos/mohawk/myst-win-demo-en.zip"
+        target: "myst"
+      - name: "Nippon Safes (Amiga demo)"
+        url: "/frs/demos/parallaction/nippon-amiga-demo-en.zip"
+        target: "nippon"
+      - name: "Operation Stealth (Amiga demo - Non interactive)"
+        url: "/frs/demos/cine/os-amiga-ni-demo-en.zip"
+        target: "os"
+        category: "blank"
+      - name: "Operation Stealth (DOS demo - Non interactive) - Requires ScummVM 1.8.0git"
+        url: "/frs/demos/cine/os-dos-ni-demo-en.zip"
+        target: "os"
+        category: "blank"
+      - name: "Ringworld: Revenge of the Patriarch (DOS demo - Non interactive)"
+        url: "/frs/demos/tsage/ringworld-dos-ni-demo-en.zip"
+        target: "tsage"
+        category: "blank"
+      - name: "Riven (Windows demo)"
+        url: "/frs/demos/mohawk/riven-win-demo-en.zip"
+        target: "riven"
+      - name: "Return to Ringworld (DOS demo)"
+        url: "/frs/demos/tsage/returntoringworld-dos-demo-en.zip"
+        target: "tsage"
+        category: "blank"
+      - name: "Return to Zork (DOS demo - Non interactive)"
+        url: "/frs/demos/made/rtz-dos-ni-demo-en.zip"
+        target: "rtz"
+      - name: "Teen Agent (DOS Union demo)"
+        url: "/frs/demos/teen/teen-dos-union-demo-en.zip"
+        target: "teenagent"
+      - name: "Teen Agent (DOS WizTech demo)"
+        url: "/frs/demos/teen/teen-dos-wiztech-demo-en.zip"
+        target: "teenagent"
+      - name: "The Journeyman Project: Pegasus Prime (Macintosh demo)"
+        url: "/frs/demos/pegasus/pegasus-mac-demo-en.zip"
+        target: "pegasus"
+        category: "jmp"
+      - name: "The Legend of Kyrandia (DOS demo - Non-interactive)"
+        url: "/frs/demos/kyra/kyra1-dos-ni-demo-en.zip"
+        target: "kyra1"
+        category: "kyra"
+      - name: "The Legend of Kyrandia: The Hand of Fate (DOS demo)"
+        url: "/frs/demos/kyra/kyra2-dos-cd-demo-en.zip"
+        target: "kyra2"
+        category: "kyra"
+      - name: "The Legend of Kyrandia: The Hand of Fate (DOS demo - Non-interactive)"
+        url: "/frs/demos/kyra/kyra2-dos-ni-demo1-en.zip"
+        target: "kyra2"
+        category: "kyra"
+      - name: "The Legend of Kyrandia: The Hand of Fate (DOS Alternative demo - Non-interactive)"
+        url: "/frs/demos/kyra/kyra2-dos-ni-demo2-en.zip"
+        target: "kyra2"
+        category: "kyra"
+      - name: "The Neverhood (DOS demo)"
+        url: "/frs/demos/neverhood/neverhood-win-demo-en.zip"
+        target: "neverhood"
+      - name: "The Neverhood (DOS Alternative demo)"
+        url: "/frs/demos/neverhood/neverhood-win-demo2-en.zip"
+        target: "neverhood"
+      - name: "Toonstruck (DOS German demo)"
+        url: "/frs/demos/toon/toon-dos-demo-de.zip"
+        target: "toon"
+      - name: "Touché: The Adventures of the Fifth Musketeer (DOS Demo)"
+        url: "/frs/demos/touche/touche-dos-demo-en.zip"
+        target: "touche"
diff --git a/include/Models/GameDemosModel.php b/include/Models/GameDemosModel.php
index d7fc473b..ffde2127 100644
--- a/include/Models/GameDemosModel.php
+++ b/include/Models/GameDemosModel.php
@@ -14,7 +14,7 @@ abstract class GameDemosModel extends BasicModel
         $fname = DIR_DATA . '/game_demos.yaml';
         $parsedData = \yaml_parse_file($fname);
         $entries = array();
-        foreach (array_values($parsedData['game_demos']['group']) as $value) {
+        foreach (array_values($parsedData['groups']) as $value) {
             $demos = array();
             foreach ($value['demos'] as $data) {
                 $demos[] = new GameDemo($data);




More information about the Scummvm-git-logs mailing list