diff --git a/data/resources/gamedb.json b/data/resources/gamedb.json
index a2a6d33a5..be1e6c58a 100644
--- a/data/resources/gamedb.json
+++ b/data/resources/gamedb.json
@@ -5678,43 +5678,6 @@
    }
   ]
  },
- {
-  "serial": "SLPS-00830",
-  "name": "Ace Combat 2 (Japan) (Rev 1)",
-  "codes": [
-   "SLPS-91146"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Namco",
-  "developer": "Namco",
-  "releaseDate": "1999-07-29",
-  "genre": "Flight Simulator / Shooter",
-  "minPlayers": 1,
-  "maxPlayers": 1,
-  "minBlocks": 1,
-  "maxBlocks": 1,
-  "vibration": false,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "AnalogController",
-   "DigitalController",
-   "NeGcon"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 580271328,
-      "md5": "ece1e7b3f995b67483b94f98401bb925"
-     }
-    ]
-   }
-  ]
- },
  {
   "serial": "SLUS-00404",
   "name": "Ace Combat 2 (USA)",
@@ -38608,8 +38571,8 @@
   "languages": [
    "Japanese"
   ],
-  "publisher": "F\u00c0O\u00c0G (Full On Games)",
-  "developer": "F\u00c0O\u00c0G (Full On Games)",
+  "publisher": "F·O·G (Full On Games)",
+  "developer": "F·O·G (Full On Games)",
   "releaseDate": "1997-08-07",
   "genre": "Dating / Hanafuda",
   "minPlayers": 1,
@@ -57158,14 +57121,6 @@
       "md5": "3c2c2f6636442fea063edebdbe7ca776"
      }
     ]
-   },
-   {
-    "tracks": [
-     {
-      "size": 621638304,
-      "md5": "844e3f18c053dd46dc845b07ecab1645"
-     }
-    ]
    }
   ],
   "compatibility": {
@@ -57174,7 +57129,7 @@
   }
  },
  {
-  "serial": "SCUS-94604",
+  "serial": "SCUS-94964",
   "name": "Carnage Heart (USA) (Mission Briefing)",
   "codes": [
    "SCUS-94964"
@@ -73283,8 +73238,8 @@
   "languages": [
    "Japanese"
   ],
-  "publisher": "Fill-In Caf\u00da",
-  "developer": "Fill-In Caf\u00da",
+  "publisher": "Fill-In Café",
+  "developer": "Fill-In Café",
   "releaseDate": "1997-10-30",
   "genre": "Action / RPG",
   "minPlayers": 1,
@@ -73334,7 +73289,7 @@
    "Japanese"
   ],
   "publisher": "Family Soft",
-  "developer": "Fill-In Caf\u00da",
+  "developer": "Fill-In Café",
   "releaseDate": "1999-06-24",
   "genre": "Action / RPG",
   "minPlayers": 1,
@@ -99392,7 +99347,7 @@
   }
  },
  {
-  "serial": "CPCS-00701",
+  "serial": "SLPM-86627",
   "name": "Dino Crisis 2 (Japan)",
   "codes": [
    "SLPM-86627",
@@ -121340,7 +121295,7 @@
  },
  {
   "serial": "SCPS-45125",
-  "name": "Einh\u00f5nder",
+  "name": "Einhänder",
   "codes": [
    "SCPS-45125"
   ],
@@ -125031,7 +124986,7 @@
   ]
  },
  {
-  "serial": "SLES-00107",
+  "serial": "SLES-00107-2",
   "name": "Euro Demo 01 (Europe)",
   "codes": [
    "HASH-AAD8E924C9D6759C"
@@ -195276,7 +195231,8 @@
   "name": "Interactive CD Sampler Disc 6 (USA)",
   "codes": [
    "PBPX-95004",
-   "SCUS-94242"
+   "SCUS-94242",
+   "SCUS-94252"
   ],
   "track_data": [
    {
@@ -195327,36 +195283,6 @@
    "comments": "There's a bug in the menu which happens if you use R1/L1 while is choosing different blocks in the menu. Sometimes the back of the tiles appear bugged. Happens in other emulators too and needs a console verification, but probably is a bug with the game itself, not with the emulator."
   }
  },
- {
-  "serial": "PBPX-95004",
-  "name": "Interactive CD Sampler Disc 6 (USA) (Rev 1)",
-  "codes": [
-   "SCUS-94252"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 581261520,
-      "md5": "5847425f4ace20f7b301252406e9b495"
-     },
-     {
-      "size": 20638800,
-      "md5": "e54b50a212ce5f0bffd81b3dab4b4dfa"
-     },
-     {
-      "size": 31897824,
-      "md5": "abd8f670c1b9a0d7efe03cf3639135ac"
-     },
-     {
-      "size": 7168896,
-      "md5": "5aa83f163b09bf784ffab161918725a8"
-     }
-    ]
-   }
-  ]
- },
  {
   "serial": "PBPX-95011",
   "name": "Interactive CD Sampler Disc Vol. 10 (USA)",
@@ -195504,7 +195430,8 @@
   "name": "Interactive CD Sampler Disc Volume 7 (USA)",
   "codes": [
    "PBPX-95006",
-   "SCUS-94258"
+   "SCUS-94258",
+   "SCUS-94262"
   ],
   "track_data": [
    {
@@ -195570,48 +195497,6 @@
    "versionTested": "0.1-1530-g6d75f42e"
   }
  },
- {
-  "serial": "PBPX-95006",
-  "name": "Interactive CD Sampler Disc Volume 7 (USA) (Rev 1)",
-  "codes": [
-   "SCUS-94262"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 670418784,
-      "md5": "795c5b10f14a6033681975d311258842"
-     },
-     {
-      "size": 28386288,
-      "md5": "4d88f6e35e93ef5f012ed9aba7934cbc"
-     },
-     {
-      "size": 20349504,
-      "md5": "e6897c7003d21d478cce671142827840"
-     },
-     {
-      "size": 11625936,
-      "md5": "2c2253773e248aea18f218417b10775f"
-     },
-     {
-      "size": 1331232,
-      "md5": "e2772593ad1d463fc1136e799884a2f7"
-     },
-     {
-      "size": 1401792,
-      "md5": "54734d3fe6f75e0d6cf73fa0d3b63c83"
-     }
-    ]
-   }
-  ],
-  "compatibility": {
-   "rating": 5,
-   "versionTested": "0.1-1530-g6d75f42e"
-  }
- },
  {
   "serial": "PBPX-95009",
   "name": "Interactive CD Sampler Disc Volume 8 (USA)",
@@ -225298,8 +225183,8 @@
   "languages": [
    "Japanese"
   ],
-  "publisher": "F\u00c0O\u00c0G (Full On Games)",
-  "developer": "F\u00c0O\u00c0G (Full On Games)",
+  "publisher": "F·O·G (Full On Games)",
+  "developer": "F·O·G (Full On Games)",
   "releaseDate": "1998-12-03",
   "genre": "Adventure",
   "minPlayers": 1,
@@ -258217,8 +258102,8 @@
   "languages": [
    "Japanese"
   ],
-  "publisher": "F\u00c0O\u00c0G (Full On Games)",
-  "developer": "F\u00c0O\u00c0G (Full On Games)",
+  "publisher": "F·O·G (Full On Games)",
+  "developer": "F·O·G (Full On Games)",
   "releaseDate": "1999-12-22",
   "genre": "Dating / Hanafuda",
   "minPlayers": 1,
@@ -264468,42 +264353,6 @@
    }
   ]
  },
- {
-  "serial": "SLPS-01906",
-  "name": "Monster Farm 2 (Japan) (Rev 1)",
-  "codes": [
-   "SLPS-91199"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Tecmo",
-  "developer": "Tecmo",
-  "releaseDate": "2000-07-27",
-  "genre": "Breeding / RPG",
-  "minPlayers": 1,
-  "maxPlayers": 1,
-  "minBlocks": 1,
-  "maxBlocks": 1,
-  "vibration": false,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "AnalogController",
-   "DigitalController"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 451866240,
-      "md5": "7a56b65a22f02c8b2f9cd278a0469861"
-     }
-    ]
-   }
-  ]
- },
  {
   "serial": "SLPS-02653",
   "name": "Monster Farm Battle Card (Japan)",
@@ -287119,7 +286968,7 @@
    "Japanese"
   ],
   "publisher": "Netz Magazine",
-  "developer": "Dents\u00b9",
+  "developer": "Dentsû",
   "releaseDate": "1997-03-10",
   "genre": "Driving / Racing",
   "minPlayers": 1,
@@ -322619,7 +322468,8 @@
   "serial": "SCPS-10023",
   "name": "PoPoLoCrois Monogatari (Japan)",
   "codes": [
-   "HASH-72E54F40E1FCDE62"
+   "HASH-72E54F40E1FCDE62",
+   "HASH-670BF5FA849D6979"
   ],
   "languages": [
    "Japanese"
@@ -322646,34 +322496,9 @@
       "md5": "8ee8426168afc22153f6abeafa22e6c1"
      }
     ]
-   }
-  ]
- },
- {
-  "serial": "SCPS-10023",
-  "name": "PoPoLoCrois Monogatari (Japan) (Rev 1)",
-  "codes": [
-   "HASH-670BF5FA849D6979"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Sony",
-  "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "1996-07-12",
-  "genre": "Tactical RPG",
-  "minPlayers": 1,
-  "maxPlayers": 1,
-  "minBlocks": 1,
-  "maxBlocks": 5,
-  "vibration": false,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "DigitalController"
-  ],
-  "track_data": [
+   },
    {
+    "version": "Rev 1",
     "tracks": [
      {
       "size": 683611152,
@@ -322853,7 +322678,8 @@
   "serial": "SCPS-10050",
   "name": "PoPoRoGue (Japan)",
   "codes": [
-   "HASH-E6F9616D27744F0F"
+   "HASH-E6F9616D27744F0F",
+   "HASH-6796D79E4BC5E282"
   ],
   "languages": [
    "Japanese"
@@ -322881,35 +322707,9 @@
       "md5": "950d12d0cc9d0ecd5d01ea6c96a9b808"
      }
     ]
-   }
-  ]
- },
- {
-  "serial": "SCPS-10050",
-  "name": "PoPoRoGue (Japan) (Rev 1)",
-  "codes": [
-   "HASH-6796D79E4BC5E282"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Sony",
-  "developer": "G-Artists / Sugar & Rockets",
-  "releaseDate": "1998-11-26",
-  "genre": "Tactical RPG",
-  "minPlayers": 1,
-  "maxPlayers": 1,
-  "minBlocks": 1,
-  "maxBlocks": 5,
-  "vibration": true,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "AnalogController",
-   "DigitalController"
-  ],
-  "track_data": [
+   },
    {
+    "version": "Rev 1",
     "tracks": [
      {
       "size": 702787008,
@@ -334052,41 +333852,6 @@
    }
   ]
  },
- {
-  "serial": "SLPS-01080",
-  "name": "Puyo Puyo Sun - Ketteiban (Japan) (Rev 1)",
-  "codes": [
-   "SLPS-91224"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Compile",
-  "developer": "Compile",
-  "releaseDate": "2001-04-12",
-  "genre": "Puzzle",
-  "minPlayers": 1,
-  "maxPlayers": 2,
-  "minBlocks": 1,
-  "maxBlocks": 1,
-  "vibration": false,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "DigitalController"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 318009216,
-      "md5": "19e0a9c5ebb3b5e417e220904f278742"
-     }
-    ]
-   }
-  ]
- },
  {
   "serial": "SLPS-00530",
   "name": "Puyo Puyo Tsuu - Ketteiban (Japan)",
@@ -334130,41 +333895,6 @@
    }
   ]
  },
- {
-  "serial": "SLPS-00530",
-  "name": "Puyo Puyo Tsuu - Ketteiban (Japan) (Rev 1)",
-  "codes": [
-   "SLPS-91194"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Compile",
-  "developer": "Compile",
-  "releaseDate": "2000-03-30",
-  "genre": "Puzzle",
-  "minPlayers": 1,
-  "maxPlayers": 2,
-  "minBlocks": 1,
-  "maxBlocks": 1,
-  "vibration": false,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "DigitalController"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 502810560,
-      "md5": "e239ff37969a1cfecfeea2655d3edac5"
-     }
-    ]
-   }
-  ]
- },
  {
   "serial": "SLPS-02412",
   "name": "Puyo Puyoon - Car-kun to Issho (Japan)",
@@ -350718,118 +350448,6 @@
    }
   ]
  },
- {
-  "serial": "SLPS-00150",
-  "name": "Ridge Racer Revolution (Japan) (Rev 1)",
-  "codes": [
-   "SLPS-91028"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Namco",
-  "developer": "Namco",
-  "releaseDate": "1997-06-27",
-  "genre": "Driving / Racing",
-  "minPlayers": 1,
-  "maxPlayers": 1,
-  "minBlocks": 1,
-  "maxBlocks": 1,
-  "vibration": false,
-  "multitap": false,
-  "linkCable": true,
-  "controllers": [
-   "DigitalController",
-   "NeGcon"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 11012064,
-      "md5": "1de3e3e319943ee0e87e4bb7bede4d91"
-     },
-     {
-      "size": 1615824,
-      "md5": "514922b97a1595f51ad2a024931632b9"
-     },
-     {
-      "size": 18171552,
-      "md5": "65a0da38130a0b65cc70f02536fd80a3"
-     },
-     {
-      "size": 24166800,
-      "md5": "c903452a8561958451258f60bbba6714"
-     },
-     {
-      "size": 53275152,
-      "md5": "6596ef05c8197b99fa1fe51cb772a034"
-     },
-     {
-      "size": 53275152,
-      "md5": "5bbe2259e9e974ce1be41c50a462958a"
-     },
-     {
-      "size": 53275152,
-      "md5": "8df6ed4c912065e1ff0c724c1e363629"
-     },
-     {
-      "size": 53275152,
-      "md5": "1c3316b459e6da618cfe921c79f5f2dc"
-     },
-     {
-      "size": 53275152,
-      "md5": "ba3d068498ef45ce8bf793e6c62a87ae"
-     },
-     {
-      "size": 50019984,
-      "md5": "8cc23f28e3426b328cf30a8268f7c19f"
-     },
-     {
-      "size": 53275152,
-      "md5": "7f893e25d330f9baa0d6e16f15e99c89"
-     },
-     {
-      "size": 53275152,
-      "md5": "4535430cde11360108f6a388be905d37"
-     },
-     {
-      "size": 53275152,
-      "md5": "0ac151e736760049ceabf88269c7476d"
-     },
-     {
-      "size": 53275152,
-      "md5": "3a4a0f7416acdbba13fbfb162ade370e"
-     },
-     {
-      "size": 53275152,
-      "md5": "e4d87883c1fbe60a5f8f1dd6e3cd19d5"
-     },
-     {
-      "size": 3001152,
-      "md5": "a81afe376d0eca560beee0252be8a2cd"
-     },
-     {
-      "size": 10673376,
-      "md5": "3395c7e579514fedaa73fe399d34121f"
-     },
-     {
-      "size": 20678784,
-      "md5": "3cb67739168eb9c21aa885346f42e899"
-     },
-     {
-      "size": 33226704,
-      "md5": "e44d84ee3bfb44e95b73224412f7efc2"
-     },
-     {
-      "size": 33222000,
-      "md5": "940c8ecf9347da2d53c311f00c55be50"
-     }
-    ]
-   }
-  ]
- },
  {
   "serial": "SLUS-00214",
   "name": "Ridge Racer Revolution (USA)",
@@ -359890,46 +359508,6 @@
    }
   ]
  },
- {
-  "serial": "SLPS-01560",
-  "name": "SD Gundam - GGeneration (Japan) (Rev 1)",
-  "codes": [
-   "SLPS-91133"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Bandai",
-  "developer": "Tom Create",
-  "releaseDate": "1999-05-04",
-  "genre": "Tactical RPG",
-  "minPlayers": 1,
-  "maxPlayers": 2,
-  "minBlocks": 3,
-  "maxBlocks": 2,
-  "vibration": true,
-  "multitap": true,
-  "linkCable": false,
-  "controllers": [
-   "AnalogController",
-   "DigitalController"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 607596864,
-      "md5": "2a1c7831d67d0e46c8a9d86755ce10c4"
-     },
-     {
-      "size": 32212992,
-      "md5": "b0a2cabf160b2a0afc3197929d4fe378"
-     }
-    ]
-   }
-  ]
- },
  {
   "serial": "SLPS-01561",
   "name": "SD Gundam - GGeneration (Premium Disc) (Japan)",
@@ -367024,7 +366602,7 @@
  },
  {
   "serial": "SCPS-45075",
-  "name": "Schr\u00f7dinger no Neko - Die Katze von Schr\u00f7dinger",
+  "name": "Schrödinger no Neko - Die Katze von Schrödinger",
   "codes": [
    "SCPS-45075"
   ],
@@ -369262,41 +368840,6 @@
    }
   ]
  },
- {
-  "serial": "SCPS-10015",
-  "name": "Sentou Kokka - Air Land Battle (Japan) (Rev 1)",
-  "codes": [
-   "SCPS-91008"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Sony Computer Entertainment",
-  "developer": "Soliton / Marionette",
-  "releaseDate": "1996-11-22",
-  "genre": "Strategy",
-  "minPlayers": 1,
-  "maxPlayers": 3,
-  "minBlocks": 3,
-  "maxBlocks": 3,
-  "vibration": false,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "DigitalController"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 268483152,
-      "md5": "49639c693c281b84e1a8e3aa730b6199"
-     }
-    ]
-   }
-  ]
- },
  {
   "serial": "SCPS-10034",
   "name": "Sentou Kokka Kai - Improved (Japan)",
@@ -403197,6 +402740,10 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableUpscaling": true,
+   "DisablePGXP": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -403232,6 +402779,10 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableUpscaling": true,
+   "DisablePGXP": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -403266,6 +402817,10 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableUpscaling": true,
+   "DisablePGXP": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -403301,6 +402856,10 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableUpscaling": true,
+   "DisablePGXP": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -403335,6 +402894,10 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableUpscaling": true,
+   "DisablePGXP": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -403349,10 +402912,6 @@
    "rating": 5,
    "versionTested": "0.1-986-gfc911de1",
    "upscalingIssues": "Rendering is broken when upscaling is used."
-  },
-  "traits": {
-   "DisableUpscaling": true,
-   "DisablePGXP": true
   }
  },
  {
@@ -426838,7 +426397,7 @@
  },
  {
   "serial": "SLPM-87041",
-  "name": "S\u00f7ldnerschild Special [Koei Teiban Series]",
+  "name": "Söldnerschild Special [Koei Teiban Series]",
   "codes": [
    "SLPM-87041"
   ],
@@ -433122,7 +432681,8 @@
   "serial": "SLPS-00040",
   "name": "Tekken (Japan)",
   "codes": [
-   "SLPS-00040"
+   "SLPS-00040",
+   "SLPS-91020"
   ],
   "languages": [
    "Japanese"
@@ -433374,150 +432934,6 @@
    }
   ]
  },
- {
-  "serial": "SLPS-00040",
-  "name": "Tekken (Japan) (Rev 1)",
-  "codes": [
-   "SLPS-91020"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Namco",
-  "developer": "Namco",
-  "releaseDate": "1997-03-28",
-  "genre": "Fighting",
-  "minPlayers": 1,
-  "maxPlayers": 2,
-  "minBlocks": 1,
-  "maxBlocks": 1,
-  "vibration": false,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "DigitalController",
-   "NeGcon"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 144337536,
-      "md5": "0de8fd9a07bb01c2ddeff251a97f9b31"
-     },
-     {
-      "size": 9005808,
-      "md5": "722781c229b17f92457b8c571e31447d"
-     },
-     {
-      "size": 29381184,
-      "md5": "8d711d4214d5b4cc5ebebd8722870de5"
-     },
-     {
-      "size": 26229504,
-      "md5": "fb05eb8b2060bfb3c2366ecbd91c66de"
-     },
-     {
-      "size": 45050208,
-      "md5": "2e2f01048ee4fd45f5761ff5834057e0"
-     },
-     {
-      "size": 31937808,
-      "md5": "57064b58241c19e5aa9d0763657657ee"
-     },
-     {
-      "size": 30914688,
-      "md5": "eff1887ddbce025e68f86f5d48199406"
-     },
-     {
-      "size": 33487776,
-      "md5": "a51132139f1a2f058467c7f36e40cb22"
-     },
-     {
-      "size": 28303968,
-      "md5": "450b42560b319667203420a40f0f72db"
-     },
-     {
-      "size": 28358064,
-      "md5": "6bebe14a579e733e551d456976975cbd"
-     },
-     {
-      "size": 25570944,
-      "md5": "0757c28c497fea9fffc86894b5bea03e"
-     },
-     {
-      "size": 34402704,
-      "md5": "f099e0845dbaf31fd0fd89c8889260d5"
-     },
-     {
-      "size": 28906080,
-      "md5": "bf53fa6910b5dc042253e35fed922b96"
-     },
-     {
-      "size": 18145680,
-      "md5": "c70647d062b365151ee2a0e9c863d553"
-     },
-     {
-      "size": 7604016,
-      "md5": "97e83c03c634b15f58b63c3d9fed834a"
-     },
-     {
-      "size": 8279040,
-      "md5": "06e1122165227cd207ed2539ccf9629e"
-     },
-     {
-      "size": 14827008,
-      "md5": "18f48361783f7f390fa79c520fa04747"
-     },
-     {
-      "size": 13164144,
-      "md5": "e973d2911500501e3052dd0bfccb4621"
-     },
-     {
-      "size": 17211936,
-      "md5": "684c9364834603d9593f0a1e01cd2c95"
-     },
-     {
-      "size": 19493376,
-      "md5": "46fce44ad177dde2acc4b6fcfd49e962"
-     },
-     {
-      "size": 18651360,
-      "md5": "ceb034378448ada384547db6f9aa6af8"
-     },
-     {
-      "size": 17146080,
-      "md5": "c734c026e312e7f28152c775c2770331"
-     },
-     {
-      "size": 18442032,
-      "md5": "2d527d6878740726c5790f5e38339f2e"
-     },
-     {
-      "size": 18637248,
-      "md5": "210805ca8562b54aa2653868a37e7052"
-     },
-     {
-      "size": 16353456,
-      "md5": "24c94b1ae8c5fa9b1d36e393634b82ab"
-     },
-     {
-      "size": 13168848,
-      "md5": "b88125a4b2eaae07690acac9a5a5a86a"
-     },
-     {
-      "size": 19321680,
-      "md5": "d5b0b2635517729de96f1053b8ea757c"
-     },
-     {
-      "size": 18303264,
-      "md5": "de5500ccf7e40dbde02f907fdd4f2944"
-     }
-    ]
-   }
-  ]
- },
  {
   "serial": "SLUS-00006",
   "name": "Tekken (USA)",
@@ -467957,42 +467373,6 @@
    }
   ]
  },
- {
-  "serial": "SLPS-01900",
-  "name": "Uchuu Senkan Yamato - Haruka naru Hoshi Iscandar (Japan) (Rev 1)",
-  "codes": [
-   "SLPS-03234"
-  ],
-  "languages": [
-   "Japanese"
-  ],
-  "publisher": "Bandai",
-  "developer": "Vingt et un Systems",
-  "releaseDate": "2001-06-21",
-  "genre": "Strategy / Action",
-  "minPlayers": 1,
-  "maxPlayers": 1,
-  "minBlocks": 6,
-  "maxBlocks": 6,
-  "vibration": true,
-  "multitap": false,
-  "linkCable": false,
-  "controllers": [
-   "AnalogController",
-   "DigitalController"
-  ],
-  "track_data": [
-   {
-    "version": "Rev 1",
-    "tracks": [
-     {
-      "size": 701606304,
-      "md5": "6a90f1721c6176d42c6a3ac35f5d538d"
-     }
-    ]
-   }
-  ]
- },
  {
   "serial": "SLPS-00826",
   "name": "Uchuu no Rendezvous - Rama (Japan) (Disc 1)",
@@ -485422,7 +484802,10 @@
   "linkCable": false,
   "controllers": [
    "DigitalController"
-  ]
+  ],
+  "traits": {
+   "DisableWidescreen": true
+  }
  },
  {
   "serial": "SCES-00321",
@@ -485447,6 +484830,9 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableWidescreen": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -485481,6 +484867,9 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableWidescreen": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -485515,6 +484904,9 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableWidescreen": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -485549,6 +484941,9 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableWidescreen": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -485569,6 +484964,9 @@
   "languages": [
    "Japanese"
   ],
+  "traits": {
+   "DisableWidescreen": true
+  },
   "publisher": "Sony",
   "developer": "Media.Vision Entertainment / Contrail",
   "releaseDate": "1996-12-20",
@@ -485600,6 +484998,9 @@
   "codes": [
    "PCPX-96034"
   ],
+  "traits": {
+   "DisableWidescreen": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -485635,6 +485036,9 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableWidescreen": true
+  },
   "track_data": [
    {
     "version": "Rev 1",
@@ -485670,6 +485074,9 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableWidescreen": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -485708,6 +485115,9 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "DisableWidescreen": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -485923,6 +485333,9 @@
   "codes": [
    "SCUS-94592"
   ],
+  "traits": {
+   "ForcePGXPCPUMode": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -485957,6 +485370,9 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "ForcePGXPCPUMode": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -486000,6 +485416,9 @@
   "controllers": [
    "DigitalController"
   ],
+  "traits": {
+   "ForcePGXPCPUMode": true
+  },
   "track_data": [
    {
     "tracks": [
@@ -486039,7 +485458,10 @@
   "linkCable": false,
   "controllers": [
    "DigitalController"
-  ]
+  ],
+  "traits": {
+   "ForcePGXPCPUMode": true
+  }
  },
  {
   "serial": "SLPS-02174",