diff --git a/games/cave-story-plus/game.dat b/games/cave-story/game.dat
similarity index 100%
rename from games/cave-story-plus/game.dat
rename to games/cave-story/game.dat
diff --git a/games/cave-story-plus/icon.png b/games/cave-story/icon.png
similarity index 100%
rename from games/cave-story-plus/icon.png
rename to games/cave-story/icon.png
diff --git a/games/cave-story-plus/screenshots/1.png b/games/cave-story/screenshots/1.png
similarity index 100%
rename from games/cave-story-plus/screenshots/1.png
rename to games/cave-story/screenshots/1.png
diff --git a/games/cave-story-plus/screenshots/2.png b/games/cave-story/screenshots/2.png
similarity index 100%
rename from games/cave-story-plus/screenshots/2.png
rename to games/cave-story/screenshots/2.png
diff --git a/games/cave-story-plus/screenshots/3.png b/games/cave-story/screenshots/3.png
similarity index 100%
rename from games/cave-story-plus/screenshots/3.png
rename to games/cave-story/screenshots/3.png
diff --git a/games/child-of-light-ultimate-edition/game.dat b/games/child-of-light-ultimate-edition/game.dat
new file mode 100644
index 0000000..3db13d8
--- /dev/null
+++ b/games/child-of-light-ultimate-edition/game.dat
@@ -0,0 +1,11 @@
+title = "Child of Light"
+description = "Join Aurora on her journey to save her ailing father and a lost kingdom in the magical world of Lemuria –along the way she'll discover that her destiny may be far greater than she dreamed."
+github_issues = []
+needs_system_files = false
+needs_shared_font = false
+game_type = "switch"
+
+[[ releases ]]
+title = "01007D000AD8A000"
+region = "all"
+release_date = "2018-10-11"
diff --git a/games/child-of-light-ultimate-edition/icon.png b/games/child-of-light-ultimate-edition/icon.png
new file mode 100644
index 0000000..9a020f6
Binary files /dev/null and b/games/child-of-light-ultimate-edition/icon.png differ
diff --git a/games/crash-bandicoot-nsane-trilogy/game.dat b/games/crash-bandicoot-n-sane-trilogy/game.dat
similarity index 100%
rename from games/crash-bandicoot-nsane-trilogy/game.dat
rename to games/crash-bandicoot-n-sane-trilogy/game.dat
diff --git a/games/crash-bandicoot-nsane-trilogy/icon.png b/games/crash-bandicoot-n-sane-trilogy/icon.png
similarity index 100%
rename from games/crash-bandicoot-nsane-trilogy/icon.png
rename to games/crash-bandicoot-n-sane-trilogy/icon.png
diff --git a/games/diablo-3-eternal-collection/game.dat b/games/diablo-iii-eternal-collection/game.dat
similarity index 97%
rename from games/diablo-3-eternal-collection/game.dat
rename to games/diablo-iii-eternal-collection/game.dat
index bfafb42..ac72a32 100644
--- a/games/diablo-3-eternal-collection/game.dat
+++ b/games/diablo-iii-eternal-collection/game.dat
@@ -1,11 +1,11 @@
-title = "Diablo III: Eternal Collection"
-description = "Diablo III is a dungeon crawler action role-playing video game developed and published by Blizzard Entertainment. It is the third installment in the Diablo franchise."
-github_issues = []
-needs_system_files = false
-needs_shared_font = false
-game_type = "switch"
-
-[[ releases ]]
-title = "01001B300B9BE000"
-region = "all"
-release_date = "2018-11-02"
+title = "Diablo III: Eternal Collection"
+description = "Diablo III is a dungeon crawler action role-playing video game developed and published by Blizzard Entertainment. It is the third installment in the Diablo franchise."
+github_issues = []
+needs_system_files = false
+needs_shared_font = false
+game_type = "switch"
+
+[[ releases ]]
+title = "01001B300B9BE000"
+region = "all"
+release_date = "2018-11-02"
diff --git a/games/diablo-3-eternal-collection/icon.png b/games/diablo-iii-eternal-collection/icon.png
similarity index 100%
rename from games/diablo-3-eternal-collection/icon.png
rename to games/diablo-iii-eternal-collection/icon.png
diff --git a/games/dragon-ball-xenoverse-2/game.dat b/games/dragon-ball-xenoverse-2-for-nintendo-switch/game.dat
similarity index 100%
rename from games/dragon-ball-xenoverse-2/game.dat
rename to games/dragon-ball-xenoverse-2-for-nintendo-switch/game.dat
diff --git a/games/dragon-ball-xenoverse-2/icon.png b/games/dragon-ball-xenoverse-2-for-nintendo-switch/icon.png
similarity index 100%
rename from games/dragon-ball-xenoverse-2/icon.png
rename to games/dragon-ball-xenoverse-2-for-nintendo-switch/icon.png
diff --git a/games/farming-simulator/game.dat b/games/farming-simulator-nintendo-switch-edition/game.dat
similarity index 100%
rename from games/farming-simulator/game.dat
rename to games/farming-simulator-nintendo-switch-edition/game.dat
diff --git a/games/farming-simulator/icon.png b/games/farming-simulator-nintendo-switch-edition/icon.png
similarity index 100%
rename from games/farming-simulator/icon.png
rename to games/farming-simulator-nintendo-switch-edition/icon.png
diff --git a/games/gear-club-unlimited/game.dat b/games/gearclub-unlimited/game.dat
similarity index 100%
rename from games/gear-club-unlimited/game.dat
rename to games/gearclub-unlimited/game.dat
diff --git a/games/gear-club-unlimited/icon.png b/games/gearclub-unlimited/icon.png
similarity index 100%
rename from games/gear-club-unlimited/icon.png
rename to games/gearclub-unlimited/icon.png
diff --git a/games/guacanelee!-2/game.dat b/games/guacamelee-2/game.dat
similarity index 98%
rename from games/guacanelee!-2/game.dat
rename to games/guacamelee-2/game.dat
index afac11b..9ee3f23 100644
--- a/games/guacanelee!-2/game.dat
+++ b/games/guacamelee-2/game.dat
@@ -1,12 +1,12 @@
-title = "Guacamelee! 2"
-description = "Juan saved the world once -- but this time, the entire Mexiverse is at stake!
-Luchador Juan Aguacate is out of retirement for a stunning new Metroidvania-style adventure. Explore a huge, hand-crafted world inspired by Mexican culture and folklore, filled with sassy new villains and weirdos (and a few old friends!). Learn bone-crunching wrestling moves to fend off skeletal hordes and overcome skillful platforming challenges... and who said anything about a Chicken Illuminati? Certainly not us!."
-github_issues = []
-needs_system_files = false
-needs_shared_font = false
-game_type = "switch"
-
-[[ releases ]]
-title = "01007E100456C000"
-region = "all"
-release_date = "2019-01-17"
+title = "Guacamelee! 2"
+description = "Juan saved the world once -- but this time, the entire Mexiverse is at stake!
+Luchador Juan Aguacate is out of retirement for a stunning new Metroidvania-style adventure. Explore a huge, hand-crafted world inspired by Mexican culture and folklore, filled with sassy new villains and weirdos (and a few old friends!). Learn bone-crunching wrestling moves to fend off skeletal hordes and overcome skillful platforming challenges... and who said anything about a Chicken Illuminati? Certainly not us!."
+github_issues = []
+needs_system_files = false
+needs_shared_font = false
+game_type = "switch"
+
+[[ releases ]]
+title = "01007E100456C000"
+region = "all"
+release_date = "2019-01-17"
diff --git a/games/guacanelee!-2/icon.png b/games/guacamelee-2/icon.png
similarity index 100%
rename from games/guacanelee!-2/icon.png
rename to games/guacamelee-2/icon.png
diff --git a/games/mario-plus-rabbids-kingdom-battle/game.dat b/games/mario-rabbids-kingdom-battle/game.dat
similarity index 100%
rename from games/mario-plus-rabbids-kingdom-battle/game.dat
rename to games/mario-rabbids-kingdom-battle/game.dat
diff --git a/games/mario-plus-rabbids-kingdom-battle/icon.png b/games/mario-rabbids-kingdom-battle/icon.png
similarity index 100%
rename from games/mario-plus-rabbids-kingdom-battle/icon.png
rename to games/mario-rabbids-kingdom-battle/icon.png
diff --git a/games/one-piece-unlimited-world-red-deluxe/game.dat b/games/one-piece-unlimited-world-red-deluxe-edition/game.dat
similarity index 100%
rename from games/one-piece-unlimited-world-red-deluxe/game.dat
rename to games/one-piece-unlimited-world-red-deluxe-edition/game.dat
diff --git a/games/one-piece-unlimited-world-red-deluxe/icon.png b/games/one-piece-unlimited-world-red-deluxe-edition/icon.png
similarity index 100%
rename from games/one-piece-unlimited-world-red-deluxe/icon.png
rename to games/one-piece-unlimited-world-red-deluxe-edition/icon.png
diff --git a/games/one-piece-unlimited-world-red-deluxe/screenshots/4.png b/games/one-piece-unlimited-world-red-deluxe-edition/screenshots/4.png
similarity index 100%
rename from games/one-piece-unlimited-world-red-deluxe/screenshots/4.png
rename to games/one-piece-unlimited-world-red-deluxe-edition/screenshots/4.png
diff --git a/games/pokémon-quest/game.dat b/games/pokemon-quest/game.dat
similarity index 98%
rename from games/pokémon-quest/game.dat
rename to games/pokemon-quest/game.dat
index fc6a57e..2e1a053 100644
--- a/games/pokémon-quest/game.dat
+++ b/games/pokemon-quest/game.dat
@@ -1,11 +1,11 @@
-title = "Pokémon Quest"
-description = "Tumblecube Island is the setting for Pokémon Quest, a rambunctious action RPG created by GAME FREAK inc., the developer of many of your favourite Pokémon titles. The landscape and inhabitants of Tumblecube Island have a boxy, cube-like look to them, resulting in a Pokémon adventure that looks like none before it. There is no denying that the cube versions of these Pokémon that were originally discovered in the Kanto region are simply adorable!"
-github_issues = []
-needs_system_files = false
-needs_shared_font = false
-game_type = "switch"
-
-[[ releases ]]
-title = "01005D100807A000"
-region = "all"
-release_date = "2018-05-30"
+title = "Pokémon Quest"
+description = "Tumblecube Island is the setting for Pokémon Quest, a rambunctious action RPG created by GAME FREAK inc., the developer of many of your favourite Pokémon titles. The landscape and inhabitants of Tumblecube Island have a boxy, cube-like look to them, resulting in a Pokémon adventure that looks like none before it. There is no denying that the cube versions of these Pokémon that were originally discovered in the Kanto region are simply adorable!"
+github_issues = []
+needs_system_files = false
+needs_shared_font = false
+game_type = "switch"
+
+[[ releases ]]
+title = "01005D100807A000"
+region = "all"
+release_date = "2018-05-30"
diff --git a/games/pokémon-quest/icon.png b/games/pokemon-quest/icon.png
similarity index 100%
rename from games/pokémon-quest/icon.png
rename to games/pokemon-quest/icon.png
diff --git a/games/south-park-the-fractured-but-whole/game.dat b/games/south-park-the-fractured-but-whole-standard-edition/game.dat
similarity index 100%
rename from games/south-park-the-fractured-but-whole/game.dat
rename to games/south-park-the-fractured-but-whole-standard-edition/game.dat
diff --git a/games/south-park-the-fractured-but-whole/icon.png b/games/south-park-the-fractured-but-whole-standard-edition/icon.png
similarity index 100%
rename from games/south-park-the-fractured-but-whole/icon.png
rename to games/south-park-the-fractured-but-whole-standard-edition/icon.png
diff --git a/games/starlink-battle-for-atlas/game.dat b/games/starlink-battle-for-atlas-digital-edition/game.dat
similarity index 100%
rename from games/starlink-battle-for-atlas/game.dat
rename to games/starlink-battle-for-atlas-digital-edition/game.dat
diff --git a/games/starlink-battle-for-atlas/icon.png b/games/starlink-battle-for-atlas-digital-edition/icon.png
similarity index 100%
rename from games/starlink-battle-for-atlas/icon.png
rename to games/starlink-battle-for-atlas-digital-edition/icon.png
diff --git a/games/steins-gate-elite/game.dat b/games/steinsgate-elite/game.dat
similarity index 100%
rename from games/steins-gate-elite/game.dat
rename to games/steinsgate-elite/game.dat
diff --git a/games/steins-gate-elite/icon.png b/games/steinsgate-elite/icon.png
similarity index 100%
rename from games/steins-gate-elite/icon.png
rename to games/steinsgate-elite/icon.png
diff --git a/games/steins-gate-elite/screenshots/1.png b/games/steinsgate-elite/screenshots/1.png
similarity index 100%
rename from games/steins-gate-elite/screenshots/1.png
rename to games/steinsgate-elite/screenshots/1.png
diff --git a/games/steins-gate-elite/screenshots/2.png b/games/steinsgate-elite/screenshots/2.png
similarity index 100%
rename from games/steins-gate-elite/screenshots/2.png
rename to games/steinsgate-elite/screenshots/2.png
diff --git a/games/steins-gate-elite/screenshots/3.png b/games/steinsgate-elite/screenshots/3.png
similarity index 100%
rename from games/steins-gate-elite/screenshots/3.png
rename to games/steinsgate-elite/screenshots/3.png
diff --git a/games/steins-gate-elite/screenshots/4.png b/games/steinsgate-elite/screenshots/4.png
similarity index 100%
rename from games/steins-gate-elite/screenshots/4.png
rename to games/steinsgate-elite/screenshots/4.png
diff --git a/games/steins-gate-elite/screenshots/5.png b/games/steinsgate-elite/screenshots/5.png
similarity index 100%
rename from games/steins-gate-elite/screenshots/5.png
rename to games/steinsgate-elite/screenshots/5.png
diff --git a/games/the-binding-of-isaac-afterbirth-plus/game.dat b/games/the-binding-of-isaac-afterbirth/game.dat
similarity index 100%
rename from games/the-binding-of-isaac-afterbirth-plus/game.dat
rename to games/the-binding-of-isaac-afterbirth/game.dat
diff --git a/games/the-binding-of-isaac-afterbirth-plus/icon.png b/games/the-binding-of-isaac-afterbirth/icon.png
similarity index 100%
rename from games/the-binding-of-isaac-afterbirth-plus/icon.png
rename to games/the-binding-of-isaac-afterbirth/icon.png
diff --git a/games/the-binding-of-isaac-afterbirth-plus/screenshots/5.png b/games/the-binding-of-isaac-afterbirth/screenshots/5.png
similarity index 100%
rename from games/the-binding-of-isaac-afterbirth-plus/screenshots/5.png
rename to games/the-binding-of-isaac-afterbirth/screenshots/5.png
diff --git a/games/the-binding-of-isaac-afterbirth-plus/screenshots/6.png b/games/the-binding-of-isaac-afterbirth/screenshots/6.png
similarity index 100%
rename from games/the-binding-of-isaac-afterbirth-plus/screenshots/6.png
rename to games/the-binding-of-isaac-afterbirth/screenshots/6.png
diff --git a/games/the-binding-of-isaac-afterbirth-plus/screenshots/7.png b/games/the-binding-of-isaac-afterbirth/screenshots/7.png
similarity index 100%
rename from games/the-binding-of-isaac-afterbirth-plus/screenshots/7.png
rename to games/the-binding-of-isaac-afterbirth/screenshots/7.png