From d3234a29c8098cf4bf1552bc92cd34d680746283 Mon Sep 17 00:00:00 2001
From: PugsyMAME <18102600+PugsyMAME@users.noreply.github.com>
Date: Sat, 19 Oct 2024 04:03:09 +0100
Subject: [PATCH] GameDB: Updating genres (#3315)

* Updating genres

Changed "Sports / " to "Sports -"  , as / should indicate multiple genres and - subgenres (there's still more to do).
Also added a ** DEMO ** genre as it's nice to be able sort them out.
Done a bit of work on the Lightspan educational games - but haven't completed as I've lsot the will to live with them.
Also done other clean ups on genres like cases and trailing dots.

* Tab Error in last update

Quick Fix for Tabs

* Fixing GameDB Lint errors

Oops

* Again Oops

oops

* Changed "Sports / " to "Sports -" , as / should indicate multiple genres and - subgenres (there's still more to do).
Also added a ** DEMO ** genre as it's nice to be able sort them out.
Done a bit of work on the Lightspan educational games - but haven't completed as I've lsot the will to live with them.

Also done other clean ups on genres like cases and trailing dots.
---
 data/resources/gamedb.yaml | 6298 +++++++++++++++++++++++++++---------
 1 file changed, 4727 insertions(+), 1571 deletions(-)

diff --git a/data/resources/gamedb.yaml b/data/resources/gamedb.yaml
index 6c14d6ec3..a3fd76884 100644
--- a/data/resources/gamedb.yaml
+++ b/data/resources/gamedb.yaml
@@ -18,6 +18,8 @@ SLPS-03086:
     linkCable: false
 SLPM-80238:
   name: "'98 Koushien (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01204:
   name: "'98 Koushien - Koukou Yakyuu Simulation (Japan)"
   compatibility:
@@ -245,7 +247,7 @@ SLES-03136:
     publisher: "Electronic Arts"
     developer: "Black Ops Entertaiment"
     releaseDate: "2000-11-17"
-    genre: "First person Shooter"
+    genre: "First Person Shooter"
     languages:
       - German
     minPlayers: 1
@@ -264,7 +266,7 @@ SLES-03137:
     publisher: "Electronic Arts"
     developer: "Black Ops Entertaiment"
     releaseDate: "2000-11-17"
-    genre: "First person Shooter"
+    genre: "First Person Shooter"
     languages:
       - Spanish
     minPlayers: 1
@@ -283,7 +285,7 @@ SLES-03135:
     publisher: "Electronic Arts"
     developer: "Black Ops Entertaiment"
     releaseDate: "2000-11-17"
-    genre: "First person Shooter"
+    genre: "First Person Shooter"
     languages:
       - French
     minPlayers: 1
@@ -302,7 +304,7 @@ SLES-03134:
     publisher: "Electronic Arts"
     developer: "Black Ops Entertaiment"
     releaseDate: "2000-11-17"
-    genre: "First person Shooter"
+    genre: "First Person Shooter"
     languages:
       - English
     minPlayers: 1
@@ -321,7 +323,7 @@ SLES-03138:
     publisher: "Electronic Arts"
     developer: "Black Ops Entertaiment"
     releaseDate: "2000-11-17"
-    genre: "First person Shooter"
+    genre: "First Person Shooter"
     languages:
       - Swedish
     minPlayers: 1
@@ -343,7 +345,7 @@ SLUS-01272:
     publisher: "Electronic Arts"
     developer: "Black Ops Entertaiment"
     releaseDate: "2000-11-08"
-    genre: "First person Shooter"
+    genre: "First Person Shooter"
     languages:
       - English
     minPlayers: 1
@@ -516,7 +518,7 @@ SLPS-01706:
     publisher: "Jorudan"
     developer: "Jorudan"
     releaseDate: "1999-10-21"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -528,6 +530,8 @@ SLPS-01706:
     linkCable: false
 SLPM-80351:
   name: "1 on 1 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01730:
   name: "100 Man Yen Quiz Hunter (Japan)"
   controllers:
@@ -613,13 +617,47 @@ SLPM-80643:
     versionTested: "0.1-1835-ge2fab72b"
 LSP-99012101:
   name: "16 Tales 1 (USA)"
+  codes:
+    - LSP99012101
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99012201:
   name: "16 Tales 2 (USA)"
+  codes:
+    - LSP99012201
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1323-ga6acd33"
+LSP-99012301:
+  name: "16 Tales 3 (USA)"
+  codes:
+    - LSP99012301
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99012401:
   name: "16 Tales 4 (USA)"
+  codes:
+    - LSP99012401
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLPS-01865:
   name: "19 ji 03 pun - Ueno-hatsu Yakou Ressha (Japan)"
   compatibility:
@@ -632,7 +670,7 @@ SLPS-01865:
     publisher: "Visit"
     developer: "Visit"
     releaseDate: "1999-03-04"
-    genre: "Adventure / Interactive movie"
+    genre: "Adventure / Interactive Movie"
     languages:
       - Japanese
     minPlayers: 1
@@ -653,7 +691,7 @@ SLPS-02881:
     publisher: "Visit"
     developer: "Visit"
     releaseDate: "2000-08-03"
-    genre: "Adventure / Interactive movie"
+    genre: "Adventure / Interactive Movie"
     languages:
       - Japanese
     minPlayers: 1
@@ -671,7 +709,7 @@ SCUS-94503:
     publisher: "Sony"
     developer: "SISA"
     releaseDate: "1995-12-10"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -691,7 +729,7 @@ SLPS-02466:
     publisher: "Spike"
     developer: "Spike"
     releaseDate: "1999-12-16"
-    genre: "Driving / Racing"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -739,7 +777,7 @@ SLPS-02857:
     publisher: "Virgin Interactive"
     developer: "Crimson"
     releaseDate: "2000-09-07"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -758,7 +796,7 @@ SLPS-91416:
     publisher: "Virgin Interactive"
     developer: "Crimson"
     releaseDate: "2001-12-13"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -777,7 +815,7 @@ SLES-03830:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-04-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - Swedish
@@ -797,7 +835,7 @@ SLES-03831:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-04-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -816,7 +854,7 @@ SLES-03832:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-04-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -835,7 +873,7 @@ SLES-03833:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-04-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -854,7 +892,7 @@ SLES-03834:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-04-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -876,7 +914,7 @@ SLUS-01449:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-04-23"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - Spanish
@@ -895,7 +933,7 @@ SCES-00400:
     publisher: "Sony Computer Entertainment"
     developer: "Sony"
     releaseDate: "1997-03-01"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -916,7 +954,7 @@ SCUS-94508:
     publisher: "Sony Computer Entertaiment"
     developer: "Sony"
     releaseDate: "1996-10-31"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -990,7 +1028,7 @@ SLUS-00066:
     publisher: "Crystal Dynamics"
     developer: "Crystal Dynamics"
     releaseDate: "1996-10-31"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -1011,7 +1049,7 @@ SLPS-00693:
     publisher: "BMG Interactive Entertainment"
     developer: "Crystal Dynamics"
     releaseDate: "1997-02-28"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -1153,7 +1191,7 @@ SCPS-18006:
     publisher: "Sony"
     developer: "3D Kaleidoscope"
     releaseDate: "1997-06-20"
-    genre: "Music / Simulation."
+    genre: "Music / Simulation"
     languages:
       - Japanese
     minPlayers: 1
@@ -1175,7 +1213,7 @@ SCUS-94231:
     publisher: "989 Sports"
     developer: "989 Sports"
     releaseDate: "1999-03-31"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -1187,6 +1225,8 @@ SCUS-94231:
     linkCable: false
 SCUS-94365:
   name: "3Xtreme (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00071:
   name: "3x3 Eyes - Kyuusei Koushu (Japan) (Disc 1)"
   discSet:
@@ -1322,7 +1362,7 @@ SLES-00095:
     publisher: "Virgin Interactive"
     developer: "Arc Developments"
     releaseDate: "1997-08-01"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -1356,6 +1396,8 @@ SLES-01937:
     linkCable: false
 SLED-02435:
   name: "40 Winks (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01940:
   name: "40 Winks (Italy)"
   controllers:
@@ -1462,6 +1504,8 @@ SLES-04064:
     linkCable: false
 SLPM-80387:
   name: "70's Robot Anime - Geppy-X (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01995:
   name: "70's Robot Anime - Geppy-X - The Super Boosted Armor (Japan) (Disc 1)"
   discSet:
@@ -1878,7 +1922,7 @@ SLES-01875:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1996-06-10"
-    genre: "Sports / Australian Football"
+    genre: "Sports - Australian Football"
     languages:
       - English
     minPlayers: 1
@@ -1896,7 +1940,7 @@ SLPS-02411:
     publisher: "i4 Corporation"
     developer: "i4 Corporation"
     releaseDate: "1999-11-25"
-    genre: "Board / Mahjong."
+    genre: "Board / Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -1914,7 +1958,7 @@ SLPM-87117:
     publisher: "Hamster"
     developer: "i4 Corporation"
     releaseDate: "2002-07-25"
-    genre: "Board / Mahjong."
+    genre: "Board / Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -1998,6 +2042,8 @@ SLPM-87068:
     linkCable: false
 SLUS-90010:
   name: "ASCII Entertainment Demo CD (USA)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1409-ge198e315"
@@ -2241,6 +2287,8 @@ SLPS-01118:
     linkCable: false
 SLPM-80175:
   name: "Abe a GoGo (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01341:
   name: "Absolute Football (France) (En,Fr,De,Es,It,Pt)"
   controllers:
@@ -2250,7 +2298,7 @@ SLES-01341:
     publisher: "Virgin Interactive"
     developer: "Crimson"
     releaseDate: "1999-03-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -2550,6 +2598,8 @@ SLPS-02119:
     linkCable: false
 SLPM-80430:
   name: "Acid (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86589:
   name: "Acid (Japan) (Major Wave)"
   controllers:
@@ -2628,7 +2678,7 @@ SLPS-02482:
     publisher: "Syscom Entertaiment"
     developer: "Vingt-et-un Systems"
     releaseDate: "1999-12-09"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -2647,7 +2697,7 @@ SLES-03105:
     publisher: "Take-Two Interactive"
     developer: "Vingt-et-un Systems"
     releaseDate: "2000-09-29"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -2666,7 +2716,7 @@ SLPM-86927:
     publisher: "Syscom Entertaiment"
     developer: "Vingt-et-un Systems"
     releaseDate: "2001-12-06"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -2688,7 +2738,7 @@ SLUS-01248:
     publisher: "Take 2 Interactive"
     developer: "Vingt-et-un Systems"
     releaseDate: "2000-07-14"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -2800,7 +2850,7 @@ SLES-00015:
     publisher: "Gremlin Interactive"
     developer: "Gremlin Interactive"
     releaseDate: "1996-10-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
       - French
@@ -2820,7 +2870,7 @@ SLPS-00298:
     publisher: "Naxat Soft"
     developer: "Gremlin Interactive"
     releaseDate: "1997-04-11"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -2838,7 +2888,7 @@ SLES-00044:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1997-09-05"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -2857,7 +2907,7 @@ SLES-01042:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1998-10-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -2876,7 +2926,7 @@ SLES-00188:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1998-02-10"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
       - Finnish
@@ -2899,7 +2949,7 @@ SLPM-86078:
     publisher: "Konami"
     developer: "Gremlin Graphics"
     releaseDate: "1998-12-17"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - Japanese
     minPlayers: 1
@@ -2919,7 +2969,7 @@ SLES-01226:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1999-04-23"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -2938,7 +2988,7 @@ SLES-01647:
     publisher: "Gremlin Interactive, Acclaim Entertainment Inc"
     developer: "Mirage"
     releaseDate: "1999-11-30"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -2956,7 +3006,7 @@ SLES-00014:
     publisher: "Gremlin Interactive"
     developer: "Gremlin Interactive"
     releaseDate: "1996-03-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -2975,7 +3025,7 @@ SLPS-00297:
     publisher: "Naxat Soft"
     developer: "Gremlin Interactive"
     releaseDate: "1996-07-19"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -2993,7 +3043,7 @@ SLES-00190:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1997-05-01"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -3012,7 +3062,7 @@ SLES-00021:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1997-11-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -3032,7 +3082,7 @@ SLES-01029:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1997-11-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - German
@@ -3052,7 +3102,7 @@ SLES-01028:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1997-11-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -3071,7 +3121,7 @@ SLES-01210:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1998-12-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -3090,7 +3140,7 @@ SLES-01644:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1998-12-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -3109,7 +3159,7 @@ SLES-01645:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1998-12-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -3128,7 +3178,7 @@ SLES-01646:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1998-12-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -3147,7 +3197,7 @@ SLES-00265:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1998-09-25"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -3166,7 +3216,7 @@ SLES-01396:
     publisher: "Gremlin Graphics"
     developer: "Gremlin Graphics"
     releaseDate: "1998-09-25"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - German
     minPlayers: 1
@@ -3200,6 +3250,8 @@ SCPS-10126:
     linkCable: false
 PAPX-90105:
   name: "Addie no Okurimono - To Moze from Addie (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-04108:
   name: "Adiboo & Paziral's Secret (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -3256,7 +3308,7 @@ SLES-00189:
     publisher: "Psygnosis"
     developer: "Psygnosis"
     releaseDate: "1996-06-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -3278,7 +3330,7 @@ SCUS-94502:
     publisher: "Psygnosis"
     developer: "Psygnosis"
     releaseDate: "1996-08-31"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -3296,7 +3348,7 @@ SLES-00857:
     publisher: "Psygnosis"
     developer: "Shen Technologies SARL"
     releaseDate: "1997-12-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -3322,7 +3374,7 @@ SLES-01239:
     publisher: "Psygnosis"
     developer: "Shen"
     releaseDate: "1998-06-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -3339,10 +3391,14 @@ SLES-01239:
     linkCable: false
 SLED-01310:
   name: "Adidas Power Soccer 98 (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   settings:
     dmaMaxSliceTicks: 100
 SLED-01311:
   name: "Adidas Power Soccer 98 (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   settings:
     dmaMaxSliceTicks: 100
 SLUS-00547:
@@ -3359,7 +3415,7 @@ SLUS-00547:
     publisher: "Psygnosis"
     developer: "Shen"
     releaseDate: "1998-06-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -3377,7 +3433,7 @@ SLES-00270:
     publisher: "Psygnosis"
     developer: "Shen Technologies SARL"
     releaseDate: "1997-04-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -3474,6 +3530,8 @@ SLUS-00378:
     linkCable: false
 SLUS-00212:
   name: "Advanced Dungeons & Dragons - Iron & Blood - Warriors of Ravenloft (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00208:
   name: "Advanced V.G. (Japan)"
   compatibility:
@@ -3498,6 +3556,8 @@ SLPS-00208:
     linkCable: false
 SLPM-80017:
   name: "Advanced V.G. (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01318:
   name: "Advanced V.G. 2 (Japan)"
   compatibility:
@@ -3969,6 +4029,8 @@ SIPS-60005:
     linkCable: false
 PCPX-96041:
   name: "AirAssault - The Red Mercury Missions (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00559:
   name: "AirGrave (Japan)"
   compatibility:
@@ -4057,7 +4119,7 @@ SLPS-01096:
     publisher: "Coconuts Japan"
     developer: "Coconuts Japan"
     releaseDate: "1998-02-11"
-    genre: "Visual novel"
+    genre: "Visual Novel"
     languages:
       - Japanese
     minPlayers: 1
@@ -4075,7 +4137,7 @@ SLPS-02824:
     publisher: "Coconuts Japan"
     developer: "Coconuts Japan"
     releaseDate: "2000-06-29"
-    genre: "Visual novel"
+    genre: "Visual Novel"
     languages:
       - Japanese
     minPlayers: 1
@@ -4392,6 +4454,8 @@ SLUS-00715:
     linkCable: false
 SLUS-80715:
   name: "Akuji the Heartless (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86023:
   name: "Akumajou Dracula X - Gekka no Yasoukyoku (Japan)"
   compatibility:
@@ -4462,7 +4526,7 @@ SLES-03150:
     publisher: "3DO"
     developer: "Anco"
     releaseDate: "2000-11-24"
-    genre: "Soccer / Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -4480,7 +4544,7 @@ SLES-03775:
     publisher: "UBI Soft Entertainment"
     developer: "Anco"
     releaseDate: "2002-05-17"
-    genre: "Soccer Management"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -4523,7 +4587,7 @@ SLUS-00872:
     publisher: "Take 2 Interactive"
     developer: "Z-Axis, Ltd"
     releaseDate: "1999-04-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -4653,6 +4717,8 @@ SLES-00101:
     linkCable: false
 SLES-00288:
   name: "Alien Trilogy (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00246:
   name: "Alien Trilogy (Germany)"
   controllers:
@@ -4864,7 +4930,7 @@ SLES-03958:
     publisher: "Midas Interactive"
     developer: "Nekogumi (Jorudan)"
     releaseDate: "2003-05-02"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -4968,7 +5034,7 @@ SLES-00747:
     publisher: "Eidos Interactive"
     developer: "Eidos Interactive"
     releaseDate: "1997-08-01"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -4983,6 +5049,8 @@ SLES-00747:
     linkCable: false
 SLED-01560:
   name: "All Star Tennis '99 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01433:
   name: "All Star Tennis '99 (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -4992,7 +5060,7 @@ SLES-01433:
     publisher: "UBI Soft Entertainment"
     developer: "Smart Dog"
     releaseDate: "1998-11-20"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
       - French
@@ -5015,7 +5083,7 @@ SLPS-01962:
     publisher: "UBI Soft Entertainment"
     developer: "Smart Dog"
     releaseDate: "1999-02-12"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -5034,7 +5102,7 @@ SLES-03963:
     publisher: "Midas Interactive"
     developer: "Nekogumi (Jorudan)"
     releaseDate: "2003-05-25"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -5052,7 +5120,7 @@ SLES-02764:
     publisher: "Ubi Soft Entertainment"
     developer: "Aqua Pacific"
     releaseDate: "2000-08-17"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
       - German
@@ -5073,7 +5141,7 @@ SLES-02765:
     publisher: "Ubi Soft Entertainment"
     developer: "Aqua Pacific"
     releaseDate: "2000-08-17"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - French
     minPlayers: 1
@@ -5092,7 +5160,7 @@ SLES-04060:
     publisher: "Phoenix Games"
     developer: "Phoenix Games"
     releaseDate: "2003-03-14"
-    genre: "Sports / Water Sports"
+    genre: "Sports - Water Sports"
     languages:
       - English
     minPlayers: 1
@@ -5110,7 +5178,7 @@ SLUS-00392:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Iguana Entertainment"
     releaseDate: "1997-07-10"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -5150,7 +5218,7 @@ SLUS-01431:
     publisher: "A1 Games"
     developer: "Access"
     releaseDate: "2002-02-12"
-    genre: "Sports / Dodgeball"
+    genre: "Sports - Dodgeball"
     languages:
       - English
     minPlayers: 1
@@ -5169,7 +5237,7 @@ SLES-02984:
     publisher: "TDK / Universal / Sound Source Interactive"
     developer: "Realtime Associates Inc"
     releaseDate: "2000-10-13"
-    genre: "Action / Platformer."
+    genre: "Action / Platformer"
     languages:
       - Italian
     minPlayers: 1
@@ -5256,6 +5324,8 @@ SLPS-00173:
     linkCable: false
 SLPM-80069:
   name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01187:
   name: "Alnam no Tsubasa - Shoujin no Sora no Kanata e (Japan) (Disc 1)"
   discSet:
@@ -5727,6 +5797,8 @@ SLES-01135:
     linkCable: false
 SLED-01308:
   name: "Alundra (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLES-01198:
@@ -5975,6 +6047,8 @@ SCPS-10115:
     linkCable: false
 PAPX-90097:
   name: "Alundra 2 - Mashinka no Nazo (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLES-02601:
@@ -6094,7 +6168,7 @@ SLES-04037:
     publisher: "Midas Interactive Entertainment"
     developer: "Digicube"
     releaseDate: "2003-08-08"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -6116,7 +6190,7 @@ SLUS-01488:
     publisher: "Mud Duck Productions"
     developer: "Digicube"
     releaseDate: "2003-06-05"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -6502,6 +6576,8 @@ SLPS-01109:
     linkCable: false
 SLPM-80141:
   name: "Ancient Roman Extra (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00438:
   name: "Andretti Racing (Europe)"
   controllers:
@@ -6620,6 +6696,8 @@ SLPS-00894:
     linkCable: false
 SLPM-80094:
   name: "Angel Blade - Neo Tokyo Guardians (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86960:
   name: "Angel Blade - Neo Tokyo Guardians (Japan) (Major Wave)"
   controllers:
@@ -6974,7 +7052,7 @@ SLUS-00784:
     publisher: "ASC Games"
     developer: "Saffire Corporation"
     releaseDate: "1998-01-10"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -6992,7 +7070,7 @@ SLES-01717:
     publisher: "ASC Games"
     developer: "Saffire Corporation"
     releaseDate: "1998-01-10"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -7127,7 +7205,7 @@ SCES-01833:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "1999-06-15"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -7214,6 +7292,8 @@ SLPS-01655:
     linkCable: false
 SLPM-80321:
   name: "Another Mind (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02563:
   name: "Anstoss - Premier Manager (Germany)"
   controllers:
@@ -7224,7 +7304,7 @@ SLES-02563:
     publisher: "Infogrames"
     developer: "Infogrames Sheffield House"
     releaseDate: "2000-09-14"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - German
     minPlayers: 1
@@ -7376,6 +7456,8 @@ SCES-01564:
     linkCable: false
 SCED-02133:
   name: "Ape Escape (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-02028:
   name: "Ape Escape (France)"
   controllers:
@@ -7456,8 +7538,12 @@ SCUS-94423:
     linkCable: false
 SCUS-94470:
   name: "Ape Escape (USA) (Demo 1) (EDC)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94489:
   name: "Ape Escape (USA) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1391-g5f9481dd"
@@ -7501,6 +7587,8 @@ SLES-00460:
     linkCable: false
 SLED-01610:
   name: "Apocalypse (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00834:
   name: "Apocalypse (France)"
   controllers:
@@ -7737,6 +7825,8 @@ SLPS-02141:
     linkCable: false
 SLPM-80449:
   name: "Aquanaut no Kyuujitsu 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02919:
   name: "Aquanaut no Kyuujitsu 2 [Artdink Best Choice]"
   controllers:
@@ -8056,8 +8146,12 @@ SCPS-91071:
     linkCable: false
 PAPX-90099:
   name: "Arc the Lad III (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96176:
   name: "Arc the Lad III (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10106:
   name: "Arc the Lad III (Japan) (Disc 1)"
   discSet:
@@ -8658,7 +8752,7 @@ SLES-04096:
     publisher: "Ignition Entertainment"
     developer: "Ignition Entertainment"
     releaseDate: "2003-01-01"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -8944,10 +9038,16 @@ SLPS-00900:
     linkCable: true
 SLPM-80111:
   name: "Armored Core (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80118:
   name: "Armored Core (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80119:
   name: "Armored Core (Japan) (Demo 3)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03581:
   name: "Armored Core (Japan) (Rev 1)"
   controllers:
@@ -9018,6 +9118,8 @@ SLUS-01323:
     linkCable: true
 SLPM-80371:
   name: "Armored Core - Master of Arena (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01855:
   name: "Armored Core - Master of Arena (Japan) (Disc 1)"
   discSet:
@@ -9260,7 +9362,7 @@ SLES-02617:
     publisher: "Acclaim Entertaiment"
     developer: "Acclaim Studios London"
     releaseDate: "2000-05-04"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - English
       - French
@@ -9282,7 +9384,7 @@ SLES-02726:
     publisher: "Acclaim Entertaiment"
     developer: "Acclaim Studios London"
     releaseDate: "2000-05-04"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - German
     minPlayers: 1
@@ -9301,7 +9403,7 @@ SLPM-86502:
     publisher: "Acclaim Entertaiment"
     developer: "Acclaim Studios London"
     releaseDate: "2000-07-13"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - Japanese
     minPlayers: 1
@@ -9323,7 +9425,7 @@ SLUS-01022:
     publisher: "Acclaim Entertaiment"
     developer: "Acclaim Studios London"
     releaseDate: "2000-05-04"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - English
     minPlayers: 1
@@ -10005,6 +10107,8 @@ SLPM-87186:
     linkCable: false
 SLPM-80144:
   name: "Artdink Preview (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00363:
   name: "Arthur to Astaroth no Nazo Makaimura - Incredible Toons (Japan)"
   controllers:
@@ -10228,6 +10332,8 @@ SLPM-86872:
     linkCable: false
 SLPM-80452:
   name: "Assault Suits Valken 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02475:
   name: "Asterix & Obelix Take On Caesar (Europe)"
   controllers:
@@ -10383,6 +10489,8 @@ SLES-03324:
     linkCable: false
 SLED-03446:
   name: "Asterix - Mega Madness (Europe) (En,Fr,De,Es,It,Nl) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01418:
   name: "Asteroids (Europe)"
   controllers:
@@ -10502,6 +10610,8 @@ SLPS-01862:
     linkCable: false
 SLPM-80278:
   name: "Astronoka (Japan) (Demo Movie)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86107:
   name: "Astronoka (Japan) (Demo)"
   controllers:
@@ -10511,7 +10621,7 @@ SLPM-86107:
     publisher: "Enix"
     developer: "tri-Ace"
     releaseDate: "1998-07-20"
-    genre: "RPG"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -10684,6 +10794,8 @@ SLUS-01427:
     linkCable: false
 SLED-02251:
   name: "Atari Demo Disk (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01751:
   name: "Atelier Elie - Elie no Atelier - Salburg no Renkinjutsushi 2 (Japan)"
   controllers:
@@ -10724,6 +10836,8 @@ SLPS-91180:
     linkCable: false
 SLPM-80413:
   name: "Athena - Awakening from the Ordinary Life (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen # Pre-rendered backgrounds.
 SLPM-86185:
@@ -11079,6 +11193,23 @@ SLES-01291:
       - SLES-01291
       - SLES-11291
       - SLES-21291
+  controllers:
+    - DigitalController
+    - PlayStationMouse
+  metadata:
+    publisher: "Cryo Interactive Entertainment"
+    developer: "Cryo Interactive Entertainment"
+    releaseDate: "1998-10-01"
+    genre: "Adventure"
+    languages:
+      - English
+    minPlayers: 1
+    maxPlayers: 1
+    minBlocks: 1
+    maxBlocks: 1
+    vibration: false
+    multitap: false
+    linkCable: false
 SLES-11291:
   name: "Atlantis - The Lost Tales (Europe) (Disc 2)"
   discSet:
@@ -11087,6 +11218,23 @@ SLES-11291:
       - SLES-01291
       - SLES-11291
       - SLES-21291
+  controllers:
+    - DigitalController
+    - PlayStationMouse
+  metadata:
+    publisher: "Cryo Interactive Entertainment"
+    developer: "Cryo Interactive Entertainment"
+    releaseDate: "1998-10-01"
+    genre: "Adventure"
+    languages:
+      - English
+    minPlayers: 1
+    maxPlayers: 1
+    minBlocks: 1
+    maxBlocks: 1
+    vibration: false
+    multitap: false
+    linkCable: false
 SLES-21291:
   name: "Atlantis - The Lost Tales (Europe) (Disc 3)"
   discSet:
@@ -11095,6 +11243,23 @@ SLES-21291:
       - SLES-01291
       - SLES-11291
       - SLES-21291
+  controllers:
+    - DigitalController
+    - PlayStationMouse
+  metadata:
+    publisher: "Cryo Interactive Entertainment"
+    developer: "Cryo Interactive Entertainment"
+    releaseDate: "1998-10-01"
+    genre: "Adventure"
+    languages:
+      - English
+    minPlayers: 1
+    maxPlayers: 1
+    minBlocks: 1
+    maxBlocks: 1
+    vibration: false
+    multitap: false
+    linkCable: false
 SLES-01605:
   name: "Atlantis - The Lost Tales (Europe) (En,Es,Nl,Sv) (Disc 1)"
   discSet:
@@ -11181,6 +11346,8 @@ SLES-21605:
     linkCable: false
 SLPM-80224:
   name: "Atlus Shinsaku Title Demo CD-ROM (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01718:
   name: "Attack of the Saucerman (Europe) (En,Fr,De,Es,It)"
   compatibility:
@@ -11227,6 +11394,8 @@ SLPS-00546:
     linkCable: false
 SLPM-80053:
   name: "Aubirdforce (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00533:
   name: "Aubirdforce (Japan) (Shokai Genteiban)"
   controllers:
@@ -11344,6 +11513,8 @@ SLUS-01456:
     linkCable: false
 SCED-01570:
   name: "Australian Summer Special (Australia)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00909:
   name: "Auto Destruct (Europe) (En,Fr,De,Es,Sv)"
   controllers:
@@ -11413,6 +11584,8 @@ SCED-01306:
   name: "Autorennen Spezial '98 (Germany)"
 SCED-00273:
   name: "Autumn-Christmas Releases '96 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00946:
   name: "Ayakashi Ninden Kunoichiban (Japan) (Disc 1)"
   discSet:
@@ -11742,6 +11915,8 @@ SLUS-00614:
     linkCable: false
 SLPM-80138:
   name: "B Senjou no Alice - Alice on Borderlines (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01003:
   name: "B Senjou no Alice - Alice on Borderlines (Japan) (Disc 1)"
   discSet:
@@ -11887,7 +12062,7 @@ SLES-02977:
     publisher: "Codemasters"
     developer: "Codemasters"
     releaseDate: "2001-01-26"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - German
     minPlayers: 1
@@ -11937,6 +12112,8 @@ SLPS-00566:
     linkCable: false
 SLED-01054:
   name: "BMG Demos (France)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03991:
   name: "Baby Felix Tennis (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
@@ -11946,7 +12123,7 @@ SLES-03991:
     publisher: "LSP"
     developer: "LSP"
     releaseDate: "2002-12-07"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Dutch
       - English
@@ -11969,7 +12146,7 @@ SCES-00982:
     publisher: "Sony"
     developer: "3D Kaleidoscope"
     releaseDate: "1997-06-20"
-    genre: "Music / Simulation."
+    genre: "Music / Simulation"
     languages:
       - English
     minPlayers: 1
@@ -12158,7 +12335,7 @@ SLUS-00659:
     publisher: "ASCII Entertainment"
     developer: "Argent"
     releaseDate: "1998-10-01"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -12180,7 +12357,7 @@ SLUS-01094:
     publisher: "Infogrames / Humongous Entertainment"
     developer: "Runecraft, Ltd"
     releaseDate: "2001-09-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -12277,7 +12454,7 @@ SLPS-03437:
     publisher: "Tecmo"
     developer: "Tecmo"
     releaseDate: "2002-07-25"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -12296,7 +12473,7 @@ SLPS-02429:
     publisher: "Fujimic Inc"
     developer: "Fujimic Inc"
     releaseDate: "2000-09-14"
-    genre: "Sports / Kajak Racing"
+    genre: "Sports - Kajak Racing"
     languages:
       - Japanese
     minPlayers: 1
@@ -12405,6 +12582,8 @@ SLPS-02465:
     linkCable: false
 SLPM-80506:
   name: "Bakusou Dekotora Densetsu 2 - Otoko Jinsei Yume Ichiro (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02093:
   name: "Bakusou Kyoudai Let's & Go!! - Eternal Wings [Rerelease]"
   controllers:
@@ -13113,7 +13292,7 @@ SCES-02488:
     publisher: "Mattel"
     developer: "Runecraft"
     releaseDate: "2000-01-06"
-    genre: "Sports / Skating / Snowboarding"
+    genre: "Sports - Skating / Snowboarding"
     languages:
       - French
     minPlayers: 1
@@ -13133,7 +13312,7 @@ SCES-02489:
     publisher: "Mattel"
     developer: "Runecraft"
     releaseDate: "2000-01-06"
-    genre: "Sports / Skating / Snowboarding"
+    genre: "Sports - Skating / Snowboarding"
     languages:
       - German
     minPlayers: 1
@@ -13153,7 +13332,7 @@ SCES-02487:
     publisher: "Mattel"
     developer: "Runecraft"
     releaseDate: "2000-01-06"
-    genre: "Sports / Skating / Snowboarding"
+    genre: "Sports - Skating / Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -13173,7 +13352,7 @@ SCES-02490:
     publisher: "Mattel"
     developer: "Runecraft"
     releaseDate: "2000-01-06"
-    genre: "Sports / Skating / Snowboarding"
+    genre: "Sports - Skating / Snowboarding"
     languages:
       - Italian
     minPlayers: 1
@@ -13193,7 +13372,7 @@ SCES-02491:
     publisher: "Mattel"
     developer: "Runecraft"
     releaseDate: "2000-01-06"
-    genre: "Sports / Skating / Snowboarding"
+    genre: "Sports - Skating / Snowboarding"
     languages:
       - Spanish
     minPlayers: 1
@@ -13215,7 +13394,7 @@ SLUS-00946:
     publisher: "Mattel"
     developer: "Runecraft"
     releaseDate: "2000-01-06"
-    genre: "Sports / Skating / Snowboarding"
+    genre: "Sports - Skating / Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -13234,7 +13413,7 @@ SLES-02615:
     publisher: "Ubi Soft"
     developer: "Anco"
     releaseDate: "2000-09-14"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - Catalan
       - Spanish
@@ -13352,7 +13531,7 @@ SLPS-03055:
     publisher: "Media Group"
     developer: "Now Productions"
     releaseDate: "2002-12-07"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -13410,7 +13589,7 @@ SLUS-00086:
     publisher: "Jaleco Entertainment"
     developer: "Jaleco"
     releaseDate: "1995-12-22"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -13429,7 +13608,7 @@ SLPS-01304:
     publisher: "Sammy Entertaiment"
     developer: "Sammy Entertaiment"
     releaseDate: "1998-06-11"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -13451,7 +13630,7 @@ SLPS-01765:
     publisher: "ASCII Entertaiment"
     developer: "Tose Software"
     releaseDate: "2001-10-04"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -13472,7 +13651,7 @@ SLUS-00873:
     publisher: "Agetec, Inc"
     developer: "Tose Software"
     releaseDate: "1999-09-29"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -13491,7 +13670,7 @@ SLPS-01764:
     publisher: "ASCII Entertaiment"
     developer: "Tose Software"
     releaseDate: "1999-01-14"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -13510,7 +13689,7 @@ SLPS-02647:
     publisher: "ASCII Entertainment"
     developer: "Tose Software"
     releaseDate: "2000-02-23"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -13529,7 +13708,7 @@ SLPS-91223:
     publisher: "ASCII Entertainment"
     developer: "Tose Software"
     releaseDate: "2001-04-05"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -13548,7 +13727,7 @@ SLPS-02646:
     publisher: "ASCII Entertainment"
     developer: "Tose Software"
     releaseDate: "2000-02-23"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -13570,7 +13749,7 @@ SLUS-00905:
     publisher: "Bandai"
     developer: "BEC"
     releaseDate: "1999-10-26"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -13589,7 +13768,7 @@ SLPS-01914:
     publisher: "Banpresto"
     developer: "Team Daiwa"
     releaseDate: "1999-04-22"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -13608,7 +13787,7 @@ SLPS-02859:
     publisher: "Easily Staffi"
     developer: "Hearty Robin"
     releaseDate: "2000-08-10"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -13638,6 +13817,8 @@ SLPS-00542:
     linkCable: false
 SLPM-80051:
   name: "Bastard!! Utsuronaru Kamigami no Utsuwa (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00102:
   name: "Batman & Robin (Europe) (En,Fr,De,Es)"
   controllers:
@@ -13761,7 +13942,7 @@ SLUS-01207:
     publisher: "UBI Soft Entertainment"
     developer: "Kemco"
     releaseDate: "2000-11-20"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -13779,7 +13960,7 @@ SLES-00525:
     publisher: "Acclaim Entertainment"
     developer: "Iguana Entertainment, Inc"
     releaseDate: "1996-12-10"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -13797,7 +13978,7 @@ SLPS-00698:
     publisher: "Acclaim Entertainment"
     developer: "Iguana Entertainment, Inc"
     releaseDate: "1997-02-14"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -13818,7 +13999,7 @@ SLUS-00387:
     publisher: "Acclaim Entertainment"
     developer: "Iguana Entertainment, Inc"
     releaseDate: "1996-12-03"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -13837,7 +14018,7 @@ SLES-02902:
     publisher: "UBI Soft Entertainment"
     developer: "Kemco"
     releaseDate: "2000-12-15"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
       - French
@@ -14435,7 +14616,7 @@ SLES-02808:
     publisher: "Infogrames"
     developer: "Carapace"
     releaseDate: "2000-10-27"
-    genre: "Sports / Beach Volleyball"
+    genre: "Sports - Beach Volleyball"
     languages:
       - English
       - French
@@ -14491,6 +14672,8 @@ SLES-00709:
     linkCable: false
 SLED-01339:
   name: "Beast Wars - Transformers (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00508:
   name: "Beast Wars - Transformers (USA)"
   controllers:
@@ -14665,8 +14848,12 @@ SCPS-18013:
     linkCable: false
 SCED-01991:
   name: "Beat-Em-Up Special (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01643:
   name: "Beat-Em-Up Speziale (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02096:
   name: "Beatmania (Europe)"
   controllers:
@@ -14976,21 +15163,33 @@ SLPS-91462:
     linkCable: false
 SCUS-94286:
   name: "Best Buy Demo CD (USA)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1336-gd711baa"
 SCUS-94668:
   name: "Best Buy Greatest Hits Demo Disc - Volume One (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02420:
   name: "Best Horror Games Ever Demo (Europe, Australia)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02327:
   name: "Best PlayStation Games Ever, The - No. 1 of 4 (Europe, Australia)"
 SCED-02421:
   name: "Best Sports Games Ever (Europe, Australia)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03167:
   name: "Best Sports Games Ever 2000 (Europe, Australia)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94261:
   name: "Best of PlayStation Underground Year One, The (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLES-04093:
   name: "Beyblade (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -15082,7 +15281,7 @@ SLES-01531:
     publisher: "Accolade"
     developer: "Pitbull Syndicate"
     releaseDate: "1999-03-01"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Danish
       - English
@@ -15107,7 +15306,7 @@ SLUS-00645:
     publisher: "Accolade"
     developer: "Pitbull Syndicate"
     releaseDate: "1999-03-01"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -15126,7 +15325,7 @@ SLES-03847:
     publisher: "Take-Two Interactive"
     developer: "Coresoft, Inc"
     releaseDate: "2002-05-26"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
       - French
@@ -15149,7 +15348,7 @@ SLUS-01442:
     publisher: "Take-Two Interactive"
     developer: "Coresoft, Inc"
     releaseDate: "2002-05-06"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -15167,7 +15366,7 @@ SLUS-00228:
     publisher: "Hot-B"
     developer: "Starfish"
     releaseDate: "1997-03-15"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -15185,7 +15384,7 @@ SLPS-00459:
     publisher: "VAP (NTV)"
     developer: "VAP (NTV)"
     releaseDate: "1997-03-14"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -15204,7 +15403,7 @@ SLUS-01527:
     publisher: "A1 Games"
     developer: "Now Productions"
     releaseDate: "2003-07-08"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -15227,7 +15426,7 @@ SLUS-01259:
     publisher: "Konami"
     developer: "KCE Nagoya"
     releaseDate: "2000-11-10"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -15246,7 +15445,7 @@ SLES-04025:
     publisher: "Gotham Games"
     developer: "Coresoft, Inc"
     releaseDate: "2003-04-17"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
       - German
@@ -15267,7 +15466,7 @@ SLUS-01478:
     publisher: "Gotham Games"
     developer: "Coresoft, Inc"
     releaseDate: "2003-03-20"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -15286,7 +15485,7 @@ SLUS-01289:
     publisher: "Agetec"
     developer: "A1 Games / Success"
     releaseDate: "2001-07-09"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -15355,6 +15554,8 @@ SLPS-00222:
     linkCable: false
 SLPM-80027:
   name: "Bio Hazard (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01513:
   name: "Bio Hazard - Complete Disc (Japan)"
   controllers:
@@ -15564,6 +15765,8 @@ SLPS-02300:
     linkCable: false
 SLPM-80485:
   name: "Biohazard 3 - Last Escape (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
     - ForcePGXPCPUMode # Fixes jitter in character models.
@@ -15937,7 +16140,7 @@ SLUS-00648:
     publisher: "HOT-B USA Inc"
     developer: "HOT-B"
     releaseDate: "1999-11-18"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -16311,7 +16514,7 @@ SCPS-45067:
     publisher: "Virgin Interactive"
     developer: "Core Design"
     releaseDate: "1997-05-23"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - Japanese
     minPlayers: 1
@@ -16329,7 +16532,7 @@ SLES-00349:
     publisher: "Eidos Interactive, Inc"
     developer: "Core Design"
     releaseDate: "1996-10-15"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - English
     minPlayers: 1
@@ -16347,7 +16550,7 @@ SLES-00350:
     publisher: "Eidos Interactive, Inc"
     developer: "Core Design"
     releaseDate: "1996-10-15"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - French
     minPlayers: 1
@@ -16365,7 +16568,7 @@ SLES-00351:
     publisher: "Eidos Interactive, Inc"
     developer: "Core Design"
     releaseDate: "1996-10-15"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - German
     minPlayers: 1
@@ -16383,7 +16586,7 @@ SLPS-00798:
     publisher: "Virgin Interactive"
     developer: "Core Design"
     releaseDate: "1997-05-23"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - Japanese
     minPlayers: 1
@@ -16476,6 +16679,8 @@ SLES-01169:
     linkCable: true
 SLED-01272:
   name: "Blast Radius (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01192:
   name: "Blast Radius (France)"
   controllers:
@@ -16915,8 +17120,12 @@ SLPS-03219:
     linkCable: false
 SLPM-80619:
   name: "Block Wars (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00877:
   name: "Blockbuster Playstation Challenge (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLES-04003:
   name: "Blockids (Europe)"
   controllers:
@@ -17166,6 +17375,8 @@ SLES-01010:
     linkCable: false
 SLED-00108:
   name: "Bloody Roar - Hyper Beast Duel (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91157:
   name: "Bloody Roar - Hyper Beast Duel (Japan) (En,Ja)"
   controllers:
@@ -17213,10 +17424,14 @@ SLES-01722:
     linkCable: false
 SLED-01928:
   name: "Bloody Roar 2 - Bringer of the New Age (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
 SLPM-80373:
   name: "Bloody Roar 2 - Bringer of the New Age (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45374:
   name: "Bloody Roar 2 - Bringer of the New Age (Japan, Asia)"
   compatibility:
@@ -17406,7 +17621,7 @@ SLPM-86718:
     publisher: "Starfish Software"
     developer: "HOT-B"
     releaseDate: "2000-05-02"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -17562,7 +17777,7 @@ SLPS-00865:
     publisher: "Human Entertainment"
     developer: "Grey Matter"
     releaseDate: "1997-07-03"
-    genre: "Action / Adventure / Beat'em up"
+    genre: "Action / Adventure / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -18174,7 +18389,7 @@ SLUS-00296:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1997-07-10"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -18192,7 +18407,7 @@ SLUS-00678:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-08-31"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -18210,7 +18425,7 @@ SLUS-00049:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1997-01-15"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -18228,7 +18443,7 @@ SLPM-86004:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-10-25"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -18349,6 +18564,8 @@ SLPS-00757:
     linkCable: false
 SLPM-80101:
   name: "Bounty Sword First (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86614:
   name: "Bounty Sword First (Japan) (Major Wave)"
   controllers:
@@ -18379,7 +18596,7 @@ SLUS-01288:
     publisher: "A1 Games"
     developer: "Tamsoft Corporation"
     releaseDate: "2000-12-29"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -18398,7 +18615,7 @@ SLES-02324:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "1999-11-19"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - German
     minPlayers: 1
@@ -18417,7 +18634,7 @@ SLES-03123:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-11-30"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - German
     minPlayers: 1
@@ -18436,7 +18653,7 @@ SLES-01451:
     publisher: "Electronic Arts"
     developer: "Press Start, Inc"
     releaseDate: "1998-11-20"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - German
     minPlayers: 1
@@ -18494,7 +18711,7 @@ SLUS-01309:
     publisher: "A1 Games"
     developer: "Nekogumi (Jorudan)"
     releaseDate: "2001-05-14"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -18594,7 +18811,7 @@ SLPS-00514:
     publisher: "Coconuts Japan Entertainment"
     developer: "Ready Soft"
     releaseDate: "1996-10-18"
-    genre: "Interactive movie"
+    genre: "Interactive Movie"
     languages:
       - English
     minPlayers: 1
@@ -18617,7 +18834,7 @@ SLPS-00515:
     publisher: "Coconuts Japan Entertainment"
     developer: "Ready Soft"
     releaseDate: "1996-10-18"
-    genre: "Interactive movie"
+    genre: "Interactive Movie"
     languages:
       - English
     minPlayers: 1
@@ -18640,7 +18857,7 @@ SLUS-00083:
     publisher: "Ready Soft"
     developer: "Ready Soft"
     releaseDate: "1996-06-03"
-    genre: "Interactive movie"
+    genre: "Interactive Movie"
     languages:
       - English
     minPlayers: 1
@@ -18663,7 +18880,7 @@ SLUS-00171:
     publisher: "Ready Soft"
     developer: "Ready Soft"
     releaseDate: "1996-06-03"
-    genre: "Interactive movie"
+    genre: "Interactive Movie"
     languages:
       - English
     minPlayers: 1
@@ -18779,6 +18996,8 @@ SLPS-01490:
     linkCable: false
 SLPM-80262:
   name: "Brave Fencer Musashiden (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01316:
   name: "Brave Prove (Japan)"
   controllers:
@@ -18909,7 +19128,7 @@ SLES-00258:
     publisher: "Ocean"
     developer: "Smart Dog"
     releaseDate: "1996-01-18"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
       - French
@@ -18928,7 +19147,7 @@ SLPM-86044:
     publisher: "Konami / Ocean"
     developer: "Smart Dog"
     releaseDate: "1997-09-18"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -19110,6 +19329,8 @@ SLPS-00990:
     linkCable: false
 SLPM-80115:
   name: "Breath of Fire III (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Fixes jittery sprites.
     - DisableWidescreen # Breaks sprite placement.
@@ -19294,7 +19515,7 @@ SLES-00759:
     publisher: "Codemasters"
     developer: "Codemasters"
     releaseDate: "1998-12-08"
-    genre: "Sports / Cricket"
+    genre: "Sports - Cricket"
     languages:
       - English
     minPlayers: 1
@@ -19647,7 +19868,7 @@ SLES-01376:
     publisher: "THQ"
     developer: "Chris Braun"
     releaseDate: "1998-11-15"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -19665,7 +19886,7 @@ SLUS-00571:
     publisher: "THQ"
     developer: "Chris Braun"
     releaseDate: "1998-09-30"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -19684,7 +19905,7 @@ SLES-02618:
     publisher: "THQ"
     developer: "Adrenalin Entertainment"
     releaseDate: "2000-02-10"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -19703,7 +19924,7 @@ SLUS-00856:
     publisher: "THQ"
     developer: "Adrenalin Entertainment"
     releaseDate: "2000-02-10"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -20003,6 +20224,8 @@ SLES-01726:
     linkCable: false
 SLED-02125:
   name: "Bugs Bunny - Lost in Time (Europe) (En,Fr,De,Es,It,Nl) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00838:
   name: "Bugs Bunny - Lost in Time (USA) (En,Fr,Es)"
   compatibility:
@@ -20029,6 +20252,8 @@ SLUS-00838:
     linkCable: false
 SLUS-90058:
   name: "Bugs Bunny - Lost in Time (USA) (En,Fr,Es) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01086:
   name: "Builder's Block (USA)"
   controllers:
@@ -20075,7 +20300,7 @@ SLES-02564:
     publisher: "Electronic Arts"
     developer: "Krisalis Software Ltd"
     releaseDate: "1999-10-29"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - German
     minPlayers: 1
@@ -20094,7 +20319,7 @@ SLES-02143:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "1999-08-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -20113,7 +20338,7 @@ SLES-03065:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-09-08"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -20249,6 +20474,8 @@ SLUS-00324:
     linkCable: true
 SLUS-90002:
   name: "Burning Road (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03338:
   name: "BursTrick - Wake Boarding!! (Europe) (En,Fr,De)"
   controllers:
@@ -20473,6 +20700,8 @@ SCUS-94263:
     linkCable: false
 SCUS-94376:
   name: "Bust A Groove (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01159:
   name: "Bust A Groove 2 (USA)"
   compatibility:
@@ -20515,6 +20744,8 @@ SLPS-01237:
     linkCable: false
 PAPX-90028:
   name: "Bust A Move (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01232:
   name: "Bust A Move (Japan) (Disc 1) (Genteiban)"
   discSet:
@@ -20582,6 +20813,8 @@ SLPM-86219:
     linkCable: false
 SLPM-80410:
   name: "Bust A Move 2 - Dance Tengoku Mix (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01313:
   name: "Bust-A-Groove (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -20922,6 +21155,8 @@ SCES-03364:
     linkCable: false
 SCED-03516:
   name: "C-12 - Final Resistance (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-03366:
   name: "C-12 - Final Resistance (Europe) (Es,It)"
   compatibility:
@@ -21258,6 +21493,8 @@ SCUS-94426:
     linkCable: false
 SCUS-94459:
   name: "CTR - Crash Team Racing (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisablePGXPPreserveProjFP
 SLUS-01391:
@@ -21438,11 +21675,12 @@ LSP-200110:
   codes:
     - LSP-200110
     - LSP-905031
+    - LSP20011001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1997-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -21459,11 +21697,12 @@ LSP-200220:
   codes:
     - LSP-200220
     - LSP-905048
+    - LSP20022001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1997-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -21480,11 +21719,12 @@ LSP-200330:
   codes:
     - LSP-200330
     - LSP-905055
+    - LSP20033001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1997-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -21503,7 +21743,7 @@ SLES-02614:
     publisher: "3DO"
     developer: "Anco"
     releaseDate: "2000-04-07"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - Italian
     minPlayers: 1
@@ -21533,11 +21773,20 @@ SLPS-01071:
     linkCable: false
 SLPM-80147:
   name: "Calcolo! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 LSP-020190:
   name: "Cali's Geo Tools (USA)"
   codes:
     - LSP-020190
     - LSP-903426
+    - LSP02019001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLES-03921:
   name: "California Surfing (Europe)"
   controllers:
@@ -21547,7 +21796,7 @@ SLES-03921:
     publisher: "Midas Interactive"
     developer: "Midas Interactive"
     releaseDate: "2003-07-02"
-    genre: "Sports / Surfing"
+    genre: "Sports - Surfing"
     languages:
       - English
     minPlayers: 1
@@ -21588,7 +21837,7 @@ SLES-02293:
     publisher: "Infogrames"
     developer: "Infogrames Sheffield House"
     releaseDate: "2000-04-14"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - French
       - Italian
@@ -22063,6 +22312,8 @@ SLPM-87053:
     linkCable: false
 SLPM-80632:
   name: "Capcom vs. SNK - Millennium Fight 2000 Pro (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01476:
   name: "Capcom vs. SNK Pro (USA)"
   compatibility:
@@ -22104,7 +22355,7 @@ SLPS-01567:
     publisher: "Capcom"
     developer: "Capcom"
     releaseDate: "1998-09-17"
-    genre: "Beat'em up"
+    genre: "Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -22198,7 +22449,7 @@ SLPS-00310:
     publisher: "Bandai"
     developer: "Bandai"
     releaseDate: "1996-05-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -22405,6 +22656,8 @@ SCUS-94156:
     linkCable: false
 SCUS-94265:
   name: "Cardinal Syn (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01960:
   name: "Carmageddon (Europe) (En,Fr,Es,It)"
   compatibility:
@@ -22588,7 +22841,7 @@ SLPS-00837:
     publisher: "Argent"
     developer: "Agenda"
     releaseDate: "1997-04-25"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -22607,7 +22860,7 @@ SLPS-01486:
     publisher: "Argent"
     developer: "Argent"
     releaseDate: "1998-07-30"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -22619,6 +22872,8 @@ SLPS-01486:
     linkCable: false
 SLPM-80267:
   name: "Carom Shot 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02935:
   name: "Carton-kun (Japan)"
   controllers:
@@ -22640,6 +22895,8 @@ SLPS-02935:
     linkCable: false
 SLPM-80572:
   name: "Carton-kun (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00045:
   name: "Casper (Europe) (En,Fr,De)"
   controllers:
@@ -22691,7 +22948,7 @@ SLES-03113:
     publisher: "TDK Mediactive"
     developer: "Sound Source Interactive / Realtime Associates"
     releaseDate: "2000-11-16"
-    genre: "Mini Games / Platform."
+    genre: "Mini Games / Platformer"
     languages:
       - English
       - French
@@ -22717,7 +22974,7 @@ SLUS-01245:
     publisher: "TDK Mediactive"
     developer: "Sound Source Interactive / Realtime Associates"
     releaseDate: "2000-11-16"
-    genre: "Mini Games / Platform"
+    genre: "Mini Games / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -23006,7 +23263,7 @@ SCPS-10013:
     publisher: "Sony"
     developer: "Insider Yagakusha"
     releaseDate: "1996-09-13"
-    genre: "Quiz / Educational."
+    genre: "Quiz / Educational"
     languages:
       - Japanese
     minPlayers: 1
@@ -23084,6 +23341,8 @@ SLUS-00807:
     linkCable: false
 SCED-01992:
   name: "Cha Cha Special 04-99 Demo (Belgium, Netherlands) (En,Fr,Nl)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02422:
   name: "Chakushin Melody Damon (Japan)"
   controllers:
@@ -23190,7 +23449,7 @@ SLPM-86617:
     publisher: "Taito Corporation"
     developer: "Taito Corporation"
     releaseDate: "2000-08-10"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -23209,7 +23468,7 @@ SLES-02775:
     publisher: "Electronic Arts"
     developer: "Pai Corporation, Ltd"
     releaseDate: "2000-03-31"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -23228,7 +23487,7 @@ SLPS-02674:
     publisher: "Electronic Arts Victor"
     developer: "Pai Corporation, Ltd"
     releaseDate: "2000-11-02"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -23247,7 +23506,7 @@ SLUS-01084:
     publisher: "EA Sports"
     developer: "Pai Corporation, Ltd"
     releaseDate: "2000-03-07"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -23285,7 +23544,7 @@ SLES-03252:
     publisher: "THQ"
     developer: "Funcom"
     releaseDate: "2001-02-01"
-    genre: "Sports / Motocross"
+    genre: "Sports - Motocross"
     languages:
       - English
     minPlayers: 1
@@ -23307,7 +23566,7 @@ SLUS-01230:
     publisher: "THQ"
     developer: "Funcom"
     releaseDate: "2001-02-01"
-    genre: "Sports / Motocross"
+    genre: "Sports - Motocross"
     languages:
       - English
     minPlayers: 1
@@ -23326,7 +23585,7 @@ SLES-02200:
     publisher: "THQ"
     developer: "Funcom Dublin Ltd"
     releaseDate: "1999-07-31"
-    genre: "Sports / Motocross"
+    genre: "Sports - Motocross"
     languages:
       - English
     minPlayers: 1
@@ -23338,6 +23597,8 @@ SLES-02200:
     linkCable: false
 SLED-02385:
   name: "Championship Motocross featuring Ricky Carmichael (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00790:
   name: "Championship Motocross featuring Ricky Carmichael (USA)"
   controllers:
@@ -23347,7 +23608,7 @@ SLUS-00790:
     publisher: "THQ"
     developer: "Funcom Dublin Ltd"
     releaseDate: "1999-09-13"
-    genre: "Sports / Motocross"
+    genre: "Sports - Motocross"
     languages:
       - English
     minPlayers: 1
@@ -23366,7 +23627,7 @@ SLES-03427:
     publisher: "Game Studios"
     developer: "Krome Studios"
     releaseDate: "2001-07-20"
-    genre: "Sports / Surf"
+    genre: "Sports - Surf"
     languages:
       - Dutch
       - English
@@ -23390,7 +23651,7 @@ SLUS-01216:
     publisher: "Mattel Interactive"
     developer: "Krome Studios"
     releaseDate: "2000-12-02"
-    genre: "Sports / Surf"
+    genre: "Sports - Surf"
     languages:
       - English
     minPlayers: 1
@@ -23720,8 +23981,12 @@ SCES-12815:
     linkCable: false
 PAPX-90107:
   name: "Chase the Express (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96189:
   name: "Chase the Express (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10109:
   name: "Chase the Express (Japan, Asia) (Disc 1)"
   discSet:
@@ -23838,7 +24103,7 @@ SLPS-01251:
     publisher: "Altron"
     developer: "Altron"
     releaseDate: "1998-06-18"
-    genre: "Chess"
+    genre: "Board - Chess"
     languages:
       - Japanese
     minPlayers: 1
@@ -23857,7 +24122,7 @@ SLES-02917:
     publisher: "Midas Interactive"
     developer: "Mere Mortals"
     releaseDate: "2001-04-12"
-    genre: "Chess"
+    genre: "Board - Chess"
     languages:
       - English
     minPlayers: 1
@@ -23875,7 +24140,7 @@ SLPS-03136:
     publisher: "Altron"
     developer: "Altron"
     releaseDate: "2001-02-15"
-    genre: "Chess"
+    genre: "Board - Chess"
     languages:
       - Japanese
     minPlayers: 1
@@ -23893,7 +24158,7 @@ SLES-04053:
     publisher: "Phoenix Games"
     developer: "Mere Mortals"
     releaseDate: "2002-02-05"
-    genre: "Chess"
+    genre: "Board - Chess"
     languages:
       - English
     minPlayers: 1
@@ -23948,7 +24213,7 @@ SLUS-01400:
     publisher: "A1 Games"
     developer: "Success"
     releaseDate: "2001-11-29"
-    genre: "Board / Chess"
+    genre: "Board - Chess"
     languages:
       - English
     minPlayers: 1
@@ -23966,7 +24231,7 @@ SLPS-02624:
     publisher: "Digicube"
     developer: "Oxford Softworks"
     releaseDate: "2000-04-06"
-    genre: "Chess"
+    genre: "Board - Chess"
     languages:
       - Japanese
     minPlayers: 1
@@ -23984,7 +24249,7 @@ SLES-00187:
     publisher: "Mindscape Inc"
     developer: "Mindscape Inc"
     releaseDate: "1996-07-10"
-    genre: "Board / Chess"
+    genre: "Board - Chess"
     languages:
       - English
     minPlayers: 1
@@ -24002,7 +24267,7 @@ SLUS-00052:
     publisher: "Mindscape Inc"
     developer: "Mindscape Inc"
     releaseDate: "1996-03-10"
-    genre: "Board / Chess"
+    genre: "Board - Chess"
     languages:
       - English
     minPlayers: 1
@@ -24020,7 +24285,7 @@ SLES-02117:
     publisher: "Mindscape Inc"
     developer: "Starsphere Interactive, Inc"
     releaseDate: "1999-10-15"
-    genre: "Board / Chess"
+    genre: "Board - Chess"
     languages:
       - English
     minPlayers: 1
@@ -24038,7 +24303,7 @@ SLUS-00886:
     publisher: "Mindscape Inc"
     developer: "Starsphere Interactive, Inc"
     releaseDate: "1999-09-27"
-    genre: "Board / Chess"
+    genre: "Board - Chess"
     languages:
       - English
     minPlayers: 1
@@ -24056,7 +24321,7 @@ SLPS-00331:
     publisher: "Altron"
     developer: "Mindscape Inc"
     releaseDate: "1996-11-01"
-    genre: "Board / Chess"
+    genre: "Board - Chess"
     languages:
       - Japanese
     minPlayers: 1
@@ -24379,6 +24644,8 @@ SLPM-86845:
     linkCable: false
 SLED-01194:
   name: "Chill (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00711:
   name: "Chill (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -24388,7 +24655,7 @@ SLES-00711:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1998-04-15"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
       - French
@@ -24462,6 +24729,8 @@ SLPS-02788:
     linkCable: false
 SLPM-80433:
   name: "Chippoke Ralph no Daibouken - The Adventure of Little Ralph (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01853:
   name: "Chippoke Ralph no Daibouken - The Adventure of Little Ralph (Japan) (Rev 1)"
   compatibility:
@@ -24974,6 +25243,8 @@ SLPS-01436:
     linkCable: false
 SLPM-80227:
   name: "Choro Q Marine - Q-Boat (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-87339:
   name: "Choro Q Marine Q-Boat [PSOne Books]"
   controllers:
@@ -25206,7 +25477,7 @@ SLPS-01871:
     publisher: "Hect"
     developer: "Avit"
     releaseDate: "1999-02-18"
-    genre: "Volleyball"
+    genre: "Sports - Volleyball"
     languages:
       - Japanese
     minPlayers: 1
@@ -25317,7 +25588,7 @@ SLES-02948:
     publisher: "Midas Interactive Entertainment"
     developer: "Pixel Storm"
     releaseDate: "2000-08-25"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -26450,6 +26721,8 @@ SLPM-86564:
     linkCable: false
 PCPX-96138:
   name: "Circadia (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - PCPX-96138
     - PCPX-96140
@@ -26547,6 +26820,8 @@ SLES-00753:
     linkCable: false
 SLED-01403:
   name: "Circuit Breakers (Europe) (En,Fr,De,Es,It) (Demo-Add-On Disc)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00697:
   name: "Circuit Breakers (USA)"
   controllers:
@@ -26587,6 +26862,8 @@ SLES-00573:
     linkCable: false
 SLED-00734:
   name: "Cite des Enfants Perdus, La (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00361:
   name: "City Bravo! (Japan)"
   controllers:
@@ -26959,6 +27236,8 @@ SLUS-01491:
     linkCable: false
 SLPM-80482:
   name: "Click Manga (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02354:
   name: "Click Manga - Click no Hi (Japan)"
   controllers:
@@ -27225,6 +27504,8 @@ SLPS-01290:
     linkCable: false
 SLPM-80219:
   name: "Clock Tower - Ghost Head (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91175:
   name: "Clock Tower - Ghost Head [Playstation the Best]"
   controllers:
@@ -27292,8 +27573,12 @@ SLPS-00657:
     linkCable: false
 SLPM-80062:
   name: "Clock Tower 2 (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80063:
   name: "Clock Tower 2 (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00695:
   name: "Clock Tower II - The Struggle Within (USA)"
   controllers:
@@ -27375,10 +27660,16 @@ PL-646:
   name: "Codebreaker D.J. (USA) (Unl)"
 SLUS-90091:
   name: "Codemasters Demo CD (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02809:
   name: "Codemasters Demo Disk (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLED-03094:
   name: "Codemasters Q3 2000 Demo (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94409:
   name: "Codename - Tenka (USA)"
   compatibility:
@@ -27452,6 +27743,8 @@ SCES-12151:
     linkCable: false
 SLPM-80380:
   name: "Colin McRae - The Rally (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01938:
   name: "Colin McRae - The Rally (Japan) (En,Ja)"
   controllers:
@@ -27499,6 +27792,8 @@ SLPS-02878:
     linkCable: false
 SLED-01380:
   name: "Colin McRae Rally (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00477:
   name: "Colin McRae Rally (Europe) (En,Fr,De,Es)"
   controllers:
@@ -27524,6 +27819,8 @@ SLES-00477:
     linkCable: false
 SLED-01381:
   name: "Colin McRae Rally (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01204:
   name: "Colin McRae Rally (Italy)"
   controllers:
@@ -27546,6 +27843,8 @@ SLES-01204:
     linkCable: false
 SLED-01388:
   name: "Colin McRae Rally (Italy) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94474:
   name: "Colin McRae Rally (USA)"
   compatibility:
@@ -27696,7 +27995,7 @@ SLUS-00196:
     publisher: "Acclaim"
     developer: "Iguana Entertainment"
     releaseDate: "1996-02-10"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -27778,6 +28077,8 @@ SLES-10860:
     linkCable: false
 SLED-00091:
   name: "Colony Wars (Europe) (Fr,De) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00861:
   name: "Colony Wars (France) (Disc 1)"
   discSet:
@@ -27924,6 +28225,8 @@ SLES-10863:
     linkCable: false
 SLPM-80304:
   name: "Colony Wars (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01403:
   name: "Colony Wars (Japan) (Disc 1)"
   discSet:
@@ -28212,6 +28515,8 @@ SLES-01392:
     linkCable: false
 SLED-01471:
   name: "Colony Wars - Vengeance (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01405:
   name: "Colony Wars - Vengeance (France)"
   controllers:
@@ -28445,7 +28750,7 @@ SLPS-01429:
     publisher: "Axela"
     developer: "Axela"
     releaseDate: "1998-06-18"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - Japanese
     minPlayers: 1
@@ -28461,6 +28766,8 @@ SLPM-80536:
   name: "Comic Bom Bom - Special Movie Disc (Japan)"
 SLED-00652:
   name: "Command & Conquer (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00530:
   name: "Command & Conquer (Europe) (Disc 1) (GDI)"
   discSet:
@@ -28619,6 +28926,8 @@ SLUS-00410:
     linkCable: false
 SLED-01270:
   name: "Command & Conquer - Alarmstufe Rot & Bloody Roar (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01007:
   name: "Command & Conquer - Alarmstufe Rot (Germany) (Disc 1)"
   discSet:
@@ -28717,6 +29026,8 @@ SLES-11345:
     linkCable: true
 SLED-01067:
   name: "Command & Conquer - Alerte Rouge (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01006:
   name: "Command & Conquer - Alerte Rouge (France) (Disc 1) (Allies)"
   discSet:
@@ -28815,6 +29126,8 @@ SLES-11344:
     linkCable: true
 SLED-01255:
   name: "Command & Conquer - Red Alert & Bloody Roar (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00949:
   name: "Command & Conquer - Red Alert (Europe) (Disc 1) (Allies)"
   discSet:
@@ -29027,6 +29340,8 @@ SLUS-00667:
     linkCable: true
 SLED-00695:
   name: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00532:
   name: "Command & Conquer - Teil 1 - Der Tiberiumkonflikt (Germany) (Disc 1) (GDI)"
   discSet:
@@ -29076,6 +29391,8 @@ SLES-10532:
     linkCable: false
 SLPM-80222:
   name: "Command & Conquer Complete (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00976:
   name: "Command & Conquer Complete (Japan) (Disc 1) (GDI)"
   discSet:
@@ -29162,12 +29479,18 @@ SLPS-02116:
     linkCable: false
 SLED-02310:
   name: "Compilation 01 (Australia)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02439:
   name: "Compilation 03 (Australia)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisablePGXPCulling
 SLED-02440:
   name: "Compilation 04 (Australia)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01062:
   name: "Complete Soccer Onside (Japan)"
   controllers:
@@ -29176,7 +29499,7 @@ SLPS-01062:
     publisher: "Ichikawa"
     developer: "Elite Systems Ltd"
     releaseDate: "1998-01-29"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -29239,7 +29562,7 @@ SCUS-94294:
     publisher: "Sony Computer Entertainment America, Inc"
     developer: "Victor Interactive Software, Inc"
     releaseDate: "1999-01-13"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -29251,6 +29574,8 @@ SCUS-94294:
     linkCable: false
 SCUS-94380:
   name: "Contender (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94494:
   name: "Contender 2"
   controllers:
@@ -29260,7 +29585,7 @@ SCUS-94494:
     publisher: "Bam! Entertaiment"
     developer: "Pegasus Japan"
     releaseDate: "2000-01-10"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -29282,7 +29607,7 @@ SLUS-01305:
     publisher: "Bam! Entertaiment"
     developer: "Pegasus Japan"
     releaseDate: "2000-01-10"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -29435,7 +29760,7 @@ SCPS-45061:
     publisher: "UEP Systems"
     developer: "UEP Systems"
     releaseDate: "1996-08-30"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -29454,7 +29779,7 @@ SCES-00568:
     publisher: "Sony"
     developer: "UEP Systems"
     releaseDate: "1997-01-15"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -29476,7 +29801,7 @@ SLPS-00456:
     publisher: "UEP Systems"
     developer: "UEP Systems"
     releaseDate: "1997-06-27"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -29498,7 +29823,7 @@ SCUS-94356:
     publisher: "Sony"
     developer: "UEP Systems"
     releaseDate: "1996-12-31"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -29520,7 +29845,7 @@ SCES-00992:
     publisher: "Sony"
     developer: "UEP Systems"
     releaseDate: "1998-01-15"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -29542,7 +29867,7 @@ SCUS-94358:
     publisher: "Sony"
     developer: "UEP Systems"
     releaseDate: "1997-11-15"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -29554,6 +29879,8 @@ SCUS-94358:
     linkCable: true
 SLPM-80143:
   name: "Cool Boarders 2 - Killing Session (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45103:
   name: "Cool Boarders 2 - Killing Session (Japan, Asia)"
   controllers:
@@ -29566,7 +29893,7 @@ SCPS-45103:
     publisher: "UEP Systems"
     developer: "UEP Systems"
     releaseDate: "1997-08-28"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -29585,7 +29912,7 @@ SLPS-91122:
     publisher: "UEP Systems"
     developer: "UEP Systems"
     releaseDate: "1999-02-04"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -29608,7 +29935,7 @@ SCUS-94597:
     publisher: "Sony"
     developer: "Idol Minds"
     releaseDate: "2000-01-10"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -29620,6 +29947,8 @@ SCUS-94597:
     linkCable: false
 SCUS-94625:
   name: "Cool Boarders 2001 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01615:
   name: "Cool Boarders 3 (Europe)"
   controllers:
@@ -29630,7 +29959,7 @@ SCES-01615:
     publisher: "989 Studios"
     developer: "Idol Minds"
     releaseDate: "1998-11-15"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -29650,7 +29979,7 @@ SLPS-01698:
     publisher: "UEP Systems"
     developer: "Idol Minds"
     releaseDate: "1998-11-26"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -29670,7 +29999,7 @@ SCUS-94251:
     publisher: "989 Studios"
     developer: "Idol Minds"
     releaseDate: "1998-01-11"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -29682,6 +30011,8 @@ SCUS-94251:
     linkCable: true
 SCUS-94374:
   name: "Cool Boarders 3 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-02283:
   name: "Cool Boarders 4 (Europe)"
   controllers:
@@ -29692,7 +30023,7 @@ SCES-02283:
     publisher: "989 Studios"
     developer: "Idol Minds"
     releaseDate: "1999-01-10"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -29712,7 +30043,7 @@ SLPS-02527:
     publisher: "UEP Systems"
     developer: "Idol Minds"
     releaseDate: "2000-03-09"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -29724,6 +30055,8 @@ SLPS-02527:
     linkCable: false
 SLPM-80539:
   name: "Cool Boarders 4 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94559:
   name: "Cool Boarders 4 (USA)"
   controllers:
@@ -29734,7 +30067,7 @@ SCUS-94559:
     publisher: "989 Studios"
     developer: "Idol Minds"
     releaseDate: "1999-01-10"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -29746,6 +30079,8 @@ SCUS-94559:
     linkCable: false
 SCUS-94388:
   name: "Cool Boarders 4 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00499:
   name: "Cooly Skunk (Japan)"
   controllers:
@@ -29774,7 +30109,7 @@ SLES-01269:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1998-05-22"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -29789,6 +30124,13 @@ LSP-080230:
   codes:
     - LSP-080230
     - LSP-905154
+    - LSP08023001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-080240:
   name: "Cosmic Cookoff - Mathematics (USA)"
   controllers:
@@ -29796,11 +30138,12 @@ LSP-080240:
   codes:
     - LSP-080240
     - LSP-905413
+    - LSP08024001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -29960,7 +30303,7 @@ SLES-01266:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1998-05-22"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -30202,6 +30545,8 @@ SCUS-94244:
     linkCable: false
 SCUS-94289:
   name: "Crash Bandicoot - Warped (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00967:
   name: "Crash Bandicoot 2 - Cortex Strikes Back (Europe) (En,Fr,De,Es,It)"
   compatibility:
@@ -30281,6 +30626,8 @@ SCPS-10047:
     linkCable: false
 PCPX-96098:
   name: "Crash Bandicoot 2 - Cortex no Gyakushuu! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10073:
   name: "Crash Bandicoot 3 - Buttobi! Sekai Isshuu (Japan)"
   compatibility:
@@ -30403,6 +30750,8 @@ SCPS-10140:
     linkCable: false
 PCPX-96202:
   name: "Crash Bandicoot Carnival (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45470:
   name: "Crash Bandicoot Racing"
   controllers:
@@ -30452,6 +30801,8 @@ SCPS-10118:
     linkCable: false
 PCPX-96183:
   name: "Crash Bandicoot Racing (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisablePGXPPreserveProjFP
 SCPS-91230:
@@ -30498,6 +30849,8 @@ SCPS-91304:
     linkCable: false
 SCUS-94654:
   name: "Crash Bash & Spyro - Year of the Dragon (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-02834:
   name: "Crash Bash (Europe) (En,Fr,De,Es,It)"
   compatibility:
@@ -30551,6 +30904,8 @@ SCUS-94570:
     linkCable: false
 SCUS-94616:
   name: "Crash Bash (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02582:
   name: "Crazy Climber 2000 (Japan)"
   controllers:
@@ -30577,11 +30932,12 @@ LSP-130110:
   codes:
     - LSP-130110
     - LSP-903150
+    - LSP13011001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -30593,16 +30949,34 @@ LSP-130110:
     linkCable: false
 LSP-130120:
   name: "Creative Isle (USA)"
+  codes:
+    - LSP-130120
+    - LSP13012001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
 LSP-905109:
   name: "Creative Journey (USA)"
   codes:
     - LSP-905109
+    - LSP90510901
     - LSP-90510901
+    - LSP90510901
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
 LSP-907097:
   name: "Creative Voyage (USA)"
   codes:
     - LSP-907097
     - LSP-90709701
+    - LSP90709701
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
 SLPS-00120:
   name: "Creature Shock (Japan) (Disc 1)"
   discSet:
@@ -30616,7 +30990,7 @@ SLPS-00120:
     publisher: "Data East"
     developer: "Argonaut Games"
     releaseDate: "1996-08-23"
-    genre: "Action / First person Shooter"
+    genre: "Action / First Person Shooter"
     languages:
       - English
       - Japanese
@@ -30640,7 +31014,7 @@ SLPS-00121:
     publisher: "Data East"
     developer: "Argonaut Games"
     releaseDate: "1996-08-23"
-    genre: "Action / First person Shooter"
+    genre: "Action / First Person Shooter"
     languages:
       - English
       - Japanese
@@ -30750,7 +31124,7 @@ SLES-02495:
     publisher: "Electronic Arts"
     developer: "Krisalis Software Ltd"
     releaseDate: "2000-03-24"
-    genre: "Sports / Cricket"
+    genre: "Sports - Cricket"
     languages:
       - English
     minPlayers: 1
@@ -30806,6 +31180,8 @@ SCPS-10037:
     linkCable: false
 SLED-01085:
   name: "Crime Killer (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00954:
   name: "Crime Killer (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -30831,6 +31207,8 @@ SLES-00954:
     linkCable: false
 SLED-01305:
   name: "Crime Killer (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00576:
   name: "Crime Killer (USA)"
   compatibility:
@@ -30857,6 +31235,8 @@ SLUS-00576:
     linkCable: false
 SLUS-90020:
   name: "Crime Killer (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02793:
   name: "Crisis Beat (Europe)"
   compatibility:
@@ -31054,6 +31434,8 @@ SLES-00593:
     linkCable: false
 SLED-00038:
   name: "Croc - Legend of the Gobbos (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLUS-00530:
@@ -31082,6 +31464,8 @@ SLUS-00530:
     linkCable: false
 SLED-02119:
   name: "Croc 2 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-7272-g143acca03"
@@ -31143,6 +31527,8 @@ SLUS-00634:
     linkCable: false
 SLUS-90056:
   name: "Croc 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLPM-86310:
@@ -31171,6 +31557,8 @@ SLPM-86310:
     linkCable: false
 SLPM-80473:
   name: "Croc Adventure (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLPS-01055:
@@ -31196,6 +31584,8 @@ SLPS-01055:
     linkCable: false
 SLPM-80173:
   name: "Croc! Pau-Pau Island (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLPM-87235:
@@ -31356,7 +31746,7 @@ SLES-00279:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Gray Matter Studios, Inc"
     releaseDate: "1997-04-10"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -31374,7 +31764,7 @@ SLES-00648:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Gray Matter Studios, Inc"
     releaseDate: "1997-06-10"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - German
     minPlayers: 1
@@ -31392,7 +31782,7 @@ SLPS-00769:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Gray Matter Studios, Inc"
     releaseDate: "1997-04-25"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -31410,7 +31800,7 @@ SLUS-00242:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Gray Matter Studios, Inc"
     releaseDate: "1997-02-28"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -31685,6 +32075,8 @@ SLPS-01026:
     linkCable: false
 SLPM-80142:
   name: "Cu-On-Pa (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03729:
   name: "Cubix Robots for Everyone - Race 'n Robots (Europe)"
   controllers:
@@ -31990,7 +32382,7 @@ SLES-02371:
     publisher: "Electronic Arts"
     developer: "EA Redwood Shores"
     releaseDate: "1999-11-02"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -32009,7 +32401,7 @@ SLES-02370:
     publisher: "Electronic Arts"
     developer: "EA Redwood Shores"
     releaseDate: "1999-11-02"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
       - French
@@ -32032,7 +32424,7 @@ SLUS-01004:
     publisher: "Electronic Arts"
     developer: "EA Redwood Shores"
     releaseDate: "1999-11-06"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -32638,6 +33030,8 @@ SLPS-00135:
     linkCable: false
 SLPM-80558:
   name: "D-1 Grand Prix (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01040:
   name: "DBZ - Dead Ball Zone (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -32691,7 +33085,7 @@ SLES-03402:
     publisher: "Ubi Soft Entertaiment"
     developer: "Anco"
     releaseDate: "2000-11-24"
-    genre: "Soccer / Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - German
     minPlayers: 1
@@ -32709,7 +33103,7 @@ SLES-03864:
     publisher: "UBI Soft Entertainment"
     developer: "Anco"
     releaseDate: "2002-05-17"
-    genre: "Soccer Management"
+    genre: "Sports - Soccer Manager"
     languages:
       - German
     minPlayers: 1
@@ -33285,6 +33679,8 @@ SLPS-02160:
     linkCable: false
 SLPM-80259:
   name: "Daiobake Yashiki - Hamamura Jun no Jitsuwa Kaidan (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01699:
   name: "Daisenryaku - Master Combat (Japan)"
   controllers:
@@ -33390,7 +33786,7 @@ SLES-04061:
     - DigitalController
   metadata:
     publisher: "Midas Interactive"
-    developer: "The Code Monkeys"
+    developer: "The Code Monkeys Ltd"
     releaseDate: "2003-03-01"
     genre: "Puzzle / Colouring Book"
     languages:
@@ -33411,7 +33807,7 @@ SLES-02959:
     - DigitalController
   metadata:
     publisher: "Midas Interactive"
-    developer: "The Code Monkeys"
+    developer: "The Code Monkeys Ltd"
     releaseDate: "2000-05-29"
     genre: "Puzzle"
     languages:
@@ -33823,6 +34219,8 @@ SLPM-86150:
     linkCable: false
 SLPM-80348:
   name: "Dance! Dance! Dance! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-04121:
   name: "Dance-UK (UK)"
   controllers:
@@ -34526,6 +34924,22 @@ SLUS-00745:
     linkCable: false
 SLES-03447:
   name: "Darkstone (Australia)"
+  controllers:
+    - AnalogController
+    - DigitalController
+  metadata:
+    publisher: "Take 2 Interactive"
+    developer: "Delphine Software International"
+    genre: "RPG ( Action )"
+    languages:
+      - English
+    minPlayers: 1
+    maxPlayers: 1
+    minBlocks: 1
+    maxBlocks: 1
+    vibration: true
+    multitap: false
+    linkCable: false
 SLES-00612:
   name: "Darkstone (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -34589,6 +35003,8 @@ SLES-02740:
     linkCable: false
 SLED-03115:
   name: "Dave Mirra Freestyle BMX (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86682:
   name: "Dave Mirra Freestyle BMX (Japan)"
   controllers:
@@ -34632,6 +35048,8 @@ SLUS-01026:
     linkCable: false
 SLUS-81026:
   name: "Dave Mirra Freestyle BMX (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03371:
   name: "Dave Mirra Freestyle BMX - Maximum Remix (Europe)"
   controllers:
@@ -34679,7 +35097,7 @@ SLES-03488:
     publisher: "Rage Software"
     developer: "Rage Software"
     releaseDate: "2001-11-23"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -34698,7 +35116,7 @@ SLES-03682:
     publisher: "Rage Software"
     developer: "Rage Software"
     releaseDate: "2001-11-23"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
       - German
@@ -34720,7 +35138,7 @@ SLUS-01455:
     publisher: "Majesco"
     developer: "Rage Software"
     releaseDate: "2002-07-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -34738,7 +35156,7 @@ SLES-00096:
     publisher: "Telstar"
     developer: "Telstar"
     releaseDate: "1996-10-01"
-    genre: "Sports / Tennis."
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -34883,6 +35301,8 @@ SLPS-01289:
     linkCable: false
 SCED-01372:
   name: "Dead or Alive (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   controllers:
     - AnalogController
     - DigitalController
@@ -34914,6 +35334,8 @@ SLUS-00606:
     linkCable: false
 SLUS-80606:
   name: "Dead or Alive (USA) (En,Ja) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   controllers:
     - AnalogController
     - DigitalController
@@ -35375,7 +35797,7 @@ SCES-02174:
     publisher: "Sony / Disney Interactive"
     developer: "Capcom"
     releaseDate: "1999-11-26"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - French
     minPlayers: 1
@@ -35450,7 +35872,7 @@ SLES-03890:
     publisher: "Novalogic"
     developer: "Rebellion"
     releaseDate: "2002-06-12"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - English
       - French
@@ -35473,7 +35895,7 @@ SLES-03952:
     publisher: "Novalogic"
     developer: "Rebellion"
     releaseDate: "2002-06-14"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - French
     minPlayers: 1
@@ -35492,7 +35914,7 @@ SLES-03919:
     publisher: "Novalogic"
     developer: "Rebellion"
     releaseDate: "2002-06-14"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - German
     minPlayers: 1
@@ -35514,7 +35936,7 @@ SLUS-01429:
     publisher: "Novalogic"
     developer: "Rebellion"
     releaseDate: "2002-07-18"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - English
       - French
@@ -35528,77 +35950,147 @@ SLUS-01429:
     linkCable: false
 SLED-01725:
   name: "Demo Codemasters (France) (SLED-01725)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02246:
   name: "Demo Codemasters (France) (SLED-02246)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02417:
   name: "Demo Disc (Europe) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00064:
   name: "Demo One (Germany) (SCES-00064)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00121:
   name: "Demo One (Germany) (SCES-00121)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00048:
   name: "Demo One (Version 1) (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00120:
   name: "Demo One (Version 2) (Europe, Australia)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00238:
   name: "Demo One (Version 3) (Europe, Australia)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00456:
   name: "Demo One (Version 4) (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00457:
   name: "Demo One (Version 4) (Germany)"
+  metadata:
+    genre: "** DEMO **"
 PBPX-95001:
   name: "Demo One (Version 5) (Europe)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - PBPX-95001
     - SCED-00816
 PBPX-95007:
   name: "Demo One (Version 6) (Europe) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 PBPX-95008:
   name: "Demo One (Version 7) (Europe) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96003:
   name: "DemoDemo PlayStation Soukan-gou Vol. 1 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96014:
   name: "DemoDemo PlayStation Vol. 10 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96016:
   name: "DemoDemo PlayStation Vol. 11 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96018:
   name: "DemoDemo PlayStation Vol. 12 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96019:
   name: "DemoDemo PlayStation Vol. 13 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96021:
   name: "DemoDemo PlayStation Vol. 14 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96022:
   name: "DemoDemo PlayStation Vol. 15 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96025:
   name: "DemoDemo PlayStation Vol. 16 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96026:
   name: "DemoDemo PlayStation Vol. 17 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96027:
   name: "DemoDemo PlayStation Vol. 18 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96032:
   name: "DemoDemo PlayStation Vol. 19 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96005:
   name: "DemoDemo PlayStation Vol. 2 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96036:
   name: "DemoDemo PlayStation Vol. 20 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96038:
   name: "DemoDemo PlayStation Vol. 21 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96042:
   name: "DemoDemo PlayStation Vol. 22 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96006:
   name: "DemoDemo PlayStation Vol. 3 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96007:
   name: "DemoDemo PlayStation Vol. 4 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96008:
   name: "DemoDemo PlayStation Vol. 5 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96009:
   name: "DemoDemo PlayStation Vol. 6 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96010:
   name: "DemoDemo PlayStation Vol. 7 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96011:
   name: "DemoDemo PlayStation Vol. 8 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96013:
   name: "DemoDemo PlayStation Vol. 9 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02018:
   name: "Demolition Racer (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -35672,6 +36164,8 @@ SLPM-80327:
   name: "Dengeki PlayStation D11 (Japan)"
 PAPX-90060:
   name: "Dengeki PlayStation D11 - Yarudora Series Vol. 3 - Sampaguita (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80343:
   name: "Dengeki PlayStation D12 (Japan)"
 SLPM-80362:
@@ -35756,6 +36250,8 @@ SLPM-80257:
   name: "Dengeki PlayStation D8 (Japan)"
 PCPX-96116:
   name: "Dengeki PlayStation D8 - Yarudora Series Vol. 1 - Double Cast (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80266:
   name: "Dengeki PlayStation D9 (Japan)"
 SLPS-02851:
@@ -35789,7 +36285,7 @@ SLPS-01287:
     publisher: "Hudson Soft"
     developer: "Hudson Soft"
     releaseDate: "1998-04-02"
-    genre: "Mini games"
+    genre: "Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -35913,6 +36409,8 @@ SLPS-01150:
     linkCable: false
 SLPM-80166:
   name: "Densha de Go! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86263:
   name: "Densha de Go! (Japan) (PlayStation the Best)"
   controllers:
@@ -35952,8 +36450,12 @@ SLPM-86142:
     linkCable: false
 SLPM-80346:
   name: "Densha de Go! 2 (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80406:
   name: "Densha de Go! 2 (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86615:
   name: "Densha de Go! 2 (Japan) (Rev 1)"
   controllers:
@@ -36013,6 +36515,8 @@ SLPM-86424:
     linkCable: false
 SLPM-80521:
   name: "Densha de Go! Nagoya Tetsudou-hen (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86378:
   name: "Densha de Go! Professional Shiyou (Japan)"
   controllers:
@@ -36350,6 +36854,8 @@ SLPS-01591:
     linkCable: false
 SLPM-80310:
   name: "Destrega (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01772:
   name: "Destrega (Spain)"
   controllers:
@@ -36602,6 +37108,8 @@ SLUS-00912:
     linkCable: false
 SLUS-90092:
   name: "Destruction Derby Raw (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-04073:
   name: "Destructo 2 (Europe)"
   controllers:
@@ -37351,7 +37859,7 @@ SLPS-03372:
     publisher: "Twilight Express"
     developer: "Twilight Express"
     releaseDate: "2001-12-20"
-    genre: "Sports / Fitness / Jogging"
+    genre: "Sports - Fitness / Jogging"
     languages:
       - Japanese
     minPlayers: 1
@@ -37370,7 +37878,7 @@ SLPS-03371:
     publisher: "Twilight Express"
     developer: "Twilight Express"
     releaseDate: "2001-12-20"
-    genre: "Sports / Fitness / Jogging"
+    genre: "Sports - Fitness / Jogging"
     languages:
       - Japanese
     minPlayers: 1
@@ -37406,7 +37914,7 @@ SLPM-86038:
     publisher: "Squaresoft"
     developer: "Aques"
     releaseDate: "1997-06-20"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -38126,6 +38634,8 @@ SLUS-00922:
     linkCable: false
 SLUS-90066:
   name: "Dino Crisis (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03221:
   name: "Dino Crisis 2 (Europe)"
   controllers:
@@ -38240,6 +38750,8 @@ SLPM-86627:
     linkCable: false
 SLPM-80573:
   name: "Dino Crisis 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLES-03225:
@@ -38293,6 +38805,8 @@ SLUS-01279:
     linkCable: false
 SLUS-90087:
   name: "Dino Crisis 2 (USA) (En,Ja) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLES-03989:
@@ -38326,7 +38840,7 @@ SLES-04063:
     - DigitalController
   metadata:
     publisher: "Phoenix Games"
-    developer: "The Code Monkeys"
+    developer: "The Code Monkeys Ltd"
     releaseDate: "2003-03-28"
     genre: "Puzzle / Colouring Book"
     languages:
@@ -38361,6 +38875,8 @@ SLPS-02797:
     linkCable: false
 SLPM-80587:
   name: "Dioramos (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02146:
   name: "Dirt Champ Motocross No. 1 (Japan)"
   controllers:
@@ -38370,7 +38886,7 @@ SLPS-02146:
     publisher: "Media Rings"
     developer: "Funcom"
     releaseDate: "2000-01-06"
-    genre: "Sports / Motocross"
+    genre: "Sports - Motocross"
     languages:
       - Japanese
     minPlayers: 1
@@ -38382,6 +38898,8 @@ SLPS-02146:
     linkCable: false
 SLPM-80501:
   name: "Dirt Champ Motocross No. 1 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01552:
   name: "Dirt Jockey - Heavy Equipment Operator (USA)"
   controllers:
@@ -38410,7 +38928,7 @@ SLPS-02428:
     publisher: "Dazz"
     developer: "Dazz"
     releaseDate: "2000-03-30"
-    genre: "Breeding / Simulation."
+    genre: "Breeding / Simulation"
     languages:
       - Japanese
     minPlayers: 1
@@ -38429,7 +38947,7 @@ SLPS-03024:
     publisher: "Dazz"
     developer: "Dazz"
     releaseDate: "2000-11-02"
-    genre: "Breeding / Simulation."
+    genre: "Breeding / Simulation"
     languages:
       - Japanese
     minPlayers: 1
@@ -38468,6 +38986,8 @@ SLPS-00251:
     linkCable: false
 SLED-01109:
   name: "Discworld II (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00793:
   name: "Discworld II - Missing Presumed...! (Europe) (En,Es,It)"
   compatibility:
@@ -38581,6 +39101,8 @@ SLES-01549:
     linkCable: false
 SLED-02604:
   name: "Discworld Noir (Europe) (En,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02063:
   name: "Discworld Noir (France)"
   compatibility:
@@ -38738,6 +39260,8 @@ SCES-03537:
     linkCable: false
 SCED-03637:
   name: "Disney Atlantide - L'Empire Perdu (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-03541:
   name: "Disney Atlantis - El Imperio Perdido (Spain)"
   compatibility:
@@ -38807,7 +39331,7 @@ SLES-03638:
     publisher: "Ubisoft / NewKidCo LLC"
     developer: "The Code Monkeys Ltd"
     releaseDate: "2001-12-07"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - French
     minPlayers: 1
@@ -38922,7 +39446,7 @@ SCES-02004:
     publisher: "Sony / Disney Interactive"
     developer: "Revolution Software"
     releaseDate: "1999-09-17"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - French
     minPlayers: 1
@@ -39132,7 +39656,7 @@ SLES-03641:
     publisher: "Ubisoft / NewKidCo LLC"
     developer: "The Code Monkeys Ltd"
     releaseDate: "2001-12-07"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - Spanish
     minPlayers: 1
@@ -39170,7 +39694,7 @@ SLES-03965:
     publisher: "Disney Interactive"
     developer: "Revolution Software"
     releaseDate: "2002-01-01"
-    genre: "Educational / Mini games"
+    genre: "Educational / Mini Games"
     languages:
       - Dutch
       - English
@@ -39194,7 +39718,7 @@ SLES-03983:
     publisher: "Disney Interactive"
     developer: "Revolution Software"
     releaseDate: "2002-11-05"
-    genre: "Educational / Mini games"
+    genre: "Educational / Mini Games"
     languages:
       - Danish
       - Dutch
@@ -39220,7 +39744,7 @@ SCES-02006:
     publisher: "Sony / Disney Interactive"
     developer: "Revolution Software"
     releaseDate: "1999-09-17"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - Italian
     minPlayers: 1
@@ -39391,7 +39915,7 @@ SLES-03640:
     publisher: "Ubisoft / NewKidCo LLC"
     developer: "The Code Monkeys Ltd"
     releaseDate: "2001-12-07"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - Italian
     minPlayers: 1
@@ -39410,7 +39934,7 @@ SCES-03749:
     publisher: "Sony"
     developer: "Doki Denki"
     releaseDate: "2001-11-21"
-    genre: "Party / Mini games"
+    genre: "Party / Mini Games"
     languages:
       - Italian
     minPlayers: 1
@@ -39443,7 +39967,24 @@ SLUS-01210:
     multitap: false
     linkCable: false
 SLUS-01536:
-  name: "Disney Presents Tigger's Honey Hunt (USA) (Rerelease)"
+  name: "Disney Presents Tigger's Honey Hunt (USA) (Collector's Edition)"
+  controllers:
+    - AnalogController
+    - DigitalController
+  metadata:
+    publisher: "NewKidCo LLC / Disney Interactive."
+    developer: "Doki Denki"
+    releaseDate: "2002-10-21"
+    genre: "Platformer"
+    languages:
+      - English
+    minPlayers: 1
+    maxPlayers: 1
+    minBlocks: 1
+    maxBlocks: 1
+    vibration: false
+    multitap: false
+    linkCable: false
 SCES-01516:
   name: "Disney Tarzan (France)"
   controllers:
@@ -39554,7 +40095,7 @@ SCES-03748:
     publisher: "Sony"
     developer: "Doki Denki"
     releaseDate: "2001-11-21"
-    genre: "Party / Mini games"
+    genre: "Party / Mini Games"
     languages:
       - Spanish
     minPlayers: 1
@@ -39869,6 +40410,8 @@ SCES-03542:
     linkCable: false
 SCED-03636:
   name: "Disney's Atlantis - The Lost Empire (Australia) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-03533:
   name: "Disney's Atlantis - The Lost Empire (Europe)"
   controllers:
@@ -39920,7 +40463,7 @@ SCES-02007:
     publisher: "Sony / Disney Interactive"
     developer: "Revolution Software"
     releaseDate: "1999-09-17"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - Spanish
     minPlayers: 1
@@ -40162,7 +40705,7 @@ SLES-03178:
     publisher: "Ubisoft / NewKidCo LLC"
     developer: "The Code Monkeys Ltd"
     releaseDate: "2001-12-07"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -40181,7 +40724,7 @@ SLES-03639:
     publisher: "Ubisoft / NewKidCo LLC"
     developer: "The Code Monkeys Ltd"
     releaseDate: "2001-12-07"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - German
     minPlayers: 1
@@ -40203,7 +40746,7 @@ SLUS-01209:
     publisher: "NewKidCo LLC"
     developer: "The Code Monkeys Ltd"
     releaseDate: "2001-06-25"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -40363,7 +40906,7 @@ SCES-01695:
     publisher: "Sony / Disney Interactive"
     developer: "Revolution Software"
     releaseDate: "1999-09-17"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -40382,7 +40925,7 @@ SCES-03705:
     publisher: "Sony"
     developer: "Doki Denki"
     releaseDate: "2001-11-21"
-    genre: "Party / Mini games"
+    genre: "Party / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -40401,7 +40944,7 @@ SCES-03745:
     publisher: "Sony"
     developer: "Doki Denki"
     releaseDate: "2001-11-21"
-    genre: "Party / Mini games"
+    genre: "Party / Mini Games"
     languages:
       - German
     minPlayers: 1
@@ -40432,6 +40975,8 @@ SCES-03707:
     linkCable: false
 SCED-03883:
   name: "Disney's Peter Pan - Adventures in Never Land (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-03709:
   name: "Disney's Peter Pan - Avonturen in Nooitgedachtland (Netherlands)"
   controllers:
@@ -40498,7 +41043,7 @@ SLUS-01437:
     publisher: "Electronic Arts"
     developer: "Doki Denki"
     releaseDate: "2001-11-28"
-    genre: "Party / Mini games"
+    genre: "Party / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -40536,7 +41081,7 @@ SCES-03746:
     publisher: "Sony"
     developer: "Doki Denki"
     releaseDate: "2001-11-21"
-    genre: "Party / Mini games"
+    genre: "Party / Mini Games"
     languages:
       - Dutch
     minPlayers: 1
@@ -40555,7 +41100,7 @@ SLUS-01038:
     publisher: "NewKidCo LLC"
     developer: "Revolution Software"
     releaseDate: "1999-12-20"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -40880,7 +41425,7 @@ SCES-02264:
     publisher: "Sony / Disney Interactive"
     developer: "Revolution Software"
     releaseDate: "1999-09-17"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - Dutch
     minPlayers: 1
@@ -40899,7 +41444,7 @@ SCES-03706:
     publisher: "Sony"
     developer: "Doki Denki"
     releaseDate: "2001-11-21"
-    genre: "Party / Mini games"
+    genre: "Party / Mini Games"
     languages:
       - French
     minPlayers: 1
@@ -40921,7 +41466,7 @@ SLUS-01513:
     publisher: "Bam! Entertaiment / Disney Interactive"
     developer: "Revolution Software"
     releaseDate: "2002-11-05"
-    genre: "Educational / Mini games"
+    genre: "Educational / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -40959,7 +41504,7 @@ SCES-01489:
     publisher: "Sony"
     developer: "Traveller's Tales"
     releaseDate: "1999-02-19"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -40978,7 +41523,7 @@ SCES-01520:
     publisher: "Sony"
     developer: "Traveller's Tales"
     releaseDate: "1999-02-19"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - French
     minPlayers: 1
@@ -40997,7 +41542,7 @@ SLPM-86330:
     publisher: "Konami"
     developer: "Traveller's Tales"
     releaseDate: "1999-10-28"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - Japanese
     minPlayers: 1
@@ -41016,7 +41561,7 @@ SCUS-94288:
     publisher: "Sony"
     developer: "Traveller's Tales"
     releaseDate: "1998-11-01"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -41117,7 +41662,7 @@ SCES-01522:
     publisher: "Sony"
     developer: "Traveller's Tales"
     releaseDate: "1999-02-19"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - Italian
     minPlayers: 1
@@ -41139,7 +41684,7 @@ SCES-01523:
     publisher: "Sony"
     developer: "Traveller's Tales"
     releaseDate: "1999-02-19"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - Spanish
     minPlayers: 1
@@ -41177,7 +41722,7 @@ SLES-03314:
     publisher: "Activision"
     developer: "Traveller's Tales"
     releaseDate: "2000-11-10"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - Italian
     minPlayers: 1
@@ -41196,7 +41741,7 @@ SLES-03310:
     publisher: "Activision"
     developer: "Traveller's Tales"
     releaseDate: "2000-11-10"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -41218,7 +41763,7 @@ SLUS-01192:
     publisher: "Activision"
     developer: "Traveller's Tales"
     releaseDate: "2000-11-01"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -41237,7 +41782,7 @@ SLES-03313:
     publisher: "Activision"
     developer: "Traveller's Tales"
     releaseDate: "2000-11-10"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - German
     minPlayers: 1
@@ -41256,7 +41801,7 @@ SCES-01521:
     publisher: "Sony"
     developer: "Traveller's Tales"
     releaseDate: "1999-02-19"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - German
     minPlayers: 1
@@ -41294,7 +41839,7 @@ SCES-01525:
     publisher: "Sony"
     developer: "Traveller's Tales"
     releaseDate: "1999-02-19"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - Dutch
     minPlayers: 1
@@ -41313,7 +41858,7 @@ SCES-01526:
     publisher: "Sony"
     developer: "Traveller's Tales"
     releaseDate: "1999-02-19"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - Swedish
     minPlayers: 1
@@ -41332,7 +41877,7 @@ SCES-01524:
     publisher: "Sony"
     developer: "Traveller's Tales"
     releaseDate: "1999-02-19"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - Danish
     minPlayers: 1
@@ -41351,7 +41896,7 @@ SLES-03312:
     publisher: "Activision"
     developer: "Traveller's Tales"
     releaseDate: "2000-11-10"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - French
     minPlayers: 1
@@ -41477,6 +42022,8 @@ SCES-03759:
     linkCable: false
 SCED-03811:
   name: "Disney-Pixar Monsters, Inc. - Scare Island (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94635:
   name: "Disney-Pixar Monsters, Inc. - Scream Team (USA)"
   compatibility:
@@ -41585,7 +42132,7 @@ SCES-01737:
     publisher: "Sony"
     developer: "Traveller's Tales"
     releaseDate: "1999-02-19"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - Finnish
     minPlayers: 1
@@ -41656,6 +42203,8 @@ SLES-02067:
     linkCable: false
 SLED-02416:
   name: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue! (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00893:
   name: "Disney-Pixar Toy Story 2 - Buzz Lightyear to the Rescue! (USA)"
   compatibility:
@@ -41811,7 +42360,7 @@ SLES-03315:
     publisher: "Activision"
     developer: "Traveller's Tales"
     releaseDate: "2000-11-10"
-    genre: "Action / PLatformer"
+    genre: "Action / Platformer"
     languages:
       - Spanish
     minPlayers: 1
@@ -42174,7 +42723,7 @@ SCES-02005:
     publisher: "Sony / Disney Interactive"
     developer: "Revolution Software"
     releaseDate: "1999-09-17"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - German
     minPlayers: 1
@@ -42366,7 +42915,7 @@ SCES-03747:
     publisher: "Sony"
     developer: "Doki Denki"
     releaseDate: "2001-11-21"
-    genre: "Party / Mini games"
+    genre: "Party / Mini Games"
     languages:
       - Danish
     minPlayers: 1
@@ -42604,6 +43153,8 @@ SLPS-00804:
     linkCable: false
 SLED-00594:
   name: "Disruptor (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00224:
   name: "Disruptor (USA)"
   compatibility:
@@ -42666,6 +43217,8 @@ SLUS-00317:
     linkCable: false
 SLPM-80286:
   name: "DoDonPachi (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01364:
   name: "DoDonPachi (Japan) (Rev 1)"
   compatibility:
@@ -42747,6 +43300,8 @@ SLPS-01559:
     linkCable: false
 SLPM-80294:
   name: "Dokapon! Ikari no Tekken (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91190:
   name: "Dokapon! Ikari no Tekken (Japan) (Rev 2)"
   controllers:
@@ -42773,7 +43328,7 @@ SLPS-01454:
     publisher: "Bottom Up"
     developer: "Bottom Up"
     releaseDate: "1998-06-11"
-    genre: "Simulation."
+    genre: "Simulation"
     languages:
       - Japanese
     minPlayers: 1
@@ -42791,7 +43346,7 @@ SLPS-01942:
     publisher: "Bottom Up"
     developer: "Dream Japan"
     releaseDate: "1999-03-11"
-    genre: "Simulation."
+    genre: "Simulation"
     languages:
       - Japanese
     minPlayers: 1
@@ -42822,6 +43377,8 @@ SLPS-01573:
     linkCable: false
 SLPM-80285:
   name: "Doki Doki Poyatchio!! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03125:
   name: "Doki Doki Poyatchio!! [Reprint]"
   controllers:
@@ -43052,7 +43609,7 @@ SLPS-02819:
     publisher: "BEC"
     developer: "InterBEC"
     releaseDate: "2000-08-31"
-    genre: "Simulation / Mini games"
+    genre: "Simulation / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -43103,6 +43660,8 @@ SCPM-85006:
   name: "Doko Demo Issho (Japan) (Calpis Water Version)"
 PCPX-96152:
   name: "Doko Demo Issho (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10142:
   name: "Doko Demo Issho (Japan) (Rev 1)"
   controllers:
@@ -43322,6 +43881,8 @@ SLES-00132:
     linkCable: true
 SLES-00157:
   name: "Doom (Europe) (One Level Demo Disc)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00308:
   name: "Doom (Japan)"
   controllers:
@@ -43514,7 +44075,7 @@ SLPS-01984:
     publisher: "KSS"
     developer: "KSS"
     releaseDate: "1999-05-20"
-    genre: "Sports / Sumo / Simulation"
+    genre: "Sports - Sumo / Simulation"
     languages:
       - Japanese
     minPlayers: 1
@@ -43552,7 +44113,7 @@ SLPS-01362:
     publisher: "Yumedia"
     developer: "Aroma"
     releaseDate: "1998-05-14"
-    genre: "Sports / Dodgeball"
+    genre: "Sports - Dodgeball"
     languages:
       - Japanese
     minPlayers: 1
@@ -43601,6 +44162,8 @@ SLPS-00191:
     linkCable: false
 SCED-02257:
   name: "Double Life (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03526:
   name: "Doubutsu Chara Navi Uranai 2 - Kosei Shinrigaku + Ren'ai Uranai Puzzle (Japan)"
   controllers:
@@ -43647,7 +44210,7 @@ SLPS-91450:
     publisher: "ASK Corporation"
     developer: "Ornith"
     releaseDate: "2002-01-31"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -43692,7 +44255,7 @@ SLPS-02011:
     publisher: "ASK Corporation"
     developer: "Ornith"
     releaseDate: "1999-04-01"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -44452,7 +45015,7 @@ SLES-03735:
     publisher: "Bandai"
     developer: "Tose Software"
     releaseDate: "1997-12-10"
-    genre: "Fighting ."
+    genre: "Fighting "
     languages:
       - English
     minPlayers: 1
@@ -44470,7 +45033,7 @@ SLES-00964:
     publisher: "Bandai"
     developer: "Tose Software"
     releaseDate: "1997-12-10"
-    genre: "Fighting ."
+    genre: "Fighting "
     languages:
       - French
     minPlayers: 1
@@ -44488,7 +45051,7 @@ SLES-03683:
     publisher: "Bandai"
     developer: "Tose Software"
     releaseDate: "1997-12-10"
-    genre: "Fighting ."
+    genre: "Fighting "
     languages:
       - German
     minPlayers: 1
@@ -44506,7 +45069,7 @@ SLES-03684:
     publisher: "Bandai"
     developer: "Tose Software"
     releaseDate: "1997-12-10"
-    genre: "Fighting ."
+    genre: "Fighting "
     languages:
       - Italian
     minPlayers: 1
@@ -44524,7 +45087,7 @@ SLPS-00949:
     publisher: "Bandai"
     developer: "Tose Software"
     releaseDate: "1997-08-21"
-    genre: "Fighting ."
+    genre: "Fighting "
     languages:
       - Japanese
     minPlayers: 1
@@ -44536,6 +45099,8 @@ SLPS-00949:
     linkCable: false
 SLPM-80112:
   name: "Dragon Ball - Final Bout (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91079:
   name: "Dragon Ball - Final Bout (Japan) (Rev 1)"
   controllers:
@@ -44544,7 +45109,7 @@ SLPS-91079:
     publisher: "Bandai"
     developer: "Tose Software"
     releaseDate: "1998-07-23"
-    genre: "Fighting ."
+    genre: "Fighting "
     languages:
       - Japanese
     minPlayers: 1
@@ -44565,7 +45130,7 @@ SLES-03685:
     publisher: "Bandai"
     developer: "Tose Software"
     releaseDate: "1997-12-10"
-    genre: "Fighting ."
+    genre: "Fighting "
     languages:
       - Spanish
     minPlayers: 1
@@ -44586,7 +45151,7 @@ SLUS-00493:
     publisher: "Bandai"
     developer: "Tose Software"
     releaseDate: "1997-10-01"
-    genre: "Fighting ."
+    genre: "Fighting "
     languages:
       - English
     minPlayers: 1
@@ -44604,7 +45169,7 @@ SCPS-45109:
     publisher: "Bandai"
     developer: "Tose Software"
     releaseDate: "1997-08-21"
-    genre: "Fighting ."
+    genre: "Fighting "
     languages:
       - Japanese
     minPlayers: 1
@@ -44843,6 +45408,8 @@ SLPM-86293:
     linkCable: false
 SLPM-80479:
   name: "Dragon Quest Characters - Torneko no Daibouken 2 - Fushigi no Dungeon (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86916:
   name: "Dragon Quest IV - Michibikareshi Mono-tachi (Japan)"
   controllers:
@@ -45573,7 +46140,7 @@ SLES-00300:
     publisher: "Acclaim"
     developer: "Funcom"
     releaseDate: "1996-11-30"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
       - French
@@ -45593,7 +46160,7 @@ SLUS-00226:
     publisher: "Acclaim"
     developer: "Funcom"
     releaseDate: "1996-11-30"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -45763,6 +46330,8 @@ SLPS-00250:
     linkCable: false
 SLPM-80037:
   name: "Drift King Shutokou Battle - Tsuchiya Keiichi & Bandou Masaaki (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01816:
   name: "Driver (Europe)"
   controllers:
@@ -45785,6 +46354,8 @@ SLES-01816:
     linkCable: false
 SLED-01817:
   name: "Driver (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01976:
   name: "Driver (France)"
   compatibility:
@@ -45919,6 +46490,8 @@ SLUS-00842:
     linkCable: false
 SLUS-90093:
   name: "Driver 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - SLUS-90093
     - SLUS-90094
@@ -46241,6 +46814,8 @@ SLES-12997:
     linkCable: false
 SLED-03110:
   name: "Driver 2 - Back on the Streets (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86678:
   name: "Drug Store, The (Japan)"
   controllers:
@@ -46297,8 +46872,12 @@ SLPS-01246:
     linkCable: false
 SCED-03358:
   name: "Dschungelbuch, Das - Groove Party (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01386:
   name: "Dual Shock Demo (Australia)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02821:
   name: "Ducati World (Europe)"
   compatibility:
@@ -46414,6 +46993,8 @@ SLES-00987:
     linkCable: false
 SLED-01027:
   name: "Duke Nukem (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisablePGXP # 2.5D, not beneficial, breaks rendering.
     - DisableWidescreen # No effect.
@@ -46599,10 +47180,14 @@ SLUS-00583:
     linkCable: false
 SLUS-80583:
   name: "Duke Nukem - Time to Kill (USA) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Improves wall texture wobble.
 SLUS-90036:
   name: "Duke Nukem - Time to Kill (USA) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Improves wall texture wobble.
 SLPS-01557:
@@ -46927,7 +47512,7 @@ SLPS-01387:
     publisher: "Victor Interactive Software, Inc"
     developer: "Victor Interactive Software, Inc"
     releaseDate: "1998-05-21"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - Japanese
     minPlayers: 1
@@ -46948,7 +47533,7 @@ SLPS-02554:
     publisher: "A-Max"
     developer: "A-Max"
     releaseDate: "2000-10-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -46967,7 +47552,7 @@ SLPS-03436:
     publisher: "A-Max"
     developer: "A-Max"
     releaseDate: "2002-05-16"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -46986,7 +47571,7 @@ SLPS-03575:
     publisher: "A-Max"
     developer: "A-Max"
     releaseDate: "2004-04-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -47005,7 +47590,7 @@ SLPS-01414:
     publisher: "A-Max"
     developer: "A-Max"
     releaseDate: "1998-06-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -47017,6 +47602,8 @@ SLPS-01414:
     linkCable: false
 PAPX-90043:
   name: "Dynamite Soccer 98 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00885:
   name: "Dynasty Warriors (Europe)"
   controllers:
@@ -47100,6 +47687,8 @@ SLUS-01385:
     linkCable: false
 SCED-03914:
   name: "E3 Demo 2002 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02538:
   name: "EA Sports Superbike 2000 (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
@@ -47244,7 +47833,7 @@ SLES-02823:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Acclaim Studios Salt Lake City, Inc"
     releaseDate: "2000-08-09"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -47263,7 +47852,7 @@ SLES-03069:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Acclaim Studios Salt Lake City, Inc"
     releaseDate: "2000-08-09"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -47282,7 +47871,7 @@ SLUS-01169:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Acclaim Studios Salt Lake City, Inc"
     releaseDate: "2000-08-09"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -47301,7 +47890,7 @@ SLES-02535:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Acclaim Studios Salt Lake City, Inc"
     releaseDate: "2000-02-17"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -47320,7 +47909,7 @@ SLES-02536:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Acclaim Studios Salt Lake City, Inc"
     releaseDate: "2000-02-17"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - German
     minPlayers: 1
@@ -47339,7 +47928,7 @@ SLUS-01045:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Acclaim Studios Salt Lake City, Inc"
     releaseDate: "2000-02-17"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -47351,6 +47940,8 @@ SLUS-01045:
     linkCable: false
 SLUS-81045:
   name: "ECW Hardcore Revolution (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80159:
   name: "EGWord Ver 2.00 (Japan)"
 SLPS-00820:
@@ -47379,7 +47970,7 @@ SCPS-40001:
     publisher: "Antinos Records"
     developer: "Antinos Records"
     releaseDate: "1996-06-21"
-    genre: "Data / Pictures / Music."
+    genre: "Data / Pictures / Music"
     languages:
       - Japanese
     minPlayers: 1
@@ -47397,7 +47988,7 @@ SCPS-40002:
     publisher: "Antinos Records"
     developer: "Antinos Records"
     releaseDate: "1996-06-21"
-    genre: "Data / Pictures / Music."
+    genre: "Data / Pictures / Music"
     languages:
       - Japanese
     minPlayers: 1
@@ -47415,7 +48006,7 @@ SCPS-40003:
     publisher: "Antinos Records"
     developer: "Antinos Records"
     releaseDate: "1996-06-21"
-    genre: "Data / Pictures / Music."
+    genre: "Data / Pictures / Music"
     languages:
       - Japanese
     minPlayers: 1
@@ -47433,7 +48024,7 @@ SCPS-40004:
     publisher: "Antinos Records"
     developer: "Antinos Records"
     releaseDate: "1996-06-21"
-    genre: "Data / Pictures / Music."
+    genre: "Data / Pictures / Music"
     languages:
       - Japanese
     minPlayers: 1
@@ -47451,7 +48042,7 @@ SCPS-40005:
     publisher: "Antinos Records"
     developer: "Antinos Records"
     releaseDate: "1996-06-21"
-    genre: "Data / Pictures / Music."
+    genre: "Data / Pictures / Music"
     languages:
       - Japanese
     minPlayers: 1
@@ -47469,7 +48060,7 @@ SCES-00063:
     publisher: "Sony"
     developer: "SISA"
     releaseDate: "1995-12-15"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -47488,7 +48079,7 @@ SLUS-01186:
     publisher: "Konami"
     developer: "Saffire"
     releaseDate: "2000-09-19"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -47506,7 +48097,7 @@ SIPS-60004:
     publisher: "Sony"
     developer: "SISA"
     releaseDate: "1996-05-24"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - Japanese
     minPlayers: 1
@@ -47784,6 +48375,8 @@ SLPS-02167:
     linkCable: false
 SLPM-80468:
   name: "Echo Night 2 - Nemuri no Shihaisha (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00648:
   name: "Econo Kids - Ta ga Tame ni Kane wa Naru (Japan)"
   controllers:
@@ -48131,8 +48724,12 @@ SLPS-01750:
     linkCable: false
 SLPM-80332:
   name: "Ehrgeiz - God Bless the Ring (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80333:
   name: "Ehrgeiz - God Bless the Ring (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00809:
   name: "Ehrgeiz - God Bless the Ring (USA)"
   compatibility:
@@ -48159,16 +48756,28 @@ SLED-02411:
   name: "Eidos (France)"
 SLUS-90040:
   name: "Eidos Demo CD (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-90047:
   name: "Eidos Demo CD Volume 3 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-90051:
   name: "Eidos Demo CD Volume 4 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-90074:
   name: "Eidos Demo CD Volume 6 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-90065:
   name: "Eidos Demo Disc Volume 5 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-90076:
   name: "Eidos Demo Disc Volume 7 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02173:
   name: "Eikan wa Kimi ni 4 (Japan)"
   controllers:
@@ -48198,7 +48807,7 @@ SLPM-86003:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-06-21"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -48228,6 +48837,8 @@ SLPS-01008:
     linkCable: false
 SLPM-80164:
   name: "Einhaender (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94243:
   name: "Einhaender (USA)"
   compatibility:
@@ -48452,7 +49063,7 @@ SCES-02177:
     publisher: "Sony / Disney Interactive"
     developer: "Capcom"
     releaseDate: "1999-11-26"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - Spanish
     minPlayers: 1
@@ -48871,7 +49482,7 @@ SLES-02985:
     publisher: "TDK / Universal / Sound Source Interactive"
     developer: "Realtime Associates Inc"
     releaseDate: "2000-10-13"
-    genre: "Action / Platformer."
+    genre: "Action / Platformer"
     languages:
       - Spanish
     minPlayers: 1
@@ -49014,7 +49625,7 @@ SLPS-01937:
     publisher: "Oracion"
     developer: "Exit"
     releaseDate: "1999-03-25"
-    genre: "Mini games"
+    genre: "Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -49176,7 +49787,7 @@ SCES-01704:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "London Studio"
     releaseDate: "1999-12-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -49195,7 +49806,7 @@ SCES-03076:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "Sony Studio Soho"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -49207,6 +49818,8 @@ SCES-03076:
     linkCable: false
 SCED-03205:
   name: "Esto Es Futbol 2 (Spain) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02270:
   name: "Eternal Eyes (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -49269,6 +49882,8 @@ SLPS-00584:
     linkCable: false
 SLPM-80336:
   name: "Eurasia Express Satsujin Jiken (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86135:
   name: "Eurasia Express Satsujin Jiken (Japan) (Disc 1)"
   discSet:
@@ -49375,34 +49990,64 @@ SLPM-86138:
     linkCable: false
 SCED-04079:
   name: "Euro Demo (Future) 100 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04080:
   name: "Euro Demo (Future) 101 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04081:
   name: "Euro Demo (Future) 102 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04082:
   name: "Euro Demo (Future) 103 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04083:
   name: "Euro Demo (Future) 104 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04084:
   name: "Euro Demo (Future) 105 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04085:
   name: "Euro Demo (Future) 106 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04133:
   name: "Euro Demo (Future) 107 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04134:
   name: "Euro Demo (Future) 108 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04056:
   name: "Euro Demo (Future) 94 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04074:
   name: "Euro Demo (Future) 95 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04075:
   name: "Euro Demo (Future) 96 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04076:
   name: "Euro Demo (Future) 97 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04077:
   name: "Euro Demo (Future) 98 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04078:
   name: "Euro Demo (Future) 99 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00107-2:
   name: "Euro Demo 01 (Europe)"
   controllers:
@@ -49413,7 +50058,7 @@ SLES-00107-2:
     publisher: "Eidos Interactive"
     developer: "Core Design"
     releaseDate: "1998-06-20"
-    genre: "Action / Adventure / Platformer"
+    genre: "** DEMO **"
     languages:
       - Italian
     minPlayers: 1
@@ -49425,446 +50070,882 @@ SLES-00107-2:
     linkCable: false
 SCED-01844:
   name: "Euro Demo 01-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02666:
   name: "Euro Demo 01-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03476:
   name: "Euro Demo 01-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03903:
   name: "Euro Demo 01-03 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00150:
   name: "Euro Demo 02 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00583:
   name: "Euro Demo 02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01845:
   name: "Euro Demo 02-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02667:
   name: "Euro Demo 02-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03477:
   name: "Euro Demo 02-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - SCED-03477
     - SCED-03809
 SLES-00181:
   name: "Euro Demo 03 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00622:
   name: "Euro Demo 03 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01846:
   name: "Euro Demo 03-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02668:
   name: "Euro Demo 03-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03478:
   name: "Euro Demo 03-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03905:
   name: "Euro Demo 03-04-2003 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00182:
   name: "Euro Demo 04 (Europe)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - SCES-00182
     - SLES-00182
 SCED-00669:
   name: "Euro Demo 04 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01847:
   name: "Euro Demo 04-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02669:
   name: "Euro Demo 04-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03479:
   name: "Euro Demo 04-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01995:
   name: "Euro Demo 04-99 'Action Special' (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01835:
   name: "Euro Demo 04-99 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00183:
   name: "Euro Demo 05 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00670:
   name: "Euro Demo 05 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01848:
   name: "Euro Demo 05-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03468:
   name: "Euro Demo 05-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03887:
   name: "Euro Demo 05-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01836:
   name: "Euro Demo 05-99 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00184:
   name: "Euro Demo 06 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00610:
   name: "Euro Demo 06 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00671:
   name: "Euro Demo 06 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02659:
   name: "Euro Demo 06-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03469:
   name: "Euro Demo 06-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03892:
   name: "Euro Demo 06-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02050:
   name: "Euro Demo 06-99 'Special' (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01837:
   name: "Euro Demo 06-99 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00185:
   name: "Euro Demo 07 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00668:
   name: "Euro Demo 07 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00672:
   name: "Euro Demo 07 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02660:
   name: "Euro Demo 07-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03470:
   name: "Euro Demo 07-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03893:
   name: "Euro Demo 07-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01838:
   name: "Euro Demo 07-99 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00360:
   name: "Euro Demo 08 (Europe) (SCED-00360)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00186:
   name: "Euro Demo 08 (Europe) (SCES-00186)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00673:
   name: "Euro Demo 08 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02661:
   name: "Euro Demo 08-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03471:
   name: "Euro Demo 08-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03894:
   name: "Euro Demo 08-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01839:
   name: "Euro Demo 08-99 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00890:
   name: "Euro Demo 08b (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00361:
   name: "Euro Demo 09 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00772:
   name: "Euro Demo 09 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00674:
   name: "Euro Demo 09 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02662:
   name: "Euro Demo 09-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03472:
   name: "Euro Demo 09-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03895:
   name: "Euro Demo 09-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01840:
   name: "Euro Demo 09-99 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00362:
   name: "Euro Demo 10 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00773:
   name: "Euro Demo 10 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00675:
   name: "Euro Demo 10 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02663:
   name: "Euro Demo 10-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03473:
   name: "Euro Demo 10-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03896:
   name: "Euro Demo 10-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01841:
   name: "Euro Demo 10-99 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00363:
   name: "Euro Demo 11 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00774:
   name: "Euro Demo 11 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00676:
   name: "Euro Demo 11 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02664:
   name: "Euro Demo 11-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03474:
   name: "Euro Demo 11-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03897:
   name: "Euro Demo 11-02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01842:
   name: "Euro Demo 11-99 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00364:
   name: "Euro Demo 12 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00775:
   name: "Euro Demo 12 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00677:
   name: "Euro Demo 12 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02665:
   name: "Euro Demo 12-00 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03475:
   name: "Euro Demo 12-01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01843:
   name: "Euro Demo 12-99 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00365:
   name: "Euro Demo 13 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00776:
   name: "Euro Demo 13 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00678:
   name: "Euro Demo 13 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00366:
   name: "Euro Demo 14 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00777:
   name: "Euro Demo 14 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00679:
   name: "Euro Demo 14 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00367:
   name: "Euro Demo 15 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00778:
   name: "Euro Demo 15 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00680:
   name: "Euro Demo 15 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00368:
   name: "Euro Demo 16 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00779:
   name: "Euro Demo 16 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01121:
   name: "Euro Demo 16 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00369:
   name: "Euro Demo 17 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00780:
   name: "Euro Demo 17 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01122:
   name: "Euro Demo 17 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00370:
   name: "Euro Demo 18 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00781:
   name: "Euro Demo 18 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01123:
   name: "Euro Demo 18 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00371:
   name: "Euro Demo 19 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01124:
   name: "Euro Demo 19 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00372:
   name: "Euro Demo 20 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00782:
   name: "Euro Demo 20 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01125:
   name: "Euro Demo 20 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00817:
   name: "Euro Demo 21 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01114:
   name: "Euro Demo 21 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01126:
   name: "Euro Demo 21 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00818:
   name: "Euro Demo 22 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01115:
   name: "Euro Demo 22 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01127:
   name: "Euro Demo 22 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00819:
   name: "Euro Demo 23 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01116:
   name: "Euro Demo 23 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01128:
   name: "Euro Demo 23 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00820:
   name: "Euro Demo 24 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01117:
   name: "Euro Demo 24 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01129:
   name: "Euro Demo 24 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00821:
   name: "Euro Demo 25 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01118:
   name: "Euro Demo 25 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01130:
   name: "Euro Demo 25 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00822:
   name: "Euro Demo 26 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01119:
   name: "Euro Demo 26 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00823:
   name: "Euro Demo 27 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01120:
   name: "Euro Demo 27 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01777:
   name: "Euro Demo 27 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00824:
   name: "Euro Demo 28 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01785:
   name: "Euro Demo 28 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01786:
   name: "Euro Demo 28 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00825:
   name: "Euro Demo 29 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01849:
   name: "Euro Demo 29 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01834:
   name: "Euro Demo 29 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00826:
   name: "Euro Demo 30 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01850:
   name: "Euro Demo 30 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00827:
   name: "Euro Demo 31 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01851:
   name: "Euro Demo 31 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00828:
   name: "Euro Demo 32 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01852:
   name: "Euro Demo 32 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00829:
   name: "Euro Demo 33 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01853:
   name: "Euro Demo 33 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01144:
   name: "Euro Demo 34 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01854:
   name: "Euro Demo 34 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01145:
   name: "Euro Demo 35 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01855:
   name: "Euro Demo 35 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01856:
   name: "Euro Demo 36 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01147:
   name: "Euro Demo 37 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01857:
   name: "Euro Demo 37 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01148:
   name: "Euro Demo 38 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01858:
   name: "Euro Demo 38 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01149:
   name: "Euro Demo 39 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01859:
   name: "Euro Demo 39 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01150:
   name: "Euro Demo 40 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01860:
   name: "Euro Demo 40 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01151:
   name: "Euro Demo 41 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01861:
   name: "Euro Demo 41 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01152:
   name: "Euro Demo 42 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01862:
   name: "Euro Demo 42 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01153:
   name: "Euro Demo 43 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02647:
   name: "Euro Demo 43 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01818:
   name: "Euro Demo 44 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02648:
   name: "Euro Demo 44 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01819:
   name: "Euro Demo 45 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02649:
   name: "Euro Demo 45 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01820:
   name: "Euro Demo 46 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02650:
   name: "Euro Demo 46 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01821:
   name: "Euro Demo 47 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02651:
   name: "Euro Demo 47 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01822:
   name: "Euro Demo 48 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02652:
   name: "Euro Demo 48 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01823:
   name: "Euro Demo 49 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02653:
   name: "Euro Demo 49 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02229:
   name: "Euro Demo 49 (Italy)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02230:
   name: "Euro Demo 49 (Spain)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01824:
   name: "Euro Demo 50 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02654:
   name: "Euro Demo 50 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01825:
   name: "Euro Demo 51 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02655:
   name: "Euro Demo 51 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01826:
   name: "Euro Demo 52 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02656:
   name: "Euro Demo 52 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01827:
   name: "Euro Demo 53 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02657:
   name: "Euro Demo 53 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01828:
   name: "Euro Demo 54 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01829:
   name: "Euro Demo 55 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03461:
   name: "Euro Demo 55 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01830:
   name: "Euro Demo 56 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01831:
   name: "Euro Demo 57 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02632:
   name: "Euro Demo 58 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02633:
   name: "Euro Demo 59 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02634:
   name: "Euro Demo 60 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02635:
   name: "Euro Demo 61 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02636:
   name: "Euro Demo 62 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02637:
   name: "Euro Demo 63 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02638:
   name: "Euro Demo 64 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02639:
   name: "Euro Demo 65 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02640:
   name: "Euro Demo 66 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02641:
   name: "Euro Demo 67 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02642:
   name: "Euro Demo 68 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02643:
   name: "Euro Demo 69 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02644:
   name: "Euro Demo 70 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02645:
   name: "Euro Demo 71 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02646:
   name: "Euro Demo 72 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03450:
   name: "Euro Demo 73 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03451:
   name: "Euro Demo 74 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03452:
   name: "Euro Demo 75 (Europe, Australia)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03453:
   name: "Euro Demo 76 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03454:
   name: "Euro Demo 77 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03455:
   name: "Euro Demo 78 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03456:
   name: "Euro Demo 79 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03457:
   name: "Euro Demo 80 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03458:
   name: "Euro Demo 81 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03785:
   name: "Euro Demo 82 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03786:
   name: "Euro Demo 83 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03787:
   name: "Euro Demo 84 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03788:
   name: "Euro Demo 85 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03789:
   name: "Euro Demo 86 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03790:
   name: "Euro Demo 87 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03791:
   name: "Euro Demo 88 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03792:
   name: "Euro Demo 89 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03793:
   name: "Euro Demo 90 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03794:
   name: "Euro Demo 91 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04016:
   name: "Euro Demo 92 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00994:
   name: "Euro Demo Classics Special (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04035:
   name: "Euro Demo Future 93 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03415:
   name: "Europe Racer (Europe) (En,Fr,De,Es,It,Nl)"
   compatibility:
@@ -49902,7 +50983,7 @@ SLES-03082:
     publisher: "Virgin Interactive"
     developer: "Virgin Interactive"
     releaseDate: "2001-03-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -50442,18 +51523,74 @@ SLPS-03278:
     linkCable: false
 LSP-99019101:
   name: "Every Child Can Succeed 1 (USA)"
+  codes:
+    - LSP99019101
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99019201:
   name: "Every Child Can Succeed 2 (USA)"
+  codes:
+    - LSP99019201
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99019301:
   name: "Every Child Can Succeed 3 (USA)"
+  codes:
+    - LSP99019401
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99019401:
   name: "Every Child Can Succeed 4 (USA)"
+  codes:
+    - LSP99019401
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99019501:
   name: "Every Child Can Succeed 5 (USA)"
+  codes:
+    - LSP99019501
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99019601:
   name: "Every Child Can Succeed 6 (USA)"
+  codes:
+    - LSP99019601
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99019701:
   name: "Every Child Can Succeed 7 (USA)"
+  codes:
+    - LSP99019701
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SCES-00983:
   name: "Everybody's Golf (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -50462,7 +51599,7 @@ SCES-00983:
     publisher: "Sony"
     developer: "Camelot"
     releaseDate: "1998-06-01"
-    genre: "Sports / Golf / Mini Golf"
+    genre: "Sports - Golf / Mini Golf"
     languages:
       - English
       - French
@@ -50485,7 +51622,7 @@ SCES-02146:
     publisher: "Sony"
     developer: "Clap Hanz"
     releaseDate: "2000-02-22"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -50673,6 +51810,8 @@ SLPS-01117:
     linkCable: false
 SLED-00797:
   name: "Excalibur 2555 A.D. (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00478:
   name: "Excalibur 2555 A.D. (Europe) (En,Fr,De,Es)"
   controllers:
@@ -50739,7 +51878,7 @@ SLPM-86124:
     publisher: "Konami"
     developer: "KCEO"
     releaseDate: "1998-10-08"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -50758,7 +51897,7 @@ SLPM-86295:
     publisher: "Konami"
     developer: "KCE Nagoya"
     releaseDate: "1999-09-30"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -50777,7 +51916,7 @@ SLPM-86729:
     publisher: "Konami"
     developer: "KCE Nagoya"
     releaseDate: "2001-01-25"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -50796,7 +51935,7 @@ SLPM-86949:
     publisher: "Konami"
     developer: "KCE Nagoya"
     releaseDate: "2001-11-22"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -50815,7 +51954,7 @@ SLPS-02885:
     publisher: "Yuke's Co. Ltd / THQ"
     developer: "Yuke's Co. Ltd"
     releaseDate: "2000-08-03"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -50837,7 +51976,7 @@ SLPS-03122:
     publisher: "Yuke's Co. Ltd / THQ"
     developer: "Yuke's Co. Ltd"
     releaseDate: "2002-11-07"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -50849,8 +51988,12 @@ SLPS-03122:
     linkCable: false
 SLPM-80601:
   name: "Exciting Pro Wres 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02043:
   name: "Exclusive PlayStation Racing Demos (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00091:
   name: "Exector (Japan)"
   controllers:
@@ -50940,7 +52083,7 @@ SLPS-00342:
     publisher: "Nichibutsu (Nihon Bussan)"
     developer: "Nichibutsu (Nihon Bussan)"
     releaseDate: "1996-05-31"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - Japanese
     minPlayers: 1
@@ -50972,6 +52115,8 @@ SLES-00716:
     linkCable: true
 SLED-00956:
   name: "Explosive Racing (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00625:
   name: "Extra Bright (Japan)"
   controllers:
@@ -51121,7 +52266,7 @@ SLES-00501:
     publisher: "Microids"
     developer: "Virtual Studio"
     releaseDate: "1998-03-10"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -51133,6 +52278,8 @@ SLES-00501:
     linkCable: false
 SLED-01193:
   name: "Extreme Snow Break (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   settings:
     dmaMaxSliceTicks: 10 # Very sensitive to DMA timing, otherwise polygon flicker.
     dmaHaltTicks: 100 # CPU needs to run significantly faster than DMA.
@@ -51176,7 +52323,7 @@ SLES-00416:
     publisher: "Eidos Interactive"
     developer: "Krisalis Software"
     releaseDate: "1999-06-10"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -51195,7 +52342,7 @@ SLES-02254:
     publisher: "Electronic Arts"
     developer: "Krisalis Software Ltd"
     releaseDate: "1999-10-29"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -51215,7 +52362,7 @@ SLES-03061:
     publisher: "Electronic Arts"
     developer: "Krisalis Software Ltd"
     releaseDate: "2000-09-08"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -51234,7 +52381,7 @@ SLES-03063:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-09-08"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -51253,7 +52400,7 @@ SLES-02142:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "1999-08-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -51673,7 +52820,7 @@ SLES-00916:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1997-11-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -51691,7 +52838,7 @@ SLES-00915:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1997-11-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -51714,7 +52861,7 @@ SLES-00914:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1997-11-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -51737,7 +52884,7 @@ SLES-00917:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1997-11-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -51755,7 +52902,7 @@ SLPS-01383:
     publisher: "Electronic Arts Victor"
     developer: "EA Canada"
     releaseDate: "1998-05-14"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -51767,6 +52914,8 @@ SLPS-01383:
     linkCable: false
 SLPM-80236:
   name: "FIFA - Road to World Cup 98 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00520:
   name: "FIFA - Road to World Cup 98 (USA) (En,Fr,De,Es,Nl,Sv)"
   controllers:
@@ -51775,7 +52924,7 @@ SLUS-00520:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1997-12-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -51798,7 +52947,7 @@ SLPS-91150:
     publisher: "Electronic Arts Victor"
     developer: "EA Canada"
     releaseDate: "1999-08-12"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -51816,7 +52965,7 @@ SLES-00918:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1997-11-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -51840,7 +52989,7 @@ SLES-02315:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -51863,7 +53012,7 @@ SLES-02316:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -51882,7 +53031,7 @@ SLES-02317:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -51901,7 +53050,7 @@ SLES-02320:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Greek
     minPlayers: 1
@@ -51920,7 +53069,7 @@ SLES-02321:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Hebrew
     minPlayers: 1
@@ -51939,7 +53088,7 @@ SLES-02319:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -51958,7 +53107,7 @@ SLES-02318:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -51982,7 +53131,7 @@ SLPS-02675:
     publisher: "Electronic Arts Victor"
     developer: "EA Canada"
     releaseDate: "2000-03-30"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -52001,7 +53150,7 @@ SLUS-00994:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1999-10-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52024,7 +53173,7 @@ SLES-03140:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52047,7 +53196,7 @@ SLES-03141:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -52066,7 +53215,7 @@ SLES-03142:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52089,7 +53238,7 @@ SLES-03143:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Greek
     minPlayers: 1
@@ -52108,7 +53257,7 @@ SLES-03144:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Hebrew
     minPlayers: 1
@@ -52127,7 +53276,7 @@ SLES-03145:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -52146,7 +53295,7 @@ SLES-03146:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52169,7 +53318,7 @@ SLUS-01262:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2000-11-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52191,7 +53340,7 @@ SLES-00504:
     publisher: "Electronic Arts"
     developer: "High Score Productions"
     releaseDate: "1996-11-16"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52214,7 +53363,7 @@ SLES-00505:
     publisher: "Electronic Arts"
     developer: "High Score Productions"
     releaseDate: "1996-11-16"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -52232,7 +53381,7 @@ SLES-00506:
     publisher: "Electronic Arts"
     developer: "High Score Productions"
     releaseDate: "1996-11-16"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -52251,7 +53400,7 @@ SLES-01584:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1998-11-20"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52275,7 +53424,7 @@ SLES-01585:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1998-11-20"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52299,7 +53448,7 @@ SLES-01586:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1998-11-20"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52323,7 +53472,7 @@ SLES-01587:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1998-11-20"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -52342,7 +53491,7 @@ SLES-01588:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1998-11-20"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52366,7 +53515,7 @@ SLUS-00782:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "1998-11-30"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -52385,7 +53534,7 @@ SLPS-02309:
     publisher: "Electronic Arts Victor"
     developer: "EA Canada"
     releaseDate: "1999-08-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -52404,7 +53553,7 @@ SLES-03666:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2001-11-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52427,7 +53576,7 @@ SLES-03668:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2001-11-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -52446,7 +53595,7 @@ SLES-03669:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2001-11-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52469,7 +53618,7 @@ SLES-03671:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2001-11-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -52488,7 +53637,7 @@ SLES-03672:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2001-11-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52511,7 +53660,7 @@ SLES-03977:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-10-13"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52532,7 +53681,7 @@ SLES-03978:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-10-13"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -52551,7 +53700,7 @@ SLES-03979:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-10-13"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -52570,7 +53719,7 @@ SLES-03980:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-10-13"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -52589,7 +53738,7 @@ SLES-03981:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-10-13"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52612,7 +53761,7 @@ SLES-04115:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2003-10-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -52631,7 +53780,7 @@ SLES-04116:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2003-10-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -52650,7 +53799,7 @@ SLES-04117:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2003-10-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -52669,7 +53818,7 @@ SLES-04119:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2003-10-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -52688,7 +53837,7 @@ SLES-04118:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2003-10-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -52707,7 +53856,7 @@ SLES-04165:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2004-10-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -52727,7 +53876,7 @@ SLES-04166:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2004-10-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -52746,7 +53895,7 @@ SLES-04168:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2004-10-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -52765,7 +53914,7 @@ SLES-04167:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2004-10-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -52784,7 +53933,7 @@ SLES-04169:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2004-10-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -52803,7 +53952,7 @@ SLUS-01408:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2001-10-31"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -52822,7 +53971,7 @@ SLUS-01504:
     publisher: "Electronic Arts"
     developer: "EA Canada"
     releaseDate: "2002-11-13"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - Spanish
@@ -52842,7 +53991,7 @@ SLUS-01578:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2003-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -52864,7 +54013,7 @@ SLUS-01585:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2004-10-18"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -52882,7 +54031,7 @@ SLES-00116:
     publisher: "Electronic Arts"
     developer: "Extended Play (EA Canada)"
     releaseDate: "1995-12-01"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -52905,7 +54054,7 @@ SLUS-00038:
     publisher: "Electronic Arts"
     developer: "Extended Play (EA Canada)"
     releaseDate: "1995-11-22"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -52923,7 +54072,7 @@ SLPS-00878:
     publisher: "Electronic Arts"
     developer: "High Score Productions"
     releaseDate: "1997-06-20"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -52941,7 +54090,7 @@ SLUS-00269:
     publisher: "Electronic Arts"
     developer: "High Score Productions"
     releaseDate: "1996-11-16"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -52965,7 +54114,7 @@ SLPS-01719:
     publisher: "EA Sports"
     developer: "Electronic Arts"
     releaseDate: "1998-11-05"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -52983,7 +54132,7 @@ SLUS-00636:
     publisher: "Fox Sports Interactive, Inc"
     developer: "Gremlin Graphics"
     releaseDate: "1998-06-30"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -53002,7 +54151,7 @@ SLUS-00635:
     publisher: "Fox Sports Interactive, Inc"
     developer: "Gremlin Graphics"
     releaseDate: "1998-06-30"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - Spanish
@@ -53077,6 +54226,8 @@ SLPS-00812:
     linkCable: false
 SLPM-80092:
   name: "Fade to Black (Japan) (En,Ja) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00236:
   name: "Fade to Black (USA) (En,Fr,De,Es,It)"
   compatibility:
@@ -53110,11 +54261,12 @@ LSP-080130:
   codes:
     - LSP-080130
     - LSP-905161
+    - LSP08013001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -53126,6 +54278,17 @@ LSP-080130:
     linkCable: false
 LSP-080140:
   name: "Faire Games - Mathematics (USA)"
+  controllers:
+    - DigitalController
+  codes:
+    - LSP-080140
+    - LSP08014001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLPS-00010:
   name: "Falcata - Astran Pardma no Monshou (Japan)"
   controllers:
@@ -53153,7 +54316,7 @@ SLPS-03487:
     publisher: "I'Max"
     developer: "I'Max"
     releaseDate: "2002-11-21"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -53174,7 +54337,7 @@ SLPS-01523:
     publisher: "Nichibutsu (Nihon Bussan)"
     developer: "Nihon Bussan"
     releaseDate: "2000-11-30"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -53210,7 +54373,7 @@ SLPS-03392:
     publisher: "Magnolia"
     developer: "Imagic"
     releaseDate: "2002-03-20"
-    genre: "Board / Chess"
+    genre: "Board - Chess"
     languages:
       - Japanese
     minPlayers: 1
@@ -53222,6 +54385,17 @@ SLPS-03392:
     linkCable: false
 LSP-150200:
   name: "Family Connection - A Guide to Lightspan (USA)"
+  controllers:
+    - DigitalController
+  codes:
+    - LSP-15020
+    - LSP15020001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLPS-03348:
   name: "Family Diamond (Japan)"
   controllers:
@@ -53357,7 +54531,7 @@ SLPS-03488:
     publisher: "I'Max"
     developer: "Magnolia (Korea Computer Center)"
     releaseDate: "2002-11-21"
-    genre: "Board / Igo."
+    genre: "Board / Igo"
     languages:
       - Japanese
     minPlayers: 1
@@ -53377,7 +54551,7 @@ SLPS-03489:
     publisher: "Magnolia"
     developer: "Magnolia"
     releaseDate: "2002-11-21"
-    genre: "Board / Shogi."
+    genre: "Board / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -53526,7 +54700,7 @@ SLES-00548:
     publisher: "Acclaim Entertaiment"
     developer: "Probe Entertainment Limited"
     releaseDate: "1997-08-30"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
       - French
@@ -53548,7 +54722,7 @@ SLPS-01034:
     publisher: "Acclaim Entertaiment"
     developer: "Probe Entertainment Limited"
     releaseDate: "1998-02-19"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -53569,7 +54743,7 @@ SLUS-00395:
     publisher: "Acclaim Entertaiment"
     developer: "Probe Entertainment Limited"
     releaseDate: "1997-08-30"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -54753,6 +55927,8 @@ SLPS-01313:
     linkCable: false
 SLED-01098:
   name: "Fighting Force & Tomb Raider II (Europe) (En,Fr,De) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00731:
   name: "Fighting Force (Europe) (En,Fr,De)"
   controllers:
@@ -54761,7 +55937,7 @@ SLES-00731:
     publisher: "Eidos Interactive"
     developer: "Core Design"
     releaseDate: "1997-11-15"
-    genre: "Beat'em up"
+    genre: "Beat'em Up"
     languages:
       - English
       - French
@@ -54775,6 +55951,8 @@ SLES-00731:
     linkCable: false
 SLED-00881:
   name: "Fighting Force (Europe) (En,Fr,De) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00433:
   name: "Fighting Force (USA)"
   compatibility:
@@ -54786,7 +55964,7 @@ SLUS-00433:
     publisher: "Eidos Interactive"
     developer: "Core Design"
     releaseDate: "1997-11-15"
-    genre: "Beat'em up"
+    genre: "Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -54798,6 +55976,8 @@ SLUS-00433:
     linkCable: false
 SLED-02314:
   name: "Fighting Force 2 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02233:
   name: "Fighting Force 2 (Europe) (En,Fr)"
   controllers:
@@ -54919,6 +56099,8 @@ SLPS-01696:
     linkCable: false
 SLPM-80341:
   name: "Fighting Illusion - K-1 Grand Prix '98 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00340:
   name: "Fighting Illusion - K-1 Grand Prix (Japan)"
   controllers:
@@ -55037,7 +56219,7 @@ SLPS-00631:
     publisher: "Naxat Soft"
     developer: "Naxat Soft"
     releaseDate: "1997-08-07"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -57216,10 +58398,14 @@ SLPM-87383:
     linkCable: false
 SCED-02062:
   name: "Final Fantasy VIII (Europe) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLED-02258:
   name: "Final Fantasy VIII (Europe) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SCES-02080:
@@ -57385,7 +58571,7 @@ SLES-02081:
     publisher: "Squaresoft"
     developer: "Squaresoft"
     releaseDate: "1999-10-27"
-    genre: "RPG"
+    genre: "** DEMO **"
     languages:
       - French
     minPlayers: 1
@@ -57842,10 +59028,14 @@ SLPM-87387:
     linkCable: false
 SLPM-80269:
   name: "Final Fantasy VIII (Japan) (Square's Preview Extra) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLED-02262:
   name: "Final Fantasy VIII (Spain) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLES-02084:
@@ -58152,7 +59342,7 @@ SLUS-00064:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-08-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -58211,7 +59401,7 @@ SLPS-00277:
     publisher: "Human Entertainment"
     developer: "Human Entertainment"
     releaseDate: "1996-03-15"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -58230,7 +59420,7 @@ SLPS-02065:
     publisher: "Human Entertainment"
     developer: "S-Neo"
     releaseDate: "1999-06-24"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -58249,7 +59439,7 @@ SLPS-02817:
     publisher: "Spike"
     developer: "S-Neo"
     releaseDate: "2000-06-01"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -58541,7 +59731,7 @@ SLPS-00463:
     publisher: "Pack-In-Video (Victor)"
     developer: "Natsume Co., Ltd"
     releaseDate: "2002-02-07"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -58560,7 +59750,7 @@ SLPS-02383:
     publisher: "Victor Entertainment"
     developer: "Victor Interactive Software, Inc. / Team Craze"
     releaseDate: "2000-01-27"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -58572,6 +59762,8 @@ SLPS-02383:
     linkCable: false
 SLPM-80523:
   name: "Fish Eyes II (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91526:
   name: "Fish Eyes II [PSOne Books]"
   controllers:
@@ -58581,7 +59773,7 @@ SLPS-91526:
     publisher: "Marvelous Interactive"
     developer: "Victor Interactive Software, Inc. / Team Craze"
     releaseDate: "2004-02-11"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -58600,7 +59792,7 @@ SLPS-03417:
     publisher: "Victor Entertainment"
     developer: "Victor Interactive Software, Inc. / Team Craze"
     releaseDate: "2002-03-14"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -58619,7 +59811,7 @@ SLPS-02288:
     publisher: "Pony Canyon"
     developer: "Pony Canyon"
     releaseDate: "1999-09-22"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -58638,7 +59830,7 @@ SLPS-01943:
     publisher: "BPS"
     developer: "BPS"
     releaseDate: "1999-03-11"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -58657,7 +59849,7 @@ SLUS-00802:
     publisher: "Konami"
     developer: "KCEO"
     releaseDate: "1999-03-09"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -58676,7 +59868,7 @@ SLES-02085:
     publisher: "Konami"
     developer: "KCEO"
     releaseDate: "1999-03-09"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -58695,7 +59887,7 @@ SLES-02596:
     publisher: "Konami"
     developer: "KCE Nagoya"
     releaseDate: "2000-03-15"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -58714,7 +59906,7 @@ SLUS-00999:
     publisher: "Konami"
     developer: "KCE Nagoya"
     releaseDate: "1999-12-15"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -58733,7 +59925,7 @@ SLES-03295:
     publisher: "Konami"
     developer: "KCE Nagoya"
     releaseDate: "2001-03-09"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -58752,7 +59944,7 @@ SLPS-01931:
     publisher: "Bandai"
     developer: "BEC"
     releaseDate: "1999-03-25"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -58764,6 +59956,8 @@ SLPS-01931:
     linkCable: false
 SLPM-80374:
   name: "Fishing Freaks - BassRise (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - SLPM-80374
     - SLPM-80404
@@ -58776,7 +59970,7 @@ SLPS-01930:
     publisher: "Bandai"
     developer: "BEC"
     releaseDate: "1999-03-25"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -58795,7 +59989,7 @@ SLPS-02572:
     publisher: "Bandai"
     developer: "BEC"
     releaseDate: "2000-02-03"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -58813,7 +60007,7 @@ SLPS-00749:
     publisher: "King Records"
     developer: "A-Wave"
     releaseDate: "1997-03-14"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -58993,6 +60187,8 @@ SCES-00985:
     linkCable: false
 SCED-01572:
   name: "Fluid (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-04156:
   name: "Flying Squadron (Europe)"
   controllers:
@@ -59040,7 +60236,7 @@ SLES-04047:
     publisher: "Phoenix Games"
     developer: "Naps Team"
     releaseDate: "2003-03-01"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -59060,7 +60256,7 @@ SLES-02978:
     publisher: "Codemasters"
     developer: "Codemasters"
     releaseDate: "2001-01-26"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - Italian
     minPlayers: 1
@@ -59202,7 +60398,7 @@ SLPS-00762:
     publisher: "Human Entertaiment"
     developer: "Human Entertaiment"
     releaseDate: "1997-06-27"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -59221,7 +60417,7 @@ SLPM-86640:
     publisher: "Hamster"
     developer: "Human Entertaiment"
     releaseDate: "2000-09-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -59240,7 +60436,7 @@ SLPS-01419:
     publisher: "Human Entertaiment"
     developer: "Human Entertaiment"
     releaseDate: "1998-06-04"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -59514,6 +60710,8 @@ SLPS-01154:
     linkCable: false
 SLED-00447:
   name: "Formula Karts - Special Edition (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00726:
   name: "Formula Karts - Special Edition (Europe) (En,De,Es,It)"
   controllers:
@@ -59606,6 +60804,8 @@ SCED-01979:
   libcrypt: true
 SLED-00491:
   name: "Formula One (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForceInterpreter
 SCES-02777:
@@ -59943,6 +61143,8 @@ SLES-00745:
     linkCable: false
 SLED-01263:
   name: "Forsaken (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01086:
   name: "Forsaken (France)"
   controllers:
@@ -60074,7 +61276,7 @@ SLUS-00101:
     publisher: "Capcom"
     developer: "3Vision Games"
     releaseDate: "1996-10-25"
-    genre: "Adventure / Interactive movie"
+    genre: "Adventure / Interactive Movie"
     languages:
       - English
     minPlayers: 1
@@ -60098,7 +61300,7 @@ SLUS-00175:
     publisher: "Capcom"
     developer: "3Vision Games"
     releaseDate: "1996-10-25"
-    genre: "Adventure / Interactive movie"
+    genre: "Adventure / Interactive Movie"
     languages:
       - English
     minPlayers: 1
@@ -60122,7 +61324,7 @@ SLUS-00176:
     publisher: "Capcom"
     developer: "3Vision Games"
     releaseDate: "1996-10-25"
-    genre: "Adventure / Interactive movie"
+    genre: "Adventure / Interactive Movie"
     languages:
       - English
     minPlayers: 1
@@ -60182,7 +61384,7 @@ SLES-00100:
     publisher: "Acclaim"
     developer: "Iguana Entertainment"
     releaseDate: "1996-10-01"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -60200,7 +61402,7 @@ SLPS-00453:
     publisher: "Acclaim"
     developer: "Iguana Entertainment"
     releaseDate: "1996-09-13"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -60218,7 +61420,7 @@ SLUS-00010:
     publisher: "Acclaim"
     developer: "Iguana Entertainment"
     releaseDate: "1996-06-05"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -60237,7 +61439,7 @@ SLES-01267:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1998-05-22"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -60249,6 +61451,8 @@ SLES-01267:
     linkCable: false
 SCED-04009:
   name: "Free Spin Demo Disc! (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00985:
   name: "Free Talk Studio - Mari no Kimamana Oshaberi (Japan)"
   controllers:
@@ -60294,7 +61498,7 @@ SLUS-00767:
     publisher: "Capcom"
     developer: "Pony Canyon / Atelier Double"
     releaseDate: "1999-02-15"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -60328,6 +61532,26 @@ SLES-02820:
     linkCable: false
 SLUS-00122:
   name: "Freestyle Motocross - McGrath vs. Pastrana (USA)"
+  controllers:
+    - AnalogController
+    - DigitalController
+    - NeGcon
+  traits:
+    - ForceRecompilerICache
+  metadata:
+    publisher: "Acclaim"
+    developer: "Z-Axis, Ltd"
+    releaseDate: "2000-11-02"
+    genre: "Racing"
+    languages:
+      - English
+    minPlayers: 1
+    maxPlayers: 1
+    minBlocks: 1
+    maxBlocks: 1
+    vibration: true
+    multitap: false
+    linkCable: false
 SLES-03363:
   name: "Freestyle Scooter (Europe)"
   controllers:
@@ -60340,7 +61564,7 @@ SLES-03363:
     publisher: "Ubi Soft / Crave Entertaiment"
     developer: "Shaba Studios"
     releaseDate: "2001-12-14"
-    genre: "Sports / Racing."
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -60497,6 +61721,8 @@ SLUS-01172:
     linkCable: false
 SLPM-80268:
   name: "From Software 1998 Summer Preview Movies (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03555:
   name: "From TV Animation - One Piece - Tobidase Kaizokudan! [Bandai The Best]"
   controllers:
@@ -60837,7 +62063,7 @@ SLPS-02307:
     publisher: "Sony Music Entertainment Incorporated"
     developer: "Sony Music Entertainment Incorporated"
     releaseDate: "1999-11-18"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -60849,6 +62075,8 @@ SLPS-02307:
     linkCable: false
 SLPM-80486:
   name: "Fun! Fun! Pingu - Youkoso! Nankyoku e (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02306:
   name: "Fun! Fun! Pingu - Youkoso! Nankyoku e (Japan) (Shokai Suuryou Genteiban)"
   controllers:
@@ -60858,7 +62086,7 @@ SLPS-02306:
     publisher: "Sony Music Entertainment Incorporated"
     developer: "Sony Music Entertainment Incorporated"
     releaseDate: "1999-11-18"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -60877,7 +62105,7 @@ SLPS-03496:
     publisher: "Victor Entertainment"
     developer: "Victor Entertainment"
     releaseDate: "2002-11-28"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - Japanese
     minPlayers: 1
@@ -61031,7 +62259,7 @@ SCES-01702:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "London Studio"
     releaseDate: "1999-12-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -61050,7 +62278,7 @@ SCES-03074:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "Sony Studio Soho"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -61062,6 +62290,8 @@ SCES-03074:
     linkCable: false
 SCED-03203:
   name: "Fussball Live 2 (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03062:
   name: "Fussball Manager 2001 (Germany)"
   controllers:
@@ -61072,7 +62302,7 @@ SLES-03062:
     publisher: "Electronic Arts"
     developer: "Krisalis Software Ltd"
     releaseDate: "2000-09-08"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - German
     minPlayers: 1
@@ -61106,6 +62336,8 @@ SLES-01449:
     linkCable: false
 SLED-01509:
   name: "Future Cop - L.A.P.D. (Europe) (En,Fr) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01482:
   name: "Future Cop - L.A.P.D. (Germany)"
   controllers:
@@ -61149,6 +62381,8 @@ SLUS-00739:
     linkCable: false
 SLUS-90034:
   name: "Future Cop - L.A.P.D. (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03508:
   name: "Future Racer (Europe)"
   controllers:
@@ -61189,6 +62423,8 @@ SLPS-01790:
     linkCable: false
 SLPM-80364:
   name: "Fuujin Ryouiki Eretzvaju (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03094:
   name: "Fuuraiki (Japan)"
   controllers:
@@ -61228,6 +62464,8 @@ SLPS-00441:
     linkCable: false
 SLPM-80205:
   name: "G Darius (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
 SCPS-45202:
@@ -61303,6 +62541,8 @@ SLES-10082:
     linkCable: false
 SLED-01034:
   name: "G-Police (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00853:
   name: "G-Police (France) (Disc 1)"
   discSet:
@@ -61449,6 +62689,8 @@ SLES-10855:
     linkCable: false
 PCPX-96125:
   name: "G-Police (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10065:
   name: "G-Police (Japan) (Disc 1)"
   discSet:
@@ -61734,6 +62976,8 @@ SLES-01314:
     linkCable: false
 SLED-01439:
   name: "G. Darius (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00690:
   name: "G. Darius (USA)"
   compatibility:
@@ -61837,6 +63081,8 @@ SLPM-86195:
     linkCable: false
 SLPM-80409:
   name: "GI Jockey (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86213:
   name: "GI Jockey (Japan) (Shokai Genteiban)"
   controllers:
@@ -62111,6 +63357,8 @@ SLPS-02075:
     linkCable: false
 SLPM-80524:
   name: "GaiaMaster - Kamigami no Board Game (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00624:
   name: "GaiaSeed - Project Seed Trap (Japan)"
   compatibility:
@@ -62161,7 +63409,7 @@ SLPS-00078:
     publisher: "Capcom"
     developer: "Capcom"
     releaseDate: "1995-08-11"
-    genre: "Adventure / Interactive movie"
+    genre: "Adventure / Interactive Movie"
     languages:
       - Japanese
     minPlayers: 1
@@ -62770,8 +64018,12 @@ SLPS-02194:
     linkCable: false
 SLED-02869:
   name: "Galerians (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-90077:
   name: "Galerians (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00986:
   name: "Galerians (USA) (Disc 1)"
   discSet:
@@ -62889,7 +64141,7 @@ SLUS-00942:
     publisher: "Tecmo"
     developer: "Tecmo"
     releaseDate: "1999-09-15"
-    genre: "Sports / Horse Racing"
+    genre: "Sports - Horse Racing"
     languages:
       - English
     minPlayers: 1
@@ -62970,7 +64222,7 @@ SLPS-01981:
     publisher: "Tecmo"
     developer: "Tecmo"
     releaseDate: "2001-11-22"
-    genre: "Sports / Horse Racing"
+    genre: "Sports - Horse Racing"
     languages:
       - Japanese
     minPlayers: 1
@@ -63044,7 +64296,7 @@ SLPS-01306:
     publisher: "Kid"
     developer: "Kid"
     releaseDate: "1998-04-23"
-    genre: "Board / Mini games"
+    genre: "Board / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -63062,7 +64314,7 @@ SLPS-00030:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "1995-06-09"
-    genre: "Board / Mahjong / Shogi."
+    genre: "Board / Mahjong / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -63080,7 +64332,7 @@ SLPS-02052:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "1999-05-04"
-    genre: "Board / Mahjong / Shogi."
+    genre: "Board / Mahjong / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -63119,7 +64371,7 @@ SLPS-03298:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "2001-10-04"
-    genre: "Board / Mahjong / Shogi."
+    genre: "Board / Mahjong / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -63267,6 +64519,8 @@ SLPM-87187:
     linkCable: false
 SLPM-80093:
   name: "Gamera 2000 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00833:
   name: "Gamera 2000 (Japan) (En,Ja)"
   controllers:
@@ -63472,7 +64726,7 @@ SLPM-86482:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "2000-07-13"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - Japanese
     minPlayers: 1
@@ -63577,6 +64831,8 @@ SLPS-02787:
     linkCable: false
 SLPM-80446:
   name: "Garou Densetsu - Wild Ambition (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45409:
   name: "Garou Densetsu - Wild Ambition (Japan, Asia)"
   controllers:
@@ -63747,6 +65003,8 @@ SLUS-00624:
     linkCable: false
 SLUS-80624:
   name: "Gauntlet Legends (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00644:
   name: "GeGeGe no Kitarou (Japan)"
   compatibility:
@@ -63800,7 +65058,7 @@ SLPS-03189:
     publisher: "Bandai"
     developer: "Sunrise / Natsume"
     releaseDate: "2001-04-26"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -63839,7 +65097,7 @@ SLES-01241:
     publisher: "Infogrames"
     developer: "NA.P.S. Team"
     releaseDate: "2001-02-23"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
       - French
@@ -63865,7 +65123,7 @@ SLUS-00970:
     publisher: "Infogrames"
     developer: "NA.P.S. Team"
     releaseDate: "2001-02-23"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -63936,6 +65194,8 @@ SCPS-10087:
     linkCable: false
 PCPX-96164:
   name: "Gekisou Tomarunner (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01346:
   name: "Gekisou!! Grand Racing - Total Drivin' (Japan)"
   controllers:
@@ -64321,6 +65581,8 @@ SLPM-86017:
     linkCable: false
 SCPS-45319:
   name: "Gensou Suikoden II (Asia) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86168:
   name: "Gensou Suikoden II (Japan)"
   controllers:
@@ -64348,7 +65610,7 @@ SLPM-86116:
     publisher: "Konami"
     developer: "KCE Japan"
     releaseDate: "1998-09-03"
-    genre: "Action / Adventure / Strategy / Shooter"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -64592,6 +65854,8 @@ SLUS-00042:
     linkCable: false
 SLED-01954:
   name: "Gex - Deep Cover Gecko (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01299:
   name: "Gex - Deep Cover Gecko (Europe) (En,Es,It)"
   controllers:
@@ -64698,6 +65962,8 @@ SLES-00596:
     linkCable: false
 SLED-01112:
   name: "Gex 3D - Enter the Gecko (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01050:
   name: "Ghost in the Shell (Europe)"
   controllers:
@@ -64942,7 +66208,7 @@ SLPM-86226:
     publisher: "Oracion"
     developer: "Exit"
     releaseDate: "1999-04-16"
-    genre: "Data / Pictures / Videos."
+    genre: "Data / Pictures / Videos"
     languages:
       - Japanese
     minPlayers: 1
@@ -64965,7 +66231,7 @@ SLPM-86227:
     publisher: "Oracion"
     developer: "Exit"
     releaseDate: "1999-04-16"
-    genre: "Data / Pictures / Videos."
+    genre: "Data / Pictures / Videos"
     languages:
       - Japanese
     minPlayers: 1
@@ -65110,6 +66376,8 @@ SCPS-10082:
     linkCable: false
 PCPX-96146:
   name: "Global Force - Shin Sentou Kokka (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02425:
   name: "Glocal Hexcite (Japan)"
   controllers:
@@ -65246,7 +66514,7 @@ SCPS-45165:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1997-04-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -65264,7 +66532,7 @@ SLUS-00295:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1997-04-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -65282,7 +66550,7 @@ SLES-00069:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-01-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -65294,13 +66562,16 @@ SLES-00069:
     linkCable: false
 SLUS-00055:
   name: "Goal Storm (USA)"
+  codes:
+    - SLUS-00055
+    - SLUS-00069
   controllers:
     - DigitalController
   metadata:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-01-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -65319,7 +66590,7 @@ SLPS-02945:
     publisher: "Pandora Box Creative Office"
     developer: "Pandora Box Creative Office"
     releaseDate: "2000-10-19"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -65506,7 +66777,7 @@ SLES-01222:
     publisher: "BMG Interactive"
     developer: "Z-Axis, Ltd"
     releaseDate: "1998-04-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -65597,7 +66868,7 @@ SLPS-01712:
     publisher: "Daiki"
     developer: "Daiki"
     releaseDate: "1998-11-26"
-    genre: "Interactive Comic."
+    genre: "Interactive Comic"
     languages:
       - English
       - Japanese
@@ -65688,6 +66959,8 @@ SLPS-00626:
     linkCable: false
 SLPM-80061:
   name: "Goo-Cho de Park - Theme Park Monogatari (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01620:
   name: "Goryuujin Electro (Japan)"
   compatibility:
@@ -65791,6 +67064,8 @@ SLPS-00104:
     linkCable: false
 SLPM-80009:
   name: "Gouketsuji Ichizoku 2 - Chotto dake Saikyou Densetsu (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03381:
   name: "Gourmet Action Game - Manpuku!! Nabe Kazoku (Japan)"
   controllers:
@@ -65920,13 +67195,19 @@ SCES-00984:
     linkCable: false
 SCED-01279:
   name: "Gran Turismo (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96085:
   name: "Gran Turismo (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - PCPX-96085
     - PCPX-96088
 PAPX-90026:
   name: "Gran Turismo (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10045:
   name: "Gran Turismo (Japan, Asia)"
   controllers:
@@ -65977,6 +67258,8 @@ SCUS-94194:
     linkCable: false
 SCUS-94257:
   name: "Gran Turismo (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-02380:
   name: "Gran Turismo 2 (Europe) (En,Fr,De,Es,It) (Disc 1) (Arcade Mode)"
   discSet:
@@ -66045,6 +67328,8 @@ SCED-02904:
   name: "Gran Turismo 2 (France) (Un CD Bonus)"
 PAPX-90054:
   name: "Gran Turismo 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-91327:
   name: "Gran Turismo 2 (Japan) (Disc 2) (Gran Turismo) (Rev 1)"
   controllers:
@@ -66203,7 +67488,7 @@ SLUS-00127:
     publisher: "Virgin Interactive"
     developer: "Burst"
     releaseDate: "1997-04-10"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -66708,6 +67993,8 @@ SCUS-94465:
     linkCable: false
 SLPM-80297:
   name: "Grandia - Prologue (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLPS-01624:
@@ -66749,6 +68036,8 @@ SCPS-10046:
     linkCable: false
 PCPX-96087:
   name: "Granstream Denki - The Granstream Saga (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01107:
   name: "Granstream Saga, The (Europe)"
   controllers:
@@ -66844,6 +68133,8 @@ SLPS-00719:
     linkCable: false
 SLPM-80313:
   name: "Great Hits (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86125:
   name: "Great Hits - Get Down with the Beat (Japan)"
   controllers:
@@ -66875,7 +68166,7 @@ SLPS-01268:
     publisher: "DaZZ (Nexus Interact)"
     developer: "Rage"
     releaseDate: "2001-12-13"
-    genre: "Sports / Rugby"
+    genre: "Sports - Rugby"
     languages:
       - Japanese
     minPlayers: 1
@@ -67013,7 +68304,7 @@ SCES-02885:
     publisher: "Sony"
     developer: "Shaba Games"
     releaseDate: "2000-08-25"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - Dutch
       - English
@@ -67043,7 +68334,7 @@ SCUS-94568:
     publisher: "Sony"
     developer: "Shaba Games"
     releaseDate: "2000-05-23"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -67055,6 +68346,8 @@ SCUS-94568:
     linkCable: false
 SCUS-94598:
   name: "Grind Session (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00615:
   name: "Gritz - The Pyramid Adventure (Japan)"
   controllers:
@@ -67179,7 +68472,7 @@ SLPS-00088:
     publisher: "SPS"
     developer: "SPS"
     releaseDate: "1995-08-11"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -67552,6 +68845,8 @@ SLPS-01357:
     linkCable: false
 SLPM-80302:
   name: "Guilty Gear (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02273:
   name: "Guilty Gear (Japan) (Rev 1)"
   controllers:
@@ -67728,6 +69023,8 @@ SLPS-01322:
     linkCable: false
 SLPM-80303:
   name: "Gunbare! Game Tengoku - The Game Paradise 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45299:
   name: "Gunbarl (Japan, Asia)"
   controllers:
@@ -68163,6 +69460,8 @@ SLPS-01902:
     linkCable: false
 SLPM-80324:
   name: "Gungho Brigade (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10006:
   name: "Gunners Heaven (Japan)"
   compatibility:
@@ -68197,7 +69496,7 @@ SLPS-01408:
     publisher: "Banpresto"
     developer: "Ea / Yukito Products"
     releaseDate: "1998-08-27"
-    genre: "Action / Beat'em up / Adventure"
+    genre: "Action / Beat'em Up / Adventure"
     languages:
       - Japanese
     minPlayers: 1
@@ -68395,6 +69694,8 @@ SLPM-86148:
     linkCable: false
 SLPM-80365:
   name: "Guuguuthropus (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01360:
   name: "Guy Roux Football Manager Saison 97-98 (France)"
   controllers:
@@ -68403,7 +69704,7 @@ SLES-01360:
     publisher: "Ubi Soft"
     developer: "Ubi Soft"
     releaseDate: "1998-05-22"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - French
     minPlayers: 1
@@ -68422,7 +69723,7 @@ SLES-01934:
     publisher: "UBI Soft Entertaiment"
     developer: "Anco"
     releaseDate: "1999-11-10"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - French
     minPlayers: 1
@@ -68441,7 +69742,7 @@ SLES-02612:
     publisher: "Ubi Soft"
     developer: "Anco"
     releaseDate: "2000-04-07"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - French
     minPlayers: 1
@@ -68460,7 +69761,7 @@ SLES-03403:
     publisher: "Ubi Soft Entertaiment"
     developer: "Anco"
     releaseDate: "2000-11-24"
-    genre: "Soccer / Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - French
     minPlayers: 1
@@ -68497,7 +69798,7 @@ SLES-02738:
     publisher: "Acclaim"
     developer: "Osiris Software Design Studios, Inc"
     releaseDate: "2001-02-16"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
       - German
@@ -68520,7 +69821,7 @@ SLUS-01027:
     publisher: "Acclaim"
     developer: "Osiris Software Design Studios, Inc"
     releaseDate: "2000-11-20"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -68673,7 +69974,7 @@ SLPS-03266:
     publisher: "Jorudan"
     developer: "Jorudan"
     releaseDate: "2002-02-28"
-    genre: "Mini games"
+    genre: "Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -68815,6 +70116,8 @@ SLPS-01439:
     linkCable: false
 PAPX-90048:
   name: "Hanabi - Fantast (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - PAPX-90048
     - SLPM-80239
@@ -68881,7 +70184,7 @@ SLPS-01747:
     publisher: "Pony Canyon"
     developer: "Pony Canyon"
     releaseDate: "1998-12-10"
-    genre: "Cards / Hanafuda."
+    genre: "Cards / Hanafuda"
     languages:
       - Japanese
     minPlayers: 1
@@ -68955,7 +70258,7 @@ SLPS-03306:
     publisher: "Twilight Express"
     developer: "Twilight Express"
     releaseDate: "2001-11-29"
-    genre: "Sports / Fitness / Jogging"
+    genre: "Sports - Fitness / Jogging"
     languages:
       - Japanese
     minPlayers: 1
@@ -69011,7 +70314,7 @@ SLPM-86043:
     publisher: "Electronic Arts"
     developer: "Electronic Arts Victor"
     releaseDate: "1997-07-31"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - Japanese
     minPlayers: 1
@@ -69211,7 +70514,7 @@ SLUS-00651:
     publisher: "Accolade"
     developer: "MindSpan Technologies Corp"
     releaseDate: "1998-10-15"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -69229,7 +70532,7 @@ SLPS-00571:
     publisher: "SPS"
     developer: "MindSpan Technologies Corp"
     releaseDate: "1996-12-13"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -69247,7 +70550,7 @@ SLUS-00108:
     publisher: "Accolade"
     developer: "MindSpan Technologies Corp"
     releaseDate: "1996-04-15"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -69328,7 +70631,7 @@ SLES-03972:
     publisher: "Electronic Arts"
     developer: "Argonaut Games"
     releaseDate: "2002-11-15"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - English
       - French
@@ -69351,7 +70654,7 @@ SLES-03974:
     publisher: "Electronic Arts"
     developer: "Argonaut Games"
     releaseDate: "2002-11-15"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - Danish
       - Dutch
@@ -69374,7 +70677,7 @@ SLES-03973:
     publisher: "Electronic Arts"
     developer: "Argonaut Games"
     releaseDate: "2002-11-15"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - Italian
       - Portuguese
@@ -69397,7 +70700,7 @@ SLES-03975:
     publisher: "Electronic Arts"
     developer: "Argonaut Games"
     releaseDate: "2002-11-15"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - English
       - Norwegian
@@ -69423,7 +70726,7 @@ SLUS-01503:
     publisher: "Electronic Arts"
     developer: "Argonaut Games"
     releaseDate: "2002-11-15"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - English
       - French
@@ -69568,7 +70871,7 @@ SLES-03976:
     publisher: "Electronic Arts"
     developer: "Argonaut Games"
     releaseDate: "2002-11-15"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - Finnish
     minPlayers: 1
@@ -69589,7 +70892,7 @@ SLPS-03492:
     publisher: "Electronic Arts"
     developer: "Argonaut Games"
     releaseDate: "2002-11-23"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -69879,6 +71182,8 @@ SLUS-01115:
     linkCable: false
 SLUS-81115:
   name: "Harvest Moon - Back to Nature (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00704:
   name: "Hashiriya - Ookami-tachi no Densetsu (Japan)"
   controllers:
@@ -69955,10 +71260,34 @@ SLPS-00668:
     linkCable: false
 LSP-99013201:
   name: "Head to Toe 2 (USA)"
+  codes:
+    - LSP99013201
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99013301:
   name: "Head to Toe 3 (USA)"
+  codes:
+    - LSP99013301
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99013401:
   name: "Head to Toe 4 (USA)"
+  codes:
+    - LSP99013401
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLPS-01908:
   name: "Heart of Darkness"
   controllers:
@@ -70027,6 +71356,8 @@ SLES-10461:
     linkCable: false
 SLED-01351:
   name: "Heart of Darkness (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00462:
   name: "Heart of Darkness (France) (Disc 1)"
   discSet:
@@ -71327,7 +72658,7 @@ SLUS-00830:
     publisher: "The 3DO Company"
     developer: "Team .366"
     releaseDate: "1999-05-12"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -71352,7 +72683,7 @@ SLUS-01244:
     publisher: "The 3DO Company"
     developer: "Team .366"
     releaseDate: "2001-03-14"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -71484,6 +72815,8 @@ SLPM-87321:
     linkCable: false
 SLPM-80390:
   name: "Himiko-den - Renge (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01890:
   name: "Himiko-den - Renge (Japan) (Disc 1)"
   discSet:
@@ -71680,7 +73013,7 @@ SLPS-02683:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "2000-03-04"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -71777,7 +73110,7 @@ SLPS-00112:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "1998-11-05"
-    genre: "Gambling / Pachinko."
+    genre: "Gambling / Pachinko"
     languages:
       - Japanese
     minPlayers: 1
@@ -71834,7 +73167,7 @@ SLPS-02990:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "2000-10-19"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -71985,7 +73318,7 @@ SLPS-02408:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "1999-11-25"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -72042,7 +73375,7 @@ SLPS-01963:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "1999-03-25"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -72063,7 +73396,7 @@ SLPS-02284:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "1999-09-30"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -72082,7 +73415,7 @@ SLPS-02511:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "1999-12-22"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -72253,7 +73586,7 @@ SLPS-02493:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "2000-02-10"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -72423,6 +73756,8 @@ SLES-01041:
     linkCable: false
 SLED-03054:
   name: "Hogs of War (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Fixes wobble in minimap.
 SLUS-01195:
@@ -72498,7 +73833,7 @@ SLPS-02993:
     publisher: "Bandai"
     developer: "Bandai"
     releaseDate: "2000-10-26"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -72590,7 +73925,7 @@ SLPS-00986:
     publisher: "Seta Corporation"
     developer: "Seta Corporation"
     releaseDate: "1998-05-21"
-    genre: "Board / Igo."
+    genre: "Board / Igo"
     languages:
       - Japanese
     minPlayers: 1
@@ -72916,7 +74251,7 @@ SCUS-94188:
     publisher: "Sony"
     developer: "Camelot"
     releaseDate: "1998-04-30"
-    genre: "Sports / Golf / Mini Golf"
+    genre: "Sports - Golf / Mini Golf"
     languages:
       - English
     minPlayers: 1
@@ -72928,6 +74263,8 @@ SCUS-94188:
     linkCable: false
 SCUS-94253:
   name: "Hot Shots Golf (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94476:
   name: "Hot Shots Golf 2 (USA)"
   compatibility:
@@ -72940,7 +74277,7 @@ SCUS-94476:
     publisher: "Sony"
     developer: "Clap Hanz"
     releaseDate: "2000-03-22"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -72952,6 +74289,8 @@ SCUS-94476:
     linkCable: false
 SCUS-94495:
   name: "Hot Shots Golf 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03595:
   name: "Hot Wheels - Extreme Racing (Europe)"
   controllers:
@@ -74145,7 +75484,7 @@ SLPS-00278:
     publisher: "Human Entertaiment"
     developer: "Human Entertaiment"
     releaseDate: "1996-03-22"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -74163,7 +75502,7 @@ SLPS-00062:
     publisher: "Human Entertaiment"
     developer: "Human Entertaiment"
     releaseDate: "1995-10-13"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -74181,7 +75520,7 @@ SLPM-86002:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-06-28"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - Japanese
     minPlayers: 1
@@ -74203,7 +75542,7 @@ SLPM-86056:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-10-29"
-    genre: "Sports / Winter Olympics"
+    genre: "Sports - Winter Olympics"
     languages:
       - Japanese
     minPlayers: 1
@@ -74363,7 +75702,7 @@ SLES-00309:
     publisher: "JVC Digital Studios"
     developer: "Human Entertaiment"
     releaseDate: "1996-11-15"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -74438,7 +75777,7 @@ SLPS-01029:
     publisher: "I'Max"
     developer: "I'Max"
     releaseDate: "1997-10-09"
-    genre: "Board / Shogi."
+    genre: "Board / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -74472,6 +75811,8 @@ SCPS-10029:
     linkCable: false
 PCPX-96058:
   name: "I.Q - Intelligent Qube (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94181:
   name: "I.Q - Intelligent Qube (USA)"
   compatibility:
@@ -74496,6 +75837,8 @@ SCUS-94181:
     linkCable: false
 SCUS-94196:
   name: "I.Q - Intelligent Qube (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45036:
   name: "I.Q - Intelligent Qube (aka I.Q. - Intelligent Qube)"
   controllers:
@@ -74539,8 +75882,12 @@ SCPS-10071:
     linkCable: false
 PCPX-96137:
   name: "I.Q Final (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90063:
   name: "I.Q Final (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-91227:
   name: "I.Q Final [PlayStation the Best]"
   controllers:
@@ -74591,7 +75938,7 @@ SLES-02095:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "2000-05-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -74612,7 +75959,7 @@ SLES-02424:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "2000-05-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
       - Spanish
@@ -74632,7 +75979,7 @@ SLUS-01014:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "2000-02-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -74651,7 +75998,7 @@ SLES-03321:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2001-02-23"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -74672,7 +76019,7 @@ SLES-03322:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2001-02-23"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
       - Spanish
@@ -75207,7 +76554,7 @@ SLES-02983:
     publisher: "TDK / Universal / Sound Source Interactive"
     developer: "Realtime Associates Inc"
     releaseDate: "2000-10-13"
-    genre: "Action / Platformer."
+    genre: "Action / Platformer"
     languages:
       - German
     minPlayers: 1
@@ -75365,6 +76712,8 @@ SLES-02933:
     linkCable: false
 SLED-03212:
   name: "Incredible Crisis (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01225:
   name: "Incredible Crisis (USA)"
   compatibility:
@@ -75511,6 +76860,8 @@ SLPS-00860:
     linkCable: false
 SLPM-80103:
   name: "Indy 500 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01870:
   name: "Infestation (Europe) (En,Fr,De,Es,It,Nl)"
   compatibility:
@@ -75717,8 +77068,12 @@ PBPX-95003:
     - SCUS-94232
 SCUS-94222:
   name: "Interactive CD Sampler Disk Volume 5 (USA) (Rev 1)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94224:
   name: "Interactive CD Sampler Disk Volume 5 (USA) (SCUS-94224)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94957:
   name: "Interactive CD Sampler Pack Volume 2 (USA)"
   compatibility:
@@ -75746,6 +77101,8 @@ SCUS-94955:
     versionTested: "0.1-2433-g9089c973"
 SCUS-94956:
   name: "Interactive CD Sampler Volume 1 (USA) (SCUS-94956)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02404:
   name: "International Cricket Captain 2000 (Europe)"
   controllers:
@@ -75754,7 +77111,7 @@ SLES-02404:
     publisher: "Empire Interactive"
     developer: "Empire Interactive"
     releaseDate: "2000-11-03"
-    genre: "Sports / Cricket"
+    genre: "Sports - Cricket"
     languages:
       - English
     minPlayers: 1
@@ -75772,7 +77129,7 @@ SLES-03596:
     publisher: "Empire Interactive"
     developer: "Empire Interactive"
     releaseDate: "2001-08-24"
-    genre: "Sports / Cricket"
+    genre: "Sports - Cricket"
     languages:
       - English
     minPlayers: 1
@@ -75790,7 +77147,7 @@ SLES-03881:
     publisher: "Empire Interactive"
     developer: "Empire Interactive"
     releaseDate: "2002-05-24"
-    genre: "Sports / Cricket"
+    genre: "Sports - Cricket"
     languages:
       - English
     minPlayers: 1
@@ -75873,7 +77230,7 @@ SLPS-02868:
     publisher: "Epoch"
     developer: "Epoch"
     releaseDate: "2000-08-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -75892,7 +77249,7 @@ SLES-02550:
     publisher: "Konami"
     developer: "KCEO"
     releaseDate: "2000-06-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - German
@@ -75912,7 +77269,7 @@ SLES-03149:
     publisher: "Konami"
     developer: "KCEO"
     releaseDate: "2000-09-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
       - Italian
@@ -75932,7 +77289,7 @@ SLES-00511:
     publisher: "Konami"
     developer: "KCEO"
     releaseDate: "1997-02-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -75957,7 +77314,7 @@ SLES-01218:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1998-10-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -75972,10 +77329,14 @@ SLES-01218:
     linkCable: false
 SLED-01401:
   name: "International Superstar Soccer Pro '98 (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForceRecompilerICache
 SLED-01513:
   name: "International Superstar Soccer Pro '98 (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForceRecompilerICache
 SLES-01264:
@@ -75989,7 +77350,7 @@ SLES-01264:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1998-10-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -76010,7 +77371,7 @@ SLUS-00674:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1998-08-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -76032,7 +77393,7 @@ SLES-00559:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1997-06-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -76044,6 +77405,8 @@ SLES-00559:
     linkCable: false
 SLED-00796:
   name: "International Superstar Soccer Pro (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45197:
   name: "International Track & Field"
   controllers:
@@ -76052,7 +77415,7 @@ SCPS-45197:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-06-15"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - English
     minPlayers: 1
@@ -76070,7 +77433,7 @@ SLES-00333:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-06-15"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - English
     minPlayers: 1
@@ -76088,7 +77451,7 @@ SLUS-00238:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-06-15"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - English
     minPlayers: 1
@@ -76107,7 +77470,7 @@ SLES-02448:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1999-10-31"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - English
     minPlayers: 1
@@ -76126,7 +77489,7 @@ SLUS-00987:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1999-12-10"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - English
     minPlayers: 1
@@ -76145,7 +77508,7 @@ SLES-01935:
     publisher: "Interplay"
     developer: "Interplay"
     releaseDate: "1999-11-19"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -76164,7 +77527,7 @@ SLUS-00850:
     publisher: "Interplay"
     developer: "Interplay"
     releaseDate: "1999-04-14"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -76362,7 +77725,7 @@ SLPS-00341:
     publisher: "I'Max"
     developer: "Irem"
     releaseDate: "1996-07-26"
-    genre: "Action / Beat'em up / Football / Racing"
+    genre: "Action / Beat'em Up / Football / Racing"
     languages:
       - Japanese
     minPlayers: 1
@@ -76380,7 +77743,7 @@ SLES-00281:
     publisher: "Acclaim Entertaiment"
     developer: "Realtime Associates"
     releaseDate: "1996-11-15"
-    genre: "Action / Shooter / Platformer / Beat'em up"
+    genre: "Action / Shooter / Platformer / Beat'em Up"
     languages:
       - English
       - French
@@ -76400,7 +77763,7 @@ SLPS-00455:
     publisher: "Acclaim Japan"
     developer: "Realtime Associates"
     releaseDate: "1997-01-31"
-    genre: "Action / Shooter / Platformer / Beat'em up"
+    genre: "Action / Shooter / Platformer / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -76421,7 +77784,7 @@ SLUS-00235:
     publisher: "Acclaim Entertaiment"
     developer: "Realtime Associates"
     releaseDate: "1996-10-30"
-    genre: "Action / Shooter / Platformer / Beat'em up"
+    genre: "Action / Shooter / Platformer / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -76628,6 +77991,8 @@ SLPM-86120:
     linkCable: false
 SLPM-80287:
   name: "Itadaki Street - Gorgeous King (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86089:
   name: "Itadaki Street - Gorgeous King (Japan) (Disc 2) (Demo)"
   controllers:
@@ -76636,7 +78001,7 @@ SLPM-86089:
     publisher: "Enix"
     developer: "System Sacom"
     releaseDate: "1998-08-27"
-    genre: "Strategy / Simulation"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -76713,6 +78078,8 @@ SLES-03648:
     linkCable: false
 SLED-03679:
   name: "Italian Job, The (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01457:
   name: "Italian Job, The (USA)"
   controllers:
@@ -76794,6 +78161,8 @@ SLPS-00832:
     linkCable: false
 SLPM-80105:
   name: "Iwatobi Penguin Rocky x Hopper (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01283:
   name: "Iwatobi Penguin Rocky x Hopper 2 - Tantei Monogatari (Japan)"
   controllers:
@@ -76955,7 +78324,7 @@ SLPM-86010:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1996-11-22"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -76974,7 +78343,7 @@ SLPM-86154:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "1998-12-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -76992,7 +78361,7 @@ SLPS-00068:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "1995-07-21"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -77011,7 +78380,7 @@ SLPM-86538:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "2000-06-29"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -77030,7 +78399,7 @@ SLPM-86668:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "2000-11-30"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -77049,7 +78418,7 @@ SLPM-86835:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "2001-06-21"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -77068,7 +78437,7 @@ SLPM-86055:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1997-12-11"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -77087,7 +78456,7 @@ SLPS-02436:
     publisher: "Tecmo"
     developer: "Tecmo"
     releaseDate: "1999-12-22"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -77106,7 +78475,7 @@ SLPS-00079:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "1995-09-29"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -77124,7 +78493,7 @@ SLPS-00301:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "1996-04-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -77164,7 +78533,7 @@ SCES-01444:
     publisher: "Midway"
     developer: "Radical Entertainment"
     releaseDate: "2000-01-31"
-    genre: "Action / Platformer / Beat'em up"
+    genre: "Action / Platformer / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -77185,7 +78554,7 @@ SLUS-00684:
     publisher: "Midway"
     developer: "Radical Entertainment"
     releaseDate: "2000-01-31"
-    genre: "Action / Platformer / Beat'em up"
+    genre: "Action / Platformer / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -77314,6 +78683,8 @@ SLUS-00854:
     linkCable: false
 SLUS-90054:
   name: "Jade Cocoon - Story of the Tamamayu (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02076:
   name: "JailBreaker (Japan) (Disc 1)"
   discSet:
@@ -77666,7 +79037,7 @@ SLES-01981:
     publisher: "Acclaim Sports"
     developer: "Acclaim Studios"
     releaseDate: "2000-09-01"
-    genre: "Sports / Racing / Motocross"
+    genre: "Sports - Racing / Motocross"
     languages:
       - English
       - French
@@ -77688,7 +79059,7 @@ SLUS-00832:
     publisher: "Acclaim Sports"
     developer: "Acclaim Studios"
     releaseDate: "2000-07-19"
-    genre: "Sports / Racing / Motocross"
+    genre: "Sports - Racing / Motocross"
     languages:
       - English
     minPlayers: 1
@@ -77708,7 +79079,7 @@ SLES-01281:
     publisher: "Acclaim Sports"
     developer: "Probe Entertainment Ltd"
     releaseDate: "1998-07-01"
-    genre: "Sports / Racing / Motocross"
+    genre: "Sports - Racing / Motocross"
     languages:
       - English
     minPlayers: 1
@@ -77728,7 +79099,7 @@ SLPM-86306:
     publisher: "Acclaim Sports"
     developer: "Probe Entertainment Ltd"
     releaseDate: "1999-09-02"
-    genre: "Sports / Racing / Motocross"
+    genre: "Sports - Racing / Motocross"
     languages:
       - Japanese
     minPlayers: 1
@@ -77748,7 +79119,7 @@ SLUS-00479:
     publisher: "Acclaim Sports"
     developer: "Probe Entertainment Ltd"
     releaseDate: "1998-06-01"
-    genre: "Sports / Racing / Motocross"
+    genre: "Sports - Racing / Motocross"
     languages:
       - English
     minPlayers: 1
@@ -77950,6 +79321,8 @@ SCUS-94555:
     linkCable: false
 SCUS-94384:
   name: "Jet Moto 3 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00566:
   name: "Jet Rider (Europe)"
   controllers:
@@ -78015,6 +79388,8 @@ SLPM-86323:
     linkCable: false
 SLPM-80515:
   name: "Jet de Go! Let's Go by Airliner (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86324:
   name: "Jet de Go! Let's Go by Airliner (Japan) (JAL Kinai Hanbai Gentei)"
   controllers:
@@ -78292,7 +79667,7 @@ SLPM-86046:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-05-14"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78310,7 +79685,7 @@ SLPM-86119:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-10-08"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78329,7 +79704,7 @@ SLPM-86464:
     publisher: "Konami"
     developer: "KCE Nagoya"
     releaseDate: "2000-03-30"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -78348,7 +79723,7 @@ SLPM-86736:
     publisher: "Konami"
     developer: "KCE Nagoya"
     releaseDate: "2001-02-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -78367,7 +79742,7 @@ SLPM-86317:
     publisher: "Konami"
     developer: "KCEO"
     releaseDate: "1999-12-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -78423,7 +79798,7 @@ SLPS-00016:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "1994-12-22"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78441,7 +79816,7 @@ SLPS-00067:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "1995-07-14"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78459,7 +79834,7 @@ SLPM-86024:
     publisher: "Konami"
     developer: "Diamond Head (KCEO)"
     releaseDate: "1998-08-28"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78478,7 +79853,7 @@ SLPM-86097:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "1998-07-23"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78497,7 +79872,7 @@ SLPM-86149:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "1998-12-23"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78516,7 +79891,7 @@ SLPM-86253:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "1999-07-22"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78535,7 +79910,7 @@ SLPM-86433:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "1999-12-25"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78554,7 +79929,7 @@ SLPM-87216:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "2003-01-23"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78573,7 +79948,7 @@ SLPM-86578:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "2000-07-19"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78592,7 +79967,7 @@ SLPM-86694:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "2000-12-21"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78611,7 +79986,7 @@ SLPM-86807:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "2001-07-06"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78630,7 +80005,7 @@ SLPM-86990:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "2001-12-20"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78649,7 +80024,7 @@ SLPM-87033:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "2002-03-14"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -78661,6 +80036,8 @@ SLPM-87033:
     linkCable: false
 SLPM-80039:
   name: "Jikuu Tantei DD - Maboroshi no Lorelei (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00397:
   name: "Jikuu Tantei DD - Maboroshi no Lorelei (Japan) (Disc 1)"
   discSet:
@@ -78875,7 +80252,7 @@ SLUS-00500:
     publisher: "Interplay"
     developer: "Padded Cell Studios"
     releaseDate: "1997-10-10"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -78894,7 +80271,7 @@ SLES-01334:
     publisher: "Virgin Interactive"
     developer: "Awesome Developments"
     releaseDate: "2000-03-31"
-    genre: "Sports / Pool & Snooker"
+    genre: "Sports - Pool & Snooker"
     languages:
       - English
       - French
@@ -78917,7 +80294,7 @@ SLUS-01313:
     publisher: "BAM! Entertainment"
     developer: "Awesome Developments"
     releaseDate: "2001-03-09"
-    genre: "Sports / Pool & Snooker"
+    genre: "Sports - Pool & Snooker"
     languages:
       - English
     minPlayers: 1
@@ -78929,6 +80306,8 @@ SLUS-01313:
     linkCable: false
 PAPX-90049:
   name: "Jingle Cats - Love-Para Daisakusen no Maki (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-03908:
   name: "Jinx (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -79388,7 +80767,7 @@ SLES-00377:
     publisher: "Codemasters"
     developer: "Rage"
     releaseDate: "1997-03-31"
-    genre: "Sports / Rugby"
+    genre: "Sports - Rugby"
     languages:
       - English
       - German
@@ -79410,7 +80789,7 @@ SLES-00611:
     publisher: "Codemasters"
     developer: "Rage"
     releaseDate: "1997-03-31"
-    genre: "Sports / Rugby"
+    genre: "Sports - Rugby"
     languages:
       - French
     minPlayers: 1
@@ -79502,7 +80881,7 @@ SLPS-00936:
     publisher: "Asmik Ace Entertainment"
     developer: "Asmik Ace Entertainment"
     releaseDate: "1997-09-10"
-    genre: "Sports / Simulation"
+    genre: "Sports - Simulation"
     languages:
       - Japanese
     minPlayers: 1
@@ -79514,6 +80893,8 @@ SLPS-00936:
     linkCable: false
 SCED-01138:
   name: "Joypad Demo 01 (France) (En,Fr)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00755:
   name: "Judge Dredd (Europe)"
   controllers:
@@ -79776,6 +81157,8 @@ SCES-00003:
     linkCable: false
 SCPM-85001:
   name: "Jumping Flash! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10022:
   name: "Jumping Flash! (Japan) (Europe-ban)"
 SCUS-94103:
@@ -79894,7 +81277,7 @@ SLPM-86080:
     publisher: "T&E Soft"
     developer: "T&E Soft"
     releaseDate: "1998-04-23"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -79955,7 +81338,7 @@ SLES-03579:
     publisher: "Infogrames / Humongous Entertainment"
     developer: "Runecraft, Ltd"
     releaseDate: "2001-09-23"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -79974,7 +81357,7 @@ SLES-03580:
     publisher: "Infogrames / Humongous Entertainment"
     developer: "Runecraft, Ltd"
     releaseDate: "2001-09-23"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -79993,7 +81376,7 @@ SLES-03581:
     publisher: "Infogrames / Humongous Entertainment"
     developer: "Runecraft, Ltd"
     releaseDate: "2001-09-23"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -80068,6 +81451,8 @@ SLUS-00177:
     linkCable: false
 SLUS-80515:
   name: "Jurassic Park - The Lost World (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02753:
   name: "K-1 Grand Prix (Europe)"
   controllers:
@@ -80210,7 +81595,7 @@ SLPS-01413:
     publisher: "Altron"
     developer: "Altron"
     releaseDate: "2000-04-20"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - Japanese
     minPlayers: 1
@@ -80225,26 +81610,61 @@ LSP-090110:
   codes:
     - LSP-090110
     - LSP-905062
+    - LSP09011002
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-090220:
   name: "K9.5 2 - We Are the Dogs! (USA)"
   codes:
     - LSP-090220
     - LSP-905079
+    - LSP09022001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-090330:
   name: "K9.5 3 - WebTunes (USA)"
   codes:
     - LSP-090330
     - LSP-905086
+    - LSP09033001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-090440:
   name: "K9.5 4 - The Tail-Wag Tour (USA)"
   codes:
     - LSP-090440
     - LSP-905093
+    - LSP09044001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-907103:
   name: "K9.5 5 - The Howlywood Premiere (USA)"
   codes:
     - LSP-907103
     - LSP-90710301
+    - LSP90710301
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLES-03211:
   name: "KISS Pinball (Europe) (En,Fr,De)"
   controllers:
@@ -80381,6 +81801,8 @@ SLPS-02332:
     linkCable: false
 SLPM-80460:
   name: "Kaeru no Ehon - Nakushita Kioku o Motomete (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-87174:
   name: "Kaette Kita Cyborg Kuro-chan (Japan)"
   controllers:
@@ -80408,7 +81830,7 @@ SLPS-01384:
     publisher: "Coconuts Japan"
     developer: "Coconuts Japan"
     releaseDate: "1998-07-02"
-    genre: "Board."
+    genre: "Board"
     languages:
       - Japanese
     minPlayers: 1
@@ -80528,6 +81950,8 @@ SLUS-00677:
     linkCable: false
 SLUS-90041:
   name: "Kagero - Deception II (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91405:
   name: "Kagero - Kokumeikan Shinshou [PSOne Books]"
   controllers:
@@ -80893,6 +82317,8 @@ SLPS-01570:
     linkCable: false
 SLPM-80326:
   name: "Kamen Rider (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03344:
   name: "Kamen Rider Agito (Japan)"
   controllers:
@@ -80916,6 +82342,8 @@ SLPS-03344:
     linkCable: false
 SLPM-80629:
   name: "Kamen Rider Agito + Hyakujuu Sentai GaoRanger (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03529:
   name: "Kamen Rider Agito [Bandai the Best]"
   controllers:
@@ -81024,7 +82452,7 @@ SLPS-00052:
     publisher: "Seta Corporation"
     developer: "Seta Corporation"
     releaseDate: "1995-04-21"
-    genre: "Shogi."
+    genre: "Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -81154,7 +82582,7 @@ SLPS-01630:
     publisher: "ASCII Entertainment"
     developer: "Japan Vistec"
     releaseDate: "1998-10-22"
-    genre: "Adventure / Mini games / RPG"
+    genre: "Adventure / Mini Games / RPG"
     languages:
       - Japanese
     minPlayers: 1
@@ -81172,7 +82600,7 @@ SLPS-01629:
     publisher: "ASCII Entertainment"
     developer: "Japan Vistec"
     releaseDate: "1998-10-22"
-    genre: "Adventure / Mini games / RPG"
+    genre: "Adventure / Mini Games / RPG"
     languages:
       - Japanese
     minPlayers: 1
@@ -81184,6 +82612,8 @@ SLPS-01629:
     linkCable: false
 SCED-01739:
   name: "Katalog Spezial Demo (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86045:
   name: "Kato Hifumi Kudan - Shogi Club"
   controllers:
@@ -81265,6 +82695,8 @@ SLPS-01253:
     linkCable: false
 SLPM-80223:
   name: "Kattobi Tune (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91502:
   name: "Kawa no Nushi Tsuri - Hikyou o Motomete [PSOne Books]"
   controllers:
@@ -81311,11 +82743,25 @@ LSP-070110:
   codes:
     - LSP-070110
     - LSP-905123
+    - HASH-41202276753908A9
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-905130:
   name: "KazMania 2 - Chaos in KazMania (USA)"
   codes:
     - LSP-905130
     - LSP-90513001
+    - LSP90513000
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLPS-01010:
   name: "Kaze no Klonoa - Door to Phantomile (Japan)"
   compatibility:
@@ -81567,7 +83013,7 @@ SLPS-02717:
     publisher: "Increment-P"
     developer: "Increment-P"
     releaseDate: "2000-07-27"
-    genre: "Data / Music / Pictures."
+    genre: "Data / Music / Pictures"
     languages:
       - Japanese
     minPlayers: 1
@@ -81601,6 +83047,8 @@ SLPM-84002:
   name: "Kellogg Original Waku Waku Doki Doki Ninki Game Chara Daishuugou! (Japan)"
 SLPM-80512:
   name: "Kenkaku Ibunroku - Yomigaerishi Souku no Yaiba - Samurai Spirits Shinshou (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45466:
   name: "Kenkaku Ibunroku - Yomigaerishi Souku no Yaiba - Samurai Spirits Shinshou (Japan, Asia)"
   controllers:
@@ -81745,7 +83193,7 @@ SLPS-00502:
     publisher: "Victor Interactive Software"
     developer: "Victor Interactive Software"
     releaseDate: "1996-11-15"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - Japanese
     minPlayers: 1
@@ -81823,7 +83271,7 @@ SLPM-86621:
     publisher: "Media Factory"
     developer: "Amedio"
     releaseDate: "2002-04-24"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -81835,8 +83283,12 @@ SLPM-86621:
     linkCable: false
 SLPM-80583:
   name: "Kero Kero King (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86432:
   name: "Kessen - Demo Video CD-ROM (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02640:
   name: "Khamrai (Japan)"
   controllers:
@@ -81865,7 +83317,7 @@ SLES-01039:
     publisher: "Funsoft"
     developer: "Anco"
     releaseDate: "1998-06-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -81884,7 +83336,7 @@ SLES-01327:
     publisher: "Funsoft"
     developer: "Anco"
     releaseDate: "1998-06-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - Spanish
@@ -81904,7 +83356,7 @@ SLES-01061:
     publisher: "Funsoft"
     developer: "Anco"
     releaseDate: "1998-06-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -81924,7 +83376,7 @@ SLES-01062:
     publisher: "Funsoft"
     developer: "Anco"
     releaseDate: "1998-06-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -81943,7 +83395,7 @@ SLES-01328:
     publisher: "Funsoft"
     developer: "Anco"
     releaseDate: "1998-06-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Greek
     minPlayers: 1
@@ -82142,6 +83594,8 @@ SCPS-45045:
     linkCable: false
 SCED-02542:
   name: "Kids Demo 01 (Europe) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86907:
   name: "Kids Station - Asobou! Hanasou! Guru Guru Town Hanamaru-kun (Japan)"
   controllers:
@@ -82389,6 +83843,8 @@ SLPS-03323:
     linkCable: false
 SLPM-80624:
   name: "Kids Station - Doraemon - Himitsu no Yojigen Pocket (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03324:
   name: "Kids Station - Doraemon Himitsu no Yojigen Pocket"
   controllers:
@@ -82696,7 +84152,7 @@ SLPM-87001:
     publisher: "Atlus Co"
     developer: "Revolution Software"
     releaseDate: "2002-02-07"
-    genre: "Educational / Mini games"
+    genre: "Educational / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -82715,7 +84171,7 @@ SLPM-87000:
     publisher: "Atlus Co"
     developer: "Revolution Software"
     releaseDate: "2002-02-07"
-    genre: "Educational / Mini games"
+    genre: "Educational / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -83503,7 +84959,7 @@ SLPS-02747:
     publisher: "Magical Company LTD."
     developer: "Magical Company LTD"
     releaseDate: "2001-02-01"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -83836,7 +85292,7 @@ SLPS-00092:
     publisher: "Coconuts Japan"
     developer: "Aisystem Tokyo"
     releaseDate: "1995-08-29"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -83854,7 +85310,7 @@ SLES-02916:
     publisher: "Midas Interactive"
     developer: "Coconuts Japan Entertaiment"
     releaseDate: "2000-08-25"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -83872,7 +85328,7 @@ SLPS-01541:
     publisher: "Coconuts Japan Entertaiment"
     developer: "Coconuts Japan Entertaiment"
     releaseDate: "1998-08-27"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -83890,7 +85346,7 @@ SLPS-02688:
     publisher: "Coconuts Japan Entertaiment"
     developer: "Coconuts Japan Entertaiment"
     releaseDate: "2000-04-20"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -83909,7 +85365,7 @@ SLES-04049:
     publisher: "Phoenix Games"
     developer: "Digicube"
     releaseDate: "2004-08-09"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -84652,7 +86108,7 @@ SLPS-01821:
     publisher: "Map Japan"
     developer: "Map Japan"
     releaseDate: "1999-01-28"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -84671,7 +86127,7 @@ SLPS-02746:
     publisher: "Map Japan"
     developer: "Map Japan"
     releaseDate: "2000-05-02"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -84833,7 +86289,7 @@ SLPS-02424:
     publisher: "River Hill Software"
     developer: "KIDSMIND"
     releaseDate: "1999-11-25"
-    genre: "Sports / Air Hockey"
+    genre: "Sports - Air Hockey"
     languages:
       - Japanese
     minPlayers: 1
@@ -84911,6 +86367,8 @@ SLPS-01501:
     linkCable: false
 PAPX-90053:
   name: "Klaymen Series (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00942:
   name: "Klonoa - Door to Phantomile (Europe)"
   compatibility:
@@ -85039,7 +86497,7 @@ SCPS-45516:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "2002-04-24"
-    genre: "Sports / Beach Volleyball"
+    genre: "Sports - Beach Volleyball"
     languages:
       - Japanese
     minPlayers: 1
@@ -85058,7 +86516,7 @@ SLPS-03433:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "2002-04-24"
-    genre: "Sports / Beach Volleyball"
+    genre: "Sports - Beach Volleyball"
     languages:
       - Japanese
     minPlayers: 1
@@ -85077,7 +86535,7 @@ SCES-03922:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "2002-04-24"
-    genre: "Sports / Beach Volleyball"
+    genre: "Sports - Beach Volleyball"
     languages:
       - English
       - French
@@ -85119,7 +86577,7 @@ SLUS-00737:
     publisher: "Electronic Arts"
     developer: "Press Start, Inc"
     releaseDate: "1998-11-25"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -85138,7 +86596,7 @@ SLES-02322:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "1999-11-19"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -85157,7 +86615,7 @@ SLES-02323:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "1999-11-19"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - French
     minPlayers: 1
@@ -85176,7 +86634,7 @@ SLUS-00993:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "1999-10-31"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -85195,7 +86653,7 @@ SLES-03121:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-10-30"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -85214,7 +86672,7 @@ SLES-03122:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-10-30"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - French
     minPlayers: 1
@@ -85233,7 +86691,7 @@ SLUS-01269:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-10-19"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -85252,7 +86710,7 @@ SLES-01448:
     publisher: "Electronic Arts"
     developer: "Press Start, Inc"
     releaseDate: "1998-11-20"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -85271,7 +86729,7 @@ SLES-01450:
     publisher: "Electronic Arts"
     developer: "Press Start, Inc"
     releaseDate: "1998-11-20"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - French
     minPlayers: 1
@@ -85289,7 +86747,7 @@ SLPS-00922:
     publisher: "Bandai"
     developer: "Aisystem Tokyo"
     releaseDate: "1997-07-24"
-    genre: "Strategy / Mini games"
+    genre: "Strategy / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -85326,7 +86784,7 @@ SLPM-80195:
     publisher: "Sunmark"
     developer: "Sunmark"
     releaseDate: "1998-04-01"
-    genre: "Action / Educational / Mini Games."
+    genre: "Action / Educational / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -85393,6 +86851,8 @@ SLPS-01354:
     linkCable: false
 SLPM-80204:
   name: "Kojin Kyouju - La Lecon Particuliere (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03434:
   name: "Kojin Kyouju - La Lecon Particuliere [MyCom Best]"
   controllers:
@@ -85574,7 +87034,7 @@ SLPM-86052:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1997-11-20"
-    genre: "Action / Sports / Compilation"
+    genre: "Action / Sports - Compilation"
     languages:
       - Japanese
     minPlayers: 1
@@ -85592,7 +87052,7 @@ SLPM-86062:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1998-01-22"
-    genre: "Action / Sports / Compilation"
+    genre: "Action / Sports - Compilation"
     languages:
       - Japanese
     minPlayers: 1
@@ -85613,7 +87073,7 @@ SCPS-45205:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1998-03-19"
-    genre: "Action / Sports / Compilation"
+    genre: "Action / Sports - Compilation"
     languages:
       - Japanese
     minPlayers: 1
@@ -85631,7 +87091,7 @@ SCPS-45155:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1998-01-22"
-    genre: "Action / Sports / Compilation"
+    genre: "Action / Sports - Compilation"
     languages:
       - Japanese
     minPlayers: 1
@@ -85673,7 +87133,7 @@ SLES-00337:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-11-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -85751,7 +87211,7 @@ SLPS-03084:
     publisher: "Magical Company LTD"
     developer: "Magical Company LTD"
     releaseDate: "2000-12-07"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -85769,7 +87229,7 @@ SLPS-02565:
     publisher: "Magical Company LTD"
     developer: "Magical Company LTD"
     releaseDate: "2000-01-06"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -86455,8 +87915,12 @@ SCPS-10043:
     linkCable: false
 PCPX-96068:
   name: "Koukaku Kidoutai - Ghost in the Shell (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90020:
   name: "Koukaku Kidoutai - Ghost in the Shell (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10136:
   name: "Koukidou Gensou - Gunparade March (Japan)"
   controllers:
@@ -86560,7 +88024,7 @@ SLPS-00577:
     publisher: "Xing Entertainment"
     developer: "Xing Entertainment"
     releaseDate: "1996-11-29"
-    genre: "Strategy."
+    genre: "Strategy"
     languages:
       - Japanese
     minPlayers: 1
@@ -86578,7 +88042,7 @@ SLPS-02550:
     publisher: "Xing Entertainment"
     developer: "Xing Entertainment"
     releaseDate: "2000-01-20"
-    genre: "Strategy."
+    genre: "Strategy"
     languages:
       - Japanese
     minPlayers: 1
@@ -86632,7 +88096,7 @@ SLPS-00729:
     publisher: "Magical Company LTD"
     developer: "Magical Company LTD"
     releaseDate: "1997-05-16"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -86680,6 +88144,8 @@ SLPS-01775:
     linkCable: false
 SLPM-80420:
   name: "Kouyasai - A Sherd of Youthful Memories (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03454:
   name: "Kowai Shashin - Shinrei Shashin Kitan (Japan)"
   controllers:
@@ -87050,6 +88516,8 @@ SCPS-10064:
     linkCable: false
 PCPX-96121:
   name: "KulaQuest (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
 SLPS-00115:
@@ -87212,7 +88680,7 @@ SLUS-01125:
     publisher: "Midway Home Entertainment"
     developer: "Midway Home Entertainment"
     releaseDate: "2000-05-18"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -87475,7 +88943,7 @@ SLPM-86447:
     publisher: "The Second"
     developer: "The Second"
     releaseDate: "2000-02-03"
-    genre: "Simulation."
+    genre: "Simulation"
     languages:
       - Japanese
     minPlayers: 1
@@ -87512,7 +88980,7 @@ SLPS-03193:
     publisher: "Visit"
     developer: "Visit"
     releaseDate: "2001-06-26"
-    genre: "Simulation / Mini Games."
+    genre: "Simulation / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -88082,7 +89550,7 @@ SLES-02975:
     publisher: "Codemasters"
     developer: "Codemasters"
     releaseDate: "2001-01-26"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -88121,7 +89589,7 @@ SLES-03064:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-09-08"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -88267,7 +89735,7 @@ SLPS-00408:
     publisher: "DaZZ (Nexus Interact)"
     developer: "Nexus Interact"
     releaseDate: "1998-09-23"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -88286,7 +89754,7 @@ SLPS-01342:
     publisher: "DaZZ (Nexus Interact)"
     developer: "Nexus Interact"
     releaseDate: "1998-07-09"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -88305,7 +89773,7 @@ SLPS-02069:
     publisher: "DaZZ (Nexus Interact)"
     developer: "Nexus Interact"
     releaseDate: "1999-05-20"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -88327,7 +89795,7 @@ SLPS-02177:
     publisher: "DaZZ (Nexus Interact)"
     developer: "Nexus Interact"
     releaseDate: "2001-12-13"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -88346,7 +89814,7 @@ SLPS-02869:
     publisher: "DaZZ (Nexus Interact)"
     developer: "Nexus Interact"
     releaseDate: "2000-08-03"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -88449,7 +89917,7 @@ SLES-02981:
     publisher: "TDK / Universal / Sound Source Interactive"
     developer: "Realtime Associates Inc"
     releaseDate: "2000-10-13"
-    genre: "Action / Platformer."
+    genre: "Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -88468,7 +89936,7 @@ SLUS-01043:
     publisher: "TDK / Universal / Sound Source Interactive"
     developer: "Realtime Associates Inc"
     releaseDate: "2000-09-15"
-    genre: "Action / Platformer."
+    genre: "Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -88703,6 +90171,8 @@ SLES-00020:
     linkCable: false
 SLED-01365:
   name: "Last Report, The (Europe) (En,De) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00889:
   name: "Last Report, The (Europe) (En,Fr)"
   controllers:
@@ -88858,6 +90328,8 @@ SLES-01362:
     linkCable: false
 SCED-03202:
   name: "Le Monde Des Bleus 2 (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01886:
   name: "Leading Jockey '99 (Japan)"
   controllers:
@@ -88917,6 +90389,8 @@ SLES-01301:
     linkCable: false
 SLED-02252:
   name: "Legacy of Kain - Soul Reaver (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02024:
   name: "Legacy of Kain - Soul Reaver (France)"
   compatibility:
@@ -89048,6 +90522,8 @@ SCPS-10059:
     linkCable: false
 PAPX-90055:
   name: "Legaia Densetsu (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-91246:
   name: "Legaia Densetsu [Playstation the best]"
   controllers:
@@ -89075,7 +90551,7 @@ SLES-00730:
     publisher: "Funsoft"
     developer: "Toka"
     releaseDate: "1998-12-15"
-    genre: "Beat'em up"
+    genre: "Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -89551,11 +91027,15 @@ SCES-33046:
     linkCable: false
 PAPX-90091:
   name: "Legend of Dragoon, The (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen # Breaks background rendering.
     - DisableSpriteTextureFiltering # Breaks background rendering.
 PAPX-90103:
   name: "Legend of Dragoon, The (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen # Breaks background rendering.
     - DisableSpriteTextureFiltering # Breaks background rendering.
@@ -90056,6 +91536,8 @@ SCUS-94254:
     linkCable: false
 SCUS-94366:
   name: "Legend of Legaia (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01013:
   name: "Legend of Mana (USA)"
   compatibility:
@@ -90251,7 +91733,7 @@ SCPS-45343:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "1998-11-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -90270,7 +91752,7 @@ SLPS-02950:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "2000-09-07"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -90289,7 +91771,7 @@ SCES-01430:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "1998-10-31"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -90301,6 +91783,8 @@ SCES-01430:
     linkCable: false
 SCED-01491:
   name: "LiberoGrande (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01681:
   name: "LiberoGrande (Japan)"
   controllers:
@@ -90310,7 +91794,7 @@ SLPS-01681:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "1998-11-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -90322,6 +91806,8 @@ SLPS-01681:
     linkCable: false
 SLPM-80340:
   name: "LiberoGrande (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-03254:
   name: "Liberogrande International (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -90331,7 +91817,7 @@ SCES-03254:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "2001-01-14"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -90434,6 +91920,8 @@ SLES-00613:
     linkCable: false
 SLED-00690:
   name: "Lifeforce Tenka (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLES-00614:
@@ -90557,11 +92045,13 @@ LSP-990122:
   name: "Lightspan - 16 Tales 2"
   controllers:
     - DigitalController
+  codes:
+    - LSP990122
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Interactive Movie / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -90575,11 +92065,13 @@ LSP-060101:
   name: "Lightspan - The Quaddle Family Mysteries 1 - The case of the Scarce Scarab - Lobby - Kitchen"
   controllers:
     - DigitalController
+  codes:
+    - LSP060101
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1997-04-07"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -90593,11 +92085,13 @@ LSP-060102:
   name: "Lightspan - The Quaddle Family Mysteries 2 - The case of the Scarce Scarab - Garden"
   controllers:
     - DigitalController
+  codes:
+    - LSP060102
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1997-12-05"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -90611,11 +92105,13 @@ LSP-060103:
   name: "Lightspan - The Quaddle Family Mysteries 3 - The case of the Scarce Scarab - Parlor - Family Room"
   controllers:
     - DigitalController
+  codes:
+    - LSP060103
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1997-12-05"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -90726,6 +92222,15 @@ SLES-04065:
     linkCable: false
 LSP-010150:
   name: "Liquid Books Adventure 1 - Lety's Favorite Stories (USA)"
+  codes:
+    - LSP-010150
+    - LSP01015001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-010250:
   name: "Liquid Books Adventure 2 - Amrita's Trees & Cerdito and the Coyote (USA)"
   controllers:
@@ -90733,11 +92238,12 @@ LSP-010250:
   codes:
     - LSP-010250
     - LSP-903112
+    - LSP01025001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1997-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -90752,18 +92258,48 @@ LSP-010350:
   codes:
     - LSP-010350
     - LSP-903129
+    - LSP01035001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-903136:
   name: "Liquid Books Adventure 4 - The Adventures of Adelita and Bo (USA)"
+  codes:
+    - LSP-903136
+    - LSP01035501
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-903143:
   name: "Liquid Books Adventure 5 - Pop-Out Prose (USA)"
   codes:
     - LSP-903143
     - LSP-90314301
+    - LSP90314300
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-905147:
   name: "Liquid Books Adventure 6 - The Wandering Path (USA)"
   codes:
     - LSP-905147
     - LSP-90514700
+    - LSP90514700
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLES-00698:
   name: "Little Big Adventure (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -90963,6 +92499,8 @@ SLPS-03013:
     linkCable: false
 SLED-01561:
   name: "Live Wire! (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01332:
   name: "Live Wire! (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -91166,6 +92704,8 @@ SLES-00451:
     linkCable: false
 SLED-00516:
   name: "Lomax (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00987:
   name: "Lomax (Japan)"
   compatibility:
@@ -91449,6 +92989,8 @@ SCPS-10086:
     linkCable: false
 PAPX-90081:
   name: "Lord of Monsters (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02951:
   name: "Lord of the Jungle (Europe) (En,Fr,De,Nl)"
   controllers:
@@ -91858,7 +93400,7 @@ SLPS-00686:
     publisher: "Tears (Ichikawa Software)"
     developer: "Tears (Ichikawa Software)"
     releaseDate: "1997-02-28"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -91870,6 +93412,8 @@ SLPS-00686:
     linkCable: false
 PAPX-90014:
   name: "Love Game's - Wai Wai Tennis (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86541:
   name: "Love Game's - Wai Wai Tennis (Japan) (Major Wave)"
   controllers:
@@ -91878,7 +93422,7 @@ SLPM-86541:
     publisher: "Hamster"
     developer: "Tears (Ichikawa Software)"
     releaseDate: "2000-06-29"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -91896,7 +93440,7 @@ SLPS-01647:
     publisher: "Tears (Ichikawa Software)"
     developer: "Tears (Ichikawa Software)"
     releaseDate: "1998-10-29"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -91915,7 +93459,7 @@ SLPS-02510:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "1999-12-22"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -91934,7 +93478,7 @@ SLPS-02983:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "2000-12-07"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -91953,7 +93497,7 @@ SLPM-86899:
     publisher: "Hamster"
     developer: "Tears (Ichikawa Software)"
     releaseDate: "2002-03-28"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -92086,7 +93630,7 @@ SLPS-01784:
     publisher: "Toshiba EMI"
     developer: "Toshiba EMI"
     releaseDate: "1998-12-23"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -92280,6 +93824,8 @@ SCPS-45250:
     linkCable: false
 SLUS-90055:
   name: "Lunar - Silver Star Story Complete (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00628:
   name: "Lunar - Silver Star Story Complete (USA) (Disc 1)"
   discSet:
@@ -92440,7 +93986,7 @@ SLUS-90083:
     publisher: "Working Designs"
     developer: "Human Entertainment"
     releaseDate: "2000-06-28"
-    genre: "Tactical RPG"
+    genre: "** DEMO **"
     languages:
       - English
     minPlayers: 1
@@ -92883,12 +94429,20 @@ SLUS-01306:
     linkCable: false
 SCED-01713:
   name: "M-6 PlayStation Demo (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02121:
   name: "M6 PlayStation - Best of '99 Vol. 1 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02419:
   name: "M6 PlayStation - Best of '99 Vol. 2 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02570:
   name: "M6 PlayStation - Special Kids (France)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00980:
   name: "M6 Turbo Racing (France)"
   controllers:
@@ -92910,6 +94464,8 @@ SLES-00980:
     linkCable: true
 SLED-00912:
   name: "MDK (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00599:
   name: "MDK (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -92935,6 +94491,8 @@ SLES-00599:
     linkCable: false
 SLED-01069:
   name: "MDK (France) (En,Fr) (PlayMag Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10052:
   name: "MDK (Japan)"
   controllers:
@@ -92997,8 +94555,12 @@ SLPM-88501:
     linkCable: false
 SCED-01189:
   name: "MIP Club Demo 01 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01190:
   name: "MIP Club Demo 02 (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94359:
   name: "MLB 2000 (USA)"
   controllers:
@@ -93008,7 +94570,7 @@ SCUS-94359:
     publisher: "Sony"
     developer: "989 Studios"
     releaseDate: "1999-03-01"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -93020,6 +94582,8 @@ SCUS-94359:
     linkCable: false
 SCUS-94364:
   name: "MLB 2000 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94478:
   name: "MLB 2001 (USA)"
   controllers:
@@ -93029,7 +94593,7 @@ SCUS-94478:
     publisher: "Sony"
     developer: "989 Studios"
     releaseDate: "2000-03-29"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -93041,6 +94605,8 @@ SCUS-94478:
     linkCable: false
 SCUS-94479:
   name: "MLB 2001 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94638:
   name: "MLB 2002 (USA)"
   controllers:
@@ -93050,7 +94616,7 @@ SCUS-94638:
     publisher: "Sony"
     developer: "989 Studios"
     releaseDate: "2001-05-08"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -93062,6 +94628,8 @@ SCUS-94638:
     linkCable: false
 SCUS-94648:
   name: "MLB 2002 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94653:
   name: "MLB 2003 (USA)"
   controllers:
@@ -93071,7 +94639,7 @@ SCUS-94653:
     publisher: "Sony"
     developer: "989 Studios"
     releaseDate: "2002-06-19"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -93083,6 +94651,8 @@ SCUS-94653:
     linkCable: false
 SCUS-94672:
   name: "MLB 2003 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94689:
   name: "MLB 2004 (USA)"
   controllers:
@@ -93092,7 +94662,7 @@ SCUS-94689:
     publisher: "Sony"
     developer: "989 Studios"
     releaseDate: "2003-04-29"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -93111,7 +94681,7 @@ SCUS-94692:
     publisher: "Sony"
     developer: "989 Sports"
     releaseDate: "2004-03-04"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -93129,7 +94699,7 @@ SCUS-94170:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1997-07-10"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -93147,7 +94717,7 @@ SCUS-94233:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1998-04-01"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -93159,6 +94729,8 @@ SCUS-94233:
     linkCable: false
 PAPX-90008:
   name: "MLB Pennant Race (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94507:
   name: "MLB Pennant Race (USA)"
   controllers:
@@ -93167,7 +94739,7 @@ SCUS-94507:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1996-09-30"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -93272,7 +94844,7 @@ SLES-03162:
     publisher: "THQ"
     developer: "Radical Entertainment"
     releaseDate: "2000-10-01"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
       - French
@@ -93286,6 +94858,8 @@ SLES-03162:
     linkCable: false
 SLED-03277:
   name: "MTV Sports - Pure Ride (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01231:
   name: "MTV Sports - Pure Ride (USA)"
   controllers:
@@ -93295,7 +94869,7 @@ SLUS-01231:
     publisher: "THQ"
     developer: "Radical Entertainment"
     releaseDate: "2000-09-02"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -93307,6 +94881,8 @@ SLUS-01231:
     linkCable: false
 SLUS-90089:
   name: "MTV Sports - Pure Ride (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03133:
   name: "MTV Sports - Skateboarding featuring Andy Macdonald (Europe)"
   controllers:
@@ -93316,7 +94892,7 @@ SLES-03133:
     publisher: "THQ"
     developer: "DarkBlack Ltd"
     releaseDate: "2000-09-30"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -93335,7 +94911,7 @@ SLUS-01232:
     publisher: "THQ"
     developer: "DarkBlack Ltd"
     releaseDate: "2000-09-16"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -93354,7 +94930,7 @@ SLES-02353:
     publisher: "THQ"
     developer: "Radical Entertainment"
     releaseDate: "1999-12-15"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -93366,6 +94942,8 @@ SLES-02353:
     linkCable: false
 SLED-02412:
   name: "MTV Sports - Snowboarding (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00990:
   name: "MTV Sports - Snowboarding (USA)"
   controllers:
@@ -93375,7 +94953,7 @@ SLUS-00990:
     publisher: "THQ"
     developer: "Radical Entertainment"
     releaseDate: "1999-10-25"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -93394,7 +94972,7 @@ SLES-03430:
     publisher: "THQ"
     developer: "Blue Shift Inc"
     releaseDate: "2001-04-30"
-    genre: "Sports / BMX"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -93413,7 +94991,7 @@ SLUS-01233:
     publisher: "THQ"
     developer: "Blue Shift Inc"
     releaseDate: "2001-03-20"
-    genre: "Sports / BMX"
+    genre: "Sports - BMX"
     languages:
       - English
     minPlayers: 1
@@ -93437,7 +95015,7 @@ SLPS-02705:
     publisher: "Kaga Tech"
     developer: "Sims"
     releaseDate: "2000-04-06"
-    genre: "Adventure."
+    genre: "Adventure"
     languages:
       - Japanese
     minPlayers: 1
@@ -93461,7 +95039,7 @@ SLPS-02706:
     publisher: "Kaga Tech"
     developer: "Sims"
     releaseDate: "2000-04-06"
-    genre: "Adventure."
+    genre: "Adventure"
     languages:
       - Japanese
     minPlayers: 1
@@ -93483,7 +95061,7 @@ SLPS-03143:
     publisher: "Kaga Tech"
     developer: "Sims"
     releaseDate: "2001-02-22"
-    genre: "Adventure."
+    genre: "Adventure"
     languages:
       - Japanese
     minPlayers: 1
@@ -93520,7 +95098,7 @@ SLUS-00383:
     publisher: "Eidos Interactive"
     developer: "Core Design"
     releaseDate: "1996-10-15"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - English
     minPlayers: 1
@@ -93704,6 +95282,8 @@ SLPS-00386:
     linkCable: false
 SLPM-80083:
   name: "Macross Digital Mission VF-X (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91058:
   name: "Macross Digital Mission VF-X (Japan) (Rev 1)"
   controllers:
@@ -93768,7 +95348,7 @@ SLPS-02007:
     publisher: "Bandai"
     developer: "Bandai"
     releaseDate: "1999-05-27"
-    genre: "Action / Shooter"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -93804,7 +95384,7 @@ SLPS-00734:
     publisher: "Family Soft"
     developer: "Fill In Cafe"
     releaseDate: "1997-07-03"
-    genre: "Action / Beat'em up / Shooter"
+    genre: "Action / Beat'em Up / Shooter"
     languages:
       - English
     minPlayers: 1
@@ -93823,7 +95403,7 @@ SLES-02192:
     publisher: "EA Sports (Electronic Arts)"
     developer: "Tiburon Entertaiment"
     releaseDate: "1999-09-15"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -93842,7 +95422,7 @@ SLUS-00961:
     publisher: "EA Sports (Electronic Arts)"
     developer: "Tiburon Entertaiment"
     releaseDate: "1999-08-31"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -93861,7 +95441,7 @@ SLES-03067:
     publisher: "EA Sports (Electronic Arts)"
     developer: "Tiburon Entertaiment"
     releaseDate: "2000-10-06"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -93880,7 +95460,7 @@ SLUS-01241:
     publisher: "EA Sports (Electronic Arts)"
     developer: "Tiburon Entertaiment"
     releaseDate: "2000-08-22"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -93899,7 +95479,7 @@ SLUS-01402:
     publisher: "EA Sports (Electronic Arts)"
     developer: "Tiburon Entertaiment"
     releaseDate: "2001-08-15"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -93918,7 +95498,7 @@ SLUS-01482:
     publisher: "EA Sports (Electronic Arts)"
     developer: "Tiburon Entertaiment"
     releaseDate: "2002-08-13"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -93937,7 +95517,7 @@ SLUS-01570:
     publisher: "Electronic Arts"
     developer: "Budcat Creations"
     releaseDate: "2003-08-12"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -93956,7 +95536,7 @@ SLUS-01584:
     publisher: "Electronic Arts"
     developer: "Tiburon"
     releaseDate: "2004-09-14"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -93974,7 +95554,7 @@ SLES-00436:
     publisher: "Electronic Arts"
     developer: "Tiburon Entertaiment"
     releaseDate: "1996-10-15"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -93992,7 +95572,7 @@ SLUS-00018:
     publisher: "Electronic Arts"
     developer: "Tiburon Entertaiment"
     releaseDate: "1996-08-15"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -94010,7 +95590,7 @@ SLES-00904:
     publisher: "EA Sports (Electronic Arts)"
     developer: "Tiburon Entertaiment"
     releaseDate: "1997-09-15"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -94028,7 +95608,7 @@ SLUS-00516:
     publisher: "EA Sports (Electronic Arts)"
     developer: "Tiburon Entertaiment"
     releaseDate: "1997-08-26"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -94047,7 +95627,7 @@ SLES-01427:
     publisher: "EA Sports (Electronic Arts)"
     developer: "Tiburon Entertaiment"
     releaseDate: "1998-09-15"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -94068,7 +95648,7 @@ SLUS-00729:
     publisher: "EA Sports (Electronic Arts)"
     developer: "Tiburon Entertaiment"
     releaseDate: "1998-08-01"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -94302,7 +95882,7 @@ SLPS-00426:
     publisher: "BMG Japan"
     developer: "Left Field Productions"
     releaseDate: "1996-08-09"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -94597,7 +96177,7 @@ SCES-02154:
     publisher: "Sony / Disney Interactive"
     developer: "Capcom"
     releaseDate: "1999-11-26"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - English
     minPlayers: 1
@@ -94616,7 +96196,7 @@ SCES-02175:
     publisher: "Sony / Disney Interactive"
     developer: "Capcom"
     releaseDate: "1999-11-26"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - German
     minPlayers: 1
@@ -94638,7 +96218,7 @@ SLPS-01786:
     publisher: "Capcom"
     developer: "Capcom"
     releaseDate: "1999-03-18"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - Japanese
     minPlayers: 1
@@ -94650,6 +96230,8 @@ SLPS-01786:
     linkCable: false
 SCED-03993:
   name: "Magical World of Disney on PlayStation, The (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01173:
   name: "Magical Zunou Power!! Party Selection (Japan)"
   controllers:
@@ -94695,7 +96277,7 @@ SCES-02178:
     publisher: "Sony / Disney Interactive"
     developer: "Capcom"
     releaseDate: "1999-11-26"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - Dutch
     minPlayers: 1
@@ -95199,7 +96781,7 @@ SLES-02979:
     publisher: "Codemasters"
     developer: "Codemasters"
     releaseDate: "2001-01-26"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - Spanish
     minPlayers: 1
@@ -95276,7 +96858,7 @@ SLES-03868:
     publisher: "3DO"
     developer: "Anco"
     releaseDate: "2002-06-20"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -95294,7 +96876,7 @@ SLUS-00526:
     publisher: "Electronics Arts"
     developer: "Scoreboard Productions"
     releaseDate: "1998-02-28"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -95306,6 +96888,8 @@ SLUS-00526:
     linkCable: false
 SLPM-80185:
   name: "Maria - Kimitachi ga Umareta Wake (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01136:
   name: "Maria - Kimitachi ga Umareta Wake (Japan) (Disc 1)"
   discSet:
@@ -95738,13 +97322,16 @@ SLES-02768:
     linkCable: false
 LSP-010180:
   name: "Mars Moose Adventure - WalkAbout 1 - The Natural History Museum (USA)"
+  codes:
+    - LSP-010180
+    - LSP01018001
   controllers:
     - DigitalController
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -95756,6 +97343,18 @@ LSP-010180:
     linkCable: false
 LSP-010280:
   name: "Mars Moose Adventure - WalkAbout 2 - The Shakespeare Festival (USA)"
+  codes:
+    - LSP-010280
+    - LSP01028001
+  controllers:
+    - DigitalController
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    releaseDate: "1996-01-01"
+    genre: "Educational"
+    languages:
+      - English
 LSP-010380:
   name: "Mars Moose Adventure - WalkAbout 3 - World Sports Day (USA)"
   controllers:
@@ -95764,11 +97363,12 @@ LSP-010380:
     - LSP-010380
     - LSP-01038001
     - LSP-903099
+    - LSP01038001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -95786,11 +97386,12 @@ LSP-010170:
     - LSP-010170
     - LSP-01017001
     - LSP-903013
+    - LSP01017001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -95807,11 +97408,12 @@ LSP-010270:
   codes:
     - LSP-010270
     - LSP-903020
+    - LSP01027001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -95828,11 +97430,12 @@ LSP-010370:
   codes:
     - LSP-010370
     - LSP-903037
+    - LSP01037001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -95850,11 +97453,12 @@ LSP-010160:
     - LSP-010160
     - LSP-01016001
     - LSP-903044
+    - LSP01016001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -95872,11 +97476,12 @@ LSP-010260:
     - LSP-010260
     - LSP-01026001
     - LSP-903051
+    - LSP01026001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -95893,11 +97498,12 @@ LSP-010360:
   codes:
     - LSP-010360
     - LSP-903068
+    - LSP01036001
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1996-01-01"
-    genre: "Adventure / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -96102,6 +97708,8 @@ SLES-00932:
     linkCable: false
 SLED-00499:
   name: "Marvel Super Heroes (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00763:
   name: "Marvel Super Heroes (Japan)"
   controllers:
@@ -96208,6 +97816,8 @@ SLPS-01915:
     linkCable: false
 SLPM-80376:
   name: "Marvel Super Heroes vs. Street Fighter - EX Edition (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - SLPM-80376
     - SLPM-80382
@@ -96285,6 +97895,8 @@ SLPS-02368:
     linkCable: false
 SLPM-80508:
   name: "Marvel vs. Capcom - Clash of Super Heroes - EX Edition (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableAutoAnalogMode # Analog sticks do nothing.
 SLES-02379:
@@ -96557,7 +98169,7 @@ SLPS-00373:
     publisher: "Soft Bank"
     developer: "T&E Soft"
     releaseDate: "1997-01-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -96725,7 +98337,7 @@ SLPS-00178:
     publisher: "Zoom-X"
     developer: "Marble"
     releaseDate: "1998-01-22"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -96739,31 +98351,74 @@ LSP-903433:
   name: "Math Gallery - Collection 1 (USA)"
   codes:
     - LSP-903433
+    - LSP90343300
     - LSP-90343301
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-903440:
   name: "Math Gallery - Collection 2 (USA)"
   codes:
     - LSP-903440
+    - LSP90344001
     - LSP-90344001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-100112:
   name: "Math on the Move! 1 - Addition-Subtraction Advanced (USA)"
   codes:
     - LSP-100112
+    - LSP10011201
     - LSP-10011201
     - LSP-907394
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-100110:
   name: "Math on the Move! 1 - Addition-Subtraction Intermediate (USA)"
   codes:
     - LSP-100110
+    - LSP10011001
     - LSP-905390
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-100113:
   name: "Math on the Move! 2 - Multiplication-Division Advanced (USA)"
   codes:
     - LSP-100113
+    - LSP10011301
     - LSP-10011301
     - LSP-907400
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-905406:
   name: "Math on the Move! 2 - Multiplication-Division Intermediate (USA)"
+  codes:
+    - LSP905406
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLPS-00198:
   name: "Matsukata Hiroki no World Fishing (Japan)"
   controllers:
@@ -96772,7 +98427,7 @@ SLPS-00198:
     publisher: "Bullet-Proof Software (BPS)"
     developer: "Tose Software"
     releaseDate: "1996-01-19"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -96791,7 +98446,7 @@ SLPS-02041:
     publisher: "Bullet-Proof Software (BPS)"
     developer: "Tose Software"
     releaseDate: "1999-04-28"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -96887,6 +98542,8 @@ SLPS-01359:
     linkCable: false
 SLPM-80232:
   name: "Mawatte Mucho! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01694:
   name: "Max Power Racing (Europe)"
   controllers:
@@ -96916,7 +98573,7 @@ SLPS-02398:
     publisher: "KSS"
     developer: "Sunsoft"
     releaseDate: "1999-11-18"
-    genre: "Sports / Surf"
+    genre: "Sports - Surf"
     languages:
       - Japanese
     minPlayers: 1
@@ -97032,12 +98689,20 @@ SLPS-03490:
     linkCable: false
 SCED-03909:
   name: "McDonald's - Demo 01 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03910:
   name: "McDonald's - Demo 02 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03911:
   name: "McDonald's - Demo 03 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03912:
   name: "McDonald's - Demo 04 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00340:
   name: "MechWarrior 2 - 31st Century Combat - Arcade Combat Edition (Europe)"
   controllers:
@@ -97459,6 +99124,8 @@ SCUS-94227:
     linkCable: false
 SCUS-94291:
   name: "MediEvil (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10081:
   name: "MediEvil - Yomigaetta Gallowmere no Yuusha (Japan)"
   controllers:
@@ -97527,6 +99194,8 @@ SCES-02545:
     linkCable: false
 SCED-02818:
   name: "MediEvil 2 (Europe) (Es,It,Pt) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-02546:
   name: "MediEvil 2 (Russia)"
   controllers:
@@ -97549,6 +99218,8 @@ SCES-02546:
     linkCable: false
 SCED-01527:
   name: "MediEvil Collector's Edition (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94564:
   name: "MediEvil II (USA)"
   compatibility:
@@ -97573,6 +99244,8 @@ SCUS-94564:
     linkCable: false
 SCED-01571:
   name: "MediEvil Special (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01064:
   name: "Mega Man 8 (Europe)"
   compatibility:
@@ -97714,7 +99387,7 @@ SLUS-90078:
     publisher: "Capcom"
     developer: "Capcom Production Studio 2"
     releaseDate: "2000-04-30"
-    genre: "Action / Adventure / Puzzle / RPG"
+    genre: "** DEMO **"
     languages:
       - English
     minPlayers: 1
@@ -98093,6 +99766,8 @@ SLPS-02804:
     linkCable: false
 SLPM-80568:
   name: "Meitantei Conan - 3-nin no Meisuiri (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03425:
   name: "Meitantei Conan - Saikou no Partner (Japan)"
   controllers:
@@ -98142,7 +99817,7 @@ SLPS-02649:
     publisher: "Atlus Co"
     developer: "Atlus Co"
     releaseDate: "2000-04-20"
-    genre: "Data / Music / Pictures."
+    genre: "Data / Music / Pictures"
     languages:
       - Japanese
     minPlayers: 1
@@ -98172,6 +99847,8 @@ SLPS-00282:
     linkCable: false
 SLPM-80161:
   name: "MeltyLancer - Re-inforce (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01147:
   name: "MeltyLancer - Re-inforce (Japan) (Disc 1)"
   discSet:
@@ -98728,6 +100405,8 @@ SLPS-02685:
     linkCable: false
 SCED-02256:
   name: "Mental Wealth - ECTS '99 Demo Disc (Europe) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01664:
   name: "Meremanoid (Japan)"
   controllers:
@@ -98749,6 +100428,8 @@ SLPS-01664:
     linkCable: false
 SLPM-80440:
   name: "Meremanoid (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86934:
   name: "Mermaid no Kisetsu (Japan) (Disc 1)"
   discSet:
@@ -99008,7 +100689,7 @@ SLPS-01164:
     publisher: "Electronic Arts"
     developer: "Core Design"
     releaseDate: "1998-01-15"
-    genre: "Beat'em up"
+    genre: "Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -99045,6 +100726,8 @@ SCPS-45320:
     linkCable: false
 PAPX-90044:
   name: "Metal Gear Solid (Asia) (Demo)"
+  metadata:
+    genre: "			"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-905-g237f469"
@@ -99110,10 +100793,14 @@ SCPS-45318:
     linkCable: false
 SLED-01400:
   name: "Metal Gear Solid (Europe) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLED-01775:
   name: "Metal Gear Solid (Europe) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
 SLES-01370:
@@ -99359,7 +101046,7 @@ SLPM-86098:
     publisher: "Konami"
     developer: "Konami / Diamond Head"
     releaseDate: "1998-07-23"
-    genre: "Sports / Baseball"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -99510,7 +101197,7 @@ SLUS-00594:
     publisher: "Konami"
     developer: "KCE Japan"
     releaseDate: "1998-10-21"
-    genre: "Action / Adventure / Strategy / Shooter"
+    genre: "** DEMO **"
     languages:
       - English
     minPlayers: 1
@@ -99698,6 +101385,8 @@ SLUS-00957:
     linkCable: false
 SLUS-90062:
   name: "Metal Gear Solid - VR Missions (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86485:
   name: "Metal Gear Solid [Konami the Best]"
   controllers:
@@ -99910,7 +101599,7 @@ SLPS-01911:
     publisher: "Dazz"
     developer: "Nexus Interact"
     releaseDate: "2000-02-24"
-    genre: "Simulation."
+    genre: "Simulation"
     languages:
       - Japanese
     minPlayers: 1
@@ -99969,7 +101658,7 @@ SLES-01594:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1998-11-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -100448,6 +102137,8 @@ SLPS-01614:
     linkCable: false
 SLPM-80283:
   name: "Mikagura Shoujo Tanteidan + Neko Zamurai (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02839:
   name: "Mike Tyson Boxing (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -100458,7 +102149,7 @@ SLES-02839:
     publisher: "Proein"
     developer: "Codemasters"
     releaseDate: "2000-03-11"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
       - French
@@ -100481,7 +102172,7 @@ SLUS-01162:
     publisher: "Codemasters"
     developer: "Codemasters"
     releaseDate: "2000-10-31"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -100847,7 +102538,7 @@ SCPS-10042:
     publisher: "Sony"
     developer: "Camelot"
     releaseDate: "1999-03-25"
-    genre: "Sports / Golf / Mini Golf"
+    genre: "Sports - Golf / Mini Golf"
     languages:
       - English
     minPlayers: 1
@@ -100859,6 +102550,8 @@ SCPS-10042:
     linkCable: false
 PAPX-90018:
   name: "Minna no Golf (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - PAPX-90018
     - PAPX-90019
@@ -100872,7 +102565,7 @@ SCPS-45421:
     publisher: "Sony"
     developer: "Clap Hanz"
     releaseDate: "1999-07-29"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Chinese
       - English
@@ -100893,7 +102586,7 @@ SCPS-10093:
     publisher: "Sony"
     developer: "Clap Hanz"
     releaseDate: "1999-07-29"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -100912,7 +102605,7 @@ SCPS-91197:
     publisher: "Sony"
     developer: "Clap Hanz"
     releaseDate: "2000-07-06"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -100950,7 +102643,7 @@ SLPS-03279:
     publisher: "Dyna Corporation"
     developer: "Dyna Corporation"
     releaseDate: "2001-09-06"
-    genre: "Breeding / Simulation / Data / Pictures."
+    genre: "Breeding / Simulation / Data / Pictures"
     languages:
       - Japanese
     minPlayers: 1
@@ -101028,7 +102721,7 @@ SLPS-01227:
     publisher: "Easily Staffi"
     developer: "Hearty Robin"
     releaseDate: "1998-02-11"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -101156,12 +102849,20 @@ SLPS-02143:
     linkCable: false
 PCPX-96132:
   name: "MiruMiru PlayStation Vol. 28 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96139:
   name: "MiruMiru PlayStation Vol. 29 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96144:
   name: "MiruMiru PlayStation Vol. 31 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96196:
   name: "MiruMiru PlayStation Vol. 43 (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01276:
   name: "Misa no Mahou Monogatari (Japan) (Disc 1)"
   discSet:
@@ -101565,7 +103266,7 @@ SLPS-02215:
     publisher: "Oracion"
     developer: "Oracion"
     releaseDate: "1999-08-05"
-    genre: "Simulation."
+    genre: "Simulation"
     languages:
       - Japanese
     minPlayers: 1
@@ -101784,6 +103485,8 @@ SLPS-00035:
     linkCable: false
 SLPM-80291:
   name: "Mobile Suit Gundam - Char's Counter Attack (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45349:
   name: "Mobile Suit Gundam - Char's Counterattack"
   controllers:
@@ -101906,6 +103609,8 @@ SCPS-45160:
     linkCable: true
 SLPM-80139:
   name: "Mobile Suit Z-Gundam (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01142:
   name: "Mobile Suit Z-Gundam (Japan) (Disc 1)"
   discSet:
@@ -102043,7 +103748,7 @@ SLPS-00099:
     publisher: "Jaleco Entertainment"
     developer: "Jaleco"
     releaseDate: "1995-11-22"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -102211,8 +103916,24 @@ SLPM-86888:
     linkCable: false
 LSP-905017:
   name: "Mona & Moki 1 - Drive Me Wild! (USA)"
+  codes:
+    - LSP905017
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-905024:
   name: "Mona & Moki 2 - Drive Me Wilder! (USA)"
+  codes:
+    - LSP905024
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLUS-00834:
   name: "Monaco Grand Prix (USA)"
   controllers:
@@ -102258,6 +103979,8 @@ SLES-01691:
     linkCable: true
 SLED-01901:
   name: "Monaco Grand Prix Racing Simulation 2 (Europe) (En,Fr,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02106:
   name: "Monaco Grand Prix Racing Simulation 2 (Japan)"
   controllers:
@@ -102287,7 +104010,7 @@ SCES-03073:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "Sony Studio Soho"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -102307,7 +104030,7 @@ SCES-01701:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "London Studio"
     releaseDate: "1999-12-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -102444,6 +104167,8 @@ SLUS-00765:
     linkCable: false
 SLUS-80765:
   name: "Monkey Hero (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
 SLPS-02583:
@@ -102576,7 +104301,7 @@ SLUS-01490:
     publisher: "XS Games LLC."
     developer: "Magical Company LTD"
     releaseDate: "2002-12-15"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -102665,6 +104390,8 @@ SLPS-00910:
     linkCable: false
 SLPM-80096:
   name: "Monster Farm (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01906:
   name: "Monster Farm 2 (Japan)"
   controllers:
@@ -102686,6 +104413,8 @@ SLPS-01906:
     linkCable: false
 SLPM-80379:
   name: "Monster Farm 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02653:
   name: "Monster Farm Battle Card (Japan)"
   controllers:
@@ -102826,6 +104555,8 @@ SLUS-00568:
     linkCable: false
 SLUS-80568:
   name: "Monster Rancher (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00917:
   name: "Monster Rancher 2 (USA)"
   compatibility:
@@ -102849,6 +104580,8 @@ SLUS-00917:
     linkCable: false
 SLUS-90071:
   name: "Monster Rancher 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01178:
   name: "Monster Rancher Battle Card - Episode II (USA)"
   controllers:
@@ -102911,6 +104644,8 @@ SLES-00314:
     linkCable: false
 SLED-00692:
   name: "Monster Trucks (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01540:
   name: "MonsterSeed (Europe) (En,Fr,De)"
   controllers:
@@ -103113,6 +104848,8 @@ SCPS-45122:
     linkCable: false
 SLPM-80150:
   name: "Moonlight Syndrome (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01001:
   name: "Moonlight Syndrome (Japan) (Disc 1)"
   discSet:
@@ -103295,7 +105032,7 @@ SLPS-02488:
     publisher: "Yuki"
     developer: "Yuki"
     releaseDate: "1999-12-16"
-    genre: "Board / Chess."
+    genre: "Board - Chess"
     languages:
       - Japanese
     minPlayers: 1
@@ -103314,7 +105051,7 @@ SLPS-02487:
     publisher: "Yuki"
     developer: "Yuki"
     releaseDate: "1999-12-16"
-    genre: "Board."
+    genre: "Board"
     languages:
       - Japanese
     minPlayers: 1
@@ -103353,7 +105090,7 @@ SLPS-02278:
     publisher: "Yuki"
     developer: "Yuki"
     releaseDate: "1999-09-22"
-    genre: "Board / Reversi."
+    genre: "Board / Reversi"
     languages:
       - Japanese
     minPlayers: 1
@@ -103372,7 +105109,7 @@ SLPS-02277:
     publisher: "Yuki"
     developer: "Yuki"
     releaseDate: "1999-09-22"
-    genre: "Board / Shogi."
+    genre: "Board / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -103496,7 +105233,7 @@ SLES-02338:
     publisher: "Midway"
     developer: "Midway"
     releaseDate: "2000-09-29"
-    genre: "Action / Beat'em up / Shooter / Adventure"
+    genre: "Action / Beat'em Up / Shooter / Adventure"
     languages:
       - English
     minPlayers: 1
@@ -103518,7 +105255,7 @@ SLUS-00824:
     publisher: "Midway"
     developer: "Midway"
     releaseDate: "2000-06-30"
-    genre: "Action / Beat'em up / Shooter / Adventure"
+    genre: "Action / Beat'em Up / Shooter / Adventure"
     languages:
       - English
     minPlayers: 1
@@ -103668,7 +105405,7 @@ SLES-01020:
     publisher: "GT Interactive"
     developer: "Avalanche Software"
     releaseDate: "1997-12-01"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -103689,7 +105426,7 @@ SLUS-00476:
     publisher: "Midway"
     developer: "Avalanche Software"
     releaseDate: "1997-10-10"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -103826,6 +105563,8 @@ SLES-00469:
     linkCable: false
 SLED-01005:
   name: "Moto Racer (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01163:
   name: "Moto Racer (Japan)"
   compatibility:
@@ -103874,6 +105613,8 @@ SLUS-00498:
     linkCable: false
 SLED-01552:
   name: "Moto Racer 2 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01184:
   name: "Moto Racer 2 (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
@@ -104662,6 +106403,8 @@ SLUS-01018:
     linkCable: false
 SLUS-90080:
   name: "Ms. Pac-Man Maze Madness (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02973:
   name: "Mummy, The (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -104715,7 +106458,7 @@ SLES-03870:
     publisher: "Anco"
     developer: "Anco"
     releaseDate: "2002-04-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Portuguese
     minPlayers: 1
@@ -104971,7 +106714,7 @@ SLPS-01392:
     publisher: "Victor Entertainment"
     developer: "A-Wave"
     releaseDate: "1998-06-11"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -104983,6 +106726,8 @@ SLPS-01392:
     linkCable: false
 SLPM-80253:
   name: "Murakoshi Seikai no Bakuchou Nihon Rettou (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02279:
   name: "Murakoshi Seikai no Bakuchou Nihon Rettou (Japan) (TsuriCon Taiouban)"
   controllers:
@@ -104992,7 +106737,7 @@ SLPS-02279:
     publisher: "Victor Entertainment"
     developer: "A-Wave"
     releaseDate: "1999-09-22"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -105011,7 +106756,7 @@ SLPS-02890:
     publisher: "Victor Entertainment"
     developer: "Infinity"
     releaseDate: "2000-09-14"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -105035,7 +106780,7 @@ SLPS-01988:
     publisher: "Victor Entertainment"
     developer: "A-Wave"
     releaseDate: "1999-03-25"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -105059,7 +106804,7 @@ SLPS-01989:
     publisher: "Victor Entertainment"
     developer: "A-Wave"
     releaseDate: "1999-03-25"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -105150,6 +106895,8 @@ SLES-01356:
     linkCable: false
 SLED-02539:
   name: "Music 2000 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02224:
   name: "Music 2000 (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -106067,6 +107814,8 @@ SLUS-01571:
     linkCable: false
 SLUS-80473:
   name: "NBA 2Ball (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02299:
   name: "NBA Basketball 2000 (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -106076,7 +107825,7 @@ SLES-02299:
     publisher: "Fox Interactive"
     developer: "Radical Entertaiment"
     releaseDate: "1999-10-31"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
       - French
@@ -106099,7 +107848,7 @@ SLUS-00926:
     publisher: "Fox Interactive"
     developer: "Radical Entertaiment"
     releaseDate: "1999-10-31"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106117,7 +107866,7 @@ SLES-01003:
     publisher: "GT Interactive"
     developer: "Visual Concepts"
     releaseDate: "1998-12-01"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106135,7 +107884,7 @@ SLUS-00492:
     publisher: "Midway Home Entertainment"
     developer: "Visual Concepts"
     releaseDate: "1997-11-10"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106155,7 +107904,7 @@ SLUS-00329:
     publisher: "Midway"
     developer: "Director's Cut"
     releaseDate: "1997-05-15"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106174,7 +107923,7 @@ SLES-03362:
     publisher: "Midway Home Entertainment Inc"
     developer: "Eurocom Developments Ltd"
     releaseDate: "2001-04-13"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106193,7 +107942,7 @@ SLUS-01331:
     publisher: "Midway Home Entertainment Inc"
     developer: "Eurocom Developments Ltd"
     releaseDate: "2001-02-17"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106211,7 +107960,7 @@ SLES-00068:
     publisher: "Acclaim Entertaiment"
     developer: "Iguana Entertainment"
     releaseDate: "1996-01-10"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106229,7 +107978,7 @@ SLPS-00199:
     publisher: "Acclaim Entertaiment"
     developer: "Iguana Entertainment"
     releaseDate: "1996-05-17"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -106247,7 +107996,7 @@ SLUS-00002:
     publisher: "Acclaim Entertaiment"
     developer: "Iguana Entertainment"
     releaseDate: "1995-09-05"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106267,7 +108016,7 @@ SLES-00529:
     publisher: "Acclaim Entertaiment"
     developer: "Sculptured Software, Inc"
     releaseDate: "1996-11-29"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106287,7 +108036,7 @@ SLPS-00699:
     publisher: "Acclaim Entertaiment"
     developer: "Sculptured Software, Inc"
     releaseDate: "1997-02-21"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -106310,7 +108059,7 @@ SLUS-00388:
     publisher: "Acclaim Entertaiment"
     developer: "Sculptured Software, Inc"
     releaseDate: "1996-10-31"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106329,7 +108078,7 @@ SLES-02358:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106348,7 +108097,7 @@ SLES-02359:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - French
     minPlayers: 1
@@ -106367,7 +108116,7 @@ SLES-02360:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - German
     minPlayers: 1
@@ -106386,7 +108135,7 @@ SLES-02361:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Italian
     minPlayers: 1
@@ -106405,7 +108154,7 @@ SLPS-02603:
     publisher: "Electronics Arts Victor"
     developer: "EA Canada"
     releaseDate: "2000-02-24"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -106424,7 +108173,7 @@ SLES-02362:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Spanish
     minPlayers: 1
@@ -106443,7 +108192,7 @@ SLUS-00998:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "1999-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106462,7 +108211,7 @@ SLES-03128:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106481,7 +108230,7 @@ SLES-03129:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - French
     minPlayers: 1
@@ -106500,7 +108249,7 @@ SLES-03130:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - German
     minPlayers: 1
@@ -106519,7 +108268,7 @@ SLES-03131:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Italian
     minPlayers: 1
@@ -106538,7 +108287,7 @@ SLES-03132:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Spanish
     minPlayers: 1
@@ -106557,7 +108306,7 @@ SLUS-01271:
     publisher: "Electronics Arts"
     developer: "EA Canada"
     releaseDate: "2000-10-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106576,7 +108325,7 @@ SLES-03718:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "2001-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106595,7 +108344,7 @@ SLES-03719:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "2001-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - French
     minPlayers: 1
@@ -106614,7 +108363,7 @@ SLES-03720:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "2001-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - German
     minPlayers: 1
@@ -106633,7 +108382,7 @@ SLES-03721:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "2001-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Italian
     minPlayers: 1
@@ -106652,7 +108401,7 @@ SLES-03722:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "2001-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Spanish
     minPlayers: 1
@@ -106671,7 +108420,7 @@ SLUS-01416:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "2001-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106690,7 +108439,7 @@ SLES-03982:
     publisher: "Electronic Arts"
     developer: "NuFX, Inc"
     releaseDate: "2002-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106709,7 +108458,7 @@ SLES-03969:
     publisher: "Electronic Arts"
     developer: "NuFX, Inc"
     releaseDate: "2002-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - French
     minPlayers: 1
@@ -106728,7 +108477,7 @@ SLES-03968:
     publisher: "Electronic Arts"
     developer: "NuFX, Inc"
     releaseDate: "2002-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - German
     minPlayers: 1
@@ -106747,7 +108496,7 @@ SLES-03970:
     publisher: "Electronic Arts"
     developer: "NuFX, Inc"
     releaseDate: "2002-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Italian
     minPlayers: 1
@@ -106766,7 +108515,7 @@ SLES-03971:
     publisher: "Electronic Arts"
     developer: "NuFX, Inc"
     releaseDate: "2002-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Spanish
     minPlayers: 1
@@ -106785,7 +108534,7 @@ SLUS-01483:
     publisher: "Electronic Arts"
     developer: "NuFX, Inc"
     releaseDate: "2002-10-08"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106803,7 +108552,7 @@ SLES-00225:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1996-05-01"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106821,7 +108570,7 @@ SLPS-00389:
     publisher: "Electronic Arts Victor"
     developer: "EA Sports"
     releaseDate: "1996-06-14"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -106843,7 +108592,7 @@ SLUS-00060:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1996-03-10"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106861,7 +108610,7 @@ SLES-00517:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "1996-12-01"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
       - French
@@ -106881,7 +108630,7 @@ SLPS-00736:
     publisher: "Electronic Arts Victor"
     developer: "EA Canada"
     releaseDate: "1997-02-28"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -106899,7 +108648,7 @@ SLUS-00267:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "1996-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -106918,7 +108667,7 @@ SLES-00906:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1997-10-15"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
       - Italian
@@ -106939,7 +108688,7 @@ SLES-00951:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1997-10-15"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - French
     minPlayers: 1
@@ -106958,7 +108707,7 @@ SLES-00952:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1997-10-15"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - German
     minPlayers: 1
@@ -106977,7 +108726,7 @@ SLPS-01296:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1998-04-02"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -106996,7 +108745,7 @@ SLUS-00523:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1997-11-10"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107015,7 +108764,7 @@ SLES-01446:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "1998-12-04"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107034,7 +108783,7 @@ SLES-01454:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "1998-12-04"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - French
     minPlayers: 1
@@ -107053,7 +108802,7 @@ SLES-01455:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "1998-12-04"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - German
     minPlayers: 1
@@ -107072,7 +108821,7 @@ SLES-01456:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "1998-12-04"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Italian
     minPlayers: 1
@@ -107091,7 +108840,7 @@ SLPS-02033:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "1999-04-28"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -107110,7 +108859,7 @@ SLES-01457:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "1998-12-04"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Spanish
     minPlayers: 1
@@ -107129,7 +108878,7 @@ SLUS-00736:
     publisher: "EA Sports"
     developer: "NuFX, Inc"
     releaseDate: "1998-11-15"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107147,7 +108896,7 @@ SLPS-00188:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1995-12-22"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -107165,7 +108914,7 @@ SLPM-86011:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-11-29"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
       - Japanese
@@ -107184,7 +108933,7 @@ SLPM-86060:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-01-29"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -107203,7 +108952,7 @@ SLPM-86176:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1999-07-03"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
       - Japanese
@@ -107223,7 +108972,7 @@ SLPM-86397:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2000-01-27"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -107241,7 +108990,7 @@ SLES-00882:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-04-10"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107260,7 +109009,7 @@ SLES-01970:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1999-03-31"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107278,7 +109027,7 @@ SCUS-94552:
     publisher: "Sony Computer Entertainment"
     developer: "Team SOHO"
     releaseDate: "1997-03-01"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107296,7 +109045,7 @@ SCUS-94500:
     publisher: "Sony Computer Entertainment"
     developer: "Team SOHO"
     releaseDate: "1996-03-10"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107315,7 +109064,7 @@ SCUS-94561:
     publisher: "989 Sports"
     developer: "989 Sports"
     releaseDate: "1999-10-26"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107334,7 +109083,7 @@ SCUS-94581:
     publisher: "989 Sports"
     developer: "Killer Game"
     releaseDate: "2000-10-25"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107346,6 +109095,8 @@ SCUS-94581:
     linkCable: false
 SCUS-94582:
   name: "NBA ShootOut 2001 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94641:
   name: "NBA ShootOut 2002 (USA)"
   controllers:
@@ -107355,7 +109106,7 @@ SCUS-94641:
     publisher: "989 Sports"
     developer: "Killer Game"
     releaseDate: "2001-09-19"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107367,6 +109118,8 @@ SCUS-94641:
     linkCable: false
 SCUS-94660:
   name: "NBA ShootOut 2002 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94673:
   name: "NBA ShootOut 2003 (USA)"
   controllers:
@@ -107376,7 +109129,7 @@ SCUS-94673:
     publisher: "989 Sports"
     developer: "Killer Game"
     releaseDate: "2002-09-25"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107395,7 +109148,7 @@ SCUS-94691:
     publisher: "989 Sports"
     developer: "989 Sports"
     releaseDate: "2003-10-08"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107413,7 +109166,7 @@ SCUS-94171:
     publisher: "Sony Computer Entertainment"
     developer: "Sony Interactive Studios America"
     releaseDate: "1998-02-28"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107432,7 +109185,7 @@ SLES-02336:
     publisher: "Midway"
     developer: "Eurocom Entertainment Software"
     releaseDate: "2000-04-28"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107451,7 +109204,7 @@ SLUS-00948:
     publisher: "Midway"
     developer: "Eurocom Entertainment Software"
     releaseDate: "1999-11-16"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107469,7 +109222,7 @@ SLUS-00445:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-01-31"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107488,7 +109241,7 @@ SLUS-00791:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1999-03-31"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107506,7 +109259,7 @@ SLES-00171:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-04-14"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107524,7 +109277,7 @@ SLUS-00048:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1995-12-14"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107542,7 +109295,7 @@ SLES-00560:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-11-21"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107560,7 +109313,7 @@ SLUS-00294:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-11-21"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107579,7 +109332,7 @@ SLES-02513:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2000-02-02"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107598,7 +109351,7 @@ SLUS-01028:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2000-02-02"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107616,7 +109369,7 @@ SLUS-00142:
     publisher: "Mindscape Inc"
     developer: "High Voltage Software, Inc"
     releaseDate: "1997-03-31"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107635,7 +109388,7 @@ SCUS-94562:
     publisher: "989 Sports"
     developer: "Killer Game"
     releaseDate: "1999-10-31"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107647,6 +109400,8 @@ SCUS-94562:
     linkCable: false
 SCUS-94391:
   name: "NCAA Final Four 2000 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94579:
   name: "NCAA Final Four 2001 (USA)"
   controllers:
@@ -107656,7 +109411,7 @@ SCUS-94579:
     publisher: "989 Sports"
     developer: "Killer Game"
     releaseDate: "2000-11-15"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107678,7 +109433,7 @@ SCUS-94264:
     publisher: "989 Sports"
     developer: "Killer Game"
     releaseDate: "1999-01-13"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107697,7 +109452,7 @@ SLUS-00932:
     publisher: "Electronic Arts"
     developer: "Tiburon"
     releaseDate: "1999-07-27"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107716,7 +109471,7 @@ SLUS-01219:
     publisher: "Electronic Arts"
     developer: "Tiburon"
     releaseDate: "2000-07-26"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107734,7 +109489,7 @@ SLUS-00514:
     publisher: "Electronic Arts"
     developer: "Tiburon"
     releaseDate: "1997-08-05"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107753,7 +109508,7 @@ SLUS-00688:
     publisher: "Electronic Arts"
     developer: "Tiburon"
     releaseDate: "1998-08-01"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107771,7 +109526,7 @@ SCUS-94509:
     publisher: "Sony"
     developer: "Sony"
     releaseDate: "1996-08-31"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107790,7 +109545,7 @@ SCUS-94557:
     publisher: "Sony"
     developer: "Sony"
     releaseDate: "1999-08-10"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107802,6 +109557,8 @@ SCUS-94557:
     linkCable: false
 SCUS-94386:
   name: "NCAA GameBreaker 2000 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94573:
   name: "NCAA GameBreaker 2001 (USA)"
   controllers:
@@ -107811,7 +109568,7 @@ SCUS-94573:
     publisher: "Sony"
     developer: "989 Sports"
     releaseDate: "2000-08-21"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107823,6 +109580,8 @@ SCUS-94573:
     linkCable: false
 SCUS-94574:
   name: "NCAA GameBreaker 2001 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94172:
   name: "NCAA GameBreaker 98 (USA)"
   controllers:
@@ -107832,7 +109591,7 @@ SCUS-94172:
     publisher: "Sony"
     developer: "Sony"
     releaseDate: "1997-08-01"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107851,7 +109610,7 @@ SCUS-94246:
     publisher: "Sony"
     developer: "Sony"
     releaseDate: "1998-10-10"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107863,6 +109622,8 @@ SCUS-94246:
     linkCable: false
 SCUS-94375:
   name: "NCAA GameBreaker 99 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01023:
   name: "NCAA March Madness 2000 (USA)"
   controllers:
@@ -107872,7 +109633,7 @@ SLUS-01023:
     publisher: "Electronics Arts"
     developer: "Scoreboard Productions"
     releaseDate: "1999-09-30"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107891,7 +109652,7 @@ SLUS-01320:
     publisher: "Electronic Arts"
     developer: "Black Ops Entertainment, Inc"
     releaseDate: "2000-11-29"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107910,7 +109671,7 @@ SLUS-00805:
     publisher: "Electronics Arts"
     developer: "Scoreboard Productions"
     releaseDate: "1998-11-30"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -107929,7 +109690,7 @@ SLUS-00617:
     publisher: "Midway Home Entertainment"
     developer: "Midway Home Entertainment"
     releaseDate: "1998-09-10"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107948,7 +109709,7 @@ SLES-02335:
     publisher: "Midway Home Entertainment"
     developer: "Midway Home Entertainment"
     releaseDate: "2000-03-12"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107967,7 +109728,7 @@ SLUS-00861:
     publisher: "Midway Home Entertainment"
     developer: "Midway Home Entertainment"
     releaseDate: "1999-08-24"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -107989,7 +109750,7 @@ SLUS-01146:
     publisher: "Midway Home Entertainment"
     developer: "Point of View, Inc"
     releaseDate: "2000-09-12"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108007,7 +109768,7 @@ SLUS-00047:
     publisher: "Konami"
     developer: "Robin Antonick Games, L.L.C"
     releaseDate: "1996-08-10"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108025,7 +109786,7 @@ SCES-00219:
     publisher: "Sony"
     developer: "Sony"
     releaseDate: "1996-05-10"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108046,7 +109807,7 @@ SCUS-94505:
     publisher: "Sony"
     developer: "Sony"
     releaseDate: "1995-11-10"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108065,7 +109826,7 @@ SCUS-94556:
     publisher: "Sony"
     developer: "Red Zone Interactive, Inc"
     releaseDate: "1999-07-31"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108077,6 +109838,8 @@ SCUS-94556:
     linkCable: false
 SCUS-94385:
   name: "NFL GameDay 2000 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94575:
   name: "NFL GameDay 2001 (USA)"
   controllers:
@@ -108086,7 +109849,7 @@ SCUS-94575:
     publisher: "Sony"
     developer: "Red Zone Interactive, Inc"
     releaseDate: "2000-08-16"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108098,6 +109861,8 @@ SCUS-94575:
     linkCable: false
 SCUS-94576:
   name: "NFL GameDay 2001 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94639:
   name: "NFL GameDay 2002 (USA)"
   controllers:
@@ -108107,7 +109872,7 @@ SCUS-94639:
     publisher: "Sony"
     developer: "Red Zone Interactive, Inc"
     releaseDate: "2001-08-08"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108126,7 +109891,7 @@ SCUS-94665:
     publisher: "989 Sports"
     developer: "Red Zone Interactive, Inc"
     releaseDate: "2002-08-14"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108145,7 +109910,7 @@ SCUS-94690:
     publisher: "Sony"
     developer: "Red Zone Interactive, Inc"
     releaseDate: "2003-08-12"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108164,7 +109929,7 @@ SCUS-94695:
     publisher: "Sony"
     developer: "Red Zone Interactive, Inc"
     releaseDate: "2004-08-10"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108182,7 +109947,7 @@ SCUS-94510:
     publisher: "Sony"
     developer: "Sony"
     releaseDate: "1996-11-30"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108200,7 +109965,7 @@ SCUS-94173:
     publisher: "Sony"
     developer: "Sony"
     releaseDate: "1997-08-26"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108222,7 +109987,7 @@ SCUS-94234:
     publisher: "Sony"
     developer: "Red Zone Interactive, Inc"
     releaseDate: "1998-08-26"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108234,6 +109999,8 @@ SCUS-94234:
     linkCable: false
 SCUS-94285:
   name: "NFL GameDay 99 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00221:
   name: "NFL Quarterback Club '96"
   controllers:
@@ -108242,7 +110009,7 @@ SLPS-00221:
     publisher: "Acclaim"
     developer: "Iguana Entertainment"
     releaseDate: "1997-07-24"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - Japanese
     minPlayers: 1
@@ -108260,7 +110027,7 @@ SLES-00449:
     publisher: "Acclaim"
     developer: "Iguana Entertainment"
     releaseDate: "1996-11-30"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108278,7 +110045,7 @@ SLUS-00011:
     publisher: "Acclaim"
     developer: "Iguana Entertainment"
     releaseDate: "1996-11-30"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108297,7 +110064,7 @@ SCES-01490:
     publisher: "989 Studios"
     developer: "989 Studios"
     releaseDate: "1998-10-10"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108316,7 +110083,7 @@ SCUS-94245:
     publisher: "989 Studios"
     developer: "989 Studios"
     releaseDate: "1998-06-30"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108328,6 +110095,8 @@ SCUS-94245:
     linkCable: false
 SCUS-94271:
   name: "NFL Xtreme (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94420:
   name: "NFL Xtreme 2 (USA)"
   controllers:
@@ -108337,7 +110106,7 @@ SCUS-94420:
     publisher: "989 Studios"
     developer: "989 Studios"
     releaseDate: "1999-07-20"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -108349,6 +110118,8 @@ SCUS-94420:
     linkCable: false
 SCUS-94383:
   name: "NFL Xtreme 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02225:
   name: "NHL 2000 (Europe) (En,Sv,Fi)"
   controllers:
@@ -108358,7 +110129,7 @@ SLES-02225:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1999-09-30"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
       - Finnish
@@ -108379,7 +110150,7 @@ SLES-02226:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1999-09-30"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - French
     minPlayers: 1
@@ -108398,7 +110169,7 @@ SLES-02227:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1999-09-30"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - German
     minPlayers: 1
@@ -108417,7 +110188,7 @@ SLUS-00965:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1999-09-30"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108436,7 +110207,7 @@ SLES-03139:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "2000-10-06"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
       - Finnish
@@ -108457,7 +110228,7 @@ SLES-03155:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "2000-10-06"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - Czech
       - French
@@ -108477,7 +110248,7 @@ SLES-03154:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "2000-10-06"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - German
     minPlayers: 1
@@ -108496,7 +110267,7 @@ SLUS-01264:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "2000-09-26"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108514,7 +110285,7 @@ SLES-00492:
     publisher: "EA Sports"
     developer: "Visual Concepts"
     releaseDate: "1996-11-10"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108532,7 +110303,7 @@ SLES-00533:
     publisher: "EA Sports"
     developer: "Visual Concepts"
     releaseDate: "1996-11-10"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - German
     minPlayers: 1
@@ -108550,7 +110321,7 @@ SLPS-00861:
     publisher: "EA Sports"
     developer: "Visual Concepts"
     releaseDate: "1997-07-24"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - Japanese
     minPlayers: 1
@@ -108568,7 +110339,7 @@ SLUS-00030:
     publisher: "EA Sports"
     developer: "Visual Concepts"
     releaseDate: "1996-10-15"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108586,7 +110357,7 @@ SLES-00907:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1997-10-03"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
       - Finnish
@@ -108606,7 +110377,7 @@ SLES-00512:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1997-10-03"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - German
     minPlayers: 1
@@ -108624,7 +110395,7 @@ SLUS-00519:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1997-08-31"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108643,7 +110414,7 @@ SLES-01445:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "1998-10-01"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
       - Finnish
@@ -108665,7 +110436,7 @@ SLES-01458:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "1998-10-15"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - German
     minPlayers: 1
@@ -108684,7 +110455,7 @@ SLUS-00735:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "1998-10-01"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108703,7 +110474,7 @@ SLES-02514:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2000-03-20"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108722,7 +110493,7 @@ SLPM-86193:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2000-03-30"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - Japanese
     minPlayers: 1
@@ -108741,7 +110512,7 @@ SLUS-00825:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2000-03-06"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108759,7 +110530,7 @@ SLES-00624:
     publisher: "Acclaim Entertainment Inc"
     developer: "Sculptured Software, Inc"
     releaseDate: "1997-09-30"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108777,7 +110548,7 @@ SLUS-00391:
     publisher: "Acclaim Entertainment Inc"
     developer: "Sculptured Software, Inc"
     releaseDate: "1997-09-30"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108796,7 +110567,7 @@ SLES-02298:
     publisher: "Fox Sports Interactive, Inc"
     developer: "Radical Entertainment"
     releaseDate: "1999-10-06"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108815,7 +110586,7 @@ SLUS-00925:
     publisher: "Fox Sports Interactive, Inc"
     developer: "Radical Entertainment"
     releaseDate: "1999-10-04"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108833,7 +110604,7 @@ SCES-00392:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1997-03-10"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108851,7 +110622,7 @@ SCUS-94550:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1996-10-23"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108869,7 +110640,7 @@ SCES-00220:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1995-05-10"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108887,7 +110658,7 @@ SCUS-94504:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1995-05-10"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108906,7 +110677,7 @@ SCES-02451:
     publisher: "989 Sports"
     developer: "Solworks"
     releaseDate: "2000-03-31"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108925,7 +110696,7 @@ SCUS-94558:
     publisher: "989 Sports"
     developer: "Solworks"
     releaseDate: "1999-09-14"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108937,6 +110708,8 @@ SCUS-94558:
     linkCable: false
 SCUS-94387:
   name: "NHL FaceOff 2000 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94577:
   name: "NHL FaceOff 2001 (USA)"
   controllers:
@@ -108948,7 +110721,7 @@ SCUS-94577:
     publisher: "989 Sports"
     developer: "Solworks"
     releaseDate: "2000-09-05"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108960,6 +110733,8 @@ SCUS-94577:
     linkCable: false
 SCUS-94578:
   name: "NHL FaceOff 2001 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForceRecompilerICache
 SCES-01022:
@@ -108971,7 +110746,7 @@ SCES-01022:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1998-04-10"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -108990,7 +110765,7 @@ SCUS-94174:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1997-09-24"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -109009,7 +110784,7 @@ SCES-01736:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1998-10-03"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -109028,7 +110803,7 @@ SCUS-94235:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1998-10-03"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -109040,6 +110815,8 @@ SCUS-94235:
     linkCable: false
 SCUS-94372:
   name: "NHL FaceOff 99 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00327:
   name: "NHL Open Ice - 2 on 2 Challenge (USA)"
   controllers:
@@ -109048,7 +110825,7 @@ SLUS-00327:
     publisher: "Midway"
     developer: "Avalanche Software"
     releaseDate: "1996-11-30"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -109066,7 +110843,7 @@ SIPS-60018:
     publisher: "Sony"
     developer: "Sony Interactive Studios America"
     releaseDate: "1997-05-30"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - Japanese
     minPlayers: 1
@@ -109084,7 +110861,7 @@ SLPS-00595:
     publisher: "Virgin Interactive"
     developer: "Radical Entertainment"
     releaseDate: "1997-01-10"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - Japanese
     minPlayers: 1
@@ -109102,7 +110879,7 @@ SLUS-00227:
     publisher: "Virgin Interactive"
     developer: "Radical Entertainment"
     releaseDate: "1996-09-30"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -109120,7 +110897,7 @@ SLES-00313:
     publisher: "Virgin Interactive"
     developer: "Radical Entertainment"
     releaseDate: "1997-06-20"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -109138,7 +110915,7 @@ SLES-00418:
     publisher: "Virgin Interactive"
     developer: "Radical Entertainment"
     releaseDate: "1998-05-22"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
       - French
@@ -109158,7 +110935,7 @@ SLUS-00528:
     publisher: "Virgin Interactive"
     developer: "Radical Entertainment"
     releaseDate: "1997-08-31"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
       - French
@@ -109179,7 +110956,7 @@ SLES-02794:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "2000-06-16"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -109198,7 +110975,7 @@ SLUS-01085:
     publisher: "EA Sports"
     developer: "EA Canada"
     releaseDate: "2000-03-16"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -109609,7 +111386,7 @@ SLES-00999:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-02-15"
-    genre: "Sports / Winter Olympics"
+    genre: "Sports - Winter Olympics"
     languages:
       - English
     minPlayers: 1
@@ -109628,7 +111405,7 @@ SLUS-00591:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1998-01-15"
-    genre: "Sports / Winter Olympics"
+    genre: "Sports - Winter Olympics"
     languages:
       - English
     minPlayers: 1
@@ -109701,7 +111478,7 @@ SLPS-01625:
     publisher: "Oracion"
     developer: "Exit"
     releaseDate: "1998-10-15"
-    genre: "Data / Pictures / Music."
+    genre: "Data / Pictures / Music"
     languages:
       - Japanese
     minPlayers: 1
@@ -109749,8 +111526,12 @@ SLPS-01221:
     linkCable: false
 SCED-00789:
   name: "Namco Demo (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-90008:
   name: "Namco Demo CD (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01050:
   name: "Namco Museum Encore (Japan)"
   controllers:
@@ -110150,7 +111931,7 @@ SCES-00266:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "1996-11-22"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -110168,7 +111949,7 @@ SCES-00263:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "1996-12-15"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -111231,7 +113012,7 @@ SLPS-00006:
     publisher: "TechnoSoft"
     developer: "TechnoSoft"
     releaseDate: "1994-12-03"
-    genre: "Beat'em up"
+    genre: "Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -111392,8 +113173,12 @@ SLPS-01212:
     linkCable: false
 SLPM-80230:
   name: "Neo Atlas (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80282:
   name: "Neo Atlas - Famitsuu no Nazo (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02238:
   name: "Neo Atlas II"
   controllers:
@@ -111627,6 +113412,8 @@ SLPS-00914:
     linkCable: false
 SLED-01340:
   name: "Net Yaroze (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86163:
   name: "Netz Magazine - Altezza (Japan)"
   controllers:
@@ -111730,6 +113517,8 @@ SLES-00933:
     linkCable: false
 SLED-01196:
   name: "Newman Haas Racing (Europe) (En,Fr,De,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   controllers:
     - AnalogController
     - DigitalController
@@ -111760,14 +113549,24 @@ SLUS-00602:
     linkCable: false
 SLED-02022:
   name: "Next Demo 4 (Italy) (En,It)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02076:
   name: "Next Demo 5 (Italy) (En,It)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02041:
   name: "Next Demo 6 (Italy) (En,It)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02156:
   name: "Next Demo 7 (Italy) (En,It)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02157:
   name: "Next Demo 9 (Italy) (En,It)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00859:
   name: "Next King - Koi no Sennen Oukoku (Japan)"
   controllers:
@@ -111776,7 +113575,7 @@ SLPS-00859:
     publisher: "Bandai"
     developer: "Alfa System / MARS Corporation"
     releaseDate: "1997-06-27"
-    genre: "Board / Dating / RPG."
+    genre: "Board / Dating / RPG"
     languages:
       - Japanese
     minPlayers: 1
@@ -111794,7 +113593,7 @@ SLPS-00858:
     publisher: "Bandai"
     developer: "Alfa System / MARS Corporation"
     releaseDate: "1997-06-27"
-    genre: "Board / Dating / RPG."
+    genre: "Board / Dating / RPG"
     languages:
       - Japanese
     minPlayers: 1
@@ -111820,7 +113619,7 @@ SLPS-02507:
     publisher: "Bullet Proof Software"
     developer: "Blue Planet Interactive"
     releaseDate: "1999-12-16"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - Japanese
     minPlayers: 1
@@ -111838,7 +113637,7 @@ SLES-01987:
     publisher: "Atari / Hasbro Interactive"
     developer: "Blue Planet Interactive"
     releaseDate: "1999-06-10"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - Dutch
       - English
@@ -111866,7 +113665,7 @@ SLPS-01774:
     publisher: "Bullet Proof Software"
     developer: "Blue Planet Interactive"
     releaseDate: "2000-04-13"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - Japanese
     minPlayers: 1
@@ -111889,7 +113688,7 @@ SLUS-00862:
     publisher: "Atari / Hasbro Interactive"
     developer: "Blue Planet Interactive"
     releaseDate: "1999-05-31"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - English
     minPlayers: 1
@@ -111953,7 +113752,7 @@ SLPS-03351:
     publisher: "Digicube"
     developer: "Naxat Soft"
     releaseDate: "2001-11-29"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -111991,7 +113790,7 @@ SLPS-03369:
     publisher: "DigiCube"
     developer: "Yuki"
     releaseDate: "2002-01-24"
-    genre: "Hanafuda / Cards."
+    genre: "Hanafuda / Cards"
     languages:
       - Japanese
     minPlayers: 1
@@ -112010,7 +113809,7 @@ SLPS-03368:
     publisher: "Digicube"
     developer: "Digicube"
     releaseDate: "2002-01-31"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -112066,7 +113865,7 @@ SLPS-03398:
     publisher: "DigiCube"
     developer: "DigiCube"
     releaseDate: "2002-02-27"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -112122,7 +113921,7 @@ SLPS-03410:
     publisher: "Digicube"
     developer: "Digicube"
     releaseDate: "2002-03-28"
-    genre: "Board / Igo."
+    genre: "Board / Igo"
     languages:
       - Japanese
     minPlayers: 1
@@ -112196,7 +113995,7 @@ SLES-04173:
     publisher: "Global Star Software Ltd"
     developer: "ImaginEngine Corp"
     releaseDate: "2003-11-18"
-    genre: "Adventure / PLatformer / Mini games."
+    genre: "Adventure / Platformer / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -112215,7 +114014,7 @@ SLUS-01576:
     publisher: "Global Star Software Ltd"
     developer: "ImaginEngine Corp"
     releaseDate: "2003-11-18"
-    genre: "Adventure / PLatformer / Mini games."
+    genre: "Adventure / Platformer / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -112272,7 +114071,7 @@ SLES-02524:
     publisher: "THQ"
     developer: "n-Space, Inc"
     releaseDate: "1999-12-15"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - French
     minPlayers: 1
@@ -112290,7 +114089,7 @@ SLES-03343:
     publisher: "THQ, Inc"
     developer: "Avalanche Software"
     releaseDate: "2001-03-30"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - French
     minPlayers: 1
@@ -112423,7 +114222,7 @@ SLES-02911:
     publisher: "Proein / THQ"
     developer: "n-Space, Inc"
     releaseDate: "2000-05-18"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - Spanish
     minPlayers: 1
@@ -112492,6 +114291,8 @@ SLUS-00650:
     linkCable: false
 SLUS-80650:
   name: "Nickelodeon Rugrats - Search for Reptar (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02525:
   name: "Nickelodeon Rugrats - Studio Tour (Europe)"
   controllers:
@@ -112501,7 +114302,7 @@ SLES-02525:
     publisher: "THQ"
     developer: "n-Space, Inc"
     releaseDate: "1999-12-15"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -112520,7 +114321,7 @@ SLES-02523:
     publisher: "THQ"
     developer: "n-Space, Inc"
     releaseDate: "1999-12-15"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - German
     minPlayers: 1
@@ -112539,7 +114340,7 @@ SLES-02912:
     publisher: "THQ"
     developer: "n-Space, Inc"
     releaseDate: "1999-12-15"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - Italian
     minPlayers: 1
@@ -112558,7 +114359,7 @@ SLUS-00880:
     publisher: "THQ"
     developer: "n-Space, Inc"
     releaseDate: "1999-11-15"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -112614,7 +114415,7 @@ SLES-03344:
     publisher: "THQ, Inc. / Proein Soft"
     developer: "Avalanche Software"
     releaseDate: "2001-03-30"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - Spanish
     minPlayers: 1
@@ -112632,7 +114433,7 @@ SLES-03342:
     publisher: "THQ, Inc"
     developer: "Avalanche Software"
     releaseDate: "2001-03-30"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -112650,7 +114451,7 @@ SLUS-01116:
     publisher: "THQ, Inc"
     developer: "Avalanche Software"
     releaseDate: "2001-03-30"
-    genre: "Action / Adventure / Mini games"
+    genre: "Action / Adventure / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -112872,6 +114673,8 @@ SIPS-60027:
     linkCable: false
 PCPX-96101:
   name: "Nightmare Creatures (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForceRecompilerICache # Crappy CD code on boot is timing sensitive.
 SLUS-00582:
@@ -112900,6 +114703,8 @@ SLUS-00582:
     linkCable: false
 SLUS-90011:
   name: "Nightmare Creatures (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForceRecompilerICache # Crappy CD code on boot is timing sensitive.
 SLES-02751:
@@ -113046,7 +114851,7 @@ SLPS-01667:
     publisher: "Sunsoft"
     developer: "Graphic Research"
     releaseDate: "2000-06-01"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -113058,6 +114863,8 @@ SLPS-01667:
     linkCable: false
 SLPM-80086:
   name: "Nihon Pro Golf Kyoukai Kanshuu - Double Eagle (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00793:
   name: "Nihon Pro Mahjong Renmei Kounin - Doujou Yaburi (Japan)"
   controllers:
@@ -113066,7 +114873,7 @@ SLPS-00793:
     publisher: "Naxat Soft"
     developer: "Naxat Soft"
     releaseDate: "1997-05-30"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -113106,7 +114913,7 @@ SLPS-01653:
     publisher: "Naxat Soft"
     developer: "Naxat Soft"
     releaseDate: "2000-06-29"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -113165,7 +114972,7 @@ SLPM-87039:
     publisher: "Atlus Co"
     developer: "Atlus Co"
     releaseDate: "2002-12-12"
-    genre: "Sports / Dodgeball"
+    genre: "Sports - Dodgeball"
     languages:
       - Japanese
     minPlayers: 1
@@ -113240,7 +115047,7 @@ SLES-00757:
     publisher: "Eidos Interactive"
     developer: "Core Design Ltd"
     releaseDate: "1998-09-30"
-    genre: "Action / Platformer / Beat'em up"
+    genre: "Action / Platformer / Beat'em Up"
     languages:
       - French
     minPlayers: 1
@@ -113258,7 +115065,7 @@ SLES-01554:
     publisher: "Eidos Interactive"
     developer: "Core Design Ltd"
     releaseDate: "1998-09-30"
-    genre: "Action / Platformer / Beat'em up"
+    genre: "Action / Platformer / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -113276,7 +115083,7 @@ SLES-00076:
     publisher: "Crystal Dynamics"
     developer: "Left Field Productions"
     releaseDate: "1996-07-26"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -113288,8 +115095,12 @@ SLES-00076:
     linkCable: false
 SLED-01413:
   name: "Ninja - Shadow of Darkness (Europe) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01414:
   name: "Ninja - Shadow of Darkness (Europe) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00756:
   name: "Ninja - Shadow of Darkness (Europe) (Es,It)"
   controllers:
@@ -113298,7 +115109,7 @@ SLES-00756:
     publisher: "Eidos Interactive"
     developer: "Core Design Ltd"
     releaseDate: "1998-09-30"
-    genre: "Action / Platformer / Beat'em up"
+    genre: "Action / Platformer / Beat'em Up"
     languages:
       - Italian
       - Spanish
@@ -113317,7 +115128,7 @@ SLES-00758:
     publisher: "Eidos Interactive"
     developer: "Core Design Ltd"
     releaseDate: "1998-09-30"
-    genre: "Action / Platformer / Beat'em up"
+    genre: "Action / Platformer / Beat'em Up"
     languages:
       - German
     minPlayers: 1
@@ -113338,7 +115149,7 @@ SLUS-00435:
     publisher: "Eidos Interactive"
     developer: "Core Design Ltd"
     releaseDate: "1998-10-01"
-    genre: "Action / Platformer / Beat'em up"
+    genre: "Action / Platformer / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -113411,7 +115222,7 @@ SLPS-01757:
     publisher: "ASCII Entertainment"
     developer: "ASCII Entertainment"
     releaseDate: "1998-12-17"
-    genre: "Board / Shogi."
+    genre: "Board / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -113429,7 +115240,7 @@ SLPS-00658:
     publisher: "Sunsoft"
     developer: "Graphic Research"
     releaseDate: "1997-05-30"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -113483,7 +115294,7 @@ SLPS-02356:
     publisher: "Naxat Soft"
     developer: "Naxat Soft"
     releaseDate: "1999-10-28"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -113521,7 +115332,7 @@ SLPS-02175:
     publisher: "KSS"
     developer: "KSS"
     releaseDate: "1999-08-26"
-    genre: "Gambling / Pachinko."
+    genre: "Gambling / Pachinko"
     languages:
       - Japanese
     minPlayers: 1
@@ -113625,6 +115436,8 @@ SLPS-01024:
     linkCable: false
 SLPM-80160:
   name: "Nissan Presents - Over Drivin' - Skyline Memorial (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01000:
   name: "No Fear Downhill Mountain Bike Racing (USA)"
   compatibility:
@@ -113638,7 +115451,7 @@ SLUS-01000:
     publisher: "The Codemasters Software Co. Ltd"
     developer: "UDS"
     releaseDate: "1999-11-16"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -113650,6 +115463,8 @@ SLUS-01000:
     linkCable: false
 SLED-02450:
   name: "No Fear Downhill Mountain Biking (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00849:
   name: "No Fear Downhill Mountain Biking (Europe) (En,Fr,De,Es,It,Sv)"
   controllers:
@@ -113660,7 +115475,7 @@ SLES-00849:
     publisher: "The Codemasters Software Co. Ltd"
     developer: "UDS"
     releaseDate: "1999-11-16"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
       - French
@@ -113713,6 +115528,8 @@ SLUS-00804:
     linkCable: false
 SLUS-80804:
   name: "No One Can Stop Mr. Domino (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00265:
   name: "No-Appointment Gals Olympos"
   controllers:
@@ -114559,6 +116376,8 @@ SLUS-00518:
     linkCable: false
 SLUS-80518:
   name: "Nuclear Strike (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - SLUS-80518
     - SLUS-90006
@@ -114678,6 +116497,8 @@ SLES-01409:
     linkCable: false
 SLED-01574:
   name: "O.D.T. (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01410:
   name: "O.D.T. (Germany)"
   controllers:
@@ -114699,6 +116520,8 @@ SLES-01410:
     linkCable: false
 SLED-01575:
   name: "O.D.T. (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01411:
   name: "O.D.T. (Italy)"
   controllers:
@@ -114758,12 +116581,20 @@ SLUS-00698:
     linkCable: false
 SLUS-90043:
   name: "O.D.T. (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02851:
   name: "OPSM Best Ever Ever Games Demo (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03239:
   name: "OPSM Best PS One Games Ever (Europe, Australia)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02492:
   name: "OPSM Best Racing Game Ever (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01899:
   name: "Oasis Road (Japan)"
   controllers:
@@ -115104,6 +116935,8 @@ SLUS-00731:
     linkCable: false
 SLED-01608:
   name: "Oddworld - Abe's Exoddus + Duke Nukem - Time To Kill + B-Movie (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01655:
   name: "Oddworld - Abe's Exoddus + Duke Nukem - Time to Kill + Duke Nukem - 3D (France) (En,Fr)"
 SLES-00664:
@@ -115129,6 +116962,8 @@ SLES-00664:
     linkCable: false
 SLED-00725:
   name: "Oddworld - Abe's Oddysee (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00839:
   name: "Oddworld - Abe's Oddysee (Germany)"
   controllers:
@@ -115210,6 +117045,8 @@ SLUS-00190:
     linkCable: false
 SLUS-90004:
   name: "Oddworld - Abe's Oddysee (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01502:
   name: "Oddworld - L'Exode d'Abe (France) (Disc 1)"
   discSet:
@@ -115370,122 +117207,240 @@ SLUS-00020:
     linkCable: false
 SCZS-94106:
   name: "Official Fan Book - Circadia - Special CD-ROM (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03375:
   name: "Official PlayStation Magazine Best Games Ever 2000 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02122:
   name: "Official PlayStation Magazine Platinum Special Demo (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94189:
   name: "Official U.S. PlayStation Magazine Demo Disc 01 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94198:
   name: "Official U.S. PlayStation Magazine Demo Disc 02 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94210:
   name: "Official U.S. PlayStation Magazine Demo Disc 03 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94211:
   name: "Official U.S. PlayStation Magazine Demo Disc 04 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94212:
   name: "Official U.S. PlayStation Magazine Demo Disc 05 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94213:
   name: "Official U.S. PlayStation Magazine Demo Disc 06 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94214:
   name: "Official U.S. PlayStation Magazine Demo Disc 07 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94215:
   name: "Official U.S. PlayStation Magazine Demo Disc 08 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94216:
   name: "Official U.S. PlayStation Magazine Demo Disc 09 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94217:
   name: "Official U.S. PlayStation Magazine Demo Disc 10 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94218:
   name: "Official U.S. PlayStation Magazine Demo Disc 11 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94219:
   name: "Official U.S. PlayStation Magazine Demo Disc 12 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94275:
   name: "Official U.S. PlayStation Magazine Demo Disc 13 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94276:
   name: "Official U.S. PlayStation Magazine Demo Disc 14 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94277:
   name: "Official U.S. PlayStation Magazine Demo Disc 15 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94278:
   name: "Official U.S. PlayStation Magazine Demo Disc 16 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94279:
   name: "Official U.S. PlayStation Magazine Demo Disc 17 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94280:
   name: "Official U.S. PlayStation Magazine Demo Disc 18 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94281:
   name: "Official U.S. PlayStation Magazine Demo Disc 19 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94282:
   name: "Official U.S. PlayStation Magazine Demo Disc 20 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94429:
   name: "Official U.S. PlayStation Magazine Demo Disc 21 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94430:
   name: "Official U.S. PlayStation Magazine Demo Disc 22 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94431:
   name: "Official U.S. PlayStation Magazine Demo Disc 23 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94432:
   name: "Official U.S. PlayStation Magazine Demo Disc 24 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94433:
   name: "Official U.S. PlayStation Magazine Demo Disc 25 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94434:
   name: "Official U.S. PlayStation Magazine Demo Disc 26 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94435:
   name: "Official U.S. PlayStation Magazine Demo Disc 27 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94436:
   name: "Official U.S. PlayStation Magazine Demo Disc 28 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94437:
   name: "Official U.S. PlayStation Magazine Demo Disc 29 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94438:
   name: "Official U.S. PlayStation Magazine Demo Disc 30 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94499:
   name: "Official U.S. PlayStation Magazine Demo Disc 31 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94583:
   name: "Official U.S. PlayStation Magazine Demo Disc 32 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94591:
   name: "Official U.S. PlayStation Magazine Demo Disc 33 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94593:
   name: "Official U.S. PlayStation Magazine Demo Disc 34 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94596:
   name: "Official U.S. PlayStation Magazine Demo Disc 35 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94599:
   name: "Official U.S. PlayStation Magazine Demo Disc 36 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94614:
   name: "Official U.S. PlayStation Magazine Demo Disc 37 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94617:
   name: "Official U.S. PlayStation Magazine Demo Disc 38 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94622:
   name: "Official U.S. PlayStation Magazine Demo Disc 39 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94628:
   name: "Official U.S. PlayStation Magazine Demo Disc 40 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94630:
   name: "Official U.S. PlayStation Magazine Demo Disc 41 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94631:
   name: "Official U.S. PlayStation Magazine Demo Disc 42 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94634:
   name: "Official U.S. PlayStation Magazine Demo Disc 43 (USA) (EDC)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94637:
   name: "Official U.S. PlayStation Magazine Demo Disc 44 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94645:
   name: "Official U.S. PlayStation Magazine Demo Disc 45 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94649:
   name: "Official U.S. PlayStation Magazine Demo Disc 46 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94652:
   name: "Official U.S. PlayStation Magazine Demo Disc 47 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94655:
   name: "Official U.S. PlayStation Magazine Demo Disc 48 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94658:
   name: "Official U.S. PlayStation Magazine Demo Disc 50 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94662:
   name: "Official U.S. PlayStation Magazine Demo Disc 52 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94664:
   name: "Official U.S. PlayStation Magazine Demo Disc 54 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03408:
   name: "Official UK PlayStation Best Games Ever! (UK)"
+  metadata:
+    genre: "** DEMO **"
 SCZS-94101:
   name: "Official Yarudora Fan Book - Double Cast - CD-ROM Special Data-shuu (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SCZS-94102:
   name: "Official Yarudora Fan Book - Kisetsu o Dakishimete (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SCZS-94103:
   name: "Official Yarudora Fan Book - Sampaguita (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SCZS-94104:
   name: "Official Yarudora Fan Book - Yukiwari no Hana - CD-ROM Special Data-shuu (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00467:
   name: "Ogre Battle - Limited Edition (USA)"
   compatibility:
@@ -115727,7 +117682,7 @@ SLPS-01524:
     publisher: "Naxat Soft"
     developer: "Spiel"
     releaseDate: "1998-10-06"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -115839,7 +117794,7 @@ SLES-00113:
     publisher: "U.S. Gold"
     developer: "Silicon Dreams"
     releaseDate: "1996-07-18"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -115861,7 +117816,7 @@ SLPS-00523:
     publisher: "Coconuts Japan"
     developer: "Silicon Dreams"
     releaseDate: "1996-11-08"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -115879,7 +117834,7 @@ SLUS-00156:
     publisher: "U.S. Gold"
     developer: "Silicon Dreams"
     releaseDate: "1996-07-18"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -115970,6 +117925,8 @@ SCES-02120:
     linkCable: false
 PAPX-90080:
   name: "Omega Boost (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10020:
   name: "Omega Boost (Japan) (En,Ja)"
   compatibility:
@@ -116071,6 +118028,8 @@ SLPS-02815:
     linkCable: false
 SLED-01170:
   name: "One (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00944:
   name: "One (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -116080,7 +118039,7 @@ SLES-00944:
     publisher: "ASC Games"
     developer: "Visual Concepts"
     releaseDate: "1998-03-11"
-    genre: "Action / Platform / Shooter"
+    genre: "Action / Platformer / Shooter"
     languages:
       - English
       - French
@@ -116103,7 +118062,7 @@ SLPS-01812:
     publisher: "Capcom"
     developer: "Visual Concepts"
     releaseDate: "1999-03-25"
-    genre: "Action / Platform / Shooter"
+    genre: "Action / Platformer / Shooter"
     languages:
       - Japanese
     minPlayers: 1
@@ -116125,7 +118084,7 @@ SLUS-00469:
     publisher: "ASC Games"
     developer: "Visual Concepts"
     releaseDate: "1997-11-30"
-    genre: "Action / Platform / Shooter"
+    genre: "Action / Platformer / Shooter"
     languages:
       - English
     minPlayers: 1
@@ -116175,6 +118134,8 @@ SLPM-86837:
     linkCable: false
 SLPM-80617:
   name: "One Piece Mansion (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01406:
   name: "One Piece Mansion (USA)"
   controllers:
@@ -116202,7 +118163,7 @@ SLPS-02585:
     publisher: "Hect"
     developer: "Hect"
     releaseDate: "2000-02-24"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -116275,7 +118236,7 @@ SLPS-00089:
     publisher: "Nippon Ichi Software"
     developer: "O-Two"
     releaseDate: "1995-10-13"
-    genre: "Board / Mini games"
+    genre: "Board / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -116293,7 +118254,7 @@ SLPM-86989:
     publisher: "Hamster"
     developer: "O-Two"
     releaseDate: "2002-04-18"
-    genre: "Board / Mini games"
+    genre: "Board / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -116305,6 +118266,8 @@ SLPM-86989:
     linkCable: false
 LSP-150500:
   name: "Online Connection CD - For the PlayStation Game Console (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00079:
   name: "Onside Complete Soccer (Europe) (En,Fr,De,Es)"
   controllers:
@@ -116313,7 +118276,7 @@ SLES-00079:
     publisher: "Telstar"
     developer: "Elite Systems Ltd"
     releaseDate: "1997-06-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -116390,7 +118353,7 @@ SLPS-00418:
     publisher: "Banpresto"
     developer: "Banpre Kikaku"
     releaseDate: "1996-07-19"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -116667,6 +118630,8 @@ SLPS-01144:
     linkCable: false
 SLPM-80165:
   name: "Ore! Tomba (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03186:
   name: "Oro e Gloria - La Strada per El Dorado (Italy)"
   controllers:
@@ -116713,7 +118678,7 @@ SLPS-02013:
     publisher: "Kid Genius"
     developer: "Ron Group"
     releaseDate: "1999-04-08"
-    genre: "Simulation / Strategy."
+    genre: "Simulation / Strategy"
     languages:
       - Japanese
     minPlayers: 1
@@ -117167,6 +119132,8 @@ SLPS-02099:
     linkCable: false
 SLPM-80437:
   name: "Over Drivin' IV (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00768:
   name: "OverBlood (Europe)"
   controllers:
@@ -117428,6 +119395,8 @@ SLES-11880:
     linkCable: false
 PAPX-90046:
   name: "OverBlood 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01261:
   name: "OverBlood 2 (Japan) (Disc 1)"
   discSet:
@@ -117528,7 +119497,7 @@ SLPS-03260:
     publisher: "Visit"
     developer: "Visit"
     releaseDate: "2001-08-09"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -117621,7 +119590,7 @@ SLPS-02590:
     publisher: "Visit"
     developer: "Visit"
     releaseDate: "2000-02-17"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -117670,23 +119639,60 @@ SLPS-02335:
     linkCable: false
 LSP-060190:
   name: "P.K.'s Math Studio (USA)"
+  codes:
+    - LSP060190
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-060310:
   name: "P.K.'s Place 1 - Party on the Patio! (USA)"
   codes:
     - LSP-060310
+    - LSP06031001
     - LSP-905345
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-180210:
   name: "P.K.'s Place 2 - Hoopo at Sea! (USA)"
   codes:
     - LSP-180210
+    - LSP18021001
     - LSP-905352
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-180310:
   name: "P.K.'s Place 3 - Carlos at the Races! (USA)"
   codes:
     - LSP-180310
+    - LSP18031001
     - LSP-905369
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-180410:
   name: "P.K.'s Place 4 - Daphne and the Seventh Wonder (USA)"
+  codes:
+    - LSP180410
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SCPS-10097:
   name: "PAQA (Japan)"
   controllers:
@@ -117708,6 +119714,8 @@ SCPS-10097:
     linkCable: false
 PAPX-90092:
   name: "PAQA (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00195:
   name: "PD Ultraman Invader (Japan)"
   controllers:
@@ -117736,7 +119744,7 @@ SLES-02061:
     publisher: "Infogrames"
     developer: "Infogrames"
     releaseDate: "1999-11-18"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
       - German
@@ -117757,7 +119765,7 @@ SLES-02396:
     publisher: "Infogrames"
     developer: "Infogrames"
     releaseDate: "1999-11-18"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - French
       - Italian
@@ -117777,7 +119785,7 @@ SLES-00073:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1995-11-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -117795,7 +119803,7 @@ SLPS-00245:
     publisher: "Electronic Arts Victor"
     developer: "Electronic Arts"
     releaseDate: "1996-02-23"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -117813,7 +119821,7 @@ SLUS-00016:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1996-02-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -117831,7 +119839,7 @@ SLES-00437:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1996-11-10"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -117849,7 +119857,7 @@ SLPS-00758:
     publisher: "Electronic Arts Victor"
     developer: "Electronic Arts"
     releaseDate: "1997-03-20"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -117867,7 +119875,7 @@ SLUS-00261:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1996-09-30"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -117885,7 +119893,7 @@ SLES-00908:
     publisher: "Electronic Arts"
     developer: "NuFX, Inc"
     releaseDate: "1997-09-27"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -117903,7 +119911,7 @@ SLUS-00517:
     publisher: "Electronic Arts"
     developer: "NuFX, Inc"
     releaseDate: "1997-09-27"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -117973,14 +119981,20 @@ SLUS-00097:
     linkCable: false
 SCED-03675:
   name: "PS One Demo Disc 02 (Europe) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03920:
   name: "PS One Demo Disc 2002 (Europe) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03238:
   name: "PS One Kids Autumn 2000 (Europe) (En,Fr,De,Es,It)"
 SCED-03340:
   name: "PS One Kids Autumn 2000 (France) (En,Fr,De,Es,It)"
 SCED-03175:
   name: "PS One Special Demo 01 (Europe) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94696:
   name: "PS One Winter 03 Kiosk Version 1.21 (USA)"
 SCUS-94799:
@@ -118014,8 +120028,12 @@ SCPS-18002:
     linkCable: false
 PCPX-96049:
   name: "PaRappa the Rapper (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94195:
   name: "PaRappa the Rapper (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94183:
   name: "PaRappa the Rapper (USA) (En,Fr,De,Es,It)"
   compatibility:
@@ -118087,6 +120105,8 @@ SCPS-45445:
     linkCable: false
 SLUS-90057:
   name: "Pac-Man World (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00439:
   name: "Pac-Man World - 20th Anniversary (USA)"
   compatibility:
@@ -118346,7 +120366,7 @@ SLPS-03210:
     publisher: "Media Entertainment"
     developer: "Media Entertainment"
     releaseDate: "2001-05-10"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -118365,7 +120385,7 @@ SLPS-02782:
     publisher: "Media Entertainment"
     developer: "Media Entertainment"
     releaseDate: "2000-08-10"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -118746,7 +120766,7 @@ SLPS-03029:
     publisher: "Media Entertainment"
     developer: "Media Entertainment"
     releaseDate: "2000-11-30"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -119300,7 +121320,7 @@ SLPS-01089:
     publisher: "Nexton"
     developer: "Nexton"
     releaseDate: "1998-02-26"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -119356,7 +121376,7 @@ SLPS-02419:
     publisher: "Hack Berry"
     developer: "Hack Berry"
     releaseDate: "1999-11-25"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -119375,7 +121395,7 @@ SLPS-02575:
     publisher: "Hack Berry"
     developer: "Hack Berry"
     releaseDate: "2000-06-01"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -119394,7 +121414,7 @@ SLPS-03422:
     publisher: "Hack Berry"
     developer: "Hack Berry"
     releaseDate: "2002-04-18"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -119465,6 +121485,8 @@ SLPS-00346:
     linkCable: false
 SLPM-80079:
   name: "Pal - Shinken Densetsu (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01820:
   name: "Palm Town (Japan)"
   controllers:
@@ -119523,6 +121545,8 @@ SLES-00965:
     linkCable: false
 SLED-01015:
   name: "Pandemonium 2 (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00578:
   name: "Pandemonium 2 (USA)"
   compatibility:
@@ -119546,6 +121570,8 @@ SLUS-00578:
     linkCable: false
 SLUS-80578:
   name: "Pandemonium 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00526:
   name: "Pandemonium! (Europe)"
   controllers:
@@ -119568,6 +121594,8 @@ SLES-00526:
     linkCable: false
 SLED-00570:
   name: "Pandemonium! (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   settings:
     dmaMaxSliceTicks: 100
 SLUS-00232:
@@ -119678,7 +121706,7 @@ SLPS-02944:
     publisher: "Pandora Box Creative Office"
     developer: "Pandora Box Creative Office"
     releaseDate: "2000-10-19"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -119777,7 +121805,7 @@ SLPS-00899:
     publisher: "Banpresto"
     developer: "Fill in Cafe / Kool Kizz Amusement Works"
     releaseDate: "1997-08-07"
-    genre: "Beat'em up"
+    genre: "Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -119789,6 +121817,8 @@ SLPS-00899:
     linkCable: false
 SLPM-80124:
   name: "Panzer Bandit (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03339:
   name: "Panzer Front (Europe) (En,Fr,De)"
   controllers:
@@ -119831,6 +121861,8 @@ SLPS-02503:
     linkCable: false
 SLPM-80499:
   name: "Panzer Front (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01399:
   name: "Panzer Front (USA)"
   controllers:
@@ -120799,7 +122831,7 @@ SLPS-01859:
     publisher: "Nihon Telenet"
     developer: "Nihon Telenet / Earthly Production"
     releaseDate: "1999-02-11"
-    genre: "Gambling / Shooter."
+    genre: "Gambling / Shooter"
     languages:
       - Japanese
     minPlayers: 1
@@ -120837,7 +122869,7 @@ SLPS-02483:
     publisher: "Nihon Telenet"
     developer: "Nihon Telenet / Earthly Production"
     releaseDate: "1999-12-09"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -121012,7 +123044,7 @@ SLPS-02996:
     publisher: "Nihon Telenet"
     developer: "Nihon Telenet / Earthly Production"
     releaseDate: "2000-11-30"
-    genre: "Gambling."
+    genre: "Gambling"
     languages:
       - Japanese
     minPlayers: 1
@@ -121119,6 +123151,8 @@ SLPS-00959:
     linkCable: false
 SLPM-80131:
   name: "Pastel Muses (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01804:
   name: "Patlabor - The Game - Taikenban Ver. 1.0 (Japan) (Demo)"
   controllers:
@@ -121128,7 +123162,7 @@ SLPS-01804:
     publisher: "Bandai Visual (Emotion Digital Software)"
     developer: "TechnoSoft"
     releaseDate: "1998-12-23"
-    genre: "Adventure / RPG"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -121248,7 +123282,7 @@ SLPS-00632:
     publisher: "Soft Bank"
     developer: "T&E Soft"
     releaseDate: "1996-12-13"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -121266,7 +123300,7 @@ SLPS-00841:
     publisher: "Soft Bank"
     developer: "T&E Soft"
     releaseDate: "1997-01-01"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -121374,7 +123408,7 @@ SLPS-02409:
     publisher: "Seta Corporation"
     developer: "Seta Corporation"
     releaseDate: "2000-03-04"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -121393,7 +123427,7 @@ SLPS-02410:
     publisher: "Seta Corporation"
     developer: "Seta Corporation"
     releaseDate: "2000-03-04"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -121411,7 +123445,7 @@ SLPS-01394:
     publisher: "Seta Corporation"
     developer: "Nasa Corporation"
     releaseDate: "1998-05-28"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -121429,7 +123463,7 @@ SLPS-00087:
     publisher: "Seta Corporation"
     developer: "Seta Corporation"
     releaseDate: "1995-12-01"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -121466,7 +123500,7 @@ SLES-00581:
     publisher: "ASC Games"
     developer: "Grey Matter"
     releaseDate: "1996-11-10"
-    genre: "Action / Adventure / Beat'em up"
+    genre: "Action / Adventure / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -121484,7 +123518,7 @@ SLES-00685:
     publisher: "ASC Games"
     developer: "Grey Matter"
     releaseDate: "1997-08-01"
-    genre: "Action / Adventure / Beat'em up"
+    genre: "Action / Adventure / Beat'em Up"
     languages:
       - French
     minPlayers: 1
@@ -121502,7 +123536,7 @@ SLES-00686:
     publisher: "ASC Games"
     developer: "Grey Matter"
     releaseDate: "1997-08-01"
-    genre: "Action / Adventure / Beat'em up"
+    genre: "Action / Adventure / Beat'em Up"
     languages:
       - German
     minPlayers: 1
@@ -121520,7 +123554,7 @@ SLUS-00341:
     publisher: "ASC Games"
     developer: "Grey Matter"
     releaseDate: "1996-11-10"
-    genre: "Action / Adventure / Beat'em up"
+    genre: "Action / Adventure / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -121784,7 +123818,7 @@ SLPS-01923:
     publisher: "Atlus Co"
     developer: "Tose Software"
     releaseDate: "1999-04-08"
-    genre: "RPG"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -121935,7 +123969,7 @@ SLUS-01130:
     publisher: "Infogrames"
     developer: "Incredible Technologies"
     releaseDate: "2000-09-20"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -121973,7 +124007,7 @@ SLES-02982:
     publisher: "TDK / Universal / Sound Source Interactive"
     developer: "Realtime Associates Inc"
     releaseDate: "2000-10-13"
-    genre: "Action / Platformer."
+    genre: "Action / Platformer"
     languages:
       - French
     minPlayers: 1
@@ -121991,7 +124025,7 @@ SLES-01178:
     publisher: "Funsoft"
     developer: "Pony Canyon / Atelier Double"
     releaseDate: "1998-08-01"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -122543,6 +124577,8 @@ SLES-00836:
     linkCable: false
 SLED-01243:
   name: "Pitfall 3D - Beyond the Jungle (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00837:
   name: "Pitfall 3D - Beyond the Jungle (Germany)"
   controllers:
@@ -122605,6 +124641,8 @@ SLUS-00254:
     linkCable: false
 SLUS-90017:
   name: "Pitfall 3D - Beyond the Jungle (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02290:
   name: "Pixygarden (Japan) (Disc 1) (Game Disc)"
   discSet:
@@ -122674,12 +124712,20 @@ SLPS-02906:
     linkCable: false
 SCED-02520:
   name: "Pizza Hut Demo 01 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02833:
   name: "Pizza Hut Demo 01 (France)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02521:
   name: "Pizza Hut Demo 02 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94292:
   name: "Pizza Hut Demo CD (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94480:
   name: "Pizza Hut Disc 1 (USA)"
 SCUS-94481:
@@ -122730,6 +124776,8 @@ SLPS-02111:
     linkCable: false
 SLPM-80442:
   name: "Planet Dob (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86264:
   name: "Planet Laika (Japan)"
   controllers:
@@ -122817,6 +124865,8 @@ SLES-00221:
   name: "Play It (Europe)"
 SLED-02097:
   name: "Play Power 4 (Spain) (En,Es) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02721:
   name: "Play Zone Vol. 18 (Germany)"
 SLED-02832:
@@ -122880,7 +124930,7 @@ SLPS-02907:
     publisher: "Nagase Brothers Inc"
     developer: "Graphic Research"
     releaseDate: "2000-08-03"
-    genre: "Educational / Quiz."
+    genre: "Educational / Quiz"
     languages:
       - Japanese
     minPlayers: 1
@@ -122899,7 +124949,7 @@ SLPM-89008:
     publisher: "Nagase Brothers Inc"
     developer: "Graphic Research"
     releaseDate: "2000-07-05"
-    genre: "Educational / Quiz."
+    genre: "Educational / Quiz"
     languages:
       - Japanese
     minPlayers: 1
@@ -123032,7 +125082,7 @@ SLPS-03099:
     publisher: "Nagase Brothers Inc"
     developer: "Graphic Research"
     releaseDate: "2000-12-21"
-    genre: "Educational / Quiz."
+    genre: "Educational / Quiz"
     languages:
       - Japanese
     minPlayers: 1
@@ -123051,7 +125101,7 @@ SLPM-89009:
     publisher: "Nagase Brothers Inc"
     developer: "Graphic Research"
     releaseDate: "2000-12-21"
-    genre: "Educational / Quiz."
+    genre: "Educational / Quiz"
     languages:
       - Japanese
     minPlayers: 1
@@ -123070,7 +125120,7 @@ SLPS-03168:
     publisher: "Nagase Brothers Inc"
     developer: "Graphic Research"
     releaseDate: "2001-03-01"
-    genre: "Educational / Quiz."
+    genre: "Educational / Quiz"
     languages:
       - Japanese
     minPlayers: 1
@@ -123108,7 +125158,7 @@ SLPM-89010:
     publisher: "Nagase Brothers Inc"
     developer: "Graphic Research"
     releaseDate: "2001-03-01"
-    genre: "Educational / Quiz."
+    genre: "Educational / Quiz"
     languages:
       - Japanese
     minPlayers: 1
@@ -123168,7 +125218,7 @@ SLPS-00239:
     publisher: "Banpresto"
     developer: "Banpresto"
     releaseDate: "1996-04-12"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -123186,7 +125236,7 @@ SLPS-00807:
     publisher: "Banpresto"
     developer: "Banpresto"
     releaseDate: "1997-04-11"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -123205,7 +125255,7 @@ SLPS-01369:
     publisher: "Banpresto"
     developer: "Banpresto"
     releaseDate: "1998-04-16"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -123224,7 +125274,7 @@ SLPS-02121:
     publisher: "Banpresto"
     developer: "Banpresto"
     releaseDate: "1999-07-29"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -123255,10 +125305,16 @@ SCPS-19004:
     linkCable: false
 PAPX-90057:
   name: "PlayStation Comic - 2999-nen no Game Kids (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96135:
   name: "PlayStation Comic - 2999-nen no Game Kids (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90076:
   name: "PlayStation Comic - 2999-nen no Game Kids (Japan) (Demo 3)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-19007:
   name: "PlayStation Comic - Buzzer Beater - Kouhen (Japan)"
   controllers:
@@ -123372,43 +125428,67 @@ SCPS-19002:
     linkCable: false
 SCUS-94482:
   name: "PlayStation Demo Disc - Shock Your System! (USA) (SCUS-94482)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCUS-94483:
   name: "PlayStation Demo Disc - Shock Your System! (USA) (SCUS-94483)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94496:
   name: "PlayStation Demo Disc - Shock Your System! (USA) (SCUS-94496)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94594:
   name: "PlayStation Demo Disc - Spring 2000 (USA) (SCUS-94594)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94595:
   name: "PlayStation Demo Disc - Spring 2000 (USA, Canada) (SCUS-94595)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94619:
   name: "PlayStation Demo Disc Ver. 1.15 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94618:
   name: "PlayStation Demo Disc Version 1.3 (USA)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCUS-94650:
   name: "PlayStation Demo Disc Version 1.4 (USA)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCUS-94674:
   name: "PlayStation Demo Disc Version 1.5 (USA)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCUS-94497:
   name: "PlayStation Demo Disc Winter 1999 - Shock Your System! (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94950:
   name: "PlayStation Developer's Demo Disc (USA) (SCUS-94950)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
 SCUS-94954:
   name: "PlayStation Developer's Demo Disc (USA) (SCUS-94954)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1530-g6d75f42e"
@@ -123416,16 +125496,28 @@ SCED-01229:
   name: "PlayStation Kids (Europe)"
 SCUS-94705:
   name: "PlayStation Kiosk Demo Disc 2004-2005 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94651:
   name: "PlayStation Kiosk Demo Disc Version 1.16 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94663:
   name: "PlayStation Kiosk Demo Disc Version 1.17 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94667:
   name: "PlayStation Kiosk Demo Disc Version 1.18 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94675:
   name: "PlayStation Kiosk Demo Disc Version 1.19 (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94678:
   name: "PlayStation Kiosk Demo Disc Version 1.20 (USA)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96095:
   name: "PlayStation Official Catalog CD-ROM (Japan)"
 SCUS-94952:
@@ -123450,6 +125542,8 @@ SLED-01989:
   name: "PlayStation Power (Spain) (Virgin Interactive)"
 SCED-01049:
   name: "PlayStation Sampler (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03103:
   name: "PlayStation Speziale Italia (Italy)"
 SCUS-94440:
@@ -123699,6 +125793,8 @@ SLED-02139:
   name: "PlayStation Zone CD Vol. 9 (Germany)"
 SCUS-94193:
   name: "PlayStation-Pepsi Sampler Disc (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00319:
   name: "Player Manager (Europe) (En,Fr,De,Es,It,Sv,No)"
   controllers:
@@ -123707,7 +125803,7 @@ SLES-00319:
     publisher: "Funsoft"
     developer: "Anco"
     releaseDate: "1997-03-10"
-    genre: "Soccer Management"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
       - French
@@ -123732,7 +125828,7 @@ SLES-02015:
     publisher: "Infogrames"
     developer: "Anco"
     releaseDate: "1999-11-15"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - Portuguese
     minPlayers: 1
@@ -123751,7 +125847,7 @@ SLES-02325:
     publisher: "3DO"
     developer: "Anco"
     releaseDate: "2000-04-07"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -123770,7 +125866,7 @@ SLES-02613:
     publisher: "3DO"
     developer: "Anco"
     releaseDate: "2000-04-07"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - German
     minPlayers: 1
@@ -123791,7 +125887,7 @@ SLES-01346:
     publisher: "Infogrames"
     developer: "Anco"
     releaseDate: "1999-07-02"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -123810,7 +125906,7 @@ SLES-01766:
     publisher: "Infogrames"
     developer: "Anco"
     releaseDate: "1999-11-10"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - German
     minPlayers: 1
@@ -123829,7 +125925,7 @@ SLES-02132:
     publisher: "Infogrames"
     developer: "Anco"
     releaseDate: "1999-11-10"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -123848,7 +125944,7 @@ SLES-01767:
     publisher: "Infogrames"
     developer: "Anco"
     releaseDate: "1999-11-10"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - Italian
     minPlayers: 1
@@ -123900,6 +125996,8 @@ SCPS-10023:
     linkCable: false
 PCPX-96195:
   name: "PoPoLoCrois Monogatari II (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10112:
   name: "PoPoLoCrois Monogatari II (Japan) (Disc 1)"
   discSet:
@@ -124312,6 +126410,8 @@ PAPX-90094:
   name: "Pocket Zanmai - 3 Title Iri Taikenban (PAQA, PokeTan, Pocket Jiman) (Japan)"
 SCED-00287:
   name: "Point Blank (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00886:
   name: "Point Blank (Europe) (En,Fr,De)"
   controllers:
@@ -124478,7 +126578,7 @@ SLPM-86061:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1998-07-09"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -124496,7 +126596,7 @@ SLPM-86034:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1997-06-12"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -124556,7 +126656,7 @@ SLPS-02651:
     publisher: "Atlus Co"
     developer: "Atlus Co"
     releaseDate: "2000-04-20"
-    genre: "Data / Music / Pictures."
+    genre: "Data / Music / Pictures"
     languages:
       - Japanese
     minPlayers: 1
@@ -124575,7 +126675,7 @@ SLPS-02664:
     publisher: "Atlus Co"
     developer: "Atlus Co"
     releaseDate: "2000-04-20"
-    genre: "Data / Music / Pictures."
+    genre: "Data / Music / Pictures"
     languages:
       - Japanese
     minPlayers: 1
@@ -124725,7 +126825,7 @@ SLPS-03460:
     publisher: "Tomy"
     developer: "Doki Denki"
     releaseDate: "2002-09-05"
-    genre: "Party / Mini games"
+    genre: "Party / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -124744,7 +126844,7 @@ SLES-02697:
     publisher: "UBI Soft Entertainment"
     developer: "Sunsoft / ASK / Ornith"
     releaseDate: "2000-07-28"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
       - French
@@ -124765,7 +126865,7 @@ SLES-01688:
     publisher: "Activision / ASK Corporation"
     developer: "Ornith"
     releaseDate: "1999-11-09"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -124784,7 +126884,7 @@ SLUS-00758:
     publisher: "Activision / ASK Corporation"
     developer: "Ornith"
     releaseDate: "1999-11-09"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -124803,7 +126903,7 @@ SLES-01537:
     publisher: "Gremlin Interactive"
     developer: "Mirage Interactive"
     releaseDate: "1999-01-29"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -125347,7 +127447,7 @@ SLES-03388:
     publisher: "JVC"
     developer: "Taito"
     releaseDate: "2001-09-30"
-    genre: "Action / Driving / Simulation / Mini games"
+    genre: "Action / Driving / Simulation / Mini Games"
     languages:
       - English
       - French
@@ -125403,7 +127503,7 @@ SLPS-01517:
     publisher: "Hudson Soft"
     developer: "Hudson Soft"
     releaseDate: "1998-11-12"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -125421,7 +127521,7 @@ SLES-00202:
     publisher: "Activision"
     developer: "Yuke's Co. Ltd"
     releaseDate: "1996-11-10"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -125439,7 +127539,7 @@ SLUS-00408:
     publisher: "Activision"
     developer: "Yuke's Co. Ltd"
     releaseDate: "1996-11-10"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -125477,7 +127577,7 @@ SLES-03731:
     publisher: "THQ"
     developer: "Climax Group"
     releaseDate: "2002-02-08"
-    genre: "Beat'em up / Action / Platformer"
+    genre: "Beat'em Up / Action / Platformer"
     languages:
       - French
     minPlayers: 1
@@ -125513,7 +127613,7 @@ SLES-00118:
     publisher: "Ocean"
     developer: "SPS"
     releaseDate: "1996-02-09"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
       - French
@@ -125533,7 +127633,7 @@ SLUS-00105:
     publisher: "Ocean"
     developer: "SPS"
     releaseDate: "1995-08-31"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -125555,7 +127655,7 @@ SLUS-01343:
     publisher: "Acclaim Entertainment"
     developer: "Taito"
     releaseDate: "2001-07-15"
-    genre: "Action / Driving / Simulation / Mini games"
+    genre: "Action / Driving / Simulation / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -125574,7 +127674,7 @@ SLPM-86629:
     publisher: "Taito"
     developer: "Taito"
     releaseDate: "2000-09-21"
-    genre: "Action / Driving / Simulation / Mini games"
+    genre: "Action / Driving / Simulation / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -125595,7 +127695,7 @@ SLUS-01196:
     publisher: "Infogrames"
     developer: "Carapace"
     releaseDate: "2000-11-15"
-    genre: "Sports / Beach Volleyball"
+    genre: "Sports - Beach Volleyball"
     languages:
       - English
     minPlayers: 1
@@ -125733,7 +127833,7 @@ SLES-00785:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1998-06-01"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -125751,7 +127851,7 @@ SLUS-00486:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1997-09-01"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -125770,7 +127870,7 @@ SLES-01536:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1999-05-07"
-    genre: "Action / Mini games"
+    genre: "Action / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -125822,6 +127922,8 @@ PCPX-96203:
   name: "PrePre Plus 007 - 2000 December (Japan)"
 PCPX-96015:
   name: "PrePre Soukan Junbi-gou - DemoDemo PlayStation Special (Japan)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96017:
   name: "PrePre Vol. 1 (Japan)"
 PCPX-96103:
@@ -126002,7 +128104,7 @@ SLES-02292:
     publisher: "Infogrames"
     developer: "Infogrames Sheffield House"
     releaseDate: "2000-04-14"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -126020,7 +128122,7 @@ SLES-00738:
     publisher: "Gremlin Interactive"
     developer: "Gremlin Interactive"
     releaseDate: "1998-07-10"
-    genre: "Soccer Manager / Strategy"
+    genre: "Sports - Soccer Manager / Strategy"
     languages:
       - English
     minPlayers: 1
@@ -126038,7 +128140,7 @@ SLES-01284:
     publisher: "Gremlin Interactive"
     developer: "Gremlin Interactive"
     releaseDate: "1998-07-10"
-    genre: "Soccer Manager / Strategy"
+    genre: "Sports - Soccer Manager / Strategy"
     languages:
       - Italian
     minPlayers: 1
@@ -126057,7 +128159,7 @@ SLES-01544:
     publisher: "Gremlin Interactive"
     developer: "Gremlin Interactive"
     releaseDate: "1999-09-30"
-    genre: "Soccer Manager / Strategy"
+    genre: "Sports - Soccer Manager / Strategy"
     languages:
       - English
     minPlayers: 1
@@ -126076,7 +128178,7 @@ SLES-01864:
     publisher: "Gremlin Interactive"
     developer: "Gremlin Interactive"
     releaseDate: "1999-09-30"
-    genre: "Soccer Manager / Strategy"
+    genre: "Sports - Soccer Manager / Strategy"
     languages:
       - Italian
     minPlayers: 1
@@ -126157,7 +128259,7 @@ SLES-02702:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-03-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -126177,7 +128279,7 @@ SLES-00017:
     publisher: "Codemasters"
     developer: "Codemasters"
     releaseDate: "2000-03-11"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
       - French
@@ -126291,6 +128393,8 @@ SCPS-10032:
     linkCable: false
 PAPX-90013:
   name: "Princess Maker - Yumemiru Yousei (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45013:
   name: "Princess Maker Yumemiru Yousei"
   controllers:
@@ -126497,7 +128601,7 @@ SLES-01559:
     publisher: "Psygnosis"
     developer: "Intelligent Games Ltd"
     releaseDate: "1999-04-10"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
       - French
@@ -126521,7 +128625,7 @@ SLUS-00817:
     publisher: "Psygnosis"
     developer: "Intelligent Games Ltd"
     releaseDate: "1999-04-10"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -126561,7 +128665,7 @@ SLES-03327:
     publisher: "Midas Interactive"
     developer: "Theyer GFX"
     releaseDate: "2002-12-04"
-    genre: "Sports / Surf"
+    genre: "Sports - Surf"
     languages:
       - English
       - French
@@ -126582,7 +128686,7 @@ SLES-03795:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "2002-02-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -126603,7 +128707,7 @@ SLES-03796:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "2002-02-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
       - Spanish
@@ -126623,7 +128727,7 @@ SLES-03946:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2002-10-25"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -126644,7 +128748,7 @@ SLES-03957:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2002-10-25"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
       - Spanish
@@ -126781,7 +128885,7 @@ SLPS-01987:
     publisher: "Culture Brain"
     developer: "Culture Brain"
     releaseDate: "1999-05-13"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -126799,7 +128903,7 @@ SLPS-03065:
     publisher: "Culture Brain"
     developer: "Culture Brain"
     releaseDate: "2000-12-31"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -126817,7 +128921,7 @@ SLPS-02659:
     publisher: "Culture Brain"
     developer: "Culture Brain"
     releaseDate: "2000-05-18"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -126835,7 +128939,7 @@ SLPS-03464:
     publisher: "Culture Brain"
     developer: "Culture Brain"
     releaseDate: "2002-08-29"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -126853,7 +128957,7 @@ SLPS-02359:
     publisher: "Culture Brain"
     developer: "Culture Brain"
     releaseDate: "1999-11-02"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -126871,7 +128975,7 @@ SLPS-03218:
     publisher: "Culture Brain"
     developer: "Culture Brain"
     releaseDate: "2001-05-24"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -126890,7 +128994,7 @@ SLPM-86139:
     publisher: "Naxat Soft"
     developer: "Naxat Soft"
     releaseDate: "1998-12-17"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -127081,7 +129185,7 @@ SLES-03962:
     publisher: "Midas Interactive"
     developer: "Tamsoft Corporation"
     releaseDate: "2004-02-27"
-    genre: "Driving / Racing"
+    genre: "** DEMO **"
     languages:
       - English
     minPlayers: 1
@@ -127099,7 +129203,7 @@ SLPS-01006:
     publisher: "KSS"
     developer: "Dream Japan"
     releaseDate: "1997-06-27"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -127190,7 +129294,7 @@ SCUS-94551:
     publisher: "Psygnosis"
     developer: "Beyond Reality"
     releaseDate: "1997-02-14"
-    genre: "Sports / Action"
+    genre: "Sports - Action"
     languages:
       - English
     minPlayers: 1
@@ -127340,6 +129444,8 @@ SLES-00929:
     linkCable: false
 SLED-01488:
   name: "Psybadek (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00730:
   name: "Psybadek (USA)"
   controllers:
@@ -127546,6 +129652,8 @@ SLPM-86616:
     linkCable: false
 SLPM-80049:
   name: "Psychic Force (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00419:
   name: "Psychic Force (USA)"
   controllers:
@@ -127651,6 +129759,8 @@ SLPM-86273:
     linkCable: false
 SLPM-80463:
   name: "Psychic Force 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01869:
   name: "Psychometrer Eiji (Japan)"
   controllers:
@@ -127672,10 +129782,16 @@ SLPS-01869:
     linkCable: false
 SLUS-90037:
   name: "Psygnosis '98 Interactive Demos (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02784:
   name: "Pub Demo 03 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02785:
   name: "Pub Demo 04 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02070:
   name: "Puchi Carat (Europe)"
   controllers:
@@ -127737,7 +129853,7 @@ ESPM-70003:
     publisher: "Sony Music Entertainment Incorporated"
     developer: "Sony Music Entertainment Incorporated"
     releaseDate: "1998-09-09"
-    genre: "Music / Video."
+    genre: "Music / Video"
     languages:
       - Japanese
     minPlayers: 1
@@ -127756,7 +129872,7 @@ SLES-01203:
     publisher: "Sunsoft"
     developer: "PixelStorm"
     releaseDate: "1999-05-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -128371,10 +130487,34 @@ SLUS-01561:
     linkCable: false
 LSP-905314:
   name: "Quaddle Family Mysteries, The 1 - The Case of the Scarce Scarab - Lobby & Kitchen (USA)"
+  codes:
+    - LSP905314
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-905321:
   name: "Quaddle Family Mysteries, The 2 - The Case of the Scarce Scarab - Garden (USA)"
+  codes:
+    - LSP905321
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-905338:
   name: "Quaddle Family Mysteries, The 3 - The Case of the Scarce Scarab - Parlor & Family Room (USA)"
+  codes:
+    - LSP905338
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLES-01534:
   name: "Quake II (Europe)"
   controllers:
@@ -128385,7 +130525,7 @@ SLES-01534:
     publisher: "Activision"
     developer: "Hammerhead"
     releaseDate: "1999-10-08"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - English
     minPlayers: 1
@@ -128408,7 +130548,7 @@ SLUS-00757:
     publisher: "Activision"
     developer: "Hammerhead"
     releaseDate: "1999-09-30"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - English
     minPlayers: 1
@@ -128822,7 +130962,7 @@ SLPS-02047:
     publisher: "FAB Communication"
     developer: "Pixy Corporation"
     releaseDate: "1999-04-01"
-    genre: "Extreme Sports / Action / Snowboard Racing"
+    genre: "Extreme Sports - Action / Snowboard Racing"
     languages:
       - Japanese
     minPlayers: 1
@@ -128846,7 +130986,7 @@ SLPS-02045:
     publisher: "FAB Communication"
     developer: "Pixy Corporation"
     releaseDate: "1999-04-01"
-    genre: "Extreme Sports / Action / Snowboard Racing"
+    genre: "Extreme Sports - Action / Snowboard Racing"
     languages:
       - Japanese
     minPlayers: 1
@@ -128870,7 +131010,7 @@ SLPS-02046:
     publisher: "FAB Communication"
     developer: "Pixy Corporation"
     releaseDate: "1999-04-01"
-    genre: "Extreme Sports / Action / Snowboard Racing"
+    genre: "Extreme Sports - Action / Snowboard Racing"
     languages:
       - Japanese
     minPlayers: 1
@@ -128901,6 +131041,8 @@ SLES-01459:
     linkCable: false
 SLED-01501:
   name: "R-C Stunt Copter (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02141:
   name: "R-C Stunt Copter (France)"
   controllers:
@@ -128922,6 +131064,8 @@ SLES-02141:
     linkCable: false
 SLED-02231:
   name: "R-C Stunt Copter (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02140:
   name: "R-C Stunt Copter (Germany)"
   controllers:
@@ -129282,6 +131426,8 @@ SLES-02824:
     linkCable: false
 SLED-03100:
   name: "RC Revenge (Europe) (En,Fr,De,Es) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86635:
   name: "RC Revenge (Japan)"
   controllers:
@@ -129439,6 +131585,8 @@ SLPS-01088:
     linkCable: false
 SLPM-80172:
   name: "RMJ - The Mystery Hospital - Second Attack Sample CD-ROM (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00640:
   name: "RPG Maker (USA)"
   compatibility:
@@ -129539,7 +131687,7 @@ SLES-03772:
     publisher: "VCC Entertainment"
     developer: "THQ"
     releaseDate: "2001-11-01"
-    genre: "Sports / Ski Jumping"
+    genre: "Sports - Ski Jumping"
     languages:
       - English
       - German
@@ -129795,7 +131943,7 @@ SLES-03511:
     publisher: "Midas Interactive Entertainment"
     developer: "Naps Team"
     releaseDate: "2002-04-12"
-    genre: "Sports / Action"
+    genre: "Sports - Action"
     languages:
       - English
     minPlayers: 1
@@ -129814,7 +131962,7 @@ SLUS-01461:
     publisher: "Agetec Inc"
     developer: "Naps Team"
     releaseDate: "2002-07-25"
-    genre: "Sports / Action"
+    genre: "Sports - Action"
     languages:
       - English
     minPlayers: 1
@@ -130146,6 +132294,8 @@ SCUS-94247:
     linkCable: false
 SCUS-94377:
   name: "Rally Cross 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01601:
   name: "Rally de Africa (Japan)"
   controllers:
@@ -130362,7 +132512,7 @@ SLES-00214:
     publisher: "Gremlin Interactive"
     developer: "Gremlin Interactive"
     releaseDate: "1996-05-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -130500,6 +132650,8 @@ SLES-00858:
     linkCable: false
 SLED-01065:
   name: "Rascal (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00542:
   name: "Rascal (USA)"
   compatibility:
@@ -130524,6 +132676,8 @@ SLUS-00542:
     linkCable: false
 SLUS-90015:
   name: "Rascal (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-04058:
   name: "Rascal Racers (Europe)"
   controllers:
@@ -130960,6 +133114,8 @@ SLPS-00678:
     linkCable: false
 SLPM-80066:
   name: "RayStorm (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00482:
   name: "RayStorm (USA)"
   compatibility:
@@ -131121,6 +133277,8 @@ SLES-02905:
     linkCable: false
 SLUS-90095:
   name: "Rayman 2 - The Great Escape (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01235:
   name: "Rayman 2 - The Great Escape (USA) (En,Fr,Es)"
   compatibility:
@@ -131340,7 +133498,7 @@ SLUS-01322:
     publisher: "Crave Entertaiment"
     developer: "Shaba Studios"
     releaseDate: "2000-12-13"
-    genre: "Sports / Racing."
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -131363,7 +133521,7 @@ SLUS-01410:
     publisher: "Crave Entertainment"
     developer: "Vision Scape Interactive, Inc"
     releaseDate: "2001-11-01"
-    genre: "Extreme Sports / Scooter Racing"
+    genre: "Extreme Sports - Scooter Racing"
     languages:
       - English
     minPlayers: 1
@@ -131588,7 +133746,7 @@ SLPM-86448:
     publisher: "SNK"
     developer: "Point of View, Inc"
     releaseDate: "2001-12-31"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - Japanese
     minPlayers: 1
@@ -131607,7 +133765,7 @@ SLES-02333:
     publisher: "Midway Home Entertainment"
     developer: "Point of View, Inc"
     releaseDate: "1999-11-15"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
       - French
@@ -131628,7 +133786,7 @@ SLUS-00857:
     publisher: "Midway Home Entertainment"
     developer: "Point of View, Inc"
     releaseDate: "1999-11-15"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -131647,7 +133805,7 @@ SLES-02850:
     publisher: "Midway Home Entertainment"
     developer: "Point of View, Inc"
     releaseDate: "2000-11-24"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
       - French
@@ -131668,7 +133826,7 @@ SLUS-01147:
     publisher: "Midway Home Entertainment"
     developer: "Point of View, Inc"
     releaseDate: "2000-11-01"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -131716,6 +133874,8 @@ SCPS-45033:
     linkCable: false
 SLPM-80070:
   name: "Real Bout Garou Densetsu (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00640:
   name: "Real Bout Garou Densetsu (Japan) (En,Ja)"
   controllers:
@@ -131778,6 +133938,8 @@ SLPM-86085:
     linkCable: false
 SLPM-80246:
   name: "Real Bout Garou Densetsu Special - Dominated Mind (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   controllers:
     - AnalogController
     - DigitalController
@@ -131956,7 +134118,7 @@ SLES-01727:
     publisher: "Natsume"
     developer: "Natsume Co., Ltd"
     releaseDate: "1998-03-10"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
       - French
@@ -131976,7 +134138,7 @@ SLUS-00440:
     publisher: "Natsume"
     developer: "Natsume Co., Ltd"
     releaseDate: "1997-10-01"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -131995,7 +134157,7 @@ SLES-02780:
     publisher: "Natsume"
     developer: "Victor Interactive Software, Inc. / Team Craze"
     releaseDate: "2000-10-06"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
       - German
@@ -132015,7 +134177,7 @@ SLUS-00843:
     publisher: "Natsume"
     developer: "Victor Interactive Software, Inc. / Team Craze"
     releaseDate: "2000-06-21"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -132127,18 +134289,32 @@ SLPS-01841:
     linkCable: false
 SCED-01385:
   name: "Registered Users Demo (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00936:
   name: "Registered Users Demo 02 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01230:
   name: "Registered Users Demo 03 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01636:
   name: "Registered Users Demo 05 (Europe) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 SCED-01988:
   name: "Registered Users Demo 06 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02676:
   name: "Registered Users Demo 08 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00637:
   name: "Registration Demo 01 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86274:
   name: "Reikoku - Ikeda Kizoku Shinrei Kenkyuujo (Japan)"
   controllers:
@@ -132221,6 +134397,8 @@ SLPS-02243:
     linkCable: false
 SLPM-80445:
   name: "Remote Control Dandy (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01588:
   name: "Ren'ai Kouza - Real Age (Japan)"
   controllers:
@@ -132522,6 +134700,8 @@ SLES-00200:
     linkCable: false
 SLES-00335:
   name: "Resident Evil (Europe, Australia) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLES-00227:
@@ -132566,6 +134746,8 @@ SLES-00228:
     linkCable: false
 SLES-00355:
   name: "Resident Evil (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLUS-00170:
@@ -133021,6 +135203,8 @@ SLES-10976:
     linkCable: false
 SLUS-80421:
   name: "Resident Evil 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
   codes:
@@ -133159,6 +135343,8 @@ SLES-02529:
     linkCable: false
 SLED-02541:
   name: "Resident Evil 3 - Nemesis (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
     - ForcePGXPCPUMode # Fixes jitter in character models.
@@ -133307,6 +135493,8 @@ SLUS-00923:
     linkCable: false
 SLUS-90064:
   name: "Resident Evil 3 - Nemesis (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
     - ForcePGXPCPUMode # Fixes jitter in character models.
@@ -133619,6 +135807,8 @@ SLPS-00905:
     linkCable: false
 SLPM-80127:
   name: "Ridegear Guybrave (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01643:
   name: "Ridegear Guybrave II (Japan) (Disc 1)"
   discSet:
@@ -133808,7 +135998,7 @@ SCED-01832:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "Namco"
     releaseDate: "1999-02-10"
-    genre: "Driving / Racing"
+    genre: "** DEMO **"
     languages:
       - English
       - French
@@ -133911,6 +136101,8 @@ SCES-01706:
     linkCable: false
 SCED-01982:
   name: "Ridge Racer Type 4 Collectors Demo (Europe, Australia)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03023:
   name: "Riichi Mahjong - Ohitorisama demo Utemasu! (Japan)"
   controllers:
@@ -133993,7 +136185,7 @@ SLES-00472:
     publisher: "Psygnosis"
     developer: "Beyond Reality"
     releaseDate: "1997-04-24"
-    genre: "Sports / Action"
+    genre: "Sports - Action"
     languages:
       - English
     minPlayers: 1
@@ -134005,6 +136197,8 @@ SLES-00472:
     linkCable: false
 SLED-00639:
   name: "Riot (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00829:
   name: "Riot Stars (Japan)"
   controllers:
@@ -134025,6 +136219,8 @@ SLPS-00829:
     linkCable: false
 SLPM-80102:
   name: "Riot Stars (Japan) (Sample)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00164:
   name: "Rise 2 - Resurrection (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -134218,6 +136414,8 @@ SLPS-01272:
     linkCable: false
 PAPX-90029:
   name: "Rittai Ninja Katsugeki - Tenchu (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01901:
   name: "Rittai Ninja Katsugeki - Tenchu - Shinobi Gaisen (Japan) (En,Ja,Fr,It)"
   controllers:
@@ -135424,7 +137622,7 @@ SCPS-10103:
     publisher: "Sony"
     developer: "Sugar & Rockets"
     releaseDate: "1999-10-14"
-    genre: "Platform"
+    genre: "Platformer"
     languages:
       - Japanese
     minPlayers: 1
@@ -135573,7 +137771,7 @@ SLPS-00975:
     publisher: "Altron"
     developer: "Altron"
     releaseDate: "1997-08-07"
-    genre: "Adventure"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -135684,6 +137882,8 @@ SLES-00539:
     linkCable: false
 SLED-00515:
   name: "Robotron X (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00790:
   name: "Robotron X (Japan)"
   compatibility:
@@ -135737,7 +137937,7 @@ ESPM-70002:
     publisher: "Sony Music Entertainment Incorporated"
     developer: "Sony Music Entertainment Incorporated"
     releaseDate: "1998-09-09"
-    genre: "Music / Video."
+    genre: "Music / Video"
     languages:
       - Japanese
     minPlayers: 1
@@ -136098,6 +138298,8 @@ SLPS-01141:
     linkCable: false
 SLPM-80158:
   name: "Rockman Dash - Hagane no Boukenshin (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91094:
   name: "Rockman Dash - Hagane no Boukenshin (Japan) (Digest-ban)"
   controllers:
@@ -136129,7 +138331,7 @@ SLPS-02109:
     publisher: "Capcom"
     developer: "Capcom Production Studio 2"
     releaseDate: "1999-07-22"
-    genre: "Action / Adventure / Puzzle / RPG"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -136235,6 +138437,8 @@ SLPS-00901:
     linkCable: false
 SLPM-80121:
   name: "Rockman X4, Rockman 8 - Metal Heroes, Rockman - Battle & Chase (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86666:
   name: "Rockman X5 (Japan)"
   compatibility:
@@ -136295,7 +138499,7 @@ SLES-02976:
     publisher: "Codemasters"
     developer: "Codemasters"
     releaseDate: "2001-01-26"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - French
     minPlayers: 1
@@ -136365,8 +138569,12 @@ SLUS-00643:
     linkCable: true
 SLUS-90044:
   name: "Rogue Trip - Vacation 2012 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-80643:
   name: "Rogue Trip - Vacation 2012 (USA) (Demo) (Alt)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03449:
   name: "Roland Garros French Open 2001 (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -136378,7 +138586,7 @@ SLES-03449:
     publisher: "Cryo Interactive"
     developer: "Carapace"
     releaseDate: "2001-06-01"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
       - French
@@ -136416,6 +138624,8 @@ SLUS-00724:
     linkCable: false
 SLED-01896:
   name: "Rollcage (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01660:
   name: "Rollcage (Europe) (En,Fr,De,Es,It)"
   compatibility:
@@ -136445,6 +138655,8 @@ SLES-01660:
     linkCable: false
 SLED-01732:
   name: "Rollcage (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00800:
   name: "Rollcage (USA)"
   compatibility:
@@ -136470,6 +138682,8 @@ SLUS-00800:
     linkCable: false
 SLUS-90052:
   name: "Rollcage (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01922:
   name: "Rollcage Stage II (Europe) (En,Fr,De,Es,It)"
   compatibility:
@@ -136636,7 +138850,7 @@ SLES-02681:
     publisher: "Infogrames"
     developer: "Power & Magic"
     releaseDate: "2000-06-09"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
       - Italian
@@ -136659,7 +138873,7 @@ SLES-00995:
     publisher: "Infogrames"
     developer: "Power & Magic"
     releaseDate: "2000-06-09"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -136700,7 +138914,7 @@ SLES-02094:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "1999-09-15"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
       - French
@@ -136919,6 +139133,8 @@ SLPS-00857:
     linkCable: false
 SLPM-80104:
   name: "Runabout (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-04015:
   name: "Runabout 2 (Europe)"
   controllers:
@@ -136961,6 +139177,8 @@ SLPS-02403:
     linkCable: false
 SLPM-80510:
   name: "Runabout 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03033:
   name: "Runabout 2 (Japan) (Fukyuuban 1500)"
   controllers:
@@ -137077,6 +139295,8 @@ SLPS-00751:
     linkCable: false
 SLPM-80095:
   name: "Running High (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01630:
   name: "Running Wild (Europe)"
   controllers:
@@ -137123,6 +139343,8 @@ SCUS-94272:
     linkCable: false
 SCUS-94373:
   name: "Running Wild (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10030:
   name: "Rurouni Kenshin - Meiji Kenkaku Romantan - Ishin Gekitou-hen (Japan)"
   controllers:
@@ -137164,6 +139386,8 @@ SCPS-10048:
     linkCable: false
 PAPX-90021:
   name: "Rurouni Kenshin - Meiji Kenkaku Romantan - Juuyuushi Inbou-hen (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - PAPX-90021
     - PAPX-90024
@@ -137255,6 +139479,8 @@ SLED-01511:
   name: "radicalgames@psygnosis v.3 (Europe) (En,Fr,De,Es,It,Fi)"
 SLED-01415:
   name: "S.C.A.R.S. (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01286:
   name: "S.C.A.R.S. (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -137892,7 +140118,7 @@ SLES-03286:
     publisher: "THQ"
     developer: "Climax/Mass Media"
     releaseDate: "2000-12-01"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
       - French
@@ -137913,7 +140139,7 @@ SLUS-01114:
     publisher: "THQ"
     developer: "Climax/Mass Media"
     releaseDate: "2000-09-26"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -137932,7 +140158,7 @@ SLES-03730:
     publisher: "THQ"
     developer: "Climax Group"
     releaseDate: "2001-12-07"
-    genre: "Beat'em up / Action / Platformer"
+    genre: "Beat'em Up / Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -137951,7 +140177,7 @@ SLUS-01351:
     publisher: "THQ"
     developer: "Climax Group"
     releaseDate: "2001-11-02"
-    genre: "Beat'em up / Action / Platformer"
+    genre: "Beat'em Up / Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -138179,7 +140405,7 @@ SLPS-03482:
     publisher: "I'Max"
     developer: "SilverStar"
     releaseDate: "2002-10-24"
-    genre: "Board / Chess"
+    genre: "Board - Chess"
     languages:
       - Japanese
     minPlayers: 1
@@ -138197,7 +140423,7 @@ SLPS-03461:
     publisher: "I.Magic"
     developer: "I.Magic"
     releaseDate: "2002-08-29"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -138296,7 +140522,7 @@ SLPS-01978:
     publisher: "Unbalance"
     developer: "Unbalance"
     releaseDate: "1999-06-03"
-    genre: "Board / Shogi."
+    genre: "Board / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -138333,6 +140559,8 @@ SLPS-01257:
     linkCable: false
 SLPM-80215:
   name: "Saishuu Densha (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03327:
   name: "Saishuu Densha [Rerelease]"
   controllers:
@@ -138550,7 +140778,7 @@ SLES-03753:
     publisher: "Take 2 Interactive"
     developer: "Coresoft, Inc"
     releaseDate: "2001-11-28"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
       - French
@@ -138573,7 +140801,7 @@ SLUS-01397:
     publisher: "Take 2 Interactive"
     developer: "Coresoft, Inc"
     releaseDate: "2001-11-28"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - English
     minPlayers: 1
@@ -138592,7 +140820,7 @@ SLUS-01063:
     publisher: "3DO"
     developer: "Team .366"
     releaseDate: "2000-03-21"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -138611,7 +140839,7 @@ SLUS-01064:
     publisher: "The 3DO Company"
     developer: "The 3DO Company"
     releaseDate: "2000-03-02"
-    genre: "Sports / Softball"
+    genre: "Sports - Softball"
     languages:
       - English
     minPlayers: 1
@@ -138629,7 +140857,7 @@ SLES-00217:
     publisher: "Codemasters"
     developer: "Codemasters"
     releaseDate: "1997-07-01"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
       - French
@@ -138651,7 +140879,7 @@ SLPS-00594:
     publisher: "Codemasters"
     developer: "Virgin Interactive Entertainment (Japan), Inc"
     releaseDate: "1997-01-10"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -138905,6 +141133,8 @@ SLPS-00731:
     linkCable: false
 SLPM-80085:
   name: "Sangoku Musou (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86860:
   name: "Sangoku Musou (Japan) (Rev 1)"
   controllers:
@@ -139744,7 +141974,7 @@ PAPX-90079:
     publisher: "Sony Computer Entertaiment Japan"
     developer: "Insomniac Games"
     releaseDate: "1999-04-01"
-    genre: "Action / Platformer"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -139883,10 +142113,34 @@ SCPS-45075:
     linkCable: false
 LSP-99016101:
   name: "Science Is Elementary 1 (USA)"
+  codes:
+    - LSP99016101
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99016201:
   name: "Science Is Elementary 2 (USA)"
+  codes:
+    - LSP99016201
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99016301:
   name: "Science Is Elementary 3 (USA)"
+  codes:
+    - LSP99016301
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLES-03703:
   name: "Scooby-Doo and the Cyber Chase (Europe)"
   controllers:
@@ -139930,6 +142184,8 @@ SLUS-01396:
     linkCable: false
 SLUS-90098:
   name: "Scooby-Doo and the Cyber Chase (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03733:
   name: "Scooby-Doo et la Cybertraque (France)"
   controllers:
@@ -139959,7 +142215,7 @@ SLES-03770:
     publisher: "Ubi Soft Entertaiment"
     developer: "Vision Scape Interactive, Inc"
     releaseDate: "2002-03-15"
-    genre: "Extreme Sports / Scooter Racing"
+    genre: "Extreme Sports - Scooter Racing"
     languages:
       - English
     minPlayers: 1
@@ -140075,7 +142331,7 @@ SLPS-00356:
     publisher: "Victor Entertaiment"
     developer: "Pegasus Japan"
     releaseDate: "1996-06-21"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -140093,7 +142349,7 @@ SLPS-00992:
     publisher: "Victor Entertaiment"
     developer: "A Wave Inc"
     releaseDate: "1997-09-25"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -140109,12 +142365,13 @@ LSP-020160:
     - DigitalController
   codes:
     - LSP-020160
+    - LSP02016001
     - LSP-903310
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1997-01-01"
-    genre: "Adventure / Educational / Mini Games."
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -140130,12 +142387,13 @@ LSP-020150:
     - DigitalController
   codes:
     - LSP-020150
+    - LSP02015001
     - LSP-903327
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1997-01-01"
-    genre: "Adventure / Educational / Mini Games."
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -140149,37 +142407,86 @@ LSP-020180:
   name: "Secret of Googol 2a, The - Reshaping Googol - The Castle (USA)"
   codes:
     - LSP-020180
+    - LSP02018001
     - LSP-903334
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-020170:
   name: "Secret of Googol 2b, The - Reshaping Googol - Under the Ocean (USA)"
   codes:
     - LSP-020170
+    - LSP02017001
     - LSP-903341
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-020260:
   name: "Secret of Googol 3, The - The Googol Counting Fair - Midways (USA)"
   codes:
     - LSP-020260
+    - LSP02026001
     - LSP-903358
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-020280:
   name: "Secret of Googol 4, The - The Googol Counting Fair - Corral & Fun House (USA)"
   codes:
     - LSP-020280
+    - LSP02028001
     - LSP-903365
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-020450:
   name: "Secret of Googol 5, The - Googolfest - Party Isle & Toy Isle (USA)"
   codes:
     - LSP-020450
+    - LSP02045001
     - LSP-903372
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-020570:
   name: "Secret of Googol 6, The - Googolfest - Arcade Isle & Moon Feast Isle (USA)"
   codes:
     - LSP-020570
+    - LSP02057001
     - LSP-903389
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-020650:
   name: "Secret of Googol 7, The - Eggs All Around - Egg Trek & Balloon Picnic (USA)"
   codes:
     - LSP-020650
+    - LSP02065001
     - LSP-903396
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-020780:
   name: "Secret of Googol 8, The - Googol Gulch - General Store & Math Arcade (USA)"
 SLPM-86230:
@@ -140203,6 +142510,8 @@ SLPM-86230:
     linkCable: false
 SLPM-80426:
   name: "Segare Ijiri (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02323:
   name: "Seikai no Monshou (Japan)"
   controllers:
@@ -140285,6 +142594,8 @@ SLPS-01271:
     linkCable: false
 SLPM-80271:
   name: "Seirei Shoukan - Princess of Darkness (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02652:
   name: "Seireiki Rayblade (Japan)"
   controllers:
@@ -140536,7 +142847,7 @@ SLPS-00142:
     publisher: "Electronic Arts Victor"
     developer: "Electronic Arts Victor"
     releaseDate: "1995-11-17"
-    genre: "Board / Shogi."
+    genre: "Board / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -140555,7 +142866,7 @@ SLES-01021:
     publisher: "GT Interactive"
     developer: "Sensible Software / Krisalis Software"
     releaseDate: "1999-01-08"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -141013,7 +143324,7 @@ SCES-02176:
     publisher: "Sony / Disney Interactive"
     developer: "Capcom"
     releaseDate: "1999-11-26"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - Italian
     minPlayers: 1
@@ -141308,6 +143619,8 @@ SCES-12103:
     linkCable: false
 SLUS-90031:
   name: "Shadow Madness (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00468:
   name: "Shadow Madness (USA) (Disc 1)"
   discSet:
@@ -141448,7 +143761,7 @@ SLES-00888:
     publisher: "Psygnosis"
     developer: "Hammerhead"
     releaseDate: "1998-01-15"
-    genre: "First person shooter / Action"
+    genre: "First Person Shooter / Action"
     languages:
       - English
       - French
@@ -141464,6 +143777,8 @@ SLES-00888:
     linkCable: false
 SLED-00968:
   name: "Shadow Master (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00545:
   name: "Shadow Master (USA)"
   compatibility:
@@ -141477,7 +143792,7 @@ SLUS-00545:
     publisher: "Psygnosis"
     developer: "Hammerhead"
     releaseDate: "1997-12-15"
-    genre: "First person shooter / Action"
+    genre: "First Person Shooter / Action"
     languages:
       - English
     minPlayers: 1
@@ -141593,7 +143908,7 @@ SLES-01576:
     publisher: "Codemasters"
     developer: "Codemasters"
     releaseDate: "2000-11-22"
-    genre: "Sports / Cricket"
+    genre: "Sports - Cricket"
     languages:
       - English
     minPlayers: 1
@@ -141890,6 +144205,8 @@ SLES-02895:
     linkCable: false
 SLED-03631:
   name: "Sheep, Dog 'n' Wolf - Interactive Demo (Europe) (En,Fr,De,Es,It,Nl)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00026:
   name: "Shellshock (Europe)"
   controllers:
@@ -142134,7 +144451,7 @@ SLPS-02810:
     publisher: "Visit"
     developer: "Visit"
     releaseDate: "2000-06-15"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -142208,7 +144525,7 @@ SLPM-86177:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "1999-04-28"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -142362,7 +144679,7 @@ SLPS-00084:
     publisher: "Tomy"
     developer: "Yuke's"
     releaseDate: "1996-11-22"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -142380,7 +144697,7 @@ SLPS-00637:
     publisher: "Tomy"
     developer: "Yuke's"
     releaseDate: "1996-12-20"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -142398,7 +144715,7 @@ SLPS-01366:
     publisher: "Tomy"
     developer: "Yuke's"
     releaseDate: "1998-03-26"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -142416,7 +144733,7 @@ SLPS-01314:
     publisher: "Tomy"
     developer: "Yuke's"
     releaseDate: "1998-03-26"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -142813,7 +145130,7 @@ SCPS-45402:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "1999-04-28"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -143125,6 +145442,8 @@ SLPS-01114:
     linkCable: false
 SLPM-80156:
   name: "Shinshuku Taisen - It's a Nony! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03312:
   name: "Shinsou Kaiten!! Wan Wan Umi Monogatari - Sanyo Pachinko Paradise DX (Japan)"
   controllers:
@@ -143164,6 +145483,8 @@ SLUS-00558:
     linkCable: false
 SLUS-90013:
   name: "Shipwreckers! (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01240:
   name: "Shiritsu Justice Gakuen - Legion of Heroes (Japan) (Disc 1) (Evolution Disc)"
   discSet:
@@ -143453,7 +145774,7 @@ SLPS-00139:
     publisher: "Seta Corporation"
     developer: "Seta Corporation"
     releaseDate: "1995-12-08"
-    genre: "Shogi."
+    genre: "Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -143471,7 +145792,7 @@ SLPS-01976:
     publisher: "Magical Company (Mahou)"
     developer: "Magical Company (Mahou)"
     releaseDate: "1999-04-28"
-    genre: "Shogi."
+    genre: "Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -143489,7 +145810,7 @@ SLPS-03081:
     publisher: "Magical Company (Mahou)"
     developer: "Magical Company (Mahou)"
     releaseDate: "2001-02-01"
-    genre: "Shogi."
+    genre: "Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -143507,7 +145828,7 @@ SLPM-86069:
     publisher: "Magical Company (Mahou)"
     developer: "Magical Company (Mahou)"
     releaseDate: "1998-03-19"
-    genre: "Shogi."
+    genre: "Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -143525,7 +145846,7 @@ SLPS-03083:
     publisher: "Magical Company (Mahou)"
     developer: "Magical Company (Mahou)"
     releaseDate: "2000-12-07"
-    genre: "Shogi."
+    genre: "Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -143560,7 +145881,7 @@ SLES-03996:
     - DigitalController
   metadata:
     publisher: "TDK Impulse"
-    developer: "The Code Monkeys"
+    developer: "The Code Monkeys Ltd"
     releaseDate: "2002-11-15"
     genre: "Action / Mini Games"
     languages:
@@ -143585,7 +145906,7 @@ SLUS-01463:
     - DigitalController
   metadata:
     publisher: "TDK Impulse"
-    developer: "The Code Monkeys"
+    developer: "The Code Monkeys Ltd"
     releaseDate: "2002-10-20"
     genre: "Action / Mini Games"
     languages:
@@ -143679,6 +146000,8 @@ SLPS-00828:
     linkCable: true
 SLPM-80088:
   name: "Shutokou Battle R (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02401:
   name: "Shuukan Gallop - Blood Master (Japan) (Disc 1)"
   discSet:
@@ -143772,7 +146095,7 @@ SLPS-01079:
     publisher: "Data East"
     developer: "Prosoft"
     releaseDate: "1998-04-16"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -143803,6 +146126,8 @@ SLPS-01175:
     linkCable: false
 SLPM-80145:
   name: "Side by Side Special (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86344:
   name: "Side by Side Special 2000 (Japan)"
   compatibility:
@@ -144021,6 +146346,8 @@ SLPS-02334:
     linkCable: false
 SLPM-80494:
   name: "Silent Bomber (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02992:
   name: "Silent Bomber (Spain)"
   controllers:
@@ -144084,8 +146411,12 @@ SCPS-45380:
     linkCable: false
 SLED-02186:
   name: "Silent Hill (Australia) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01735:
   name: "Silent Hill (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01514:
   name: "Silent Hill (Europe) (En,Fr,De,Es,It)"
   compatibility:
@@ -144117,6 +146448,8 @@ SLES-01514:
     linkCable: false
 SLED-01774:
   name: "Silent Hill (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86192:
   name: "Silent Hill (Japan)"
   compatibility:
@@ -144144,6 +146477,8 @@ SLPM-86192:
     linkCable: false
 SLPM-80363:
   name: "Silent Hill (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86498:
   name: "Silent Hill (Japan) (Rev 1)"
   controllers:
@@ -144195,8 +146530,12 @@ SLUS-00707:
     linkCable: false
 SLUS-90050:
   name: "Silent Hill (USA) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-80707:
   name: "Silent Hill (USA) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
   compatibility:
     rating: NoIssues
     versionTested: "0.1-1448-g472f1c1c"
@@ -144339,6 +146678,8 @@ SLPS-02320:
     linkCable: false
 SLPM-80469:
   name: "Silver Jiken - The Silver (Japan) (Experience) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00050:
   name: "Silverload (USA)"
   controllers:
@@ -144803,7 +147144,7 @@ SLPM-86866:
     publisher: "D3 Publisher"
     developer: "Tamsoft"
     releaseDate: "2001-08-30"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -144871,6 +147212,8 @@ SLPM-86910:
     linkCable: false
 SLPM-80472:
   name: "Simple 1500 Series - The Demo (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02437:
   name: "Simple 1500 Series Vol. 1 - The Mahjong (Japan)"
   controllers:
@@ -144918,7 +147261,7 @@ SLPS-02446:
     publisher: "D3 Publisher"
     developer: "Success"
     releaseDate: "1999-11-01"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -144937,7 +147280,7 @@ SLPS-02030:
     publisher: "Culture Publishers"
     developer: "Success"
     releaseDate: "1999-04-22"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -145299,7 +147642,7 @@ SLPS-02433:
     publisher: "D3 Publisher"
     developer: "Tamsoft Corporation"
     releaseDate: "1999-11-18"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -145429,7 +147772,7 @@ SLPS-02472:
     publisher: "D3 Publisher"
     developer: "Yuke's"
     releaseDate: "1999-12-09"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -145508,7 +147851,7 @@ SLPS-02228:
     publisher: "D3 Publisher"
     developer: "Nekogumi (Jorudan)"
     releaseDate: "2000-02-24"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -145527,7 +147870,7 @@ SLPS-02630:
     publisher: "D3 Publisher"
     developer: "Atelier Double"
     releaseDate: "2000-02-24"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -145565,7 +147908,7 @@ SLPS-02755:
     publisher: "D3 Publisher"
     developer: "Access"
     releaseDate: "2000-07-13"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -145622,7 +147965,7 @@ SLPS-02756:
     publisher: "D3 Publisher"
     developer: "Jorudan"
     releaseDate: "2000-05-02"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -145660,7 +148003,7 @@ SLPS-02922:
     publisher: "D3 Publisher"
     developer: "Nekogumi (Jorudan)"
     releaseDate: "2000-08-03"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - Japanese
     minPlayers: 1
@@ -145984,7 +148327,7 @@ SLPS-03037:
     publisher: "D3 Publisher"
     developer: "Atelier Double"
     releaseDate: "2000-11-16"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -146077,7 +148420,7 @@ SLPM-86697:
     publisher: "D3 Publisher"
     developer: "Argent"
     releaseDate: "2000-12-07"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -146115,7 +148458,7 @@ SLPM-86702:
     publisher: "D3 Publisher"
     developer: "Yuke's"
     releaseDate: "2000-12-14"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -146153,7 +148496,7 @@ SLPM-86713:
     publisher: "D3 Publisher"
     developer: "Art Co"
     releaseDate: "2001-01-25"
-    genre: "Sports / Volleyball"
+    genre: "Sports - Volleyball"
     languages:
       - Japanese
     minPlayers: 1
@@ -146340,7 +148683,7 @@ SLPM-86801:
     publisher: "D3 Publisher"
     developer: "Atelier Double"
     releaseDate: "2001-05-31"
-    genre: "Sports / Ski"
+    genre: "Sports - Ski"
     languages:
       - Japanese
     minPlayers: 1
@@ -146398,7 +148741,7 @@ SLPM-86842:
     publisher: "D3 Publisher"
     developer: "Highwaystar"
     releaseDate: "2001-07-07"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -146436,7 +148779,7 @@ SLPM-86864:
     publisher: "D3 Publisher"
     developer: "A-Max"
     releaseDate: "2001-08-09"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -146568,7 +148911,7 @@ SLPM-86871:
     publisher: "D3 Publisher"
     developer: "Break"
     releaseDate: "2001-08-30"
-    genre: "Sports / Volleyball"
+    genre: "Sports - Volleyball"
     languages:
       - Japanese
     minPlayers: 1
@@ -146644,7 +148987,7 @@ SLPM-86914:
     publisher: "D3 Publisher"
     developer: "Access"
     releaseDate: "2001-03-25"
-    genre: "Sports / Dodgeball"
+    genre: "Sports - Dodgeball"
     languages:
       - Japanese
     minPlayers: 1
@@ -146663,7 +149006,7 @@ SLPM-86915:
     publisher: "D3 Publisher"
     developer: "Highwaystar"
     releaseDate: "2001-10-25"
-    genre: "Sports / Swimming"
+    genre: "Sports - Swimming"
     languages:
       - Japanese
     minPlayers: 1
@@ -146931,7 +149274,7 @@ SLPM-87035:
     publisher: "D3 Publisher"
     developer: "Taito"
     releaseDate: "2002-03-28"
-    genre: "Action / Driving / Simulation / Mini games"
+    genre: "Action / Driving / Simulation / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -147062,7 +149405,7 @@ SLPM-87076:
     publisher: "D3 Publisher"
     developer: "Tomcat System / Irem Software Engineering"
     releaseDate: "2002-05-23"
-    genre: "Platform"
+    genre: "Platformer"
     languages:
       - Japanese
     minPlayers: 1
@@ -147119,7 +149462,7 @@ SLPM-87088:
     publisher: "D3 Publisher"
     developer: "Highwaystar"
     releaseDate: "2002-06-27"
-    genre: "Sports / Squash"
+    genre: "Sports - Squash"
     languages:
       - Japanese
     minPlayers: 1
@@ -147138,7 +149481,7 @@ SLPM-87087:
     publisher: "D3 Publisher"
     developer: "Axes Art Amuse"
     releaseDate: "2002-09-05"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -147253,7 +149596,7 @@ SLPS-03362:
     publisher: "Bandai"
     developer: "Break"
     releaseDate: "2001-12-20"
-    genre: "Sports / Table Hockey"
+    genre: "Sports - Table Hockey"
     languages:
       - Japanese
     minPlayers: 1
@@ -147331,7 +149674,7 @@ SLPS-03445:
     publisher: "Bandai / D3 Publisher"
     developer: "Bandai"
     releaseDate: "2002-06-27"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -147349,7 +149692,7 @@ SLPS-03457:
     publisher: "Bandai / D3 Publisher"
     developer: "Bandai"
     releaseDate: "2002-08-29"
-    genre: "Sports / Dodgeball"
+    genre: "Sports - Dodgeball"
     languages:
       - Japanese
     minPlayers: 1
@@ -147501,7 +149844,7 @@ SLES-03401:
     publisher: "Electronic Arts / Fox Interactive"
     developer: "Big Ape Productions"
     releaseDate: "2001-03-22"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -147523,7 +149866,7 @@ SLUS-01227:
     publisher: "Activision / Fox Interactive"
     developer: "Big Ape Productions"
     releaseDate: "2001-04-04"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -147897,7 +150240,7 @@ SLES-00341:
     publisher: "Virgin Interactive Entertaiment"
     developer: "Neversoft Entertainment"
     releaseDate: "1996-09-01"
-    genre: "Action Beat'em up"
+    genre: "Action Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -147918,7 +150261,7 @@ SLUS-00209:
     publisher: "Playmates Interactive Entertainment"
     developer: "Neversoft Entertainment"
     releaseDate: "1996-05-10"
-    genre: "Action Beat'em up"
+    genre: "Action Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -147937,7 +150280,7 @@ SLES-02947:
     publisher: "Midas Interactive"
     developer: "KID"
     releaseDate: "2000-01-09"
-    genre: "Sports / Ski"
+    genre: "Sports - Ski"
     languages:
       - English
     minPlayers: 1
@@ -147956,7 +150299,7 @@ SLPS-01476:
     publisher: "KID"
     developer: "KID"
     releaseDate: "1998-07-23"
-    genre: "Sports / Ski"
+    genre: "Sports - Ski"
     languages:
       - Japanese
     minPlayers: 1
@@ -148091,7 +150434,7 @@ SLUS-01392:
     publisher: "Natsume"
     developer: "Metro"
     releaseDate: "2001-08-09"
-    genre: "Sports / Simulation"
+    genre: "Sports - Simulation"
     languages:
       - English
     minPlayers: 1
@@ -148111,7 +150454,7 @@ SLUS-00022:
     publisher: "Crystal Dynamics"
     developer: "Left Field Productions"
     releaseDate: "1996-05-10"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -148264,8 +150607,12 @@ SLPS-01599:
     linkCable: false
 SLUS-90072:
   name: "Sled Storm & Medal of Honor Demo CD (USA)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02300:
   name: "Sled Storm (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02194:
   name: "Sled Storm (Europe) (En,Fr,De,Es)"
   controllers:
@@ -148779,7 +151126,7 @@ SLPS-00450:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "2001-12-27"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -148798,7 +151145,7 @@ SLPS-01693:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "1998-11-12"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -148817,7 +151164,7 @@ SLPS-03001:
     publisher: "Namco"
     developer: "Namco"
     releaseDate: "2000-11-09"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -148949,7 +151296,7 @@ SLES-02763:
     publisher: "Ubi Soft / Crave Entertainment"
     developer: "Unique Development Studios (UDS)"
     releaseDate: "2000-08-06"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
       - French
@@ -148973,7 +151320,7 @@ SLUS-01093:
     publisher: "Crave Entertainment"
     developer: "Unique Development Studios (UDS)"
     releaseDate: "2000-08-09"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -148992,7 +151339,7 @@ SLPS-01823:
     publisher: "ASCII Entertainment"
     developer: "ASCII Entertainment"
     releaseDate: "1999-01-21"
-    genre: "Sports / Snowboard"
+    genre: "Sports - Snowboard"
     languages:
       - Japanese
     minPlayers: 1
@@ -149013,7 +151360,7 @@ SCPS-45157:
     publisher: "Atlus"
     developer: "Virtual Studio"
     releaseDate: "1998-01-29"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - English
     minPlayers: 1
@@ -149031,7 +151378,7 @@ SLES-01106:
     publisher: "Infogrames"
     developer: "Ocean / Power & Magic"
     releaseDate: "1998-07-20"
-    genre: "Sports / Ski"
+    genre: "Sports - Ski"
     languages:
       - English
     minPlayers: 1
@@ -149050,7 +151397,7 @@ SLES-03960:
     publisher: "Midas Interactive"
     developer: "Atelier Double"
     releaseDate: "2003-05-02"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -149069,7 +151416,7 @@ SLUS-01287:
     publisher: "Agetec"
     developer: "Atelier Double"
     releaseDate: "2000-12-10"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -149105,7 +151452,7 @@ SLES-00691:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1997-03-10"
-    genre: "Soccer."
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -149261,6 +151608,8 @@ SLPS-03027:
     linkCable: false
 SLPM-80381:
   name: "Sonata (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01843:
   name: "Sonata (Japan) (Disc 1)"
   discSet:
@@ -149406,7 +151755,7 @@ SLPS-01827:
     publisher: "Victor Interactive Software"
     developer: "Victor Interactive Software"
     releaseDate: "1999-01-21"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -149820,6 +152169,8 @@ SLPS-02091:
     linkCable: false
 SLPM-80432:
   name: "Soukou Kidoutai L.A.P.D. (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02315:
   name: "Soukou Kihei Votoms - Koutetsu no Gunzei (Japan)"
   controllers:
@@ -149879,6 +152230,8 @@ SLPS-01961:
     linkCable: false
 SLPM-80360:
   name: "Soukou Kihei Votoms - Lightning Slash (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01960:
   name: "Soukou Kihei Votoms - Lightning Slash (Japan) (Limited Edition)"
   controllers:
@@ -150195,7 +152548,7 @@ SLUS-00822:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "1999-08-22"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -150247,6 +152600,8 @@ SLPS-02479:
     linkCable: false
 SLPM-80507:
   name: "Soumatou (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91237:
   name: "Soumatou [PlayStation the Best]"
   controllers:
@@ -150534,6 +152889,8 @@ SLES-01972:
     linkCable: false
 SLED-02576:
   name: "South Park - Chef's Luv Shack (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00997:
   name: "South Park - Chef's Luv Shack (USA)"
   controllers:
@@ -150632,7 +152989,7 @@ SLPM-86408:
     publisher: "Hanson"
     developer: "Hanson"
     releaseDate: "1999-12-10"
-    genre: "Data / Pictures / Music."
+    genre: "Data / Pictures / Music"
     languages:
       - Japanese
     minPlayers: 1
@@ -150656,7 +153013,7 @@ SLPM-86409:
     publisher: "Hanson"
     developer: "Hanson"
     releaseDate: "1999-12-10"
-    genre: "Data / Pictures / Music."
+    genre: "Data / Pictures / Music"
     languages:
       - Japanese
     minPlayers: 1
@@ -150680,7 +153037,7 @@ SLPM-86410:
     publisher: "Hanson"
     developer: "Hanson"
     releaseDate: "1999-12-10"
-    genre: "Data / Pictures / Music."
+    genre: "Data / Pictures / Music"
     languages:
       - Japanese
     minPlayers: 1
@@ -151098,7 +153455,7 @@ SLES-00284:
     publisher: "Acclaim Entertaiment"
     developer: "Sculptured Software"
     releaseDate: "1997-03-14"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -151116,7 +153473,7 @@ SLPS-00697:
     publisher: "Acclaim Entertaiment"
     developer: "Sculptured Software"
     releaseDate: "1997-02-28"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -151137,7 +153494,7 @@ SLUS-00243:
     publisher: "Acclaim Entertaiment"
     developer: "Sculptured Software"
     releaseDate: "1996-11-10"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -151576,6 +153933,8 @@ SLPS-01179:
     linkCable: false
 SLPM-80209:
   name: "Spectral Tower II (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01763:
   name: "Speed Freaks (Europe)"
   controllers:
@@ -151661,6 +154020,8 @@ SCUS-94563:
     linkCable: false
 SCUS-94572:
   name: "Speed Punks (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00613:
   name: "Speed Racer (USA)"
   compatibility:
@@ -151692,7 +154053,7 @@ SLES-02782:
     publisher: "Empire Interactive, Inc"
     developer: "The Bitmap Brothers"
     releaseDate: "2000-09-29"
-    genre: "Sports / Action"
+    genre: "Sports - Action"
     languages:
       - English
       - French
@@ -151715,7 +154076,7 @@ SLUS-01218:
     publisher: "Empire Interactive, Inc"
     developer: "The Bitmap Brothers"
     releaseDate: "2000-10-25"
-    genre: "Sports / Action"
+    genre: "Sports - Action"
     languages:
       - English
     minPlayers: 1
@@ -151746,6 +154107,8 @@ SLES-00575:
     linkCable: false
 SLED-01711:
   name: "Sphere 360 (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00883:
   name: "Spice World (Europe)"
   controllers:
@@ -152430,7 +154793,7 @@ SLES-02616:
     publisher: "Ubi Soft"
     developer: "Anco"
     releaseDate: "2000-04-07"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
       - French
@@ -152450,7 +154813,7 @@ SLES-03569:
     publisher: "Ubi Soft Entertaiment"
     developer: "Anco"
     releaseDate: "2000-11-24"
-    genre: "Soccer / Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -152538,6 +154901,8 @@ SLPS-02117:
     linkCable: false
 SLPM-80447:
   name: "Spriggan - Lunar Verse (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90034:
   name: "Spring Special (Japan)"
 SCES-02835:
@@ -152554,7 +154919,7 @@ SCES-02835:
     publisher: "Sony"
     developer: "Insomniac Games"
     releaseDate: "2000-11-10"
-    genre: "Action / Platform"
+    genre: "Action / Platformer"
     languages:
       - English
       - French
@@ -152582,7 +154947,7 @@ SCUS-94467:
     publisher: "Sony"
     developer: "Insomniac Games"
     releaseDate: "2000-10-10"
-    genre: "Action / Platform"
+    genre: "Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -152594,6 +154959,8 @@ SCUS-94467:
     linkCable: false
 SCUS-94615:
   name: "Spyro - Year of the Dragon (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
 SCES-02104:
@@ -152610,7 +154977,7 @@ SCES-02104:
     publisher: "Sony"
     developer: "Insomniac Games"
     releaseDate: "1999-11-05"
-    genre: "Action / Platform"
+    genre: "Action / Platformer"
     languages:
       - English
       - French
@@ -152638,7 +155005,7 @@ SCUS-94425:
     publisher: "Sony"
     developer: "Insomniac Games"
     releaseDate: "1999-09-07"
-    genre: "Action / Platform"
+    genre: "Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -152650,6 +155017,8 @@ SCUS-94425:
     linkCable: false
 SCUS-94460:
   name: "Spyro 2 - Ripto's Rage! (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
 SCUS-94632:
@@ -152733,6 +155102,8 @@ SCPS-10085:
     linkCable: false
 PAPX-90078:
   name: "Spyro the Dragon (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
     - DisablePGXPCulling # Fixes geometry corruption when looking at portals.
@@ -152785,11 +155156,15 @@ SCUS-94228:
     linkCable: false
 SCUS-94290:
   name: "Spyro the Dragon (USA) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
     - DisablePGXPCulling # Fixes geometry corruption when looking at portals.
 SCUS-94439:
   name: "Spyro the Dragon (USA) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode # Required, but not perfect. Game messes with geometry.
     - DisablePGXPCulling # Fixes geometry corruption when looking at portals.
@@ -152806,7 +155181,7 @@ SCPS-10128:
     publisher: "Sony"
     developer: "Insomniac Games"
     releaseDate: "2000-03-16"
-    genre: "Action / Platform"
+    genre: "Action / Platformer"
     languages:
       - Japanese
     minPlayers: 1
@@ -152818,6 +155193,8 @@ SCPS-10128:
     linkCable: false
 PCPX-96191:
   name: "Spyro x Sparx - Tondemo Tours (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80306:
   name: "Square Maniacs '98 (Japan)"
 SLPM-80556:
@@ -152901,6 +155278,8 @@ SCPS-45417:
     linkCable: false
 SLPM-80048:
   name: "Square's Preview Extra - FF VII Sample & SIGGRAPH '95 Works (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45401:
   name: "Square's Preview Vol. 4 (Japan, Asia)"
   controllers:
@@ -152942,7 +155321,7 @@ SLUS-90029:
     publisher: "Squaresoft"
     developer: "Squaresoft"
     releaseDate: "1998-01-11"
-    genre: "Action RPG"
+    genre: "** DEMO **"
     languages:
       - English
     minPlayers: 1
@@ -152984,7 +155363,7 @@ SLPS-00957:
     publisher: "Shogakukan Production"
     developer: "Seta"
     releaseDate: "1997-08-28"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -153121,7 +155500,7 @@ SLPS-01196:
     publisher: "Yumedia (Aroma)"
     developer: "Yumedia (Aroma)"
     releaseDate: "1998-01-29"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -153146,7 +155525,7 @@ SLPS-01197:
     publisher: "Yumedia (Aroma)"
     developer: "Yumedia (Aroma)"
     releaseDate: "1998-01-29"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -153171,7 +155550,7 @@ SLPS-01198:
     publisher: "Yumedia (Aroma)"
     developer: "Yumedia (Aroma)"
     releaseDate: "1998-01-29"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -153196,7 +155575,7 @@ SLPS-01199:
     publisher: "Yumedia (Aroma)"
     developer: "Yumedia (Aroma)"
     releaseDate: "1998-01-29"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -153226,6 +155605,8 @@ SLUS-00241:
     linkCable: false
 SLED-00553:
   name: "Star Gladiator (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00495:
   name: "Star Gladiator - Episode I - Final Crusade (Europe)"
   controllers:
@@ -153264,6 +155645,8 @@ SLPS-00539:
     linkCable: false
 SLPM-80056:
   name: "Star Gladiator - Episode I - Final Crusade (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00372:
   name: "Star Gladiator - Episode I - Final Crusade (USA)"
   controllers:
@@ -153347,7 +155730,7 @@ SLPS-01390:
     publisher: "GMF"
     developer: "GMF"
     releaseDate: "1998-06-18"
-    genre: "Simulation / Mini games"
+    genre: "Simulation / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -153359,6 +155742,8 @@ SLPS-01390:
     linkCable: false
 SLPM-80274:
   name: "Star Ocean - The Second Story & Hello Charlie!! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-02159:
   name: "Star Ocean - The Second Story (Europe) (Disc 1)"
   discSet:
@@ -153915,6 +156300,8 @@ SLUS-01183:
     linkCable: false
 SLUS-90088:
   name: "Star Wars - Demolition (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02036:
   name: "Star Wars - Episode I - Die dunkle Bedrohung (Germany)"
   controllers:
@@ -153943,7 +156330,7 @@ SLES-02607:
     publisher: "Lucasarts"
     developer: "Lucasarts"
     releaseDate: "2000-04-28"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -153962,7 +156349,7 @@ SLES-02608:
     publisher: "Lucasarts"
     developer: "Lucasarts"
     releaseDate: "2000-04-28"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - French
     minPlayers: 1
@@ -153981,7 +156368,7 @@ SLES-02609:
     publisher: "Lucasarts"
     developer: "Lucasarts"
     releaseDate: "2000-04-28"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - German
     minPlayers: 1
@@ -154000,7 +156387,7 @@ SLUS-01046:
     publisher: "Lucasarts"
     developer: "Lucasarts"
     releaseDate: "2000-04-01"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -154031,8 +156418,12 @@ SLES-02035:
     linkCable: false
 SLED-02045:
   name: "Star Wars - Episode I - La Menace Fantome (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02044:
   name: "Star Wars - Episode I - The Phantom Menace (Australia) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02034:
   name: "Star Wars - Episode I - The Phantom Menace (Europe)"
   controllers:
@@ -154092,6 +156483,8 @@ SLUS-00884:
     linkCable: false
 SLUS-80884:
   name: "Star Wars - Episode I - The Phantom Menace (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02610:
   name: "Star Wars - Episodio I - Jedi Power Battles (Italy)"
   controllers:
@@ -154101,7 +156494,7 @@ SLES-02610:
     publisher: "Lucasarts"
     developer: "Lucasarts"
     releaseDate: "2000-04-28"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Italian
     minPlayers: 1
@@ -154123,7 +156516,7 @@ SLES-02611:
     publisher: "Lucasarts"
     developer: "Lucasarts"
     releaseDate: "2000-04-28"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Spanish
     minPlayers: 1
@@ -154693,8 +157086,12 @@ SLPS-01040:
     linkCable: false
 SLPM-80136:
   name: "StarSweep (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80151:
   name: "StarSweep (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00034:
   name: "Starblade Alpha (Europe)"
   controllers:
@@ -154927,22 +157324,40 @@ SLUS-00094:
     linkCable: false
 SLED-01553:
   name: "Station Demo Disc 1 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01634:
   name: "Station Demo Disc 2 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01696:
   name: "Station Demo Disc 3 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01731:
   name: "Station Demo Disc 4 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01782:
   name: "Station Demo Disc 5 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01895:
   name: "Station Demo Disc 6 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01969:
   name: "Station Demo Disc 7 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02033:
   name: "Station Demo Disc 8 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02077:
   name: "Station Demo Disc 9 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00373:
   name: "Steel Harbinger (Europe)"
   controllers:
@@ -155062,54 +157477,152 @@ SLPS-00472:
     linkCable: false
 LSP-99014101:
   name: "Story Lane Theater 1 (USA)"
+  codes:
+    - LSP99014101
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99014201:
   name: "Story Lane Theater 2 (USA)"
+  codes:
+    - LSP99014201
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99014301:
   name: "Story Lane Theater 3 (USA)"
+  codes:
+    - LSP99014301
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99014401:
   name: "Story Lane Theater 4 (USA)"
+  codes:
+    - LSP99014401
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99014501:
   name: "Story Lane Theater 5 (USA)"
+  codes:
+    - LSP99014501
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-907011:
   name: "Str.at.e.s. 1 - Match-A-Batch (USA)"
+  codes:
+    - LSP907011
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-030102:
   name: "Str.at.e.s. 2 - Matchamania! (USA)"
   codes:
     - LSP-030102
+    - LSP03010201
     - LSP-03010201
     - LSP-907028
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-030103:
   name: "Str.at.e.s. 3 - Title This! Title That! (USA)"
   codes:
     - LSP-030103
+    - LSP03010301
     - LSP-03010301
     - LSP-907035
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-030104:
   name: "Str.at.e.s. 4 - Titlerama! (USA)"
   codes:
     - LSP-030104
+    - LSP03010401
     - LSP-03010401
     - LSP-907042
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-030105:
   name: "Str.at.e.s. 5 - Parallel Lives! (USA)"
   codes:
     - LSP-030105
+    - LSP03010501
     - LSP-03010501
     - LSP-907059
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-030106:
   name: "Str.at.e.s. 6 - Analogy-ology! (USA)"
   codes:
     - LSP-030106
+    - LSP03010601
     - LSP-03010601
     - LSP-907066
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-030107:
   name: "Str.at.e.s. 7 - Riddle Roundup! (USA)"
   codes:
     - LSP-030107
+    - LSP03010701
     - LSP-03010701
     - LSP-907073
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-907080:
   name: "Str.at.e.s. 8 - Riddle Wrangler! (USA)"
+  codes:
+    - LSP907080
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLPS-01310:
   name: "Straight Victory - Hoshino Kazuyoshi e no Chousen (Japan)"
   controllers:
@@ -155221,7 +157734,7 @@ SLPS-01622:
     publisher: "Micro Cabin"
     developer: "Atelier Double"
     releaseDate: "1998-10-23"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -155240,7 +157753,7 @@ SLPS-02744:
     publisher: "Micro Cabin"
     developer: "Micro Cabin"
     releaseDate: "2000-08-10"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -155481,6 +157994,8 @@ SLES-10998:
     linkCable: false
 SLPM-80154:
   name: "Street Fighter Collection (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00800:
   name: "Street Fighter Collection (Japan) (Disc 1)"
   discSet:
@@ -155631,6 +158146,8 @@ SLUS-00746:
     linkCable: false
 SLED-00473:
   name: "Street Fighter EX + Alpha (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-45074:
   name: "Street Fighter EX Plus Alpha"
   controllers:
@@ -155748,6 +158265,8 @@ SLPS-02508:
     linkCable: false
 SLPM-80517:
   name: "Street Fighter EX2 Plus (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01105:
   name: "Street Fighter EX2 Plus (USA)"
   compatibility:
@@ -155905,7 +158424,7 @@ SIPS-60019:
     publisher: "Sony Computer Entertaiment"
     developer: "Sony"
     releaseDate: "1997-04-11"
-    genre: "Sports / Racing"
+    genre: "Sports - Racing"
     languages:
       - Japanese
     minPlayers: 1
@@ -155917,6 +158436,8 @@ SIPS-60019:
     linkCable: false
 PCPX-96067:
   name: "Street Games '97 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00296:
   name: "Street Racer (Europe)"
   controllers:
@@ -155983,7 +158504,7 @@ SLUS-01450:
     publisher: "Agetec / A1 Games"
     developer: "Highwaystar"
     releaseDate: "2003-01-04"
-    genre: "Sports / Squash"
+    genre: "Sports - Squash"
     languages:
       - English
     minPlayers: 1
@@ -156050,7 +158571,7 @@ SLUS-00818:
     publisher: "Electronic Arts"
     developer: "Atelier Double"
     releaseDate: "1999-02-24"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -156074,7 +158595,7 @@ SLUS-01083:
     publisher: "Electronic Arts"
     developer: "Micro Cabin"
     releaseDate: "2000-03-15"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -156094,7 +158615,7 @@ SLES-01759:
     publisher: "Electronic Arts"
     developer: "Atelier Double"
     releaseDate: "1999-02-24"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
       - French
@@ -156117,7 +158638,7 @@ SLES-02703:
     publisher: "Electronic Arts"
     developer: "Micro Cabin"
     releaseDate: "2000-03-15"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
       - French
@@ -156237,6 +158758,8 @@ SLUS-01163:
     linkCable: false
 SLPM-80537:
   name: "Strider Hiryuu 1 & 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02620:
   name: "Strider Hiryuu 1 & 2 (Japan) (Disc 1) (Strider Hiryuu)"
   discSet:
@@ -156370,7 +158893,7 @@ SLPS-00127:
     publisher: "Coconuts Japan"
     developer: "Rage Software"
     releaseDate: "1995-11-22"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -156388,7 +158911,7 @@ SLES-00023:
     publisher: "Time Warner Interactive"
     developer: "Rage Software"
     releaseDate: "1996-02-01"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -156406,7 +158929,7 @@ SLUS-00210:
     publisher: "Acclaim Entertainment"
     developer: "Rage Software"
     releaseDate: "1996-02-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -156425,7 +158948,7 @@ SLUS-01078:
     publisher: "Infogrames"
     developer: "Rage Software"
     releaseDate: "2000-05-31"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -157111,6 +159634,8 @@ SLES-02442:
     linkCable: false
 SLED-02742:
   name: "Suikoden II (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02443:
   name: "Suikoden II (France)"
   compatibility:
@@ -157298,6 +159823,8 @@ SLPS-02542:
     linkCable: false
 SLPM-80509:
   name: "Summon Night (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03237:
   name: "Summon Night 2 (Japan) (Disc 1)"
   discSet:
@@ -157499,7 +160026,7 @@ SLPS-02219:
     publisher: "King Records"
     developer: "King Records"
     releaseDate: "1999-08-26"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -157518,7 +160045,7 @@ SLPS-02867:
     publisher: "King Records"
     developer: "King Records"
     releaseDate: "2000-07-27"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -157536,7 +160063,7 @@ SCPS-45084:
     publisher: "Starfish"
     developer: "Starfish"
     releaseDate: "1997-08-07"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -157557,7 +160084,7 @@ SLPS-00839:
     publisher: "Starfish"
     developer: "Starfish"
     releaseDate: "1999-05-20"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -157579,7 +160106,7 @@ SLPM-86717:
     publisher: "Starfish Software"
     developer: "HOT-B"
     releaseDate: "2001-05-10"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -157655,7 +160182,7 @@ SLES-00715:
     publisher: "Mindscape"
     developer: "Taito Corporation"
     releaseDate: "1997-10-01"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -157673,7 +160200,7 @@ SLPS-00569:
     publisher: "Taito Corporation"
     developer: "Taito Corporation"
     releaseDate: "1996-11-29"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -157691,7 +160218,7 @@ SLPM-86620:
     publisher: "Taito Corporation"
     developer: "Taito Corporation"
     releaseDate: "2000-08-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -157742,6 +160269,8 @@ SLPS-01776:
     linkCable: false
 SLPM-80358:
   name: "Super Hero Sakusen (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03020:
   name: "Super Hero Sakusen - Diedal no Yabou (Japan)"
   controllers:
@@ -157826,7 +160355,7 @@ SLPM-86019:
     publisher: "Aques"
     developer: "Squaresoft"
     releaseDate: "1998-01-01"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -157845,7 +160374,7 @@ SLES-01175:
     publisher: "Acclaim"
     developer: "Cranberry Source"
     releaseDate: "1998-08-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -157910,7 +160439,7 @@ SLPS-03226:
     publisher: "Selen"
     developer: "Prosoft"
     releaseDate: "2001-07-12"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -158374,7 +160903,7 @@ SLUS-01464:
     publisher: "Tecmo"
     developer: "Tecmo"
     releaseDate: "2002-06-14"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -158393,7 +160922,7 @@ SLES-03961:
     publisher: "Midas Interactive"
     developer: "Access"
     releaseDate: "2003-05-02"
-    genre: "Sports / Dodgeball"
+    genre: "Sports - Dodgeball"
     languages:
       - English
     minPlayers: 1
@@ -158447,6 +160976,8 @@ SCUS-94453:
     linkCable: false
 SCUS-94396:
   name: "SuperCross Circuit (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-87231:
   name: "SuperLite 1500 Series - A Ressha de Ikou 4 - Evolution Global (Japan) (En,Ja,Fr,De)"
   controllers:
@@ -158834,7 +161365,7 @@ SLPM-86426:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2000-01-27"
-    genre: "Board."
+    genre: "Board"
     languages:
       - Japanese
     minPlayers: 1
@@ -158853,7 +161384,7 @@ SLPM-86535:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2000-11-30"
-    genre: "Board."
+    genre: "Board"
     languages:
       - Japanese
     minPlayers: 1
@@ -158872,7 +161403,7 @@ SLPM-86796:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2001-05-24"
-    genre: "Board."
+    genre: "Board"
     languages:
       - Japanese
     minPlayers: 1
@@ -159044,7 +161575,7 @@ SLPM-86622:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2000-08-24"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -159063,7 +161594,7 @@ SLPM-86623:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2000-08-24"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -159082,7 +161613,7 @@ SLPM-86624:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2000-08-24"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -159119,7 +161650,7 @@ SLPM-86297:
     publisher: "Success"
     developer: "Kid"
     releaseDate: "1999-09-22"
-    genre: "Board / Mini games"
+    genre: "Board / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -159173,7 +161704,7 @@ SLPM-86320:
     publisher: "Success"
     developer: "Coconuts Japan"
     releaseDate: "1999-10-28"
-    genre: "Board."
+    genre: "Board"
     languages:
       - Japanese
     minPlayers: 1
@@ -159874,7 +162405,7 @@ SLPM-86282:
     publisher: "Success"
     developer: "Success"
     releaseDate: "1999-08-26"
-    genre: "Board / Reversi."
+    genre: "Board / Reversi"
     languages:
       - Japanese
     minPlayers: 1
@@ -160265,7 +162796,7 @@ SLPM-86581:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2000-07-19"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - Japanese
     minPlayers: 1
@@ -160541,7 +163072,7 @@ SLPM-86981:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2001-12-20"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -160559,7 +163090,7 @@ SLPM-86958:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2001-11-29"
-    genre: "Board / Chess"
+    genre: "Board - Chess"
     languages:
       - Japanese
     minPlayers: 1
@@ -160596,7 +163127,7 @@ SLPM-86799:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2001-05-31"
-    genre: "Board / Mahjong."
+    genre: "Board / Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -160632,7 +163163,7 @@ SLPM-87009:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2002-03-07"
-    genre: "Board /Shogi."
+    genre: "Board /Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -160650,7 +163181,7 @@ SLPM-87010:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2002-03-07"
-    genre: "Board /Shogi."
+    genre: "Board /Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -160668,7 +163199,7 @@ SLPM-86920:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2002-03-07"
-    genre: "Board /Shogi."
+    genre: "Board /Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -160686,7 +163217,7 @@ SLPM-86819:
     publisher: "Success"
     developer: "Success"
     releaseDate: "2001-01-26"
-    genre: "Board /Card / Shogi."
+    genre: "Board /Card / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -160825,7 +163356,7 @@ SLES-02838:
     publisher: "Ubi Soft Entertaiment"
     developer: "Sunsoft"
     releaseDate: "2000-09-29"
-    genre: "Sports / Surf"
+    genre: "Sports - Surf"
     languages:
       - English
     minPlayers: 1
@@ -160844,7 +163375,7 @@ SLUS-01190:
     publisher: "Ubi Soft Entertaiment"
     developer: "Sunsoft"
     releaseDate: "2000-08-01"
-    genre: "Sports / Surf"
+    genre: "Sports - Surf"
     languages:
       - English
     minPlayers: 1
@@ -160875,6 +163406,8 @@ SLPS-01737:
     linkCable: false
 SLPM-80367:
   name: "Susume! Kaizoku - Be Pirates! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02467:
   name: "Susume! Kaizoku - Be Pirates! [Artdink Best Choice]"
   controllers:
@@ -160998,7 +163531,7 @@ SLES-03867:
     publisher: "3DO"
     developer: "Anco"
     releaseDate: "2002-05-20"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -161017,7 +163550,7 @@ SLES-03826:
     publisher: "3DO"
     developer: "Anco"
     releaseDate: "2002-06-28"
-    genre: "Soccer Manager"
+    genre: "Sports - Soccer Manager"
     languages:
       - English
     minPlayers: 1
@@ -161049,6 +163582,8 @@ SLES-00025:
     linkCable: false
 SLED-00665:
   name: "Swagman (Europe) (En,Fr,De) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00151:
   name: "Swagman (USA)"
   compatibility:
@@ -161145,7 +163680,7 @@ SLES-02857:
     publisher: "Eidos Interactive"
     developer: "Attention To Detail Limited"
     releaseDate: "2000-08-25"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - English
     minPlayers: 1
@@ -161165,7 +163700,7 @@ SLES-02858:
     publisher: "Eidos Interactive"
     developer: "Attention To Detail Limited"
     releaseDate: "2000-08-25"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - French
     minPlayers: 1
@@ -161185,7 +163720,7 @@ SLES-02859:
     publisher: "Eidos Interactive"
     developer: "Attention To Detail Limited"
     releaseDate: "2000-08-25"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - German
     minPlayers: 1
@@ -161205,7 +163740,7 @@ SLES-02860:
     publisher: "Eidos Interactive"
     developer: "Attention To Detail Limited"
     releaseDate: "2000-08-25"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - Italian
     minPlayers: 1
@@ -161224,7 +163759,7 @@ SLPM-86626:
     publisher: "Capcom"
     developer: "Attention To Detail Limited"
     releaseDate: "2000-10-26"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - Japanese
     minPlayers: 1
@@ -161244,7 +163779,7 @@ SLES-02861:
     publisher: "Eidos Interactive"
     developer: "Attention To Detail Limited"
     releaseDate: "2000-08-25"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - Spanish
     minPlayers: 1
@@ -161266,7 +163801,7 @@ SLUS-01177:
     publisher: "Eidos Interactive"
     developer: "Attention To Detail Limited"
     releaseDate: "2000-08-18"
-    genre: "Sports / Olympic"
+    genre: "Sports - Olympic"
     languages:
       - English
     minPlayers: 1
@@ -161443,6 +163978,8 @@ SLPS-02216:
     linkCable: false
 SLPM-80448:
   name: "Syphon Filter (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01914:
   name: "Syphon Filter (Spain)"
   compatibility:
@@ -161489,6 +164026,8 @@ SCUS-94240:
     linkCable: false
 SCUS-94362:
   name: "Syphon Filter (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-02285:
   name: "Syphon Filter 2 (Europe) (Disc 1)"
   discSet:
@@ -161683,6 +164222,8 @@ SCES-12288:
     linkCable: false
 SCUS-94393:
   name: "Syphon Filter 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94451:
   name: "Syphon Filter 2 (USA) (Disc 1)"
   discSet:
@@ -161911,6 +164452,8 @@ SCUS-94640:
     linkCable: false
 SCUS-94661:
   name: "Syphon Filter 3 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPVertexCache
 SCES-03701:
@@ -161939,6 +164482,8 @@ SCES-03701:
     linkCable: false
 SCED-03780:
   name: "Syphon Filter 3 - Sentencia Final (Spain) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPVertexCache
 SLPM-87041:
@@ -161987,7 +164532,7 @@ SLES-01473:
     publisher: "Activision"
     developer: "Dreamworks Interactive"
     releaseDate: "1999-04-26"
-    genre: "Action / Beat'em up / Platform"
+    genre: "Action / Beat'em Up / Platformer"
     languages:
       - German
     minPlayers: 1
@@ -162006,7 +164551,7 @@ SLES-01460:
     publisher: "Activision"
     developer: "Dreamworks Interactive"
     releaseDate: "1999-04-26"
-    genre: "Action / Beat'em up / Platform"
+    genre: "Action / Beat'em Up / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -162018,6 +164563,8 @@ SLES-01460:
     linkCable: false
 SLED-01609:
   name: "T'ai Fu - Wrath of the Tiger (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01472:
   name: "T'ai Fu - Wrath of the Tiger (France)"
   controllers:
@@ -162027,7 +164574,7 @@ SLES-01472:
     publisher: "Activision"
     developer: "Dreamworks Interactive"
     releaseDate: "1999-04-26"
-    genre: "Action / Beat'em up / Platform"
+    genre: "Action / Beat'em Up / Platformer"
     languages:
       - French
     minPlayers: 1
@@ -162046,7 +164593,7 @@ SLES-01474:
     publisher: "Activision"
     developer: "Dreamworks Interactive"
     releaseDate: "1999-04-26"
-    genre: "Action / Beat'em up / Platform"
+    genre: "Action / Beat'em Up / Platformer"
     languages:
       - Italian
     minPlayers: 1
@@ -162068,7 +164615,7 @@ SLUS-00787:
     publisher: "Activision"
     developer: "Dreamworks Interactive"
     releaseDate: "1999-02-28"
-    genre: "Action / Beat'em up / Platform"
+    genre: "Action / Beat'em Up / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -162144,6 +164691,8 @@ SLPS-00123:
     linkCable: false
 SLPM-80016:
   name: "TIZ - Tokyo Insect Zoo (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - SLPM-80016
     - SLPM-80024
@@ -162648,7 +165197,7 @@ SLPS-01131:
     publisher: "GameBank"
     developer: "GameBank"
     releaseDate: "1997-12-18"
-    genre: "Board / Igo."
+    genre: "Board / Igo"
     languages:
       - Japanese
     minPlayers: 1
@@ -162669,7 +165218,7 @@ SLPM-86467:
     publisher: "J-Wing"
     developer: "J-Wing"
     releaseDate: "2000-03-23"
-    genre: "Board / Shogi."
+    genre: "Board / Shogi"
     languages:
       - Japanese
     minPlayers: 1
@@ -162759,6 +165308,8 @@ SLUS-00660:
     linkCable: false
 SLUS-90060:
   name: "Tail Concerto (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94607:
   name: "Tail of the Sun (USA)"
   compatibility:
@@ -162918,8 +165469,12 @@ SLPS-01100:
     linkCable: false
 SLPM-80133:
   name: "Tales of Destiny (Japan) (Preview Edition by Namco)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80179:
   name: "Tales of Destiny (Japan) (Preview Edition) (Famitsuu Version)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-91111:
   name: "Tales of Destiny (Japan) (Rev 1)"
   controllers:
@@ -163068,6 +165623,8 @@ SCPS-45507:
     linkCable: false
 SLPM-80586:
   name: "Tales of Eternia (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03050:
   name: "Tales of Eternia (Japan) (Disc 1)"
   discSet:
@@ -163311,6 +165868,8 @@ SLPS-01770:
     linkCable: false
 SLPM-80344:
   name: "Tales of Phantasia (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01547:
   name: "Tall - Infinity (USA)"
   compatibility:
@@ -163516,6 +166075,8 @@ SLPS-02261:
     linkCable: false
 SLED-01942:
   name: "Tank Racer (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01248:
   name: "Tank Racer (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -164090,7 +166651,7 @@ SLPS-00565:
     publisher: "Tecmo"
     developer: "Tecmo"
     releaseDate: "1996-11-08"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - Japanese
     minPlayers: 1
@@ -164108,7 +166669,7 @@ SLUS-00070:
     publisher: "Tecmo"
     developer: "Tecmo"
     releaseDate: "1996-08-10"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -164126,7 +166687,7 @@ SLUS-00299:
     publisher: "Tecmo"
     developer: "Seta Corporation"
     releaseDate: "1996-06-01"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -164399,10 +166960,14 @@ SCES-01237:
     linkCable: false
 SCED-01146:
   name: "Tekken 3 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableAutoAnalogMode # Analog sticks do nothing.
 SCED-01384:
   name: "Tekken 3 (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableAutoAnalogMode # Analog sticks do nothing.
 SLPS-91202:
@@ -164510,7 +167075,7 @@ SLES-02131:
     publisher: "Ubisoft"
     developer: "Gremlin Interactive"
     releaseDate: "1999-09-30"
-    genre: "Soccer Manager / Strategy"
+    genre: "Sports - Soccer Manager / Strategy"
     languages:
       - French
     minPlayers: 1
@@ -164589,7 +167154,7 @@ SLES-00534:
     publisher: "American Softworks"
     developer: "Adrenalin Entertainment"
     releaseDate: "1997-06-10"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -164607,7 +167172,7 @@ SLUS-00377:
     publisher: "ASC Games"
     developer: "Adrenalin Entertainment"
     releaseDate: "1996-11-15"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -164744,6 +167309,8 @@ SLES-01374:
     linkCable: false
 SLED-01467:
   name: "Tenchu - Stealth Assassins (Europe) (En,Fr,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00706:
   name: "Tenchu - Stealth Assassins (USA)"
   compatibility:
@@ -165025,7 +167592,7 @@ SLUS-01348:
     publisher: "A1 Games"
     developer: "Nekogumi (Jorudan)"
     releaseDate: "2001-08-28"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -165043,7 +167610,7 @@ SLES-00935:
     publisher: "Ubi Soft"
     developer: "Smart Dog"
     releaseDate: "1997-11-05"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
       - French
@@ -165065,7 +167632,7 @@ SLPS-01303:
     publisher: "Ubi Soft"
     developer: "Smart Dog"
     releaseDate: "1998-03-19"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -165083,7 +167650,7 @@ SLUS-00596:
     publisher: "Ubi Soft"
     developer: "Smart Dog"
     releaseDate: "1998-02-28"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -165659,7 +168226,7 @@ SCES-02179:
     publisher: "Sony / Disney Interactive"
     developer: "Capcom"
     releaseDate: "1999-11-26"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - Danish
     minPlayers: 1
@@ -165677,7 +168244,7 @@ SLES-00442:
     publisher: "JVC Digital Studios"
     developer: "Natsume"
     releaseDate: "1997-10-18"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - English
     minPlayers: 1
@@ -165698,7 +168265,7 @@ SLPS-00466:
     publisher: "Jaleco Entertaiment"
     developer: "Natsume"
     releaseDate: "1998-11-26"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - Japanese
     minPlayers: 1
@@ -165719,7 +168286,7 @@ SLUS-00338:
     publisher: "Jaleco Entertainment"
     developer: "Natsume"
     releaseDate: "1996-10-18"
-    genre: "Puzzle"
+    genre: "Puzzle / Tetris"
     languages:
       - English
     minPlayers: 1
@@ -166101,7 +168668,7 @@ SLPS-02632:
     publisher: "Naxat Soft"
     developer: "Naxat Soft"
     releaseDate: "2000-02-24"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -166120,7 +168687,7 @@ SLPS-03104:
     publisher: "Naxat Soft"
     developer: "Naxat Soft"
     releaseDate: "2000-12-21"
-    genre: "Mahjong."
+    genre: "Mahjong"
     languages:
       - Japanese
     minPlayers: 1
@@ -166395,7 +168962,7 @@ SCES-01700:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "London Studio"
     releaseDate: "1999-12-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -166415,7 +168982,7 @@ SCES-01882:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "London Studio"
     releaseDate: "1999-12-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - French
@@ -166436,7 +169003,7 @@ SCES-01703:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "London Studio"
     releaseDate: "1999-12-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -166455,7 +169022,7 @@ SCES-03236:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "Sony Studio Soho"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -166467,6 +169034,8 @@ SCES-03236:
     linkCable: false
 SCED-03237:
   name: "This Is Football 2 (Belgium) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-03070:
   name: "This Is Football 2 (Europe)"
   compatibility:
@@ -166478,7 +169047,7 @@ SCES-03070:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "Sony Studio Soho"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -166497,7 +169066,7 @@ SCES-03075:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "Sony Studio Soho"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -166509,6 +169078,8 @@ SCES-03075:
     linkCable: false
 SCED-03204:
   name: "This Is Football 2 (Italy) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-03072:
   name: "This Is Football 2 (Netherlands)"
   controllers:
@@ -166518,7 +169089,7 @@ SCES-03072:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "Sony Studio Soho"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
     minPlayers: 1
@@ -166530,8 +169101,12 @@ SCES-03072:
     linkCable: false
 SCED-03201:
   name: "This Is Football 2 (Netherlands) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03199:
   name: "This Is Football 2 (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-02269:
   name: "This Is Soccer (Australia)"
   controllers:
@@ -166541,7 +169116,7 @@ SCES-02269:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "London Studio"
     releaseDate: "1999-12-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -166560,7 +169135,7 @@ SCES-03071:
     publisher: "Sony Computer Entertaiment Europe"
     developer: "Sony Studio Soho"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -166572,6 +169147,8 @@ SCES-03071:
     linkCable: false
 SCED-03200:
   name: "This Is Soccer 2 (Australia) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01324:
   name: "Thoroughbred Breeder - Sekai Seiha-hen (Japan)"
   controllers:
@@ -166592,6 +169169,8 @@ SLPS-01324:
     linkCable: false
 SLPM-80231:
   name: "Thoroughbred Breeder - Sekai Seiha-hen (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00053:
   name: "Thoroughbred Breeder II Plus (Japan)"
   controllers:
@@ -166678,6 +169257,8 @@ SLPS-01781:
     linkCable: false
 SLUS-90059:
   name: "Thousand Arms (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00845:
   name: "Thousand Arms (USA) (Disc 1)"
   discSet:
@@ -166741,7 +169322,7 @@ SLPS-02589:
     publisher: "UEP Systems"
     developer: "Z-Axis"
     releaseDate: "2000-03-04"
-    genre: "Sports / Skateboard"
+    genre: "Sports - Skateboard"
     languages:
       - Japanese
     minPlayers: 1
@@ -166760,7 +169341,7 @@ SLES-02556:
     publisher: "Take 2"
     developer: "Z-Axis"
     releaseDate: "1999-10-31"
-    genre: "Sports / Skateboard"
+    genre: "Sports - Skateboard"
     languages:
       - English
     minPlayers: 1
@@ -166779,7 +169360,7 @@ SLES-02340:
     publisher: "Take 2"
     developer: "Z-Axis"
     releaseDate: "1999-10-31"
-    genre: "Sports / Skateboard"
+    genre: "Sports - Skateboard"
     languages:
       - English
       - French
@@ -166802,7 +169383,7 @@ SLUS-00935:
     publisher: "Rockstar Games"
     developer: "Z-Axis"
     releaseDate: "1999-12-15"
-    genre: "Sports / Skateboard"
+    genre: "Sports - Skateboard"
     languages:
       - English
     minPlayers: 1
@@ -166814,6 +169395,8 @@ SLUS-00935:
     linkCable: false
 SLUS-90067:
   name: "Thrasher - Skate and Destroy (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01019:
   name: "Threads of Fate (USA)"
   compatibility:
@@ -166843,11 +169426,23 @@ LSP-903174:
   codes:
     - LSP-903174
     - LSP-90317401
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-903181:
   name: "Three Decoders 2, The - Key to the Carousel (USA)"
   codes:
     - LSP-903181
     - LSP-90318101
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLES-00876:
   name: "Three Lions (UK) (En,Fr,De,Es,It)"
   controllers:
@@ -166857,7 +169452,7 @@ SLES-00876:
     publisher: "BMG Interactive"
     developer: "Z-Axis, Ltd"
     releaseDate: "1998-04-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -166883,7 +169478,7 @@ SLUS-01486:
     publisher: "Metro3D, Inc"
     developer: "Cinemaware Corporation"
     releaseDate: "2004-02-07"
-    genre: "Mini Games."
+    genre: "Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -167054,7 +169649,7 @@ SLES-01674:
     publisher: "Electronic Arts"
     developer: "Adrenalin Entertainment"
     releaseDate: "1998-11-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
       - French
@@ -167077,7 +169672,7 @@ SLPS-02012:
     publisher: "Electronic Arts Square"
     developer: "Adrenalin Entertainment"
     releaseDate: "1999-04-08"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -167099,7 +169694,7 @@ SLUS-00785:
     publisher: "Electronic Arts"
     developer: "Adrenalin Entertainment"
     releaseDate: "1998-10-31"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -167111,6 +169706,22 @@ SLUS-00785:
     linkCable: false
 SLES-01675:
   name: "Tiger Woods 99 USA Tour Golf (Australia)"
+  controllers:
+    - AnalogController
+    - DigitalController
+  metadata:
+    publisher: "Electronic Arts"
+    developer: "Adrenalin Entertainment"
+    genre: "Sports - Golf"
+    languages:
+      - English
+    minPlayers: 1
+    maxPlayers: 4
+    minBlocks: 2
+    maxBlocks: 2
+    vibration: false
+    multitap: true
+    linkCable: false
 SLES-02551:
   name: "Tiger Woods PGA Tour 2000 (Europe) (En,Fr,De,Es,Sv)"
   controllers:
@@ -167120,7 +169731,7 @@ SLES-02551:
     publisher: "Electronic Arts"
     developer: "EA Redwood Shores"
     releaseDate: "2000-01-30"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
       - French
@@ -167143,7 +169754,7 @@ SLUS-01054:
     publisher: "Electronic Arts"
     developer: "EA Redwood Shores"
     releaseDate: "2000-01-18"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -167162,7 +169773,7 @@ SLES-03148:
     publisher: "Electronic Arts"
     developer: "Stormfront Studios"
     releaseDate: "2000-12-08"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -167181,7 +169792,7 @@ SLUS-01273:
     publisher: "Electronic Arts"
     developer: "Stormfront Studios"
     releaseDate: "2000-11-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -167200,7 +169811,7 @@ SLES-02595:
     publisher: "Electronic Arts"
     developer: "EA Redwood Shores"
     releaseDate: "2000-01-30"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -167219,7 +169830,7 @@ SLES-03337:
     publisher: "Electronic Arts"
     developer: "Stormfront Studios"
     releaseDate: "2000-12-08"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -167415,6 +170026,21 @@ SLPM-80064:
   name: "Time Bokan Series - Bokan to Ippatsu! Doronboo (Japan) (Taikenban)"
 SLES-00488:
   name: "Time Commando (Australia)"
+  controllers:
+    - DigitalController
+  metadata:
+    publisher: "Activision"
+    developer: "Adeline Software International"
+    genre: "Action / Beat'em Up"
+    languages:
+      - English
+    minPlayers: 1
+    maxPlayers: 1
+    minBlocks: 1
+    maxBlocks: 1
+    vibration: false
+    multitap: false
+    linkCable: false
 SLES-00224:
   name: "Time Commando (Europe)"
   controllers:
@@ -167423,7 +170049,7 @@ SLES-00224:
     publisher: "Electronic Arts"
     developer: "Adeline Software International"
     releaseDate: "1996-09-15"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -167441,7 +170067,7 @@ SLPS-00556:
     publisher: "Virgin Interactive"
     developer: "Adeline Software International"
     releaseDate: "1996-11-15"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -167459,7 +170085,7 @@ SLUS-00342:
     publisher: "Activision"
     developer: "Adeline Software International"
     releaseDate: "1996-09-30"
-    genre: "Action / Beat'em up"
+    genre: "Action / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -167722,45 +170348,101 @@ LSP-907387:
   name: "Timeless Jade Trade (USA)"
   codes:
     - LSP-907387
+    - LSP90738700
     - LSP-90738701
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-040110:
   name: "Timeless Math 1 - Maya, Search and Rescue (USA)"
   codes:
     - LSP-040110
+    - LSP04011001
     - LSP-907318
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-040130:
   name: "Timeless Math 2 - Maya, Observatory (USA)"
   codes:
     - LSP-040130
+    - LSP04013001
     - LSP-04013001
     - LSP-907325
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-040120:
   name: "Timeless Math 3 - Maya, King Jaguar's Village (USA)"
   codes:
     - LSP-040120
+    - LSP04012001
     - LSP-04012001
     - LSP-907332
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-040410:
   name: "Timeless Math 4 - Lunar Base (USA)"
   codes:
     - LSP-040410
+    - LSP04041001
     - LSP-04041001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-040510:
   name: "Timeless Math 5 - Space Flight Rescue (USA)"
   codes:
     - LSP-040510
+    - LSP04051001
     - LSP-04051001
     - LSP-907356
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-907363:
   name: "Timeless Math 6 - Brainswarm (USA)"
   codes:
     - LSP-907363
+    - LSP90736300
     - LSP-90736300
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-907370:
   name: "Timeless Math 7 - Rover Recovery (USA)"
   codes:
     - LSP-907370
+    - LSP90737000
     - LSP-90737001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLES-03459:
   name: "Tintin - Destination Adventure (Europe) (En,Fr,De,Es,It,Nl,Pt)"
   controllers:
@@ -168149,6 +170831,8 @@ SLES-02926:
     linkCable: false
 SLUS-90082:
   name: "Titan A.E. (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00275:
   name: "Titan Wars (Europe)"
   controllers:
@@ -168235,6 +170919,8 @@ SLPS-00620:
     linkCable: false
 SLPM-80059:
   name: "ToPoLo (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00436:
   name: "Toaplan Shooting Battle 1 (Japan)"
   compatibility:
@@ -169180,6 +171866,8 @@ SLPM-86039:
     linkCable: false
 SLPM-80123:
   name: "Tokimeki Memorial Drama Series Vol. 1 - Nijiiro no Seishun (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86070:
   name: "Tokimeki Memorial Drama Series Vol. 2 - Irodori no Love Song (Japan) (Disc 1)"
   discSet:
@@ -169650,6 +172338,8 @@ SLUS-00229:
     linkCable: false
 SLPM-80622:
   name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-03333:
   name: "Tokyo Majin Gakuen - Gehouchou (Japan) (Disc 1) (You)"
   discSet:
@@ -169954,6 +172644,8 @@ SLPM-87178:
     linkCable: false
 SLPM-80021:
   name: "Tokyo Shadow (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00285:
   name: "Tokyo Shadow (Japan) (Disc 1)"
   discSet:
@@ -170166,7 +172858,7 @@ SLES-03888:
     publisher: "Ubisoft Entertainment"
     developer: "Rebellion"
     releaseDate: "2002-07-05"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - English
       - French
@@ -170189,7 +172881,7 @@ SLUS-01473:
     publisher: "Ubisoft Entertainment"
     developer: "Rebellion"
     releaseDate: "2002-08-22"
-    genre: "First person shooter"
+    genre: "First Person Shooter"
     languages:
       - English
     minPlayers: 1
@@ -170304,6 +172996,8 @@ SLUS-01191:
     linkCable: false
 SLED-00513:
   name: "Tomb Raider & Blam! Machinehead (France)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00024:
   name: "Tomb Raider (Europe)"
   compatibility:
@@ -170327,6 +173021,8 @@ SLES-00024:
     linkCable: false
 SLED-00571:
   name: "Tomb Raider (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00485:
   name: "Tomb Raider (France)"
   compatibility:
@@ -170468,6 +173164,8 @@ SLES-02238:
     linkCable: false
 SLED-02418:
   name: "Tomb Raider - The Last Revelation (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02241:
   name: "Tomb Raider - The Last Revelation (Italy)"
   controllers:
@@ -170552,6 +173250,8 @@ SLPS-01200:
     linkCable: false
 SLPM-80168:
   name: "Tomb Raider 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03331:
   name: "Tomb Raider Chronicles (Europe)"
   controllers:
@@ -170669,6 +173369,8 @@ SLES-00719:
     linkCable: false
 SLED-01036:
   name: "Tomb Raider II - Starring Lara Croft (France) (En,Fr,De) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00720:
   name: "Tomb Raider II - Starring Lara Croft (Germany)"
   controllers:
@@ -170837,6 +173539,8 @@ SLES-01684:
     linkCable: false
 SLPM-80385:
   name: "Tomb Raider III - Adventures of Lara Croft (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86196:
   name: "Tomb Raider III - Adventures of Lara Croft (Japan) (Disc 1) (Japanese Version)"
   discSet:
@@ -170949,6 +173653,8 @@ SLES-01682:
     linkCable: false
 SLED-01709:
   name: "Tomb Raider III - Les Aventures de Lara Croft (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02240:
   name: "Tomb Raider IV - The Last Revelation (Germany)"
   controllers:
@@ -170992,6 +173698,8 @@ SLPM-86896:
     linkCable: false
 SLED-01623:
   name: "Tomb Raider Trilogy - Demo Disc (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-87160:
   name: "Tomb Raider V - Chronicles (Capkore)"
   controllers:
@@ -171076,6 +173784,8 @@ SCUS-94236:
     linkCable: false
 SCUS-94255:
   name: "Tomba! (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94454:
   name: "Tomba! 2 - The Evil Swine Return (USA)"
   compatibility:
@@ -171100,6 +173810,8 @@ SCUS-94454:
     linkCable: false
 SCUS-94464:
   name: "Tomba! 2 - The Evil Swine Return (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02350:
   name: "Tomba! The Wild Adventures (Japan)"
   controllers:
@@ -171127,6 +173839,8 @@ SLPS-02350:
     linkCable: false
 PAPX-90096:
   name: "Tomba! The Wild Adventures (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   codes:
     - PAPX-90096
     - SLPM-80476
@@ -171316,6 +174030,8 @@ SLES-01228:
     linkCable: false
 SLED-01329:
   name: "Tommi Maekinen Rally (Europe) (En,Fr,De,Es,Fi) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01235:
   name: "Tommi Maekinen Rally (Italy)"
   controllers:
@@ -171338,8 +174054,12 @@ SLES-01235:
     linkCable: false
 PCPX-96105:
   name: "Tomoyasu Hotei - Stolen Song (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96112:
   name: "Tomoyasu Hotei - Stolen Song (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-18009:
   name: "Tomoyasu Hotei - Stolen Song (Japan) (Disc 1)"
   discSet:
@@ -171472,6 +174192,8 @@ SLPS-02113:
     linkCable: false
 SLPM-80435:
   name: "Tondemo Crisis! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-01007:
   name: "Tonka Space Station (USA)"
   controllers:
@@ -171505,7 +174227,7 @@ SLPM-86429:
     publisher: "Success"
     developer: "Neversoft Entertainment"
     releaseDate: "2001-11-29"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -171529,7 +174251,7 @@ SLUS-00860:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
     releaseDate: "1999-09-28"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -171541,10 +174263,14 @@ SLUS-00860:
     linkCable: false
 SLED-02879:
   name: "Tony Hawk's Pro Skater 2 (Australia) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForceRecompilerLUTFastmem
 SLED-03048:
   name: "Tony Hawk's Pro Skater 2 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForceRecompilerLUTFastmem
 SLES-02908:
@@ -171558,7 +174284,7 @@ SLES-02908:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
     releaseDate: "2000-09-29"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -171579,7 +174305,7 @@ SLES-02909:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
     releaseDate: "2000-09-29"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - French
     minPlayers: 1
@@ -171600,7 +174326,7 @@ SLES-02910:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
     releaseDate: "2000-09-29"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - German
     minPlayers: 1
@@ -171621,7 +174347,7 @@ SLPM-86751:
     publisher: "Success"
     developer: "Neversoft Entertainment"
     releaseDate: "2001-03-08"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -171645,7 +174371,7 @@ SLUS-01066:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
     releaseDate: "2000-09-02"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -171657,6 +174383,8 @@ SLUS-01066:
     linkCable: false
 SLUS-90086:
   name: "Tony Hawk's Pro Skater 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForceRecompilerLUTFastmem
 SLES-03645:
@@ -171670,7 +174398,7 @@ SLES-03645:
     publisher: "Activision"
     developer: "Shaba Games"
     releaseDate: "2001-11-23"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -171691,7 +174419,7 @@ SLES-03646:
     publisher: "Activision"
     developer: "Shaba Games"
     releaseDate: "2001-11-23"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - French
     minPlayers: 1
@@ -171712,7 +174440,7 @@ SLES-03647:
     publisher: "Activision"
     developer: "Shaba Games"
     releaseDate: "2001-11-23"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - German
     minPlayers: 1
@@ -171736,7 +174464,7 @@ SLUS-01419:
     publisher: "Activision"
     developer: "Shaba Games"
     releaseDate: "2001-10-29"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -171757,7 +174485,7 @@ SLES-03954:
     publisher: "Activision"
     developer: "Vicarious Visions"
     releaseDate: "2002-11-15"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -171778,7 +174506,7 @@ SLES-03956:
     publisher: "Activision"
     developer: "Vicarious Visions"
     releaseDate: "2002-11-15"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - French
     minPlayers: 1
@@ -171799,7 +174527,7 @@ SLES-03955:
     publisher: "Activision"
     developer: "Vicarious Visions"
     releaseDate: "2002-11-15"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - German
     minPlayers: 1
@@ -171823,7 +174551,7 @@ SLUS-01485:
     publisher: "Activision"
     developer: "Vicarious Visions"
     releaseDate: "2002-10-23"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -171842,7 +174570,7 @@ SLES-02055:
     publisher: "Activision"
     developer: "Neversoft Entertainment"
     releaseDate: "1999-10-01"
-    genre: "Sports / Skateboarding"
+    genre: "Sports - Skateboarding"
     languages:
       - English
     minPlayers: 1
@@ -171854,6 +174582,8 @@ SLES-02055:
     linkCable: false
 SLED-02054:
   name: "Tony Hawk's Skateboarding (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00430:
   name: "Tonzura-kun (Japan)"
   controllers:
@@ -172008,6 +174738,8 @@ SLES-02493:
     linkCable: false
 SLED-02023:
   name: "Total Activision Demo (France)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00307:
   name: "Total Drivin (Europe) (En,Fr,De,Es,It,Pt)"
   controllers:
@@ -172093,7 +174825,7 @@ SCES-00067:
     publisher: "Sony Computer Entertainment"
     developer: "Team SOHO"
     releaseDate: "1996-03-20"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -172111,7 +174843,7 @@ SIPS-60008:
     publisher: "Sony Computer Entertainment"
     developer: "Team SOHO"
     releaseDate: "1996-07-05"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -172129,7 +174861,7 @@ SCES-00623:
     publisher: "Sony Computer Entertainment"
     developer: "Team SOHO"
     releaseDate: "1997-03-20"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -172147,7 +174879,7 @@ SIPS-60015:
     publisher: "Sony Computer Entertainment"
     developer: "Team SOHO"
     releaseDate: "1997-06-27"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - Japanese
     minPlayers: 1
@@ -172165,7 +174897,7 @@ SCES-01079:
     publisher: "Sony Computer Entertainment"
     developer: "Sony Interactive Studios America"
     releaseDate: "1998-05-15"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -172257,6 +174989,8 @@ SLPS-02361:
     linkCable: false
 SLPM-80474:
   name: "Touge Max G (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00187:
   name: "Touhaiden Akagi (Japan)"
   controllers:
@@ -172358,7 +175092,7 @@ SLPS-00445:
     publisher: "Victor Interactive Software"
     developer: "Core Design"
     releaseDate: "1996-08-23"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -172414,6 +175148,8 @@ SLPS-01113:
     linkCable: false
 SLPM-80001:
   name: "Toushinden Otanoshimi-Ban (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02022:
   name: "Toushinden Subaru (Japan)"
 SLPS-01789:
@@ -172532,12 +175268,20 @@ SLPS-01704:
     linkCable: false
 SCUS-94397:
   name: "Toys R Us - Attack of the Killer Demos! (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94371:
   name: "Toys R Us - Interactive CD Sampler Disc (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94266:
   name: "Toys R Us Demo Disc (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94611:
   name: "Toys R Us Summer Demo Disc (USA)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94190:
   name: "Toys R Us Test Drive Promotion (USA)"
 SLPS-01076:
@@ -172864,7 +175608,7 @@ SLES-02304:
     publisher: "Virgin Interactive"
     developer: "Cave"
     releaseDate: "2000-12-29"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -172883,7 +175627,7 @@ SLUS-00979:
     publisher: "Capcom"
     developer: "Cave"
     releaseDate: "1999-10-19"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -172902,7 +175646,7 @@ SLES-04062:
     publisher: "Phoenix Games"
     developer: "Selen / Prosoft"
     releaseDate: "2003-03-14"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -172921,7 +175665,7 @@ SLPS-01860:
     publisher: "Capcom"
     developer: "Cave"
     releaseDate: "1999-02-04"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -172940,7 +175684,7 @@ SLUS-00827:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1999-03-24"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -172959,7 +175703,7 @@ SLUS-01082:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "2000-03-14"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -172977,7 +175721,7 @@ SLPS-00682:
     publisher: "Electronic Arts Victor"
     developer: "EA Sports"
     releaseDate: "1997-01-17"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -172995,7 +175739,7 @@ SLUS-00237:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1996-10-05"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -173016,7 +175760,7 @@ SLPS-00887:
     publisher: "Electronic Arts Victor"
     developer: "EA Sports"
     releaseDate: "1997-09-25"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -173034,7 +175778,7 @@ SLUS-00465:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1997-04-30"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -173052,7 +175796,7 @@ SLPS-01621:
     publisher: "Electronic Arts Victor"
     developer: "EA Sports"
     releaseDate: "1998-11-12"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -173070,7 +175814,7 @@ SLUS-00618:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1998-03-10"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
       - Spanish
@@ -173090,7 +175834,7 @@ SLUS-01345:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "2001-02-27"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -173109,7 +175853,7 @@ SLES-01791:
     publisher: "EA Sports"
     developer: "EA Sports"
     releaseDate: "1999-05-07"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -173534,7 +176278,7 @@ SLPS-00440:
     publisher: "Shogakukan"
     developer: "Shogakukan"
     releaseDate: "1996-09-13"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -173553,7 +176297,7 @@ SLPS-01752:
     publisher: "OZ Club"
     developer: "Vingt et un Systems"
     releaseDate: "1999-01-28"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -173572,7 +176316,7 @@ SLPS-02676:
     publisher: "OZ Club"
     developer: "Vingt et un Systems"
     releaseDate: "2000-06-29"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -173591,7 +176335,7 @@ SLPS-01139:
     publisher: "OZ Club (Escot)"
     developer: "Vingt et un Systems"
     releaseDate: "1997-12-11"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -173610,7 +176354,7 @@ SLPS-91125:
     publisher: "OZ Club (Escot)"
     developer: "Vingt et un Systems"
     releaseDate: "1999-03-25"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -173704,6 +176448,8 @@ SLUS-00188:
     linkCable: false
 SLED-00514:
   name: "Tunnel B1 + X2 - No Relief + Break Point + Cheesy (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCUS-94229:
   name: "Turbo Prop Racing (USA)"
   controllers:
@@ -173801,6 +176547,8 @@ SLES-03412:
     linkCable: false
 SLPM-80042:
   name: "Twilight Syndrome (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00405:
   name: "Twilight Syndrome - Kyuumei-hen (Japan)"
   controllers:
@@ -174152,6 +176900,8 @@ SCUS-94560:
     linkCable: false
 SCUS-94389:
   name: "Twisted Metal 4 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SIPS-60021:
   name: "Twisted Metal EX - World Tour (Japan)"
   controllers:
@@ -174193,8 +176943,12 @@ SCUS-94249:
     linkCable: false
 SCUS-94378:
   name: "Twisted Metal III (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02540:
   name: "Two Product Psygnosis Demo (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00131:
   name: "Two-Ten Kaku (Japan)"
   compatibility:
@@ -174237,6 +176991,8 @@ SLUS-01074:
     linkCable: false
 SLUS-90085:
   name: "Tyco R-C - Assault with a Battery (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02693:
   name: "U-SA (Japan)"
   controllers:
@@ -174301,7 +177057,7 @@ SLES-02806:
     publisher: "Infogrames"
     developer: "Infogrames"
     releaseDate: "2001-04-13"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -174323,7 +177079,7 @@ SLES-02807:
     publisher: "Infogrames"
     developer: "Infogrames"
     releaseDate: "2001-04-13"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
       - Italian
@@ -174345,7 +177101,7 @@ SLES-01744:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1999-03-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -174364,7 +177120,7 @@ SLES-01745:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1999-03-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -174383,7 +177139,7 @@ SLES-01622:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1999-03-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -174405,7 +177161,7 @@ SLES-02577:
     publisher: "Eidos"
     developer: "Silicon Dreams"
     releaseDate: "2000-03-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -174424,7 +177180,7 @@ SLES-02578:
     publisher: "Eidos"
     developer: "Silicon Dreams"
     releaseDate: "2000-03-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -174443,7 +177199,7 @@ SLES-02579:
     publisher: "Eidos"
     developer: "Silicon Dreams"
     releaseDate: "2000-03-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -174462,7 +177218,7 @@ SLES-02580:
     publisher: "Eidos"
     developer: "Silicon Dreams"
     releaseDate: "2000-03-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -174481,7 +177237,7 @@ SLES-02581:
     publisher: "Eidos"
     developer: "Silicon Dreams"
     releaseDate: "2000-03-24"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -174500,7 +177256,7 @@ SLES-03262:
     publisher: "Take Two"
     developer: "Silicon Dreams"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -174519,7 +177275,7 @@ SLES-03280:
     publisher: "Take Two"
     developer: "Silicon Dreams"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -174538,7 +177294,7 @@ SLES-03281:
     publisher: "Take Two"
     developer: "Silicon Dreams"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -174557,7 +177313,7 @@ SLES-03282:
     publisher: "Take Two"
     developer: "Silicon Dreams"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -174576,7 +177332,7 @@ SLES-03283:
     publisher: "Take Two"
     developer: "Silicon Dreams"
     releaseDate: "2000-11-03"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -174595,7 +177351,7 @@ SLES-01746:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1999-03-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -174614,7 +177370,7 @@ SLES-01747:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1999-03-26"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -174634,7 +177390,7 @@ SLES-02704:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-04-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -174654,7 +177410,7 @@ SLES-02705:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-04-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -174674,7 +177430,7 @@ SLES-02706:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-04-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -174694,7 +177450,7 @@ SLES-02707:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-04-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -174714,7 +177470,7 @@ SLES-02708:
     publisher: "Electronic Arts"
     developer: "EA Sports"
     releaseDate: "2000-04-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Spanish
     minPlayers: 1
@@ -174734,7 +177490,7 @@ SLES-01733:
     publisher: "Infogrames"
     developer: "Rage Software"
     releaseDate: "1999-10-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Dutch
       - English
@@ -174915,7 +177671,7 @@ SLPS-00236:
     publisher: "Astec21"
     developer: "Astec21"
     releaseDate: "1996-03-22"
-    genre: "Board / Mini games"
+    genre: "Board / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -175057,7 +177813,7 @@ SLPS-02579:
     publisher: "Teichiku Records"
     developer: "Teichiku Records"
     releaseDate: "2000-02-17"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -175076,7 +177832,7 @@ SLPS-01521:
     publisher: "Teichiku Records"
     developer: "Teichiku Records"
     releaseDate: "1998-08-06"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -175094,7 +177850,7 @@ SLPS-00983:
     publisher: "Teichiku"
     developer: "Teichiku"
     releaseDate: "1997-09-11"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -175113,7 +177869,7 @@ SLPS-01571:
     publisher: "Teichiku"
     developer: "Teichiku"
     releaseDate: "1998-09-10"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -175150,7 +177906,7 @@ SLUS-00864:
     publisher: "THQ"
     developer: "Mirage Interactive"
     releaseDate: "1999-05-31"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -175241,6 +177997,8 @@ SLUS-01143:
     linkCable: false
 SLUS-81143:
   name: "Ultimate Fighting Championship (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01248:
   name: "Ultraman - Fighting Evolution (Japan)"
   compatibility:
@@ -175267,6 +178025,8 @@ SLPS-01248:
     linkCable: false
 SLPM-80218:
   name: "Ultraman - Fighting Evolution (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01455:
   name: "Ultraman Tiga & Ultraman Dyna - Aratanaru Futatsu no Hikari (Japan)"
   controllers:
@@ -175394,6 +178154,8 @@ SCUS-94448:
     linkCable: false
 SCUS-94398:
   name: "Um Jammer Lammy (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-91325:
   name: "Um Jammer Lammy [PSOne Books]"
   controllers:
@@ -175441,7 +178203,7 @@ SLPS-01767:
     publisher: "Daiki"
     developer: "Daiki"
     releaseDate: "1998-12-17"
-    genre: "Board / Igo."
+    genre: "Board / Igo"
     languages:
       - Japanese
     minPlayers: 1
@@ -175498,7 +178260,7 @@ SLPS-01623:
     publisher: "Victor Interactive Software"
     developer: "Progress"
     releaseDate: "1998-10-29"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -175510,6 +178272,8 @@ SLPS-01623:
     linkCable: false
 SLPM-80322:
   name: "Umi no Oh! Yah! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00643:
   name: "Umihara Kawase Shun (Japan)"
   compatibility:
@@ -175590,6 +178354,8 @@ SLPS-03380:
     linkCable: false
 SLED-01557:
   name: "Unholy War, The (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01300:
   name: "Unholy War, The (Europe) (En,Fr,De,Es,It)"
   compatibility:
@@ -175637,6 +178403,8 @@ SLUS-00676:
     linkCable: false
 SLUS-90030:
   name: "Unholy War, The (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-01225:
   name: "Universal Nuts (Japan)"
   controllers:
@@ -175677,15 +178445,25 @@ SLPS-00101:
     linkCable: false
 LSP-909015:
   name: "Unknown Variable 1 - Masque Manor (USA)"
+  codes:
+    - LSP909015
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-909022:
   name: "Unknown Variable 2 - Raven's Ridge (USA)"
   controllers:
     - DigitalController
+  codes:
+    - LSP909022
   metadata:
     publisher: "Lightspan"
     developer: "Lightspan"
     releaseDate: "1997-01-01"
-    genre: "Interactive Movie / Educational"
+    genre: "Educational"
     languages:
       - English
     minPlayers: 1
@@ -175797,7 +178575,7 @@ SLUS-00686:
     publisher: "3DO"
     developer: "Cyclone"
     releaseDate: "1998-12-15"
-    genre: "Action / Strategy / First person shooter"
+    genre: "Action / Strategy / First Person Shooter"
     languages:
       - English
     minPlayers: 1
@@ -175994,7 +178772,7 @@ SLES-02071:
     publisher: "Proein Software / Eidos Interactive"
     developer: "Mucky Foot"
     releaseDate: "2000-04-15"
-    genre: "Action / Driving / Shooter / Beat'em up"
+    genre: "Action / Driving / Shooter / Beat'em Up"
     languages:
       - English
       - Italian
@@ -176016,7 +178794,7 @@ SLES-02354:
     publisher: "Eidos Interactive"
     developer: "Mucky Foot"
     releaseDate: "2000-04-15"
-    genre: "Action / Driving / Shooter / Beat'em up"
+    genre: "Action / Driving / Shooter / Beat'em Up"
     languages:
       - French
     minPlayers: 1
@@ -176036,7 +178814,7 @@ SLES-02355:
     publisher: "Eidos Interactive"
     developer: "Mucky Foot"
     releaseDate: "2000-04-15"
-    genre: "Action / Driving / Shooter / Beat'em up"
+    genre: "Action / Driving / Shooter / Beat'em Up"
     languages:
       - German
     minPlayers: 1
@@ -176057,7 +178835,7 @@ SLUS-01091:
     publisher: "Eidos Interactive"
     developer: "Mucky Foot"
     releaseDate: "2000-03-31"
-    genre: "Action / Driving / Shooter / Beat'em up"
+    genre: "Action / Driving / Shooter / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -176116,7 +178894,7 @@ SLES-00846:
     publisher: "Funsoft"
     developer: "American Technos / Avit"
     releaseDate: "1998-08-01"
-    genre: "Sports / Beach Volley"
+    genre: "Sports - Beach Volley"
     languages:
       - English
     minPlayers: 1
@@ -176177,6 +178955,8 @@ SLPS-01149:
     linkCable: false
 SLED-02124:
   name: "V-Rally - Championship Edition 2 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01907:
   name: "V-Rally - Championship Edition 2 (Europe) (En,Fr,De)"
   compatibility:
@@ -176254,7 +179034,7 @@ SLES-00285:
     publisher: "Acclaim"
     developer: "Tonkin House"
     releaseDate: "1997-06-15"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -176272,7 +179052,7 @@ SLPS-00103:
     publisher: "Tonkin House"
     developer: "Tonkin House"
     releaseDate: "1995-09-22"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -176290,7 +179070,7 @@ SLUS-00218:
     publisher: "Acclaim"
     developer: "Tonkin House"
     releaseDate: "1997-06-01"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -176308,7 +179088,7 @@ SLPS-00469:
     publisher: "Tonkin House (Tokyo Shoseki)"
     developer: "Tonkin House (Tokyo Shoseki)"
     releaseDate: "1996-11-29"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - Japanese
     minPlayers: 1
@@ -176388,10 +179168,16 @@ SLES-00545:
     linkCable: false
 SLED-01548:
   name: "V2000 (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00236:
   name: "VIP Demo (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00237:
   name: "VIP Demo (Germany)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00657:
   name: "VIVA Soccer"
   controllers:
@@ -176401,7 +179187,7 @@ SLUS-00657:
     publisher: "Virgin Interactive"
     developer: "Crimson"
     releaseDate: "1999-09-01"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -176459,7 +179245,7 @@ SLES-00169:
     publisher: "Interplay"
     developer: "VR Sports"
     releaseDate: "1997-09-10"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -176477,7 +179263,7 @@ SLUS-00281:
     publisher: "Interplay"
     developer: "VR Sports"
     releaseDate: "1997-10-31"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -176495,7 +179281,7 @@ SLES-01325:
     publisher: "Interplay"
     developer: "VR Sports"
     releaseDate: "1998-08-01"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -176513,7 +179299,7 @@ SLUS-00632:
     publisher: "Interplay"
     developer: "VR Sports"
     releaseDate: "1998-03-01"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - English
     minPlayers: 1
@@ -176531,7 +179317,7 @@ SLUS-00198:
     publisher: "Interplay Productions, Inc"
     developer: "Gremlin Interactive"
     releaseDate: "1996-10-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
       - French
@@ -176550,7 +179336,7 @@ SLUS-00199:
     publisher: "Interplay"
     developer: "Gremlin Interactive"
     releaseDate: "1996-10-31"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -176562,6 +179348,8 @@ SLUS-00199:
     linkCable: false
 SLED-00911:
   name: "VR Sports Powerboat Racing (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00931:
   name: "VR Sports Powerboat Racing (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -177580,6 +180368,8 @@ SCPS-10027:
     linkCable: false
 PAPX-90012:
   name: "Velldeselba Senki - Tsubasa no Kunshou (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03483:
   name: "Vem Vill Bli Miljonaer (Sweden)"
   controllers:
@@ -177739,7 +180529,7 @@ SCPS-45469:
     publisher: "Sony"
     developer: "NanaOn-Sha"
     releaseDate: "1999-12-09"
-    genre: "Music / Platform"
+    genre: "Music / Platformer"
     languages:
       - Japanese
     minPlayers: 1
@@ -177761,7 +180551,7 @@ SCES-02873:
     publisher: "Sony"
     developer: "NanaOn-Sha"
     releaseDate: "2000-09-01"
-    genre: "Music / Platform"
+    genre: "Music / Platformer"
     languages:
       - English
       - French
@@ -177791,7 +180581,7 @@ SCPS-18012:
     publisher: "Sony"
     developer: "NanaOn-Sha"
     releaseDate: "2001-11-22"
-    genre: "Music / Platform"
+    genre: "Music / Platformer"
     languages:
       - Japanese
     minPlayers: 1
@@ -177803,6 +180593,8 @@ SCPS-18012:
     linkCable: false
 PAPX-90101:
   name: "Vib-Ribbon (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02740:
   name: "Victory Boxing (Japan)"
   controllers:
@@ -177812,7 +180604,7 @@ SLPS-02740:
     publisher: "Victor Entertainment"
     developer: "Pegasus Japan"
     releaseDate: "2000-05-18"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - Japanese
     minPlayers: 1
@@ -177831,7 +180623,7 @@ SLES-01393:
     publisher: "JVC"
     developer: "Victor Interactive Software, Inc"
     releaseDate: "1998-10-01"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -177843,6 +180635,8 @@ SLES-01393:
     linkCable: false
 SLED-01529:
   name: "Victory Boxing 2 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-02727:
   name: "Victory Boxing Challenger (Europe) (En,Fr,De,Es)"
   controllers:
@@ -177852,7 +180646,7 @@ SLES-02727:
     publisher: "JVC Sports"
     developer: "Pegasus Japan"
     releaseDate: "2000-04-15"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -177870,7 +180664,7 @@ SLES-00180:
     publisher: "JVC Digital Studios"
     developer: "Victor Interactive Software"
     releaseDate: "1996-12-10"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -177889,7 +180683,7 @@ SLES-03599:
     publisher: "Virgin Interactive"
     developer: "Victor Interactive Software, Inc"
     releaseDate: "2001-10-12"
-    genre: "Sports / Boxing"
+    genre: "Sports - Boxing"
     languages:
       - English
     minPlayers: 1
@@ -177907,7 +180701,7 @@ SLPS-00372:
     publisher: "Imagineer"
     developer: "Imagineer"
     releaseDate: "1996-06-07"
-    genre: "Sports / Volleyball."
+    genre: "Sports - Volleyball"
     languages:
       - Japanese
     minPlayers: 1
@@ -178034,6 +180828,8 @@ SLES-01212:
     linkCable: false
 SLED-01250:
   name: "Vigilante 8 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01213:
   name: "Vigilante 8 (France)"
   controllers:
@@ -178119,6 +180915,8 @@ SLPS-01703:
     linkCable: false
 SLPM-80316:
   name: "Vigilante 8 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00510:
   name: "Vigilante 8 (USA)"
   compatibility:
@@ -178144,6 +180942,8 @@ SLUS-00510:
     linkCable: false
 SLUS-90022:
   name: "Vigilante 8 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02615:
   name: "Vigilante 8 - 2nd Battle (Japan)"
   controllers:
@@ -178320,7 +181120,7 @@ SLPS-02295:
     publisher: "Map Japan"
     developer: "Map Japan"
     releaseDate: "1999-10-21"
-    genre: "Gambling / Pachinko."
+    genre: "Gambling / Pachinko"
     languages:
       - Japanese
     minPlayers: 1
@@ -178376,7 +181176,7 @@ SLPS-00892:
     publisher: "Nihon Bussan"
     developer: "Adrenalin Entertainment"
     releaseDate: "1997-07-31"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - English
     minPlayers: 1
@@ -178433,7 +181233,7 @@ SLES-00264:
     publisher: "Core Design"
     developer: "Core Design"
     releaseDate: "1996-09-27"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -178463,6 +181263,8 @@ SLPS-00338:
     linkCable: false
 SLPM-80110:
   name: "Virtual Hiryuu no Ken (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03288:
   name: "Virtual Kasparov (Europe) (En,Fr,De,Es,It,Nl)"
   controllers:
@@ -178472,7 +181274,7 @@ SLES-03288:
     publisher: "Virgin Interactive"
     developer: "Titus Software"
     releaseDate: "2001-04-27"
-    genre: "Chess"
+    genre: "Board - Chess"
     languages:
       - Dutch
       - English
@@ -178496,7 +181298,7 @@ SLUS-01341:
     publisher: "Titus Software"
     developer: "Titus Software"
     releaseDate: "2001-08-15"
-    genre: "Chess"
+    genre: "Board - Chess"
     languages:
       - English
       - French
@@ -178614,7 +181416,7 @@ SLES-00234:
     publisher: "Interplay"
     developer: "Celeris, Inc"
     releaseDate: "1997-05-10"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -178633,7 +181435,7 @@ SLUS-00034:
     publisher: "Interplay"
     developer: "Celeris, Inc"
     releaseDate: "1997-02-28"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -178652,7 +181454,7 @@ SLUS-01374:
     publisher: "XS Games, LLC"
     developer: "Celeris, Inc"
     releaseDate: "2003-08-11"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - English
     minPlayers: 1
@@ -178670,7 +181472,7 @@ SLPS-00449:
     publisher: "Asmik Ace Entertainment, Inc,"
     developer: "AKI Corporation1"
     releaseDate: "1996-09-13"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -178751,7 +181553,7 @@ SLES-00761:
     publisher: "Virgin Interactive"
     developer: "Crimson"
     releaseDate: "1998-09-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -178768,6 +181570,8 @@ SLES-00761:
     linkCable: false
 SLED-01931:
   name: "Viva Football (Europe) (En,Fr,De,Es,It,Pt) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00953:
   name: "Viva Soccer (USA) (En,Fr,De,Es,It,Pt)"
   controllers:
@@ -178777,7 +181581,7 @@ SLUS-00953:
     publisher: "Virgin Interactive"
     developer: "Crimson"
     releaseDate: "1999-09-01"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -178823,7 +181627,7 @@ SLPS-00775:
     publisher: "Data East"
     developer: "Data East"
     releaseDate: "1997-04-18"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -178846,7 +181650,7 @@ SLPS-00776:
     publisher: "Data East"
     developer: "Data East"
     releaseDate: "1997-04-18"
-    genre: "Sports / Pool"
+    genre: "Sports - Pool"
     languages:
       - Japanese
     minPlayers: 1
@@ -178929,7 +181733,7 @@ SLES-01104:
     publisher: "THQ, Inc"
     developer: "PolygonMagic, Inc"
     releaseDate: "1998-06-12"
-    genre: "Fighting."
+    genre: "Fighting"
     languages:
       - English
     minPlayers: 1
@@ -178947,7 +181751,7 @@ SLUS-00513:
     publisher: "THQ, Inc"
     developer: "PolygonMagic, Inc"
     releaseDate: "1997-11-30"
-    genre: "Fighting."
+    genre: "Fighting"
     languages:
       - English
     minPlayers: 1
@@ -178965,7 +181769,7 @@ SLES-03168:
     publisher: "Electronic Arts"
     developer: "Kodiak Interactive Software Studios"
     releaseDate: "2000-11-24"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -178983,7 +181787,7 @@ SLUS-01274:
     publisher: "Electronic Arts"
     developer: "Kodiak Interactive Software Studios"
     releaseDate: "2000-10-31"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179002,7 +181806,7 @@ SLES-02193:
     publisher: "Electronic Arts"
     developer: "Kodiak Interactive Software Studios"
     releaseDate: "1999-12-22"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179021,7 +181825,7 @@ SLUS-00963:
     publisher: "Electronic Arts"
     developer: "Kodiak Interactive Software Studios"
     releaseDate: "1999-09-21"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179039,7 +181843,7 @@ SLES-01137:
     publisher: "THQ, Inc"
     developer: "Inland Productions, Inc"
     releaseDate: "1998-06-19"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179057,7 +181861,7 @@ SLUS-00397:
     publisher: "THQ, Inc"
     developer: "Inland Productions, Inc"
     releaseDate: "1998-11-16"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179075,7 +181879,7 @@ SLES-00763:
     publisher: "THQ, Inc"
     developer: "AKI Corporation1"
     releaseDate: "1997-12-01"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179093,7 +181897,7 @@ SLUS-00455:
     publisher: "THQ, Inc"
     developer: "AKI Corporation1"
     releaseDate: "1997-02-28"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179112,7 +181916,7 @@ SLES-01663:
     publisher: "THQ, Inc"
     developer: "Inland Productions, Inc"
     releaseDate: "1999-02-05"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179131,7 +181935,7 @@ SLUS-00779:
     publisher: "THQ, Inc"
     developer: "Inland Productions, Inc"
     releaseDate: "1999-01-15"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179149,7 +181953,7 @@ SLES-03869:
     publisher: "3DO"
     developer: "Anco"
     releaseDate: "2002-07-20"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -179258,7 +182062,7 @@ SLES-01980:
     publisher: "Acclaim Sports"
     developer: "Acclaim Studios Salt Lake City, Inc"
     releaseDate: "1999-08-20"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179277,7 +182081,7 @@ SLES-02255:
     publisher: "Acclaim Sports"
     developer: "Acclaim Studios Salt Lake City, Inc"
     releaseDate: "1999-08-20"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179296,7 +182100,7 @@ SLUS-00831:
     publisher: "Acclaim Sports"
     developer: "Acclaim Studios Salt Lake City, Inc"
     releaseDate: "1999-06-30"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179314,7 +182118,7 @@ SLES-00286:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Sculptured Software, Inc"
     releaseDate: "1996-12-20"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179332,7 +182136,7 @@ SLPS-00695:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Sculptured Software, Inc"
     releaseDate: "1997-02-21"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -179350,7 +182154,7 @@ SLUS-00246:
     publisher: "Acclaim Entertainment, Inc"
     developer: "Sculptured Software, Inc"
     releaseDate: "1996-11-21"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179369,7 +182173,7 @@ SLES-02619:
     publisher: "THQ"
     developer: "Yuke's Co. Ltd"
     releaseDate: "2000-04-10"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179388,7 +182192,7 @@ SLUS-00927:
     publisher: "THQ"
     developer: "Yuke's Co. Ltd"
     releaseDate: "2000-02-03"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179407,7 +182211,7 @@ SLES-03251:
     publisher: "THQ"
     developer: "Yuke's Co. Ltd"
     releaseDate: "2001-01-01"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179429,7 +182233,7 @@ SLUS-01234:
     publisher: "THQ"
     developer: "Yuke's Co. Ltd"
     releaseDate: "2000-11-21"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179447,7 +182251,7 @@ SLES-00804:
     publisher: "Acclaim Sports"
     developer: "Iguana West Software, Inc"
     releaseDate: "1998-09-01"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179465,7 +182269,7 @@ SLUS-00495:
     publisher: "Acclaim Sports"
     developer: "Iguana West Software, Inc"
     releaseDate: "1998-07-01"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179483,7 +182287,7 @@ SLES-00103:
     publisher: "Acclaim"
     developer: "Sculptured Software, Inc"
     releaseDate: "1996-11-15"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179501,7 +182305,7 @@ SLPS-00223:
     publisher: "Acclaim"
     developer: "Sculptured Software, Inc"
     releaseDate: "1996-01-26"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -179519,7 +182323,7 @@ SLUS-00013:
     publisher: "Acclaim"
     developer: "Sculptured Software, Inc"
     releaseDate: "1995-10-18"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - English
     minPlayers: 1
@@ -179619,7 +182423,7 @@ SLPM-87225:
     publisher: "Hamster"
     developer: "Nihon Bussan"
     releaseDate: "2003-01-30"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -179677,7 +182481,7 @@ SLPM-87244:
     publisher: "Hamster"
     developer: "Now Productions"
     releaseDate: "2003-03-20"
-    genre: "Sports / Baseball"
+    genre: "Sports - Baseball"
     languages:
       - Japanese
     minPlayers: 1
@@ -179752,7 +182556,7 @@ SLPS-01166:
     publisher: "Coconuts Japan"
     developer: "Coconuts Japan"
     releaseDate: "1998-04-02"
-    genre: "Sports / Bowling"
+    genre: "Sports - Bowling"
     languages:
       - Japanese
     minPlayers: 1
@@ -179782,7 +182586,7 @@ SLPS-01695:
     publisher: "Athena"
     developer: "Art Co"
     releaseDate: "1999-10-07"
-    genre: "Volleyball / Beach Volleyball"
+    genre: "Sports - Volleyball / Beach Volleyball"
     languages:
       - Japanese
     minPlayers: 1
@@ -180315,6 +183119,8 @@ SLES-00978:
     linkCable: false
 SLED-01366:
   name: "WarGames - Defcon 1 (Europe, Australia) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00599:
   name: "WarGames - Defcon 1 (USA)"
   controllers:
@@ -180700,6 +183506,8 @@ SLES-01743:
     linkCable: false
 SLED-01787:
   name: "Warzone 2100 (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00819:
   name: "Warzone 2100 (USA)"
   controllers:
@@ -180764,7 +183572,7 @@ SLES-01160:
     publisher: "GT Interactive"
     developer: "Software Creations"
     releaseDate: "1998-10-01"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -180782,7 +183590,7 @@ SLUS-00147:
     publisher: "Midway Home Entertainment Inc"
     developer: "Software Creations"
     releaseDate: "1998-10-01"
-    genre: "Sports / Ice Hockey"
+    genre: "Sports - Ice Hockey"
     languages:
       - English
     minPlayers: 1
@@ -181147,7 +183955,7 @@ SLES-00141:
     publisher: "Konami"
     developer: "Flair"
     releaseDate: "1997-02-07"
-    genre: "Action / Platform."
+    genre: "Action / Platformer"
     languages:
       - English
     minPlayers: 1
@@ -181165,7 +183973,7 @@ SLPS-00939:
     publisher: "B-Factory"
     developer: "Flair"
     releaseDate: "1997-09-18"
-    genre: "Action / Platform."
+    genre: "Action / Platformer"
     languages:
       - Japanese
     minPlayers: 1
@@ -181310,8 +184118,12 @@ SLES-03592:
     linkCable: false
 SLED-01689:
   name: "Wild 9 & MDK & Crime Killer (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01496:
   name: "Wild 9 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01333:
   name: "Wild 9 (Europe) (En,Fr,De,Es,It)"
   controllers:
@@ -181479,6 +184291,8 @@ SCPS-10028:
     linkCable: false
 PCPX-96034:
   name: "Wild Arms (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SCPS-91038:
@@ -181552,6 +184366,8 @@ SCUS-94608:
     linkCable: false
 PCPX-96161:
   name: "Wild Arms - 2nd Ignition (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10089:
   name: "Wild Arms - 2nd Ignition (Japan) (Disc 1)"
   discSet:
@@ -181654,6 +184470,8 @@ PCPX-96171:
   name: "Wild Arms - 2nd Ignition (Japan) (Tentou-you Movie Disc)"
 SCUS-94592:
   name: "Wild Arms 2 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - ForcePGXPCPUMode
   settings:
@@ -181770,7 +184588,7 @@ SLES-02631:
     publisher: "EON Digital Entertainment"
     developer: "Fujimic Inc"
     releaseDate: "2000-09-30"
-    genre: "Sports / Kajak Racing"
+    genre: "Sports - Kajak Racing"
     languages:
       - English
     minPlayers: 1
@@ -181866,7 +184684,7 @@ SLES-03329:
     publisher: "Midas Interactive"
     developer: "Theyer GFX"
     releaseDate: "2001-09-14"
-    genre: "Windsurfing"
+    genre: "Sports - Windsurfing"
     languages:
       - English
       - French
@@ -182863,7 +185681,7 @@ SLPM-86548:
     publisher: "Hori"
     developer: "Hori"
     releaseDate: "2000-07-27"
-    genre: "Sports / Fishing"
+    genre: "Sports - Fishing"
     languages:
       - Japanese
     minPlayers: 1
@@ -183096,12 +185914,20 @@ SLPS-00189:
     linkCable: false
 SCED-01441:
   name: "Winter Releases '98 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02306:
   name: "Winter Releases (Europe, Australia) (En,Fr,De,Es,It)"
+  metadata:
+    genre: "** DEMO **"
 SCED-00986:
   name: "Winter Releases - '97 Demo 01 (Europe)"
+  metadata:
+    genre: "** DEMO **"
 SCED-02197:
   name: "Wip3out (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01909:
   name: "Wip3out (Europe) (En,Fr,De,Es,It)"
   compatibility:
@@ -183219,6 +186045,8 @@ SLES-00327:
     linkCable: true
 SLED-00498:
   name: "WipEout 2097 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10098:
   name: "WipEout 3 (Japan)"
   compatibility:
@@ -183269,6 +186097,8 @@ SLUS-00865:
     linkCable: false
 SLUS-90063:
   name: "WipEout 3 (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-02845:
   name: "WipEout 3 - Special Edition (Europe) (En,Fr,De,Es,It)"
   compatibility:
@@ -183739,7 +186569,7 @@ SLES-02196:
     publisher: "Codemasters"
     developer: "Blade Interactive Systems"
     releaseDate: "2000-06-28"
-    genre: "Sports / Snooker"
+    genre: "Sports - Snooker"
     languages:
       - English
       - French
@@ -183762,7 +186592,7 @@ SLES-01265:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1998-05-22"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -183788,7 +186618,7 @@ SLUS-00644:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1998-06-30"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -183807,7 +186637,7 @@ SLES-01268:
     publisher: "Electronic Arts"
     developer: "Electronic Arts"
     releaseDate: "1998-05-22"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Italian
     minPlayers: 1
@@ -183825,7 +186655,7 @@ SLPS-00256:
     publisher: "Coconuts Japan"
     developer: "Arc Developments"
     releaseDate: "1996-03-01"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -183843,7 +186673,7 @@ SLES-00088:
     publisher: "US Gold"
     developer: "Arc Developments"
     releaseDate: "1996-01-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -183863,7 +186693,7 @@ SLES-00137:
     publisher: "US Gold"
     developer: "Arc Developments"
     releaseDate: "1996-01-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - German
     minPlayers: 1
@@ -183881,7 +186711,7 @@ SLUS-00063:
     publisher: "US Gold"
     developer: "Arc Developments"
     releaseDate: "1996-01-15"
-    genre: "Sports / Golf"
+    genre: "Sports - Golf"
     languages:
       - English
     minPlayers: 1
@@ -184024,7 +186854,7 @@ SLPM-87061:
     publisher: "Syscom Entertainment"
     developer: "The Bitmap Brothers"
     releaseDate: "2002-06-13"
-    genre: "Sports / Action"
+    genre: "Sports - Action"
     languages:
       - Japanese
     minPlayers: 1
@@ -184081,7 +186911,7 @@ SLES-00626:
     publisher: "Mindscape"
     developer: "High Voltage Software"
     releaseDate: "1997-12-10"
-    genre: "Sports / Basketball"
+    genre: "Sports - Basketball"
     languages:
       - English
     minPlayers: 1
@@ -184100,7 +186930,7 @@ SLES-00717:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1998-05-29"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - German
@@ -184121,7 +186951,7 @@ SLES-01166:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1998-05-29"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - French
     minPlayers: 1
@@ -184133,6 +186963,8 @@ SLES-01166:
     linkCable: false
 SLED-01367:
   name: "World League Soccer '98 (France) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-01167:
   name: "World League Soccer '98 (Germany)"
   controllers:
@@ -184142,7 +186974,7 @@ SLES-01167:
     publisher: "Eidos Interactive"
     developer: "Silicon Dreams"
     releaseDate: "1998-05-29"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - German
     minPlayers: 1
@@ -184164,7 +186996,7 @@ SLPS-01389:
     publisher: "Coconuts Japan"
     developer: "Silicon Dreams"
     releaseDate: "2000-03-30"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -184260,7 +187092,7 @@ SLPS-01379:
     publisher: "I.Magic"
     developer: "I.Magic"
     releaseDate: "1998-08-06"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
       - Japanese
@@ -184280,7 +187112,7 @@ SLPM-86600:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "2000-08-31"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -184302,7 +187134,7 @@ SLPM-86162:
     publisher: "Konami"
     developer: "KCE Sapporo"
     releaseDate: "1998-12-11"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -184322,7 +187154,7 @@ SLPM-86086:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1998-05-28"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -184343,7 +187175,7 @@ SLPM-86291:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1999-09-02"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -184361,7 +187193,7 @@ SLPM-86035:
     publisher: "Konami"
     developer: "KCET"
     releaseDate: "1997-06-05"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -184379,7 +187211,7 @@ SLPS-00272:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "1996-03-15"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -184401,7 +187233,7 @@ SLPM-87056:
     publisher: "Konami"
     developer: "Konami"
     releaseDate: "2002-04-25"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - Japanese
     minPlayers: 1
@@ -184519,7 +187351,7 @@ SLES-04039:
     publisher: "Ignition Entertainment"
     developer: "Ignition Entertainment"
     releaseDate: "2004-06-02"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
     minPlayers: 1
@@ -184788,7 +187620,7 @@ SLES-03804:
     - DigitalController
   metadata:
     publisher: "Ubisoft Entertainment"
-    developer: "Team17 Software, Ltd. / The Code Monkeys"
+    developer: "Team17 Software, Ltd. / The Code Monkeys Ltd"
     releaseDate: "2001-12-14"
     genre: "Strategy / Action"
     languages:
@@ -184817,7 +187649,7 @@ SLUS-01448:
     - DigitalController
   metadata:
     publisher: "Ubisoft Entertainment"
-    developer: "Team17 Software, Ltd. / The Code Monkeys"
+    developer: "Team17 Software, Ltd. / The Code Monkeys Ltd"
     releaseDate: "2002-03-29"
     genre: "Strategy / Action"
     languages:
@@ -184882,24 +187714,104 @@ SLUS-00587:
     linkCable: false
 LSP-17011001:
   name: "Write Away 1 (USA)"
+  codes:
+    - LSP17011001
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99011901:
   name: "Write Away 10 (USA)"
+  codes:
+    - LSP99011901
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-17011101:
   name: "Write Away 2 (USA)"
+  codes:
+    - LSP17011101
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-17011201:
   name: "Write Away 3 (USA)"
+  codes:
+    - LSP17011201
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-17011301:
   name: "Write Away 4 (USA)"
+  codes:
+    - LSP99011301
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99011401:
   name: "Write Away 5 (USA)"
+  codes:
+    - LSP99011401
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99011501:
   name: "Write Away 6 (USA)"
+  codes:
+    - LSP99011501
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99011601:
   name: "Write Away 7 (USA)"
+  codes:
+    - LSP99011601
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99011701:
   name: "Write Away 8 (USA)"
+  codes:
+    - LSP99011701
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 LSP-99011801:
   name: "Write Away 9 (USA)"
+  codes:
+    - LSP99011801
+  metadata:
+    publisher: "Lightspan"
+    developer: "Lightspan"
+    genre: "Educational"
+    languages:
+      - English
 SLES-02171:
   name: "Wu-Tang - Shaolin Style (France)"
   controllers:
@@ -184909,7 +187821,7 @@ SLES-02171:
     publisher: "Activision"
     developer: "Paradox Development"
     releaseDate: "1999-11-12"
-    genre: "Fighting / Beat'em up"
+    genre: "Fighting / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -184928,7 +187840,7 @@ SLES-02172:
     publisher: "Activision"
     developer: "Paradox Development"
     releaseDate: "1999-11-12"
-    genre: "Fighting / Beat'em up"
+    genre: "Fighting / Beat'em Up"
     languages:
       - German
     minPlayers: 1
@@ -184947,7 +187859,7 @@ SLPM-86944:
     publisher: "Success"
     developer: "Paradox Development"
     releaseDate: "2001-11-21"
-    genre: "Fighting / Beat'em up"
+    genre: "Fighting / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -184966,7 +187878,7 @@ SLUS-00929:
     publisher: "Activision"
     developer: "Paradox Development"
     releaseDate: "1999-10-31"
-    genre: "Fighting / Beat'em up"
+    genre: "Fighting / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -184985,7 +187897,7 @@ SLES-02170:
     publisher: "Activision"
     developer: "Paradox Development"
     releaseDate: "1999-11-12"
-    genre: "Fighting / Beat'em up"
+    genre: "Fighting / Beat'em Up"
     languages:
       - English
     minPlayers: 1
@@ -185004,7 +187916,7 @@ SLES-02173:
     publisher: "Activision"
     developer: "Paradox Development"
     releaseDate: "1999-11-12"
-    genre: "Fighting / Beat'em up"
+    genre: "Fighting / Beat'em Up"
     languages:
       - Italian
     minPlayers: 1
@@ -185023,7 +187935,7 @@ SLPM-86487:
     publisher: "Success"
     developer: "Paradox Development"
     releaseDate: "2000-06-21"
-    genre: "Fighting / Beat'em up"
+    genre: "Fighting / Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -185042,7 +187954,7 @@ SCES-01556:
     publisher: "Konami"
     developer: "Radical Entertainment"
     releaseDate: "1998-11-15"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
       - French
@@ -185067,7 +187979,7 @@ SLPS-01944:
     publisher: "Konami"
     developer: "Radical Entertainment"
     releaseDate: "1999-03-11"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -185079,6 +187991,8 @@ SLPS-01944:
     linkCable: false
 SLPM-80393:
   name: "X Games Pro Boarder (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00704:
   name: "X Games Pro Boarder (USA)"
   compatibility:
@@ -185090,7 +188004,7 @@ SLUS-00704:
     publisher: "Konami"
     developer: "Radical Entertainment"
     releaseDate: "1998-10-31"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - English
     minPlayers: 1
@@ -185127,6 +188041,8 @@ SLES-03433:
     linkCable: false
 SLUS-90021:
   name: "X-360 - Surrounding Your World with Sound (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03815:
   name: "X-Bladez - Inline Skater (Europe)"
   controllers:
@@ -185136,7 +188052,7 @@ SLES-03815:
     publisher: "Ubisoft"
     developer: "Vision Scape Interactive"
     releaseDate: "2002-03-22"
-    genre: "Sports / Skate"
+    genre: "Sports - Skate"
     languages:
       - English
     minPlayers: 1
@@ -185158,7 +188074,7 @@ SLUS-01444:
     publisher: "Crave Entertainment"
     developer: "Vision Scape Interactive"
     releaseDate: "2002-01-24"
-    genre: "Sports / Skate"
+    genre: "Sports - Skate"
     languages:
       - English
     minPlayers: 1
@@ -186055,6 +188971,8 @@ SLUS-00774:
     linkCable: false
 SLUS-81223:
   name: "X-Men - Mutant Academy (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-03630:
   name: "X-Men - Mutant Academy 2 (Europe)"
   controllers:
@@ -186271,6 +189189,8 @@ SCPS-45465:
     linkCable: false
 PAPX-90037:
   name: "XI [sai] (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10051:
   name: "XI [sai] (Japan) (En,Ja)"
   controllers:
@@ -186296,6 +189216,8 @@ SCPS-10051:
     linkCable: false
 PAPX-90032:
   name: "XI [sai] (Japan) (En,Ja) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10123:
   name: "XI [sai] Jumbo (Japan)"
   controllers:
@@ -186373,7 +189295,7 @@ SLUS-01560:
     publisher: "XS Games"
     developer: "Aroma"
     releaseDate: "2003-09-03"
-    genre: "Sports / Dodgeball"
+    genre: "Sports - Dodgeball"
     languages:
       - English
     minPlayers: 1
@@ -186392,7 +189314,7 @@ SLUS-01554:
     publisher: "XS Games"
     developer: "Wahoo Studios"
     releaseDate: "2003-12-03"
-    genre: "Sports / American Football"
+    genre: "Sports - American Football"
     languages:
       - English
     minPlayers: 1
@@ -186411,7 +189333,7 @@ SLES-04120:
     publisher: "XS Games"
     developer: "Wahoo Studios"
     releaseDate: "2004-09-29"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
       - French
@@ -186434,7 +189356,7 @@ SLUS-01520:
     publisher: "XS Games"
     developer: "Wahoo Studios"
     releaseDate: "2003-12-10"
-    genre: "Sports / Soccer"
+    genre: "Sports - Soccer"
     languages:
       - English
     minPlayers: 1
@@ -186985,6 +189907,8 @@ SLPS-03435:
     linkCable: false
 SLPM-80634:
   name: "Yakitori Musume - Sugoude Hanjouki (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00152:
   name: "Yaku - Yuujou Dangi (Japan)"
   controllers:
@@ -187331,12 +190255,20 @@ SLPS-00054:
     linkCable: false
 PAPX-90058:
   name: "Yarudora (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96128:
   name: "Yarudora - Yukiwari no Hana & Sampaguita (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90033:
   name: "Yarudora Series Vol. 1 - Double Cast (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90035:
   name: "Yarudora Series Vol. 1 - Double Cast (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10053:
   name: "Yarudora Series Vol. 1 - Double Cast (Japan) (Disc 1)"
   discSet:
@@ -187387,6 +190319,8 @@ SCPS-10054:
     linkCable: false
 PAPX-90036:
   name: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10056:
   name: "Yarudora Series Vol. 2 - Kisetsu o Dakishimete (Japan) (Disc 1)"
   discSet:
@@ -187437,6 +190371,8 @@ SCPS-10057:
     linkCable: false
 PAPX-90042:
   name: "Yarudora Series Vol. 3 - Sampaguita (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-10067:
   name: "Yarudora Series Vol. 3 - Sampaguita (Japan) (Disc 1)"
   discSet:
@@ -187614,7 +190550,7 @@ SLES-02272:
     publisher: "Sunsoft"
     developer: "Sunsoft"
     releaseDate: "2000-09-08"
-    genre: "Sports / Tennis"
+    genre: "Sports - Tennis"
     languages:
       - English
       - French
@@ -187672,7 +190608,7 @@ SLES-04164:
     publisher: "JowooD Productions"
     developer: "Edelweiss Medienwerkst"
     releaseDate: "2004-09-28"
-    genre: "Mini Games."
+    genre: "Mini Games"
     languages:
       - English
       - French
@@ -187759,7 +190695,7 @@ SLPS-02308:
     publisher: "Sony Music Entertainment"
     developer: "Polygon Magic"
     releaseDate: "1999-09-30"
-    genre: "Adventure / Mini games"
+    genre: "Adventure / Mini Games"
     languages:
       - Japanese
     minPlayers: 1
@@ -187808,6 +190744,8 @@ SLES-03499:
     linkCable: false
 SLUS-90061:
   name: "You Don't Know Jack (USA) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLUS-00716:
   name: "You Don't Know Jack (USA) (Disc 1)"
   discSet:
@@ -188214,6 +191152,8 @@ SLPS-03177:
     linkCable: false
 SLPM-80610:
   name: "Yutona Eiyuu Senki - TearRingSaga - Prelude (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02722:
   name: "Yuugen Gaisha Chikyuu Boueitai (Japan)"
   controllers:
@@ -188507,6 +191447,8 @@ SLPS-02274:
     linkCable: false
 SLPM-80444:
   name: "Yuuyami Doori Tankentai (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-00600:
   name: "Z (Europe)"
   controllers:
@@ -188644,6 +191586,8 @@ SLPS-03354:
     linkCable: false
 SLPM-80626:
   name: "Zanac x Zanac (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-00909:
   name: "Zap! Snowboarding Trix '98 (Japan)"
   controllers:
@@ -188652,7 +191596,7 @@ SLPS-00909:
     publisher: "Pony Canyon"
     developer: "Pony Canyon / Atelier Double"
     releaseDate: "1997-12-25"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -188670,7 +191614,7 @@ SLPS-03034:
     publisher: "Media Rings"
     developer: "Pony Canyon / Atelier Double"
     releaseDate: "2001-11-01"
-    genre: "Sports / Snowboarding"
+    genre: "Sports - Snowboarding"
     languages:
       - Japanese
     minPlayers: 1
@@ -188688,7 +191632,7 @@ SLPS-00575:
     publisher: "Banpresto"
     developer: "Banpresto"
     releaseDate: "1996-12-13"
-    genre: "Beat'em Up / Fighting"
+    genre: "Beat'em Up"
     languages:
       - Japanese
     minPlayers: 1
@@ -188794,7 +191738,7 @@ SLPS-01475:
     publisher: "TEN Institute"
     developer: "GW"
     releaseDate: "1998-07-23"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -188813,7 +191757,7 @@ SLPS-01849:
     publisher: "Human Entertainment"
     developer: "Human Club"
     releaseDate: "1999-04-08"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -188835,7 +191779,7 @@ SLPS-02934:
     publisher: "Spike Chunsoft Co. Ltd."
     developer: "Human Club"
     releaseDate: "2000-09-07"
-    genre: "Sports / Wrestling"
+    genre: "Sports - Wrestling"
     languages:
       - Japanese
     minPlayers: 1
@@ -188899,7 +191843,7 @@ SLPS-01811:
     publisher: "Shoeisha"
     developer: "Fupac"
     releaseDate: "1999-01-14"
-    genre: "Simulation / Strategy"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -189098,6 +192042,8 @@ SLPS-00891:
     linkCable: false
 PCPX-96081:
   name: "Zero Divide 2 - The Secret Wish (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-01290:
   name: "Zero Divide 2 - The Secret Wish (Spain)"
   controllers:
@@ -189193,6 +192139,8 @@ SLPS-01666:
     linkCable: false
 SLPM-80335:
   name: "Zeus - Carnage Heart Second (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPS-02318:
   name: "Zeus II - Carnage Heart (Japan)"
   controllers:
@@ -189221,7 +192169,7 @@ SLPS-01483:
     publisher: "Upstar"
     developer: "Lay-Up"
     releaseDate: "1998-12-10"
-    genre: "Sports / Mini Golf"
+    genre: "Sports - Mini Golf"
     languages:
       - Japanese
     minPlayers: 1
@@ -189278,7 +192226,7 @@ SLPS-02244:
     publisher: "Human Entertaiment"
     developer: "Sandlot"
     releaseDate: "1999-07-22"
-    genre: "Simulation / Action"
+    genre: "** DEMO **"
     languages:
       - Japanese
     minPlayers: 1
@@ -189309,6 +192257,8 @@ SLPS-02260:
     linkCable: false
 SLPM-80488:
   name: "Zipangu-jima - Unmei wa Saikoro ga Kimeru! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-86643:
   name: "Zipangu-jima - Unmei wa Saikoro ga Kimeru! (Japan) (Major Wave)"
   controllers:
@@ -189340,7 +192290,7 @@ SLUS-01401:
     publisher: "Encore Software"
     developer: "Big Grub"
     releaseDate: "2001-10-11"
-    genre: "Platformer / Adventure / Mini games"
+    genre: "Platformer / Adventure / Mini Games"
     languages:
       - English
     minPlayers: 1
@@ -189766,230 +192716,436 @@ SCUS-01232:
   name: "MTV Sports - Skateboarding featuring Andy Macdonald (USA)"
 PCPX-96033:
   name: "Total NBA '96 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80548:
   name: "Puzz Loop (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80226:
   name: "NBA Live 98 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80436:
   name: "Grandia - Prelude (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90100:
   name: "PokeTan (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80500:
   name: "V-Rally - Championship Edition 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80003:
   name: "Nise Flopon-kun P! Famitsuu Nottori Version (Japan)"
 PCPX-96155:
   name: "MiruMiru PlayStation Vol. 34 (Japan)"
 SLPM-80347:
   name: "Gensou Suikoden II (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80323:
   name: "Ridegear Guybrave II (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80491:
   name: "Pac-Man World - 20th Anniversary (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96193:
   name: "Beat Planet Music (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96188:
   name: "Toro Channel - Zoukangou nano nya! SCEI Nenmatsu Shinsaku Soft Information Movie Disc (Japan)"
 SLPM-80492:
   name: "Little Princess - Marl Oukoku no Ningyou-hime 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80428:
   name: "Remote Control Dandy (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96129:
   name: "Navit (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80419:
   name: "Lunar 2 - Eternal Blue (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96184:
   name: "Legend of Dragoon, The (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
     - DisableTextureFiltering
 SLPM-80441:
   name: "Maria 2 - Jutai Kokuchi no Nazo (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90098:
   name: "Robbit mon Dieu (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80564:
   name: "F1 2000 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80034:
   name: "CyberSpeed (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80254:
   name: "Metal Gear Solid (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96096:
   name: "Gran Turismo (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02415:
   name: "Compilation 02 (Australia)"
 SLES-00687:
   name: "Perfect Weapon (Italy)"
+  controllers:
+    - DigitalController
+  metadata:
+    publisher: "ASC Games"
+    developer: "Grey Matter"
+    releaseDate: "1997-08-01"
+    genre: "Action / Adventure / Beat'em Up"
+    languages:
+      - Italian
+    minPlayers: 1
+    maxPlayers: 1
+    minBlocks: 1
+    maxBlocks: 1
+    vibration: false
+    multitap: false
+    linkCable: false
 SLED-01533:
   name: "Assault (Europe) (En,Fr,De,Es,It) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01342:
   name: "Heart of Darkness (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80570:
   name: "Exciting Pro Wres (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80137:
   name: "Farland Story - Yottsu no Fuuin (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCES-03031:
   name: "Livro da Selva, O - Uma Festa Divertida (Portugal)"
 SLPM-80054:
   name: "Darius Gaiden (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80571:
   name: "Power Shovel ni Norou!! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80229:
   name: "Utchan Nanchan no Honoo no Challenger - Denryuu Iraira-bou Returns (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80242:
   name: "King of Fighters '97, The (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96035:
   name: "Tobal No. 1 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80057:
   name: "Vandal Hearts - Ushinawareta Kodai Bunmei (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCED-03927:
   name: "Erlebe den Zauber von Disney auf der PlayStation (Germany)"
 PCPX-96083:
   name: "Linda^3 Again (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96130:
   name: "Legaia Densetsu (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80047:
   name: "Kowloon's Gate (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80091:
   name: "Deep Sea Adventure - Kaitei-kyuu Pantarassa no Nazo (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80097:
   name: "Formula Circus (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80135:
   name: "Robo-Pit 2 (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80213:
   name: "Choro Q 3 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80220:
   name: "Toshiba Emi Egg & Zutto Issho Demo Disc (Japan)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80244:
   name: "Hello Kitty no Cube de Cute (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80252:
   name: "Hit Back (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80301:
   name: "Naniwa Wangan Battle - Tarzan Yamada & AutoSelect Sawa Kyoudai (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80353:
   name: "Lunatic Dawn III & Susume! Kaizoku Promotion Disc (Japan)"
 SLPM-80368:
   name: "Next Tetris, The (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80528:
   name: "Hexamoon Guardians (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80565:
   name: "Suzuki Bakuhatsu (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80575:
   name: "World Soccer Jikkyou Winning Eleven 2000 - U-23 Medal e no Chousen (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80613:
   name: "Yakiniku Action Game - Yakiniku Bugyou (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80631:
   name: "Gourmet Action Game - Manpuku!! Nabe Kazoku (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80270:
   name: "OverBlood 2 - The East Edge File (Japan)"
 SLES-03609:
   name: "Worms World Party (Europe) (En,Fr,De,Es,It,Nl,Sv,Da) (Beta)"
 SCED-04013:
   name: "Gratis! Demo Disc! (Spain)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01650:
   name: "Music - Music Creation for the PlayStation (Europe) (En,Fr,De) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96160:
   name: "Ore no Shikabane o Koete Yuke (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90086:
   name: "Doko Demo Issho (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96053:
   name: "MiruMiru PlayStation Vol. 4 (Japan) (Disc 3)"
 SLPM-80563:
   name: "RC de Go! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80408:
   name: "Kagayaku Kisetsu e (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96192:
   name: "MiruMiru PlayStation Vol. 42 (Japan)"
 SLPM-80541:
   name: "RayCrisis (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-84003:
   name: "Kellogg Original Waku Waku Doki Doki Ninki Game Chara Daishuugou! Waku Waku-shou (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02138:
   name: "Play Power 5 (Spain)"
 SLPM-80203:
   name: "Option - Tuning Car Battle (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80206:
   name: "Option - Tuning Car Battle (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80148:
   name: "Sony Music Entertainment - PlayStation Title Digest (Japan)"
 SLPM-80391:
   name: "Cinema Eikaiwa Series - Tengoku ni Ikenai Papa (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80345:
   name: "Cool Boarders 3 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96180:
   name: "Pet in TV - With My Dear Dog (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80616:
   name: "Yamasa Digi World - Tetra Master (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90093:
   name: "Arc the Lad III (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SCED-04012:
   name: "Free Spin Demo Disc! Voellig Gratis Demo Disc! (Germany)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90073:
   name: "Circadia (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80043:
   name: "Street Fighter Zero 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02048:
   name: "Star Wars - Episodio I - La Amenaza Fantasma (Spain) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SCPM-85005:
   name: "Arc the Lad II - Characters & World CG Movie Collection (Japan)"
 SLED-02741:
   name: "WWF SmackDown! (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80561:
   name: "Macross Plus - Game Edition (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80210:
   name: "Gundam the Battle Master 2 (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80107:
   name: "Gundam the Battle Master (Japan) (Demo 2)"
+  metadata:
+    genre: "** DEMO **"
 SCPS-46001:
   name: "R4 - Ridge Racer Type 4 (Korea)"
 SLPM-80328:
   name: "End Sector (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01271:
   name: "WCW Nitro (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02046:
   name: "Star Wars - Episode I - Die Dunkle Bedrohung (Germany) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-02276:
   name: "Wu-Tang - Taste the Pain (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90088:
   name: "Back to School Special - PlayStation Demo Disc (Asia)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96150:
   name: "Um Jammer Lammy (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80405:
   name: "Lord of Fist (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80466:
   name: "Zipangu - Unmei wa Saikoro ga Kimeru! (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80493:
   name: "Jojo no Kimyou na Bouken (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80566:
   name: "Menkyo o Torou (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80178:
   name: "Thoroughbred Breeder - Sekai Seiha-hen (Japan) (Demo 1)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80008:
   name: "Zero Divide (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80074:
   name: "Ninja Jajamaru-kun - Onigiri Ninpouchou (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96153:
   name: "Tamago de Puzzle (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-01755:
   name: "Nickelodeon Rugrats - Search for Reptar (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-00179:
   name: "Adidas Power Soccer 2 (Europe) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLES-00066:
   name: "Adidas Power Soccer (UK) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLED-00406:
   name: "Resident Evil (France) (Demo)"
+  metadata:
+    genre: "** DEMO **"
   traits:
     - DisableWidescreen
 SLPM-80241:
   name: "Frogger (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80191:
   name: "V-Rally - Championship Edition (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PCPX-96154:
   name: "Sony Computer Entertainment Inc. Monthly Software Information - 6-gatsu Hatsubai Yotei Title (Japan)"
 SLPM-80245:
   name: "King of Fighters Kyou, The (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80459:
   name: "Umi no Nushi-tsuri - Takarajima ni Mukatte (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 PAPX-90089:
   name: "Ore no Ryouri (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"
 SLPM-80638:
   name: "Inuyasha - Sengoku Otogi Gassen (Japan) (Demo)"
+  metadata:
+    genre: "** DEMO **"